fix(all): update compiler and metadata plugin

aurelia · Apr 7, 2015 · 50e3afe · 50e3afe
1 parent 4b09490
commit 50e3afe
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 25 deletions.
diff --git a/build/babel-options.js b/build/babel-options.js
@@ -1,23 +1,18 @@
 module.exports = {
   filename: '',
   filenameRelative: '',
-  blacklist: [],
-  whitelist: [],
   modules: '',
   sourceMap: true,
   sourceMapName: '',
   sourceRoot: '',
   moduleRoot: '',
   moduleIds: false,
   experimental: false,
-  format: {
-    comments: false,
-    compact: false,
-    indent: {
-      parentheses: true,
-      adjustMultilineComment: true,
-      style: "  ",
-      base: 0
-    }
-  }
+  comments: false,
+  compact: false,
+  code:true,
+  stage:2,
+  optional: [
+    "es7.decorators"
+  ]
 };
diff --git a/config.js b/config.js
@@ -17,6 +17,7 @@ System.config({
     "aurelia-path": "github:aurelia/path@0.4.6",
     "aurelia-task-queue": "github:aurelia/task-queue@0.2.5",
     "aurelia-templating": "github:aurelia/templating@0.9.0",
+    "core-js": "github:zloirock/core-js@0.8.1",
     "github:aurelia/binding@0.4.0": {
       "aurelia-dependency-injection": "github:aurelia/dependency-injection@0.5.0",
       "aurelia-metadata": "github:aurelia/metadata@0.3.4",

diff --git a/karma.conf.js b/karma.conf.js
@@ -38,10 +38,10 @@ module.exports = function(config) {
       options: {
         sourceMap: 'inline',
         modules: 'system',
-        moduleIds: false
-      },
-      sourceFileName : function(file){
-        return file.path.replace(/.+\//,'');
+        moduleIds: false,
+        optional: [
+          "es7.decorators"
+        ]
       }
     },
 

diff --git a/package.json b/package.json
@@ -32,25 +32,26 @@
       "aurelia-metadata": "github:aurelia/metadata@^0.3.4",
       "aurelia-path": "github:aurelia/path@^0.4.6",
       "aurelia-task-queue": "github:aurelia/task-queue@^0.2.5",
-      "aurelia-templating": "github:aurelia/templating@^0.9.0"
+      "aurelia-templating": "github:aurelia/templating@^0.9.0",
+      "core-js": "github:zloirock/core-js@^0.8.1"
     }
   },
   "devDependencies": {
-    "aurelia-tools": "^0.1.0",
+    "aurelia-tools": "^0.1.3",
     "conventional-changelog": "0.0.11",
     "del": "^1.1.0",
     "gulp": "^3.8.10",
-    "gulp-babel": "^4.0.0",
+    "gulp-babel": "^5.0.0",
     "gulp-bump": "^0.1.11",
     "gulp-jshint": "^1.9.0",
     "gulp-yuidoc": "^0.1.2",
     "jasmine-core": "^2.1.3",
     "jshint-stylish": "^1.0.0",
     "karma": "^0.12.28",
-    "karma-babel-preprocessor": "^4.0.0",
+    "karma-babel-preprocessor": "^5.0.1",
     "karma-chrome-launcher": "^0.1.7",
     "karma-jasmine": "^0.3.5",
-    "karma-jspm": "^1.0.1",
+    "karma-jspm": "^1.1.4",
     "object.assign": "^1.0.3",
     "require-dir": "^0.1.0",
     "run-sequence": "^1.0.2",

diff --git a/src/aurelia.js b/src/aurelia.js
@@ -1,3 +1,4 @@
+import core from 'core-js';
 import * as LogManager from 'aurelia-logging';
 import {Container} from 'aurelia-dependency-injection';
 import {Loader} from 'aurelia-loader';

diff --git a/src/plugins.js b/src/plugins.js
@@ -1,3 +1,4 @@
+import core from 'core-js';
 import * as LogManager from 'aurelia-logging';
 import {Metadata} from 'aurelia-metadata';
 

diff --git a/test/plugin.spec.js b/test/plugin.spec.js
@@ -157,10 +157,6 @@ describe('the plugin loader', () => {
       plugins.atscript();
       expect(containerMock.supportAtScript).toHaveBeenCalled();
       expect(Metadata.configure.locator).toHaveBeenCalled();
-      //Let's also ensure that the locator is working correctly seeing that it's defined in plugins
-      var locator = Metadata.configure.locator.calls.mostRecent().args[0];
-      expect(locator({annotate : 'annotation'})).toBe("annotation");
-      expect(locator({annotations : 'annotations'})).toBe("annotations");
     });
   });
 });