Skip to content

Commit 8583dde

Browse files
Ember 4.8, require Ember 3.28+ (#1363)
* Ember 4.8, bump ember-auto-import * Ember 4.8 * Update ember-classy-page-object * Bump some deps * Remove unused deps from test apps * Yarn upgrade * Add ember-lts-4.4
1 parent b99e325 commit 8583dde

File tree

14 files changed

+3333
-3124
lines changed

14 files changed

+3333
-3124
lines changed

.ember-cli

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,11 @@
55

66
Setting `disableAnalytics` to true will prevent any data from being sent.
77
*/
8-
"disableAnalytics": false
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.
13+
*/
14+
"isTypeScriptProject": false
915
}

.github/workflows/ci-cd.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ jobs:
9696
fail-fast: false
9797
matrix:
9898
try-scenario:
99-
# - 'ember-lts-3.24'
10099
- 'ember-lts-3.28'
100+
- 'ember-lts-4.4'
101101
- 'ember-release'
102102
- 'ember-beta'
103103
- 'ember-canary'

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@
2929
/package-lock.json.ember-try
3030
/yarn.lock.ember-try
3131

32+
# broccoli-debug
33+
/DEBUG/
34+
3235
# intellij
3336
/.idea/
3437
ember-cli-addon-docs.iml

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@
2222
* `ember serve`
2323
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).
2424

25-
For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
25+
For more information on using ember-cli, visit [https://cli.emberjs.com/release/](https://cli.emberjs.com/release/).

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ ember-cli-addon-docs
99
Compatibility
1010
------------------------------------------------------------------------------
1111

12-
* Ember.js v3.24 or above
13-
* Ember CLI v3.24 or above
12+
* Ember.js v3.28 or above
13+
* Ember CLI v3.28 or above
1414
* Node.js v14 or above
1515

1616
The original maintainers of AddonDocs have moved on, but this addon is still very much actively maintained and is still being used by many addons.

config/ember-try.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@ module.exports = async function () {
88
useYarn: true,
99
scenarios: [
1010
{
11-
name: 'ember-lts-3.24',
11+
name: 'ember-lts-3.28',
1212
npm: {
1313
devDependencies: {
14-
'ember-source': '~3.24.3',
14+
'ember-source': '~3.28.0',
1515
},
1616
},
1717
},
1818
{
19-
name: 'ember-lts-3.28',
19+
name: 'ember-lts-4.4',
2020
npm: {
2121
devDependencies: {
22-
'ember-source': '~3.28.0',
22+
'ember-source': '~4.4.0',
2323
},
2424
},
2525
},

package.json

Lines changed: 27 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616
"scripts": {
1717
"build": "ember build --environment=production",
1818
"deploy": "ember deploy production",
19-
"lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
20-
"lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix",
19+
"lint": "npm-run-all --print-name --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
20+
"lint:fix": "npm-run-all --print-name --aggregate-output --continue-on-error --parallel \"lint:*:fix\"",
2121
"lint:hbs": "ember-template-lint .",
2222
"lint:hbs:fix": "ember-template-lint . --fix",
2323
"lint:js": "eslint . --cache",
2424
"prepare": "./scripts/link-them.sh",
2525
"lint:js:fix": "eslint . --fix",
2626
"start": "ember serve",
27-
"test": "npm-run-all lint test:*",
27+
"test": "npm-run-all --print-name \"lint\" \"test:*\"",
2828
"test:ember": "ember test --test-port=0",
2929
"test:node": "mocha tests-node --recursive",
3030
"test:test-apps": "cd test-apps/new-addon && yarn test"
@@ -33,9 +33,9 @@
3333
"@csstools/postcss-sass": "^5.0.0",
3434
"@ember/render-modifiers": "^2.0.0",
3535
"@ember/test-waiters": "^3.0.0",
36-
"@glimmer/component": "^1.0.4",
36+
"@glimmer/component": "^1.1.2",
3737
"@glimmer/syntax": "^0.84.0",
38-
"@glimmer/tracking": "^1.0.4",
38+
"@glimmer/tracking": "^1.1.2",
3939
"@handlebars/parser": "^2.1.0",
4040
"broccoli-bridge": "^1.0.0",
4141
"broccoli-caching-writer": "^3.0.3",
@@ -47,11 +47,11 @@
4747
"broccoli-source": "^3.0.0",
4848
"broccoli-stew": "^3.0.0",
4949
"chalk": "4.1.2",
50-
"ember-auto-import": "^2.4.0",
50+
"ember-auto-import": "^2.5.0",
5151
"ember-cli-autoprefixer": "^2.0.0",
5252
"ember-cli-babel": "^7.26.11",
5353
"ember-cli-clipboard": "^0.16.0",
54-
"ember-cli-htmlbars": "^6.0.1",
54+
"ember-cli-htmlbars": "^6.1.1",
5555
"ember-cli-postcss": "^8.0.0",
5656
"ember-cli-string-helpers": "^6.1.0",
5757
"ember-cli-string-utils": "^1.1.0",
@@ -66,7 +66,7 @@
6666
"ember-router-generator": "^2.0.0",
6767
"ember-router-scroll": "^4.1.2",
6868
"ember-set-helper": "^2.0.1",
69-
"ember-svg-jar": "^2.3.4",
69+
"ember-svg-jar": "^2.4.2",
7070
"ember-tether": "^2.0.1",
7171
"ember-truth-helpers": "^3.0.0",
7272
"esm": "^3.2.25",
@@ -90,7 +90,7 @@
9090
"postcss-nested": "^5.0.6",
9191
"postcss-scss": "^4.0.0",
9292
"quick-temp": "^0.1.8",
93-
"semver": "^7.3.2",
93+
"semver": "^7.3.8",
9494
"striptags": "^3.1.1",
9595
"tailwindcss": "1.9.6",
9696
"tracked-toolbox": "^2.0.0",
@@ -101,17 +101,17 @@
101101
"@babel/eslint-parser": "^7.16.3",
102102
"@babel/preset-env": "^7.16.4",
103103
"@ember/optional-features": "^2.0.0",
104-
"@ember/test-helpers": "^2.6.0",
105-
"@embroider/test-setup": "^1.2.0",
104+
"@ember/test-helpers": "^2.8.1",
105+
"@embroider/test-setup": "^2.0.2",
106106
"@fullhuman/postcss-purgecss": "^4.0.3",
107107
"broccoli-asset-rev": "^3.0.0",
108108
"chai": "^4.2.0",
109109
"common-tags": "^1.8.2",
110-
"ember-classy-page-object": "rwwagner90/ember-classy-page-object#1a126eaf9077587fa85bfe9fd2c6d3cc6d1f7f1b",
111-
"ember-cli": "~4.1.1",
110+
"ember-classy-page-object": "0.8.0-beta.2",
111+
"ember-cli": "~4.8.0",
112112
"ember-cli-addon-docs-yuidoc": "^1.0.0",
113113
"ember-cli-blueprint-test-helpers": "^0.19.2",
114-
"ember-cli-dependency-checker": "^3.2.0",
114+
"ember-cli-dependency-checker": "^3.3.1",
115115
"ember-cli-deploy": "^1.0.2",
116116
"ember-cli-deploy-build": "^2.0.0",
117117
"ember-cli-deploy-git": "^1.3.4",
@@ -121,32 +121,30 @@
121121
"ember-cli-terser": "^4.0.2",
122122
"ember-data": "~4.4.0",
123123
"ember-disable-prototype-extensions": "^1.1.3",
124-
"ember-export-application-global": "^2.0.1",
125124
"ember-load-initializers": "^2.1.2",
126-
"ember-maybe-import-regenerator-for-testing": "^1.0.0",
127-
"ember-qunit": "^5.1.5",
125+
"ember-qunit": "^6.0.0",
128126
"ember-resolver": "^8.0.3",
129-
"ember-source": "~4.6.0",
127+
"ember-source": "~4.8.0",
130128
"ember-source-channel-url": "^3.0.0",
131-
"ember-template-lint": "^4.0.0",
129+
"ember-template-lint": "^4.16.1",
132130
"ember-test-selectors": "^6.0.0",
133131
"ember-try": "^2.0.0",
134132
"eslint": "^8.3.0",
135-
"eslint-config-prettier": "^8.3.0",
136-
"eslint-plugin-ember": "^10.5.8",
133+
"eslint-config-prettier": "^8.5.0",
134+
"eslint-plugin-ember": "^11.1.0",
137135
"eslint-plugin-node": "^11.1.0",
138-
"eslint-plugin-prettier": "^4.0.0",
139-
"eslint-plugin-qunit": "^7.2.0",
136+
"eslint-plugin-prettier": "^4.2.1",
137+
"eslint-plugin-qunit": "^7.3.1",
140138
"loader.js": "^4.7.0",
141-
"miragejs": "^0.1.43",
142-
"mocha": "^10.0.0",
139+
"miragejs": "^0.1.46",
140+
"mocha": "^10.1.0",
143141
"npm-run-all": "^4.1.5",
144-
"prettier": "^2.5.1",
145-
"qunit": "^2.17.2",
142+
"prettier": "^2.7.1",
143+
"qunit": "^2.19.2",
146144
"qunit-dom": "^2.0.0",
147-
"release-it": "^14.12.1",
145+
"release-it": "^15.5.0",
148146
"release-it-lerna-changelog": "^5.0.0",
149-
"webpack": "^5.68.0"
147+
"webpack": "^5.74.0"
150148
},
151149
"peerDependencies": {
152150
"ember-data": ">= 3.0.0",

test-apps/new-addon/package.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
"devDependencies": {
2727
"@ember/optional-features": "*",
2828
"@ember/test-helpers": "*",
29-
"@ember/optional-features": "*",
3029
"ember-cli-addon-docs": "*",
3130
"ember-cli-addon-docs-yuidoc": "*",
3231
"broccoli-asset-rev": "*",
@@ -40,9 +39,7 @@
4039
"ember-cli-sri": "*",
4140
"ember-cli-terser": "*",
4241
"ember-disable-prototype-extensions": "*",
43-
"ember-export-application-global": "*",
4442
"ember-load-initializers": "*",
45-
"ember-maybe-import-regenerator-for-testing": "*",
4643
"ember-resolver": "*",
4744
"ember-source": "*",
4845
"ember-source-channel-url": "*",

tests/dummy/app/index.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<html>
33
<head>
44
<meta charset="utf-8">
5-
<meta http-equiv="X-UA-Compatible" content="IE=edge">
65
<title>Ember CLI AddonDocs</title>
76
<meta name="description" content="">
87
<meta name="viewport" content="width=device-width, initial-scale=1">

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.1.1",
6+
"version": "4.8.0",
77
"blueprints": [
88
{
99
"name": "addon",

0 commit comments

Comments
 (0)