Skip to content

Commit 46fcfd0

Browse files
committed
update to v3.28.6 with ember-cli-update
1 parent 14238e0 commit 46fcfd0

File tree

9 files changed

+57
-43
lines changed

9 files changed

+57
-43
lines changed

packages/ember-cli-fastboot/.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
# misc
1414
/coverage/
1515
!.*
16+
.*/
1617
.eslintcache
1718

1819
# ember-try

packages/ember-cli-fastboot/.eslintrc.js

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -28,23 +28,15 @@ module.exports = {
2828
// node files
2929
{
3030
files: [
31-
'.eslintrc.js',
32-
'.prettierrc.js',
33-
'.template-lintrc.js',
34-
'ember-cli-build.js',
35-
'index.js',
36-
'testem.js',
37-
'blueprints/*/index.js',
38-
'config/**/*.js',
39-
'tests/dummy/config/**/*.js',
40-
'lib/**/*.js'
41-
],
42-
excludedFiles: [
43-
'app/**',
44-
'addon/**',
45-
'addon-test-support/**',
46-
'app/**',
47-
'tests/dummy/app/**',
31+
'./.eslintrc.js',
32+
'./.prettierrc.js',
33+
'./.template-lintrc.js',
34+
'./ember-cli-build.js',
35+
'./index.js',
36+
'./testem.js',
37+
'./blueprints/*/index.js',
38+
'./config/**/*.js',
39+
'./tests/dummy/config/**/*.js',
4840
],
4941
parserOptions: {
5042
sourceType: 'script',
@@ -56,5 +48,10 @@ module.exports = {
5648
plugins: ['node'],
5749
extends: ['plugin:node/recommended'],
5850
},
51+
{
52+
// Test files:
53+
files: ['tests/**/*-test.{js,ts}'],
54+
extends: ['plugin:qunit/recommended'],
55+
},
5956
],
6057
};

packages/ember-cli-fastboot/.npmignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
/testem.js
2828
/test/
2929
/tests/
30+
/yarn-error.log
3031
/yarn.lock
3132
.gitkeep
3233

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
};

packages/ember-cli-fastboot/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
};

packages/ember-cli-fastboot/package.json

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
},
1515
"scripts": {
1616
"build": "ember build --environment=production",
17-
"lint": "npm-run-all --aggregate-output --continue-on-error --parallel 'lint:!(fix)'",
17+
"lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
1818
"lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix",
1919
"lint:hbs": "ember-template-lint .",
2020
"lint:hbs:fix": "ember-template-lint . --fix",
@@ -35,7 +35,7 @@
3535
"broccoli-merge-trees": "^4.2.0",
3636
"broccoli-plugin": "^4.0.7",
3737
"chalk": "^4.1.2",
38-
"ember-cli-babel": "^7.26.6",
38+
"ember-cli-babel": "^7.26.10",
3939
"ember-cli-lodash-subset": "^2.0.1",
4040
"ember-cli-preprocess-registry": "^3.3.0",
4141
"ember-cli-version-checker": "^5.1.2",
@@ -51,48 +51,49 @@
5151
"devDependencies": {
5252
"@ember/optional-features": "^2.0.0",
5353
"@ember/test-helpers": "^2.6.0",
54-
"@embroider/test-setup": "^0.37.0",
54+
"@embroider/test-setup": "^0.48.1",
5555
"@glimmer/component": "^1.0.4",
5656
"@glimmer/tracking": "^1.0.4",
5757
"babel-eslint": "^10.1.0",
5858
"body-parser": "^1.18.3",
5959
"broccoli-asset-rev": "^3.0.0",
6060
"broccoli-test-helper": "^1.5.0",
61-
"co": "4.6.0",
6261
"chai": "^4.3.4",
6362
"chai-fs": "^2.0.0",
6463
"chai-string": "^1.4.0",
64+
"co": "4.6.0",
6565
"ember-auto-import": "^2.2.1",
6666
"ember-cli": "~4.1.0",
6767
"ember-cli-addon-tests": "^0.11.1",
6868
"ember-cli-dependency-checker": "^3.2.0",
69-
"ember-cli-htmlbars": "^5.7.1",
70-
"ember-cli-inject-live-reload": "^2.0.2",
69+
"ember-cli-htmlbars": "^5.7.2",
70+
"ember-cli-inject-live-reload": "^2.1.0",
7171
"ember-cli-sri": "^2.1.1",
72-
"ember-cli-terser": "^4.0.1",
72+
"ember-cli-terser": "^4.0.2",
7373
"ember-disable-prototype-extensions": "^1.1.3",
7474
"ember-export-application-global": "^2.0.1",
7575
"ember-load-initializers": "^2.1.2",
7676
"ember-maybe-import-regenerator-for-testing": "^1.0.0",
7777
"ember-page-title": "^7.0.0",
7878
"ember-qunit": "^5.1.5",
79-
"ember-resolver": "^8.0.2",
79+
"ember-resolver": "^8.0.3",
8080
"ember-sinon": "^2.2.0",
81-
"ember-source": "~3.26.1",
81+
"ember-source": "~3.28.8",
8282
"ember-source-channel-url": "^3.0.0",
83-
"ember-template-lint": "^3.2.0",
83+
"ember-template-lint": "^3.15.0",
8484
"ember-try": "^1.4.0",
85-
"eslint": "^7.23.0",
86-
"eslint-config-prettier": "^8.1.0",
87-
"eslint-plugin-ember": "^10.3.0",
85+
"eslint": "^7.32.0",
86+
"eslint-config-prettier": "^8.3.0",
87+
"eslint-plugin-ember": "^10.5.8",
8888
"eslint-plugin-node": "^11.1.0",
89-
"eslint-plugin-prettier": "^3.3.1",
89+
"eslint-plugin-prettier": "^3.4.1",
90+
"eslint-plugin-qunit": "^6.2.0",
9091
"glob": "^7.1.3",
9192
"loader.js": "^4.7.0",
9293
"mocha": "^9.1.2",
9394
"npm-run-all": "^4.1.5",
94-
"prettier": "^2.2.1",
95-
"qunit": "^2.14.1",
95+
"prettier": "^2.5.1",
96+
"qunit": "^2.17.2",
9697
"qunit-dom": "^1.6.0",
9798
"release-it": "^14.2.2",
9899
"release-it-lerna-changelog": "^3.1.0",

packages/ember-cli-fastboot/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": "3.26.1",
6+
"version": "3.28.6",
77
"blueprints": [
88
{
99
"name": "addon",

packages/ember-cli-fastboot/tests/dummy/config/targets.js

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,20 @@ const browsers = [
66
'last 1 Safari versions',
77
];
88

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

1624
module.exports = {
1725
browsers,

packages/ember-cli-fastboot/tests/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</div>
2929
</div>
3030

31-
<script src="/testem.js" integrity=""></script>
31+
<script src="/testem.js" integrity="" data-embroider-ignore></script>
3232
<script src="{{rootURL}}assets/vendor.js"></script>
3333
<script src="{{rootURL}}assets/test-support.js"></script>
3434
<script src="{{rootURL}}assets/dummy.js"></script>

0 commit comments

Comments
 (0)