Merge pull request #88 from ember-cli-deploy/update-dependencies

[BREAKING] Update dependencies including required node versions
ember-cli-deploy · Jun 4, 2023 · ed9e6eb · ed9e6eb
2 parents 3eca880 + 0c17bb5
commit ed9e6eb
Show file tree

Hide file tree

Showing 7 changed files with 3,611 additions and 3,622 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,7 +1,15 @@
 module.exports = {
   root: true,
+  parser: '@babel/eslint-parser',
   parserOptions: {
-    ecmaVersion: 2018
+    ecmaVersion: 2020,
+    sourceType: 'module',
+    requireConfigFile: false,
+    babelOptions: {
+      configFile: false,
+      // your babel options
+      presets: ["@babel/preset-env"],
+    },
   },
   plugins: [
     'ember'
@@ -42,6 +50,7 @@ module.exports = {
         node: true
       },
       plugins: ['node'],
+      extends: ['plugin:node/recommended'],
       rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
         // add your custom rules and overrides for node files here
         'ember/avoid-leaking-state-in-ember-objects': 'off'

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -10,11 +10,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [12.x, 14.x, 16.x]
+        node-version: [14.x, 16.x, 18.x, 20.x]
     steps:
     - uses: actions/checkout@v2
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v2
+      uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node-version }}
         cache: 'yarn'
@@ -26,11 +26,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [12.x, 14.x, 16.x]
+        node-version: [14.x, 16.x, 18.x, 20.x]
     steps:
     - uses: actions/checkout@v2
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v2
+      uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node-version }}
         cache: 'yarn'

diff --git a/package.json b/package.json
@@ -18,33 +18,34 @@
     "test": "mocha tests/**/*-test.js --exit"
   },
   "dependencies": {
-    "chalk": "^1.0.0",
-    "ember-cli-deploy-plugin": "^0.2.1",
-    "glob": "^7.1.1",
-    "rsvp": "^3.5.0"
+    "@babel/eslint-parser": "^7.21.8",
+    "chalk": "^4.1.2",
+    "ember-cli-deploy-plugin": "^0.2.9",
+    "glob": "^10.2.6",
+    "rsvp": "^4.8.5"
   },
   "devDependencies": {
-    "@ember/optional-features": "^0.7.0",
-    "chai": "^3.5.0",
-    "chai-as-promised": "^6.0.0",
-    "ember-cli": "~3.12.0",
-    "ember-cli-babel": "^7.7.3",
-    "ember-cli-htmlbars": "^3.0.1",
+    "@ember/optional-features": "^2.0.0",
+    "chai": "^4.3.7",
+    "chai-as-promised": "^7.1.1",
+    "ember-cli": "~3.28.6",
+    "ember-cli-babel": "^7.26.11",
+    "ember-cli-htmlbars": "^6.2.0",
     "ember-cli-release-tag": "^0.1.5",
-    "ember-maybe-import-regenerator": "^0.1.6",
-    "ember-source": "~3.12.0",
-    "eslint": "^6.1.0",
-    "eslint-plugin-ember": "^6.2.0",
-    "eslint-plugin-node": "^9.0.1",
-    "github": "^0.2.4",
-    "glob": "^7.1.1",
+    "ember-maybe-import-regenerator": "^1.0.0",
+    "ember-source": "~3.28.12",
+    "eslint": "^8.42.0",
+    "eslint-plugin-ember": "^11.8.0",
+    "eslint-plugin-node": "^11.1.0",
+    "github": "^14.0.0",
+    "glob": "^10.2.6",
     "loader.js": "^4.7.0",
-    "mocha": "^6.2.0",
-    "release-it": "^14.2.1",
-    "release-it-lerna-changelog": "^3.1.0"
+    "mocha": "^6.2.3",
+    "release-it": "~14.14.3",
+    "release-it-lerna-changelog": "~3.1.0"
   },
   "engines": {
-    "node": "12.* || 14.* || >= 16"
+    "node": "14.* || 16.* || 18.* || >= 20"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
@@ -66,5 +67,9 @@
       "release": true,
       "tokenRef": "GITHUB_AUTH"
     }
+  },
+  "volta": {
+    "node": "14.21.3",
+    "yarn": "1.22.19"
   }
 }
diff --git a/tests/dummy/app/app.js b/tests/dummy/app/app.js
@@ -3,11 +3,11 @@ import Resolver from './resolver';
 import loadInitializers from 'ember-load-initializers';
 import config from './config/environment';
 
-const App = Application.extend({
-  modulePrefix: config.modulePrefix,
-  podModulePrefix: config.podModulePrefix,
-  Resolver
-});
+class App extends Application {
+  modulePrefix = config.modulePrefix;
+  podModulePrefix = config.podModulePrefix;
+  Resolver = Resolver
+}
 
 loadInitializers(App, config.modulePrefix);
 

diff --git a/tests/dummy/app/router.js b/tests/dummy/app/router.js
@@ -1,10 +1,10 @@
 import EmberRouter from '@ember/routing/router';
 import config from './config/environment';
 
-const Router = EmberRouter.extend({
-  location: config.locationType,
-  rootURL: config.rootURL
-});
+class Router extends EmberRouter {
+  location = config.locationType;
+  rootURL = config.rootURL;
+}
 
 Router.map(function() {
 });

diff --git a/tests/index-test.js b/tests/index-test.js
@@ -16,7 +16,9 @@ describe('build plugin', function() {
     mockUi = {
       messages: [],
       verbose: true,
+      spinner: {},
       startProgress: function() { },
+      stopProgress: function() { },
       write: function() { },
       writeLine: function(message) {
         this.messages.push(message);
@@ -154,20 +156,20 @@ describe('build plugin', function() {
           assert.deepEqual(result, {
             distDir: 'tmp/dist-deploy',
             distFiles: [
-               'assets/dummy.css',
-               'assets/dummy.js',
-               'assets/dummy.map',
-               'assets/test-support.js',
-               'assets/test-support.map',
-               'assets/tests.js',
-               'assets/tests.map',
-               'assets/vendor.css',
-               'assets/vendor.js',
-               'assets/vendor.map',
-               'index.html',
-               'robots.txt',
-               'testem.js',
-               'tests/index.html'
+              'testem.js',
+              'robots.txt',
+              'index.html',
+              'tests/index.html',
+              'assets/vendor.map',
+              'assets/vendor.js',
+              'assets/vendor.css',
+              'assets/tests.map',
+              'assets/tests.js',
+              'assets/test-support.map',
+              'assets/test-support.js',
+              'assets/dummy.map',
+              'assets/dummy.js',
+              'assets/dummy.css',
             ]
           });
           done();
@@ -185,8 +187,8 @@ describe('build plugin', function() {
           assert.deepEqual(result, {
             distDir: __dirname + '/fixtures/fake-build-output',
             distFiles: [
-              'assets/inner-example.css',
-              'top-file-example.js'
+              'top-file-example.js',
+              'assets/inner-example.css'
             ]
           });
           done();