Skip to content

Commit

Permalink
ember-cli update to 5.5.0, require node 18+ (#1520)
Browse files Browse the repository at this point in the history
  • Loading branch information
RobbieTheWagner authored Dec 23, 2023
1 parent 890036c commit 1e7c0d9
Show file tree
Hide file tree
Showing 10 changed files with 1,093 additions and 2,082 deletions.
8 changes: 0 additions & 8 deletions .ember-cli
Original file line number Diff line number Diff line change
@@ -1,12 +1,4 @@
{
/**
Ember CLI sends analytics information by default. The data is completely
anonymous, but there are times when you might want to disable this behavior.

Setting `disableAnalytics` to true will prevent any data from being sent.
*/
"disableAnalytics": false,

/**
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/ci-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ concurrency:
cancel-in-progress: true

env:
NODE_VERSION: 16
NODE_VERSION: 18

jobs:
lint:
Expand Down Expand Up @@ -96,14 +96,14 @@ jobs:
fail-fast: false
matrix:
try-scenario:
- 'ember-lts-4.4'
- 'ember-lts-4.8'
- 'ember-lts-5.4'
- 'ember-release'
- 'ember-beta'
- 'ember-canary'
- 'embroider-safe'
# - 'embroider-optimized'
- ember-lts-4.4
- ember-lts-4.8
- ember-lts-4.12
- ember-release
- ember-beta
- ember-canary
- embroider-safe
- embroider-optimized
timeout-minutes: 7
steps:
- name: Check out a copy of the repo
Expand Down
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@

## Running tests

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

## Running the dummy application

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

For more information on using ember-cli, visit [https://cli.emberjs.com/release/](https://cli.emberjs.com/release/).
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Compatibility

* Ember.js v4.4 or above
* Ember CLI v4.4 or above
* Node.js v16 or above
* Node.js v18 or above

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.
We are currently working on embroider and fastboot support, and would love help, if anyone would like to help out!
Expand Down
4 changes: 2 additions & 2 deletions addon/-private/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { cached } from 'tracked-toolbox';
* @function getRootURL
* @private
* @param {*} target Instance of an ember class that has an owner
* @returns {String} The currently configured rootURL
* @return {String} The currently configured rootURL
*/
export function getRootURL(target) {
return getOwner(target).resolveRegistration('config:environment').rootURL;
Expand All @@ -20,7 +20,7 @@ export function getRootURL(target) {
* @function getAddonDocsConfig
* @private
* @param {*} target Instance of an ember class that has an owner
* @returns {Object} The `ember-cli-addon-docs` configuration object
* @return {Object} The `ember-cli-addon-docs` configuration object
*/
export function getAddonDocsConfig(target) {
return getOwner(target).resolveRegistration('config:environment')[
Expand Down
34 changes: 17 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,15 @@
"broccoli-filter": "^1.3.0",
"broccoli-funnel": "^3.0.8",
"broccoli-merge-trees": "^4.2.0",
"broccoli-persistent-filter": "^3.1.0",
"broccoli-persistent-filter": "^3.1.3",
"broccoli-plugin": "1.5.1 - 5",
"broccoli-source": "^3.0.0",
"broccoli-stew": "^3.0.0",
"chalk": "4.1.2",
"ember-auto-import": "^2.6.3",
"ember-auto-import": "^2.7.0",
"ember-cli-autoprefixer": "^2.0.0",
"ember-cli-babel": "^7.26.11",
"ember-cli-clipboard": "^1.0.0",
"ember-cli-clipboard": "^1.1.0",
"ember-cli-htmlbars": "^6.3.0",
"ember-cli-postcss": "^8.0.0",
"ember-cli-string-helpers": "^6.1.0",
Expand Down Expand Up @@ -100,9 +100,9 @@
"yuidocjs": "^0.10.2"
},
"devDependencies": {
"@babel/eslint-parser": "^7.22.10",
"@babel/plugin-proposal-decorators": "^7.22.10",
"@babel/preset-env": "^7.16.4",
"@babel/eslint-parser": "^7.23.3",
"@babel/plugin-proposal-decorators": "^7.23.6",
"@babel/preset-env": "^7.23.6",
"@ember/optional-features": "^2.0.0",
"@ember/string": "^3.1.1",
"@ember/test-helpers": "^3.2.1",
Expand All @@ -111,9 +111,9 @@
"broccoli-asset-rev": "^3.0.0",
"chai": "^4.2.0",
"common-tags": "^1.8.2",
"concurrently": "^8.2.0",
"concurrently": "^8.2.2",
"ember-classy-page-object": "0.8.0-beta.2",
"ember-cli": "~5.2.0",
"ember-cli": "~5.5.0",
"ember-cli-addon-docs-yuidoc": "^1.0.0",
"ember-cli-blueprint-test-helpers": "^0.19.2",
"ember-cli-clean-css": "^3.0.0",
Expand All @@ -125,13 +125,13 @@
"ember-cli-mirage": "^3.0.2",
"ember-cli-sri": "^2.1.1",
"ember-cli-terser": "^4.0.2",
"ember-data": "~4.11.3",
"ember-data": "~5.3.0",
"ember-load-initializers": "^2.1.2",
"ember-qunit": "^7.0.0",
"ember-qunit": "^8.0.2",
"ember-resolver": "^11.0.1",
"ember-source": "~5.2.0",
"ember-source": "~5.5.0",
"ember-source-channel-url": "^3.0.0",
"ember-template-lint": "^5.11.2",
"ember-template-lint": "^5.13.0",
"ember-test-selectors": "^6.0.0",
"ember-try": "^3.0.0",
"eslint": "^8.56.0",
Expand All @@ -144,22 +144,22 @@
"miragejs": "^0.1.48",
"mocha": "^10.1.0",
"prettier": "^3.1.1",
"qunit": "^2.19.4",
"qunit": "^2.20.0",
"qunit-dom": "^2.0.0",
"release-it": "^15.5.0",
"release-it-lerna-changelog": "^5.0.0",
"stylelint": "^15.10.3",
"stylelint": "^15.11.0",
"stylelint-config-standard": "^34.0.0",
"stylelint-prettier": "^4.0.2",
"webpack": "^5.88.2"
"stylelint-prettier": "^4.1.0",
"webpack": "^5.89.0"
},
"peerDependencies": {
"ember-data": ">= 3.0.0",
"ember-fetch": "^8.1.1",
"ember-source": ">= 4.0.0"
},
"engines": {
"node": "16.* || >= 18"
"node": ">= 18"
},
"publishConfig": {
"registry": "https://registry.npmjs.org"
Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/config/ember-cli-update.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"packages": [
{
"name": "ember-cli",
"version": "5.2.0",
"version": "5.5.0",
"blueprints": [
{
"name": "addon",
Expand Down
9 changes: 9 additions & 0 deletions tests/dummy/config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,15 @@ module.exports = async function () {
},
},
},
{
name: 'ember-lts-4.12',
npm: {
devDependencies: {
'ember-data': '~4.11.3',
'ember-source': '~4.12.0',
},
},
},
{
name: 'ember-lts-5.4',
npm: {
Expand Down
2 changes: 1 addition & 1 deletion tests/helpers/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
setupTest as upstreamSetupTest,
} from 'ember-qunit';

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

Expand Down
Loading

0 comments on commit 1e7c0d9

Please sign in to comment.