Merge pull request #2315 from SergeAstapov/ember-cli-update

Run `npx ember-cli-update --to=4.1.0` to sync with the latest blueprint
miragejs · Jan 14, 2022 · 290ba6d · 290ba6d
2 parents 3e3a182 + f1ffb7b
commit 290ba6d
Show file tree

Hide file tree

Showing 21 changed files with 229 additions and 245 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -22,5 +22,7 @@
 # ember-try
 /.node_modules.ember-try/
 /bower.json.ember-try
+/npm-shrinkwrap.json.ember-try
 /package.json.ember-try
+/package-lock.json.ember-try
 /yarn.lock.ember-try
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -50,7 +50,7 @@ module.exports = {
       extends: ['plugin:node/recommended'],
     },
     {
-      // Test files:
+      // test files
       files: ['tests/**/*-test.{js,ts}'],
       extends: ['plugin:qunit/recommended'],
     },

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -7,6 +7,10 @@ on:
       - master
   pull_request: {}
 
+concurrency:
+   group: ci-${{ github.head_ref || github.ref }}
+   cancel-in-progress: true
+
 jobs:
   test:
     name: "Tests"
@@ -62,13 +66,12 @@ jobs:
           - ember-lts-3.20
           - ember-lts-3.24
           - ember-lts-3.28
-          #- ember-release
-          #- ember-beta
-          #- ember-canary
+          - ember-release
+          - ember-beta
+          - ember-canary
           - ember-classic
-          - ember-default-with-jquery
-          #- embroider-safe
-          #- embroider-optimized
+#          - embroider-safe
+#          - embroider-optimized
 
     steps:
       - uses: actions/checkout@v2

diff --git a/.gitignore b/.gitignore
@@ -23,7 +23,10 @@
 # ember-try
 /.node_modules.ember-try/
 /bower.json.ember-try
+/npm-shrinkwrap.json.ember-try
 /package.json.ember-try
+/package-lock.json.ember-try
+/yarn.lock.ember-try
 
 # custom
 .floo

diff --git a/.node-version b/.node-version
@@ -1 +1 @@
-10.19.0
+12.22.7
diff --git a/.npmignore b/.npmignore
@@ -14,15 +14,21 @@
 /.eslintignore
 /.eslintrc.js
 /.git/
+/.github/
 /.gitignore
+/.node-version
 /.prettierignore
 /.prettierrc.js
 /.template-lintrc.js
 /.travis.yml
 /.watchmanconfig
 /bower.json
+/config/addon-docs.js
+/config/deploy.js
 /config/ember-try.js
 /CONTRIBUTING.md
+/ISSUE_TEMPLATE.md
+/SECURITY.md
 /ember-cli-build.js
 /testem.js
 /tests/
@@ -33,7 +39,10 @@
 # ember-try
 /.node_modules.ember-try/
 /bower.json.ember-try
+/npm-shrinkwrap.json.ember-try
 /package.json.ember-try
+/package-lock.json.ember-try
+/yarn.lock.ember-try
 
 /.sass-cache
 /jekyll-tmp

diff --git a/.prettierignore b/.prettierignore
@@ -15,8 +15,12 @@
 /coverage/
 !.*
 .eslintcache
+.lint-todo/
 
 # ember-try
 /.node_modules.ember-try/
 /bower.json.ember-try
+/npm-shrinkwrap.json.ember-try
 /package.json.ember-try
+/package-lock.json.ember-try
+/yarn.lock.ember-try
diff --git a/README.md b/README.md
@@ -10,6 +10,12 @@ A client-side server to develop, test and prototype your Ember CLI app.
 
 ----
 
+## Compatibility
+
+* Ember.js v3.12 or above
+* Ember CLI v3.12 or above
+* Node.js v12 or above
+
 ## Installation
 
 ```sh

diff --git a/config/ember-try.js b/config/ember-try.js
@@ -57,10 +57,6 @@ module.exports = async function () {
           devDependencies: {
             'ember-source': await getChannelURL('release'),
           },
-          dependencies: {
-            'ember-auto-import': '^2.2.4',
-            webpack: '^5.64.4',
-          },
         },
       },
       {
@@ -69,10 +65,6 @@ module.exports = async function () {
           devDependencies: {
             'ember-source': await getChannelURL('beta'),
           },
-          dependencies: {
-            'ember-auto-import': '^2.2.4',
-            webpack: '^5.64.4',
-          },
         },
       },
       {
@@ -81,23 +73,6 @@ module.exports = async function () {
           devDependencies: {
             'ember-source': await getChannelURL('canary'),
           },
-          dependencies: {
-            'ember-auto-import': '^2.2.4',
-            webpack: '^5.64.4',
-          },
-        },
-      },
-      {
-        name: 'ember-default-with-jquery',
-        env: {
-          EMBER_OPTIONAL_FEATURES: JSON.stringify({
-            'jquery-integration': true,
-          }),
-        },
-        npm: {
-          devDependencies: {
-            '@ember/jquery': '^1.1.0',
-          },
         },
       },
       {

diff --git a/package.json b/package.json
@@ -44,7 +44,7 @@
     "broccoli-funnel": "^3.0.3",
     "broccoli-merge-trees": "^4.2.0",
     "ember-auto-import": "^2.2.4",
-    "ember-cli-babel": "^7.26.6",
+    "ember-cli-babel": "^7.26.11",
     "ember-destroyable-polyfill": "^2.0.3",
     "ember-get-config": "0.2.4 - 0.5.0 || ^1.0.0",
     "ember-inflector": "^2.0.0 || ^3.0.0 || ^4.0.2",
@@ -71,12 +71,12 @@
     "@ember/jquery": "^2.0.0",
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^2.6.0",
-    "@embroider/test-setup": "^0.41.0",
+    "@embroider/test-setup": "^0.50.1",
     "@glimmer/component": "^1.0.4",
     "@glimmer/tracking": "^1.0.4",
     "babel-eslint": "^10.1.0",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-cli": "~3.28.4",
+    "ember-cli": "~4.1.0",
     "ember-cli-addon-docs": "^4.2.1",
     "ember-cli-addon-docs-esdoc": "^0.4.0",
     "ember-cli-dependency-checker": "^3.2.0",
@@ -97,20 +97,19 @@
     "ember-export-application-global": "^2.0.1",
     "ember-fetch": "^8.1.1",
     "ember-load-initializers": "^2.1.2",
-    "ember-maybe-import-regenerator": "^1.0.0",
     "ember-moment": "^9.0.1",
     "ember-qunit": "^5.1.5",
     "ember-resolver": "^8.0.3",
-    "ember-source": "~3.28.8",
+    "ember-source": "~4.1.0",
     "ember-source-channel-url": "^3.0.0",
-    "ember-template-lint": "^3.14.0",
+    "ember-template-lint": "^3.15.0",
     "ember-try": "^2.0.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": "^4.0.0",
-    "eslint-plugin-qunit": "^7.1.0",
+    "eslint-plugin-qunit": "^7.2.0",
     "faker": "^5.1.0",
     "fastboot": "^3.2.0-beta.5",
     "js-yaml": "^4.0.0",

diff --git a/test-projects/01-basic-app/.gitignore b/test-projects/01-basic-app/.gitignore
@@ -21,6 +21,9 @@
 /yarn-error.log
 
 # ember-try
-.node_modules.ember-try/
-bower.json.ember-try
-package.json.ember-try
+/.node_modules.ember-try/
+/bower.json.ember-try
+/npm-shrinkwrap.json.ember-try
+/package.json.ember-try
+/package-lock.json.ember-try
+/yarn.lock.ember-try
diff --git a/test-projects/01-basic-app/config/ember-cli-update.json b/test-projects/01-basic-app/config/ember-cli-update.json
@@ -3,7 +3,7 @@
   "packages": [
     {
       "name": "ember-cli",
-      "version": "3.28.4",
+      "version": "4.1.0",
       "blueprints": [
         {
           "name": "app",

diff --git a/test-projects/01-basic-app/config/targets.js b/test-projects/01-basic-app/config/targets.js
@@ -6,21 +6,6 @@ const browsers = [
   'last 1 Safari versions',
 ];
 
-// 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,
   node: 'current',

diff --git a/test-projects/01-basic-app/package.json b/test-projects/01-basic-app/package.json
@@ -39,7 +39,6 @@
     "ember-export-application-global": "*",
     "ember-fetch": "*",
     "ember-load-initializers": "*",
-    "ember-maybe-import-regenerator": "*",
     "ember-qunit": "*",
     "ember-resolver": "*",
     "ember-source": "*",
@@ -50,10 +49,11 @@
     "miragejs": "*",
     "npm-run-all": "*",
     "qunit": "*",
-    "qunit-dom": "*"
+    "qunit-dom": "*",
+    "webpack": "*"
   },
   "engines": {
-    "node": ">= 10.*"
+    "node": "12.* || 14.* || >= 16"
   },
   "ember": {
     "edition": "octane"

diff --git a/test-projects/02-app-that-excludes-mirage/.gitignore b/test-projects/02-app-that-excludes-mirage/.gitignore
@@ -21,6 +21,9 @@
 /yarn-error.log
 
 # ember-try
-.node_modules.ember-try/
-bower.json.ember-try
-package.json.ember-try
+/.node_modules.ember-try/
+/bower.json.ember-try
+/npm-shrinkwrap.json.ember-try
+/package.json.ember-try
+/package-lock.json.ember-try
+/yarn.lock.ember-try
diff --git a/test-projects/02-app-that-excludes-mirage/config/ember-cli-update.json b/test-projects/02-app-that-excludes-mirage/config/ember-cli-update.json
@@ -3,7 +3,7 @@
   "packages": [
     {
       "name": "ember-cli",
-      "version": "3.28.4",
+      "version": "4.1.0",
       "blueprints": [
         {
           "name": "app",

diff --git a/test-projects/02-app-that-excludes-mirage/config/targets.js b/test-projects/02-app-that-excludes-mirage/config/targets.js
@@ -6,21 +6,6 @@ const browsers = [
   'last 1 Safari versions',
 ];
 
-// 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,
   node: 'current',

diff --git a/test-projects/02-app-that-excludes-mirage/package.json b/test-projects/02-app-that-excludes-mirage/package.json
@@ -39,7 +39,6 @@
     "ember-export-application-global": "*",
     "ember-fetch": "*",
     "ember-load-initializers": "*",
-    "ember-maybe-import-regenerator": "*",
     "ember-qunit": "*",
     "ember-resolver": "*",
     "ember-source": "*",
@@ -50,10 +49,11 @@
     "miragejs": "*",
     "npm-run-all": "*",
     "qunit": "*",
-    "qunit-dom": "*"
+    "qunit-dom": "*",
+    "webpack": "*"
   },
   "engines": {
-    "node": ">= 10.*"
+    "node": "12.* || 14.* || >= 16"
   },
   "ember": {
     "edition": "octane"

diff --git a/tests/dummy/config/ember-cli-update.json b/tests/dummy/config/ember-cli-update.json
@@ -3,7 +3,7 @@
   "packages": [
     {
       "name": "ember-cli",
-      "version": "3.28.4",
+      "version": "4.1.0",
       "blueprints": [
         {
           "name": "addon",

diff --git a/tests/dummy/config/targets.js b/tests/dummy/config/targets.js
@@ -6,21 +6,6 @@ const browsers = [
   'last 1 Safari versions',
 ];
 
-// 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,
   node: 'current',