Skip to content

Commit

Permalink
Merge pull request #516 from fishbrain/develop
Browse files Browse the repository at this point in the history
Go Live
  • Loading branch information
lhansford authored Aug 30, 2024
2 parents 2c34ec3 + f3d0e38 commit 54fb8a0
Show file tree
Hide file tree
Showing 22 changed files with 6,243 additions and 11,837 deletions.
33 changes: 0 additions & 33 deletions .eslintrc.js

This file was deleted.

10 changes: 6 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: CI
on:
push:
branches-ignore:
- master
- main

jobs:
test:
Expand All @@ -14,11 +14,13 @@ jobs:
- uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
- name: Enable Corepack
run: corepack enable

- name: Install
run: npm ci
run: yarn

- name: Test
run: npm run test
- name: Test configs
run: yarn test
env:
CI: true
2 changes: 1 addition & 1 deletion .github/workflows/outstanding-prs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
jobs:
outstanding-prs:
name: Outstanding PRs
runs-on: buildjet-2vcpu-ubuntu-2204
runs-on: warp-ubuntu-latest-x64-2x
steps:
- uses: fishbrain/outstanding-pull-requests-action@dcad1106114e0416e3dbc67de16ddc228b15be28 #v1.0.2
env:
Expand Down
20 changes: 17 additions & 3 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,31 @@ name: Publish
on:
push:
branches:
- master
- main

jobs:
publish:
publish-base:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'

- uses: JS-DevTools/npm-publish@4b07b26a2f6e0a51846e1870223e545bae91c552 # v3.0.1
- uses: JS-DevTools/npm-publish@19c28f1ef146469e409470805ea4279d47c3d35c # v3.1.1
with:
token: ${{ secrets.NPM_TOKEN }}
package: ./packages/base

publish-react:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'

- uses: JS-DevTools/npm-publish@19c28f1ef146469e409470805ea4279d47c3d35c # v3.1.1
with:
token: ${{ secrets.NPM_TOKEN }}
package: ./packages/react
17 changes: 12 additions & 5 deletions .github/workflows/semgrep.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,27 @@
######################################################################################################################
name: Semgrep
on:
workflow_dispatch: {}
pull_request: {}
push:
branches:
- main
- master
paths:
- .github/workflows/semgrep.yml
schedule:
- cron: '0 2 * * 1' # Once a week at 2am.
- cron: "0 2 * * 1" # Once a week at 2am.

jobs:
semgrep:
name: Scan
runs-on: buildjet-2vcpu-ubuntu-2204
runs-on: warp-ubuntu-latest-x64-2x
timeout-minutes: 15 # There's been issues with some runs hanging. This times out after 15 minutes instead of the default 360.
env:
SEMGREP_APP_TOKEN: ${{ secrets.SEMGREP_APP_TOKEN }}
container:
image: returntocorp/semgrep
image: semgrep/semgrep
if: (github.actor != 'dependabot[bot]')
steps:
- uses: actions/checkout@v4
- run: semgrep ci
env:
SEMGREP_APP_TOKEN: ${{ secrets.SEMGREP_APP_TOKEN }}
63 changes: 2 additions & 61 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,61 +1,2 @@
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*

# Runtime data
pids
*.pid
*.seed
*.pid.lock

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage

# nyc test coverage
.nyc_output

# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# Bower dependency directory (https://bower.io/)
bower_components

# node-waf configuration
.lock-wscript

# Compiled binary addons (https://nodejs.org/api/addons.html)
build/Release

# Dependency directories
node_modules/
jspm_packages/

# TypeScript v1 declaration files
typings/

# Optional npm cache directory
.npm

# Optional eslint cache
.eslintcache

# Optional REPL history
.node_repl_history

# Output of 'npm pack'
*.tgz

# Yarn Integrity file
.yarn-integrity

# dotenv environment variables file
.env

# next.js build output
.next
node_modules
.yarn
1 change: 1 addition & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nodeLinker: node-modules
18 changes: 1 addition & 17 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,25 +77,9 @@ You can also add exceptions for polyfills in `.eslintrc`. See
}
```

### Editor settings

To enable ESLint in VS Code add the following to your `settings.json`:

```json
{
"tslint.enable": false,
"eslint.validate": [
"javascript",
"javascriptreact",
"typescript",
"typescriptreact"
]
}
```

## Releasing

1. Update the version number in package.json
1. Run `yarn version <patch|minor|major>`.
2. Merge all changes to `develop`
3. Run `/golive eslint-config-fishbrain` in Slack.
4. Merge the created go live PR.
2 changes: 0 additions & 2 deletions index.js

This file was deleted.

Loading

0 comments on commit 54fb8a0

Please sign in to comment.