Skip to content

Commit 440c1b3

Browse files
nicolasgarnierbojeil-google
authored andcommitted
Using default attribute of Firebase require statement if available (#398)
* Using default attribute of Firebase require statement if available fixes #392 * Add typeof
1 parent 0e512fd commit 440c1b3

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

gulpfile.js

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,18 @@ const OUTPUT_WRAPPER = OPTIMIZATION_LEVEL === 'WHITESPACE_ONLY' ?
4242
const DIALOG_POLYFILL = 'if(typeof window!==\'undefined\')' +
4343
'{window.dialogPolyfill=require(\'dialog-polyfill\');}';
4444

45-
// Adds the firebase module requirement and exports firebaseui.
45+
// Using default import if available.
46+
const DEFAULT_IMPORT_FIX = 'if(typeof firebase.default!==\'undefined\')' +
47+
'{firebase=firebase.default;}';
48+
49+
// Adds the module requirement and exports firebaseui.
4650
const NPM_MODULE_WRAPPER = OPTIMIZATION_LEVEL === 'WHITESPACE_ONLY' ?
4751
'var firebase=require(\'firebase/app\');require(\'firebase/auth\');' +
48-
'%output%' + DIALOG_POLYFILL + 'module.exports=firebaseui;' :
52+
DEFAULT_IMPORT_FIX + '%output%' + DIALOG_POLYFILL +
53+
'module.exports=firebaseui;' :
4954
'(function() { var firebase=require(\'firebase/app\');' +
50-
'require(\'firebase/auth\');%output% ' + DIALOG_POLYFILL + '})();' +
51-
'module.exports=firebaseui;';
55+
'require(\'firebase/auth\');' + DEFAULT_IMPORT_FIX + '%output% ' +
56+
DIALOG_POLYFILL + '})();' + 'module.exports=firebaseui;';
5257

5358
// The path to Closure Compiler.
5459
const COMPILER_PATH = 'node_modules/google-closure-compiler/compiler.jar';

0 commit comments

Comments
 (0)