diff --git a/app/index.html b/app/index.html index 190adb7c..bff5ac8a 100644 --- a/app/index.html +++ b/app/index.html @@ -31,7 +31,12 @@ diff --git a/app/services/ember-cli.js b/app/services/ember-cli.js index 3df3970d..2b0aceb4 100644 --- a/app/services/ember-cli.js +++ b/app/services/ember-cli.js @@ -2,7 +2,6 @@ import Babel from 'babel-core'; import Path from 'path'; import HbsPlugin from '../plugins/hbs-plugin'; import blueprints from '../lib/blueprints'; -import config from '../config/environment'; import Ember from 'ember'; import moment from 'moment'; import _template from "lodash/string/template"; @@ -307,7 +306,7 @@ export default Ember.Service.extend({ let EmberENV = twiddleJSON.EmberENV || {}; depScriptTags += ``; - depScriptTags += ``; + depScriptTags += ``; Object.keys(deps).forEach(function(depKey) { let dep = deps[depKey]; @@ -322,18 +321,18 @@ export default Ember.Service.extend({ } }); - depScriptTags += ``; + depScriptTags += ``; if (testingEnabled(twiddleJSON)) { - const testJSFiles = ['assets/test-loader.js', 'testem.js']; + const testJSFiles = ['testLoader', 'testem']; testJSFiles.forEach(jsFile => { - depScriptTags += ``; + depScriptTags += ``; }); depScriptTags += ``; - depCssLinkTags += ``; + depCssLinkTags += ``; testStuff += `
diff --git a/blueprints/twiddle.json b/blueprints/twiddle.json index af0f2467..0a091fdc 100644 --- a/blueprints/twiddle.json +++ b/blueprints/twiddle.json @@ -1,5 +1,5 @@ { - "version": "0.12.0", + "version": "0.12.1", "EmberENV": { "FEATURES": {} }, diff --git a/bower.json b/bower.json index 0bd2c9f1..5f3b042d 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "ember-twiddle", - "version": "0.12.0", + "version": "0.12.1", "dependencies": { "ember": "~2.10.2", "ember-cli-shims": "0.1.3", diff --git a/ember-cli-build.js b/ember-cli-build.js index 191dc430..d65b1997 100644 --- a/ember-cli-build.js +++ b/ember-cli-build.js @@ -28,7 +28,7 @@ module.exports = function(defaults) { enabled: isProductionLikeBuild, prepend: prepend, extensions: ['js', 'css', 'png', 'jpg', 'gif', 'map', 'svg', 'eot', 'ttf', 'woff', 'woff2', 'ico'], - exclude: ['test-loader', 'test-support.css', 'testem'] + exclude: [] }, codemirror: { modes: ['xml', 'javascript', 'handlebars', 'htmlmixed', 'css'], @@ -156,7 +156,7 @@ module.exports = function(defaults) { outputFile: '/assets/twiddle-deps.js' }); - return mergeTrees([app.toTree(), twiddleVendorTree, loaderTree, testLoaderTree]); + return app.toTree(mergeTrees([twiddleVendorTree, loaderTree, testLoaderTree])); }; // This copies code out of ember-cli's blueprints into diff --git a/package.json b/package.json index d0111865..64ec5643 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ember-twiddle", - "version": "0.12.0", + "version": "0.12.1", "description": "https://ember-twiddle.com", "private": true, "directories": { @@ -14,7 +14,7 @@ }, "repository": "https://github.com/ember-cli/ember-twiddle", "engines": { - "node": ">= 0.12.0" + "node": ">= 4" }, "author": "Ember Twiddle Contributors", "license": "MIT", diff --git a/tests/index.html b/tests/index.html index cdcaf572..1a3dae20 100644 --- a/tests/index.html +++ b/tests/index.html @@ -32,7 +32,12 @@