Update ember cli babel 6.6.0

.travis.yml

@@ -1,38 +1,49 @@
 ---
 language: node_js
 node_js:
-  - "4"
+  # we recommend testing addons with the same minimum supported node version as Ember CLI
+  # so that your addon works for all apps
+  - "6"
 
 sudo: false
+dist: trusty
+
+addons:
+  chrome: stable
 
 cache:
+  yarn: true
   directories:
-    - node_modules
+    - $HOME/.npm
 
 env:
-  - EMBER_TRY_SCENARIO=default
-  - EMBER_TRY_SCENARIO=ember-1.13
-  - EMBER_TRY_SCENARIO=ember-release
-  - EMBER_TRY_SCENARIO=ember-beta
-  - EMBER_TRY_SCENARIO=ember-canary
+  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-lts-2.18
+    - EMBER_TRY_SCENARIO=ember-release
+    - EMBER_TRY_SCENARIO=ember-beta
+    - EMBER_TRY_SCENARIO=ember-canary
 
 matrix:
   fast_finish: true
   allow_failures:
     - env: EMBER_TRY_SCENARIO=ember-canary
 
 before_install:
-  - npm config set spin false
-  - npm install -g bower
-  - bower --version
-  - npm install phantomjs-prebuilt
-  - node_modules/phantomjs-prebuilt/bin/phantomjs --version
+  - curl -o- -L https://yarnpkg.com/install.sh | bash
+  - export PATH=$HOME/.yarn/bin:$PATH
 
 install:
-  - npm install
+  - yarn install --no-lockfile --non-interactive
   - bower install
 
 script:
   # Usually, it's ok to finish the test scenario without reverting
   #  to the addon's original dependency state, skipping "cleanup".
-  - ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup
+  - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup

addon/utils/countries-lists.js

@@ -1,8 +1,4 @@
-import Em from 'ember';
-
-const {
-  A
-  } = Em;
+import {A} from '@ember/array';
 
 
 export const COUNTRIES_LIST = A([

addon/utils/countries-properties.js

@@ -1,11 +1,7 @@
-import Em from 'ember';
+import { isNone } from '@ember/utils';
 import { COUNTRIES_LIST, COUNTRIES_WITHOUT_ZIP_LIST, COUNTRIES_WITH_STATES_LIST } from './countries-lists';
 import { getFormat, buildIndex } from './helpers';
 
-const {
-  isNone
-  } = Em;
-
 let indexedByIso2;
 let indexedByIso3;
 let indexedByIsoNumeric;

addon/utils/helpers.js

@@ -1,9 +1,4 @@
-import Em from 'ember';
-
-const {
-  isNone
-  } = Em;
-
+import { isNone } from '@ember/utils';
 
 export function getFormat(val) {
   if (typeof val !== "string") {return null;}

addon/utils/states-lists.js

@@ -1,9 +1,4 @@
-import Em from 'ember';
-
-const {
-  A
-  } = Em;
-
+import {A} from '@ember/array';
 
 /*********************
  United States lists

addon/utils/states-properties.js

@@ -1,16 +1,12 @@
-import Em from 'ember';
+import {A} from '@ember/array';
+import { isNone } from '@ember/utils';
+
 import { getFormat, buildIndex } from './helpers';
 import { getCountry, isCountryWithState } from './countries-properties';
 import { STATES_BY_COUNTRIES, US_REQUIRING_CUSTOM_DECLARATION_STATES_LIST } from './states-lists';
 
-const {
-  A,
-  isNone
-  } = Em;
-
 let indexedByIso2;
 
-
 export function getState(country, value) {
   let valueFormat = getFormat(value);
   if (valueFormat === null || valueFormat !== 'iso2') {return;}

bower.json

@@ -1,7 +1,6 @@
 {
   "name": "ember-countries",
   "dependencies": {
-    "ember": "~2.8.0",
-    "ember-cli-shims": "0.1.1"
+    "ember-template-compiler": "toranb/ember-template-compiler#^1.8.0"
   }
 }

config/ember-try.js

@@ -1,55 +1,72 @@
 /*jshint node:true*/
-module.exports = {
-  scenarios: [
-    {
-      name: 'default',
-      bower: {
-        dependencies: { }
-      }
-    },
-    {
-      name: 'ember-1.13',
-      bower: {
-        dependencies: {
-          'ember': '~1.13.0'
+"use strict";
+
+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.12',
+          npm: {
+            devDependencies: {
+              'ember-source': '~2.12.0'
+            }
+          }
         },
-        resolutions: {
-          'ember': '~1.13.0'
-        }
-      }
-    },
-    {
-      name: 'ember-release',
-      bower: {
-        dependencies: {
-          'ember': 'components/ember#release'
+        {
+          name: 'ember-lts-2.16',
+          npm: {
+            devDependencies: {
+              'ember-source': '~2.16.0'
+            }
+          }
         },
-        resolutions: {
-          'ember': 'release'
-        }
-      }
-    },
-    {
-      name: 'ember-beta',
-      bower: {
-        dependencies: {
-          'ember': 'components/ember#beta'
+        {
+          name: 'ember-lts-2.18',
+          npm: {
+            devDependencies: {
+              'ember-source': '~2.18.0'
+            }
+          }
         },
-        resolutions: {
-          'ember': 'beta'
-        }
-      }
-    },
-    {
-      name: 'ember-canary',
-      bower: {
-        dependencies: {
-          'ember': 'components/ember#canary'
+        {
+          name: 'ember-release',
+          npm: {
+            devDependencies: {
+              'ember-source': urls[0]
+            }
+          }
+        },
+        {
+          name: 'ember-beta',
+          npm: {
+            devDependencies: {
+              'ember-source': urls[1]
+            }
+          }
+        },
+        {
+          name: 'ember-canary',
+          npm: {
+            devDependencies: {
+              'ember-source': urls[2]
+            }
+          }
         },
-        resolutions: {
-          'ember': 'canary'
+        {
+          name: 'ember-default',
+          npm: {
+            devDependencies: {}
+          }
         }
-      }
-    }
-  ]
+      ]
+    };
+  });
 };

ember-cli-build.js

@@ -1,9 +1,9 @@
 /*jshint node:true*/
-/* global require, module */
-var EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
+
+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
   });
 

package.json

@@ -9,45 +9,36 @@
   "scripts": {
     "build": "ember build",
     "start": "ember server",
-    "test": "ember try:testall"
+    "test": "ember try:each"
   },
   "repository": "https://github.com/mnowik/ember-countries",
   "engines": {
     "node": ">= 0.10.0"
   },
   "author": "Matthieu Nowicki",
   "license": "MIT",
-  "devDependencies": {
-    "broccoli-asset-rev": "^2.4.2",
-    "ember-ajax": "^2.0.1",
-    "ember-cli": "2.8.0",
-    "ember-cli-app-version": "^1.0.0",
-    "ember-cli-dependency-checker": "^1.2.0",
-    "ember-cli-htmlbars": "^1.0.3",
-    "ember-cli-htmlbars-inline-precompile": "^0.3.1",
-    "ember-cli-inject-live-reload": "^1.4.0",
-    "ember-cli-jshint": "^1.0.0",
-    "ember-cli-qunit": "^2.1.0",
-    "ember-cli-release": "^0.2.9",
-    "ember-cli-sri": "^2.1.0",
-    "ember-cli-test-loader": "^1.1.0",
-    "ember-cli-uglify": "^1.2.0",
-    "ember-data": "^2.8.0",
-    "ember-disable-prototype-extensions": "^1.1.0",
-    "ember-export-application-global": "^1.0.5",
-    "ember-load-initializers": "^0.5.1",
-    "ember-resolver": "^2.0.3",
-    "ember-welcome-page": "^1.0.1",
-    "loader.js": "^4.0.1"
-  },
   "keywords": [
     "ember-addon",
     "utils",
     "countries",
     "list"
   ],
   "dependencies": {
-    "ember-cli-babel": "^5.1.6"
+    "ember-cli-babel": "^6.6.0"
+  },
+  "devDependencies": {
+    "bower": "^1.8.4",
+    "ember-cli": "^3.6.0",
+    "ember-cli-htmlbars": "^3.0.1",
+    "ember-cli-htmlbars-inline-precompile": "^2.1.0",
+    "ember-load-initializers": "^2.0.0",
+    "ember-qunit": "^4.2.0",
+    "ember-resolver": "^5.0.1",
+    "ember-source": "https://s3.amazonaws.com/builds.emberjs.com/release/shas/9ff016d21488fd7fa4d625db78c2bafe01772f11.tgz",
+    "ember-source-channel-url": "^1.1.0",
+    "ember-template-compiler": "^1.9.0-alpha",
+    "ember-try": "^1.1.0",
+    "loader.js": "^4.7.0"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config"

testem.js

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