Make generated helper file have .js extension in preserveModules mode (…

…#373) * Make generated helper file have .js extension in preserveModules mode * Support for new globalThis global
rollup · Apr 2, 2019 · d93d838 · tionkje · Sep 12, 2019 · d93d838
1 parent 9755028
commit d93d838
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/helpers.js b/src/helpers.js
@@ -1,11 +1,11 @@
 export const PROXY_PREFIX = '\0commonjs-proxy:';
 export const EXTERNAL_PREFIX = '\0commonjs-external:';
-export const HELPERS_ID = '\0commonjsHelpers';
+export const HELPERS_ID = '\0commonjsHelpers.js';
 
 // `x['default']` is used instead of `x.default` for backward compatibility with ES3 browsers.
 // Minifiers like uglify will usually transpile it back if compatibility with ES3 is not enabled.
 export const HELPERS = `
-export var commonjsGlobal = typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
+export var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 
 export function commonjsRequire () {
 	throw new Error('Dynamic requires are not currently supported by rollup-plugin-commonjs');

diff --git a/test/form/dynamic-template-literal/output.js b/test/form/dynamic-template-literal/output.js
@@ -1,4 +1,4 @@
-import * as commonjsHelpers from 'commonjsHelpers';
+import * as commonjsHelpers from 'commonjsHelpers.js';
 
 var pe = 'pe';
 var foo = commonjsHelpers.commonjsRequire(`ta${pe}`);

diff --git a/test/form/typeof-module-exports/output.js b/test/form/typeof-module-exports/output.js
@@ -1,4 +1,4 @@
-import * as commonjsHelpers from 'commonjsHelpers';
+import * as commonjsHelpers from 'commonjsHelpers.js';
 
 var input = commonjsHelpers.createCommonjsModule(function (module, exports) {
 var foo = 42;