🤖 Pick PR #58895 (Fix global when typescript.js loade...) into releas…

…e-5.5 (#58896) Co-authored-by: Jake Bailey <5341706+jakebailey@users.noreply.github.com>
microsoft · Jun 18, 2024 · 02132e5 · 02132e5
1 parent 45b1e3c
commit 02132e5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/Herebyfile.mjs b/Herebyfile.mjs
@@ -216,7 +216,7 @@ function createBundler(entrypoint, outfile, taskOptions = {}) {
             // Monaco bundles us as ESM by wrapping our code with something that defines module.exports
             // but then does not use it, instead using the `ts` variable. Ensure that if we think we're CJS
             // that we still set `ts` to the module.exports object.
-            options.footer = { js: `})(typeof module !== "undefined" && module.exports ? module : { exports: ts });\nif (typeof module !== "undefined" && module.exports) { ts = module.exports; }` };
+            options.footer = { js: `})({ get exports() { return ts; }, set exports(v) { ts = v; if (typeof module !== "undefined" && module.exports) { module.exports = v; } } })` };
 
             // esbuild converts calls to "require" to "__require"; this function
             // calls the real require if it exists, or throws if it does not (rather than

diff --git a/scripts/browserIntegrationTest.mjs b/scripts/browserIntegrationTest.mjs
@@ -29,6 +29,7 @@ for (const browserType of browsers) {
     await page.setContent(`
     <html>
     <script>${readFileSync(join("built", "local", "typescript.js"), "utf8")}</script>
+    <script>if (typeof ts.version !== "string") throw new Error("ts.version not set")</script>
     </html>
     `);
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,6 +29,7 @@ for (const browserType of browsers) { @@
         await page.setContent(`
         <html>
         <script>${readFileSync(join("built", "local", "typescript.js"), "utf8")}</script>
+        <script>if (typeof ts.version !== "string") throw new Error("ts.version not set")</script>
         </html>
         `);
@@ Expand Down @@