diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bc8b07ba..011989dd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,8 +22,10 @@ jobs:
test-all-packages:
name: Ember Tests
runs-on: ${{ matrix.os }}
+ timeout-minutes: 10
strategy:
+ fail-fast: false
matrix:
node-version: [16.x, 14.x]
os: [ubuntu-latest, windows-latest]
@@ -51,8 +53,10 @@ jobs:
integration-tests:
name: Integration Tests
runs-on: ${{ matrix.os }}
+ timeout-minutes: 10
strategy:
+ fail-fast: false
matrix:
node-version: [16.x, 14.x]
os: [ubuntu-latest, windows-latest]
@@ -73,8 +77,10 @@ jobs:
test-packages:
name: Test Packages
runs-on: ${{ matrix.os }}
+ timeout-minutes: 10
strategy:
+ fail-fast: false
matrix:
node-version: [16.x, 14.x]
os: [ubuntu-latest, windows-latest]
@@ -99,6 +105,7 @@ jobs:
test-legacy-mocha:
name: Legacy Mocha Tests - ${{ matrix.node-version }}
runs-on: ubuntu-latest
+ timeout-minutes: 10
strategy:
fail-fast: false
@@ -122,7 +129,7 @@ jobs:
try-scenarios:
name: "ember-try for ember-cli-fastboot: ${{ matrix.ember-try-scenario }}"
runs-on: ubuntu-latest
- timeout-minutes: 7
+ timeout-minutes: 10
strategy:
fail-fast: false
diff --git a/packages/ember-cli-fastboot/.eslintignore b/packages/ember-cli-fastboot/.eslintignore
index 92216555..701947ed 100644
--- a/packages/ember-cli-fastboot/.eslintignore
+++ b/packages/ember-cli-fastboot/.eslintignore
@@ -13,6 +13,7 @@
# misc
/coverage/
!.*
+.*/
.eslintcache
# ember-try
diff --git a/packages/ember-cli-fastboot/.eslintrc.js b/packages/ember-cli-fastboot/.eslintrc.js
index e3534bf0..a979bfe4 100644
--- a/packages/ember-cli-fastboot/.eslintrc.js
+++ b/packages/ember-cli-fastboot/.eslintrc.js
@@ -28,23 +28,15 @@ module.exports = {
// node files
{
files: [
- '.eslintrc.js',
- '.prettierrc.js',
- '.template-lintrc.js',
- 'ember-cli-build.js',
- 'index.js',
- 'testem.js',
- 'blueprints/*/index.js',
- 'config/**/*.js',
- 'tests/dummy/config/**/*.js',
- 'lib/**/*.js'
- ],
- excludedFiles: [
- 'app/**',
- 'addon/**',
- 'addon-test-support/**',
- 'app/**',
- 'tests/dummy/app/**',
+ './.eslintrc.js',
+ './.prettierrc.js',
+ './.template-lintrc.js',
+ './ember-cli-build.js',
+ './index.js',
+ './testem.js',
+ './blueprints/*/index.js',
+ './config/**/*.js',
+ './tests/dummy/config/**/*.js',
],
parserOptions: {
sourceType: 'script',
@@ -56,5 +48,10 @@ module.exports = {
plugins: ['node'],
extends: ['plugin:node/recommended'],
},
+ {
+ // Test files:
+ files: ['tests/**/*-test.{js,ts}'],
+ extends: ['plugin:qunit/recommended'],
+ },
],
};
diff --git a/packages/ember-cli-fastboot/.npmignore b/packages/ember-cli-fastboot/.npmignore
index eb8e610c..7f9fb326 100644
--- a/packages/ember-cli-fastboot/.npmignore
+++ b/packages/ember-cli-fastboot/.npmignore
@@ -27,6 +27,7 @@
/testem.js
/test/
/tests/
+/yarn-error.log
/yarn.lock
.gitkeep
diff --git a/packages/ember-cli-fastboot/.template-lintrc.js b/packages/ember-cli-fastboot/.template-lintrc.js
index 3b0b9af9..f35f61c7 100644
--- a/packages/ember-cli-fastboot/.template-lintrc.js
+++ b/packages/ember-cli-fastboot/.template-lintrc.js
@@ -1,5 +1,5 @@
'use strict';
module.exports = {
- extends: 'octane',
+ extends: 'recommended',
};
diff --git a/packages/ember-cli-fastboot/ember-cli-build.js b/packages/ember-cli-fastboot/ember-cli-build.js
index a778499b..e211c633 100644
--- a/packages/ember-cli-fastboot/ember-cli-build.js
+++ b/packages/ember-cli-fastboot/ember-cli-build.js
@@ -15,5 +15,11 @@ module.exports = function (defaults) {
*/
const { maybeEmbroider } = require('@embroider/test-setup');
- return maybeEmbroider(app);
+ return maybeEmbroider(app, {
+ skipBabel: [
+ {
+ package: 'qunit',
+ },
+ ],
+ });
};
diff --git a/packages/ember-cli-fastboot/package.json b/packages/ember-cli-fastboot/package.json
index fcaeb7c3..32d879c4 100644
--- a/packages/ember-cli-fastboot/package.json
+++ b/packages/ember-cli-fastboot/package.json
@@ -14,7 +14,7 @@
},
"scripts": {
"build": "ember build --environment=production",
- "lint": "npm-run-all --aggregate-output --continue-on-error --parallel 'lint:!(fix)'",
+ "lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
"lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix",
"lint:hbs": "ember-template-lint .",
"lint:hbs:fix": "ember-template-lint . --fix",
@@ -35,7 +35,7 @@
"broccoli-merge-trees": "^4.2.0",
"broccoli-plugin": "^4.0.7",
"chalk": "^4.1.2",
- "ember-cli-babel": "^7.26.6",
+ "ember-cli-babel": "^7.26.10",
"ember-cli-lodash-subset": "^2.0.1",
"ember-cli-preprocess-registry": "^3.3.0",
"ember-cli-version-checker": "^5.1.2",
@@ -51,48 +51,49 @@
"devDependencies": {
"@ember/optional-features": "^2.0.0",
"@ember/test-helpers": "^2.6.0",
- "@embroider/test-setup": "^0.37.0",
+ "@embroider/test-setup": "^0.48.1",
"@glimmer/component": "^1.0.4",
"@glimmer/tracking": "^1.0.4",
"babel-eslint": "^10.1.0",
"body-parser": "^1.18.3",
"broccoli-asset-rev": "^3.0.0",
"broccoli-test-helper": "^1.5.0",
- "co": "4.6.0",
"chai": "^4.3.4",
"chai-fs": "^2.0.0",
"chai-string": "^1.4.0",
+ "co": "4.6.0",
"ember-auto-import": "^2.2.1",
"ember-cli": "~4.1.0",
"ember-cli-addon-tests": "^0.11.1",
"ember-cli-dependency-checker": "^3.2.0",
- "ember-cli-htmlbars": "^5.7.1",
- "ember-cli-inject-live-reload": "^2.0.2",
+ "ember-cli-htmlbars": "^5.7.2",
+ "ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-sri": "^2.1.1",
- "ember-cli-terser": "^4.0.1",
+ "ember-cli-terser": "^4.0.2",
"ember-disable-prototype-extensions": "^1.1.3",
"ember-export-application-global": "^2.0.1",
"ember-load-initializers": "^2.1.2",
"ember-maybe-import-regenerator-for-testing": "^1.0.0",
"ember-page-title": "^7.0.0",
"ember-qunit": "^5.1.5",
- "ember-resolver": "^8.0.2",
+ "ember-resolver": "^8.0.3",
"ember-sinon": "^2.2.0",
- "ember-source": "~3.26.1",
+ "ember-source": "~3.28.8",
"ember-source-channel-url": "^3.0.0",
- "ember-template-lint": "^3.2.0",
+ "ember-template-lint": "^3.15.0",
"ember-try": "^1.4.0",
- "eslint": "^7.23.0",
- "eslint-config-prettier": "^8.1.0",
- "eslint-plugin-ember": "^10.3.0",
+ "eslint": "^7.32.0",
+ "eslint-config-prettier": "^8.3.0",
+ "eslint-plugin-ember": "^10.5.8",
"eslint-plugin-node": "^11.1.0",
- "eslint-plugin-prettier": "^3.3.1",
+ "eslint-plugin-prettier": "^3.4.1",
+ "eslint-plugin-qunit": "^6.2.0",
"glob": "^7.1.3",
"loader.js": "^4.7.0",
"mocha": "^9.1.2",
"npm-run-all": "^4.1.5",
- "prettier": "^2.2.1",
- "qunit": "^2.14.1",
+ "prettier": "^2.5.1",
+ "qunit": "^2.17.2",
"qunit-dom": "^1.6.0",
"release-it": "^14.2.2",
"release-it-lerna-changelog": "^3.1.0",
diff --git a/packages/ember-cli-fastboot/tests/dummy/config/ember-cli-update.json b/packages/ember-cli-fastboot/tests/dummy/config/ember-cli-update.json
index 3a4ab322..871e6e48 100644
--- a/packages/ember-cli-fastboot/tests/dummy/config/ember-cli-update.json
+++ b/packages/ember-cli-fastboot/tests/dummy/config/ember-cli-update.json
@@ -3,7 +3,7 @@
"packages": [
{
"name": "ember-cli",
- "version": "3.26.1",
+ "version": "3.28.6",
"blueprints": [
{
"name": "addon",
diff --git a/packages/ember-cli-fastboot/tests/dummy/config/targets.js b/packages/ember-cli-fastboot/tests/dummy/config/targets.js
index 4b33327e..3cd797ab 100644
--- a/packages/ember-cli-fastboot/tests/dummy/config/targets.js
+++ b/packages/ember-cli-fastboot/tests/dummy/config/targets.js
@@ -6,12 +6,20 @@ const browsers = [
'last 1 Safari versions',
];
-const isCI = Boolean(process.env.CI);
-const isProduction = process.env.EMBER_ENV === 'production';
-
-if (isCI || isProduction) {
- browsers.push('ie 11');
-}
+// Ember's browser support policy is changing, and IE11 support will end in
+// v4.0 onwards.
+//
+// See https://deprecations.emberjs.com/v3.x#toc_3-0-browser-support-policy
+//
+// If you need IE11 support on a version of Ember that still offers support
+// for it, uncomment the code block below.
+//
+// const isCI = Boolean(process.env.CI);
+// const isProduction = process.env.EMBER_ENV === 'production';
+//
+// if (isCI || isProduction) {
+// browsers.push('ie 11');
+// }
module.exports = {
browsers,
diff --git a/packages/ember-cli-fastboot/tests/index.html b/packages/ember-cli-fastboot/tests/index.html
index f5efd816..c4bb4117 100644
--- a/packages/ember-cli-fastboot/tests/index.html
+++ b/packages/ember-cli-fastboot/tests/index.html
@@ -28,7 +28,7 @@
-
+