Merge pull request #3 from chuckdumont/work

Fix issue #2
chuckdumont · Jul 16, 2018 · ff2b283 · ff2b283
2 parents 826d08d + f379f83
commit ff2b283
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 /node_modules/
+package-lock.json
diff --git a/lib/I18nExtractorPlugin.js b/lib/I18nExtractorPlugin.js
@@ -223,9 +223,11 @@ module.exports = class I18nExtractorPlugin {
             throw new Error(`Error referencing promise polyfill: ${options.promisePolyfill}`);
           }
         }
-        buf.push(`Promise.all(loadLanguageChunks(${JSON.stringify(chunk.id)})).then(function() {  ${BLOCK_COMMENT}`);
+        buf.push(`var langPromises = loadLanguageChunks(${JSON.stringify(chunk.id)});  ${BLOCK_COMMENT}`);
+        buf.push(`function startupFn() {  ${BLOCK_COMMENT}`);
         buf.push(Template.indent(source));
-        buf.push(`});  ${BLOCK_COMMENT}`);
+        buf.push(`}  ${BLOCK_COMMENT}`);
+        buf.push(`return (langPromises.length) ? Promise.all(langPromises).then(startupFn) : startupFn();  ${BLOCK_COMMENT}`);
         return Template.asString(buf);
       });
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "webpack-i18n-extractor-plugin",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "peerDependencies": {
     "webpack": ">= 4.0.0"
   },