Upgrade to ember 3.21

jkusa · Sep 19, 2020 · 2b4734e · 2b4734e
1 parent 6215398
commit 2b4734e
Show file tree

Hide file tree

Showing 9 changed files with 43 additions and 61 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -15,9 +15,7 @@ module.exports = {
   env: {
     browser: true,
   },
-  rules: {
-    'ember/no-jquery': 'error',
-  },
+  rules: {},
   overrides: [
     // node files
     {
@@ -46,13 +44,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']
+    }
+  ]
 };
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,7 @@ node_js:
   # so that your addon works for all apps
   - '10'
 
-dist: trusty
+dist: xenial
 
 addons:
   chrome: stable
@@ -50,8 +50,8 @@ jobs:
 
     # we recommend new addons test the current and previous LTS
     # as well as latest stable release (bonus points to beta/canary)
-    - env: EMBER_TRY_SCENARIO=ember-lts-3.12
     - env: EMBER_TRY_SCENARIO=ember-lts-3.16
+    - env: EMBER_TRY_SCENARIO=ember-lts-3.20
     - env: EMBER_TRY_SCENARIO=ember-release
     - env: EMBER_TRY_SCENARIO=ember-beta
     - env: EMBER_TRY_SCENARIO=ember-canary
@@ -62,8 +62,5 @@ before_install:
   - curl -o- -L https://yarnpkg.com/install.sh | bash
   - export PATH=$HOME/.yarn/bin:$PATH
 
-install:
-  - yarn install --no-lockfile --non-interactive
-
 script:
   - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO
diff --git a/config/ember-try.js b/config/ember-try.js
@@ -7,20 +7,20 @@ module.exports = async function () {
     useYarn: true,
     scenarios: [
       {
-        name: 'ember-lts-3.12',
+        name: 'ember-lts-3.16',
         npm: {
           devDependencies: {
-            'ember-source': '~3.12.0',
-          },
-        },
+            'ember-source': '~3.16.0'
+          }
+        }
       },
       {
-        name: 'ember-lts-3.16',
+        name: 'ember-lts-3.20',
         npm: {
           devDependencies: {
-            'ember-source': '~3.16.0',
-          },
-        },
+            'ember-source': '~3.20.5'
+          }
+        }
       },
       {
         name: 'ember-release',
@@ -46,16 +46,6 @@ module.exports = async function () {
           },
         },
       },
-      // The default `.travis.yml` runs this scenario via `npm 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: {
@@ -65,9 +55,9 @@ module.exports = async function () {
         },
         npm: {
           devDependencies: {
-            '@ember/jquery': '^0.5.1',
-          },
-        },
+            '@ember/jquery': '^1.1.0'
+          }
+        }
       },
       {
         name: 'ember-classic',

diff --git a/package.json b/package.json
@@ -14,13 +14,13 @@
     "deploy": "ember build --environment production && ember github-pages:commit --message \"Deploy gh-pages from commit $(git rev-parse HEAD)\" && git push origin gh-pages:gh-pages"
   },
   "devDependencies": {
-    "@ember/optional-features": "^1.3.0",
-    "@glimmer/component": "^1.0.0",
-    "@glimmer/tracking": "^1.0.0",
+    "@ember/optional-features": "^2.0.0",
+    "@glimmer/component": "^1.0.1",
+    "@glimmer/tracking": "^1.0.1",
     "babel-eslint": "^10.1.0",
     "broccoli-asset-rev": "^3.0.0",
     "ember-angle-bracket-invocation-polyfill": "^2.0.2",
-    "ember-cli": "~3.17.0",
+    "ember-cli": "~3.21.2",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-fastboot": "^2.0.4",
     "ember-cli-fastboot-testing": "^0.4.0",
@@ -29,7 +29,7 @@
     "ember-cli-inject-live-reload": "^2.0.2",
     "ember-cli-sass": "^10.0.1",
     "ember-cli-sri": "^2.1.1",
-    "ember-cli-uglify": "^3.0.0",
+    "ember-cli-terser": "^4.0.0",
     "ember-composable-helpers": "^2.3.1",
     "ember-decorators-polyfill": "^1.1.1",
     "ember-disable-prototype-extensions": "^1.1.3",
@@ -40,30 +40,30 @@
     "ember-modifier": "^1.0.2",
     "ember-named-arguments-polyfill": "^1.0.0",
     "ember-qunit": "^4.6.0",
-    "ember-resolver": "^7.0.0",
-    "ember-source": "~3.17.0",
-    "ember-source-channel-url": "^2.0.1",
-    "ember-template-lint": "^2.4.0",
+    "ember-resolver": "^8.0.2",
+    "ember-source": "~3.21.1",
+    "ember-source-channel-url": "^3.0.0",
+    "ember-template-lint": "^2.11.0",
     "ember-try": "^1.4.0",
-    "eslint": "^7.0.0",
-    "eslint-plugin-ember": "^8.4.0",
-    "eslint-plugin-node": "^11.0.0",
+    "eslint": "^7.8.0",
+    "eslint-plugin-ember": "^8.13.0",
+    "eslint-plugin-node": "^11.1.0",
     "highlight.js": "^9.12.0",
     "husky": "^4.2.1",
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.0.2",
     "pretty-quick": "^2.0.1",
-    "qunit-dom": "^1.1.0",
+    "qunit-dom": "^1.4.0",
     "sass": "^1.22.1",
     "uuid": "^7.0.1"
   },
   "dependencies": {
     "@ember/render-modifiers": "^1.0.1",
     "clipboard": "^2.0.6",
-    "ember-auto-import": "^1.5.3",
-    "ember-cli-babel": "^7.20.2",
-    "ember-cli-htmlbars": "^4.2.3"
+    "ember-auto-import": "^1.6.0",
+    "ember-cli-babel": "^7.22.1",
+    "ember-cli-htmlbars": "^5.3.1"
   },
   "resolutions": {
     "clean-css": "4.2.1"

diff --git a/tests/dummy/app/app.js b/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;

diff --git a/tests/dummy/app/router.js b/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;

diff --git a/tests/dummy/config/ember-cli-update.json b/tests/dummy/config/ember-cli-update.json
@@ -3,14 +3,17 @@
   "packages": [
     {
       "name": "ember-cli",
-      "version": "3.17.0",
+      "version": "3.21.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"]
+          "options": [
+            "--yarn",
+            "--no-welcome"
+          ]
         }
       ]
     }

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';
 import './helpers/flash-message';