Skip to content

Commit 44f28ca

Browse files
committed
update to v3.28 with ember-cli-update
1 parent f2c7e0b commit 44f28ca

13 files changed

Lines changed: 139 additions & 86 deletions

File tree

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
# misc
1515
/coverage/
1616
!.*
17+
.*/
1718
.eslintcache
1819

1920
# ember-try

.eslintrc.js

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,21 +24,15 @@ module.exports = {
2424
// node files
2525
{
2626
files: [
27-
'.eslintrc.js',
28-
'.prettierrc.js',
29-
'.template-lintrc.js',
30-
'ember-cli-build.js',
31-
'index.js',
32-
'testem.js',
33-
'blueprints/*/index.js',
34-
'config/**/*.js',
35-
'tests/dummy/config/**/*.js',
36-
],
37-
excludedFiles: [
38-
'addon/**',
39-
'addon-test-support/**',
40-
'app/**',
41-
'tests/dummy/app/**',
27+
'./.eslintrc.js',
28+
'./.prettierrc.js',
29+
'./.template-lintrc.js',
30+
'./ember-cli-build.js',
31+
'./index.js',
32+
'./testem.js',
33+
'./blueprints/*/index.js',
34+
'./config/**/*.js',
35+
'./tests/dummy/config/**/*.js',
4236
],
4337
parserOptions: {
4438
sourceType: 'script',
@@ -50,5 +44,10 @@ module.exports = {
5044
plugins: ['node'],
5145
extends: ['plugin:node/recommended'],
5246
},
47+
{
48+
// Test files:
49+
files: ['tests/**/*-test.{js,ts}'],
50+
extends: ['plugin:qunit/recommended'],
51+
},
5352
],
5453
};

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ jobs:
6262
try-scenario:
6363
- ember-lts-3.16
6464
- ember-lts-3.20
65+
- ember-lts-3.24
6566
- ember-release
6667
- ember-beta
6768
- ember-canary

.npmignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
/ember-cli-build.js
2727
/testem.js
2828
/tests/
29+
/yarn-error.log
2930
/yarn.lock
3031
.gitkeep
3132

.template-lintrc.js

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

33
module.exports = {
4-
extends: 'octane',
4+
extends: 'recommended',
55
};

config/ember-try.js

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,22 @@ module.exports = async function () {
2323
},
2424
},
2525
},
26+
{
27+
name: 'ember-lts-3.24',
28+
npm: {
29+
devDependencies: {
30+
'ember-source': '~3.24.3',
31+
},
32+
},
33+
},
34+
{
35+
name: 'ember-lts-3.28',
36+
npm: {
37+
devDependencies: {
38+
'ember-source': '~3.28.0',
39+
},
40+
},
41+
},
2642
{
2743
name: 'ember-release',
2844
npm: {
@@ -70,6 +86,9 @@ module.exports = async function () {
7086
}),
7187
},
7288
npm: {
89+
devDependencies: {
90+
'ember-source': '~3.28.0',
91+
},
7392
ember: {
7493
edition: 'classic',
7594
},

ember-cli-build.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,11 @@ module.exports = function (defaults) {
1515
*/
1616

1717
const { maybeEmbroider } = require('@embroider/test-setup');
18-
return maybeEmbroider(app);
18+
return maybeEmbroider(app, {
19+
skipBabel: [
20+
{
21+
package: 'qunit',
22+
},
23+
],
24+
});
1925
};

package.json

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
},
2121
"scripts": {
2222
"build": "ember build --environment=production",
23-
"lint": "npm-run-all --aggregate-output --continue-on-error --parallel 'lint:!(fix)'",
23+
"lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
2424
"lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix",
2525
"lint:hbs": "ember-template-lint .",
2626
"lint:hbs:fix": "ember-template-lint . --fix",
@@ -32,53 +32,54 @@
3232
"ember-compatibility-tests": "ember try:each"
3333
},
3434
"dependencies": {
35-
"ember-cli-babel": "^7.26.3",
36-
"ember-cli-htmlbars": "^5.7.1",
35+
"ember-cli-babel": "^7.26.10",
36+
"ember-cli-htmlbars": "^5.7.2",
3737
"ember-in-element-polyfill": "^1.0.0"
3838
},
3939
"devDependencies": {
4040
"@ember/optional-features": "^2.0.0",
41-
"@ember/test-helpers": "^2.2.5",
42-
"@embroider/test-setup": "^0.37.0",
41+
"@ember/test-helpers": "^2.6.0",
42+
"@embroider/test-setup": "^0.48.1",
4343
"@glimmer/component": "^1.0.4",
4444
"@glimmer/tracking": "^1.0.4",
4545
"babel-eslint": "^10.1.0",
4646
"broccoli-asset-rev": "^3.0.0",
4747
"chai": "^4.2.0",
4848
"ember-auto-import": "^2.6.3",
49-
"ember-cli": "~3.26.1",
49+
"ember-cli": "~3.28.6",
5050
"ember-cli-dependency-checker": "^3.2.0",
5151
"ember-cli-fastboot": "^4.1.1",
5252
"ember-cli-fastboot-testing": "^0.5.0",
53-
"ember-cli-inject-live-reload": "^2.0.2",
53+
"ember-cli-inject-live-reload": "^2.1.0",
5454
"ember-cli-sri": "^2.1.1",
55-
"ember-cli-terser": "^4.0.1",
55+
"ember-cli-terser": "^4.0.2",
5656
"ember-disable-prototype-extensions": "^1.1.3",
5757
"ember-export-application-global": "^2.0.1",
5858
"ember-load-initializers": "^2.1.2",
5959
"ember-maybe-import-regenerator": "^0.1.6",
60-
"ember-page-title": "^6.2.1",
61-
"ember-qunit": "^5.1.4",
62-
"ember-resolver": "^8.0.2",
63-
"ember-source": "~3.26.1",
60+
"ember-page-title": "^6.2.2",
61+
"ember-qunit": "^5.1.5",
62+
"ember-resolver": "^8.0.3",
63+
"ember-source": "~3.28.8",
6464
"ember-source-channel-url": "^3.0.0",
65-
"ember-template-lint": "^3.2.0",
65+
"ember-template-lint": "^3.15.0",
6666
"ember-try": "^3.0.0",
67-
"eslint": "^7.23.0",
68-
"eslint-config-prettier": "^8.1.0",
69-
"eslint-plugin-ember": "^10.3.0",
67+
"eslint": "^7.32.0",
68+
"eslint-config-prettier": "^8.3.0",
69+
"eslint-plugin-ember": "^10.5.8",
7070
"eslint-plugin-node": "^11.1.0",
71-
"eslint-plugin-prettier": "^3.3.1",
71+
"eslint-plugin-prettier": "^3.4.1",
72+
"eslint-plugin-qunit": "^6.2.0",
7273
"loader.js": "^4.7.0",
7374
"npm-run-all": "^4.1.5",
74-
"prettier": "^2.2.1",
75-
"qunit": "^2.14.1",
75+
"prettier": "^2.5.1",
76+
"qunit": "^2.17.2",
7677
"qunit-dom": "^1.6.0",
7778
"release-plan": "^0.5.1",
7879
"webpack": "^5.85.0"
7980
},
8081
"engines": {
81-
"node": "12.* || >= 14"
82+
"node": "12.* || 14.* || >= 16"
8283
},
8384
"publishConfig": {
8485
"registry": "https://registry.npmjs.org"

0 commit comments

Comments
 (0)