⬆️ Upgrading To Ember-Cli 3.16 (#65)

* ♻️ Angle Bracket Codemod

* ⬆️ v3.14.0...v3.15.2

* v3.15.0

* ⬆️ v3.15.2...v3.16.2

* v3.16.0

.editorconfig

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

.eslintrc.js

@@ -1,3 +1,5 @@
+'use strict';
+
 module.exports = {
   root: true,
   parser: "babel-eslint",

.github/dependabot.yml

@@ -10,3 +10,7 @@ updates:
       - nadnoslen
     labels:
       - dependencies
+    ignore:
+      - dependency-name: ember-cli
+      - dependency-name: ember-data
+      - dependency-name: ember-source

.npmignore

@@ -8,7 +8,7 @@
 # misc
 /.bowerrc
 /.editorconfig
-/.ember-cli.js
+/.ember-cli
 /.env*
 /.eslintignore
 /.eslintrc.js

.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:
@@ -26,42 +25,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:
   - 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

CONTRIBUTING.md

@@ -23,4 +23,4 @@
 * `ember serve`
 * Visit the dummy application at [http://localhost:4200](http://localhost:4200).
 
-For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
+For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).

README.md

@@ -6,9 +6,11 @@
 
 Ember.TextSupport enhancements including a `{{input-text}}` and `{{text-area}}` component.
 
-- Ember.js v3.4 or above
+## Compatibility
+
+- 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

@@ -1,6 +1,6 @@
 {
   "name": "ember-cli-text-support-mixins",
-  "version": "3.14.0",
+  "version": "3.16.0",
   "description": "Ember.TextSupport enhancements including a {{input-text}} and {{text-area}} component.",
   "keywords": [
     "Autofocus",
@@ -32,15 +32,15 @@
     "url": "https://github.com/cybertoothca/ember-cli-text-support-mixins.git"
   },
   "scripts": {
-    "build": "ember build",
+    "build": "ember build --environment=production",
     "lint:hbs": "ember-template-lint .",
     "lint:js": "eslint .",
     "start": "ember serve",
     "test": "ember test",
     "test:all": "ember try:each"
   },
   "dependencies": {
-    "ember-cli-babel": "^7.11.1",
+    "ember-cli-babel": "^7.17.2",
     "ember-cli-htmlbars": "^6.0.1",
     "ember-cli-node-assets": "^0.2.2"
   },
@@ -50,16 +50,18 @@
     "@fortawesome/ember-fontawesome": "^0.1.8",
     "@fortawesome/free-brands-svg-icons": "^5.5.0",
     "@fortawesome/free-solid-svg-icons": "^5.5.0",
+    "@glimmer/component": "^1.0.0",
+    "@glimmer/tracking": "^1.0.0",
     "babel-eslint": "^10.0.3",
     "bootstrap": "^4.1.0",
     "broccoli-asset-rev": "^3.0.0",
     "clipboard": "^2.0.2",
     "ct-emberjs-bling": "^0.0.1-rc.5",
-    "ember-auto-import": "^1.5.2",
-    "ember-cli": "~3.14.0",
+    "ember-auto-import": "^1.5.3",
+    "ember-cli": "~3.16.2",
     "ember-cli-app-version": "^5.0.0",
     "ember-cli-bootstrap-4": "^0.13.0",
-    "ember-cli-dependency-checker": "^3.1.0",
+    "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",
@@ -74,16 +76,16 @@
     "ember-cli-uglify": "^3.0.0",
     "ember-cli-update": "^1.0.1",
     "ember-disable-prototype-extensions": "^1.1.3",
-    "ember-export-application-global": "^2.0.0",
-    "ember-load-initializers": "^2.1.0",
+    "ember-export-application-global": "^2.0.1",
+    "ember-load-initializers": "^2.1.1",
     "ember-maybe-import-regenerator": "^1.0.0",
-    "ember-qunit": "^4.5.1",
+    "ember-qunit": "^4.6.0",
     "ember-resolver": "^8.0.3",
     "ember-route-action-helper": "^2.0.6",
-    "ember-source": "~3.14.1",
+    "ember-source": "~3.16.0",
     "ember-source-channel-url": "^3.0.0",
     "ember-try": "^2.0.0",
-    "eslint-plugin-ember": "^7.1.0",
+    "eslint-plugin-ember": "^7.7.2",
     "eslint-plugin-node": "^11.1.0",
     "keyevent": "^1.1.0",
     "loader.js": "^4.7.0",
@@ -92,7 +94,10 @@
     "sass": "^1.14.3"
   },
   "engines": {
-    "node": "8.* || >= 10.*"
+    "node": "10.* || >= 12"
+  },
+  "ember": {
+    "edition": "octane"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config",

testem.js

@@ -1,25 +1,23 @@
-/* eslint-env node */
+"use strict";
+
 module.exports = {
-  test_page: 'tests/index.html?hidepassed',
+  test_page: "tests/index.html?hidepassed",
   disable_watching: true,
-  launch_in_ci: [
-    'Chrome'
-  ],
-  launch_in_dev: [
-    'Chrome'
-  ],
+  launch_in_ci: ["Chrome"],
+  launch_in_dev: ["Chrome"],
+  browser_start_timeout: 120,
   browser_args: {
     Chrome: {
       ci: [
         // --no-sandbox is needed when running Chrome inside a container
-        process.env.CI ? '--no-sandbox' : null,
-        '--headless',
-        '--disable-dev-shm-usage',
-        '--disable-software-rasterizer',
-        '--mute-audio',
-        '--remote-debugging-port=0',
-        '--window-size=1440,900'
-      ].filter(Boolean)
-    }
-  }
+        process.env.CI ? "--no-sandbox" : null,
+        "--headless",
+        "--disable-dev-shm-usage",
+        "--disable-software-rasterizer",
+        "--mute-audio",
+        "--remote-debugging-port=0",
+        "--window-size=1440,900",
+      ].filter(Boolean),
+    },
+  },
 };

tests/dummy/app/app.js

@@ -1,5 +1,5 @@
 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';
 

tests/dummy/app/controllers/demo/input-text-ctrl-enter-submits.js

@@ -1,3 +1,3 @@
-import InputTextEnterSubmits from './input-text-enter-submits';
+import InputTextEnterSubmits from "./input-text-enter-submits";
 
-export default InputTextEnterSubmits.extend({});
+export default class InputTextCtrlEnterSubmitsController extends InputTextEnterSubmits {}

tests/dummy/app/controllers/demo/input-text-enter-submits.js

@@ -1,15 +1,8 @@
-import Controller from '@ember/controller';
+import Controller from "@ember/controller";
 
-export default Controller.extend({
-  actions: {
-    withSubmit(/*event*/) {
-      window.alert('<form {{action "submitWithOn" on="submit"}}>');
-      return false;
-    },
-
-    withOnSubmit(/*event*/) {
-      window.alert('<form onsubmit={{action "submitWithOn"}}>');
-      return false;
-    }
+export default class InputTextEnterSubmitsController extends Controller {
+  withSubmit(/*event*/) {
+    window.alert('<form {{on "submit" this.withSubmit}}>');
+    return false;
   }
-});
+}

tests/dummy/app/controllers/demo/text-area-ctrl-enter-submits.js

@@ -1,3 +1,3 @@
-import InputTextEnterSubmits from './input-text-enter-submits';
+import InputTextEnterSubmits from "./input-text-enter-submits";
 
-export default InputTextEnterSubmits.extend({});
+export default class TextAreaCtrlEnterSubmitsController extends InputTextEnterSubmits {}

tests/dummy/app/templates/acceptance/autofocus-select-text-disabled.hbs

@@ -1 +1 @@
-{{input-text value="Autofocus This Text" autofocus=true focusSelectsText?=false}}
+<InputText @value="Autofocus This Text" @autofocus={{true}} @focusSelectsText?={{false}} />

tests/dummy/app/templates/acceptance/autofocus-with-select-text.hbs

@@ -1 +1 @@
-{{input-text value="Autofocus This Text" autofocus=true focusSelectsText?=true}}
+<InputText @value="Autofocus This Text" @autofocus={{true}} @focusSelectsText?={{true}} />

tests/dummy/app/templates/acceptance/escape-clears-text.hbs

@@ -1,3 +1,3 @@
-{{input-text class="escape-clears-by-default" value="Escape Clears This Text"}}
-{{input-text class="escape-clears-enabled" value="Escape Clears This Text" escapeKeyClears?=true}}
-{{input-text class="escape-clears-disabled" value="Escape Will Not Clear This Text" escapeKeyClears?=false}}
+<InputText @class="escape-clears-by-default" @value="Escape Clears This Text" />
+<InputText @class="escape-clears-enabled" @value="Escape Clears This Text" @escapeKeyClears?={{true}} />
+<InputText @class="escape-clears-disabled" @value="Escape Will Not Clear This Text" @escapeKeyClears?={{false}} />

tests/dummy/app/templates/acceptance/focus-selects-text.hbs

@@ -1,3 +1,3 @@
-{{input-text class="select-enabled" value="Select This Text" focusSelectsText?=true}}
+<InputText @class="select-enabled" @value="Select This Text" @focusSelectsText?={{true}} />
 
-{{input-text class="select-disabled" value="Text Will Not Select On Focus" focusSelectsText?=false}}
+<InputText @class="select-disabled" @value="Text Will Not Select On Focus" @focusSelectsText?={{false}} />