Skip to content

Commit 44aeacd

Browse files
ef4ef4
committed
ember-cli-update to 6.0.1
1 parent c6cd460 commit 44aeacd

16 files changed

+1761
-2065
lines changed

‎.ember-cli

+2-10
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,7 @@
11
{
22
/**
3-
Ember CLI sends analytics information by default. The data is completely
4-
anonymous, but there are times when you might want to disable this behavior.
5-
6-
Setting `disableAnalytics` to true will prevent any data from being sent.
7-
*/
8-
"disableAnalytics": false,
9-
10-
/**
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.
3+
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
4+
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
135
*/
146
"isTypeScriptProject": false
157
}

‎.eslintignore

+1-12
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,15 @@
11
# unconventional js
22
/blueprints/*/files/
3-
/vendor/
43

54
# compiled output
5+
/declarations/
66
/dist/
7-
/tmp/
87
/public/assets/
98

10-
# dependencies
11-
/bower_components/
12-
/node_modules/
13-
149
# misc
1510
/coverage/
1611
!.*
1712
.*/
18-
.eslintcache
1913

2014
# ember-try
2115
/.node_modules.ember-try/
22-
/bower.json.ember-try
23-
/npm-shrinkwrap.json.ember-try
24-
/package.json.ember-try
25-
/package-lock.json.ember-try
26-
/yarn.lock.ember-try

‎.eslintrc.js

+9-11
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,15 @@
22

33
module.exports = {
44
root: true,
5-
parser: 'babel-eslint',
5+
parser: '@babel/eslint-parser',
66
parserOptions: {
7-
ecmaVersion: 2018,
7+
ecmaVersion: 'latest',
88
sourceType: 'module',
9-
ecmaFeatures: {
10-
legacyDecorators: true,
9+
requireConfigFile: false,
10+
babelOptions: {
11+
plugins: [
12+
['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }],
13+
],
1114
},
1215
},
1316
plugins: ['ember'],
@@ -26,6 +29,7 @@ module.exports = {
2629
files: [
2730
'./.eslintrc.js',
2831
'./.prettierrc.js',
32+
'./.stylelintrc.js',
2933
'./.template-lintrc.js',
3034
'./ember-cli-build.js',
3135
'./testem.js',
@@ -42,13 +46,7 @@ module.exports = {
4246
browser: false,
4347
node: true,
4448
},
45-
plugins: ['node'],
46-
extends: ['plugin:node/recommended'],
47-
rules: {
48-
// this can be removed once the following is fixed
49-
// https://github.com/mysticatea/eslint-plugin-node/issues/77
50-
'node/no-unpublished-require': 'off',
51-
},
49+
extends: ['plugin:n/recommended'],
5250
},
5351
{
5452
// test files

‎.gitignore

+1-8
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,22 @@
1-
# See https://help.github.com/ignore-files/ for more about ignoring files.
2-
31
# compiled output
42
/dist/
5-
/tmp/
3+
/declarations/
64

75
# dependencies
8-
/bower_components/
96
/node_modules/
107

118
# misc
129
/.env*
1310
/.pnp*
14-
/.sass-cache
1511
/.eslintcache
16-
/connect.lock
1712
/coverage/
18-
/libpeerconnection.log
1913
/npm-debug.log*
2014
/testem.log
2115
/yarn-error.log
2216
.DS_Store
2317

2418
# ember-try
2519
/.node_modules.ember-try/
26-
/bower.json.ember-try
2720
/npm-shrinkwrap.json.ember-try
2821
/package.json.ember-try
2922
/package-lock.json.ember-try

‎.prettierignore

+1-13
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,13 @@
11
# unconventional js
22
/blueprints/*/files/
3-
/vendor/
43

54
# compiled output
65
/dist/
7-
/tmp/
8-
9-
# dependencies
10-
/bower_components/
11-
/node_modules/
126

137
# misc
148
/coverage/
159
!.*
16-
.eslintcache
17-
.lint-todo/
10+
.*/
1811

1912
# ember-try
2013
/.node_modules.ember-try/
21-
/bower.json.ember-try
22-
/npm-shrinkwrap.json.ember-try
23-
/package.json.ember-try
24-
/package-lock.json.ember-try
25-
/yarn.lock.ember-try

‎.prettierrc.js

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

33
module.exports = {
4-
singleQuote: true,
4+
overrides: [
5+
{
6+
files: '*.{js,ts}',
7+
options: {
8+
singleQuote: true,
9+
},
10+
},
11+
],
512
};

‎.stylelintignore

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# unconventional files
2+
/blueprints/*/files/
3+
4+
# compiled output
5+
/dist/
6+
7+
# addons
8+
/.node_modules.ember-try/

‎.stylelintrc.js

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
'use strict';
2+
3+
module.exports = {
4+
extends: ['stylelint-config-standard', 'stylelint-prettier/recommended'],
5+
};

‎.watchmanconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"ignore_dirs": ["tmp", "dist"]
2+
"ignore_dirs": ["dist"]
33
}

‎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.4.1",
6+
"version": "6.0.1",
77
"blueprints": [
88
{
99
"name": "app",

‎config/environment.js

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

33
module.exports = function (environment) {
4-
let ENV = {
4+
const ENV = {
55
modulePrefix: 'ember-guides',
66
environment,
77
rootURL: '/',
88
locationType: 'trailing-history',
99
historySupportMiddleware: true,
1010

1111
EmberENV: {
12+
EXTEND_PROTOTYPES: false,
1213
FEATURES: {
1314
// Here you can enable experimental features on an ember canary build
1415
// e.g. 'with-controller': true
1516
},
16-
EXTEND_PROTOTYPES: {
17-
// Prevent Ember Data from overriding Date.parse.
18-
Date: false,
19-
},
2017
},
2118

2219
APP: {

‎config/optional-features.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22
"application-template-wrapper": false,
33
"default-async-observers": true,
44
"jquery-integration": false,
5-
"template-only-glimmer-components": true
5+
"template-only-glimmer-components": true,
6+
"no-implicit-route-model": true
67
}

‎ember-cli-build.js

+1-14
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ if (!process.env.ALL_VERSIONS) {
1515
}
1616

1717
module.exports = function (defaults) {
18-
let app = new EmberApp(defaults, {
18+
const app = new EmberApp(defaults, {
1919
fingerprint: {
2020
extensions: ['js', 'css', 'map'],
2121
exclude: ['downloads'],
@@ -39,19 +39,6 @@ module.exports = function (defaults) {
3939
},
4040
});
4141

42-
// Use `app.import` to add additional libraries to the generated
43-
// output files.
44-
//
45-
// If you need to use different assets in different
46-
// environments, specify an object as the first parameter. That
47-
// object's keys should be the environment name and the values
48-
// should be the asset to use in that environment.
49-
//
50-
// If the library that you are including contains AMD or ES6
51-
// modules that you would like to import into your application
52-
// please specify an object with the list of modules as keys
53-
// along with the exports of each module as its value.
54-
5542
return app.toTree();
5643
};
5744

‎package.json

+40-30
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,15 @@
2323
"scripts": {
2424
"build": "ember build --environment=production",
2525
"build:prebuilt": "node ./scripts/update-prebuild.mjs",
26-
"lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
27-
"lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix",
26+
"lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
27+
"lint:css": "stylelint \"**/*.css\"",
28+
"lint:css:fix": "concurrently \"npm:lint:css -- --fix\"",
29+
"lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"",
2830
"lint:js": "eslint . --cache",
2931
"lint:md": "remark . --frail --quiet",
3032
"lint:js:fix": "eslint . --fix",
3133
"start": "ember serve",
32-
"test": "npm-run-all lint test:*",
34+
"test": "concurrently \"npm:lint\" \"npm:test:*\" --names \"lint,test:\"",
3335
"test:ember": "ember test",
3436
"test:node": "mocha node-tests --exclude node-tests/local/**",
3537
"test:node-local": "mocha node-tests/local",
@@ -39,51 +41,56 @@
3941
"release:search": "scripts/update-search-index"
4042
},
4143
"devDependencies": {
42-
"@ember/optional-features": "^2.0.0",
43-
"@ember/test-helpers": "^2.7.0",
44+
"@babel/core": "^7.26.0",
45+
"@babel/eslint-parser": "^7.25.9",
46+
"@babel/plugin-proposal-decorators": "^7.25.9",
4447
"@ember-data/adapter": "^4.12.0",
4548
"@ember-data/model": "^4.12.0",
4649
"@ember-data/serializer": "^4.12.0",
50+
"@ember/optional-features": "^2.2.0",
51+
"@ember/string": "^4.0.0",
52+
"@ember/test-helpers": "^4.0.4",
4753
"@glimmer/component": "^1.1.2",
4854
"@glimmer/tracking": "^1.1.2",
4955
"@percy/cli": "^1.21.0",
5056
"@percy/ember": "^3.0.1",
51-
"babel-eslint": "^10.1.0",
5257
"broccoli-asset-rev": "^3.0.0",
5358
"chai": "^4.3.4",
5459
"commander": "^11.1.0",
5560
"compare-versions": "^6.0.0-rc.2",
56-
"ember-auto-import": "^2.7.2",
57-
"ember-cli": "~4.4.1",
58-
"ember-cli-babel": "^7.26.11",
59-
"ember-cli-dependency-checker": "^3.3.1",
61+
"concurrently": "^8.2.2",
62+
"ember-auto-import": "^2.10.0",
63+
"ember-cli": "~6.0.1",
64+
"ember-cli-babel": "^8.2.0",
65+
"ember-cli-clean-css": "^3.0.0",
66+
"ember-cli-dependency-checker": "^3.3.2",
6067
"ember-cli-deploy": "^1.0.2",
6168
"ember-cli-deploy-build": "^2.0.0",
6269
"ember-cli-deploy-prember-algolia": "^1.0.1",
6370
"ember-cli-fastboot": "^4.1.2",
64-
"ember-cli-htmlbars": "^6.0.1",
71+
"ember-cli-htmlbars": "^6.3.0",
6572
"ember-cli-inject-live-reload": "^2.1.0",
6673
"ember-cli-netlify": "^0.4.1",
6774
"ember-cli-sri": "^2.1.1",
6875
"ember-cli-terser": "^4.0.2",
69-
"ember-data": "~4.12.0",
76+
"ember-data": "~5.3.9",
7077
"ember-dictionary": "^0.2.6",
71-
"ember-export-application-global": "^2.0.1",
72-
"ember-fetch": "^8.1.1",
78+
"ember-fetch": "^8.1.2",
7379
"ember-load-initializers": "^2.1.2",
7480
"ember-metrics": "^1.5.2",
75-
"ember-page-title": "^7.0.0",
76-
"ember-qunit": "^5.1.5",
77-
"ember-resolver": "^8.0.3",
78-
"ember-source": "~4.4.0",
81+
"ember-modifier": "^4.2.0",
82+
"ember-page-title": "^8.2.3",
83+
"ember-qunit": "^8.1.1",
84+
"ember-resolver": "^12.0.1",
85+
"ember-source": "~6.0.0",
7986
"ember-test-selectors": "^6.0.0",
80-
"eslint": "^7.32.0",
87+
"eslint": "^8.57.1",
8188
"eslint-config-airbnb-base": "^14.2.1",
82-
"eslint-config-prettier": "^8.5.0",
83-
"eslint-plugin-ember": "^10.6.1",
84-
"eslint-plugin-node": "^11.1.0",
85-
"eslint-plugin-prettier": "^4.0.0",
86-
"eslint-plugin-qunit": "^7.2.0",
89+
"eslint-config-prettier": "^9.1.0",
90+
"eslint-plugin-ember": "^12.3.1",
91+
"eslint-plugin-n": "^16.6.2",
92+
"eslint-plugin-prettier": "^5.2.1",
93+
"eslint-plugin-qunit": "^8.1.2",
8794
"gfm-code-blocks": "^1.0.0",
8895
"guidemaker": "^4.0.3",
8996
"guidemaker-ember-template": "^4.0.1",
@@ -92,11 +99,10 @@
9299
"markdown-link-extractor": "1.2.3",
93100
"mocha": "^10.1.0",
94101
"node-fetch": "^2.6.7",
95-
"npm-run-all": "^4.1.5",
96102
"prember": "^2.0.0",
97-
"prettier": "^2.6.2",
98-
"qunit": "^2.19.1",
99-
"qunit-dom": "^2.0.0",
103+
"prettier": "^3.3.3",
104+
"qunit": "^2.22.0",
105+
"qunit-dom": "^3.3.0",
100106
"remark-cli": "^8.0.0",
101107
"remark-lint": "^7.0.0",
102108
"remark-preset-lint-consistent": "^3.0.0",
@@ -111,12 +117,16 @@
111117
"retext-syntax-urls": "^2.0.0",
112118
"shelljs": "^0.8.5",
113119
"showdown": "^2.1.0",
120+
"stylelint": "^15.11.0",
121+
"stylelint-config-standard": "^34.0.0",
122+
"stylelint-prettier": "^4.1.0",
123+
"tracked-built-ins": "^3.3.0",
114124
"unified": "^9.2.1",
115125
"walk-sync": "^2.0.2",
116-
"webpack": "^5.72.1"
126+
"webpack": "^5.96.1"
117127
},
118128
"engines": {
119-
"node": "16.* || 18.* || >= 20"
129+
"node": ">= 18"
120130
},
121131
"ember": {
122132
"edition": "octane"

0 commit comments

Comments
 (0)