⬆️ v3.12.1...v3.16.2 (#99)

* ⬆️ v3.12.1...v3.16.2

* ♻️ Codemods

.editorconfig

@@ -4,7 +4,6 @@
 
 root = true
 
-
 [*]
 end_of_line = lf
 charset = utf-8

.eslintrc.js

@@ -1,15 +1,23 @@
+'use strict';
+
 module.exports = {
   root: true,
+  parser: 'babel-eslint',
   parserOptions: {
     ecmaVersion: 2018,
     sourceType: 'module',
+    ecmaFeatures: {
+      legacyDecorators: true,
+    },
   },
   plugins: ['ember'],
   extends: ['eslint:recommended', 'plugin:ember/recommended'],
   env: {
     browser: true,
   },
-  rules: {},
+  rules: {
+    'ember/no-jquery': 'error',
+  },
   overrides: [
     // node files
     {

.npmignore

@@ -12,6 +12,7 @@
 /.env*
 /.eslintignore
 /.eslintrc.js
+/.git/
 /.gitignore
 /.template-lintrc.js
 /.travis.yml

.template-lintrc.js

@@ -1,7 +1,7 @@
 'use strict';
 
 module.exports = {
-  extends: 'recommended',
+  extends: 'octane',
   rules: {
     'self-closing-void-elements': false,
   },

.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:
@@ -27,40 +26,42 @@ 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
 
-    - name: 'Floating Dependencies'
+    - stage: 'Additional Tests'
+      name: 'Floating Dependencies'
+      install:
+        - yarn install --no-lockfile --non-interactive
       script:
         - yarn test
 
     # 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:
-  - npm config set spin false
-  - npm install -g npm@4
-  - npm --version
+  - curl -o- -L https://yarnpkg.com/install.sh | bash
+  - export PATH=$HOME/.yarn/bin:$PATH
+
+install:
+  - yarn install --non-interactive
 
 script:
   - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO

README.md

@@ -17,9 +17,9 @@ a _vanilla_ port of Gruber's original works.
 
 ## Compatibility
 
-- Ember.js v3.4 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
 

config/ember-try.js

@@ -7,18 +7,18 @@ module.exports = async function () {
     useYarn: true,
     scenarios: [
       {
-        name: 'ember-lts-3.4',
+        name: 'ember-lts-3.12',
         npm: {
           devDependencies: {
-            'ember-source': '~3.4.0',
+            'ember-source': '~3.12.0',
           },
         },
       },
       {
-        name: 'ember-lts-3.8',
+        name: 'ember-lts-3.16',
         npm: {
           devDependencies: {
-            'ember-source': '~3.8.0',
+            'ember-source': '~3.16.0',
           },
         },
       },
@@ -69,6 +69,21 @@ module.exports = async function () {
           },
         },
       },
+      {
+        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',
+          },
+        },
+      },
     ],
   };
 };

package.json

@@ -33,7 +33,7 @@
     "test": "tests"
   },
   "scripts": {
-    "build": "ember build",
+    "build": "ember build --environment=production",
     "ember-cli-update": "ember-cli-update",
     "ember-cli-update:codemods": "ember-cli-update --run-codemods",
     "lint:hbs": "ember-template-lint .",
@@ -48,38 +48,41 @@
   "dependencies": {
     "ember-auto-import": "^1.5.3",
     "ember-cli-babel": "^7.26.11",
-    "ember-cli-htmlbars": "^3.0.1",
+    "ember-cli-htmlbars": "^4.2.2",
     "lodash.startswith": "^4.2.1",
     "showdown": "^1.9.1"
   },
   "devDependencies": {
     "@ember/jquery": "^1.0.0",
     "@ember/optional-features": "^2.0.0",
+    "@glimmer/component": "^1.0.0",
+    "@glimmer/tracking": "^1.0.0",
+    "babel-eslint": "^10.0.3",
     "bootstrap": "^3.4.1",
     "bootstrap-sass": "^3.4.3",
     "bootswatch": "^3.4.1",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-cli": "~3.12.1",
-    "ember-cli-dependency-checker": "^3.1.0",
+    "ember-auto-import": "^1.5.3",
+    "ember-cli": "~3.16.2",
+    "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-deploy": "^1.0.2",
     "ember-cli-deploy-build": "^2.0.0",
     "ember-cli-deploy-gzip": "^2.0.1",
     "ember-cli-deploy-s3": "^3.1.0",
     "ember-cli-eslint": "^5.1.0",
-    "ember-cli-htmlbars-inline-precompile": "^3.0.2",
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sass": "^10.0.0",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-template-lint": "^2.0.2",
     "ember-cli-uglify": "^3.0.0",
     "ember-cli-update": "0.54",
     "ember-disable-prototype-extensions": "^1.1.3",
-    "ember-export-application-global": "^2.0.0",
+    "ember-export-application-global": "^2.0.1",
     "ember-load-initializers": "^2.1.2",
     "ember-maybe-import-regenerator": "^0.1.6",
     "ember-qunit": "^4.6.0",
     "ember-resolver": "^8.0.3",
-    "ember-source": "~3.12.0",
+    "ember-source": "~3.16.0",
     "ember-source-channel-url": "^3.0.0",
     "ember-try": "^2.0.0",
     "eslint-plugin-ember": "^8.14.0",
@@ -91,7 +94,10 @@
     "sass": "~1.48.0"
   },
   "engines": {
-    "node": "8.* || >= 10.*"
+    "node": "10.* || >= 12"
+  },
+  "ember": {
+    "edition": "octane"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config"

testem.js

@@ -1,8 +1,11 @@
+'use strict';
+
 module.exports = {
   test_page: 'tests/index.html?hidepassed',
   disable_watching: true,
   launch_in_ci: ['Chrome'],
   launch_in_dev: ['Chrome'],
+  browser_start_timeout: 120,
   browser_args: {
     Chrome: {
       ci: [

tests/dummy/app/app.js

@@ -1,14 +1,14 @@
-import Application from '@ember/application';
-import Resolver from './resolver';
 import loadInitializers from 'ember-load-initializers';
+import Resolver from 'ember-resolver';
+
+import Application from '@ember/application';
+
 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;

tests/dummy/app/router.js

@@ -1,13 +1,12 @@
 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 () {
   this.route('another-page');
 });
-
-export default Router;

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

@@ -3,7 +3,7 @@
   "packages": [
     {
       "name": "ember-cli",
-      "version": "3.12.1",
+      "version": "3.16.2",
       "blueprints": [
         {
           "name": "addon",

tests/dummy/config/optional-features.json

@@ -1,3 +1,6 @@
 {
-  "jquery-integration": true
+  "application-template-wrapper": false,
+  "default-async-observers": true,
+  "jquery-integration": true,
+  "template-only-glimmer-components": true
 }

tests/integration/components/set-links-target-test.js

@@ -1,5 +1,5 @@
+import { hbs } from 'ember-cli-htmlbars';
 import { setupRenderingTest } from 'ember-qunit';
-import hbs from 'htmlbars-inline-precompile';
 import { module, test } from 'qunit';
 
 import { find, findAll, render } from '@ember/test-helpers';