Skip to content

Commit 038bd02

Browse files
mansonamansona
authored
Merge pull request #935 from ember-fastboot/update-ember-more
update to Ember 5.8 using ember-cli-update
2 parents 1e6ed03 + a2e0854 commit 038bd02

File tree

13 files changed

+1535
-835
lines changed

13 files changed

+1535
-835
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,8 @@ jobs:
131131
- ember-lts-3.28
132132
- ember-lts-4.4
133133
- ember-lts-4.8
134+
- ember-lts-4.12
135+
- ember-lts-5.4
134136
- ember-release
135137
- ember-beta
136138
- ember-canary

‎packages/ember-cli-fastboot/.ember-cli‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,4 @@
11
{
2-
/**
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-
102
/**
113
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
124
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.

‎packages/ember-cli-fastboot/.eslintignore‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,14 @@
11
# unconventional js
22
/blueprints/*/files/
3-
/vendor/
43

54
# compiled output
5+
/declarations/
66
/dist/
7-
/tmp/
8-
9-
# dependencies
10-
/bower_components/
11-
/node_modules/
127

138
# misc
149
/coverage/
1510
!.*
1611
.*/
17-
.eslintcache
1812

1913
# ember-try
2014
/.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

‎packages/ember-cli-fastboot/.gitignore‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,21 @@
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

2317
# ember-try
2418
/.node_modules.ember-try/
25-
/bower.json.ember-try
2619
/npm-shrinkwrap.json.ember-try
2720
/package.json.ember-try
2821
/package-lock.json.ember-try

‎packages/ember-cli-fastboot/.npmignore‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@
22
/dist/
33
/tmp/
44

5-
# dependencies
6-
/bower_components/
7-
85
# misc
9-
/.bowerrc
106
/.editorconfig
117
/.ember-cli
128
/.env*
@@ -23,19 +19,19 @@
2319
/.template-lintrc.js
2420
/.travis.yml
2521
/.watchmanconfig
26-
/bower.json
2722
/CONTRIBUTING.md
2823
/ember-cli-build.js
2924
/testem.js
3025
/test/
3126
/tests/
27+
/tsconfig.declarations.json
28+
/tsconfig.json
3229
/yarn-error.log
3330
/yarn.lock
3431
.gitkeep
3532

3633
# ember-try
3734
/.node_modules.ember-try/
38-
/bower.json.ember-try
3935
/npm-shrinkwrap.json.ember-try
4036
/package.json.ember-try
4137
/package-lock.json.ember-try

‎packages/ember-cli-fastboot/.prettierignore‎

Lines changed: 1 addition & 13 deletions
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

‎packages/ember-cli-fastboot/.watchmanconfig‎

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

‎packages/ember-cli-fastboot/package.json‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -49,51 +49,51 @@
4949
"silent-error": "^1.1.1"
5050
},
5151
"devDependencies": {
52-
"@babel/eslint-parser": "^7.21.3",
53-
"@babel/plugin-proposal-decorators": "^7.21.0",
54-
"@ember/optional-features": "^2.0.0",
55-
"@ember/string": "^3.1.1",
56-
"@ember/test-helpers": "^2.9.3",
52+
"@babel/eslint-parser": "^7.24.1",
53+
"@babel/plugin-proposal-decorators": "^7.24.1",
54+
"@ember/optional-features": "^2.1.0",
55+
"@ember/test-helpers": "^3.3.0",
5756
"@embroider/test-setup": "^3.0.3",
5857
"@glimmer/component": "^1.1.2",
5958
"@glimmer/tracking": "^1.1.2",
6059
"broccoli-asset-rev": "^3.0.0",
6160
"broccoli-test-helper": "^1.5.0",
62-
"concurrently": "^8.0.1",
63-
"ember-auto-import": "^2.6.3",
64-
"ember-cli": "~4.12.3",
65-
"ember-cli-dependency-checker": "^3.3.1",
66-
"ember-cli-htmlbars": "^6.2.0",
61+
"concurrently": "^8.2.2",
62+
"ember-auto-import": "^2.7.2",
63+
"ember-cli": "~5.8.1",
64+
"ember-cli-clean-css": "^3.0.0",
65+
"ember-cli-dependency-checker": "^3.3.2",
66+
"ember-cli-htmlbars": "^6.3.0",
6767
"ember-cli-inject-live-reload": "^2.1.0",
6868
"ember-cli-sri": "^2.1.1",
6969
"ember-cli-terser": "^4.0.2",
7070
"ember-load-initializers": "^2.1.2",
71-
"ember-page-title": "^7.0.0",
72-
"ember-qunit": "^6.2.0",
73-
"ember-resolver": "^10.0.0",
74-
"ember-source": "~4.12.0",
71+
"ember-page-title": "^8.2.3",
72+
"ember-qunit": "^8.0.2",
73+
"ember-resolver": "^11.0.1",
74+
"ember-source": "~5.8.0",
7575
"ember-source-channel-url": "^3.0.0",
76-
"ember-template-lint": "^5.7.2",
76+
"ember-template-lint": "^5.13.0",
7777
"ember-try": "^3.0.0",
78-
"eslint": "^8.37.0",
79-
"eslint-config-prettier": "^8.8.0",
80-
"eslint-plugin-ember": "^11.5.0",
81-
"eslint-plugin-n": "^15.7.0",
82-
"eslint-plugin-prettier": "^4.2.1",
83-
"eslint-plugin-qunit": "^7.3.4",
78+
"eslint": "^8.57.0",
79+
"eslint-config-prettier": "^9.1.0",
80+
"eslint-plugin-ember": "^11.12.0",
81+
"eslint-plugin-n": "^16.6.2",
82+
"eslint-plugin-prettier": "^5.1.3",
83+
"eslint-plugin-qunit": "^8.1.1",
8484
"glob": "^7.1.3",
8585
"lint-to-the-future": "^2.0.0",
8686
"lint-to-the-future-eslint": "^2.0.1",
8787
"loader.js": "^4.7.0",
8888
"mocha": "^9.1.2",
89-
"prettier": "^2.8.7",
90-
"qunit": "^2.19.4",
89+
"prettier": "^3.2.5",
90+
"qunit": "^2.20.1",
9191
"qunit-dom": "^2.0.0",
9292
"sinon": "^17.0.1",
93-
"stylelint": "^15.4.0",
94-
"stylelint-config-standard": "^32.0.0",
95-
"stylelint-prettier": "^3.0.0",
96-
"webpack": "^5.90.1"
93+
"stylelint": "^15.11.0",
94+
"stylelint-config-standard": "^34.0.0",
95+
"stylelint-prettier": "^4.1.0",
96+
"webpack": "^5.91.0"
9797
},
9898
"peerDependencies": {
9999
"ember-source": "^4.0.0"

‎packages/ember-cli-fastboot/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.12.3",
6+
"version": "5.8.1",
77
"blueprints": [
88
{
99
"name": "addon",

‎packages/ember-cli-fastboot/tests/dummy/config/ember-try.js‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ module.exports = async function () {
1313
devDependencies: {
1414
'ember-source': '~3.16.0',
1515
'ember-qunit': '^5.0.0',
16+
'ember-cli': '^4.12.0',
17+
'@ember/test-helpers': '^2.4.0',
1618
},
1719
},
1820
},
@@ -22,6 +24,8 @@ module.exports = async function () {
2224
devDependencies: {
2325
'ember-source': '~3.20.5',
2426
'ember-qunit': '^5.0.0',
27+
'ember-cli': '^4.12.0',
28+
'@ember/test-helpers': '^2.4.0',
2529
},
2630
},
2731
},
@@ -31,6 +35,8 @@ module.exports = async function () {
3135
devDependencies: {
3236
'ember-source': '~3.24.3',
3337
'ember-qunit': '^5.0.0',
38+
'ember-cli': '^4.12.0',
39+
'@ember/test-helpers': '^2.4.0',
3440
},
3541
},
3642
},
@@ -39,6 +45,7 @@ module.exports = async function () {
3945
npm: {
4046
devDependencies: {
4147
'ember-source': '~3.28.0',
48+
'ember-cli': '^4.12.0',
4249
},
4350
},
4451
},
@@ -58,6 +65,22 @@ module.exports = async function () {
5865
},
5966
},
6067
},
68+
{
69+
name: 'ember-lts-4.12',
70+
npm: {
71+
devDependencies: {
72+
'ember-source': '~4.12.0',
73+
},
74+
},
75+
},
76+
{
77+
name: 'ember-lts-5.4',
78+
npm: {
79+
devDependencies: {
80+
'ember-source': '~5.4.0',
81+
},
82+
},
83+
},
6184
{
6285
name: 'ember-release',
6386
npm: {

0 commit comments

Comments
 (0)