Ember 2.13, node assets

.eslintrc.js

@@ -6,7 +6,7 @@ module.exports = {
   },
   extends: 'eslint:recommended',
   env: {
-    'browser': true
+    browser: true
   },
   rules: {
   }

.npmignore

@@ -8,7 +8,7 @@
 .editorconfig
 .ember-cli
 .gitignore
-.jshintrc
+.eslintrc.js
 .watchmanconfig
 .travis.yml
 bower.json

.travis.yml

@@ -1,14 +1,12 @@
 ---
 language: node_js
 node_js:
-  - "4"
+  - "6"
 
 sudo: false
 
 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)
@@ -17,24 +15,24 @@ env:
   - 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
-  - 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
+  - yarn global add phantomjs-prebuilt
+  - phantomjs --version
 
 install:
-  - npm install
-  - bower install
+  - yarn install --no-lockfile
+
 
 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 test --skip-cleanup

config/ember-try.js

@@ -1,4 +1,4 @@
-/*jshint node:true*/
+/* eslint-env node */
 module.exports = {
   scenarios: [
     {
@@ -10,6 +10,11 @@ module.exports = {
         resolutions: {
           'ember': 'lts-2-4'
         }
+      },
+      npm: {
+        devDependencies: {
+          'ember-source': null
+        }
       }
     },
     {
@@ -21,6 +26,11 @@ module.exports = {
         resolutions: {
           'ember': 'lts-2-8'
         }
+      },
+      npm: {
+        devDependencies: {
+          'ember-source': null
+        }
       }
     },
     {
@@ -32,6 +42,11 @@ module.exports = {
         resolutions: {
           'ember': 'release'
         }
+      },
+      npm: {
+        devDependencies: {
+          'ember-source': null
+        }
       }
     },
     {
@@ -43,6 +58,11 @@ module.exports = {
         resolutions: {
           'ember': 'beta'
         }
+      },
+      npm: {
+        devDependencies: {
+          'ember-source': null
+        }
       }
     },
     {
@@ -54,6 +74,17 @@ module.exports = {
         resolutions: {
           'ember': 'canary'
         }
+      },
+      npm: {
+        devDependencies: {
+          'ember-source': null
+        }
+      }
+    },
+    {
+      name: 'ember-default',
+      npm: {
+        devDependencies: {}
       }
     }
   ]

config/environment.js

@@ -1,4 +1,4 @@
-/*jshint node:true*/
+/* eslint-env node */
 'use strict';
 
 module.exports = function(/* environment, appConfig */) {

ember-cli-build.js

@@ -1,6 +1,5 @@
-/*jshint node:true*/
-/* global require, module */
-var EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
+/* eslint-env node */
+const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
 
 module.exports = function(defaults) {
   var app = new EmberAddon(defaults, {

index.js

@@ -1,41 +1,24 @@
-/*jshint node:true*/
-/* global require, module */
+/* eslint-env node */
 'use strict';
 
-var Funnel = require('broccoli-funnel');
-var mergeTrees = require('broccoli-merge-trees');
-
-
 module.exports = {
   name: 'ember-vivus',
 
-  included: function(app) {
-    this._super.included.apply(this, arguments);
-
-    // see: https://github.com/ember-cli/ember-cli/issues/3718
-    if (typeof app.import !== 'function' && app.app) {
-      app = app.app;
+  options: {
+    nodeAssets: {
+      vivus: {
+        vendor: ['dist/vivus.js']
+      }
     }
-
-    this.importDependencies(app);
   },
 
-  importDependencies: function(app) {
-    if (arguments.length < 1) {
-      throw new Error('Application instance must be passed to import');
-    }
-
-    var vendor = this.treePaths.vendor;
+  included: function() {
+    this._super.included.apply(this, arguments);
 
     if (!process.env.EMBER_CLI_FASTBOOT) {
-      if (app.env === "production") {
-        app.import(app.bowerDirectory + '/vivus/dist/vivus.min.js', {prepend: true});
-      } else {
-        app.import(app.bowerDirectory + '/vivus/dist/vivus.js', {prepend: true});
-      }
+      this.import('vendor/vivus/dist/vivus.js', {
+        using: [{ transformation: 'amd', as: 'vivus' }]
+      });
     }
-
-    app.import(vendor + '/shims/vivus.js');
   }
-
 };

package.json

@@ -25,47 +25,44 @@
     "test": "ember try:each"
   },
   "dependencies": {
-    "broccoli-funnel": "^1.0.8",
-    "broccoli-merge-trees": "^2.0.0",
-    "ember-cli-babel": "^5.1.7"
+    "ember-cli-babel": "^6.0.0-beta.9",
+    "ember-cli-node-assets": "0.2.2",
+    "vivus": "^0.4.0"
   },
   "devDependencies": {
     "broccoli-asset-rev": "^2.4.5",
     "ember-assign-polyfill": "1.0.0",
-    "ember-cli": "2.10.0-beta.2",
-    "ember-cli-app-version": "^2.0.0",
+    "ember-cli": "2.13.0-beta.2",
     "ember-cli-dependency-checker": "^1.3.0",
-    "ember-cli-eslint": "3.0.3",
-    "ember-cli-htmlbars": "^1.0.10",
-    "ember-cli-htmlbars-inline-precompile": "^0.3.3",
+    "ember-cli-eslint": "^3.0.0",
+    "ember-cli-htmlbars": "^1.1.1",
+    "ember-cli-htmlbars-inline-precompile": "^0.4.0-beta.2",
     "ember-cli-inject-live-reload": "^1.4.1",
-    "ember-cli-qunit": "^3.0.1",
-    "ember-cli-release": "^0.2.9",
+    "ember-cli-qunit": "^3.1.2",
+    "ember-cli-shims": "^1.0.2",
     "ember-cli-sri": "^2.1.0",
-    "ember-cli-test-loader": "^1.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.3",
-    "ember-resolver": "^2.0.3",
-    "loader.js": "^4.0.10"
+    "ember-load-initializers": "^0.6.0",
+    "ember-resolver": "^3.0.0",
+    "ember-source": "~2.13.0-beta.1",
+    "loader.js": "^4.2.3"
   },
   "engines": {
-    "node": ">= 0.12.0"
+    "node": ">= 4"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config"
   },
   "greenkeeper": {
     "ignore": [
       "broccoli-asset-rev",
-      "ember-cli-app-version",
       "ember-cli-babel",
       "ember-cli-htmlbars",
       "ember-cli-htmlbars-inline-precompile",
       "ember-cli-qunit",
       "ember-cli-sri",
-      "ember-cli-test-loader",
       "ember-export-application-global",
       "ember-resolver",
       "loader.js"

testem.js

@@ -1,6 +1,5 @@
-/*jshint node:true*/
+/* eslint-env node */
 module.exports = {
-  "framework": "qunit",
   "test_page": "tests/index.html?hidepassed",
   "disable_watching": true,
   "launch_in_ci": [

tests/.eslintrc.js

@@ -1,5 +1,5 @@
 module.exports = {
   env: {
-    'embertest': true
+    embertest: true
   }
 };

tests/acceptance/vivus-shim-test.js

@@ -0,0 +1,10 @@
+import { test } from 'qunit';
+import moduleForAcceptance from '../../tests/helpers/module-for-acceptance';
+import vivus from 'vivus';
+
+moduleForAcceptance('Acceptance | vivus shim');
+
+test('testing shim import', function(assert) {
+  assert.ok(vivus !== undefined && vivus !== null);
+  assert.equal(vivus.toString().substr(0, 42), 'function Vivus(element, options, callback)');
+});

tests/dummy/config/environment.js

@@ -1,4 +1,4 @@
-/* jshint node: true */
+/* eslint-env node */
 
 module.exports = function(environment) {
   var ENV = {

tests/dummy/config/targets.js

@@ -0,0 +1,10 @@
+/* eslint-env node */
+
+module.exports = {
+  browsers: [
+    'ie 9',
+    'last 1 Chrome versions',
+    'last 1 Firefox versions',
+    'last 1 Safari versions'
+  ]
+};

tests/helpers/start-app.js

@@ -1,20 +1,15 @@
 import Ember from 'ember';
 import Application from '../../app';
 import config from '../../config/environment';
-import assign from 'ember-assign-polyfill';
-const { run } = Ember;
 
 export default function startApp(attrs) {
-  let application;
+  let attributes = Ember.merge({}, config.APP);
+  attributes = Ember.merge(attributes, attrs); // use defaults, but you can override;
 
-  // use defaults, but you can override
-  let attributes = assign({}, config.APP, attrs);
-
-  run(() => {
-    application = Application.create(attributes);
+  return Ember.run(() => {
+    let application = Application.create(attributes);
     application.setupForTesting();
     application.injectTestHelpers();
+    return application;
   });
-
-  return application;
 }