Update ember-cli and dependencies

btecu · btecu · commit 28d063a46a60 · 2020-04-09T20:57:32.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'
diff --git a/.travis.yml b/.travis.yml
@@ -3,9 +3,8 @@ 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
 
 addons:
@@ -26,43 +25,41 @@ branches:
     - /^v\d+\.\d+\.\d+/
 
 jobs:
-  fail_fast: true
+  fast_finish: true
   allow_failures:
     - env: EMBER_TRY_SCENARIO=ember-canary
 
   include:
     # runs linting and tests with current locked deps
-
     - stage: "Tests"
       name: "Tests"
-      install:
-        - yarn install --non-interactive
       script:
-        - yarn lint:hbs
-        - yarn lint:js
-        - yarn test
+        - yarn lint
+        - yarn test:ember
 
-    - name: "Floating Dependencies"
+    - stage: "Additional Tests"
+      name: "Floating Dependencies"
+      install:
+        - yarn install --no-lockfile --non-interactive
       script:
-        - yarn test
+        - yarn test:ember
 
     # we recommend new addons test the current and previous LTS
     # as well as latest stable release (bonus points to beta/canary)
-    - stage: "Additional Tests"
-      env: EMBER_TRY_SCENARIO=ember-lts-3.4
-    - env: EMBER_TRY_SCENARIO=ember-lts-3.8
     - env: EMBER_TRY_SCENARIO=ember-lts-3.12
+    - env: EMBER_TRY_SCENARIO=ember-lts-3.16
     - env: EMBER_TRY_SCENARIO=ember-release
     - env: EMBER_TRY_SCENARIO=ember-beta
     - env: EMBER_TRY_SCENARIO=ember-canary
     - env: EMBER_TRY_SCENARIO=ember-default-with-jquery
+    - env: EMBER_TRY_SCENARIO=ember-classic
 
 before_install:
   - curl -o- -L https://yarnpkg.com/install.sh | bash
   - export PATH=$HOME/.yarn/bin:$PATH
 
 install:
-  - yarn install --no-lockfile --non-interactive
+  - yarn install --non-interactive
 
 script:
   - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -3,14 +3,14 @@
 ## Installation
 
 * `git clone https://github.com/btecu/ember-simple-tree`
-* `cd my-addon`
-* `npm install`
+* `cd ember-simple-tree`
+* `yarn install`
 
 ## Linting
 
-* `npm run lint:hbs`
-* `npm run lint:js`
-* `npm run lint:js -- --fix`
+* `yarn lint:hbs`
+* `yarn lint:js`
+* `yarn lint:js --fix`
 
 ## Running tests
 
diff --git a/addon/components/x-tree-children.js b/addon/components/x-tree-children.js
@@ -1,6 +1,6 @@
 import Component from '@ember/component';
 import layout from '../templates/components/x-tree-children';
-import { get, setProperties } from '@ember/object';
+import { setProperties } from '@ember/object';
 
 export default Component.extend({
   layout,
@@ -10,7 +10,7 @@ export default Component.extend({
   actions: {
     updateCheckbox() {
       if (this.recursiveCheck) {
-        let children = get(this, 'model.children');
+        let { children } = this.model;
 
         if (children.length) {
           let isChecked = false;
diff --git a/addon/components/x-tree-node.js b/addon/components/x-tree-node.js
@@ -1,5 +1,6 @@
+/* eslint-disable ember/no-get */
 import Component from '@ember/component';
-import { computed, get, set, setProperties }  from '@ember/object';
+import { computed, get, set, setProperties } from '@ember/object';
 import layout from '../templates/components/x-tree-node';
 
 export default Component.extend({
diff --git a/config/ember-try.js b/config/ember-try.js
@@ -7,26 +7,18 @@ module.exports = async function() {
     useYarn: true,
     scenarios: [
       {
-        name: 'ember-lts-3.4',
-        npm: {
-          devDependencies: {
-            'ember-source': '~3.4.0'
-          }
-        }
-      },
-      {
-        name: 'ember-lts-3.8',
+        name: 'ember-lts-3.12',
         npm: {
           devDependencies: {
-            'ember-source': '~3.8.0'
+            'ember-source': '~3.12.0'
           }
         }
       },
       {
-        name: 'ember-lts-3.12',
+        name: 'ember-lts-3.16',
         npm: {
           devDependencies: {
-            'ember-source': '~3.12.0'
+            'ember-source': '~3.16.0'
           }
         }
       },
@@ -54,7 +46,7 @@ module.exports = async function() {
           }
         }
       },
-      // The default `.travis.yml` runs this scenario via `npm test`,
+      // 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.
@@ -76,6 +68,21 @@ module.exports = async function() {
             '@ember/jquery': '^0.5.1'
           }
         }
+      },
+      {
+        name: 'ember-classic',
+        env: {
+          EMBER_OPTIONAL_FEATURES: JSON.stringify({
+            'application-template-wrapper': true,
+            'default-async-observers': false,
+            'template-only-glimmer-components': false
+          })
+        },
+        npm: {
+          ember: {
+            edition: 'classic'
+          }
+        }
       }
     ]
   };
diff --git a/package.json b/package.json
@@ -22,39 +22,47 @@
     "test": "tests"
   },
   "scripts": {
-    "build": "ember build",
+    "build": "ember build --environment=production",
+    "lint": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*",
     "lint:hbs": "ember-template-lint .",
     "lint:js": "eslint .",
     "start": "ember serve",
-    "test": "ember test",
-    "test:all": "ember try:each"
+    "test": "npm-run-all lint:* test:*",
+    "test:ember": "ember test",
+    "test:ember-compatibility": "ember try:each"
   },
   "dependencies": {
-    "ember-cli-babel": "^7.11.1",
-    "ember-cli-htmlbars": "^4.0.0"
+    "ember-cli-babel": "^7.19.0",
+    "ember-cli-htmlbars": "^4.3.1"
   },
   "devDependencies": {
-    "@ember/optional-features": "^1.0.0",
-    "babel-eslint": "^10.0.3",
+    "@ember/optional-features": "^1.3.0",
+    "@glimmer/component": "^1.0.0",
+    "@glimmer/tracking": "^1.0.0",
+    "babel-eslint": "^10.1.0",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-cli": "~3.13.1",
-    "ember-cli-eslint": "^5.1.0",
-    "ember-cli-template-lint": "^1.0.0-beta.3",
+    "ember-cli": "~3.17.0",
     "ember-disable-prototype-extensions": "^1.1.3",
-    "ember-load-initializers": "^2.1.0",
+    "ember-load-initializers": "^2.1.1",
     "ember-maybe-import-regenerator": "^0.1.6",
-    "ember-qunit": "^4.5.1",
-    "ember-resolver": "^5.3.0",
-    "ember-source": "~3.13.0",
+    "ember-qunit": "^4.6.0",
+    "ember-resolver": "^7.0.0",
+    "ember-source": "~3.17.3",
     "ember-source-channel-url": "^2.0.1",
-    "ember-try": "^1.2.1",
-    "eslint-plugin-ember": "^7.1.0",
-    "eslint-plugin-node": "^10.0.0",
+    "ember-template-lint": "^2.4.0",
+    "ember-try": "^1.4.0",
+    "eslint": "^6.8.0",
+    "eslint-plugin-ember": "^8.1.1",
+    "eslint-plugin-node": "^11.1.0",
     "loader.js": "^4.7.0",
-    "qunit-dom": "^0.9.0"
+    "npm-run-all": "^4.1.5",
+    "qunit-dom": "^1.1.0"
   },
   "engines": {
-    "node": "8.* || 10.* || 12.*"
+    "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';
 
-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/controllers/application.js b/tests/dummy/app/controllers/application.js
@@ -4,6 +4,6 @@ import { buildTree } from 'ember-simple-tree/utils/tree';
 
 export default Controller.extend({
   tree: computed('model', function() {
-    return buildTree(this.get('model'));
+    return buildTree(this.model);
   })
 });
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';
 
-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/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/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -7,26 +7,18 @@ module.exports = async function() {`
`7`	`7`	`useYarn: true,`
`8`	`8`	`scenarios: [`
`9`	`9`	`{`
`10`		`- name: 'ember-lts-3.4',`
`11`		`- npm: {`
`12`		`- devDependencies: {`
`13`		`- 'ember-source': '~3.4.0'`
`14`		`- }`
`15`		`- }`
`16`		`- },`
`17`		`- {`
`18`		`- name: 'ember-lts-3.8',`
	`10`	`+ name: 'ember-lts-3.12',`
`19`	`11`	`npm: {`
`20`	`12`	`devDependencies: {`
`21`		`- 'ember-source': '~3.8.0'`
	`13`	`+ 'ember-source': '~3.12.0'`
`22`	`14`	`}`
`23`	`15`	`}`
`24`	`16`	`},`
`25`	`17`	`{`
`26`		`- name: 'ember-lts-3.12',`
	`18`	`+ name: 'ember-lts-3.16',`
`27`	`19`	`npm: {`
`28`	`20`	`devDependencies: {`
`29`		`- 'ember-source': '~3.12.0'`
	`21`	`+ 'ember-source': '~3.16.0'`
`30`	`22`	`}`
`31`	`23`	`}`
`32`	`24`	`},`
`@@ -54,7 +46,7 @@ module.exports = async function() {`
`54`	`46`	`}`
`55`	`47`	`}`
`56`	`48`	`},`
`57`		- // The default `.travis.yml` runs this scenario via `npm test`,
	`49`	+ // The default `.travis.yml` runs this scenario via `yarn test`,
`58`	`50`	// not via `ember try`. It's still included here so that running
`59`	`51`	// `ember try:each` manually or from a customized CI config will run it
`60`	`52`	`// along with all the other scenarios.`
`@@ -76,6 +68,21 @@ module.exports = async function() {`
`76`	`68`	`'@ember/jquery': '^0.5.1'`
`77`	`69`	`}`
`78`	`70`	`}`
	`71`	`+ },`
	`72`	`+ {`
	`73`	`+ name: 'ember-classic',`
	`74`	`+ env: {`
	`75`	`+ EMBER_OPTIONAL_FEATURES: JSON.stringify({`
	`76`	`+ 'application-template-wrapper': true,`
	`77`	`+ 'default-async-observers': false,`
	`78`	`+ 'template-only-glimmer-components': false`
	`79`	`+ })`
	`80`	`+ },`
	`81`	`+ npm: {`
	`82`	`+ ember: {`
	`83`	`+ edition: 'classic'`
	`84`	`+ }`
	`85`	`+ }`
`79`	`86`	`}`
`80`	`87`	`]`
`81`	`88`	`};`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,6 @@`
`1`	`1`	`{`
`2`		`- "jquery-integration": false`
	`2`	`+ "application-template-wrapper": false,`
	`3`	`+ "default-async-observers": true,`
	`4`	`+ "jquery-integration": false,`
	`5`	`+ "template-only-glimmer-components": true`
`3`	`6`	`}`