update our own app & the prebuilt distribution to ember 1.10.0

ember-animation · Feb 14, 2015 · ebf9584 · ebf9584
1 parent 5b51969
commit ebf9584
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 15 deletions.
diff --git a/bower.json b/bower.json
@@ -1,9 +1,9 @@
 {
   "name": "liquid-fire",
   "dependencies": {
-    "handlebars": "~1.3.0",
+    "handlebars": "2.0.0",
     "jquery": "^1.11.1",
-    "ember": "1.8.1",
+    "ember": "1.10.0",
     "ember-resolver": "~0.1.11",
     "loader.js": "ember-cli/loader.js#1.0.1",
     "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
@@ -16,5 +16,9 @@
   "devDependencies": {
     "bootstrap-sass-official": "~3.3.1",
     "moment": "~2.8.3"
+  },
+  "resolutions": {
+    "ember": "1.10.0",
+    "handlebars": "2.0.0"
   }
 }
diff --git a/example/liquid-fire.css b/example/liquid-fire.css
@@ -1 +1 @@
-../packaging/dist/liquid-fire-0.15.1.css
+../packaging/dist/liquid-fire-0.17.0.css
diff --git a/example/liquid-fire.js b/example/liquid-fire.js
@@ -1 +1 @@
-../packaging/dist/liquid-fire-0.15.1.js
+../packaging/dist/liquid-fire-0.17.0.js
diff --git a/example/prebuilt-example.html b/example/prebuilt-example.html
@@ -1,8 +1,8 @@
 <html>
 <head>
 <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
-<script src="http://builds.handlebarsjs.com.s3.amazonaws.com/handlebars-v1.3.0.js"></script>
-<script src="http://builds.emberjs.com/tags/v1.8.1/ember.js"></script>
+<script src="http://builds.emberjs.com/tags/v1.10.0/ember.debug.js"></script>
+<script src="http://builds.emberjs.com/tags/v1.10.0/ember-template-compiler.js"></script>
 <script src="velocity.js"></script>
 <script src="liquid-fire.js"></script>
 <link rel="stylesheet" href="liquid-fire.css">

diff --git a/package.json b/package.json
@@ -22,33 +22,33 @@
   },
   "devDependencies": {
     "broccoli": "^0.13.0",
+    "broccoli-asset-rev": "^2.0.0",
     "broccoli-es3-safe-recast": "^1.0.0",
+    "broccoli-es6-concatenator": "^0.1.11",
     "broccoli-filter": "^0.1.7",
     "broccoli-funnel": "^0.1.6",
     "broccoli-merge-trees": "^0.2.1",
     "broccoli-sass": "git://github.com/ef4/broccoli-sass",
     "broccoli-static-compiler": "^0.2.1",
     "broccoli-writer": "^0.1.1",
     "commander": "^2.3.0",
-    "broccoli-es6-concatenator": "^0.1.11",
-    "broccoli-asset-rev": "^2.0.0",
-    "broccoli-ember-hbs-template-compiler": "^1.6.1",
     "ember-cli": "0.1.12",
+    "ember-cli-app-version": "0.3.1",
     "ember-cli-content-security-policy": "0.3.0",
     "ember-cli-dependency-checker": "0.0.7",
+    "ember-cli-htmlbars": "^0.7.4",
     "ember-cli-ic-ajax": "0.1.1",
     "ember-cli-inject-live-reload": "^1.3.0",
-    "ember-code-snippet": "^0.1.0",
     "ember-cli-qunit": "0.3.1",
-    "ember-cli-app-version": "0.3.1",
     "ember-cli-uglify": "1.0.1",
+    "ember-code-snippet": "^0.1.0",
     "ember-export-application-global": "^1.0.0",
     "express": "^4.8.5",
     "github": "git://github.com/ef4/node-github",
+    "glob": "^4.0.5",
     "ncp": "^0.6.0",
     "rsvp": "^3.0.13",
-    "walk-sync": "^0.1.3",
-    "glob": "^4.0.5"
+    "walk-sync": "^0.1.3"
   },
   "keywords": [
     "ember-addon"

diff --git a/packaging/Brocfile.js b/packaging/Brocfile.js
@@ -3,7 +3,7 @@
 var mergeTrees = require('broccoli-merge-trees');
 var pickFiles = require('broccoli-static-compiler');
 var compileES6 = require('broccoli-es6-concatenator');
-var templateCompiler = require('broccoli-ember-hbs-template-compiler');
+var TemplateCompiler = require('ember-cli-htmlbars');
 var es3Safe = require('broccoli-es3-safe-recast');
 var Funnel = require('broccoli-funnel');
 var registry = require('./registry');
@@ -12,7 +12,10 @@ var version = require('../package.json').version;
 
 var appTree = pickFiles('../app', { srcDir: '/', destDir: 'app'});
 
-var templateTree = templateCompiler('../app/templates', { module: true });
+var templateTree = new TemplateCompiler('../app/templates', {
+  isHTMLBars: true,
+  templateCompiler: require('../bower_components/ember/ember-template-compiler')
+});
 templateTree = pickFiles(templateTree, {srcDir: '/', destDir: 'app/templates'});
 
 var addonTree = pickFiles('../addon', {srcDir: '/', destDir: 'liquid-fire'});
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../packaging/dist/liquid-fire-0.15.1.css
		../packaging/dist/liquid-fire-0.17.0.css
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../packaging/dist/liquid-fire-0.15.1.js
		../packaging/dist/liquid-fire-0.17.0.js