diff --git a/src/ast/nodes/VariableDeclaration.ts b/src/ast/nodes/VariableDeclaration.ts index 9327220f439..2aa5e4eb923 100644 --- a/src/ast/nodes/VariableDeclaration.ts +++ b/src/ast/nodes/VariableDeclaration.ts @@ -176,6 +176,7 @@ export default class VariableDeclaration extends NodeBase { code.remove(start, end); continue; } + node.render(code, options); leadingString = ''; nextSeparatorString = ''; if ( @@ -217,7 +218,6 @@ export default class VariableDeclaration extends NodeBase { code.overwrite(lastSeparatorPos, lastSeparatorPos + 1, separatorString); code.appendLeft(renderedContentEnd, leadingString); } - node.render(code, options); actualContentEnd = contentEnd; renderedContentEnd = end; hasRenderedContent = true; diff --git a/test/form/samples/simplified-initializer/_config.js b/test/form/samples/simplified-initializer/_config.js new file mode 100644 index 00000000000..c893283454c --- /dev/null +++ b/test/form/samples/simplified-initializer/_config.js @@ -0,0 +1,4 @@ +module.exports = { + description: 'handles simplified variable initializers', + options: { output: { name: 'bundle' } } +}; diff --git a/test/form/samples/simplified-initializer/_expected/amd.js b/test/form/samples/simplified-initializer/_expected/amd.js new file mode 100644 index 00000000000..a64a179e759 --- /dev/null +++ b/test/form/samples/simplified-initializer/_expected/amd.js @@ -0,0 +1,13 @@ +define(['exports'], function (exports) { 'use strict'; + + const a = window.config ? 1 : 2; + const b = 1 ; + const c = 2; + + exports.a = a; + exports.b = b; + exports.c = c; + + Object.defineProperty(exports, '__esModule', { value: true }); + +}); diff --git a/test/form/samples/simplified-initializer/_expected/cjs.js b/test/form/samples/simplified-initializer/_expected/cjs.js new file mode 100644 index 00000000000..495e50393b3 --- /dev/null +++ b/test/form/samples/simplified-initializer/_expected/cjs.js @@ -0,0 +1,11 @@ +'use strict'; + +Object.defineProperty(exports, '__esModule', { value: true }); + +const a = window.config ? 1 : 2; +const b = 1 ; +const c = 2; + +exports.a = a; +exports.b = b; +exports.c = c; diff --git a/test/form/samples/simplified-initializer/_expected/es.js b/test/form/samples/simplified-initializer/_expected/es.js new file mode 100644 index 00000000000..bc942821bc6 --- /dev/null +++ b/test/form/samples/simplified-initializer/_expected/es.js @@ -0,0 +1,5 @@ +const a = window.config ? 1 : 2; +const b = 1 ; +const c = 2; + +export { a, b, c }; diff --git a/test/form/samples/simplified-initializer/_expected/iife.js b/test/form/samples/simplified-initializer/_expected/iife.js new file mode 100644 index 00000000000..4f265bd8263 --- /dev/null +++ b/test/form/samples/simplified-initializer/_expected/iife.js @@ -0,0 +1,16 @@ +var bundle = (function (exports) { + 'use strict'; + + const a = window.config ? 1 : 2; + const b = 1 ; + const c = 2; + + exports.a = a; + exports.b = b; + exports.c = c; + + Object.defineProperty(exports, '__esModule', { value: true }); + + return exports; + +}({})); diff --git a/test/form/samples/simplified-initializer/_expected/system.js b/test/form/samples/simplified-initializer/_expected/system.js new file mode 100644 index 00000000000..0f66633ac84 --- /dev/null +++ b/test/form/samples/simplified-initializer/_expected/system.js @@ -0,0 +1,12 @@ +System.register('bundle', [], function (exports) { + 'use strict'; + return { + execute: function () { + + const a = exports('a', window.config ? 1 : 2); + const b = exports('b', 1 ); + const c = exports('c', 2); + + } + }; +}); diff --git a/test/form/samples/simplified-initializer/_expected/umd.js b/test/form/samples/simplified-initializer/_expected/umd.js new file mode 100644 index 00000000000..72b26c4100e --- /dev/null +++ b/test/form/samples/simplified-initializer/_expected/umd.js @@ -0,0 +1,17 @@ +(function (global, factory) { + typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) : + typeof define === 'function' && define.amd ? define(['exports'], factory) : + (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.bundle = {})); +}(this, (function (exports) { 'use strict'; + + const a = window.config ? 1 : 2; + const b = 1 ; + const c = 2; + + exports.a = a; + exports.b = b; + exports.c = c; + + Object.defineProperty(exports, '__esModule', { value: true }); + +}))); diff --git a/test/form/samples/simplified-initializer/main.js b/test/form/samples/simplified-initializer/main.js new file mode 100644 index 00000000000..bede70e3059 --- /dev/null +++ b/test/form/samples/simplified-initializer/main.js @@ -0,0 +1,3 @@ +export const a = window.config ? 1 : 2 +export const b = true ? 1 : 2 +export const c = false ? 1 : 2 diff --git a/test/function/samples/max-parallel-file-reads-with-plugin/_config.js b/test/function/samples/max-parallel-file-reads-with-plugin/_config.js index 29bfcd49965..0e8b6fd3ea3 100644 --- a/test/function/samples/max-parallel-file-reads-with-plugin/_config.js +++ b/test/function/samples/max-parallel-file-reads-with-plugin/_config.js @@ -21,7 +21,6 @@ module.exports = { }, before() { fs.readFile = (path, options, callback) => { - console.log('mock read'); currentReads++; maxReads = Math.max(maxReads, currentReads); fsReadFile(path, options, (err, data) => {