Skip to content

Commit

Permalink
Merge pull request #135 from SergeAstapov/bump-deps
Browse files Browse the repository at this point in the history
bump dependencies to support latest Node versions
  • Loading branch information
quaertym committed May 2, 2022
2 parents c1e79a8 + 7d6765d commit 1780e66
Show file tree
Hide file tree
Showing 5 changed files with 2,509 additions and 1,653 deletions.
39 changes: 16 additions & 23 deletions .eslintrc.js
@@ -1,50 +1,43 @@
module.exports = {
root: true,
parser: 'babel-eslint',
parserOptions: {
ecmaVersion: 6,
sourceType: 'module'
ecmaVersion: 2018,
sourceType: 'module',
ecmaFeatures: {
legacyDecorators: true,
},
},
plugins: [
'ember'
],
plugins: ['ember'],
extends: [
'eslint:recommended',
'plugin:ember/recommended'
],
env: {
node: true
},
rules: {
},
rules: {},
overrides: [
// node files
{
files: [
'ember-cli-build.js',
'index.js',
'testem.js',
'blueprints/*/index.js',
'config/**/*.js',
'tests/dummy/config/**/*.js'
],
excludedFiles: [
'addon/**',
'addon-test-support/**',
'app/**',
'tests/dummy/app/**'
'./.eslintrc.js',
'./ember-cli-build.js',
'./index.js',
'./testem.js',
'./blueprints/*/index.js',
'./config/**/*.js',
'./tests/dummy/config/**/*.js'
],
parserOptions: {
sourceType: 'script',
ecmaVersion: 2015
},
env: {
browser: false,
node: true
},
plugins: ['node'],
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
// add your custom rules and overrides for node files here
})
extends: ['plugin:node/recommended'],
}
]
};
9 changes: 7 additions & 2 deletions .github/workflows/ci.yml
Expand Up @@ -18,7 +18,7 @@ jobs:

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

steps:
Expand All @@ -28,10 +28,13 @@ jobs:
with:
node-version: ${{ matrix.node-version }}
cache: yarn

- name: Install Dependencies
run: yarn install --frozen-lockfile

- name: Lint
run: yarn lint:js

- name: Run Tests
run: yarn test

Expand All @@ -41,15 +44,17 @@ jobs:

strategy:
matrix:
node-version: [8.x, 10.x]
node-version: [12.x, 14.x, 16.x]

steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: yarn

- name: Install Dependencies
run: yarn install --no-lockfile

- name: Run Tests
run: yarn test
2 changes: 1 addition & 1 deletion lib/dependency-checker.js
Expand Up @@ -143,7 +143,7 @@ class EmberCLIDependencyChecker {
bowerDependencies = this.project.bowerDependencies();

Object.keys(bowerDependencies).forEach((pkg) => {
if(npmDependencies.hasOwnProperty(`@bower_components/${pkg}`)) {
if(Object.prototype.hasOwnProperty.call(npmDependencies, `@bower_components/${pkg}`)) {
delete bowerDependencies[pkg];
}
});
Expand Down
32 changes: 15 additions & 17 deletions package.json
Expand Up @@ -31,27 +31,25 @@
"test:debug": "node debug tests/runner"
},
"dependencies": {
"chalk": "^2.3.0",
"find-yarn-workspace-root": "^1.1.0",
"chalk": "^2.4.2",
"find-yarn-workspace-root": "^1.2.1",
"is-git-url": "^1.0.0",
"resolve": "^1.5.0",
"semver": "^5.3.0"
"resolve": "^1.22.0",
"semver": "^5.7.1"
},
"devDependencies": {
"chai": "^4.1.2",
"babel-eslint": "^10.1.0",
"chai": "^4.3.6",
"ember-cli": "~3.2.0",
"ember-maybe-import-regenerator": "^0.1.6",
"ember-source-channel-url": "^1.0.1",
"ember-try": "^0.2.23",
"eslint-plugin-chai": "0.0.1",
"eslint-plugin-ember": "^5.0.0",
"eslint-plugin-mocha": "^5.1.0",
"eslint-plugin-node": "^6.0.1",
"glob": "^7.1.1",
"mocha": "^5.2.0",
"mocha-eslint": "^4.1.0",
"qunit-dom": "^0.7.0",
"sinon": "^13.0.0"
"eslint": "^7.32.0",
"eslint-plugin-chai": "^0.0.1",
"eslint-plugin-ember": "^10.6.0",
"eslint-plugin-mocha": "^9.0.0",
"eslint-plugin-node": "^11.1.0",
"glob": "^8.0.1",
"mocha": "^9.2.2",
"mocha-eslint": "^7.0.0",
"sinon": "^13.0.2"
},
"peerDependencies": {
"ember-cli": "^3.2.0 || ^4.0.0"
Expand Down

0 comments on commit 1780e66

Please sign in to comment.