fix(Intl): fix Intl.js polyfill loading

fixes loading of the Intl.js polyfill fixes issue #19
aurelia · Nov 16, 2015 · de20e1b · de20e1b
1 parent c21bd7b
commit de20e1b
Show file tree

Hide file tree

Showing 22 changed files with 28,378 additions and 2,018 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "aurelia-i18n",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "A plugin that provides i18n support.",
   "keywords": [
     "aurelia",

diff --git a/config.js b/config.js
@@ -1,19 +1,21 @@
 System.config({
-  defaultJSExtensions: true,
-  transpiler: "babel",
-  babelOptions: {
+  "defaultJSExtensions": true,
+  "transpiler": "babel",
+  "babelOptions": {
     "optional": [
       "es7.decorators",
       "es7.classProperties"
     ]
   },
-  paths: {
+  "paths": {
     "aurelia-i18n/*": "dist\\system/*js",
     "github:*": "jspm_packages/github/*",
     "npm:*": "jspm_packages/npm/*"
-  },
+  }
+});
 
-  map: {
+System.config({
+  "map": {
     "Intl.js": "github:andyearnshaw/[email protected]",
     "aurelia-dependency-injection": "npm:[email protected]",
     "aurelia-event-aggregator": "npm:[email protected]",
@@ -110,3 +112,4 @@ System.config({
     }
   }
 });
+
diff --git a/dist/amd/aurelia-i18n.d.ts b/dist/amd/aurelia-i18n.d.ts
@@ -3,6 +3,7 @@ declare module 'aurelia-i18n' {
   import { resolver }  from 'aurelia-dependency-injection';
   import { EventAggregator }  from 'aurelia-event-aggregator';
   import { customAttribute, ViewResources }  from 'aurelia-templating';
+  import { DefaultLoader }  from 'aurelia-loader-default';
 
   /*eslint no-irregular-whitespace: 0*/
   export const translations: any;
@@ -17,7 +18,7 @@ declare module 'aurelia-i18n' {
   /*eslint no-cond-assign: 0*/
   export class I18N {
     globalVars: any;
-    constructor(ea: any);
+    constructor(ea: any, loader: any);
     setup(options: any): any;
     setLocale(locale: any): any;
     getLocale(): any;

diff --git a/dist/amd/aurelia-i18n.js b/dist/amd/aurelia-i18n.js
@@ -1,8 +1,10 @@
-define(['exports', 'aurelia-event-aggregator', 'aurelia-templating', './i18n', './relativeTime', './df', './nf', './rt', './t', './base-i18n'], function (exports, _aureliaEventAggregator, _aureliaTemplating, _i18n, _relativeTime, _df, _nf, _rt, _t, _baseI18n) {
+define(['exports', 'aurelia-event-aggregator', 'aurelia-templating', 'aurelia-loader-default', './i18n', './relativeTime', './df', './nf', './rt', './t', './base-i18n'], function (exports, _aureliaEventAggregator, _aureliaTemplating, _aureliaLoaderDefault, _i18n, _relativeTime, _df, _nf, _rt, _t, _baseI18n) {
   'use strict';
 
   exports.__esModule = true;
 
+  console.log(_aureliaLoaderDefault.DefaultLoader);
+
   function configure(frameworkConfig, cb) {
     if (cb === undefined || typeof cb !== 'function') {
       var errorMsg = 'You need to provide a callback method to properly configure the library';
@@ -13,7 +15,8 @@ define(['exports', 'aurelia-event-aggregator', 'aurelia-templating', './i18n', '
     frameworkConfig.globalResources('./nf');
     frameworkConfig.globalResources('./df');
     frameworkConfig.globalResources('./rt');
-    var instance = new _i18n.I18N(frameworkConfig.container.get(_aureliaEventAggregator.EventAggregator));
+
+    var instance = new _i18n.I18N(frameworkConfig.container.get(_aureliaEventAggregator.EventAggregator), frameworkConfig.container.get(_aureliaLoaderDefault.DefaultLoader));
     frameworkConfig.container.registerInstance(_i18n.I18N, instance);
 
     var ret = cb(instance);

diff --git a/dist/amd/i18n.js b/dist/amd/i18n.js
@@ -10,7 +10,7 @@ define(['exports', 'i18next', './utils'], function (exports, _i18next, _utils) {
   var _i18n = _interopRequireDefault(_i18next);
 
   var I18N = (function () {
-    function I18N(ea) {
+    function I18N(ea, loader) {
       _classCallCheck(this, I18N);
 
       this.globalVars = {};
@@ -19,8 +19,11 @@ define(['exports', 'i18next', './utils'], function (exports, _i18next, _utils) {
       this.ea = ea;
       this.Intl = window.Intl;
 
+      var i18nName = loader.normalizeSync('aurelia-i18n');
+      var intlName = loader.normalizeSync('Intl.js', i18nName);
+
       if (window.Intl === undefined) {
-        System['import']('Intl').then(function (poly) {
+        loader.loadModule(intlName).then(function (poly) {
           window.Intl = poly;
         });
       }

diff --git a/dist/aurelia-i18n.d.ts b/dist/aurelia-i18n.d.ts
@@ -3,6 +3,7 @@ declare module 'aurelia-i18n' {
   import { resolver }  from 'aurelia-dependency-injection';
   import { EventAggregator }  from 'aurelia-event-aggregator';
   import { customAttribute, ViewResources }  from 'aurelia-templating';
+  import { DefaultLoader }  from 'aurelia-loader-default';
 
   /*eslint no-irregular-whitespace: 0*/
   export const translations: any;
@@ -17,7 +18,7 @@ declare module 'aurelia-i18n' {
   /*eslint no-cond-assign: 0*/
   export class I18N {
     globalVars: any;
-    constructor(ea: any);
+    constructor(ea: any, loader: any);
     setup(options: any): any;
     setLocale(locale: any): any;
     getLocale(): any;

diff --git a/dist/aurelia-i18n.js b/dist/aurelia-i18n.js
@@ -2,6 +2,7 @@ import i18n from 'i18next';
 import {resolver} from 'aurelia-dependency-injection';
 import {EventAggregator} from 'aurelia-event-aggregator';
 import {customAttribute,ViewResources} from 'aurelia-templating';
+import {DefaultLoader} from 'aurelia-loader-default';
 
 /*eslint no-irregular-whitespace: 0*/
 export const translations = {
@@ -282,14 +283,17 @@ export class I18N {
 
   globalVars = {};
 
-  constructor(ea) {
+  constructor(ea, loader) {
     this.i18next = i18n;
     this.ea = ea;
     this.Intl = window.Intl;
 
     // check whether Intl is available, otherwise load the polyfill
+    let i18nName = loader.normalizeSync('aurelia-i18n');
+    let intlName = loader.normalizeSync('Intl.js', i18nName);
+
     if (window.Intl === undefined) {
-      System.import('Intl').then( (poly) => {
+      loader.loadModule(intlName).then( (poly) => {
         window.Intl = poly;
       });
     }
@@ -635,6 +639,8 @@ export class RtValueConverter {
   }
 }
 
+console.log(DefaultLoader);
+
 function configure(frameworkConfig, cb) {
   if (cb === undefined || typeof cb !== 'function') {
     let errorMsg = 'You need to provide a callback method to properly configure the library';
@@ -645,7 +651,8 @@ function configure(frameworkConfig, cb) {
   frameworkConfig.globalResources('./nf');
   frameworkConfig.globalResources('./df');
   frameworkConfig.globalResources('./rt');
-  let instance = new I18N(frameworkConfig.container.get(EventAggregator));
+
+  let instance = new I18N(frameworkConfig.container.get(EventAggregator), frameworkConfig.container.get(DefaultLoader));
   frameworkConfig.container.registerInstance(I18N, instance);
 
   let ret = cb(instance);

diff --git a/dist/commonjs/aurelia-i18n.d.ts b/dist/commonjs/aurelia-i18n.d.ts
@@ -3,6 +3,7 @@ declare module 'aurelia-i18n' {
   import { resolver }  from 'aurelia-dependency-injection';
   import { EventAggregator }  from 'aurelia-event-aggregator';
   import { customAttribute, ViewResources }  from 'aurelia-templating';
+  import { DefaultLoader }  from 'aurelia-loader-default';
 
   /*eslint no-irregular-whitespace: 0*/
   export const translations: any;
@@ -17,7 +18,7 @@ declare module 'aurelia-i18n' {
   /*eslint no-cond-assign: 0*/
   export class I18N {
     globalVars: any;
-    constructor(ea: any);
+    constructor(ea: any, loader: any);
     setup(options: any): any;
     setLocale(locale: any): any;
     getLocale(): any;

diff --git a/dist/commonjs/aurelia-i18n.js b/dist/commonjs/aurelia-i18n.js
@@ -6,6 +6,8 @@ var _aureliaEventAggregator = require('aurelia-event-aggregator');
 
 var _aureliaTemplating = require('aurelia-templating');
 
+var _aureliaLoaderDefault = require('aurelia-loader-default');
+
 var _i18n = require('./i18n');
 
 var _relativeTime = require('./relativeTime');
@@ -20,6 +22,8 @@ var _t = require('./t');
 
 var _baseI18n = require('./base-i18n');
 
+console.log(_aureliaLoaderDefault.DefaultLoader);
+
 function configure(frameworkConfig, cb) {
   if (cb === undefined || typeof cb !== 'function') {
     var errorMsg = 'You need to provide a callback method to properly configure the library';
@@ -30,7 +34,8 @@ function configure(frameworkConfig, cb) {
   frameworkConfig.globalResources('./nf');
   frameworkConfig.globalResources('./df');
   frameworkConfig.globalResources('./rt');
-  var instance = new _i18n.I18N(frameworkConfig.container.get(_aureliaEventAggregator.EventAggregator));
+
+  var instance = new _i18n.I18N(frameworkConfig.container.get(_aureliaEventAggregator.EventAggregator), frameworkConfig.container.get(_aureliaLoaderDefault.DefaultLoader));
   frameworkConfig.container.registerInstance(_i18n.I18N, instance);
 
   var ret = cb(instance);

diff --git a/dist/commonjs/i18n.js b/dist/commonjs/i18n.js
@@ -13,7 +13,7 @@ var _i18next2 = _interopRequireDefault(_i18next);
 var _utils = require('./utils');
 
 var I18N = (function () {
-  function I18N(ea) {
+  function I18N(ea, loader) {
     _classCallCheck(this, I18N);
 
     this.globalVars = {};
@@ -22,8 +22,11 @@ var I18N = (function () {
     this.ea = ea;
     this.Intl = window.Intl;
 
+    var i18nName = loader.normalizeSync('aurelia-i18n');
+    var intlName = loader.normalizeSync('Intl.js', i18nName);
+
     if (window.Intl === undefined) {
-      System['import']('Intl').then(function (poly) {
+      loader.loadModule(intlName).then(function (poly) {
         window.Intl = poly;
       });
     }

diff --git a/dist/es6/aurelia-i18n.d.ts b/dist/es6/aurelia-i18n.d.ts
@@ -3,6 +3,7 @@ declare module 'aurelia-i18n' {
   import { resolver }  from 'aurelia-dependency-injection';
   import { EventAggregator }  from 'aurelia-event-aggregator';
   import { customAttribute, ViewResources }  from 'aurelia-templating';
+  import { DefaultLoader }  from 'aurelia-loader-default';
 
   /*eslint no-irregular-whitespace: 0*/
   export const translations: any;
@@ -17,7 +18,7 @@ declare module 'aurelia-i18n' {
   /*eslint no-cond-assign: 0*/
   export class I18N {
     globalVars: any;
-    constructor(ea: any);
+    constructor(ea: any, loader: any);
     setup(options: any): any;
     setLocale(locale: any): any;
     getLocale(): any;

diff --git a/dist/es6/aurelia-i18n.js b/dist/es6/aurelia-i18n.js
@@ -1,5 +1,8 @@
 import {EventAggregator} from 'aurelia-event-aggregator';
 import {ViewResources} from 'aurelia-templating';
+import {DefaultLoader} from 'aurelia-loader-default';
+
+console.log(DefaultLoader);
 
 import {I18N} from './i18n';
 import {RelativeTime} from './relativeTime';
@@ -21,7 +24,8 @@ function configure(frameworkConfig, cb) {
   frameworkConfig.globalResources('./nf');
   frameworkConfig.globalResources('./df');
   frameworkConfig.globalResources('./rt');
-  let instance = new I18N(frameworkConfig.container.get(EventAggregator));
+
+  let instance = new I18N(frameworkConfig.container.get(EventAggregator), frameworkConfig.container.get(DefaultLoader));
   frameworkConfig.container.registerInstance(I18N, instance);
 
   let ret = cb(instance);

diff --git a/dist/es6/i18n.js b/dist/es6/i18n.js
@@ -6,14 +6,17 @@ export class I18N {
 
   globalVars = {};
 
-  constructor(ea) {
+  constructor(ea, loader) {
     this.i18next = i18n;
     this.ea = ea;
     this.Intl = window.Intl;
 
     // check whether Intl is available, otherwise load the polyfill
+    let i18nName = loader.normalizeSync('aurelia-i18n');
+    let intlName = loader.normalizeSync('Intl.js', i18nName);
+
     if (window.Intl === undefined) {
-      System.import('Intl').then( (poly) => {
+      loader.loadModule(intlName).then( (poly) => {
         window.Intl = poly;
       });
     }

diff --git a/dist/system/aurelia-i18n.d.ts b/dist/system/aurelia-i18n.d.ts
@@ -3,6 +3,7 @@ declare module 'aurelia-i18n' {
   import { resolver }  from 'aurelia-dependency-injection';
   import { EventAggregator }  from 'aurelia-event-aggregator';
   import { customAttribute, ViewResources }  from 'aurelia-templating';
+  import { DefaultLoader }  from 'aurelia-loader-default';
 
   /*eslint no-irregular-whitespace: 0*/
   export const translations: any;
@@ -17,7 +18,7 @@ declare module 'aurelia-i18n' {
   /*eslint no-cond-assign: 0*/
   export class I18N {
     globalVars: any;
-    constructor(ea: any);
+    constructor(ea: any, loader: any);
     setup(options: any): any;
     setLocale(locale: any): any;
     getLocale(): any;

diff --git a/dist/system/aurelia-i18n.js b/dist/system/aurelia-i18n.js
@@ -1,7 +1,7 @@
-System.register(['aurelia-event-aggregator', 'aurelia-templating', './i18n', './relativeTime', './df', './nf', './rt', './t', './base-i18n'], function (_export) {
+System.register(['aurelia-event-aggregator', 'aurelia-templating', 'aurelia-loader-default', './i18n', './relativeTime', './df', './nf', './rt', './t', './base-i18n'], function (_export) {
   'use strict';
 
-  var EventAggregator, ViewResources, I18N, RelativeTime, DfValueConverter, NfValueConverter, RtValueConverter, TValueConverter, TCustomAttribute, TParamsCustomAttribute, BaseI18N;
+  var EventAggregator, ViewResources, DefaultLoader, I18N, RelativeTime, DfValueConverter, NfValueConverter, RtValueConverter, TValueConverter, TCustomAttribute, TParamsCustomAttribute, BaseI18N;
 
   function configure(frameworkConfig, cb) {
     if (cb === undefined || typeof cb !== 'function') {
@@ -13,7 +13,8 @@ System.register(['aurelia-event-aggregator', 'aurelia-templating', './i18n', './
     frameworkConfig.globalResources('./nf');
     frameworkConfig.globalResources('./df');
     frameworkConfig.globalResources('./rt');
-    var instance = new I18N(frameworkConfig.container.get(EventAggregator));
+
+    var instance = new I18N(frameworkConfig.container.get(EventAggregator), frameworkConfig.container.get(DefaultLoader));
     frameworkConfig.container.registerInstance(I18N, instance);
 
     var ret = cb(instance);
@@ -40,6 +41,8 @@ System.register(['aurelia-event-aggregator', 'aurelia-templating', './i18n', './
       EventAggregator = _aureliaEventAggregator.EventAggregator;
     }, function (_aureliaTemplating) {
       ViewResources = _aureliaTemplating.ViewResources;
+    }, function (_aureliaLoaderDefault) {
+      DefaultLoader = _aureliaLoaderDefault.DefaultLoader;
     }, function (_i18n) {
       I18N = _i18n.I18N;
     }, function (_relativeTime) {
@@ -58,6 +61,9 @@ System.register(['aurelia-event-aggregator', 'aurelia-templating', './i18n', './
       BaseI18N = _baseI18n.BaseI18N;
     }],
     execute: function () {
+
+      console.log(DefaultLoader);
+
       _export('configure', configure);
 
       _export('I18N', I18N);

diff --git a/dist/system/i18n.js b/dist/system/i18n.js
@@ -13,7 +13,7 @@ System.register(['i18next', './utils'], function (_export) {
     }],
     execute: function () {
       I18N = (function () {
-        function I18N(ea) {
+        function I18N(ea, loader) {
           _classCallCheck(this, I18N);
 
           this.globalVars = {};
@@ -22,8 +22,11 @@ System.register(['i18next', './utils'], function (_export) {
           this.ea = ea;
           this.Intl = window.Intl;
 
+          var i18nName = loader.normalizeSync('aurelia-i18n');
+          var intlName = loader.normalizeSync('Intl.js', i18nName);
+
           if (window.Intl === undefined) {
-            System['import']('Intl').then(function (poly) {
+            loader.loadModule(intlName).then(function (poly) {
               window.Intl = poly;
             });
           }