Merge pull request #122 from ember-cli/remove-bower

Remove bower.
ember-cli · Jul 26, 2018 · 40c02f9 · 40c02f9
2 parents 0fd3fad + a860e25
commit 40c02f9
Show file tree

Hide file tree

Showing 7 changed files with 547 additions and 255 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,8 @@ language: node_js
 node_js:
   - "4"
   - "6"
-  - "7"
+  - "8"
+  - "10"
 
 deploy:
   provider: npm

diff --git a/appveyor.yml b/appveyor.yml
@@ -6,7 +6,8 @@ environment:
   matrix:
     - nodejs_version: "4"
     - nodejs_version: "6"
-    - nodejs_version: "7"
+    - nodejs_version: "8"
+    - nodejs_version: "10"
 
 branches:
   only:

diff --git a/bower.json b/bower.json
diff --git a/package.json b/package.json
@@ -12,7 +12,6 @@
     "node": ">= 4.0.0"
   },
   "scripts": {
-    "prepublish": "bower install",
     "test": "mocha test/*.js",
     "test:debug": "mocha debug test/*.js"
   },
@@ -34,16 +33,16 @@
   },
   "homepage": "https://github.com/ember-cli/ember-cli-htmlbars",
   "devDependencies": {
-    "bower": "^1.3.12",
     "broccoli": "^0.16.7",
-    "broccoli-concat": "^3.2.2",
+    "broccoli-concat": "^3.5.1",
     "co": "^4.6.0",
-    "mocha": "^3.0.2",
+    "ember-source": "^3.3.1",
+    "mocha": "^5.2.0",
     "mocha-jshint": "^2.3.1"
   },
   "dependencies": {
-    "broccoli-persistent-filter": "^1.0.3",
-    "hash-for-dep": "^1.0.2",
+    "broccoli-persistent-filter": "^1.4.3",
+    "hash-for-dep": "^1.2.3",
     "json-stable-stringify": "^1.0.0",
     "strip-bom": "^3.0.0"
   }

diff --git a/test/template_compiler_test.js b/test/template_compiler_test.js
@@ -21,7 +21,7 @@ describe('TemplateCompiler', function(){
   beforeEach(function() {
     htmlbarsOptions = {
       isHTMLBars: true,
-      templateCompiler: require('../bower_components/ember/ember-template-compiler')
+      templateCompiler: require('ember-source/dist/ember-template-compiler.js')
     };
 
     htmlbarsPrecompile = htmlbarsOptions.templateCompiler.precompile;

diff --git a/test/utils_test.js b/test/utils_test.js
@@ -7,7 +7,7 @@ describe('utils', function() {
   let templateCompiler;
 
   beforeEach(function() {
-    templateCompiler = require('../bower_components/ember/ember-template-compiler');
+    templateCompiler = require('ember-source/dist/ember-template-compiler');
   });