Merge branch 'latest-aurelia'

bnavetta · Dec 7, 2015 · 55520ab · 55520ab
2 parents 02cd501 + a4c57ae
commit 55520ab
Show file tree

Hide file tree

Showing 7 changed files with 106 additions and 55 deletions.
diff --git a/config.js b/config.js
@@ -18,71 +18,93 @@ System.config({
 
 System.config({
   "map": {
-    "aurelia-framework": "github:aurelia/framework@0.13.4",
-    "aurelia-templating-binding": "github:aurelia/templating-binding@0.13.2",
+    "aurelia-framework": "github:aurelia/framework@0.17.0",
+    "aurelia-templating-binding": "github:aurelia/templating-binding@0.16.1",
     "babel": "npm:[email protected]",
     "babel-runtime": "npm:[email protected]",
     "core-js": "npm:[email protected]",
     "traceur": "github:jmcriffey/[email protected]",
     "traceur-runtime": "github:jmcriffey/[email protected]",
-    "github:aurelia/binding@0.8.5": {
-      "aurelia-dependency-injection": "github:aurelia/dependency-injection@0.9.1",
-      "aurelia-metadata": "github:aurelia/metadata@0.7.2",
-      "aurelia-task-queue": "github:aurelia/task-queue@0.6.1",
+    "github:aurelia/binding@0.10.2": {
+      "aurelia-metadata": "github:aurelia/metadata@0.9.0",
+      "aurelia-pal": "github:aurelia/pal@0.2.0",
+      "aurelia-task-queue": "github:aurelia/task-queue@0.8.0",
       "core-js": "npm:[email protected]"
     },
-    "github:aurelia/[email protected]": {
-      "aurelia-logging": "github:aurelia/[email protected]",
-      "aurelia-metadata": "github:aurelia/[email protected]",
+    "github:aurelia/[email protected]": {
+      "aurelia-logging": "github:aurelia/[email protected]",
+      "aurelia-metadata": "github:aurelia/[email protected]",
+      "aurelia-pal": "github:aurelia/[email protected]",
       "core-js": "npm:[email protected]"
     },
-    "github:aurelia/[email protected]": {
-      "aurelia-binding": "github:aurelia/[email protected]",
-      "aurelia-dependency-injection": "github:aurelia/[email protected]",
-      "aurelia-loader": "github:aurelia/[email protected]",
-      "aurelia-logging": "github:aurelia/[email protected]",
-      "aurelia-metadata": "github:aurelia/[email protected]",
-      "aurelia-path": "github:aurelia/[email protected]",
-      "aurelia-task-queue": "github:aurelia/[email protected]",
-      "aurelia-templating": "github:aurelia/[email protected]",
+    "github:aurelia/[email protected]": {
+      "aurelia-binding": "github:aurelia/[email protected]",
+      "aurelia-dependency-injection": "github:aurelia/[email protected]",
+      "aurelia-loader": "github:aurelia/[email protected]",
+      "aurelia-logging": "github:aurelia/[email protected]",
+      "aurelia-metadata": "github:aurelia/[email protected]",
+      "aurelia-pal": "github:aurelia/[email protected]",
+      "aurelia-path": "github:aurelia/[email protected]",
+      "aurelia-task-queue": "github:aurelia/[email protected]",
+      "aurelia-templating": "github:aurelia/[email protected]",
       "core-js": "npm:[email protected]"
     },
-    "github:aurelia/[email protected]": {
-      "aurelia-html-template-element": "github:aurelia/[email protected]",
-      "aurelia-metadata": "github:aurelia/[email protected]",
-      "aurelia-path": "github:aurelia/[email protected]",
-      "core-js": "npm:[email protected]",
-      "webcomponentsjs": "github:webcomponents/[email protected]"
+    "github:aurelia/[email protected]": {
+      "aurelia-metadata": "github:aurelia/[email protected]",
+      "aurelia-path": "github:aurelia/[email protected]"
     },
-    "github:aurelia/[email protected]": {
+    "github:aurelia/[email protected]": {
+      "aurelia-pal": "github:aurelia/[email protected]",
       "core-js": "npm:[email protected]"
     },
-    "github:aurelia/[email protected]": {
-      "aurelia-binding": "github:aurelia/[email protected]",
-      "aurelia-logging": "github:aurelia/[email protected]",
-      "aurelia-templating": "github:aurelia/[email protected]"
-    },
-    "github:aurelia/[email protected]": {
-      "aurelia-binding": "github:aurelia/[email protected]",
-      "aurelia-dependency-injection": "github:aurelia/[email protected]",
-      "aurelia-html-template-element": "github:aurelia/[email protected]",
-      "aurelia-loader": "github:aurelia/[email protected]",
-      "aurelia-logging": "github:aurelia/[email protected]",
-      "aurelia-metadata": "github:aurelia/[email protected]",
-      "aurelia-path": "github:aurelia/[email protected]",
-      "aurelia-task-queue": "github:aurelia/[email protected]",
+    "github:aurelia/[email protected]": {
+      "aurelia-pal": "github:aurelia/[email protected]"
+    },
+    "github:aurelia/[email protected]": {
+      "aurelia-binding": "github:aurelia/[email protected]",
+      "aurelia-logging": "github:aurelia/[email protected]",
+      "aurelia-templating": "github:aurelia/[email protected]"
+    },
+    "github:aurelia/[email protected]": {
+      "aurelia-binding": "github:aurelia/[email protected]",
+      "aurelia-dependency-injection": "github:aurelia/[email protected]",
+      "aurelia-loader": "github:aurelia/[email protected]",
+      "aurelia-logging": "github:aurelia/[email protected]",
+      "aurelia-metadata": "github:aurelia/[email protected]",
+      "aurelia-pal": "github:aurelia/[email protected]",
+      "aurelia-path": "github:aurelia/[email protected]",
+      "aurelia-task-queue": "github:aurelia/[email protected]",
       "core-js": "npm:[email protected]"
     },
-    "github:jspm/[email protected]": {
-      "process": "npm:[email protected]"
+    "github:jspm/[email protected]": {
+      "assert": "npm:[email protected]"
+    },
+    "github:jspm/[email protected]": {
+      "process": "npm:[email protected]"
+    },
+    "github:jspm/[email protected]": {
+      "util": "npm:[email protected]"
+    },
+    "npm:[email protected]": {
+      "util": "npm:[email protected]"
     },
     "npm:[email protected]": {
-      "process": "github:jspm/[email protected].1"
+      "process": "github:jspm/[email protected].2"
     },
     "npm:[email protected]": {
       "fs": "github:jspm/[email protected]",
-      "process": "github:jspm/[email protected].1",
+      "process": "github:jspm/[email protected].2",
       "systemjs-json": "github:systemjs/[email protected]"
+    },
+    "npm:[email protected]": {
+      "util": "github:jspm/[email protected]"
+    },
+    "npm:[email protected]": {
+      "assert": "github:jspm/[email protected]"
+    },
+    "npm:[email protected]": {
+      "inherits": "npm:[email protected]",
+      "process": "github:jspm/[email protected]"
     }
   }
 });

diff --git a/dist/amd/index.js b/dist/amd/index.js
@@ -1,11 +1,13 @@
-define(['exports', 'aurelia-framework', 'aurelia-templating-binding'], function (exports, _aureliaFramework, _aureliaTemplatingBinding) {
+define(['exports', 'aurelia-framework', 'aurelia-templating-binding', 'aurelia-logging'], function (exports, _aureliaFramework, _aureliaTemplatingBinding, _aureliaLogging) {
   'use strict';
 
   Object.defineProperty(exports, '__esModule', {
     value: true
   });
   exports.configure = configure;
 
+  var logger = _aureliaLogging.getLogger('polymer');
+
   function registerElement(eventManager, bindingLanguage, prototype) {
     var propertyConfig = { 'bind-value': ['change'] };
 
@@ -27,6 +29,8 @@ define(['exports', 'aurelia-framework', 'aurelia-templating-binding'], function
       }
     });
 
+    logger.debug("Registering configuration for " + prototype.is + ": " + propertyConfig);
+
     eventManager.registerElementConfig({
       tagName: prototype.is,
       properties: propertyConfig

diff --git a/dist/commonjs/index.js b/dist/commonjs/index.js
@@ -5,10 +5,18 @@ Object.defineProperty(exports, '__esModule', {
 });
 exports.configure = configure;
 
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj['default'] = obj; return newObj; } }
+
 var _aureliaFramework = require('aurelia-framework');
 
 var _aureliaTemplatingBinding = require('aurelia-templating-binding');
 
+var _aureliaLogging = require('aurelia-logging');
+
+var LogManager = _interopRequireWildcard(_aureliaLogging);
+
+var logger = LogManager.getLogger('polymer');
+
 function registerElement(eventManager, bindingLanguage, prototype) {
   var propertyConfig = { 'bind-value': ['change'] };
 
@@ -30,6 +38,8 @@ function registerElement(eventManager, bindingLanguage, prototype) {
     }
   });
 
+  logger.debug("Registering configuration for " + prototype.is + ": " + propertyConfig);
+
   eventManager.registerElementConfig({
     tagName: prototype.is,
     properties: propertyConfig

diff --git a/dist/es6/index.js b/dist/es6/index.js
@@ -1,5 +1,8 @@
 import {EventManager, ObserverLocator} from 'aurelia-framework';
 import {TemplatingBindingLanguage} from 'aurelia-templating-binding';
+import * as LogManager from 'aurelia-logging';
+
+const logger = LogManager.getLogger('polymer');
 
 function registerElement(eventManager, bindingLanguage, prototype) {
   var propertyConfig = {'bind-value': ['change']}; // Not explicitly listed for all elements that use it
@@ -20,6 +23,8 @@ function registerElement(eventManager, bindingLanguage, prototype) {
     }
   });
 
+  logger.debug("Registering configuration for " + prototype.is + ": " + propertyConfig);
+
   eventManager.registerElementConfig({
     tagName: prototype.is,
     properties: propertyConfig

diff --git a/dist/system/index.js b/dist/system/index.js
@@ -1,7 +1,7 @@
-System.register(['aurelia-framework', 'aurelia-templating-binding'], function (_export) {
+System.register(['aurelia-framework', 'aurelia-templating-binding', 'aurelia-logging'], function (_export) {
   'use strict';
 
-  var EventManager, ObserverLocator, TemplatingBindingLanguage;
+  var EventManager, ObserverLocator, TemplatingBindingLanguage, LogManager, logger;
 
   _export('configure', configure);
 
@@ -26,6 +26,8 @@ System.register(['aurelia-framework', 'aurelia-templating-binding'], function (_
       }
     });
 
+    logger.debug("Registering configuration for " + prototype.is + ": " + propertyConfig);
+
     eventManager.registerElementConfig({
       tagName: prototype.is,
       properties: propertyConfig
@@ -61,7 +63,11 @@ System.register(['aurelia-framework', 'aurelia-templating-binding'], function (_
       ObserverLocator = _aureliaFramework.ObserverLocator;
     }, function (_aureliaTemplatingBinding) {
       TemplatingBindingLanguage = _aureliaTemplatingBinding.TemplatingBindingLanguage;
+    }, function (_aureliaLogging) {
+      LogManager = _aureliaLogging;
     }],
-    execute: function () {}
+    execute: function () {
+      logger = LogManager.getLogger('polymer');
+    }
   };
 });
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aurelia-polymer",
-  "version": "0.1.1",
+  "version": "1.0.0-beta",
   "description": "An Aurelia plugin for Polymer support.",
   "keywords": [
     "aurelia",
@@ -48,15 +48,14 @@
       "lib": "dist/amd"
     },
     "dependencies": {
-      "aurelia-framework": "github:aurelia/framework@^0.13.3",
-      "aurelia-templating-binding": "github:aurelia/templating-binding@^0.13.2"
+      "aurelia-framework": "npm:aurelia-framework@^1.0.0-beta.1",
+      "aurelia-logging": "npm:aurelia-logging@^1.0.0-beta.1",
+      "aurelia-templating-binding": "npm:aurelia-templating-binding@^1.0.0-beta.1"
     },
     "devDependencies": {
-      "babel": "npm:babel-core@^5.1.13",
-      "babel-runtime": "npm:babel-runtime@^5.1.13",
-      "core-js": "npm:core-js@^0.9.4",
-      "traceur": "github:jmcriffey/[email protected]",
-      "traceur-runtime": "github:jmcriffey/[email protected]"
+      "babel": "npm:babel-core@^5.6.4",
+      "babel-runtime": "npm:babel-runtime@^5.6.4",
+      "core-js": "npm:core-js@^1.2.6"
     }
   }
 }
diff --git a/src/index.js b/src/index.js
@@ -1,5 +1,8 @@
 import {EventManager, ObserverLocator} from 'aurelia-framework';
 import {TemplatingBindingLanguage} from 'aurelia-templating-binding';
+import * as LogManager from 'aurelia-logging';
+
+const logger = LogManager.getLogger('polymer');
 
 function registerElement(eventManager, bindingLanguage, prototype) {
   var propertyConfig = {'bind-value': ['change']}; // Not explicitly listed for all elements that use it
@@ -20,6 +23,8 @@ function registerElement(eventManager, bindingLanguage, prototype) {
     }
   });
 
+  logger.debug("Registering configuration for " + prototype.is + ": " + propertyConfig);
+
   eventManager.registerElementConfig({
     tagName: prototype.is,
     properties: propertyConfig