Merge branch 'master' into wjh/no-spy-console

Author: wjhsf

packages/@lwc/integration-not-karma/helpers/utils.js

@@ -267,7 +267,7 @@ export const resolvePathOutsideRoot = (file) => {
     return file.replace(/^(\.\.\/)+?(.+?)$/, (_, outside, filepath) => {
         // To serve files from outside the web root (e.g. from the monorepo root
         // node_modules, @web/dev-server provides this "magic" path. It's hacky
-        // of us to use it it directly.
+        // of us to use it directly.
         // '../'.repeat(depth) becomes `/__wds-outside-root__/${depth}/`
         const depth = outside.length / 3;
         return `/__wds-outside-root__/${depth}/${filepath}`;

packages/@lwc/integration-not-karma/test/custom-elements-registry/index.spec.js

@@ -7,7 +7,13 @@ const tagAlreadyUsedErrorMessage =
 /** Fetches a text resource. */
 async function getModuleCode(pkg) {
     const res = await fetch(resolvePathOutsideRoot(`../${pkg}/dist/index.cjs.js`));
-    return await res.text();
+    const code = await res.text();
+    // CommonJS code needs to have `exports` defined, so we wrap in an IIFE
+    // to provide it and to encapsulate the code.
+    return `((exports) => {
+        ${code};
+        return exports;
+    })({});`;
 }
 
 /** Gets the contents of a set of script tags to insert on a page. */
@@ -20,10 +26,9 @@ async function getEngineCode() {
 
     return `(() => {
         globalThis.process = { env: { NODE_ENV: "production" } };
-        globalThis.LWC = globalThis.exports = {};
         globalThis.lwcRuntimeFlags = ${JSON.stringify(lwcRuntimeFlags)};
         ${syntheticShadow};
-        ${engineDom};
+        globalThis.LWC = ${engineDom};
     })();`;
 }