Skip to content

Commit a9c4af1

Browse files
authored
Merge pull request #744 from elwayman02/ember-4.9
Ember 4.9 Blueprint Updates
2 parents 287a8ab + 9f38243 commit a9c4af1

File tree

9 files changed

+161
-190
lines changed

9 files changed

+161
-190
lines changed

.ember-cli

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"disableAnalytics": false,
99

1010
/**
11-
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
12-
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
11+
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
12+
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
1313
*/
1414
"isTypeScriptProject": false
1515
}

.npmignore

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
/.travis.yml
2323
/.watchmanconfig
2424
/bower.json
25-
/config/ember-try.js
2625
/CONTRIBUTING.md
2726
/ember-cli-build.js
2827
/testem.js

config/environment.js

-5
This file was deleted.

package.json

+10-8
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
},
1818
"scripts": {
1919
"build": "ember build --environment=production",
20-
"lint": "npm-run-all --print-name --aggregate-output --continue-on-error --parallel \"lint:!(fix|hbs)\"",
21-
"lint:fix": "npm-run-all --print-name --aggregate-output --continue-on-error --parallel \"lint:*:fix\"",
20+
"lint": "concurrently \"npm:lint:*(!fix|hbs)\" --names \"lint:\"",
21+
"lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"",
2222
"lint:hbs": "ember-template-lint .",
2323
"lint:hbs:fix": "ember-template-lint . --fix",
2424
"lint:js": "eslint . --cache",
2525
"lint:js:fix": "eslint . --fix",
2626
"start": "ember serve",
27-
"test": "npm-run-all --print-name \"lint\" \"test:*\"",
27+
"test": "concurrently \"npm:lint\" \"npm:test:*\" --names \"lint,test:\"",
2828
"test:ember": "ember test",
2929
"test:ember-compatibility": "ember try:each"
3030
},
@@ -43,7 +43,8 @@
4343
"@glimmer/component": "^1.1.2",
4444
"@glimmer/tracking": "^1.1.2",
4545
"broccoli-asset-rev": "^3.0.0",
46-
"ember-cli": "~4.8.0",
46+
"concurrently": "^7.6.0",
47+
"ember-cli": "~4.9.0",
4748
"ember-cli-dependency-checker": "^3.3.1",
4849
"ember-cli-deprecation-workflow": "^2.0.0",
4950
"ember-cli-fastboot": "^3.3.2",
@@ -52,7 +53,6 @@
5253
"ember-cli-sri": "^2.1.1",
5354
"ember-cli-terser": "^4.0.2",
5455
"ember-data": "~4.9.1",
55-
"ember-disable-prototype-extensions": "^1.1.3",
5656
"ember-fetch": "^8.1.2",
5757
"ember-load-initializers": "^2.1.2",
5858
"ember-page-title": "^7.0.0",
@@ -61,7 +61,7 @@
6161
"ember-sinon-qunit": "^6.0.0",
6262
"ember-source": "~4.9.1",
6363
"ember-source-channel-url": "^3.0.0",
64-
"ember-template-lint": "^5.1.1",
64+
"ember-template-lint": "^5.2.0",
6565
"ember-try": "^2.0.0",
6666
"eslint": "^8.29.0",
6767
"eslint-config-prettier": "^8.5.0",
@@ -72,9 +72,8 @@
7272
"field-guide": "^2.4.0",
7373
"field-guide-default-template": "^3.0.0",
7474
"loader.js": "^4.7.0",
75-
"npm-run-all": "^4.1.5",
7675
"prember": "^1.1.1",
77-
"prettier": "^2.8.0",
76+
"prettier": "^2.8.1",
7877
"qunit": "^2.19.3",
7978
"qunit-dom": "^2.0.0",
8079
"release-it": "^15.5.1",
@@ -85,6 +84,9 @@
8584
"fastbootDependencies": [
8685
"crypto"
8786
],
87+
"peerDependencies": {
88+
"ember-source": "^3.28.0 || ^4.0.0"
89+
},
8890
"engines": {
8991
"node": "14.* || 16.* || >= 18"
9092
},

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.8.0",
6+
"version": "4.9.0",
77
"blueprints": [
88
{
99
"name": "addon",
File renamed without changes.

tests/dummy/config/environment.js

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ module.exports = function (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)