Skip to content

Commit f58b4cf

Browse files
committed
npx ember-cli-update --to=4.8
1 parent beaead6 commit f58b4cf

File tree

12 files changed

+3781
-4411
lines changed

12 files changed

+3781
-4411
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": true
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
}

.eslintrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ module.exports = {
4242
'addon/**',
4343
'addon-test-support/**',
4444
'app/**',
45+
'tests/helpers/**',
4546
'tests/dummy/app/**',
4647
],
4748
parserOptions: {

.github/workflows/ci.yml

Lines changed: 50 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,48 @@ on:
77
- 'v*'
88
pull_request: {}
99

10+
concurrency:
11+
group: ci-${{ github.head_ref || github.ref }}
12+
cancel-in-progress: true
13+
1014
jobs:
1115
test:
1216
name: Tests
1317
runs-on: ubuntu-latest
18+
timeout-minutes: 10
1419

1520
env:
1621
CI: 'true'
1722

1823
steps:
19-
- uses: actions/checkout@v2
20-
- uses: actions/setup-node@v1
24+
- uses: actions/checkout@v3
25+
- name: Install Node
26+
uses: actions/setup-node@v3
2127
with:
2228
node-version: 16.x
23-
- name: Install yarn
24-
run: npm install -g yarn
25-
- name: Install dependencies
26-
run: yarn install
27-
- name: Test
28-
run: yarn test
29+
cache: yarn
30+
- name: Install Dependencies
31+
run: yarn install --frozen-lockfile
32+
- name: Lint
33+
run: yarn lint
34+
- name: Run Tests
35+
run: yarn test:ember
36+
37+
floating:
38+
name: "Floating Dependencies"
39+
runs-on: ubuntu-latest
40+
timeout-minutes: 10
41+
42+
steps:
43+
- uses: actions/checkout@v3
44+
- uses: actions/setup-node@v3
45+
with:
46+
node-version: 16.x
47+
cache: yarn
48+
- name: Install Dependencies
49+
run: yarn install --no-lockfile
50+
- name: Run Tests
51+
run: yarn test:ember
2952

3053
try-scenarios:
3154
name: Tests ${{ matrix.ember-try-scenario }}
@@ -35,29 +58,34 @@ jobs:
3558
env:
3659
CI: 'true'
3760

61+
62+
timeout-minutes: 10
63+
3864
strategy:
3965
fail-fast: true
4066
matrix:
41-
ember-try-scenario:
42-
- ember-lts-3.24
67+
try-scenario:
4368
- ember-lts-3.28
69+
- ember-lts-4.4
70+
- ember-lts-4.8
71+
- ember-lts-4.12
72+
- ember-lts-5.4
73+
- ember-lts-5.8
4474
#- ember-release
4575
#- ember-beta
4676
#- ember-canary
4777
- ember-classic
48-
- embroider-safe
49-
- embroider-optimized
78+
#- embroider-safe
79+
#- embroider-optimized
5080

5181
steps:
52-
- uses: actions/checkout@v2
53-
- uses: actions/setup-node@v1
82+
- uses: actions/checkout@v3
83+
- name: Install Node
84+
uses: actions/setup-node@v3
5485
with:
5586
node-version: 16.x
56-
- name: Install yarn
57-
run: npm install -g yarn
58-
- name: Install dependencies
59-
run: yarn install
60-
- name: Test
61-
env:
62-
EMBER_TRY_SCENARIO: ${{ matrix.ember-try-scenario }}
63-
run: yarn ember try:one $EMBER_TRY_SCENARIO
87+
cache: yarn
88+
- name: Install Dependencies
89+
run: yarn install --frozen-lockfile
90+
- name: Run Tests
91+
run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,6 @@ jsconfig.json
2828
/package.json.ember-try
2929
/package-lock.json.ember-try
3030
/yarn.lock.ember-try
31+
32+
# broccoli-debug
33+
/DEBUG/

config/ember-try.js

Lines changed: 36 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,50 @@ 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',
23+
},
24+
},
25+
},
26+
{
27+
name: 'ember-lts-4.8',
28+
npm: {
29+
devDependencies: {
30+
'ember-source': '~4.8.0',
31+
},
32+
},
33+
},
34+
{
35+
name: 'ember-lts-4.12',
36+
npm: {
37+
devDependencies: {
38+
'ember-source': '~4.12.0',
39+
},
40+
},
41+
},
42+
{
43+
name: 'ember-lts-5.4',
44+
npm: {
45+
devDependencies: {
46+
'ember-source': '~5.4.0',
47+
},
48+
},
49+
},
50+
{
51+
name: 'ember-lts-5.8',
52+
npm: {
53+
devDependencies: {
54+
'ember-source': '~5.8.0',
2355
},
2456
},
2557
},

package.json

Lines changed: 34 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -26,71 +26,83 @@
2626
},
2727
"scripts": {
2828
"build": "ember build --environment=production",
29-
"lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
30-
"lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix",
29+
"lint": "npm-run-all --print-name --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
30+
"lint:fix": "npm-run-all --print-name --aggregate-output --continue-on-error --parallel \"lint:*:fix\"",
3131
"lint:hbs": "ember-template-lint .",
3232
"lint:hbs:fix": "ember-template-lint . --fix",
3333
"lint:js": "eslint . --cache",
3434
"lint:js:fix": "eslint . --fix",
3535
"start": "ember serve",
36-
"test": "npm-run-all lint test:*",
36+
"test": "npm-run-all --print-name \"lint\" \"test:*\"",
3737
"test:ember": "ember test"
3838
},
3939
"dependencies": {
4040
"@apollo/client": "^3.5.10",
4141
"@ember/test-waiters": "~3.0.1",
4242
"@embroider/macros": "^1.5.0",
43-
"@glimmer/tracking": "^1.0.4",
43+
"@glimmer/tracking": "^1.1.2",
4444
"broccoli-graphql-filter": "^1.0.0",
45-
"ember-auto-import": "^2.4.0",
45+
"ember-auto-import": "^2.4.3",
4646
"ember-cli-babel": "^7.26.11"
4747
},
4848
"devDependencies": {
4949
"@babel/core": "^7.17.7",
5050
"@ember/optional-features": "^2.0.0",
51-
"@ember/test-helpers": "^2.6.0",
52-
"@embroider/test-setup": "^1.2.0",
53-
"@glimmer/component": "^1.0.4",
51+
"@ember/test-helpers": "^2.8.1",
52+
"@embroider/test-setup": "^1.8.3",
53+
"@glimmer/component": "^1.1.2",
5454
"babel-eslint": "^10.1.0",
5555
"broccoli-asset-rev": "^3.0.0",
56-
"ember-cli": "~4.2.0",
57-
"ember-cli-dependency-checker": "^3.2.0",
58-
"ember-cli-htmlbars": "^6.0.1",
56+
"ember-cli": "~4.8.1",
57+
"ember-cli-dependency-checker": "^3.3.1",
58+
"ember-cli-htmlbars": "^6.1.1",
5959
"ember-cli-inject-live-reload": "^2.1.0",
6060
"ember-cli-terser": "^4.0.2",
6161
"ember-compatibility-helpers": "^1.2.6",
6262
"ember-disable-prototype-extensions": "^1.1.3",
6363
"ember-fetch": "^8.1.1",
6464
"ember-load-initializers": "^2.1.2",
6565
"ember-page-title": "^7.0.0",
66-
"ember-qunit": "^5.1.5",
66+
"ember-qunit": "^6.0.0",
6767
"ember-resolver": "^8.0.3",
68-
"ember-source": "~4.2.0",
68+
"ember-source": "~4.8.0",
6969
"ember-source-channel-url": "^3.0.0",
70-
"ember-template-lint": "^4.2.0",
70+
"ember-template-lint": "^4.16.1",
7171
"ember-try": "^2.0.0",
7272
"eslint": "^7.32.0",
73-
"eslint-config-prettier": "^8.4.0",
74-
"eslint-plugin-ember": "^10.5.9",
73+
"eslint-config-prettier": "^8.5.0",
74+
"eslint-plugin-ember": "^11.1.0",
7575
"eslint-plugin-node": "^11.1.0",
76-
"eslint-plugin-prettier": "^4.0.0",
77-
"eslint-plugin-qunit": "^7.2.0",
76+
"eslint-plugin-prettier": "^4.2.1",
77+
"eslint-plugin-qunit": "^7.3.1",
78+
"minimatch": "^5.1.6",
79+
"glob": "^7.1.7",
7880
"graphql": "^16.0.0",
7981
"graphql-tag": "^2.12.6",
8082
"graphql-tools": "^4.0.8",
8183
"loader.js": "^4.7.0",
8284
"npm-run-all": "^4.1.5",
8385
"pretender": "^3.4.7",
84-
"prettier": "^2.5.1",
85-
"qunit": "^2.18.0",
86+
"prettier": "^2.7.1",
87+
"qunit": "^2.19.2",
8688
"qunit-dom": "^2.0.0",
87-
"webpack": "^5.69.1"
89+
"webpack": "^5.74.0"
8890
},
8991
"peerDependencies": {
9092
"graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
9193
},
94+
"//resolutions": {
95+
"isbinaryfile": "later versions of isbinaryfile require node.js 18 or later, while this addon maintains compatibility with node.js 16. To ensure compatibility, we pin isbinaryfile to version 5.0.0.",
96+
"glob": "later versions of glob require node.js 18 or later, while this addon maintains compatibility with node.js 16. To ensure compatibility, we pin glob to version ^7.2.3.",
97+
"minimatch": "later versions of minimatch require node.js 18 or later, while this addon maintains compatibility with node.js 16. To ensure compatibility, we pin minimatch to version ^5.1.6."
98+
},
99+
"resolutions": {
100+
"isbinaryfile": "5.0.0",
101+
"glob": "^7.2.3",
102+
"minimatch": "^5.1.6"
103+
},
92104
"engines": {
93-
"node": ">= 16"
105+
"node": "16.* || >= 18"
94106
},
95107
"ember": {
96108
"edition": "octane"

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

tests/dummy/config/environment.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22

33
module.exports = function (environment) {
4-
let ENV = {
4+
const ENV = {
55
modulePrefix: 'dummy',
66
environment,
77
rootURL: '/',
@@ -14,10 +14,6 @@ module.exports = function (environment) {
1414
// Here you can enable experimental features on an ember canary build
1515
// e.g. EMBER_NATIVE_DECORATOR_SUPPORT: true
1616
},
17-
EXTEND_PROTOTYPES: {
18-
// Prevent Ember Data from overriding Date.parse.
19-
Date: false,
20-
},
2117
},
2218

2319
APP: {

tests/helpers/.gitkeep

Whitespace-only changes.

tests/helpers/index.js

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
import {
2+
setupApplicationTest as upstreamSetupApplicationTest,
3+
setupRenderingTest as upstreamSetupRenderingTest,
4+
setupTest as upstreamSetupTest,
5+
} from 'ember-qunit';
6+
7+
// This file exists to provide wrappers around ember-qunit's / ember-mocha's
8+
// test setup functions. This way, you can easily extend the setup that is
9+
// needed per test type.
10+
11+
function setupApplicationTest(hooks, options) {
12+
upstreamSetupApplicationTest(hooks, options);
13+
14+
// Additional setup for application tests can be done here.
15+
//
16+
// For example, if you need an authenticated session for each
17+
// application test, you could do:
18+
//
19+
// hooks.beforeEach(async function () {
20+
// await authenticateSession(); // ember-simple-auth
21+
// });
22+
//
23+
// This is also a good place to call test setup functions coming
24+
// from other addons:
25+
//
26+
// setupIntl(hooks); // ember-intl
27+
// setupMirage(hooks); // ember-cli-mirage
28+
}
29+
30+
function setupRenderingTest(hooks, options) {
31+
upstreamSetupRenderingTest(hooks, options);
32+
33+
// Additional setup for rendering tests can be done here.
34+
}
35+
36+
function setupTest(hooks, options) {
37+
upstreamSetupTest(hooks, options);
38+
39+
// Additional setup for unit tests can be done here.
40+
}
41+
42+
export { setupApplicationTest, setupRenderingTest, setupTest };

0 commit comments

Comments
 (0)