Merge pull request #834 from ember-fastboot/update

Update using ember-cli-update and drop support for Node 10

.github/ci.yml

@@ -25,7 +25,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x, 12.x, 10.x]
+        node-version: [16.x, 14.x, 12.x]
         os: [ubuntu-latest, windows-latest]
 
     steps:
@@ -53,7 +53,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x, 12.x, 10.x]
+        node-version: [16.x, 14.x, 12.x]
         os: [ubuntu-latest, windows-latest]
 
     steps:
@@ -74,7 +74,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x, 12.x, 10.x]
+        node-version: [16.x, 14.x, 12.x]
         os: [ubuntu-latest, windows-latest]
 
     steps:

packages/ember-cli-fastboot/.editorconfig

@@ -4,7 +4,6 @@
 
 root = true
 
-
 [*]
 end_of_line = lf
 charset = utf-8

packages/ember-cli-fastboot/.eslintignore

@@ -8,9 +8,14 @@
 
 # dependencies
 /bower_components/
+/node_modules/
 
 # misc
 /coverage/
+!.*
+.eslintcache
 
 # ember-try
 /.node_modules.ember-try/
+/bower.json.ember-try
+/package.json.ember-try

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

@@ -1,15 +1,20 @@
+'use strict';
+
 module.exports = {
   root: true,
+  parser: 'babel-eslint',
   parserOptions: {
-    ecmaVersion: 2017,
-    sourceType: 'module'
+    ecmaVersion: 2018,
+    sourceType: 'module',
+    ecmaFeatures: {
+      legacyDecorators: true,
+    },
   },
-  plugins: [
-    'ember'
-  ],
+  plugins: ['ember'],
   extends: [
     'eslint:recommended',
-    'plugin:ember/recommended'
+    'plugin:ember/recommended',
+    'plugin:prettier/recommended',
   ],
   env: {
     browser: true
@@ -18,10 +23,14 @@ module.exports = {
     'ember/no-get': 'warn',
     'ember/require-computed-property-dependencies': 'warn'
   },
+  rules: {},
   overrides: [
     // node files
     {
       files: [
+        '.eslintrc.js',
+        '.prettierrc.js',
+        '.template-lintrc.js',
         'ember-cli-build.js',
         'index.js',
         'testem.js',
@@ -34,28 +43,18 @@ module.exports = {
         'app/**',
         'addon/**',
         'addon-test-support/**',
+        'app/**',
+        'tests/dummy/app/**',
       ],
       parserOptions: {
         sourceType: 'script',
-        ecmaVersion: 2015
       },
       env: {
         browser: false,
-        node: true
+        node: true,
       },
       plugins: ['node'],
-      rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
-        // add your custom rules and overrides for node files here
-      })
+      extends: ['plugin:node/recommended'],
     },
-
-    // test files
-    {
-      files: ['tests/**/*.js'],
-      excludedFiles: ['tests/dummy/**/*.js'],
-      env: {
-        embertest: true
-      }
-    }
-  ]
+  ],
 };

packages/ember-cli-fastboot/.npmignore

@@ -1,23 +1,35 @@
-/bower_components
+# compiled output
+/dist/
+/tmp/
+
+# dependencies
+/bower_components/
+
+# misc
+/.bowerrc
+/.editorconfig
+/.ember-cli
+/.env*
+/.eslintcache
+/.eslintignore
+/.eslintrc.js
+/.git/
+/.gitignore
+/.prettierignore
+/.prettierrc.js
+/.template-lintrc.js
+/.travis.yml
+/.watchmanconfig
+/bower.json
 /config/ember-try.js
-/dist
-/test
-/tests
-/tmp
-**/.gitkeep
-.bowerrc
-.editorconfig
-.ember-cli
-.eslintrc.js
-.gitignore
-.watchmanconfig
-.travis.yml
-bower.json
-ember-cli-build.js
-testem.js
-yarn.lock
+/CONTRIBUTING.md
+/ember-cli-build.js
+/testem.js
+/tests/
+/yarn.lock
+.gitkeep
 
 # ember-try
-.node_modules.ember-try/
-bower.json.ember-try
-package.json.ember-try
+/.node_modules.ember-try/
+/bower.json.ember-try
+/package.json.ember-try

packages/ember-cli-fastboot/.prettierignore

@@ -0,0 +1,21 @@
+# unconventional js
+/blueprints/*/files/
+/vendor/
+
+# compiled output
+/dist/
+/tmp/
+
+# dependencies
+/bower_components/
+/node_modules/
+
+# misc
+/coverage/
+!.*
+.eslintcache
+
+# ember-try
+/.node_modules.ember-try/
+/bower.json.ember-try
+/package.json.ember-try

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

@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports = {
+  singleQuote: true,
+};

packages/ember-cli-fastboot/.template-lintrc.js

@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports = {
+  extends: 'octane',
+};

packages/ember-cli-fastboot/config/environment.js

@@ -1,5 +1,5 @@
 'use strict';
 
-module.exports = function(/* environment, appConfig */) {
-  return { };
+module.exports = function (/* environment, appConfig */) {
+  return {};
 };

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

@@ -2,7 +2,7 @@
 
 const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
 
-module.exports = function(defaults) {
+module.exports = function (defaults) {
   let app = new EmberAddon(defaults, {
     // Add options here
   });
@@ -14,5 +14,6 @@ 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);
 };

packages/ember-cli-fastboot/index.js

@@ -34,7 +34,7 @@ function getVersionChecker(context) {
  * Main entrypoint for the Ember CLI addon.
  */
 module.exports = {
-  name: 'ember-cli-fastboot',
+  name: require('./package').name,
 
   init() {
     this._super.init && this._super.init.apply(this, arguments);

packages/ember-cli-fastboot/package.json

@@ -13,11 +13,16 @@
     "test": "tests"
   },
   "scripts": {
-    "build": "ember build",
-    "lint:js": "eslint ./*.js addon app fastboot config lib tests",
+    "build": "ember build --environment=production",
+    "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",
+    "lint:js": "eslint . --cache",
     "release": "release-it",
+    "lint:js:fix": "eslint . --fix",
     "start": "ember serve",
-    "test": "mocha && ember test",
+    "test": "npm-run-all lint test:*",
     "test:mocha": "mocha",
     "test:ember": "ember test",
     "test:precook": "node node_modules/ember-cli-addon-tests/scripts/precook-node-modules.js"
@@ -29,7 +34,8 @@
     "broccoli-merge-trees": "^3.0.1",
     "broccoli-plugin": "^1.3.1",
     "chalk": "^2.4.1",
-    "ember-cli-babel": "^7.1.0",
+    "ember-cli-babel": "^7.26.3",
+    "ember-cli-htmlbars": "^5.7.1",
     "ember-cli-lodash-subset": "2.0.1",
     "ember-cli-preprocess-registry": "^3.1.2",
     "ember-cli-version-checker": "^3.0.0",
@@ -43,48 +49,62 @@
     "silent-error": "^1.1.0"
   },
   "devDependencies": {
+    "@ember/optional-features": "^2.0.0",
+    "@ember/test-helpers": "^2.2.5",
+    "@embroider/test-setup": "^0.37.0",
+    "@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.1.2",
     "chai-fs": "^2.0.0",
     "chai-string": "^1.4.0",
-    "ember-ajax": "^3.1.0",
-    "ember-cli": "~3.3.0",
+    "ember-auto-import": "^1.11.2",
+    "ember-cli": "~3.26.1",
     "ember-cli-addon-tests": "^0.11.1",
     "ember-cli-dependency-checker": "^3.2.0",
-    "ember-cli-htmlbars": "^3.0.0",
-    "ember-cli-htmlbars-inline-precompile": "^1.0.3",
-    "ember-cli-inject-live-reload": "^1.8.2",
-    "ember-cli-qunit": "^4.3.2",
-    "ember-cli-shims": "^1.2.0",
+    "ember-cli-inject-live-reload": "^2.0.2",
     "ember-cli-sri": "^2.1.1",
-    "ember-cli-uglify": "^2.1.0",
+    "ember-cli-terser": "^4.0.1",
     "ember-disable-prototype-extensions": "^1.1.3",
-    "ember-export-application-global": "^2.0.0",
-    "ember-load-initializers": "^1.1.0",
+    "ember-export-application-global": "^2.0.1",
+    "ember-load-initializers": "^2.1.2",
     "ember-maybe-import-regenerator-for-testing": "^1.0.0",
-    "ember-resolver": "^5.0.1",
+    "ember-page-title": "^6.2.1",
+    "ember-qunit": "^5.1.4",
+    "ember-resolver": "^8.0.2",
     "ember-sinon": "^2.2.0",
-    "ember-source": "~3.8.0",
-    "eslint-plugin-ember": "^7.0.0",
-    "eslint-plugin-node": "^7.0.1",
+    "ember-source": "~3.26.1",
+    "ember-template-lint": "^3.2.0",
+    "eslint": "^7.23.0",
+    "eslint-config-prettier": "^8.1.0",
+    "eslint-plugin-ember": "^10.3.0",
+    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-prettier": "^3.3.1",
     "glob": "^7.1.3",
     "loader.js": "^4.7.0",
     "mocha": "^5.2.0",
-    "qunit-dom": "^0.8.0",
+    "npm-run-all": "^4.1.5",
+    "prettier": "^2.2.1",
+    "qunit": "^2.14.1",
+    "qunit-dom": "^1.6.0",
     "release-it": "^12.0.1",
     "release-it-lerna-changelog": "^1.0.2",
     "request": "^2.88.0",
     "rsvp": "^4.8.3"
   },
   "engines": {
-    "node": "10.* || 12.* || >= 14.*"
+    "node": "12.* || 14.* || >=16"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
   },
+  "ember": {
+    "edition": "classic"
+  },
   "ember-addon": {
     "configPath": "tests/dummy/config",
     "before": [

packages/ember-cli-fastboot/testem.js

@@ -1,25 +1,23 @@
+'use strict';
+
 module.exports = {
   test_page: 'tests/index.html?hidepassed',
   disable_watching: true,
-  launch_in_ci: [
-    'Chrome'
-  ],
-  launch_in_dev: [
-    'Chrome'
-  ],
+  launch_in_ci: ['Chrome'],
+  launch_in_dev: ['Chrome'],
+  browser_start_timeout: 120,
   browser_args: {
     Chrome: {
       ci: [
         // --no-sandbox is needed when running Chrome inside a container
         process.env.CI ? '--no-sandbox' : null,
         '--headless',
-        '--disable-gpu',
         '--disable-dev-shm-usage',
         '--disable-software-rasterizer',
         '--mute-audio',
         '--remote-debugging-port=0',
-        '--window-size=1440,900'
-      ].filter(Boolean)
-    }
-  }
+        '--window-size=1440,900',
+      ].filter(Boolean),
+    },
+  },
 };