Skip to content

Commit 1e7c0d9

Browse files
ember-cli update to 5.5.0, require node 18+ (#1520)
1 parent 890036c commit 1e7c0d9

File tree

10 files changed

+1093
-2082
lines changed

10 files changed

+1093
-2082
lines changed

.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.

.github/workflows/ci-cd.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ concurrency:
1212
cancel-in-progress: true
1313

1414
env:
15-
NODE_VERSION: 16
15+
NODE_VERSION: 18
1616

1717
jobs:
1818
lint:
@@ -96,14 +96,14 @@ jobs:
9696
fail-fast: false
9797
matrix:
9898
try-scenario:
99-
- 'ember-lts-4.4'
100-
- 'ember-lts-4.8'
101-
- 'ember-lts-5.4'
102-
- 'ember-release'
103-
- 'ember-beta'
104-
- 'ember-canary'
105-
- 'embroider-safe'
106-
# - 'embroider-optimized'
99+
- ember-lts-4.4
100+
- ember-lts-4.8
101+
- ember-lts-4.12
102+
- ember-release
103+
- ember-beta
104+
- ember-canary
105+
- embroider-safe
106+
- embroider-optimized
107107
timeout-minutes: 7
108108
steps:
109109
- name: Check out a copy of the repo

CONTRIBUTING.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313

1414
## Running tests
1515

16-
* `ember test` – Runs the test suite on the current Ember version
17-
* `ember test --server` – Runs the test suite in "watch mode"
18-
* `ember try:each` – Runs the test suite against multiple Ember versions
16+
* `yarn test` – Runs the test suite on the current Ember version
17+
* `yarn test:ember --server` – Runs the test suite in "watch mode"
18+
* `yarn test:ember-compatibility` – Runs the test suite against multiple Ember versions
1919

2020
## Running the dummy application
2121

22-
* `ember serve`
22+
* `yarn start`
2323
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).
2424

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

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Compatibility
1111

1212
* Ember.js v4.4 or above
1313
* Ember CLI v4.4 or above
14-
* Node.js v16 or above
14+
* Node.js v18 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.
1717
We are currently working on embroider and fastboot support, and would love help, if anyone would like to help out!

addon/-private/config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { cached } from 'tracked-toolbox';
77
* @function getRootURL
88
* @private
99
* @param {*} target Instance of an ember class that has an owner
10-
* @returns {String} The currently configured rootURL
10+
* @return {String} The currently configured rootURL
1111
*/
1212
export function getRootURL(target) {
1313
return getOwner(target).resolveRegistration('config:environment').rootURL;
@@ -20,7 +20,7 @@ export function getRootURL(target) {
2020
* @function getAddonDocsConfig
2121
* @private
2222
* @param {*} target Instance of an ember class that has an owner
23-
* @returns {Object} The `ember-cli-addon-docs` configuration object
23+
* @return {Object} The `ember-cli-addon-docs` configuration object
2424
*/
2525
export function getAddonDocsConfig(target) {
2626
return getOwner(target).resolveRegistration('config:environment')[

package.json

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,15 @@
4444
"broccoli-filter": "^1.3.0",
4545
"broccoli-funnel": "^3.0.8",
4646
"broccoli-merge-trees": "^4.2.0",
47-
"broccoli-persistent-filter": "^3.1.0",
47+
"broccoli-persistent-filter": "^3.1.3",
4848
"broccoli-plugin": "1.5.1 - 5",
4949
"broccoli-source": "^3.0.0",
5050
"broccoli-stew": "^3.0.0",
5151
"chalk": "4.1.2",
52-
"ember-auto-import": "^2.6.3",
52+
"ember-auto-import": "^2.7.0",
5353
"ember-cli-autoprefixer": "^2.0.0",
5454
"ember-cli-babel": "^7.26.11",
55-
"ember-cli-clipboard": "^1.0.0",
55+
"ember-cli-clipboard": "^1.1.0",
5656
"ember-cli-htmlbars": "^6.3.0",
5757
"ember-cli-postcss": "^8.0.0",
5858
"ember-cli-string-helpers": "^6.1.0",
@@ -100,9 +100,9 @@
100100
"yuidocjs": "^0.10.2"
101101
},
102102
"devDependencies": {
103-
"@babel/eslint-parser": "^7.22.10",
104-
"@babel/plugin-proposal-decorators": "^7.22.10",
105-
"@babel/preset-env": "^7.16.4",
103+
"@babel/eslint-parser": "^7.23.3",
104+
"@babel/plugin-proposal-decorators": "^7.23.6",
105+
"@babel/preset-env": "^7.23.6",
106106
"@ember/optional-features": "^2.0.0",
107107
"@ember/string": "^3.1.1",
108108
"@ember/test-helpers": "^3.2.1",
@@ -111,9 +111,9 @@
111111
"broccoli-asset-rev": "^3.0.0",
112112
"chai": "^4.2.0",
113113
"common-tags": "^1.8.2",
114-
"concurrently": "^8.2.0",
114+
"concurrently": "^8.2.2",
115115
"ember-classy-page-object": "0.8.0-beta.2",
116-
"ember-cli": "~5.2.0",
116+
"ember-cli": "~5.5.0",
117117
"ember-cli-addon-docs-yuidoc": "^1.0.0",
118118
"ember-cli-blueprint-test-helpers": "^0.19.2",
119119
"ember-cli-clean-css": "^3.0.0",
@@ -125,13 +125,13 @@
125125
"ember-cli-mirage": "^3.0.2",
126126
"ember-cli-sri": "^2.1.1",
127127
"ember-cli-terser": "^4.0.2",
128-
"ember-data": "~4.11.3",
128+
"ember-data": "~5.3.0",
129129
"ember-load-initializers": "^2.1.2",
130-
"ember-qunit": "^7.0.0",
130+
"ember-qunit": "^8.0.2",
131131
"ember-resolver": "^11.0.1",
132-
"ember-source": "~5.2.0",
132+
"ember-source": "~5.5.0",
133133
"ember-source-channel-url": "^3.0.0",
134-
"ember-template-lint": "^5.11.2",
134+
"ember-template-lint": "^5.13.0",
135135
"ember-test-selectors": "^6.0.0",
136136
"ember-try": "^3.0.0",
137137
"eslint": "^8.56.0",
@@ -144,22 +144,22 @@
144144
"miragejs": "^0.1.48",
145145
"mocha": "^10.1.0",
146146
"prettier": "^3.1.1",
147-
"qunit": "^2.19.4",
147+
"qunit": "^2.20.0",
148148
"qunit-dom": "^2.0.0",
149149
"release-it": "^15.5.0",
150150
"release-it-lerna-changelog": "^5.0.0",
151-
"stylelint": "^15.10.3",
151+
"stylelint": "^15.11.0",
152152
"stylelint-config-standard": "^34.0.0",
153-
"stylelint-prettier": "^4.0.2",
154-
"webpack": "^5.88.2"
153+
"stylelint-prettier": "^4.1.0",
154+
"webpack": "^5.89.0"
155155
},
156156
"peerDependencies": {
157157
"ember-data": ">= 3.0.0",
158158
"ember-fetch": "^8.1.1",
159159
"ember-source": ">= 4.0.0"
160160
},
161161
"engines": {
162-
"node": "16.* || >= 18"
162+
"node": ">= 18"
163163
},
164164
"publishConfig": {
165165
"registry": "https://registry.npmjs.org"

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

tests/dummy/config/ember-try.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,15 @@ module.exports = async function () {
2323
},
2424
},
2525
},
26+
{
27+
name: 'ember-lts-4.12',
28+
npm: {
29+
devDependencies: {
30+
'ember-data': '~4.11.3',
31+
'ember-source': '~4.12.0',
32+
},
33+
},
34+
},
2635
{
2736
name: 'ember-lts-5.4',
2837
npm: {

tests/helpers/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
setupTest as upstreamSetupTest,
55
} from 'ember-qunit';
66

7-
// This file exists to provide wrappers around ember-qunit's / ember-mocha's
7+
// This file exists to provide wrappers around ember-qunit's
88
// test setup functions. This way, you can easily extend the setup that is
99
// needed per test type.
1010

0 commit comments

Comments
 (0)