Skip to content

Commit 6c1fff9

Browse files
committed
update to v4.8 with ember-cli-update
1 parent bb546b9 commit 6c1fff9

File tree

7 files changed

+33
-25
lines changed

7 files changed

+33
-25
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ jobs:
1515
test:
1616
name: "Tests"
1717
runs-on: ubuntu-latest
18+
timeout-minutes: 10
1819

1920
steps:
2021
- uses: actions/checkout@v3
@@ -33,6 +34,7 @@ jobs:
3334
floating:
3435
name: "Floating Dependencies"
3536
runs-on: ubuntu-latest
37+
timeout-minutes: 10
3638

3739
steps:
3840
- uses: actions/checkout@v3
@@ -49,6 +51,7 @@ jobs:
4951
name: ${{ matrix.try-scenario }}
5052
runs-on: ubuntu-latest
5153
needs: "test"
54+
timeout-minutes: 10
5255

5356
strategy:
5457
fail-fast: false
@@ -57,6 +60,8 @@ jobs:
5760
- ember-lts-3.16
5861
- ember-lts-3.20
5962
- ember-lts-3.24
63+
- ember-lts-3.28
64+
- ember-lts-4.4
6065
- ember-release
6166
- ember-beta
6267
- ember-canary

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ The hope is that, in the future, Ember will provide a mechanism for populating `
99
## Compatibility
1010

1111
* Ember.js v3.16 or above
12-
* Ember CLI v2.13 or above
12+
* Ember CLI v3.16 or above
1313
* Node.js v12 or above
1414

1515

config/ember-try.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,14 @@ module.exports = async function () {
3838
},
3939
},
4040
},
41+
{
42+
name: 'ember-lts-4.4',
43+
npm: {
44+
devDependencies: {
45+
'ember-source': '~4.4.0',
46+
},
47+
},
48+
},
4149
{
4250
name: 'ember-release',
4351
npm: {

ember-cli-build.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
44

55
module.exports = function (defaults) {
6-
let app = new EmberAddon(defaults, {
6+
const app = new EmberAddon(defaults, {
77
// Add options here
88
});
99

package.json

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,66 +20,65 @@
2020
},
2121
"scripts": {
2222
"build": "ember build --environment=production",
23-
"lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
24-
"lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix",
23+
"lint": "npm-run-all --print-name --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
24+
"lint:fix": "npm-run-all --print-name --aggregate-output --continue-on-error --parallel \"lint:*:fix\"",
2525
"lint:hbs": "ember-template-lint .",
2626
"lint:hbs:fix": "ember-template-lint . --fix",
2727
"lint:js": "eslint . --cache",
2828
"lint:js:fix": "eslint . --fix",
2929
"start": "ember serve",
30-
"test": "npm-run-all lint test:*",
30+
"test": "npm-run-all --print-name \"lint\" \"test:*\"",
3131
"test:ember": "ember test",
3232
"ember-compatibility-tests": "ember try:each"
3333
},
3434
"dependencies": {
3535
"ember-cli-babel": "^7.26.11",
36-
"ember-cli-htmlbars": "^6.0.1",
36+
"ember-cli-htmlbars": "^6.1.1",
3737
"ember-in-element-polyfill": "^1.0.0"
3838
},
3939
"devDependencies": {
4040
"@ember/optional-features": "^2.0.0",
41-
"@ember/test-helpers": "^2.7.0",
42-
"@embroider/test-setup": "^1.6.0",
41+
"@ember/test-helpers": "^2.8.1",
42+
"@embroider/test-setup": "^1.8.3",
4343
"@glimmer/component": "^1.1.2",
4444
"@glimmer/tracking": "^1.1.2",
4545
"babel-eslint": "^10.1.0",
4646
"broccoli-asset-rev": "^3.0.0",
4747
"chai": "^4.2.0",
4848
"ember-auto-import": "^2.6.3",
49-
"ember-cli": "~4.4.1",
49+
"ember-cli": "~4.8.0",
5050
"ember-cli-dependency-checker": "^3.3.1",
5151
"ember-cli-fastboot": "^4.1.1",
5252
"ember-cli-fastboot-testing": "^0.5.0",
5353
"ember-cli-inject-live-reload": "^2.1.0",
5454
"ember-cli-sri": "^2.1.1",
5555
"ember-cli-terser": "^4.0.2",
5656
"ember-disable-prototype-extensions": "^1.1.3",
57-
"ember-export-application-global": "^2.0.1",
5857
"ember-load-initializers": "^2.1.2",
5958
"ember-page-title": "^7.0.0",
60-
"ember-qunit": "^5.1.5",
59+
"ember-qunit": "^6.0.0",
6160
"ember-resolver": "^8.0.3",
62-
"ember-source": "~4.4.0",
61+
"ember-source": "~4.8.0",
6362
"ember-source-channel-url": "^3.0.0",
64-
"ember-template-lint": "^4.8.0",
63+
"ember-template-lint": "^4.16.1",
6564
"ember-try": "^2.0.0",
6665
"eslint": "^7.32.0",
6766
"eslint-config-prettier": "^8.5.0",
68-
"eslint-plugin-ember": "^10.6.1",
67+
"eslint-plugin-ember": "^11.1.0",
6968
"eslint-plugin-node": "^11.1.0",
70-
"eslint-plugin-prettier": "^4.0.0",
71-
"eslint-plugin-qunit": "^7.2.0",
69+
"eslint-plugin-prettier": "^4.2.1",
70+
"eslint-plugin-qunit": "^7.3.1",
7271
"loader.js": "^4.7.0",
7372
"npm-run-all": "^4.1.5",
74-
"prettier": "^2.6.2",
75-
"qunit": "^2.19.1",
73+
"prettier": "^2.7.1",
74+
"qunit": "^2.19.2",
7675
"qunit-dom": "^2.0.0",
7776
"release-it": "^14.2.1",
7877
"release-it-lerna-changelog": "^3.1.0",
7978
"webpack": "^5.85.0"
8079
},
8180
"engines": {
82-
"node": "12.* || 14.* || >= 16"
81+
"node": "12.* || 14.* || 16.* || >= 18"
8382
},
8483
"publishConfig": {
8584
"registry": "https://registry.npmjs.org"

tests/dummy/config/ember-cli-update.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"packages": [
44
{
55
"name": "ember-cli",
6-
"version": "4.4.1",
6+
"version": "4.8.0",
77
"blueprints": [
88
{
99
"name": "addon",

tests/dummy/config/environment.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22

33
module.exports = function (environment) {
4-
let ENV = {
4+
const ENV = {
55
modulePrefix: 'dummy',
66
environment,
77
rootURL: '/',
@@ -11,10 +11,6 @@ module.exports = function (environment) {
1111
// Here you can enable experimental features on an ember canary build
1212
// e.g. EMBER_NATIVE_DECORATOR_SUPPORT: true
1313
},
14-
EXTEND_PROTOTYPES: {
15-
// Prevent Ember Data from overriding Date.parse.
16-
Date: false,
17-
},
1814
},
1915

2016
APP: {

0 commit comments

Comments
 (0)