@@ -1081,7 +1081,24 @@ Generated by [AVA](https://avajs.dev).
10811081> Snapshot 1
10821082
10831083 {
1084- 'generated-lib2.js': `'use strict';␊
1084+ 'main.js': `'use strict';␊
1085+ ␊
1086+ var main2 = require('./main2.js');␊
1087+ ␊
1088+ /* eslint-disable import/no-dynamic-require, global-require */␊
1089+ ␊
1090+ let message;␊
1091+ ␊
1092+ for (const index of [1, 2]) {␊
1093+ try {␊
1094+ message = main2.createCommonjsRequire("/fixtures/function/dynamic-require-code-splitting")(\`./target${index}.js\`);␊
1095+ } catch (err) {␊
1096+ ({ message } = err);␊
1097+ }␊
1098+ t.is(message, index.toString());␊
1099+ }␊
1100+ `,
1101+ 'main2.js': `'use strict';␊
10851102 ␊
10861103 var target1;␊
10871104 var hasRequiredTarget1;␊
@@ -1211,28 +1228,6 @@ Generated by [AVA](https://avajs.dev).
12111228 ␊
12121229 exports.createCommonjsRequire = createCommonjsRequire;␊
12131230 `,
1214- 'main.js': `'use strict';␊
1215- ␊
1216- var lib2 = require('./generated-lib2.js');␊
1217- ␊
1218- /* eslint-disable import/no-dynamic-require, global-require */␊
1219- ␊
1220- let message;␊
1221- ␊
1222- for (const index of [1, 2]) {␊
1223- try {␊
1224- message = lib2.createCommonjsRequire("/fixtures/function/dynamic-require-code-splitting")(\`./target${index}.js\`);␊
1225- } catch (err) {␊
1226- ({ message } = err);␊
1227- }␊
1228- t.is(message, index.toString());␊
1229- }␊
1230- `,
1231- 'main2.js': `'use strict';␊
1232- ␊
1233- require('./generated-lib2.js');␊
1234- ␊
1235- `,
12361231 }
12371232
12381233## dynamic-require-different-loader
@@ -1511,6 +1506,7 @@ Generated by [AVA](https://avajs.dev).
15111506 ␊
15121507 /* eslint-disable import/no-dynamic-require, global-require */␊
15131508 ␊
1509+ ␊
15141510 t.is(result, 'submodule');␊
15151511 `,
15161512 }
@@ -3454,6 +3450,9 @@ Generated by [AVA](https://avajs.dev).
34543450 const getGlobalPollution = () => 'foo';␊
34553451 ␊
34563452 // this test makes sure that "submodule" is not wrapped in commonjs␊
3453+ // helper due to its use of "typeof module", given that "submodule" has es6 exports.␊
3454+ // any attempt to wrap it in a function will just fail as it's invalid syntax.␊
3455+ ␊
34573456 ␊
34583457 t.is(getGlobalPollution(), global.pollution);␊
34593458 `,
@@ -4023,11 +4022,11 @@ Generated by [AVA](https://avajs.dev).
40234022 {
40244023 'main.js': `'use strict';␊
40254024 ␊
4026- var other = require('./other-77ad7026 .js');␊
4025+ var other = require('./other.js');␊
40274026 ␊
4028- t.is(other.foo , 'foo');␊
4027+ t.is(other, 'foo');␊
40294028 `,
4030- 'other-77ad7026 .js': `'use strict';␊
4029+ 'other.js': `'use strict';␊
40314030 ␊
40324031 function getDefaultExportFromCjs (x) {␊
40334032 return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊
@@ -4037,15 +4036,7 @@ Generated by [AVA](https://avajs.dev).
40374036 ␊
40384037 var foo = /*@__PURE__*/getDefaultExportFromCjs(other);␊
40394038 ␊
4040- exports.foo = foo;␊
4041- `,
4042- 'other.js': `'use strict';␊
4043- ␊
4044- var other = require('./other-77ad7026.js');␊
4045- ␊
4046- ␊
4047- ␊
4048- module.exports = other.foo;␊
4039+ module.exports = foo;␊
40494040 `,
40504041 }
40514042
@@ -5124,6 +5115,16 @@ Generated by [AVA](https://avajs.dev).
51245115 return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊
51255116 }␊
51265117 ␊
5118+ var foo;␊
5119+ var hasRequiredFoo;␊
5120+ ␊
5121+ function requireFoo () {␊
5122+ if (hasRequiredFoo) return foo;␊
5123+ hasRequiredFoo = 1;␊
5124+ foo = 1;␊
5125+ return foo;␊
5126+ }␊
5127+ ␊
51275128 var multiply;␊
51285129 var hasRequiredMultiply;␊
51295130 ␊
@@ -5136,16 +5137,6 @@ Generated by [AVA](https://avajs.dev).
51365137 return multiply;␊
51375138 }␊
51385139 ␊
5139- var foo;␊
5140- var hasRequiredFoo;␊
5141- ␊
5142- function requireFoo () {␊
5143- if (hasRequiredFoo) return foo;␊
5144- hasRequiredFoo = 1;␊
5145- foo = 1;␊
5146- return foo;␊
5147- }␊
5148- ␊
51495140 /* eslint-disable global-require */␊
51505141 ␊
51515142 var main = function () {␊
@@ -5930,45 +5921,31 @@ Generated by [AVA](https://avajs.dev).
59305921> Snapshot 1
59315922
59325923 {
5933- '_virtual/_commonjsHelpers .js': `'use strict';␊
5924+ 'main .js': `'use strict';␊
59345925 ␊
59355926 var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};␊
59365927 ␊
59375928 function getDefaultExportFromCjs (x) {␊
59385929 return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊
59395930 }␊
59405931 ␊
5941- exports.commonjsGlobal = commonjsGlobal;␊
5942- exports.getDefaultExportFromCjs = getDefaultExportFromCjs;␊
5943- `,
5944- 'main.js': `'use strict';␊
5945- ␊
5946- var _commonjsHelpers = require('./_virtual/_commonjsHelpers.js');␊
5947- var main$1 = require('./main2.js');␊
5948- ␊
5949- var mainExports = main$1.__require();␊
5950- var main = /*@__PURE__*/_commonjsHelpers.getDefaultExportFromCjs(mainExports);␊
5951- ␊
5952- module.exports = main;␊
5953- `,
5954- 'main2.js': `'use strict';␊
5955- ␊
5956- var _commonjsHelpers = require('./_virtual/_commonjsHelpers.js');␊
5957- ␊
5958- var main;␊
5932+ var main$1;␊
59595933 var hasRequiredMain;␊
59605934 ␊
59615935 function requireMain () {␊
5962- if (hasRequiredMain) return main;␊
5936+ if (hasRequiredMain) return main$1 ;␊
59635937 hasRequiredMain = 1;␊
5964- _commonjsHelpers. commonjsGlobal.main = 'main';␊
5938+ commonjsGlobal.main = 'main';␊
59655939 console.log('main');␊
59665940 ␊
5967- main = 'main';␊
5968- return main;␊
5941+ main$1 = 'main';␊
5942+ return main$1 ;␊
59695943 }␊
59705944 ␊
5971- exports.__require = requireMain;␊
5945+ var mainExports = requireMain();␊
5946+ var main = /*@__PURE__*/getDefaultExportFromCjs(mainExports);␊
5947+ ␊
5948+ module.exports = main;␊
59725949 `,
59735950 }
59745951
0 commit comments