Skip to content

Commit

Permalink
Merge pull request #901 from spencermountain/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
spencermountain authored Mar 22, 2022
2 parents 4a9f2b0 + ebd2eba commit 52fb03e
Show file tree
Hide file tree
Showing 1,580 changed files with 84,941 additions and 577,963 deletions.
89 changes: 47 additions & 42 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,56 +1,61 @@
{
"root": true,
"extends": [
"eslint:recommended",
"plugin:regexp/recommended"
],
"ignorePatterns": [
"**/builds/*"
],
"env": {
"es6": true,
"browser": true,
"node": true
},
"parserOptions": {
"ecmaVersion": 2018,
"sourceType": "module",
"ecmaFeatures": {}
"ecmaVersion": 2020,
"sourceType": "module"
},
"extends": [],
"rules": {
"regexp/prefer-d": 0,
"semi": ["warn", "never"],
"indent": ["error", 2, { "SwitchCase": 1 }],
"spaced-comment": 0,
"no-cond-assign": 2,
"no-var": 1,
"comma-dangle": [
1,
"only-multiline"
],
"quotes": [
0,
"single",
"avoid-escape"
],
"max-nested-callbacks": [
1,
4
],
"max-params": [
1,
5
],
"consistent-return": 1,
"no-bitwise": 1,
"no-empty": 1,
"no-console": 1,
"no-duplicate-imports": 1,
"no-eval": 2,
"no-implied-eval": 2,
"no-mixed-operators": 2,
"no-multi-assign": 2,
"no-nested-ternary": 1,
"no-prototype-builtins": 0,
"no-self-compare": 1,
"no-sequences": 1,
"no-shadow": 2,
"no-unmodified-loop-condition": 1,
"no-use-before-define": 1,
"prefer-const": 0,
"no-extra-parens": 0,
"no-dupe-keys": 2,
"no-undef": 2,
"no-unreachable": 2,
"eqeqeq": 1,
"keyword-spacing": 0,
"no-native-reassign": 2,
"no-redeclare": 2,
"radix": 1,
"quotes": [0, "single", "avoid-escape"],
"no-shadow": 2,
"no-unused-vars": 1,
"no-lonely-if": 1,
"no-use-before-define": 2,
"no-bitwise": 2,
"no-dupe-class-members": 2,
"guard-for-in": 1,
"consistent-return": 2,
"no-octal-escape": 2,
"no-constant-condition": 1,
"no-unused-expressions": 2,
"comma-dangle": [1, "only-multiline"],
"space-before-function-paren": 0,
"max-len": [
"error",
{
"code": 120,
"ignoreComments": true,
"ignoreStrings": true,
"ignoreTemplateLiterals": true,
"ignoreRegExpLiterals": true
}
]
"regexp/prefer-d": 0,
"regexp/prefer-w": 0,
"regexp/prefer-range": 0,
"regexp/no-unused-capturing-group": 0
}
}
}
21 changes: 10 additions & 11 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,23 @@ on: [pull_request]

jobs:
build-and-test:
runs-on: ubuntu-latest

env:
CI: true
runs-on: ${{ matrix.os }}

strategy:
matrix:
node-version: [10.x, 15.x]
node-version: [12.x, 14.x, 15.x, 16.x]
os: [macos-latest, ubuntu-latest, windows-latest]

steps:
- uses: actions/checkout@v2

- name: use node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}

- name: cache dependencies
uses: actions/cache@v1
uses: actions/cache@v2
with:
path: ~/.npm
key: ${{ runner.os }}-npm-${{ matrix.node-version }}-${{ hashFiles('package-lock.json') }}
Expand All @@ -33,8 +31,8 @@ jobs:
- name: install
run: |
npm ci
npm i --no-save ts-node typescript
npm run plugins:ci
# npm i --no-save ts-node typescript
# npm run plugins:ci
- name: static checks
run: |
Expand All @@ -49,7 +47,8 @@ jobs:
- name: test
run: |
npm run test:smoke
npm run testb
npm run test
# npm run testb
# npm run perf
npm run test:types
# npm run test:types
# npm run test:stress
18 changes: 7 additions & 11 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ jobs:
release:
runs-on: ubuntu-latest

env:
CI: true

# Note that these steps are *identical* to build-and-test (with the caveat
# that build-and-test uses several versions of Node, and Release only uses
# 10.x) at least until the actual publishing happens. Ideally, we could
Expand All @@ -19,12 +16,12 @@ jobs:
steps:
- uses: actions/checkout@v2

- uses: actions/setup-node@v1
- uses: actions/setup-node@v2
with:
node-version: 10.x
node-version: 15.x

- name: cache dependencies
uses: actions/cache@v1
uses: actions/cache@v2
with:
path: ~/.npm
key: ${{ runner.os }}-npm-10.x-${{ hashFiles('package-lock.json') }}
Expand All @@ -35,12 +32,11 @@ jobs:
- name: install
run: |
npm ci
npm i --no-save ts-node typescript
npm run plugins:ci
# npm i --no-save ts-node typescript
# npm run plugins:ci
- name: static checks
run: |
npm i --no-save eslint
npm run lint
- name: build
Expand All @@ -51,9 +47,9 @@ jobs:
- name: test
run: |
npm run test:smoke
npm run testb
npm run test
# npm run perf
npm run test:types
# npm run test:types
# npm run test:stress
# And finally... publish it! Note that we create the .npmrc file
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ coverage/
.env
.nyc_output/
.vscode
.clinic
coverage.lcov
codecov.yml
plugins/phrases/data/
plugins/phrases/data/
learn/giga/result/
10 changes: 10 additions & 0 deletions .jshintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"esversion": 8,
"node": true,
"asi": true,
"undef": true,
"-W138": true,
"globals": {
"self": true
}
}
1 change: 0 additions & 1 deletion .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ data
demo
plugins
scripts
src
tests
.eslintrc
.gitignore
Expand Down
Loading

0 comments on commit 52fb03e

Please sign in to comment.