Merge pull request #16 from josemarluedke/deps/upgrade-feb-27

Upgrade project dependencies & Drop node 8
josemarluedke · Feb 28, 2020 · 3d6d072 · 3d6d072
2 parents 1a5d3c4 + 66b6d4b
commit 3d6d072
Show file tree

Hide file tree

Showing 17 changed files with 2,797 additions and 2,363 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -4,7 +4,6 @@
 
 root = true
 
-
 [*]
 end_of_line = lf
 charset = utf-8

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -42,13 +42,13 @@ jobs:
       fail-fast: true
       matrix:
         ember-try-scenario:
-          - ember-lts-2.18
-          - ember-lts-3.4
+          - ember-lts-3.12
+          - ember-lts-3.16
           - ember-release
           - ember-beta
           - ember-canary
-          - ember-default
           - ember-default-with-jquery
+          - ember-classic
 
     steps:
       - uses: actions/checkout@v2

diff --git a/.template-lintrc.js b/.template-lintrc.js
@@ -1,8 +1,8 @@
 'use strict';
 
 module.exports = {
-  extends: 'recommended',
+  extends: 'octane',
   rules: {
-    'no-implicit-this': true
+    'no-curly-component-invocation': { allow: ['docs-demo', 'demo.example'] }
   }
 };
diff --git a/README.md b/README.md
@@ -25,9 +25,9 @@ Please read the [focus-trap](https://github.com/davidtheclark/focus-trap) docume
 Compatibility
 ------------------------------------------------------------------------------
 
-* Ember.js v2.18 or above
+* Ember.js v3.12 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
@@ -2,85 +2,88 @@
 
 const getChannelURL = require('ember-source-channel-url');
 
-module.exports = function() {
-  return Promise.all([
-    getChannelURL('release'),
-    getChannelURL('beta'),
-    getChannelURL('canary')
-  ]).then(urls => {
-    return {
-      useYarn: true,
-      scenarios: [
-        {
-          name: 'ember-lts-2.18',
-          env: {
-            EMBER_OPTIONAL_FEATURES: JSON.stringify({
-              'jquery-integration': true
-            })
-          },
-          npm: {
-            devDependencies: {
-              '@ember/jquery': '^0.5.1',
-              'ember-source': '~2.18.0'
-            }
+module.exports = async function() {
+  return {
+    useYarn: true,
+    scenarios: [
+      {
+        name: 'ember-lts-3.12',
+        npm: {
+          devDependencies: {
+            'ember-source': '~3.12.0'
           }
-        },
-        {
-          name: 'ember-lts-3.4',
-          npm: {
-            devDependencies: {
-              'ember-source': '~3.4.0'
-            }
+        }
+      },
+      {
+        name: 'ember-lts-3.16',
+        npm: {
+          devDependencies: {
+            'ember-source': '~3.16.0'
           }
-        },
-        {
-          name: 'ember-release',
-          npm: {
-            devDependencies: {
-              'ember-source': urls[0]
-            }
+        }
+      },
+      {
+        name: 'ember-release',
+        npm: {
+          devDependencies: {
+            'ember-source': await getChannelURL('release')
           }
-        },
-        {
-          name: 'ember-beta',
-          npm: {
-            devDependencies: {
-              'ember-source': urls[1]
-            }
+        }
+      },
+      {
+        name: 'ember-beta',
+        npm: {
+          devDependencies: {
+            'ember-source': await getChannelURL('beta')
           }
-        },
-        {
-          name: 'ember-canary',
-          npm: {
-            devDependencies: {
-              'ember-source': urls[2]
-            }
+        }
+      },
+      {
+        name: 'ember-canary',
+        npm: {
+          devDependencies: {
+            'ember-source': await getChannelURL('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: {
+          EMBER_OPTIONAL_FEATURES: JSON.stringify({
+            'jquery-integration': true
+          })
         },
-        // 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: {}
+        npm: {
+          devDependencies: {
+            '@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
+          })
         },
-        {
-          name: 'ember-default-with-jquery',
-          env: {
-            EMBER_OPTIONAL_FEATURES: JSON.stringify({
-              'jquery-integration': true
-            })
-          },
-          npm: {
-            devDependencies: {
-              '@ember/jquery': '^0.5.1'
-            }
+        npm: {
+          ember: {
+            edition: 'classic'
           }
         }
-      ]
-    };
-  });
+      }
+    ]
+  };
 };
diff --git a/package.json b/package.json
@@ -21,52 +21,52 @@
     "test:all": "ember try:each"
   },
   "dependencies": {
-    "ember-auto-import": "^1.4.1",
-    "ember-cli-babel": "^7.12.0",
+    "ember-auto-import": "^1.5.3",
+    "ember-cli-babel": "^7.18.0",
     "ember-modifier-manager-polyfill": "^1.2.0",
-    "focus-trap": "^5.0.1"
+    "focus-trap": "^5.1.0"
   },
   "devDependencies": {
-    "@ember/optional-features": "^1.0.0",
-    "babel-eslint": "^10.0.2",
+    "@ember/optional-features": "^1.3.0",
+    "babel-eslint": "^10.1.0",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-cli": "~3.13.1",
-    "ember-cli-addon-docs": "^0.6.13",
-    "ember-cli-addon-docs-yuidoc": "^0.2.1",
+    "ember-cli": "~3.16.0",
+    "ember-cli-addon-docs": "^0.6.16",
+    "ember-cli-addon-docs-yuidoc": "^0.2.4",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-deploy": "^1.0.2",
     "ember-cli-deploy-build": "^2.0.0",
     "ember-cli-deploy-git": "^1.3.4",
     "ember-cli-deploy-git-ci": "^1.0.1",
-    "ember-cli-htmlbars": "^4.0.5",
+    "ember-cli-htmlbars": "^4.2.3",
     "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-decorators-polyfill": "^1.0.6",
+    "ember-decorators-polyfill": "^1.1.3",
     "ember-disable-prototype-extensions": "^1.1.3",
-    "ember-export-application-global": "^2.0.0",
-    "ember-load-initializers": "^2.0.0",
+    "ember-export-application-global": "^2.0.1",
+    "ember-load-initializers": "^2.1.1",
     "ember-maybe-import-regenerator": "^0.1.6",
-    "ember-qunit": "^4.4.1",
-    "ember-resolver": "^5.3.0",
-    "ember-sinon": "^4.1.1",
-    "ember-source": "~3.13.3",
+    "ember-qunit": "^4.6.0",
+    "ember-resolver": "^7.0.0",
+    "ember-sinon": "^5.0.0",
+    "ember-source": "~3.16.3",
     "ember-source-channel-url": "^2.0.1",
-    "ember-template-lint": "^1.3.0",
-    "ember-try": "^1.2.1",
-    "eslint": "^6.5.1",
-    "eslint-config-prettier": "^6.4.0",
-    "eslint-plugin-ember": "^7.1.0",
-    "eslint-plugin-node": "^10.0.0",
-    "eslint-plugin-prettier": "^3.1.1",
+    "ember-template-lint": "^2.0.1",
+    "ember-try": "^1.4.0",
+    "eslint": "^6.8.0",
+    "eslint-config-prettier": "^6.10.0",
+    "eslint-plugin-ember": "^7.8.1",
+    "eslint-plugin-node": "^11.0.0",
+    "eslint-plugin-prettier": "^3.1.2",
     "loader.js": "^4.7.0",
-    "prettier": "^1.18.2",
-    "qunit-dom": "^0.9.0",
-    "sass": "^1.23.0"
+    "prettier": "^1.19.1",
+    "qunit-dom": "^1.0.0",
+    "sass": "^1.26.1"
   },
   "engines": {
-    "node": "8.* || >= 10.*"
+    "node": ">= 10.*"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config"

diff --git a/testem.js b/testem.js
@@ -3,6 +3,7 @@ module.exports = {
   disable_watching: true,
   launch_in_ci: ['Chrome'],
   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/router.js b/tests/dummy/app/router.js
@@ -1,10 +1,10 @@
 import AddonDocsRouter, { docsRoute } from 'ember-cli-addon-docs/router';
 import config from './config/environment';
 
-const Router = AddonDocsRouter.extend({
-  location: config.locationType,
-  rootURL: config.rootURL
-});
+class Router extends AddonDocsRouter {
+  location = config.locationType;
+  rootURL = config.rootURL;
+}
 
 Router.map(function() {
   docsRoute(this, function() {

diff --git a/tests/dummy/app/templates/components/demo/example1.hbs b/tests/dummy/app/templates/components/demo/example1.hbs
@@ -1,7 +1,7 @@
 {{#docs-demo as |demo|}}
   {{#demo.example name="docs-demo-basic.hbs"}}
     <p>
-      <button onclick={{action this.activate}} class="button">
+      <button type="button" {{on "click" this.activate}} class="button">
         Activate trap
       </button>
     </p>
@@ -21,7 +21,7 @@
         parts.
       </p>
       <p>
-        <button onclick={{action this.deactivate}} class="button">
+        <button type="button" {{on "click" this.deactivate}} class="button">
           Deactivate trap
         </button>
       </p>

diff --git a/tests/dummy/app/templates/components/demo/example2.hbs b/tests/dummy/app/templates/components/demo/example2.hbs
@@ -1,7 +1,7 @@
 {{#docs-demo as |demo|}}
   {{#demo.example name="demo-example2.hbs"}}
     <p>
-      <button onclick={{action this.activate}} class="button">
+      <button type="button" {{on "click" this.activate}} class="button">
         Activate trap
       </button>
     </p>
@@ -11,7 +11,7 @@
         class="trap is-active"
         {{focus-trap
           focusTrapOptions=(hash
-            onDeactivate=(action this.deactivate)
+            onDeactivate=this.deactivate
           )
         }}
       >
@@ -23,7 +23,7 @@
           parts.
         </p>
         <p>
-          <button onclick={{action this.deactivate}} class="button">
+          <button type="button" {{on "click" this.deactivate}} class="button">
             Deactivate trap
           </button>
         </p>