Skip to content

Commit

Permalink
Merge pull request #879 from stopfstedt/update-deps
Browse files Browse the repository at this point in the history
Update dependencies
  • Loading branch information
jrjohnson authored Feb 22, 2022
2 parents b5020b9 + bd82a26 commit 1d8a85c
Show file tree
Hide file tree
Showing 19 changed files with 66,318 additions and 11,553 deletions.
13 changes: 13 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"presets": [
"@babel/preset-env"
],
"plugins": [
[
"@babel/plugin-proposal-decorators",
{
"legacy": true
}
]
]
}
6 changes: 3 additions & 3 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

module.exports = {
root: true,
parser: 'babel-eslint',
parser: '@babel/eslint-parser',
parserOptions: {
ecmaVersion: 2018,
sourceType: 'module',
ecmaFeatures: {
legacyDecorators: true,
babelOptions: {
configFile: './.babelrc',
},
},
plugins: ['ember'],
Expand Down
9 changes: 8 additions & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,16 @@ jobs:
test:
name: Tests
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [ 14.x, 16.x ]
steps:
- uses: actions/checkout@v1
- uses: actions/setup-node@v1
with:
node-version: 10
node-version: ${{ matrix.node-version }}
- name: Update to npm@8 for github deps
run: npm install -g npm@8
- name: install dependencies
run: npm ci
- name: lint js
Expand Down Expand Up @@ -60,6 +65,8 @@ jobs:
# - uses: actions/setup-node@v1
# with:
# node-version: 12
# - name: Update to npm@8 for github deps
# run: npm install -g npm@8
# - name: install dependencies
# run: npm ci
# - name: test
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/docs-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,16 @@ jobs:
defaults:
run:
working-directory: docs
strategy:
matrix:
node-version: [ 14.x, 16.x ]
steps:
- uses: actions/checkout@v1
- uses: actions/setup-node@v1
with:
node-version: 14
node-version: ${{ matrix.node-version }}
- name: Update to npm@8 for github deps
run: npm install -g npm@8
- name: install addon dependencies
working-directory: .
run: npm ci
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/future-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ jobs:
- uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- name: Update to npm@8 for github deps
run: npm install -g npm@8
- name: install dependencies
run: npm ci
- name: lint js
Expand All @@ -47,6 +49,8 @@ jobs:
- uses: actions/setup-node@v1
with:
node-version: 12
- name: Update to npm@8 for github deps
run: npm install -g npm@8
- name: install dependencies
run: npm ci
- name: test
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ jobs:
- uses: actions/setup-node@v2
with:
node-version: 14
- name: Update to npm@8 for github deps
run: npm install -g npm@8
- name: install dependencies
run: npm ci
- name: test
Expand All @@ -26,6 +28,8 @@ jobs:
with:
node-version: 14
registry-url: https://registry.npmjs.org/
- name: Update to npm@8 for github deps
run: npm install -g npm@8
- name: install dependencies
run: npm ci
- name: publish
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
14
16
8 changes: 4 additions & 4 deletions docs/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

module.exports = {
root: true,
parser: 'babel-eslint',
parser: '@babel/eslint-parser',
parserOptions: {
ecmaVersion: 2018,
sourceType: 'module',
ecmaFeatures: {
legacyDecorators: true
}
babelOptions: {
configFile: './../.babelrc',
},
},
plugins: [
'ember'
Expand Down
1 change: 1 addition & 0 deletions docs/app/templates/application.hbs
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
{{!-- template-lint-disable no-bare-strings --}}
{{page-title "Ember Simple Charts Documentation"}}
{{outlet}}
Loading

0 comments on commit 1d8a85c

Please sign in to comment.