From 3465f6b322d5526669393eaffd1a8e7ad692d577 Mon Sep 17 00:00:00 2001 From: Tony Garnock-Jones Date: Mon, 18 Jan 2021 23:36:05 +0100 Subject: [PATCH] Repair use of global module type option --- packages/compiler/src/compiler/codegen.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/compiler/src/compiler/codegen.ts b/packages/compiler/src/compiler/codegen.ts index 37120bd..8d0c40d 100644 --- a/packages/compiler/src/compiler/codegen.ts +++ b/packages/compiler/src/compiler/codegen.ts @@ -177,9 +177,9 @@ export function expand(tree: Items, moduleType: ModuleType): Items { switch (moduleType) { case 'es6': return t`export function ${BootProc}(thisFacet) {${walk(s)}}`; - case 'global': - return t`module.exports.${BootProc} = function (thisFacet) {${walk(s)}};`; case 'require': + return t`module.exports.${BootProc} = function (thisFacet) {${walk(s)}};`; + case 'global': return t`function ${BootProc}(thisFacet) {${walk(s)}}`; } }); @@ -219,7 +219,7 @@ export function compile(options: CompileOptions): CompilerOutput { } } - tree = macro.template(fixPos(end))`${tree}\nif ((typeof require === 'undefined' ? {main: void 0} : require).main === module) __SYNDICATE__.bootModule(${BootProc});`; + tree = macro.template(fixPos(end))`${tree}\nif (typeof module !== 'undefined' && ((typeof require === 'undefined' ? {main: void 0} : require).main === module)) __SYNDICATE__.bootModule(${BootProc});`; const cw = new CodeWriter(inputFilename); cw.emit(expand(tree, moduleType));