Bump ember versions (#48)

* run ember-cli-update

* Use ember-modules-codemod

* regenerate lock file

* Fix some upgrade issues

* Fix test container styles

* Fix failing tests due to no PhantomJS

Author: brandynbennett

.bowerrc

@@ -1,7 +1,7 @@
 module.exports = {
   root: true,
   parserOptions: {
-    ecmaVersion: 6,
+    ecmaVersion: 2017,
     sourceType: 'module'
   },
   extends: 'eslint:recommended',

.eslintrc.js

@@ -14,5 +14,11 @@
 /coverage/*
 /libpeerconnection.log
 npm-debug.log*
+yarn-error.log
 testem.log
 .DS_Store
+
+# ember-try
+.node_modules.ember-try/
+bower.json.ember-try
+package.json.ember-try

.gitignore

@@ -15,3 +15,8 @@ bower.json
 ember-cli-build.js
 testem.js
 **/.DS_Store
+
+# ember-try
+.node_modules.ember-try/
+bower.json.ember-try
+package.json.ember-try

.npmignore

@@ -1,22 +1,33 @@
 ---
 language: node_js
 node_js:
-  - "6"
+  # we recommend testing addons with the same minimum supported node version as Ember CLI
+  # so that your addon works for all apps
+  - "4"
 
 sudo: false
+dist: trusty
+
+addons:
+  chrome: stable
 
 cache:
   directories:
     - $HOME/.npm
 
 env:
-  # we recommend testing LTS's and latest stable release (bonus points to beta/canary)
-  - EMBER_TRY_SCENARIO=ember-lts-2.4
-  - EMBER_TRY_SCENARIO=ember-lts-2.8
-  - EMBER_TRY_SCENARIO=ember-release
-  - EMBER_TRY_SCENARIO=ember-beta
-  - EMBER_TRY_SCENARIO=ember-canary
-  - EMBER_TRY_SCENARIO=ember-default
+  global:
+    # See https://git.io/vdao3 for details.
+    - JOBS=1
+  matrix:
+    # we recommend new addons test the current and previous LTS
+    # as well as latest stable release (bonus points to beta/canary)
+    - EMBER_TRY_SCENARIO=ember-lts-2.12
+    - EMBER_TRY_SCENARIO=ember-lts-2.16
+    - EMBER_TRY_SCENARIO=ember-release
+    - EMBER_TRY_SCENARIO=ember-beta
+    - EMBER_TRY_SCENARIO=ember-canary
+    - EMBER_TRY_SCENARIO=ember-default
 
 matrix:
   fast_finish: true
@@ -25,13 +36,10 @@ matrix:
 
 before_install:
   - npm config set spin false
-  - npm install -g phantomjs-prebuilt
-  - phantomjs --version
-
-install:
-  - npm install
+  - npm install -g npm@4
+  - npm --version
 
 script:
   # Usually, it's ok to finish the test scenario without reverting
   #  to the addon's original dependency state, skipping "cleanup".
-  - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup
+  - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup

.travis.yml

@@ -1,4 +1,5 @@
-import Ember from 'ember';
+import { once } from '@ember/runloop';
+import { observer } from '@ember/object';
 import InputMaskComponent from 'ember-inputmask/components/input-mask';
 
 /**
@@ -34,11 +35,11 @@ export default InputMaskComponent.extend({
     this._super();
   },
 
-  _maskShouldChange: Ember.observer('mask', 'cardType', 'separator', function() {
-    Ember.run.once(this, 'updateMask');
+  _maskShouldChange: observer('mask', 'cardType', 'separator', function() {
+    once(this, 'updateMask');
   }),
 
-  updateCardType: Ember.observer('unmaskedValue', function() {
+  updateCardType: observer('unmaskedValue', function() {
     var unmaskedValue = this.get('unmaskedValue') || '',
         cardType;
 

addon/components/credit-card-input.js

@@ -1,6 +1,11 @@
 /* global Inputmask */
 
-import Ember from 'ember';
+import { once, debounce } from '@ember/runloop';
+
+import { isPresent } from '@ember/utils';
+import { on } from '@ember/object/evented';
+import { computed, observer } from '@ember/object';
+import TextField from '@ember/component/text-field';
 
 /**
  * `{{input-mask}}` component.
@@ -25,7 +30,7 @@ import Ember from 'ember';
  *     Enable by setting debounce > 0, makes sure to deduplicate calls to update the UI and only deliver the last ui change
  */
 
-export default Ember.TextField.extend({
+export default TextField.extend({
   mask: '',
 
   showMaskOnFocus: true,
@@ -41,7 +46,7 @@ export default Ember.TextField.extend({
 
   value: 'value',
 
-  options: Ember.computed(function() {
+  options: computed(function() {
     return {};
   }),
 
@@ -52,7 +57,7 @@ export default Ember.TextField.extend({
   },
 
   // Remove the mask from the input
-  teardownMask: Ember.on('willDestroyElement', function() {
+  teardownMask: on('willDestroyElement', function() {
     if (this.element.inputmask) {
       this.element.inputmask.remove();
     }
@@ -79,7 +84,7 @@ export default Ember.TextField.extend({
     inputmask.mask(this.element);
 
     // Initialize the unmasked value if it exists
-    if (Ember.isPresent(this.get('unmaskedValue'))) {
+    if (isPresent(this.get('unmaskedValue'))) {
       this.element.value = this.get('unmaskedValue');
     }
 
@@ -117,7 +122,7 @@ export default Ember.TextField.extend({
     this.setMask();
   },
 
-  _maskShouldChange: Ember.observer('mask',
+  _maskShouldChange: observer('mask',
     'maskPlaceholder',
     'showMaskOnFocus',
     'showMaskOnHover',
@@ -127,7 +132,7 @@ export default Ember.TextField.extend({
     'pattern',
     'regex',
     function() {
-      Ember.run.once(this, 'updateMask');
+      once(this, 'updateMask');
   }),
 
   updateVar: function () {
@@ -140,17 +145,17 @@ export default Ember.TextField.extend({
   },
 
   // Unmask the value of the field and set the property.
-  setUnmaskedValue: Ember.observer('value', function() {
+  setUnmaskedValue: observer('value', function() {
     if (this.element && this.element.inputmask) {
       this.set('unmaskedValue', this.element.inputmask.unmaskedvalue());
     }
   }),
 
   // When the unmaskedValue changes, set the value.
-  setValue: Ember.observer('unmaskedValue', function() {
-    var debounce = this.get('debounce');
-    if ( debounce ) {
-      Ember.run.debounce(this, this.updateVar, debounce);
+  setValue: observer('unmaskedValue', function() {
+    let debounceTime = this.get('debounce');
+    if ( debounceTime ) {
+      debounce(this, this.updateVar, debounce);
     } else {
       this.updateVar();
     }

addon/components/input-mask.js

@@ -1,4 +1,5 @@
-import Ember from 'ember';
+import { once } from '@ember/runloop';
+import { observer } from '@ember/object';
 import InputMaskComponent from 'ember-inputmask/components/input-mask';
 
 /**
@@ -74,7 +75,7 @@ export default InputMaskComponent.extend({
     this._super();
   },
 
-  _maskShouldChange: Ember.observer(
+  _maskShouldChange: observer(
     'mask',
     'group',
     'decimal',
@@ -88,6 +89,6 @@ export default InputMaskComponent.extend({
     'suffix',
     'unmaskAsNumber',
     function() {
-      Ember.run.once(this, 'updateMask');
+      once(this, 'updateMask');
   })
 });

addon/components/number-input.js

@@ -1,4 +1,5 @@
-import Ember from 'ember';
+import { once } from '@ember/runloop';
+import { observer } from '@ember/object';
 import InputMaskComponent from 'ember-inputmask/components/input-mask';
 
 /**
@@ -26,7 +27,7 @@ export default InputMaskComponent.extend({
     this._super();
   },
 
-  _maskShouldChange: Ember.observer('mask', 'extensions', function() {
-    Ember.run.once(this, 'updateMask');
+  _maskShouldChange: observer('mask', 'extensions', function() {
+    once(this, 'updateMask');
   })
 });

addon/components/phone-number-input.js

@@ -1,4 +1,5 @@
-import Ember from 'ember';
+import { once } from '@ember/runloop';
+import { observer } from '@ember/object';
 import InputMaskComponent from 'ember-inputmask/components/input-mask';
 
 /**
@@ -14,7 +15,7 @@ export default InputMaskComponent.extend({
     this._super();
   },
 
-  _maskShouldChange: Ember.observer('mask', function() {
-    Ember.run.once(this, 'updateMask');
+  _maskShouldChange: observer('mask', function() {
+    once(this, 'updateMask');
   })
 });

addon/components/ssn-input.js

@@ -1,4 +1,5 @@
-import Ember from 'ember';
+import { once } from '@ember/runloop';
+import { observer } from '@ember/object';
 import InputMaskComponent from 'ember-inputmask/components/input-mask';
 
 /**
@@ -27,7 +28,7 @@ export default InputMaskComponent.extend({
     this._super();
   },
 
-  _maskShouldChange: Ember.observer('mask', 'fullCode', function() {
-    Ember.run.once(this, 'updateMask');
+  _maskShouldChange: observer('mask', 'fullCode', function() {
+    once(this, 'updateMask');
   })
 });

addon/components/zip-code-input.js

@@ -1,36 +1,22 @@
 /* eslint-env node */
 
 module.exports = {
+  useYarn: true,
+
   scenarios: [
     {
-      name: 'ember-lts-2.4',
-      bower: {
-        dependencies: {
-          'ember': 'components/ember#lts-2-4'
-        },
-        resolutions: {
-          'ember': 'lts-2-4'
-        }
-      },
+      name: 'ember-lts-2.12',
       npm: {
         devDependencies: {
-          'ember-source': null
+          'ember-source': '~2.12.0'
         }
       }
     },
     {
-      name: 'ember-lts-2.8',
-      bower: {
-        dependencies: {
-          'ember': 'components/ember#lts-2-8'
-        },
-        resolutions: {
-          'ember': 'lts-2-8'
-        }
-      },
+      name: 'ember-lts-2.16',
       npm: {
         devDependencies: {
-          'ember-source': null
+          'ember-source': '~2.16.0'
         }
       }
     },

config/ember-try.js

@@ -1,9 +1,10 @@
 /* eslint-env node */
+'use strict';
 
 const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
 
 module.exports = function(defaults) {
-  var app = new EmberAddon(defaults, {
+  let app = new EmberAddon(defaults, {
     // Add options here
   });
 

ember-cli-build.js

@@ -14,38 +14,39 @@
   "repository": "https://github.com/pzuraq/ember-inputmask",
   "scripts": {
     "build": "ember build",
-    "start": "ember server",
+    "start": "ember serve",
     "test": "ember try:each"
   },
   "dependencies": {
-    "ember-cli-babel": "^5.1.7",
+    "ember-cli-babel": "^6.6.0",
     "ember-cli-node-assets": "^0.2.2",
     "fastboot-transform": "^0.1.1",
     "inputmask": "3.3.6"
   },
   "devDependencies": {
     "broccoli-asset-rev": "^2.4.5",
-    "ember-cli": "2.12.1",
-    "ember-cli-dependency-checker": "^1.3.0",
-    "ember-cli-eslint": "^3.0.0",
-    "ember-cli-htmlbars": "^1.1.1",
-    "ember-cli-htmlbars-inline-precompile": "^0.3.6",
+    "ember-ajax": "^3.0.0",
+    "ember-cli": "~2.17.0",
+    "ember-cli-dependency-checker": "^2.0.0",
+    "ember-cli-eslint": "^4.2.1",
+    "ember-cli-htmlbars": "^2.0.1",
+    "ember-cli-htmlbars-inline-precompile": "^1.0.0",
     "ember-cli-inject-live-reload": "^1.4.1",
-    "ember-cli-qunit": "^3.1.0",
-    "ember-cli-release": "0.2.9",
-    "ember-cli-shims": "^1.0.2",
+    "ember-cli-qunit": "^4.1.1",
+    "ember-cli-shims": "^1.2.0",
     "ember-cli-sri": "^2.1.0",
-    "ember-cli-uglify": "^1.2.0",
-    "ember-disable-prototype-extensions": "^1.1.0",
-    "ember-export-application-global": "^1.0.5",
-    "ember-load-initializers": "^0.6.0",
-    "ember-native-dom-helpers": "^0.4.0",
-    "ember-resolver": "2.0.3",
-    "ember-source": "~2.12.0",
+    "ember-cli-uglify": "^2.0.0",
+    "ember-disable-prototype-extensions": "^1.1.2",
+    "ember-export-application-global": "^2.0.0",
+    "ember-load-initializers": "^1.0.0",
+    "ember-maybe-import-regenerator": "^0.1.6",
+    "ember-native-dom-helpers": "^0.5.8",
+    "ember-resolver": "^4.0.0",
+    "ember-source": "~2.17.0",
     "loader.js": "^4.2.3"
   },
   "engines": {
-    "node": ">= 4"
+    "node": "^4.5 || 6.* || >= 7.*"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config"