v1.12.0-beta.3

README.md

@@ -27,7 +27,7 @@ FEATURES
   });
   ```
 
- - Uses [Ember Computed Decorators](https://github.com/rwjblue/ember-computed-decorators)
+ - [Disabled at the moment due to bugs in the dependencies.] Uses [Ember Computed Decorators](https://github.com/rwjblue/ember-computed-decorators)
 
   ```javascript
   var MyComponent = Ember.Component.extend({
@@ -46,7 +46,7 @@ FEATURES
 Packages Info
 =============
 
-Ember version: 1.12.0-beta.1
+Ember version: 1.12.0-beta.3
 
 JSPM: 0.15.3
 

app/components/my-component.js

@@ -8,11 +8,14 @@ var MyComponent = Ember.Component.extend({
 
   key: 'my-key',
 
-  @computed('key')
-  test(key) {
-    return `${key} + computed`;
-  }
+  // @computed('key')
+  // test(key) {
+  //   return `${key} + computed`;
+  // }
 
+  test: Ember.computed('key', function() {
+    return `${this.get('key')} + computed`;
+  })
 });
 
 Ember.Handlebars.helper('my-component', MyComponent);

app/config.js

@@ -15,36 +15,36 @@ System.config({
 
 System.config({
   "map": {
-    "babel": "npm:babel-core@5.1.13",
-    "babel-runtime": "npm:babel-runtime@5.1.13",
-    "core-js": "npm:[email protected].4",
-    "ember": "github:components/[email protected].1",
+    "babel": "npm:babel-core@5.2.15",
+    "babel-runtime": "npm:babel-runtime@5.2.15",
+    "core-js": "npm:[email protected].6",
+    "ember": "github:components/[email protected].3",
     "ember-computed-decorators": "github:rwjblue/ember-computed-decorators@master",
-    "hbs": "github:n-fuse/[email protected].1",
-    "ihbs": "github:n-fuse/[email protected].1",
+    "hbs": "github:n-fuse/[email protected].3",
+    "ihbs": "github:n-fuse/[email protected].3",
     "jquery": "github:components/[email protected]",
     "n-fuse/pajax": "github:n-fuse/[email protected]",
     "pajax": "github:n-fuse/[email protected]",
-    "github:components/[email protected].1": {
+    "github:components/[email protected].3": {
       "jquery": "github:components/[email protected]"
     },
     "github:jspm/[email protected]": {
       "process": "npm:[email protected]"
     },
-    "github:n-fuse/[email protected].1": {
-      "ember-template-compiler": "github:n-fuse/[email protected].1"
+    "github:n-fuse/[email protected].3": {
+      "ember-template-compiler": "github:n-fuse/[email protected].3"
     },
-    "github:n-fuse/[email protected].1": {
-      "ember-template-compiler": "github:n-fuse/[email protected].1"
+    "github:n-fuse/[email protected].3": {
+      "ember-template-compiler": "github:n-fuse/[email protected].3"
     },
     "github:rwjblue/ember-computed-decorators@master": {
-      "ember": "github:components/[email protected].1",
+      "ember": "github:components/[email protected].3",
       "ember-new-computed": "github:rwjblue/ember-new-computed@master"
     },
     "github:rwjblue/ember-new-computed@master": {
-      "ember": "github:components/[email protected].1"
+      "ember": "github:components/[email protected].3"
     },
-    "npm:[email protected].4": {
+    "npm:[email protected].6": {
       "process": "github:jspm/[email protected]"
     }
   }

gulpfile.js

@@ -19,10 +19,37 @@ gulp.task('watch', function() {
 });
 
 gulp.task('jspm', function() {
-  return jspm.bundleSFX('app', 'dist/app.js', { sourceMaps: false, minify: true, mangle: false });
+  var builder = new jspm.Builder();
+  var System = require('systemjs');
+
+  function customExtensionName(System) {
+    System._extensions.push(customExtensionName);
+    var systemNormalize = System.normalize;
+
+    System.normalize = function(name, parentName) {
+      if (name === 'ember') {
+        name = 'ember/ember.prod';
+      }
+
+      return systemNormalize.call(this, name, parentName);
+    }
+  }
+
+  customExtensionName(System);
+
+  builder.reset(System);
+
+  return builder.loadConfig('./app/config.js')
+    .then(function() {
+      builder.config({
+        baseURL: 'app',
+        lib: 'app'
+      });
+      return builder.buildSFX('app', 'dist/app.js', { sourceMaps: false, minify: true, mangle: false});
+    });
 });
 
-gulp.task('watch-dist', ['jspm'], function () {
+gulp.task('watch-dist', ['jspm'], function() {
   var browserSync = require('browser-sync');
   browserSync({
     online: false,

package.json

@@ -10,7 +10,8 @@
   "devDependencies": {
     "browser-sync": "^1.6.3",
     "gulp": "^3.8.11",
-    "jspm": "^0.15.4"
+    "jspm": "^0.15.4",
+    "systemjs": "^0.16.11"
   },
   "scripts": {
     "postinstall": "jspm install"
@@ -21,10 +22,10 @@
       "lib": "app"
     },
     "dependencies": {
-      "ember": "github:components/[email protected].1",
+      "ember": "github:components/[email protected].3",
       "ember-computed-decorators": "github:rwjblue/ember-computed-decorators@master",
-      "hbs": "github:n-fuse/[email protected].1",
-      "ihbs": "github:n-fuse/[email protected].1",
+      "hbs": "github:n-fuse/[email protected].3",
+      "ihbs": "github:n-fuse/[email protected].3",
       "jquery": "github:components/jquery@^2.0.3",
       "n-fuse/pajax": "github:n-fuse/pajax@^0.1.0",
       "pajax": "github:n-fuse/pajax@^0.1.0"
@@ -35,10 +36,12 @@
       "core-js": "npm:core-js@^0.9.4"
     },
     "overrides": {
-      "github:components/[email protected].1": {
+      "github:components/[email protected].3": {
         "main": "ember.debug",
+        "format": "global",
         "files": [
-          "ember.debug.js"
+          "ember.debug.js",
+          "ember.prod.js"
         ],
         "dependencies": {
           "jquery": "github:components/jquery@^2.0.3"
@@ -49,6 +52,12 @@
               "jquery"
             ],
             "exports": "Ember"
+          },
+          "ember.prod": {
+            "deps": [
+              "jquery"
+            ],
+            "exports": "Ember"
           }
         }
       },