Allow multiple umd files to load into global.vuei18nLocales (#98)

* Allow multiple umd files to load into global.vuei18nLocales * IE support? * update tests
martinlindhe · Feb 9, 2020 · 95fcfa0 · 95fcfa0
1 parent f546c3f
commit 95fcfa0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Generator.php b/src/Generator.php
@@ -357,7 +357,7 @@ private function getUMDModule($body)
 (function (global, factory) {
     typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
         typeof define === 'function' && define.amd ? define(factory) :
-            (global.vuei18nLocales = factory());
+            typeof global.vuei18nLocales === 'undefined' ? global.vuei18nLocales = factory() : Object.keys(factory()).forEach(function (key) {global.vuei18nLocales[key] = factory()[key]});
 }(this, (function () { 'use strict';
     return {$body}
 })));

diff --git a/tests/GenerateTest.php b/tests/GenerateTest.php
@@ -211,7 +211,7 @@ function testBasicWithUMDFormat()
             '(function (global, factory) {' . PHP_EOL
             . '    typeof exports === \'object\' && typeof module !== \'undefined\' ? module.exports = factory() :' . PHP_EOL
             . '        typeof define === \'function\' && define.amd ? define(factory) :' . PHP_EOL
-            . '            (global.vuei18nLocales = factory());' . PHP_EOL
+            . '            typeof global.vuei18nLocales === \'undefined\' ? global.vuei18nLocales = factory() : Object.keys(factory()).forEach(function (key) {global.vuei18nLocales[key] = factory()[key]});' . PHP_EOL
             . '}(this, (function () { \'use strict\';' . PHP_EOL
             . '    return {' . PHP_EOL
             . '    "en": {' . PHP_EOL