Skip to content

Commit d65d66f

Browse files
authored
upgrade blueprints to Ember CLI 4.9 (#143)
1 parent f77e2dd commit d65d66f

9 files changed

+69
-184
lines changed

.npmignore

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
/.watchmanconfig
2525
/bower.json
2626
/CHANGELOG.md
27-
/config/ember-try.js
2827
/CONTRIBUTING.md
2928
/ember-cli-build.js
3029
/jsconfig.json

config/environment.js

-5
This file was deleted.

ember-cli-build.js

+1-1
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
autoImport: {
88
forbidEval: true,
99
},

package.json

+19-17
Original file line numberDiff line numberDiff line change
@@ -14,64 +14,66 @@
1414
},
1515
"scripts": {
1616
"build": "ember build --environment=production",
17-
"lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
18-
"lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix",
17+
"lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
18+
"lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"",
1919
"lint:hbs": "ember-template-lint .",
2020
"lint:hbs:fix": "ember-template-lint . --fix",
2121
"lint:js": "eslint . --cache",
2222
"release": "release-it",
2323
"lint:js:fix": "eslint . --fix",
2424
"start": "ember serve",
25-
"test": "npm-run-all lint test:*",
25+
"test": "concurrently \"npm:lint\" \"npm:test:*\" --names \"lint,test:\"",
2626
"test:ember": "ember test",
2727
"test:ember-compatibility": "ember try:each"
2828
},
2929
"dependencies": {
30+
"ember-auto-import": "^2.5.0",
3031
"ember-cli-babel": "^7.26.11",
31-
"ember-auto-import": "^2.4.2",
3232
"ember-modifier": "^3.2.7 || ^4.0.0"
3333
},
3434
"devDependencies": {
3535
"@ember/optional-features": "^2.0.0",
3636
"@ember/test-helpers": "^2.8.1",
37-
"@embroider/test-setup": "^2.0.0",
37+
"@embroider/test-setup": "^2.0.2",
3838
"@glimmer/component": "^1.1.2",
3939
"@glimmer/tracking": "^1.1.2",
4040
"babel-eslint": "^10.1.0",
4141
"broccoli-asset-rev": "^3.0.0",
42-
"ember-cli": "~4.9.0",
42+
"concurrently": "^7.6.0",
43+
"ember-cli": "~4.9.2",
4344
"ember-cli-content-security-policy": "^2.0.3",
4445
"ember-cli-dependency-checker": "^3.3.1",
45-
"ember-cli-htmlbars": "^6.1.0",
46+
"ember-cli-htmlbars": "^6.1.1",
4647
"ember-cli-inject-live-reload": "^2.1.0",
4748
"ember-cli-sri": "^2.1.1",
4849
"ember-cli-terser": "^4.0.2",
49-
"ember-disable-prototype-extensions": "^1.1.3",
5050
"ember-load-initializers": "^2.1.2",
5151
"ember-page-title": "^7.0.0",
5252
"ember-qunit": "^6.0.0",
5353
"ember-resolver": "^10.0.0",
54-
"ember-source": "~4.9.0",
54+
"ember-source": "~4.9.1",
5555
"ember-source-channel-url": "^3.0.0",
56-
"ember-template-lint": "^5.0.0",
56+
"ember-template-lint": "^5.2.0",
5757
"ember-try": "^2.0.0",
5858
"eslint": "^7.32.0",
5959
"eslint-config-prettier": "^8.5.0",
60-
"eslint-plugin-ember": "^11.0.6",
60+
"eslint-plugin-ember": "^11.2.1",
6161
"eslint-plugin-node": "^11.1.0",
6262
"eslint-plugin-prettier": "^4.2.1",
63-
"eslint-plugin-qunit": "^7.3.1",
63+
"eslint-plugin-qunit": "^7.3.4",
6464
"loader.js": "^4.7.0",
65-
"npm-run-all": "^4.1.5",
66-
"prettier": "^2.7.1",
67-
"qunit": "^2.19.1",
65+
"prettier": "^2.8.1",
66+
"qunit": "^2.19.3",
6867
"qunit-dom": "^2.0.0",
6968
"release-it": "^15.0.0",
7069
"release-it-lerna-changelog": "^5.0.0",
71-
"webpack": "^5.74.0"
70+
"webpack": "^5.75.0"
71+
},
72+
"peerDependencies": {
73+
"ember-source": "^3.28.0 || ^4.0.0"
7274
},
7375
"engines": {
74-
"node": "14.* || >= 16"
76+
"node": "14.* || 16.* || >= 18"
7577
},
7678
"publishConfig": {
7779
"registry": "https://registry.npmjs.org"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"packages": [
44
{
55
"name": "ember-cli",
6-
"version": "4.7.0",
6+
"version": "4.9.2",
77
"blueprints": [
88
{
99
"name": "addon",
File renamed without changes.

tests/dummy/config/environment.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
'use strict';
22

33
module.exports = function (environment) {
4-
let ENV = {
4+
const ENV = {
55
modulePrefix: 'dummy',
66
environment,
77
rootURL: '/',
88
locationType: 'history',
99
EmberENV: {
10+
EXTEND_PROTOTYPES: false,
1011
FEATURES: {
1112
// Here you can enable experimental features on an ember canary build
1213
// e.g. EMBER_NATIVE_DECORATOR_SUPPORT: true

vendor/.gitkeep

Whitespace-only changes.

0 commit comments

Comments
 (0)