Skip to content

Commit ed9e6eb

Browse files
authored
Merge pull request #88 from ember-cli-deploy/update-dependencies
[BREAKING] Update dependencies including required node versions
2 parents 3eca880 + 0c17bb5 commit ed9e6eb

File tree

7 files changed

+3611
-3622
lines changed

7 files changed

+3611
-3622
lines changed

.eslintrc.js

+10-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
11
module.exports = {
22
root: true,
3+
parser: '@babel/eslint-parser',
34
parserOptions: {
4-
ecmaVersion: 2018
5+
ecmaVersion: 2020,
6+
sourceType: 'module',
7+
requireConfigFile: false,
8+
babelOptions: {
9+
configFile: false,
10+
// your babel options
11+
presets: ["@babel/preset-env"],
12+
},
513
},
614
plugins: [
715
'ember'
@@ -42,6 +50,7 @@ module.exports = {
4250
node: true
4351
},
4452
plugins: ['node'],
53+
extends: ['plugin:node/recommended'],
4554
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
4655
// add your custom rules and overrides for node files here
4756
'ember/avoid-leaking-state-in-ember-objects': 'off'

.github/workflows/ci.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ jobs:
1010
runs-on: ubuntu-latest
1111
strategy:
1212
matrix:
13-
node-version: [12.x, 14.x, 16.x]
13+
node-version: [14.x, 16.x, 18.x, 20.x]
1414
steps:
1515
- uses: actions/checkout@v2
1616
- name: Use Node.js ${{ matrix.node-version }}
17-
uses: actions/setup-node@v2
17+
uses: actions/setup-node@v3
1818
with:
1919
node-version: ${{ matrix.node-version }}
2020
cache: 'yarn'
@@ -26,11 +26,11 @@ jobs:
2626
runs-on: ubuntu-latest
2727
strategy:
2828
matrix:
29-
node-version: [12.x, 14.x, 16.x]
29+
node-version: [14.x, 16.x, 18.x, 20.x]
3030
steps:
3131
- uses: actions/checkout@v2
3232
- name: Use Node.js ${{ matrix.node-version }}
33-
uses: actions/setup-node@v2
33+
uses: actions/setup-node@v3
3434
with:
3535
node-version: ${{ matrix.node-version }}
3636
cache: 'yarn'

package.json

+26-21
Original file line numberDiff line numberDiff line change
@@ -18,33 +18,34 @@
1818
"test": "mocha tests/**/*-test.js --exit"
1919
},
2020
"dependencies": {
21-
"chalk": "^1.0.0",
22-
"ember-cli-deploy-plugin": "^0.2.1",
23-
"glob": "^7.1.1",
24-
"rsvp": "^3.5.0"
21+
"@babel/eslint-parser": "^7.21.8",
22+
"chalk": "^4.1.2",
23+
"ember-cli-deploy-plugin": "^0.2.9",
24+
"glob": "^10.2.6",
25+
"rsvp": "^4.8.5"
2526
},
2627
"devDependencies": {
27-
"@ember/optional-features": "^0.7.0",
28-
"chai": "^3.5.0",
29-
"chai-as-promised": "^6.0.0",
30-
"ember-cli": "~3.12.0",
31-
"ember-cli-babel": "^7.7.3",
32-
"ember-cli-htmlbars": "^3.0.1",
28+
"@ember/optional-features": "^2.0.0",
29+
"chai": "^4.3.7",
30+
"chai-as-promised": "^7.1.1",
31+
"ember-cli": "~3.28.6",
32+
"ember-cli-babel": "^7.26.11",
33+
"ember-cli-htmlbars": "^6.2.0",
3334
"ember-cli-release-tag": "^0.1.5",
34-
"ember-maybe-import-regenerator": "^0.1.6",
35-
"ember-source": "~3.12.0",
36-
"eslint": "^6.1.0",
37-
"eslint-plugin-ember": "^6.2.0",
38-
"eslint-plugin-node": "^9.0.1",
39-
"github": "^0.2.4",
40-
"glob": "^7.1.1",
35+
"ember-maybe-import-regenerator": "^1.0.0",
36+
"ember-source": "~3.28.12",
37+
"eslint": "^8.42.0",
38+
"eslint-plugin-ember": "^11.8.0",
39+
"eslint-plugin-node": "^11.1.0",
40+
"github": "^14.0.0",
41+
"glob": "^10.2.6",
4142
"loader.js": "^4.7.0",
42-
"mocha": "^6.2.0",
43-
"release-it": "^14.2.1",
44-
"release-it-lerna-changelog": "^3.1.0"
43+
"mocha": "^6.2.3",
44+
"release-it": "~14.14.3",
45+
"release-it-lerna-changelog": "~3.1.0"
4546
},
4647
"engines": {
47-
"node": "12.* || 14.* || >= 16"
48+
"node": "14.* || 16.* || 18.* || >= 20"
4849
},
4950
"publishConfig": {
5051
"registry": "https://registry.npmjs.org"
@@ -66,5 +67,9 @@
6667
"release": true,
6768
"tokenRef": "GITHUB_AUTH"
6869
}
70+
},
71+
"volta": {
72+
"node": "14.21.3",
73+
"yarn": "1.22.19"
6974
}
7075
}

tests/dummy/app/app.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ import Resolver from './resolver';
33
import loadInitializers from 'ember-load-initializers';
44
import config from './config/environment';
55

6-
const App = Application.extend({
7-
modulePrefix: config.modulePrefix,
8-
podModulePrefix: config.podModulePrefix,
9-
Resolver
10-
});
6+
class App extends Application {
7+
modulePrefix = config.modulePrefix;
8+
podModulePrefix = config.podModulePrefix;
9+
Resolver = Resolver
10+
}
1111

1212
loadInitializers(App, config.modulePrefix);
1313

tests/dummy/app/router.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import EmberRouter from '@ember/routing/router';
22
import config from './config/environment';
33

4-
const Router = EmberRouter.extend({
5-
location: config.locationType,
6-
rootURL: config.rootURL
7-
});
4+
class Router extends EmberRouter {
5+
location = config.locationType;
6+
rootURL = config.rootURL;
7+
}
88

99
Router.map(function() {
1010
});

tests/index-test.js

+18-16
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ describe('build plugin', function() {
1616
mockUi = {
1717
messages: [],
1818
verbose: true,
19+
spinner: {},
1920
startProgress: function() { },
21+
stopProgress: function() { },
2022
write: function() { },
2123
writeLine: function(message) {
2224
this.messages.push(message);
@@ -154,20 +156,20 @@ describe('build plugin', function() {
154156
assert.deepEqual(result, {
155157
distDir: 'tmp/dist-deploy',
156158
distFiles: [
157-
'assets/dummy.css',
158-
'assets/dummy.js',
159-
'assets/dummy.map',
160-
'assets/test-support.js',
161-
'assets/test-support.map',
162-
'assets/tests.js',
163-
'assets/tests.map',
164-
'assets/vendor.css',
165-
'assets/vendor.js',
166-
'assets/vendor.map',
167-
'index.html',
168-
'robots.txt',
169-
'testem.js',
170-
'tests/index.html'
159+
'testem.js',
160+
'robots.txt',
161+
'index.html',
162+
'tests/index.html',
163+
'assets/vendor.map',
164+
'assets/vendor.js',
165+
'assets/vendor.css',
166+
'assets/tests.map',
167+
'assets/tests.js',
168+
'assets/test-support.map',
169+
'assets/test-support.js',
170+
'assets/dummy.map',
171+
'assets/dummy.js',
172+
'assets/dummy.css',
171173
]
172174
});
173175
done();
@@ -185,8 +187,8 @@ describe('build plugin', function() {
185187
assert.deepEqual(result, {
186188
distDir: __dirname + '/fixtures/fake-build-output',
187189
distFiles: [
188-
'assets/inner-example.css',
189-
'top-file-example.js'
190+
'top-file-example.js',
191+
'assets/inner-example.css'
190192
]
191193
});
192194
done();

0 commit comments

Comments
 (0)