upgrade to 3.0

Author: snewcomer

.editorconfig

@@ -13,22 +13,8 @@ insert_final_newline = true
 indent_style = space
 indent_size = 2
 
-[*.js]
-indent_style = space
-indent_size = 2
-
 [*.hbs]
 insert_final_newline = false
-indent_style = space
-indent_size = 2
-
-[*.css]
-indent_style = space
-indent_size = 2
-
-[*.html]
-indent_style = space
-indent_size = 2
 
 [*.{diff,md}]
 trim_trailing_whitespace = false

.eslintrc.js

@@ -1,13 +1,48 @@
 module.exports = {
   root: true,
   parserOptions: {
-    ecmaVersion: 6,
+    ecmaVersion: 2017,
     sourceType: 'module'
   },
-  extends: 'eslint:recommended',
+  plugins: [
+    'ember'
+  ],
+  extends: [
+    'eslint:recommended',
+    'plugin:ember/recommended'
+  ],
   env: {
     browser: true
   },
   rules: {
-  }
+  },
+  overrides: [
+    // node files
+    {
+      files: [
+        'index.js',
+        'testem.js',
+        'ember-cli-build.js',
+        'config/**/*.js',
+        'tests/dummy/config/**/*.js'
+      ],
+      excludedFiles: [
+        'app/**',
+        'addon/**',
+        'tests/dummy/app/**'
+      ],
+      parserOptions: {
+        sourceType: 'script',
+        ecmaVersion: 2015
+      },
+      env: {
+        browser: false,
+        node: true
+      },
+      plugins: ['node'],
+      rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
+        // add your custom rules and overrides for node files here
+      })
+    }
+  ]
 };

.gitignore

@@ -1,4 +1,4 @@
-# See http://help.github.com/ignore-files/ for more about ignoring files.
+# See https://help.github.com/ignore-files/ for more about ignoring files.
 
 # compiled output
 /dist
@@ -14,7 +14,10 @@
 /coverage/*
 /libpeerconnection.log
 npm-debug.log*
+yarn-error.log
 testem.log
-test-results.xml
-.envrc
-.DS_Store
+
+# ember-try
+.node_modules.ember-try/
+bower.json.ember-try
+package.json.ember-try

.npmignore

@@ -7,10 +7,15 @@
 .bowerrc
 .editorconfig
 .ember-cli
-.gitignore
 .eslintrc.js
+.gitignore
 .watchmanconfig
 .travis.yml
 bower.json
 ember-cli-build.js
 testem.js
+
+# ember-try
+.node_modules.ember-try/
+bower.json.ember-try
+package.json.ember-try

.travis.yml

@@ -1,40 +1,48 @@
 ---
 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
-    - $HOME/.cache # includes bowers cache
+  yarn: true
 
 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-lts-2.18
+    - EMBER_TRY_SCENARIO=ember-release
+    - EMBER_TRY_SCENARIO=ember-beta
+    - EMBER_TRY_SCENARIO=ember-canary
+    - EMBER_TRY_SCENARIO=ember-default
 
 matrix:
   fast_finish: true
   allow_failures:
     - env: EMBER_TRY_SCENARIO=ember-canary
 
 before_install:
-  - npm config set spin false
-  - npm install -g bower phantomjs-prebuilt
-  - bower --version
-  - phantomjs --version
+  - curl -o- -L https://yarnpkg.com/install.sh | bash
+  - export PATH=$HOME/.yarn/bin:$PATH
 
 install:
-  - npm install
-  - bower install
+  - yarn install --no-lockfile --non-interactive
 
 script:
+  - yarn lint:js
   # 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

addon/services/stripe.js

@@ -1,15 +1,21 @@
 /* global Stripe */
+import { isEqual, typeOf } from '@ember/utils';
+
+import { resolve, Promise as EmberPromise } from 'rsvp';
+import { registerWaiter } from '@ember/test';
+import { readOnly } from '@ember/object/computed';
+import Service from '@ember/service';
 import Ember from 'ember';
 import loadScript from 'ember-stripe-service/utils/load-script';
 
-export default Ember.Service.extend({
+export default Service.extend({
   didConfigure: false,
   config: null,
 
-  lazyLoad: Ember.computed.readOnly('config.lazyLoad'),
-  mock: Ember.computed.readOnly('config.mock'),
-  publishableKey: Ember.computed.readOnly('config.publishableKey'),
-  debuggingEnabled: Ember.computed.readOnly('config.debug'),
+  lazyLoad: readOnly('config.lazyLoad'),
+  mock: readOnly('config.mock'),
+  publishableKey: readOnly('config.publishableKey'),
+  debuggingEnabled: readOnly('config.debug'),
 
   runCount: 0,
 
@@ -23,7 +29,7 @@ export default Ember.Service.extend({
       this._waiter = () => {
         return this.get('runCount') === 0;
       };
-      Ember.Test.registerWaiter(this._waiter);
+      registerWaiter(this._waiter);
     }
 
     if (!lazyLoad || mock) {
@@ -37,7 +43,7 @@ export default Ember.Service.extend({
 
     let loadJs = lazyLoad && !mock ?
       loadScript("https://js.stripe.com/v2/") :
-      Ember.RSVP.resolve();
+      resolve();
 
     return loadJs.then(() => {
       this.configure();
@@ -74,7 +80,7 @@ export default Ember.Service.extend({
 
   stripePromise(callback) {
     return this.load().then(() => {
-      return new Ember.RSVP.Promise((resolve, reject) => {
+      return new EmberPromise((resolve, reject) => {
         callback(resolve, reject);
       });
     });
@@ -177,7 +183,7 @@ export default Ember.Service.extend({
   },
 
   _checkForAndAddCardFn(name, fn) {
-    if (Ember.isEqual(Ember.typeOf(Stripe.card[name]), 'function')) {
+    if (isEqual(typeOf(Stripe.card[name]), 'function')) {
       this.card[name] = fn;
     } else {
       this.card[name] = function() {};

addon/utils/load-script.js

@@ -1,4 +1,5 @@
-import Ember from 'ember';
+import { run } from '@ember/runloop';
+import { Promise as EmberPromise } from 'rsvp';
 
 /*
  * loadScript will load a JavaScript asset. Subsequent load
@@ -11,18 +12,18 @@ let loadedScripts = {};
 export default function loadScript(url) {
   let promise = loadedScripts[url];
   if (!promise) {
-    promise = new Ember.RSVP.Promise((resolve, reject) => {
+    promise = new EmberPromise((resolve, reject) => {
       let element = document.createElement('script');
       element.type = 'text/javascript';
       element.async = false;
       element.addEventListener('load', () => {
-        Ember.run(() => {
+        run(() => {
           resolve();
         });
       }, false);
       element.addEventListener('error', () => {
         let error = new Error(`Could not load script ${url}`);
-        Ember.run(() => {
+        run(() => {
           reject(error);
         });
       }, false);

app/initializers/ember-stripe-service.js

@@ -1,3 +1,4 @@
+import EmberError from '@ember/error';
 import Ember from 'ember';
 import StripeMock from 'ember-stripe-service/utils/stripe-mock';
 import config from '../config/environment';
@@ -16,7 +17,7 @@ export function initialize() {
   }
 
   if (!stripeConfig.publishableKey) {
-    throw new Ember.Error("StripeService: Missing Stripe key, please set `ENV.stripe.publishableKey` in config.environment.js");
+    throw new EmberError("StripeService: Missing Stripe key, please set `ENV.stripe.publishableKey` in config.environment.js");
   }
 
   if (typeof FastBoot !== 'undefined' || stripeConfig.mock) {