Merge pull request #3933 from titouanmathis/main

[Webpack Plugin] Fix CJS being injected in ESM files
microsoft · May 2, 2023 · 358be7c · 358be7c
2 parents 28e6548 + 424abe7
commit 358be7c
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/webpack-plugin/src/loaders/include.ts b/webpack-plugin/src/loaders/include.ts
@@ -30,8 +30,12 @@ export const pitch: PitchLoaderDefinitionFunction<ILoaderOptions> = function pit
 		...(globals
 			? Object.keys(globals).map((key) => `self[${JSON.stringify(key)}] = ${globals[key]};`)
 			: []),
-		...pre.map((include: any) => `require(${stringifyRequest(include)});`),
-		`module.exports = require(${stringifyRequest(`!!${remainingRequest}`)});`,
-		...post.map((include: any) => `require(${stringifyRequest(include)});`)
+		...pre.map((include: any) => `import ${stringifyRequest(include)};`),
+		`
+import * as monaco from ${stringifyRequest(`!!${remainingRequest}`)};
+export * from ${stringifyRequest(`!!${remainingRequest}`)};
+export default monaco;
+		`,
+		...post.map((include: any) => `import ${stringifyRequest(include)};`)
 	].join('\n');
 };