fix(intl): Polyfill Intl on Safari (react-boilerplate#793)

* fix(intl): polyfill for safari when clean the sample project * fix(test): fix semicolon * fix(intl): FormattedNumber doesn't work on Safari * fix(intl): add polyfill when generate new lang * fix(intl): add polyfill for safari when generate new lang * fix duplicate Closes react-boilerplate#791
cloudcck · Jul 29, 2016 · da3e502 · da3e502
1 parent c2fea3f
commit da3e502
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/app/app.js b/app/app.js
@@ -105,7 +105,11 @@ if (module.hot) {
 
 // Chunked polyfill for browsers without Intl support
 if (!window.Intl) {
-  System.import('intl').then(() => render(translationMessages));
+  Promise.all([
+    System.import('intl'),
+    System.import('intl/locale-data/jsonp/en.js'),
+    System.import('intl/locale-data/jsonp/de.js'),
+  ]).then(() => render(translationMessages));
 } else {
   render(translationMessages);
 }

diff --git a/internals/generators/language/index.js b/internals/generators/language/index.js
@@ -57,6 +57,12 @@ module.exports = {
       templateFile: './language/translations-json.hbs',
       abortOnFail: true,
     });
+    actions.push({
+      type: 'modify',
+      path: '../../app/app.js',
+      pattern: /(System\.import\('intl\/locale-data\/jsonp\/[a-z]+\.js'\),\n)(?!.*System\.import\('intl\/locale-data\/jsonp\/[a-z]+\.js'\),)/g,
+      templateFile: './language/polyfill-intl-locale.hbs',
+    });
     actions.push(
       () => {
         const cmd = 'npm run extract-intl';

diff --git a/internals/generators/language/polyfill-intl-locale.hbs b/internals/generators/language/polyfill-intl-locale.hbs
@@ -0,0 +1 @@
+$1    System.import('intl/locale-data/jsonp/{{language}}.js'),
diff --git a/internals/templates/app.js b/internals/templates/app.js
@@ -83,7 +83,10 @@ if (module.hot) {
 
 // Chunked polyfill for browsers without Intl support
 if (!window.Intl) {
-  System.import('intl').then(() => render(translationMessages));
+  Promise.all([
+    System.import('intl'),
+    System.import('intl/locale-data/jsonp/en.js'),
+  ]).then(() => render(translationMessages));
 } else {
   render(translationMessages);
 }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		$1 System.import('intl/locale-data/jsonp/{{language}}.js'),