Merge pull request #737 from ember-cli/ember-cli-update

Update blueprint to 3.28

Author: ef4

.eslintignore

@@ -14,6 +14,9 @@
 
 # misc
 /coverage/
+!.*
+.*/
+.eslintcache
 
 # ember-try
 /.node_modules.ember-try/

.eslintrc.js

@@ -10,24 +10,27 @@ module.exports = {
   env: {
     browser: true,
   },
-  rules: {},
+  rules: {
+    'ember/no-classic-components': 'off',
+    'ember/no-classic-classes': 'off',
+    'ember/require-tagless-components': 'off',
+  },
   overrides: [
     // node files
     {
       files: [
-        '.eslintrc.js',
-        '.prettierrc.js',
-        '.template-lintrc.js',
+        './.eslintrc.js',
+        './.prettierrc.js',
+        './.template-lintrc.js',
         'colocated-broccoli-plugin.js',
-        'ember-cli-build.js',
+        './ember-cli-build.js',
         'lib/**/*.js',
-        'testem.js',
-        'blueprints/*/index.js',
-        'config/**/*.js',
-        'tests/dummy/config/**/*.js',
+        './testem.js',
+        './blueprints/*/index.js',
+        './config/**/*.js',
+        './tests/dummy/config/**/*.js',
         'tests/dummy/lib/**/*.js',
       ],
-      excludedFiles: ['addon/**', 'addon-test-support/**', 'app/**', 'tests/dummy/app/**'],
       parserOptions: {
         sourceType: 'script',
         ecmaVersion: 2018,
@@ -59,5 +62,10 @@ module.exports = {
         // add your custom rules and overrides for node files here
       }),
     },
+    {
+      // Test files:
+      files: ['tests/**/*-test.{js,ts}'],
+      extends: ['plugin:qunit/recommended'],
+    },
   ],
 };

.github/workflows/ci.yml

@@ -33,7 +33,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu, windows]
-        node-version: [12.x, 13.x, 14.x]
+        node-version: [12.x, 14.x]
 
     steps:
     - uses: actions/checkout@v1
@@ -76,13 +76,14 @@ jobs:
       matrix:
         ember-try-scenario:
          - ember-lts-3.8
-         - ember-lts-3.12
-         - ember-lts-3.16
+         - ember-lts-3.20
+         - ember-lts-3.24
          - ember-release
-         - ember-octane
          - ember-beta
          - ember-canary
+         - ember-classic
          - ember-default-with-jquery
+         - embroider-safe
          - with-ember-cli-htmlbars-inline-precompile
 
     steps:

.npmignore

@@ -12,13 +12,18 @@
 /.eslintignore
 /.eslintrc.js
 /.gitignore
+/.prettierignore
+/.prettierrc.js
+/.template-lintrc.js
+/.travis.yml
 /.watchmanconfig
 /.travis.yml
 /bower.json
 /config/ember-try.js
 /ember-cli-build.js
 /testem.js
 /tests/
+/yarn-error.log
 /yarn.lock
 /node-tests/
 .gitkeep

.template-lintrc.js

@@ -2,4 +2,8 @@
 
 module.exports = {
   extends: 'recommended',
+  rules: {
+    'no-curly-component-invocation': false,
+    'no-implicit-this': false,
+  },
 };

config/ember-try.js

@@ -1,102 +1,97 @@
 'use strict';
 
 const getChannelURL = require('ember-source-channel-url');
+const { embroiderSafe } = require('@embroider/test-setup');
 
-module.exports = function () {
-  return Promise.all([
-    getChannelURL('release'),
-    getChannelURL('beta'),
-    getChannelURL('canary'),
-  ]).then((urls) => {
-    return {
-      useYarn: true,
-      scenarios: [
-        {
-          name: 'ember-lts-3.8',
-          npm: {
-            devDependencies: {
-              'ember-source': '~3.8.0',
-            },
+module.exports = async function () {
+  return {
+    useYarn: true,
+    scenarios: [
+      {
+        name: 'ember-lts-3.8',
+        npm: {
+          devDependencies: {
+            'ember-source': '~3.8.0',
           },
         },
-        {
-          name: 'ember-lts-3.12',
-          npm: {
-            devDependencies: {
-              'ember-source': '~3.12.0',
-            },
+      },
+      {
+        name: 'ember-lts-3.20',
+        npm: {
+          devDependencies: {
+            'ember-source': '~3.20.5',
           },
         },
-        {
-          name: 'ember-lts-3.16',
-          npm: {
-            devDependencies: {
-              'ember-source': '~3.16.0',
-            },
+      },
+      {
+        name: 'ember-lts-3.24',
+        npm: {
+          devDependencies: {
+            'ember-source': '~3.24.3',
           },
         },
-        {
-          name: 'ember-release',
-          npm: {
-            devDependencies: {
-              'ember-source': urls[0],
-            },
+      },
+      {
+        name: 'ember-release',
+        npm: {
+          devDependencies: {
+            'ember-source': await getChannelURL('release'),
           },
         },
-        {
-          name: 'ember-beta',
-          npm: {
-            devDependencies: {
-              'ember-source': urls[1],
-            },
+      },
+      {
+        name: 'ember-beta',
+        npm: {
+          devDependencies: {
+            'ember-source': await getChannelURL('beta'),
           },
         },
-        {
-          name: 'ember-canary',
-          npm: {
-            devDependencies: {
-              'ember-source': urls[2],
-            },
+      },
+      {
+        name: 'ember-canary',
+        npm: {
+          devDependencies: {
+            'ember-source': await getChannelURL('canary'),
           },
         },
-        {
-          name: 'ember-default',
-          npm: {
-            devDependencies: {},
-          },
+      },
+      {
+        name: 'ember-default-with-jquery',
+        env: {
+          EMBER_OPTIONAL_FEATURES: JSON.stringify({
+            'jquery-integration': true,
+          }),
         },
-        {
-          name: 'ember-octane',
-          ENV: {
-            // need to add a convienient API for this to @ember/edition-utils
-            EMBER_EDITION: 'octane',
-          },
-          npm: {
-            devDependencies: {},
+        npm: {
+          devDependencies: {
+            '@ember/jquery': '^1.1.0',
           },
         },
-        {
-          name: 'with-ember-cli-htmlbars-inline-precompile',
-          npm: {
-            devDependencies: {
-              'ember-cli-htmlbars-inline-precompile': '^3.0.0',
-            },
-          },
+      },
+      {
+        name: 'ember-classic',
+        env: {
+          EMBER_OPTIONAL_FEATURES: JSON.stringify({
+            'application-template-wrapper': true,
+            'default-async-observers': false,
+            'template-only-glimmer-components': false,
+          }),
         },
-        {
-          name: 'ember-default-with-jquery',
-          env: {
-            EMBER_OPTIONAL_FEATURES: JSON.stringify({
-              'jquery-integration': true,
-            }),
+        npm: {
+          ember: {
+            edition: 'classic',
           },
-          npm: {
-            devDependencies: {
-              '@ember/jquery': '^0.5.1',
-            },
+        },
+      },
+      embroiderSafe(),
+      {
+        name: 'with-ember-cli-htmlbars-inline-precompile',
+        npm: {
+          devDependencies: {
+            'ember-cli-htmlbars-inline-precompile': '^3.0.0',
           },
         },
-      ],
-    };
-  });
+      },
+    ],
+  };
 };

ember-cli-build.js

@@ -49,5 +49,12 @@ module.exports = function (defaults) {
     behave. You most likely want to be modifying `./index.js` or app's build file
   */
 
-  return app.toTree();
+  const { maybeEmbroider } = require('@embroider/test-setup');
+  return maybeEmbroider(app, {
+    skipBabel: [
+      {
+        package: 'qunit',
+      },
+    ],
+  });
 };

package.json

@@ -32,8 +32,8 @@
     "test:node:debug": "mocha debug node-tests/*.js"
   },
   "dependencies": {
-    "babel-plugin-ember-template-compilation": "^1.0.0",
     "@ember/edition-utils": "^1.2.0",
+    "babel-plugin-ember-template-compilation": "^1.0.0",
     "babel-plugin-htmlbars-inline-precompile": "^5.3.0",
     "broccoli-debug": "^0.6.5",
     "broccoli-persistent-filter": "^3.1.2",
@@ -57,6 +57,7 @@
     "@babel/runtime": "^7.13.8",
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^2.4.2",
+    "@embroider/test-setup": "^0.47.0",
     "babel-eslint": "^10.1.0",
     "babel-plugin-debug-macros": "^0.3.3",
     "broccoli-merge-trees": "^4.2.0",
@@ -67,26 +68,27 @@
     "console-ui": "^3.1.2",
     "core-object": "^3.1.5",
     "ember-auto-import": "^2.2.0",
-    "ember-cli": "~3.25.2",
+    "ember-cli": "~3.28.2",
     "ember-cli-app-version": "^4.0.0",
-    "ember-cli-babel": "^7.25.0",
+    "ember-cli-babel": "^7.26.6",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-export-application-global": "^2.0.1",
     "ember-load-initializers": "^2.1.1",
     "ember-maybe-import-regenerator": "^0.1.6",
     "ember-qunit": "^5.1.4",
     "ember-resolver": "^8.0.2",
-    "ember-source": "~3.25.0",
+    "ember-source": "~3.28.0",
     "ember-source-channel-url": "^3.0.0",
-    "ember-template-lint": "^2.9.1",
+    "ember-template-lint": "^3.6.0",
     "ember-try": "^1.4.0",
-    "eslint": "^7.25.0",
+    "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-ember": "^8.13.0",
+    "eslint-plugin-ember": "^10.5.4",
     "eslint-plugin-mocha": "^8.0.0",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^3.4.0",
+    "eslint-plugin-prettier": "^3.4.1",
+    "eslint-plugin-qunit": "^6.2.0",
     "fixturify": "^2.1.1",
     "loader.js": "^4.7.0",
     "mocha": "^8.4.0",
@@ -99,7 +101,7 @@
     "webpack": "^5.58.2"
   },
   "engines": {
-    "node": ">= 12.*"
+    "node": "12.* || 14.* || >= 16"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"

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

@@ -0,0 +1,21 @@
+{
+  "schemaVersion": "1.0.0",
+  "packages": [
+    {
+      "name": "ember-cli",
+      "version": "3.28.2",
+      "blueprints": [
+        {
+          "name": "addon",
+          "outputRepo": "https://github.com/ember-cli/ember-addon-output",
+          "codemodsSource": "ember-addon-codemods-manifest@1",
+          "isBaseBlueprint": true,
+          "options": [
+            "--yarn",
+            "--no-welcome"
+          ]
+        }
+      ]
+    }
+  ]
+}