Skip to content

Commit 65097b7

Browse files
Tom Zellmantzellman
Tom Zellman
authored andcommitted
chore: update to ember-cli 4.7
1 parent 5e2fd53 commit 65097b7

17 files changed

+189
-81
lines changed

.ember-cli

+7-1
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
}

.eslintignore

+3
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,7 @@
1919
# ember-try
2020
/.node_modules.ember-try/
2121
/bower.json.ember-try
22+
/npm-shrinkwrap.json.ember-try
2223
/package.json.ember-try
24+
/package-lock.json.ember-try
25+
/yarn.lock.ember-try

.github/workflows/ci.yml

+79
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
- master
8+
pull_request: {}
9+
10+
concurrency:
11+
group: ci-${{ github.head_ref || github.ref }}
12+
cancel-in-progress: true
13+
14+
jobs:
15+
test:
16+
name: "Tests"
17+
runs-on: ubuntu-latest
18+
timeout-minutes: 10
19+
20+
steps:
21+
- uses: actions/checkout@v3
22+
- name: Install Node
23+
uses: actions/setup-node@v3
24+
with:
25+
node-version: 14.x
26+
cache: npm
27+
- name: Install Dependencies
28+
run: npm ci
29+
- name: Lint
30+
run: npm run lint
31+
- name: Run Tests
32+
run: npm run test:ember
33+
34+
floating:
35+
name: "Floating Dependencies"
36+
runs-on: ubuntu-latest
37+
timeout-minutes: 10
38+
39+
steps:
40+
- uses: actions/checkout@v3
41+
- uses: actions/setup-node@v3
42+
with:
43+
node-version: 14.x
44+
cache: npm
45+
- name: Install Dependencies
46+
run: npm install --no-shrinkwrap
47+
- name: Run Tests
48+
run: npm run test:ember
49+
50+
try-scenarios:
51+
name: ${{ matrix.try-scenario }}
52+
runs-on: ubuntu-latest
53+
needs: "test"
54+
timeout-minutes: 10
55+
56+
strategy:
57+
fail-fast: false
58+
matrix:
59+
try-scenario:
60+
- ember-lts-3.24
61+
- ember-lts-3.28
62+
- ember-release
63+
- ember-beta
64+
- ember-canary
65+
- ember-classic
66+
- embroider-safe
67+
- embroider-optimized
68+
69+
steps:
70+
- uses: actions/checkout@v3
71+
- name: Install Node
72+
uses: actions/setup-node@v3
73+
with:
74+
node-version: 14.x
75+
cache: npm
76+
- name: Install Dependencies
77+
run: npm ci
78+
- name: Run Tests
79+
run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}

.gitignore

+5
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,10 @@
2424
# ember-try
2525
/.node_modules.ember-try/
2626
/bower.json.ember-try
27+
/npm-shrinkwrap.json.ember-try
2728
/package.json.ember-try
2829
/package-lock.json.ember-try
30+
/yarn.lock.ember-try
31+
32+
# broccoli-debug
33+
/DEBUG/

.npmignore

+3
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,7 @@ commitlint.config.js
3737
# ember-try
3838
/.node_modules.ember-try/
3939
/bower.json.ember-try
40+
/npm-shrinkwrap.json.ember-try
4041
/package.json.ember-try
42+
/package-lock.json.ember-try
43+
/yarn.lock.ember-try

.prettierignore

+4
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,12 @@
1414
/coverage/
1515
!.*
1616
.eslintcache
17+
.lint-todo/
1718

1819
# ember-try
1920
/.node_modules.ember-try/
2021
/bower.json.ember-try
22+
/npm-shrinkwrap.json.ember-try
2123
/package.json.ember-try
24+
/package-lock.json.ember-try
25+
/yarn.lock.ember-try

CONTRIBUTING.md

+1-1
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

+3-2
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,9 @@ The `trigger-event` modifier allows you to trigger an event when the element is
6565

6666
## Compatibility
6767

68-
- Ember.js v3.20 or above
69-
- Node.js v12 or above
68+
- Ember.js v3.24 or above
69+
- Ember CLI v3.24 or above
70+
- Node.js v14 or above
7071

7172
## Contributing
7273

config/ember-try.js

+4-17
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@ module.exports = async function () {
77
return {
88
scenarios: [
99
{
10-
name: 'ember-lts-3.20',
10+
name: 'ember-lts-3.24',
1111
npm: {
1212
devDependencies: {
13-
'ember-source': '~3.20.5'
13+
'ember-source': '~3.24.3'
1414
}
1515
}
1616
},
1717
{
18-
name: 'ember-lts-3.24',
18+
name: 'ember-lts-3.28',
1919
npm: {
2020
devDependencies: {
21-
'ember-source': '~3.24.3'
21+
'ember-source': '~3.28.0'
2222
}
2323
}
2424
},
@@ -46,19 +46,6 @@ module.exports = async function () {
4646
}
4747
}
4848
},
49-
{
50-
name: 'ember-default-with-jquery',
51-
env: {
52-
EMBER_OPTIONAL_FEATURES: JSON.stringify({
53-
'jquery-integration': true
54-
})
55-
},
56-
npm: {
57-
devDependencies: {
58-
'@ember/jquery': '^1.1.0'
59-
}
60-
}
61-
},
6249
{
6350
name: 'ember-classic',
6451
env: {

package.json

+21-22
Original file line numberDiff line numberDiff line change
@@ -26,64 +26,63 @@
2626
"test:ember-compatibility": "ember try:each"
2727
},
2828
"dependencies": {
29-
"ember-cli-babel": "^7.26.6",
30-
"ember-cli-htmlbars": "^6.0.0"
29+
"ember-cli-babel": "^7.26.11",
30+
"ember-cli-htmlbars": "^6.1.0"
3131
},
3232
"devDependencies": {
3333
"@commitlint/cli": "^13.2.1",
3434
"@commitlint/config-conventional": "^13.2.0",
3535
"@ember/optional-features": "^2.0.0",
3636
"@ember/render-modifiers": "^1.0.2",
37-
"@ember/test-helpers": "^2.5.0",
38-
"@embroider/test-setup": "^0.47.1",
39-
"@glimmer/component": "^1.0.4",
40-
"@glimmer/tracking": "^1.0.4",
37+
"@ember/test-helpers": "^2.8.1",
38+
"@embroider/test-setup": "^1.8.3",
39+
"@glimmer/component": "^1.1.2",
40+
"@glimmer/tracking": "^1.1.2",
4141
"autoprefixer": "^10.4.0",
4242
"babel-eslint": "^10.1.0",
4343
"broccoli-asset-rev": "^3.0.0",
44-
"ember-auto-import": "^1.12.0",
45-
"ember-cli": "~3.28.3",
44+
"ember-auto-import": "^2.4.2",
45+
"ember-cli": "~4.7.0",
4646
"ember-cli-code-coverage": "^1.0.3",
47-
"ember-cli-dependency-checker": "^3.2.0",
47+
"ember-cli-dependency-checker": "^3.3.1",
4848
"ember-cli-github-pages": "^0.2.2",
4949
"ember-cli-inject-live-reload": "^2.1.0",
5050
"ember-cli-postcss": "^7.0.2",
5151
"ember-cli-sri": "^2.1.1",
5252
"ember-cli-terser": "^4.0.2",
5353
"ember-composable-helpers": "^4.5.0",
5454
"ember-disable-prototype-extensions": "^1.1.3",
55-
"ember-export-application-global": "^2.0.1",
5655
"ember-load-initializers": "^2.1.2",
57-
"ember-maybe-import-regenerator": "^1.0.0",
5856
"ember-modifier": "^3.0.0",
5957
"ember-page-title": "^7.0.0",
6058
"ember-qunit": "^5.1.5",
6159
"ember-resolver": "^8.0.3",
62-
"ember-source": "~3.28.4",
60+
"ember-source": "~4.7.0",
6361
"ember-source-channel-url": "^3.0.0",
64-
"ember-template-lint": "^3.11.0",
62+
"ember-template-lint": "^4.14.0",
6563
"ember-truth-helpers": "^3.0.0",
66-
"ember-try": "^1.4.0",
64+
"ember-try": "^2.0.0",
6765
"eslint": "^7.32.0",
68-
"eslint-config-prettier": "^8.3.0",
69-
"eslint-plugin-ember": "^10.5.7",
66+
"eslint-config-prettier": "^8.5.0",
67+
"eslint-plugin-ember": "^11.0.6",
7068
"eslint-plugin-node": "^11.1.0",
71-
"eslint-plugin-prettier": "^4.0.0",
72-
"eslint-plugin-qunit": "^7.0.0",
69+
"eslint-plugin-prettier": "^4.2.1",
70+
"eslint-plugin-qunit": "^7.3.1",
7371
"husky": "^4.3.8",
7472
"loader.js": "^4.7.0",
7573
"micromatch": "^4.0.4",
7674
"npm-run-all": "^4.1.5",
77-
"prettier": "^2.4.1",
75+
"prettier": "^2.7.1",
7876
"pretty-quick": "^3.1.1",
79-
"qunit": "^2.17.2",
77+
"qunit": "^2.19.1",
8078
"qunit-dom": "^2.0.0",
8179
"rimraf": "^3.0.2",
8280
"tailwindcss": "^2.2.17",
83-
"tracked-built-ins": "^1.1.1"
81+
"tracked-built-ins": "^1.1.1",
82+
"webpack": "^5.74.0"
8483
},
8584
"engines": {
86-
"node": "12.* || 14.* || >= 16"
85+
"node": "14.* || >= 16"
8786
},
8887
"ember": {
8988
"edition": "octane"

tests/dummy/app/index.html

+16-17
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,24 @@
11
<!DOCTYPE html>
22
<html>
3-
<head>
4-
<meta charset="utf-8">
5-
<meta http-equiv="X-UA-Compatible" content="IE=edge">
6-
<title>Dummy</title>
7-
<meta name="description" content="">
8-
<meta name="viewport" content="width=device-width, initial-scale=1">
3+
<head>
4+
<meta charset="utf-8" />
5+
<title>Dummy</title>
6+
<meta name="description" content="" />
7+
<meta name="viewport" content="width=device-width, initial-scale=1" />
98

10-
{{content-for "head"}}
9+
{{content-for "head"}}
1110

12-
<link integrity="" rel="stylesheet" href="{{rootURL}}assets/vendor.css">
13-
<link integrity="" rel="stylesheet" href="{{rootURL}}assets/dummy.css">
11+
<link integrity="" rel="stylesheet" href="{{rootURL}}assets/vendor.css" />
12+
<link integrity="" rel="stylesheet" href="{{rootURL}}assets/dummy.css" />
1413

15-
{{content-for "head-footer"}}
16-
</head>
17-
<body>
18-
{{content-for "body"}}
14+
{{content-for "head-footer"}}
15+
</head>
16+
<body>
17+
{{content-for "body"}}
1918

20-
<script src="{{rootURL}}assets/vendor.js"></script>
21-
<script src="{{rootURL}}assets/dummy.js"></script>
19+
<script src="{{rootURL}}assets/vendor.js"></script>
20+
<script src="{{rootURL}}assets/dummy.js"></script>
2221

23-
{{content-for "body-footer"}}
24-
</body>
22+
{{content-for "body-footer"}}
23+
</body>
2524
</html>

tests/dummy/config/ember-cli-update.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"packages": [
44
{
55
"name": "ember-cli",
6-
"version": "3.28.3",
6+
"version": "4.7.0",
77
"blueprints": [
88
{
99
"name": "addon",

tests/dummy/config/environment.js

-4
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@ module.exports = function (environment) {
1010
FEATURES: {
1111
// Here you can enable experimental features on an ember canary build
1212
// e.g. EMBER_NATIVE_DECORATOR_SUPPORT: true
13-
},
14-
EXTEND_PROTOTYPES: {
15-
// Prevent Ember Data from overriding Date.parse.
16-
Date: false
1713
}
1814
},
1915

tests/dummy/config/targets.js

-15
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,6 @@
22

33
const browsers = ['last 1 Chrome versions', 'last 1 Firefox versions', 'last 1 Safari versions'];
44

5-
// Ember's browser support policy is changing, and IE11 support will end in
6-
// v4.0 onwards.
7-
//
8-
// See https://deprecations.emberjs.com/v3.x#toc_3-0-browser-support-policy
9-
//
10-
// If you need IE11 support on a version of Ember that still offers support
11-
// for it, uncomment the code block below.
12-
//
13-
// const isCI = Boolean(process.env.CI);
14-
// const isProduction = process.env.EMBER_ENV === 'production';
15-
//
16-
// if (isCI || isProduction) {
17-
// browsers.push('ie 11');
18-
// }
19-
205
module.exports = {
216
browsers
227
};

tests/helpers/.gitkeep

Whitespace-only changes.

0 commit comments

Comments
 (0)