Update Ember, and Friends

v3.18.0...v3.24.0

Resolves #152

.eslintignore

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

.eslintrc.js

@@ -21,14 +21,14 @@ module.exports = {
     browser: true,
   },
   rules: {
-    'ember/no-jquery': 'error',
     'ember/use-ember-data-rfc-395-imports': 'off',
   },
   overrides: [
     // node files
     {
       files: [
         '.eslintrc.js',
+        '.prettierrc.js',
         '.template-lintrc.js',
         'ember-cli-build.js',
         'index.js',
@@ -51,14 +51,7 @@ module.exports = {
         node: true,
       },
       plugins: ['node'],
-      rules: Object.assign(
-        {},
-        // eslint-disable-next-line @typescript-eslint/no-var-requires
-        require('eslint-plugin-node').configs.recommended.rules,
-        {
-          // add your custom rules and overrides for node files here
-        }
-      ),
+      extends: ['plugin:node/recommended'],
     },
   ],
 };

.gitignore

@@ -12,6 +12,7 @@
 /.env*
 /.pnp*
 /.sass-cache
+/.eslintcache
 /connect.lock
 /coverage/
 /libpeerconnection.log

.npmignore

@@ -10,6 +10,7 @@
 /.editorconfig
 /.ember-cli
 /.env*
+/.eslintcache
 /.eslintignore
 /.eslintrc.js
 /.git/

.prettierignore

@@ -1,8 +1,21 @@
-.node_modules.ember-try
-node_modules/
-bower_components/
-dist/
-lib/
-public/
-tmp/
-vendor/
+# 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

.prettierrc.js

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

config/ember-try.js

@@ -11,7 +11,6 @@ module.exports = async function () {
         npm: {
           devDependencies: {
             'ember-source': '~3.20.0',
-            'ember-data': '~3.20.0',
           },
         },
       },
@@ -20,7 +19,6 @@ module.exports = async function () {
         npm: {
           devDependencies: {
             'ember-source': '~3.24.0',
-            'ember-data': '~3.24.0',
           },
         },
       },
@@ -29,7 +27,6 @@ module.exports = async function () {
         npm: {
           devDependencies: {
             'ember-source': await getChannelURL('release'),
-            'ember-data': 'latest',
           },
         },
       },
@@ -38,7 +35,6 @@ module.exports = async function () {
         npm: {
           devDependencies: {
             'ember-source': await getChannelURL('beta'),
-            'ember-data': 'beta',
           },
         },
       },
@@ -47,20 +43,9 @@ module.exports = async function () {
         npm: {
           devDependencies: {
             'ember-source': await getChannelURL('canary'),
-            'ember-data': 'canary',
           },
         },
       },
-      // 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',
-        npm: {
-          devDependencies: {},
-        },
-      },
       {
         name: 'ember-default-with-jquery',
         env: {
@@ -70,7 +55,7 @@ module.exports = async function () {
         },
         npm: {
           devDependencies: {
-            '@ember/jquery': '^0.5.1',
+            '@ember/jquery': '^1.1.0',
           },
         },
       },

package.json

@@ -14,10 +14,12 @@
   },
   "scripts": {
     "build": "ember build --environment=production",
-    "lint": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*",
-    "lint:js": "eslint .",
+    "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:js": "eslint . --cache",
+    "lint:js:fix": "eslint . --fix",
     "start": "ember serve",
-    "test": "npm-run-all lint:* test:*",
+    "test": "npm-run-all lint test:*",
     "test:ember": "ember test",
     "test:ember-compatibility": "ember try:each",
     "prepublishOnly": "ember ts:precompile",
@@ -26,15 +28,16 @@
     "postpack": "ember ts:clean"
   },
   "dependencies": {
-    "ember-cli-babel": "^7.20.5",
-    "ember-cli-htmlbars": "^5.1.2",
+    "ember-cli-babel": "^7.26.0",
+    "ember-cli-htmlbars": "^5.3.1",
     "ember-cli-typescript": "^4.1.0",
     "ember-inflector": "^4.0.1"
   },
   "devDependencies": {
-    "@ember/optional-features": "^1.3.0",
-    "@glimmer/component": "^1.0.0",
-    "@glimmer/tracking": "^1.0.0",
+    "@ember/optional-features": "^2.0.0",
+    "@ember/test-helpers": "^2.1.4",
+    "@glimmer/component": "^1.0.3",
+    "@glimmer/tracking": "^1.0.3",
     "@types/ember": "^3.16.5",
     "@types/ember-data": "^3.16.13",
     "@types/ember-data__adapter": "^3.16.1",
@@ -67,33 +70,35 @@
     "@typescript-eslint/parser": "^4.24.0",
     "babel-eslint": "^10.1.0",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-auto-import": "^1.6.0",
-    "ember-cli": "^3.18.0",
+    "ember-auto-import": "^1.10.1",
+    "ember-cli": "^3.24.0",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-inject-live-reload": "^2.0.2",
     "ember-cli-sri": "^2.1.1",
+    "ember-cli-terser": "^4.0.1",
     "ember-cli-typescript-blueprints": "^3.0.0",
-    "ember-cli-uglify": "^3.0.0",
-    "ember-data": "^3.19.0",
+    "ember-data": "^3.24.0",
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-export-application-global": "^2.0.1",
-    "ember-load-initializers": "^2.1.1",
+    "ember-load-initializers": "^2.1.2",
     "ember-maybe-import-regenerator": "^0.1.6",
-    "ember-qunit": "^4.6.0",
-    "ember-resolver": "^8.0.0",
-    "ember-source": "^3.19.0",
-    "ember-source-channel-url": "^2.0.1",
+    "ember-page-title": "^6.0.3",
+    "ember-qunit": "^5.1.1",
+    "ember-resolver": "^8.0.2",
+    "ember-source": "^3.24.0",
+    "ember-source-channel-url": "^3.0.0",
     "ember-try": "^1.4.0",
-    "eslint": "^7.2.0",
+    "eslint": "^7.17.0",
     "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-ember": "^8.6.0",
+    "eslint-plugin-ember": "^10.1.1",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^3.4.0",
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
     "pretender": "^3.4.3",
     "prettier": "2.3.0",
-    "qunit-dom": "^1.2.0",
+    "qunit": "^2.13.0",
+    "qunit-dom": "^1.6.0",
     "typescript": "^4.2.4"
   },
   "engines": {

tests/dummy/app/app.js

@@ -1,7 +1,7 @@
 import Application from '@ember/application';
 import Resolver from 'ember-resolver';
 import loadInitializers from 'ember-load-initializers';
-import config from './config/environment';
+import config from 'dummy/config/environment';
 
 export default class App extends Application {
   modulePrefix = config.modulePrefix;

tests/dummy/app/router.js

@@ -1,5 +1,5 @@
 import EmberRouter from '@ember/routing/router';
-import config from './config/environment';
+import config from 'dummy/config/environment';
 
 export default class Router extends EmberRouter {
   location = config.locationType;

tests/dummy/app/templates/application.hbs

@@ -1,3 +1,3 @@
 <h2 id='title'>Welcome to Ember</h2>
 
-{{outlet}}
+{{outlet}}

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

@@ -3,14 +3,17 @@
   "packages": [
     {
       "name": "ember-cli",
-      "version": "3.18.0",
+      "version": "3.24.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"]
+          "options": [
+            "--yarn",
+            "--no-welcome"
+          ]
         }
       ]
     }

tests/dummy/config/targets.js

@@ -6,13 +6,6 @@ const browsers = [
   'last 1 Safari versions',
 ];
 
-const isCI = !!process.env.CI;
-const isProduction = process.env.EMBER_ENV === 'production';
-
-if (isCI || isProduction) {
-  browsers.push('ie 11');
-}
-
 module.exports = {
   browsers,
 };

tests/index.html

@@ -18,6 +18,13 @@
   <body>
     {{content-for "body"}} {{content-for "test-body"}}
 
+    <div id="qunit"></div>
+    <div id="qunit-fixture">
+      <div id="ember-testing-container">
+        <div id="ember-testing"></div>
+      </div>
+    </div>
+
     <script src="/testem.js" integrity=""></script>
     <script src="{{rootURL}}assets/vendor.js"></script>
     <script src="{{rootURL}}assets/test-support.js"></script>

tests/test-helper.js

@@ -1,8 +1,12 @@
-import Application from '../app';
-import config from '../config/environment';
+import Application from 'dummy/app';
+import config from 'dummy/config/environment';
+import * as QUnit from 'qunit';
 import { setApplication } from '@ember/test-helpers';
+import { setup } from 'qunit-dom';
 import { start } from 'ember-qunit';
 
 setApplication(Application.create(config.APP));
 
+setup(QUnit.assert);
+
 start();

tests/unit/serializers/active-model-serializer-test.ts

@@ -8,7 +8,6 @@ import { TestContext } from 'ember-test-helpers';
 import DS from 'ember-data';
 import Pretender from 'pretender';
 import Store from 'ember-data/store';
-import { get } from '@ember/object';
 import Model, { attr, belongsTo, hasMany } from '@ember-data/model';
 import { resolve } from 'rsvp';
 import type ModelRegistry from 'ember-data/types/registries/model';
@@ -204,7 +203,7 @@ module('Unit | Serializer | active model serializer', function (hooks) {
               super_villain: {
                 first_name: 'Tom',
                 last_name: 'Dale',
-                home_planet_id: get(league, 'id'),
+                home_planet_id: league.id,
               },
             },
             'we serialized correctly'