Merge pull request #122 from rwjblue/add-ember-cli

Add ember-cli for ease of use.
emberjs · Jan 31, 2015 · 33921e3 · 33921e3
2 parents bd0c0f5 + d4fe3ae
commit 33921e3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/bower.json b/bower.json
@@ -16,7 +16,7 @@
   ],
   "dependencies": {
     "ember": "^1.7.0",
-    "ember-test-helpers": "^0.2.0"
+    "ember-test-helpers": "^0.3.0"
   },
   "devDependencies": {
     "qunit": "^1.15.0",

diff --git a/package.json b/package.json
@@ -4,11 +4,11 @@
   "description": "QUnit helpers for testing Ember.js applications",
   "main": "lib/ember-qunit.js",
   "scripts": {
-    "build": "rm -rf build && BROCCOLI_ENV=test broccoli build build",
+    "build": "ember build",
     "prepublish": "bower install",
-    "pretest": "npm run-script build",
+    "pretest": "ember build",
     "test": "testem ci",
-    "start": "BROCCOLI_ENV=test broccoli serve"
+    "start": "ember serve"
   },
   "authors": [
     "Stefan Penner",
@@ -26,6 +26,7 @@
     "broccoli-merge-trees": "^0.1.4",
     "broccoli-sourcemap-concat": "^0.4.3",
     "broccoli-string-replace": "0.0.2",
+    "ember-cli": "^0.1.12",
     "git-repo-info": "^1.0.2",
     "testem": "0.6.22"
   }