bump dependencies to support latest Node versions

quaertym · Apr 30, 2022 · 7d6765d · 7d6765d
1 parent c1e79a8
commit 7d6765d
Show file tree

Hide file tree

Showing 5 changed files with 2,509 additions and 1,653 deletions.
diff --git a/.eslintrc.js b/.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'],
     }
   ]
 };
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -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:
@@ -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
 
@@ -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
diff --git a/lib/dependency-checker.js b/lib/dependency-checker.js
@@ -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];
         }
       });

diff --git a/package.json b/package.json
@@ -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"