Drop support for Node < 10, bump Ember to 3.22 (#71)

RobbieTheWagner · web-flow · commit affa692b332b · 2020-10-27T14:16:08.000-04:00
diff --git a/.editorconfig b/.editorconfig
@@ -4,7 +4,6 @@
 
 root = true
 
-
 [*]
 end_of_line = lf
 charset = utf-8
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,9 +1,14 @@
+'use strict';
+
 module.exports = {
   root: true,
   parser: 'babel-eslint',
   parserOptions: {
     ecmaVersion: 2018,
-    sourceType: 'module'
+    sourceType: 'module',
+    ecmaFeatures: {
+      legacyDecorators: true
+    }
   },
   plugins: [
     'ember'
@@ -46,9 +51,7 @@ module.exports = {
         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'],
       globals: {
         describe: true,
         it: true
diff --git a/.npmignore b/.npmignore
@@ -12,6 +12,7 @@
 /.env*
 /.eslintignore
 /.eslintrc.js
+/.git/
 /.gitignore
 /.template-lintrc.js
 /.travis.yml
diff --git a/.template-lintrc.js b/.template-lintrc.js
@@ -1,5 +1,5 @@
 'use strict';
 
 module.exports = {
-  extends: 'recommended'
+  extends: 'octane'
 };
diff --git a/.travis.yml b/.travis.yml
@@ -3,10 +3,9 @@ language: node_js
 node_js:
   # we recommend testing addons with the same minimum supported node version as Ember CLI
   # so that your addon works for all apps
-  - "8"
+  - "10"
 
-sudo: false
-dist: trusty
+dist: xenial
 
 addons:
   chrome: stable
@@ -17,6 +16,17 @@ cache:
 matrix:
   fast_finish: true
 
+env:
+  global:
+    # See https://git.io/vdao3 for details.
+    - JOBS=1
+
+branches:
+  only:
+    - master
+    # npm version tags
+    - /^v\d+\.\d+\.\d+/
+
 before_install:
   - curl -o- -L https://yarnpkg.com/install.sh | bash
   - export PATH=$HOME/.yarn/bin:$PATH
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -23,4 +23,4 @@
 * `ember serve`
 * Visit the dummy application at [http://localhost:4200](http://localhost:4200).
 
-For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
+For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
diff --git a/README.md b/README.md
@@ -17,9 +17,9 @@ version of YUIDoc with support for:
 Compatibility
 ------------------------------------------------------------------------------
 
-* Ember.js v3.4 or above
+* Ember.js v3.16 or above
 * Ember CLI v2.13 or above
-* Node.js v8 or above
+* Node.js v10 or above
 
 
 Installation
diff --git a/config/ember-try.js b/config/ember-try.js
@@ -7,18 +7,18 @@ module.exports = async function() {
     useYarn: true,
     scenarios: [
       {
-        name: 'ember-lts-3.4',
+        name: 'ember-lts-3.16',
         npm: {
           devDependencies: {
-            'ember-source': '~3.4.0'
+            'ember-source': '~3.16.0'
           }
         }
       },
       {
-        name: 'ember-lts-3.8',
+        name: 'ember-lts-3.20',
         npm: {
           devDependencies: {
-            'ember-source': '~3.8.0'
+            'ember-source': '~3.20.5'
           }
         }
       },
@@ -46,26 +46,31 @@ module.exports = async function() {
           }
         }
       },
-      // The default `.travis.yml` runs this scenario via `yarn test`,
-      // not via `ember try`. It's still included here so that running
-      // `ember try:each` manually or from a customized CI config will run it
-      // along with all the other scenarios.
       {
-        name: 'ember-default',
+        name: 'ember-default-with-jquery',
+        env: {
+          EMBER_OPTIONAL_FEATURES: JSON.stringify({
+            'jquery-integration': true
+          })
+        },
         npm: {
-          devDependencies: {}
+          devDependencies: {
+            '@ember/jquery': '^1.1.0'
+          }
         }
       },
       {
-        name: 'ember-default-with-jquery',
+        name: 'ember-classic',
         env: {
           EMBER_OPTIONAL_FEATURES: JSON.stringify({
-            'jquery-integration': true
+            'application-template-wrapper': true,
+            'default-async-observers': false,
+            'template-only-glimmer-components': false
           })
         },
         npm: {
-          devDependencies: {
-            '@ember/jquery': '^0.5.1'
+          ember: {
+            edition: 'classic'
           }
         }
       }
diff --git a/lib/preprocessors/generate-yuidoc-jsonapi.js b/lib/preprocessors/generate-yuidoc-jsonapi.js
@@ -23,7 +23,7 @@ function resolveParentClass(klasses, klass, ui) {
 
   if (matches.length === 1) {
     return matches[0];
-  } else if (matches.length === 1) {
+  } else if (matches.length > 1) {
     ui.writeWarnLine(`Attempted to match extends for ${klass.shortname}, but found multiple values for parent class ${klass.extends}. Try providing the full class identifier ({path}~{name}).`);
   }
 
diff --git a/package.json b/package.json
@@ -14,47 +14,57 @@
   },
   "repository": "https://github.com/ember-learn/ember-cli-addon-docs-yuidoc",
   "scripts": {
-    "build": "ember build",
+    "build": "ember build --environment=production",
+    "lint": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*",
     "lint:js": "eslint ./*.js config lib tests node-tests",
     "start": "ember serve",
-    "test": "mocha node-tests"
+    "test": "mocha node-tests",
+    "test:ember": "ember test",
+    "test:ember-compatibility": "ember try:each"
   },
   "dependencies": {
     "broccoli-caching-writer": "^3.0.3",
-    "ember-cli-babel": "^7.7.3",
+    "ember-cli-babel": "^7.22.1",
+    "ember-cli-htmlbars": "^5.3.1",
     "fs-extra": "^9.0.1",
     "json-api-serializer": "^2.6.0",
     "lodash": "^4.17.20",
     "yuidocjs": "^0.10.2"
   },
   "devDependencies": {
-    "@ember/optional-features": "^0.7.0",
+    "@ember/optional-features": "^2.0.0",
+    "@glimmer/component": "^1.0.2",
+    "@glimmer/tracking": "^1.0.2",
     "babel-eslint": "^10.1.0",
     "broccoli-asset-rev": "^3.0.0",
     "chai": "^4.1.2",
-    "ember-cli": "~3.12.0",
-    "ember-cli-dependency-checker": "^3.1.0",
-    "ember-cli-eslint": "^5.1.0",
-    "ember-cli-htmlbars": "^3.0.1",
-    "ember-cli-htmlbars-inline-precompile": "^3.0.1",
+    "ember-auto-import": "^1.6.0",
+    "ember-cli": "~3.22.0",
+    "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-inject-live-reload": "^2.0.2",
     "ember-cli-sri": "^2.1.1",
-    "ember-cli-uglify": "^3.0.0",
+    "ember-cli-terser": "^4.0.0",
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-export-application-global": "^2.0.1",
-    "ember-load-initializers": "^2.0.0",
+    "ember-load-initializers": "^2.1.1",
     "ember-maybe-import-regenerator": "^0.1.6",
-    "ember-resolver": "^5.0.1",
-    "ember-source": "~3.12.0",
-    "ember-source-channel-url": "^1.1.0",
-    "ember-try": "^1.0.0",
-    "eslint-plugin-ember": "^6.2.0",
+    "ember-resolver": "^8.0.2",
+    "ember-source": "~3.22.0",
+    "ember-source-channel-url": "^3.0.0",
+    "ember-template-lint": "^2.14.0",
+    "ember-try": "^1.4.0",
+    "eslint": "^7.11.0",
+    "eslint-plugin-ember": "^9.3.0",
     "eslint-plugin-node": "^11.1.0",
     "loader.js": "^4.7.0",
-    "mocha": "^8.2.0"
+    "mocha": "^8.2.0",
+    "npm-run-all": "^4.1.5"
   },
   "engines": {
-    "node": "8.* || >= 10.*"
+    "node": "10.* || >= 12"
+  },
+  "ember": {
+    "edition": "octane"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config"
diff --git a/testem.js b/testem.js
@@ -1,3 +1,5 @@
+'use strict';
+
 module.exports = {
   test_page: 'tests/index.html?hidepassed',
   disable_watching: true,
@@ -7,6 +9,7 @@ module.exports = {
   launch_in_dev: [
     'Chrome'
   ],
+  browser_start_timeout: 120,
   browser_args: {
     Chrome: {
       ci: [
diff --git a/tests/dummy/app/app.js b/tests/dummy/app/app.js
@@ -1,14 +1,12 @@
 import Application from '@ember/application';
-import Resolver from './resolver';
+import Resolver from 'ember-resolver';
 import loadInitializers from 'ember-load-initializers';
-import config from './config/environment';
+import config from 'dummy/config/environment';
 
-const App = Application.extend({
-  modulePrefix: config.modulePrefix,
-  podModulePrefix: config.podModulePrefix,
-  Resolver
-});
+export default class App extends Application {
+  modulePrefix = config.modulePrefix;
+  podModulePrefix = config.podModulePrefix;
+  Resolver = Resolver;
+}
 
 loadInitializers(App, config.modulePrefix);
-
-export default App;
diff --git a/tests/dummy/app/resolver.js b/tests/dummy/app/resolver.js
diff --git a/tests/dummy/app/router.js b/tests/dummy/app/router.js
@@ -1,12 +1,10 @@
 import EmberRouter from '@ember/routing/router';
-import config from './config/environment';
+import config from 'dummy/config/environment';
 
-const Router = EmberRouter.extend({
-  location: config.locationType,
-  rootURL: config.rootURL
-});
+export default class Router extends EmberRouter {
+  location = config.locationType;
+  rootURL = config.rootURL;
+}
 
 Router.map(function() {
 });
-
-export default Router;
diff --git a/tests/dummy/app/templates/components/.gitkeep b/tests/dummy/app/templates/components/.gitkeep
diff --git a/tests/dummy/config/ember-cli-update.json b/tests/dummy/config/ember-cli-update.json
@@ -0,0 +1,21 @@
+{
+  "schemaVersion": "1.0.0",
+  "packages": [
+    {
+      "name": "ember-cli",
+      "version": "3.22.0",
+      "blueprints": [
+        {
+          "name": "addon",
+          "outputRepo": "https://github.com/ember-cli/ember-addon-output",
+          "codemodsSource": "ember-addon-codemods-manifest@1",
+          "isBaseBlueprint": true,
+          "options": [
+            "--yarn",
+            "--no-welcome"
+          ]
+        }
+      ]
+    }
+  ]
+}
diff --git a/tests/dummy/config/optional-features.json b/tests/dummy/config/optional-features.json
@@ -1,3 +1,6 @@
 {
-  "jquery-integration": false
+  "application-template-wrapper": false,
+  "default-async-observers": true,
+  "jquery-integration": false,
+  "template-only-glimmer-components": true
 }
diff --git a/tests/dummy/config/targets.js b/tests/dummy/config/targets.js
@@ -6,7 +6,7 @@ const browsers = [
   'last 1 Safari versions'
 ];
 
-const isCI = !!process.env.CI;
+const isCI = Boolean(process.env.CI);
 const isProduction = process.env.EMBER_ENV === 'production';
 
 if (isCI || isProduction) {
diff --git a/tests/test-helper.js b/tests/test-helper.js
@@ -1,5 +1,5 @@
-import Application from '../app';
-import config from '../config/environment';
+import Application from 'dummy/app';
+import config from 'dummy/config/environment';
 import { setApplication } from '@ember/test-helpers';
 import { start } from 'ember-qunit';
 
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -7,18 +7,18 @@ module.exports = async function() {`
`7`	`7`	`useYarn: true,`
`8`	`8`	`scenarios: [`
`9`	`9`	`{`
`10`		`- name: 'ember-lts-3.4',`
	`10`	`+ name: 'ember-lts-3.16',`
`11`	`11`	`npm: {`
`12`	`12`	`devDependencies: {`
`13`		`- 'ember-source': '~3.4.0'`
	`13`	`+ 'ember-source': '~3.16.0'`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`	`},`
`17`	`17`	`{`
`18`		`- name: 'ember-lts-3.8',`
	`18`	`+ name: 'ember-lts-3.20',`
`19`	`19`	`npm: {`
`20`	`20`	`devDependencies: {`
`21`		`- 'ember-source': '~3.8.0'`
	`21`	`+ 'ember-source': '~3.20.5'`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`	`},`
`@@ -46,26 +46,31 @@ module.exports = async function() {`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`	`},`
`49`		- // The default `.travis.yml` runs this scenario via `yarn test`,
`50`		- // not via `ember try`. It's still included here so that running
`51`		- // `ember try:each` manually or from a customized CI config will run it
`52`		`- // along with all the other scenarios.`
`53`	`49`	`{`
`54`		`- name: 'ember-default',`
	`50`	`+ name: 'ember-default-with-jquery',`
	`51`	`+ env: {`
	`52`	`+ EMBER_OPTIONAL_FEATURES: JSON.stringify({`
	`53`	`+ 'jquery-integration': true`
	`54`	`+ })`
	`55`	`+ },`
`55`	`56`	`npm: {`
`56`		`- devDependencies: {}`
	`57`	`+ devDependencies: {`
	`58`	`+ '@ember/jquery': '^1.1.0'`
	`59`	`+ }`
`57`	`60`	`}`
`58`	`61`	`},`
`59`	`62`	`{`
`60`		`- name: 'ember-default-with-jquery',`
	`63`	`+ name: 'ember-classic',`
`61`	`64`	`env: {`
`62`	`65`	`EMBER_OPTIONAL_FEATURES: JSON.stringify({`
`63`		`- 'jquery-integration': true`
	`66`	`+ 'application-template-wrapper': true,`
	`67`	`+ 'default-async-observers': false,`
	`68`	`+ 'template-only-glimmer-components': false`
`64`	`69`	`})`
`65`	`70`	`},`
`66`	`71`	`npm: {`
`67`		`- devDependencies: {`
`68`		`- '@ember/jquery': '^0.5.1'`
	`72`	`+ ember: {`
	`73`	`+ edition: 'classic'`
`69`	`74`	`}`
`70`	`75`	`}`
`71`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ function resolveParentClass(klasses, klass, ui) {`
`23`	`23`
`24`	`24`	`if (matches.length === 1) {`
`25`	`25`	`return matches[0];`
`26`		`- } else if (matches.length === 1) {`
	`26`	`+ } else if (matches.length > 1) {`
`27`	`27`	ui.writeWarnLine(`Attempted to match extends for ${klass.shortname}, but found multiple values for parent class ${klass.extends}. Try providing the full class identifier ({path}~{name}).`);
`28`	`28`	`}`
`29`	`29`