@zimic/interceptor 1.3.6-canary.2 → 1.3.6-canary.4

package/dist/scripts/postinstall.js

@@ -11,68 +11,22 @@ var path__default = /*#__PURE__*/_interopDefault(path);
 
 var MSW_ROOT_DIRECTORY = path__default.default.join(chunkDGUM43GV_js.__require.resolve("msw"), "..", "..", "..");
 var MSW_PACKAGE_PATH = path__default.default.join(MSW_ROOT_DIRECTORY, "package.json");
-var MSW_CORE_DIRECTORY = path__default.default.join(MSW_ROOT_DIRECTORY, "lib", "core");
 async function patchMSWExports() {
   const mswPackageContentAsString = await fs__default.default.promises.readFile(MSW_PACKAGE_PATH, "utf-8");
   const mswPackageContent = JSON.parse(mswPackageContentAsString);
-  const browserExports = mswPackageContent.exports["./browser"];
-  const nodeExports = mswPackageContent.exports["./node"];
-  browserExports.node = nodeExports.node;
-  nodeExports.browser = browserExports.browser;
+  const mswExports = mswPackageContent.exports;
+  mswExports["./browser"].node = mswExports["./node"].node;
+  mswExports["./node"].browser = mswExports["./browser"].browser;
+  const { browser: browserNodeExport, ...nodeExportsWithoutBrowser } = mswExports["./node"];
+  mswExports["./node"] = { browser: browserNodeExport, ...nodeExportsWithoutBrowser };
   const patchedMSWPackageContentAsString = JSON.stringify(mswPackageContent, null, 2);
   await fs__default.default.promises.writeFile(MSW_PACKAGE_PATH, patchedMSWPackageContentAsString);
 }
-async function patchMSWWebSocketBroadcastChannel() {
-  await Promise.all(
-    ["ws.js", "ws.mjs"].map(async (webSocketFileName) => {
-      const mswWebSocketPath = path__default.default.join(MSW_CORE_DIRECTORY, webSocketFileName);
-      const mswWebSocketContent = await fs__default.default.promises.readFile(mswWebSocketPath, "utf-8");
-      const patchedMSWWebSocketContent = mswWebSocketContent.replace(
-        [
-          'const webSocketChannel = new BroadcastChannel("msw:websocket-client-manager");',
-          "if (isBroadcastChannelWithUnref(webSocketChannel)) {",
-          "  webSocketChannel.unref();",
-          "}"
-        ].join("\n"),
-        "let webSocketChannel;"
-      ).replace(
-        [
-          "  );",
-          "  const clientManager = new import_WebSocketClientManager.WebSocketClientManager(webSocketChannel);"
-        ].join("\n"),
-        [
-          "  );",
-          "  if (!webSocketChannel) {",
-          '    webSocketChannel = new BroadcastChannel("msw:websocket-client-manager");',
-          "    if (isBroadcastChannelWithUnref(webSocketChannel)) {",
-          "      webSocketChannel.unref();",
-          "    }",
-          "  }",
-          "  const clientManager = new import_WebSocketClientManager.WebSocketClientManager(webSocketChannel);"
-        ].join("\n")
-      ).replace(
-        ["  );", "  const clientManager = new WebSocketClientManager(webSocketChannel);"].join("\n"),
-        [
-          "  );",
-          "  if (!webSocketChannel) {",
-          '    webSocketChannel = new BroadcastChannel("msw:websocket-client-manager");',
-          "    if (isBroadcastChannelWithUnref(webSocketChannel)) {",
-          "      webSocketChannel.unref();",
-          "    }",
-          "  }",
-          "  const clientManager = new WebSocketClientManager(webSocketChannel);"
-        ].join("\n")
-      );
-      await fs__default.default.promises.writeFile(mswWebSocketPath, patchedMSWWebSocketContent);
-    })
-  );
-}
 async function postinstall() {
-  await Promise.all([patchMSWExports(), patchMSWWebSocketBroadcastChannel()]);
+  await patchMSWExports();
 }
 var postinstallPromise = postinstall();
 
-exports.MSW_CORE_DIRECTORY = MSW_CORE_DIRECTORY;
 exports.MSW_PACKAGE_PATH = MSW_PACKAGE_PATH;
 exports.MSW_ROOT_DIRECTORY = MSW_ROOT_DIRECTORY;
 exports.postinstallPromise = postinstallPromise;

package/dist/scripts/postinstall.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../scripts/postinstall.ts"],"names":["path","__require","fs"],"mappings":";;;;;;;;;;;AAQO,IAAM,kBAAA,GAAqBA,sBAAK,IAAA,CAAKC,0BAAA,CAAQ,QAAQ,KAAK,CAAA,EAAG,IAAA,EAAM,IAAA,EAAM,IAAI;AAE7E,IAAM,gBAAA,GAAmBD,qBAAA,CAAK,IAAA,CAAK,kBAAA,EAAoB,cAAc;AAErE,IAAM,kBAAA,GAAqBA,qBAAA,CAAK,IAAA,CAAK,kBAAA,EAAoB,OAAO,MAAM;AAE7E,eAAe,eAAA,GAAkB;AAC/B,EAAA,MAAM,4BAA4B,MAAME,mBAAA,CAAG,QAAA,CAAS,QAAA,CAAS,kBAAkB,OAAO,CAAA;AACtF,EAAA,MAAM,iBAAA,GAAoB,IAAA,CAAK,KAAA,CAAM,yBAAyB,CAAA;AAE9D,EAAA,MAAM,cAAA,GAAiB,iBAAA,CAAkB,OAAA,CAAQ,WAAW,CAAA;AAK5D,EAAA,MAAM,WAAA,GAAc,iBAAA,CAAkB,OAAA,CAAQ,QAAQ,CAAA;AAKtD,EAAA,cAAA,CAAe,OAAO,WAAA,CAAY,IAAA;AAClC,EAAA,WAAA,CAAY,UAAU,cAAA,CAAe,OAAA;AAErC,EAAA,MAAM,gCAAA,GAAmC,IAAA,CAAK,SAAA,CAAU,iBAAA,EAAmB,MAAM,CAAC,CAAA;AAClF,EAAA,MAAMA,mBAAA,CAAG,QAAA,CAAS,SAAA,CAAU,gBAAA,EAAkB,gCAAgC,CAAA;AAChF;AAGA,eAAe,iCAAA,GAAoC;AACjD,EAAA,MAAM,OAAA,CAAQ,GAAA;AAAA,IACZ,CAAC,OAAA,EAAS,QAAQ,CAAA,CAAE,GAAA,CAAI,OAAO,iBAAA,KAAsB;AACnD,MAAA,MAAM,gBAAA,GAAmBF,qBAAA,CAAK,IAAA,CAAK,kBAAA,EAAoB,iBAAiB,CAAA;AACxE,MAAA,MAAM,sBAAsB,MAAME,mBAAA,CAAG,QAAA,CAAS,QAAA,CAAS,kBAAkB,OAAO,CAAA;AAEhF,MAAA,MAAM,6BAA6B,mBAAA,CAChC,OAAA;AAAA,QACC;AAAA,UACE,gFAAA;AAAA,UACA,sDAAA;AAAA,UACA,6BAAA;AAAA,UACA;AAAA,SACF,CAAE,KAAK,IAAI,CAAA;AAAA,QACX;AAAA,OACF,CACC,OAAA;AAAA,QACC;AAAA,UACE,MAAA;AAAA,UACA;AAAA,SACF,CAAE,KAAK,IAAI,CAAA;AAAA,QACX;AAAA,UACE,MAAA;AAAA,UACA,4BAAA;AAAA,UACA,8EAAA;AAAA,UACA,0DAAA;AAAA,UACA,iCAAA;AAAA,UACA,OAAA;AAAA,UACA,KAAA;AAAA,UACA;AAAA,SACF,CAAE,KAAK,IAAI;AAAA,OACb,CACC,OAAA;AAAA,QACC,CAAC,MAAA,EAAQ,uEAAuE,CAAA,CAAE,KAAK,IAAI,CAAA;AAAA,QAC3F;AAAA,UACE,MAAA;AAAA,UACA,4BAAA;AAAA,UACA,8EAAA;AAAA,UACA,0DAAA;AAAA,UACA,iCAAA;AAAA,UACA,OAAA;AAAA,UACA,KAAA;AAAA,UACA;AAAA,SACF,CAAE,KAAK,IAAI;AAAA,OACb;AAEF,MAAA,MAAMA,mBAAA,CAAG,QAAA,CAAS,SAAA,CAAU,gBAAA,EAAkB,0BAA0B,CAAA;AAAA,IAC1E,CAAC;AAAA,GACH;AACF;AAEA,eAAe,WAAA,GAAc;AAC3B,EAAA,MAAM,QAAQ,GAAA,CAAI,CAAC,iBAAgB,EAAG,iCAAA,EAAmC,CAAC,CAAA;AAC5E;AAEO,IAAM,qBAAqB,WAAA","file":"postinstall.js","sourcesContent":["import { Override } from '@zimic/utils/types';\nimport fs from 'fs';\nimport type mswPackage from 'msw/package.json';\nimport path from 'path';\n\nexport type MSWPackage = typeof mswPackage;\nexport type MSWExports = MSWPackage['exports'];\n\nexport const MSW_ROOT_DIRECTORY = path.join(require.resolve('msw'), '..', '..', '..');\n\nexport const MSW_PACKAGE_PATH = path.join(MSW_ROOT_DIRECTORY, 'package.json');\n\nexport const MSW_CORE_DIRECTORY = path.join(MSW_ROOT_DIRECTORY, 'lib', 'core');\n\nasync function patchMSWExports() {\n  const mswPackageContentAsString = await fs.promises.readFile(MSW_PACKAGE_PATH, 'utf-8');\n  const mswPackageContent = JSON.parse(mswPackageContentAsString) as MSWPackage;\n\n  const browserExports = mswPackageContent.exports['./browser'] as Override<\n    MSWExports['./browser'],\n    { node: MSWExports['./node']['node'] | string | null }\n  >;\n\n  const nodeExports = mswPackageContent.exports['./node'] as Override<\n    MSWExports['./node'],\n    { browser: MSWExports['./browser']['browser'] | string | null }\n  >;\n\n  browserExports.node = nodeExports.node;\n  nodeExports.browser = browserExports.browser;\n\n  const patchedMSWPackageContentAsString = JSON.stringify(mswPackageContent, null, 2);\n  await fs.promises.writeFile(MSW_PACKAGE_PATH, patchedMSWPackageContentAsString);\n}\n\n// This is a temporary workaround. Once https://github.com/stackblitz/core/issues/3323 is fixed, we should remove it.\nasync function patchMSWWebSocketBroadcastChannel() {\n  await Promise.all(\n    ['ws.js', 'ws.mjs'].map(async (webSocketFileName) => {\n      const mswWebSocketPath = path.join(MSW_CORE_DIRECTORY, webSocketFileName);\n      const mswWebSocketContent = await fs.promises.readFile(mswWebSocketPath, 'utf-8');\n\n      const patchedMSWWebSocketContent = mswWebSocketContent\n        .replace(\n          [\n            'const webSocketChannel = new BroadcastChannel(\"msw:websocket-client-manager\");',\n            'if (isBroadcastChannelWithUnref(webSocketChannel)) {',\n            '  webSocketChannel.unref();',\n            '}',\n          ].join('\\n'),\n          'let webSocketChannel;',\n        )\n        .replace(\n          [\n            '  );',\n            '  const clientManager = new import_WebSocketClientManager.WebSocketClientManager(webSocketChannel);',\n          ].join('\\n'),\n          [\n            '  );',\n            '  if (!webSocketChannel) {',\n            '    webSocketChannel = new BroadcastChannel(\"msw:websocket-client-manager\");',\n            '    if (isBroadcastChannelWithUnref(webSocketChannel)) {',\n            '      webSocketChannel.unref();',\n            '    }',\n            '  }',\n            '  const clientManager = new import_WebSocketClientManager.WebSocketClientManager(webSocketChannel);',\n          ].join('\\n'),\n        )\n        .replace(\n          ['  );', '  const clientManager = new WebSocketClientManager(webSocketChannel);'].join('\\n'),\n          [\n            '  );',\n            '  if (!webSocketChannel) {',\n            '    webSocketChannel = new BroadcastChannel(\"msw:websocket-client-manager\");',\n            '    if (isBroadcastChannelWithUnref(webSocketChannel)) {',\n            '      webSocketChannel.unref();',\n            '    }',\n            '  }',\n            '  const clientManager = new WebSocketClientManager(webSocketChannel);',\n          ].join('\\n'),\n        );\n\n      await fs.promises.writeFile(mswWebSocketPath, patchedMSWWebSocketContent);\n    }),\n  );\n}\n\nasync function postinstall() {\n  await Promise.all([patchMSWExports(), patchMSWWebSocketBroadcastChannel()]);\n}\n\nexport const postinstallPromise = postinstall();\n"]}
+{"version":3,"sources":["../../scripts/postinstall.ts"],"names":["path","__require","fs"],"mappings":";;;;;;;;;;;AAQO,IAAM,kBAAA,GAAqBA,sBAAK,IAAA,CAAKC,0BAAA,CAAQ,QAAQ,KAAK,CAAA,EAAG,IAAA,EAAM,IAAA,EAAM,IAAI;AAC7E,IAAM,gBAAA,GAAmBD,qBAAA,CAAK,IAAA,CAAK,kBAAA,EAAoB,cAAc;AAE5E,eAAe,eAAA,GAAkB;AAC/B,EAAA,MAAM,4BAA4B,MAAME,mBAAA,CAAG,QAAA,CAAS,QAAA,CAAS,kBAAkB,OAAO,CAAA;AACtF,EAAA,MAAM,iBAAA,GAAoB,IAAA,CAAK,KAAA,CAAM,yBAAyB,CAAA;AAE9D,EAAA,MAAM,aAAa,iBAAA,CAAkB,OAAA;AAKrC,EAAA,UAAA,CAAW,WAAW,CAAA,CAAE,IAAA,GAAO,UAAA,CAAW,QAAQ,CAAA,CAAE,IAAA;AACpD,EAAA,UAAA,CAAW,QAAQ,CAAA,CAAE,OAAA,GAAU,UAAA,CAAW,WAAW,CAAA,CAAE,OAAA;AAGvD,EAAA,MAAM,EAAE,OAAA,EAAS,iBAAA,EAAmB,GAAG,yBAAA,EAA0B,GAAI,WAAW,QAAQ,CAAA;AACxF,EAAA,UAAA,CAAW,QAAQ,CAAA,GAAI,EAAE,OAAA,EAAS,iBAAA,EAAmB,GAAG,yBAAA,EAA0B;AAElF,EAAA,MAAM,gCAAA,GAAmC,IAAA,CAAK,SAAA,CAAU,iBAAA,EAAmB,MAAM,CAAC,CAAA;AAClF,EAAA,MAAMA,mBAAA,CAAG,QAAA,CAAS,SAAA,CAAU,gBAAA,EAAkB,gCAAgC,CAAA;AAChF;AAEA,eAAe,WAAA,GAAc;AAC3B,EAAA,MAAM,eAAA,EAAgB;AACxB;AAEO,IAAM,qBAAqB,WAAA","file":"postinstall.js","sourcesContent":["import { Override } from '@zimic/utils/types';\nimport fs from 'fs';\nimport type mswPackage from 'msw/package.json';\nimport path from 'path';\n\nexport type MSWPackage = typeof mswPackage;\nexport type MSWExports = MSWPackage['exports'];\n\nexport const MSW_ROOT_DIRECTORY = path.join(require.resolve('msw'), '..', '..', '..');\nexport const MSW_PACKAGE_PATH = path.join(MSW_ROOT_DIRECTORY, 'package.json');\n\nasync function patchMSWExports() {\n  const mswPackageContentAsString = await fs.promises.readFile(MSW_PACKAGE_PATH, 'utf-8');\n  const mswPackageContent = JSON.parse(mswPackageContentAsString) as MSWPackage;\n\n  const mswExports = mswPackageContent.exports as {\n    './browser': Override<MSWExports['./browser'], { node: MSWExports['./node']['node'] | string | null }>;\n    './node': Override<MSWExports['./node'], { browser: MSWExports['./browser']['browser'] | string | null }>;\n  };\n\n  mswExports['./browser'].node = mswExports['./node'].node;\n  mswExports['./node'].browser = mswExports['./browser'].browser;\n\n  // To avoid issues with export condition ordering, the browser export must be defined before the node export.\n  const { browser: browserNodeExport, ...nodeExportsWithoutBrowser } = mswExports['./node'];\n  mswExports['./node'] = { browser: browserNodeExport, ...nodeExportsWithoutBrowser };\n\n  const patchedMSWPackageContentAsString = JSON.stringify(mswPackageContent, null, 2);\n  await fs.promises.writeFile(MSW_PACKAGE_PATH, patchedMSWPackageContentAsString);\n}\n\nasync function postinstall() {\n  await patchMSWExports();\n}\n\nexport const postinstallPromise = postinstall();\n"]}

package/dist/scripts/postinstall.mjs

@@ -4,67 +4,22 @@ import path from 'path';
 
 var MSW_ROOT_DIRECTORY = path.join(__require.resolve("msw"), "..", "..", "..");
 var MSW_PACKAGE_PATH = path.join(MSW_ROOT_DIRECTORY, "package.json");
-var MSW_CORE_DIRECTORY = path.join(MSW_ROOT_DIRECTORY, "lib", "core");
 async function patchMSWExports() {
   const mswPackageContentAsString = await fs.promises.readFile(MSW_PACKAGE_PATH, "utf-8");
   const mswPackageContent = JSON.parse(mswPackageContentAsString);
-  const browserExports = mswPackageContent.exports["./browser"];
-  const nodeExports = mswPackageContent.exports["./node"];
-  browserExports.node = nodeExports.node;
-  nodeExports.browser = browserExports.browser;
+  const mswExports = mswPackageContent.exports;
+  mswExports["./browser"].node = mswExports["./node"].node;
+  mswExports["./node"].browser = mswExports["./browser"].browser;
+  const { browser: browserNodeExport, ...nodeExportsWithoutBrowser } = mswExports["./node"];
+  mswExports["./node"] = { browser: browserNodeExport, ...nodeExportsWithoutBrowser };
   const patchedMSWPackageContentAsString = JSON.stringify(mswPackageContent, null, 2);
   await fs.promises.writeFile(MSW_PACKAGE_PATH, patchedMSWPackageContentAsString);
 }
-async function patchMSWWebSocketBroadcastChannel() {
-  await Promise.all(
-    ["ws.js", "ws.mjs"].map(async (webSocketFileName) => {
-      const mswWebSocketPath = path.join(MSW_CORE_DIRECTORY, webSocketFileName);
-      const mswWebSocketContent = await fs.promises.readFile(mswWebSocketPath, "utf-8");
-      const patchedMSWWebSocketContent = mswWebSocketContent.replace(
-        [
-          'const webSocketChannel = new BroadcastChannel("msw:websocket-client-manager");',
-          "if (isBroadcastChannelWithUnref(webSocketChannel)) {",
-          "  webSocketChannel.unref();",
-          "}"
-        ].join("\n"),
-        "let webSocketChannel;"
-      ).replace(
-        [
-          "  );",
-          "  const clientManager = new import_WebSocketClientManager.WebSocketClientManager(webSocketChannel);"
-        ].join("\n"),
-        [
-          "  );",
-          "  if (!webSocketChannel) {",
-          '    webSocketChannel = new BroadcastChannel("msw:websocket-client-manager");',
-          "    if (isBroadcastChannelWithUnref(webSocketChannel)) {",
-          "      webSocketChannel.unref();",
-          "    }",
-          "  }",
-          "  const clientManager = new import_WebSocketClientManager.WebSocketClientManager(webSocketChannel);"
-        ].join("\n")
-      ).replace(
-        ["  );", "  const clientManager = new WebSocketClientManager(webSocketChannel);"].join("\n"),
-        [
-          "  );",
-          "  if (!webSocketChannel) {",
-          '    webSocketChannel = new BroadcastChannel("msw:websocket-client-manager");',
-          "    if (isBroadcastChannelWithUnref(webSocketChannel)) {",
-          "      webSocketChannel.unref();",
-          "    }",
-          "  }",
-          "  const clientManager = new WebSocketClientManager(webSocketChannel);"
-        ].join("\n")
-      );
-      await fs.promises.writeFile(mswWebSocketPath, patchedMSWWebSocketContent);
-    })
-  );
-}
 async function postinstall() {
-  await Promise.all([patchMSWExports(), patchMSWWebSocketBroadcastChannel()]);
+  await patchMSWExports();
 }
 var postinstallPromise = postinstall();
 
-export { MSW_CORE_DIRECTORY, MSW_PACKAGE_PATH, MSW_ROOT_DIRECTORY, postinstallPromise };
+export { MSW_PACKAGE_PATH, MSW_ROOT_DIRECTORY, postinstallPromise };
 //# sourceMappingURL=postinstall.mjs.map
 //# sourceMappingURL=postinstall.mjs.map

package/dist/scripts/postinstall.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../scripts/postinstall.ts"],"names":[],"mappings":";;;;AAQO,IAAM,kBAAA,GAAqB,KAAK,IAAA,CAAK,SAAA,CAAQ,QAAQ,KAAK,CAAA,EAAG,IAAA,EAAM,IAAA,EAAM,IAAI;AAE7E,IAAM,gBAAA,GAAmB,IAAA,CAAK,IAAA,CAAK,kBAAA,EAAoB,cAAc;AAErE,IAAM,kBAAA,GAAqB,IAAA,CAAK,IAAA,CAAK,kBAAA,EAAoB,OAAO,MAAM;AAE7E,eAAe,eAAA,GAAkB;AAC/B,EAAA,MAAM,4BAA4B,MAAM,EAAA,CAAG,QAAA,CAAS,QAAA,CAAS,kBAAkB,OAAO,CAAA;AACtF,EAAA,MAAM,iBAAA,GAAoB,IAAA,CAAK,KAAA,CAAM,yBAAyB,CAAA;AAE9D,EAAA,MAAM,cAAA,GAAiB,iBAAA,CAAkB,OAAA,CAAQ,WAAW,CAAA;AAK5D,EAAA,MAAM,WAAA,GAAc,iBAAA,CAAkB,OAAA,CAAQ,QAAQ,CAAA;AAKtD,EAAA,cAAA,CAAe,OAAO,WAAA,CAAY,IAAA;AAClC,EAAA,WAAA,CAAY,UAAU,cAAA,CAAe,OAAA;AAErC,EAAA,MAAM,gCAAA,GAAmC,IAAA,CAAK,SAAA,CAAU,iBAAA,EAAmB,MAAM,CAAC,CAAA;AAClF,EAAA,MAAM,EAAA,CAAG,QAAA,CAAS,SAAA,CAAU,gBAAA,EAAkB,gCAAgC,CAAA;AAChF;AAGA,eAAe,iCAAA,GAAoC;AACjD,EAAA,MAAM,OAAA,CAAQ,GAAA;AAAA,IACZ,CAAC,OAAA,EAAS,QAAQ,CAAA,CAAE,GAAA,CAAI,OAAO,iBAAA,KAAsB;AACnD,MAAA,MAAM,gBAAA,GAAmB,IAAA,CAAK,IAAA,CAAK,kBAAA,EAAoB,iBAAiB,CAAA;AACxE,MAAA,MAAM,sBAAsB,MAAM,EAAA,CAAG,QAAA,CAAS,QAAA,CAAS,kBAAkB,OAAO,CAAA;AAEhF,MAAA,MAAM,6BAA6B,mBAAA,CAChC,OAAA;AAAA,QACC;AAAA,UACE,gFAAA;AAAA,UACA,sDAAA;AAAA,UACA,6BAAA;AAAA,UACA;AAAA,SACF,CAAE,KAAK,IAAI,CAAA;AAAA,QACX;AAAA,OACF,CACC,OAAA;AAAA,QACC;AAAA,UACE,MAAA;AAAA,UACA;AAAA,SACF,CAAE,KAAK,IAAI,CAAA;AAAA,QACX;AAAA,UACE,MAAA;AAAA,UACA,4BAAA;AAAA,UACA,8EAAA;AAAA,UACA,0DAAA;AAAA,UACA,iCAAA;AAAA,UACA,OAAA;AAAA,UACA,KAAA;AAAA,UACA;AAAA,SACF,CAAE,KAAK,IAAI;AAAA,OACb,CACC,OAAA;AAAA,QACC,CAAC,MAAA,EAAQ,uEAAuE,CAAA,CAAE,KAAK,IAAI,CAAA;AAAA,QAC3F;AAAA,UACE,MAAA;AAAA,UACA,4BAAA;AAAA,UACA,8EAAA;AAAA,UACA,0DAAA;AAAA,UACA,iCAAA;AAAA,UACA,OAAA;AAAA,UACA,KAAA;AAAA,UACA;AAAA,SACF,CAAE,KAAK,IAAI;AAAA,OACb;AAEF,MAAA,MAAM,EAAA,CAAG,QAAA,CAAS,SAAA,CAAU,gBAAA,EAAkB,0BAA0B,CAAA;AAAA,IAC1E,CAAC;AAAA,GACH;AACF;AAEA,eAAe,WAAA,GAAc;AAC3B,EAAA,MAAM,QAAQ,GAAA,CAAI,CAAC,iBAAgB,EAAG,iCAAA,EAAmC,CAAC,CAAA;AAC5E;AAEO,IAAM,qBAAqB,WAAA","file":"postinstall.mjs","sourcesContent":["import { Override } from '@zimic/utils/types';\nimport fs from 'fs';\nimport type mswPackage from 'msw/package.json';\nimport path from 'path';\n\nexport type MSWPackage = typeof mswPackage;\nexport type MSWExports = MSWPackage['exports'];\n\nexport const MSW_ROOT_DIRECTORY = path.join(require.resolve('msw'), '..', '..', '..');\n\nexport const MSW_PACKAGE_PATH = path.join(MSW_ROOT_DIRECTORY, 'package.json');\n\nexport const MSW_CORE_DIRECTORY = path.join(MSW_ROOT_DIRECTORY, 'lib', 'core');\n\nasync function patchMSWExports() {\n  const mswPackageContentAsString = await fs.promises.readFile(MSW_PACKAGE_PATH, 'utf-8');\n  const mswPackageContent = JSON.parse(mswPackageContentAsString) as MSWPackage;\n\n  const browserExports = mswPackageContent.exports['./browser'] as Override<\n    MSWExports['./browser'],\n    { node: MSWExports['./node']['node'] | string | null }\n  >;\n\n  const nodeExports = mswPackageContent.exports['./node'] as Override<\n    MSWExports['./node'],\n    { browser: MSWExports['./browser']['browser'] | string | null }\n  >;\n\n  browserExports.node = nodeExports.node;\n  nodeExports.browser = browserExports.browser;\n\n  const patchedMSWPackageContentAsString = JSON.stringify(mswPackageContent, null, 2);\n  await fs.promises.writeFile(MSW_PACKAGE_PATH, patchedMSWPackageContentAsString);\n}\n\n// This is a temporary workaround. Once https://github.com/stackblitz/core/issues/3323 is fixed, we should remove it.\nasync function patchMSWWebSocketBroadcastChannel() {\n  await Promise.all(\n    ['ws.js', 'ws.mjs'].map(async (webSocketFileName) => {\n      const mswWebSocketPath = path.join(MSW_CORE_DIRECTORY, webSocketFileName);\n      const mswWebSocketContent = await fs.promises.readFile(mswWebSocketPath, 'utf-8');\n\n      const patchedMSWWebSocketContent = mswWebSocketContent\n        .replace(\n          [\n            'const webSocketChannel = new BroadcastChannel(\"msw:websocket-client-manager\");',\n            'if (isBroadcastChannelWithUnref(webSocketChannel)) {',\n            '  webSocketChannel.unref();',\n            '}',\n          ].join('\\n'),\n          'let webSocketChannel;',\n        )\n        .replace(\n          [\n            '  );',\n            '  const clientManager = new import_WebSocketClientManager.WebSocketClientManager(webSocketChannel);',\n          ].join('\\n'),\n          [\n            '  );',\n            '  if (!webSocketChannel) {',\n            '    webSocketChannel = new BroadcastChannel(\"msw:websocket-client-manager\");',\n            '    if (isBroadcastChannelWithUnref(webSocketChannel)) {',\n            '      webSocketChannel.unref();',\n            '    }',\n            '  }',\n            '  const clientManager = new import_WebSocketClientManager.WebSocketClientManager(webSocketChannel);',\n          ].join('\\n'),\n        )\n        .replace(\n          ['  );', '  const clientManager = new WebSocketClientManager(webSocketChannel);'].join('\\n'),\n          [\n            '  );',\n            '  if (!webSocketChannel) {',\n            '    webSocketChannel = new BroadcastChannel(\"msw:websocket-client-manager\");',\n            '    if (isBroadcastChannelWithUnref(webSocketChannel)) {',\n            '      webSocketChannel.unref();',\n            '    }',\n            '  }',\n            '  const clientManager = new WebSocketClientManager(webSocketChannel);',\n          ].join('\\n'),\n        );\n\n      await fs.promises.writeFile(mswWebSocketPath, patchedMSWWebSocketContent);\n    }),\n  );\n}\n\nasync function postinstall() {\n  await Promise.all([patchMSWExports(), patchMSWWebSocketBroadcastChannel()]);\n}\n\nexport const postinstallPromise = postinstall();\n"]}
+{"version":3,"sources":["../../scripts/postinstall.ts"],"names":[],"mappings":";;;;AAQO,IAAM,kBAAA,GAAqB,KAAK,IAAA,CAAK,SAAA,CAAQ,QAAQ,KAAK,CAAA,EAAG,IAAA,EAAM,IAAA,EAAM,IAAI;AAC7E,IAAM,gBAAA,GAAmB,IAAA,CAAK,IAAA,CAAK,kBAAA,EAAoB,cAAc;AAE5E,eAAe,eAAA,GAAkB;AAC/B,EAAA,MAAM,4BAA4B,MAAM,EAAA,CAAG,QAAA,CAAS,QAAA,CAAS,kBAAkB,OAAO,CAAA;AACtF,EAAA,MAAM,iBAAA,GAAoB,IAAA,CAAK,KAAA,CAAM,yBAAyB,CAAA;AAE9D,EAAA,MAAM,aAAa,iBAAA,CAAkB,OAAA;AAKrC,EAAA,UAAA,CAAW,WAAW,CAAA,CAAE,IAAA,GAAO,UAAA,CAAW,QAAQ,CAAA,CAAE,IAAA;AACpD,EAAA,UAAA,CAAW,QAAQ,CAAA,CAAE,OAAA,GAAU,UAAA,CAAW,WAAW,CAAA,CAAE,OAAA;AAGvD,EAAA,MAAM,EAAE,OAAA,EAAS,iBAAA,EAAmB,GAAG,yBAAA,EAA0B,GAAI,WAAW,QAAQ,CAAA;AACxF,EAAA,UAAA,CAAW,QAAQ,CAAA,GAAI,EAAE,OAAA,EAAS,iBAAA,EAAmB,GAAG,yBAAA,EAA0B;AAElF,EAAA,MAAM,gCAAA,GAAmC,IAAA,CAAK,SAAA,CAAU,iBAAA,EAAmB,MAAM,CAAC,CAAA;AAClF,EAAA,MAAM,EAAA,CAAG,QAAA,CAAS,SAAA,CAAU,gBAAA,EAAkB,gCAAgC,CAAA;AAChF;AAEA,eAAe,WAAA,GAAc;AAC3B,EAAA,MAAM,eAAA,EAAgB;AACxB;AAEO,IAAM,qBAAqB,WAAA","file":"postinstall.mjs","sourcesContent":["import { Override } from '@zimic/utils/types';\nimport fs from 'fs';\nimport type mswPackage from 'msw/package.json';\nimport path from 'path';\n\nexport type MSWPackage = typeof mswPackage;\nexport type MSWExports = MSWPackage['exports'];\n\nexport const MSW_ROOT_DIRECTORY = path.join(require.resolve('msw'), '..', '..', '..');\nexport const MSW_PACKAGE_PATH = path.join(MSW_ROOT_DIRECTORY, 'package.json');\n\nasync function patchMSWExports() {\n  const mswPackageContentAsString = await fs.promises.readFile(MSW_PACKAGE_PATH, 'utf-8');\n  const mswPackageContent = JSON.parse(mswPackageContentAsString) as MSWPackage;\n\n  const mswExports = mswPackageContent.exports as {\n    './browser': Override<MSWExports['./browser'], { node: MSWExports['./node']['node'] | string | null }>;\n    './node': Override<MSWExports['./node'], { browser: MSWExports['./browser']['browser'] | string | null }>;\n  };\n\n  mswExports['./browser'].node = mswExports['./node'].node;\n  mswExports['./node'].browser = mswExports['./browser'].browser;\n\n  // To avoid issues with export condition ordering, the browser export must be defined before the node export.\n  const { browser: browserNodeExport, ...nodeExportsWithoutBrowser } = mswExports['./node'];\n  mswExports['./node'] = { browser: browserNodeExport, ...nodeExportsWithoutBrowser };\n\n  const patchedMSWPackageContentAsString = JSON.stringify(mswPackageContent, null, 2);\n  await fs.promises.writeFile(MSW_PACKAGE_PATH, patchedMSWPackageContentAsString);\n}\n\nasync function postinstall() {\n  await patchMSWExports();\n}\n\nexport const postinstallPromise = postinstall();\n"]}

package/dist/server.js

@@ -1,29 +1,29 @@
 'use strict';
 
-var chunk2YIGHTHM_js = require('./chunk-2YIGHTHM.js');
+var chunkSNMNOHD6_js = require('./chunk-SNMNOHD6.js');
 require('./chunk-DGUM43GV.js');
 
 
 
 Object.defineProperty(exports, "DEFAULT_ACCESS_CONTROL_HEADERS", {
   enumerable: true,
-  get: function () { return chunk2YIGHTHM_js.DEFAULT_ACCESS_CONTROL_HEADERS; }
+  get: function () { return chunkSNMNOHD6_js.DEFAULT_ACCESS_CONTROL_HEADERS; }
 });
 Object.defineProperty(exports, "DEFAULT_PREFLIGHT_STATUS_CODE", {
   enumerable: true,
-  get: function () { return chunk2YIGHTHM_js.DEFAULT_PREFLIGHT_STATUS_CODE; }
+  get: function () { return chunkSNMNOHD6_js.DEFAULT_PREFLIGHT_STATUS_CODE; }
 });
 Object.defineProperty(exports, "NotRunningInterceptorServerError", {
   enumerable: true,
-  get: function () { return chunk2YIGHTHM_js.NotRunningInterceptorServerError_default; }
+  get: function () { return chunkSNMNOHD6_js.NotRunningInterceptorServerError_default; }
 });
 Object.defineProperty(exports, "RunningInterceptorServerError", {
   enumerable: true,
-  get: function () { return chunk2YIGHTHM_js.RunningInterceptorServerError_default; }
+  get: function () { return chunkSNMNOHD6_js.RunningInterceptorServerError_default; }
 });
 Object.defineProperty(exports, "createInterceptorServer", {
   enumerable: true,
-  get: function () { return chunk2YIGHTHM_js.createInterceptorServer; }
+  get: function () { return chunkSNMNOHD6_js.createInterceptorServer; }
 });
 //# sourceMappingURL=server.js.map
 //# sourceMappingURL=server.js.map

package/dist/server.mjs

@@ -1,4 +1,4 @@
-export { DEFAULT_ACCESS_CONTROL_HEADERS, DEFAULT_PREFLIGHT_STATUS_CODE, NotRunningInterceptorServerError_default as NotRunningInterceptorServerError, RunningInterceptorServerError_default as RunningInterceptorServerError, createInterceptorServer } from './chunk-4XT4ZOJ2.mjs';
+export { DEFAULT_ACCESS_CONTROL_HEADERS, DEFAULT_PREFLIGHT_STATUS_CODE, NotRunningInterceptorServerError_default as NotRunningInterceptorServerError, RunningInterceptorServerError_default as RunningInterceptorServerError, createInterceptorServer } from './chunk-WG7EXKWT.mjs';
 import './chunk-BJTO5JO5.mjs';
 //# sourceMappingURL=server.mjs.map
 //# sourceMappingURL=server.mjs.map

package/package.json

@@ -14,7 +14,7 @@
     "api",
     "static"
   ],
-  "version": "1.3.6-canary.2",
+  "version": "1.3.6-canary.4",
   "homepage": "https://zimic.dev/docs/interceptor",
   "repository": {
     "type": "git",
@@ -97,7 +97,7 @@
   "dependencies": {
     "@whatwg-node/server": "0.10.18",
     "isomorphic-ws": "5.0.0",
-    "msw": "2.11.1",
+    "msw": "2.13.4",
     "picocolors": "^1.1.1",
     "ws": "8.20.0",
     "yargs": "18.0.0",
@@ -119,7 +119,7 @@
     "eslint": "^9.39.4",
     "playwright": "^1.59.1",
     "tsup": "^8.5.1",
-    "typescript": "6.0.2",
+    "typescript": "6.0.3",
     "vitest": "^4.1.4"
   },
   "peerDependencies": {

package/src/http/interceptor/HttpInterceptorStore.ts

@@ -75,6 +75,7 @@ class HttpInterceptorStore {
 
   getOrCreateLocalWorker(workerOptions: Omit<LocalHttpInterceptorWorkerOptions, 'type'>) {
     const existingWorker = this.class._localWorker;
+
     if (existingWorker) {
       return existingWorker;
     }

package/src/http/interceptor/LocalHttpInterceptor.ts

@@ -18,12 +18,8 @@ class LocalHttpInterceptor<Schema extends HttpSchema> implements PublicLocalHttp
     this.implementation = new HttpInterceptorImplementation<Schema, typeof LocalHttpRequestHandler>({
       store: this.store,
       baseURL,
-      createWorker: () => {
-        return this.store.getOrCreateLocalWorker({});
-      },
-      deleteWorker: () => {
-        this.store.deleteLocalWorker();
-      },
+      createWorker: () => this.store.getOrCreateLocalWorker({}),
+      deleteWorker: () => this.store.deleteLocalWorker(),
       Handler: LocalHttpRequestHandler,
       onUnhandledRequest: options.onUnhandledRequest,
       requestSaving: options.requestSaving,

package/src/http/interceptorWorker/HttpInterceptorWorker.ts

@@ -87,12 +87,16 @@ abstract class HttpInterceptorWorker {
     if (!this.isRunning) {
       return;
     }
+
     if (this.stoppingPromise) {
       return this.stoppingPromise;
     }
 
     const stoppingResult = internalStop();
 
+    /* istanbul ignore next -- @preserve
+     * This if statement only runs if concurrent calls to stop() are made, which is an edge case that is hard to
+     * reliably reproduce in tests. */
     if (stoppingResult instanceof Promise) {
       this.stoppingPromise = stoppingResult;
       await this.stoppingPromise;

package/src/http/interceptorWorker/LocalHttpInterceptorWorker.ts

@@ -1,8 +1,7 @@
 import { HttpRequest, HttpResponse, HttpMethod, HttpSchema, HttpHeadersInit, HttpBody } from '@zimic/http';
+import { createCachedDynamicImport } from '@zimic/utils/import';
 import { createRegexFromPath, excludeNonPathParams, validatePathParams } from '@zimic/utils/url';
 import { SharedOptions as MSWWorkerSharedOptions, bypass, http, passthrough } from 'msw';
-import * as mswBrowser from 'msw/browser';
-import * as mswNode from 'msw/node';
 
 import { removeArrayIndex } from '@/utils/arrays';
 import { isClientSide, isServerSide } from '@/utils/environment';
@@ -16,9 +15,12 @@ import { UnhandledRequestStrategy } from '../interceptor/types/options';
 import UnregisteredBrowserServiceWorkerError from './errors/UnregisteredBrowserServiceWorkerError';
 import HttpInterceptorWorker from './HttpInterceptorWorker';
 import { HttpResponseFactory, HttpResponseFactoryContext } from './types/http';
-import { BrowserMSWWorker, MSWWorker, NodeMSWWorker } from './types/msw';
+import { BrowserMSWWorker, MSWHttpHandler, MSWWorker, NodeMSWWorker } from './types/msw';
 import { LocalHttpInterceptorWorkerOptions } from './types/options';
 
+const importMSWNode = createCachedDynamicImport(() => import('msw/node'));
+const importMSWBrowser = createCachedDynamicImport(() => import('msw/browser'));
+
 interface HttpHandler {
   baseURL: string;
   method: HttpMethod;
@@ -28,7 +30,12 @@ interface HttpHandler {
 }
 
 class LocalHttpInterceptorWorker extends HttpInterceptorWorker {
-  private internalWorker?: MSWWorker;
+  // Re-creating MSW workers may cause issues, so we should keep a single worker instance, even if all interceptor
+  // workers are stopped. See https://github.com/mswjs/msw/issues/2597.
+  private static mswWorker?: MSWWorker;
+  static isMSWWorkerRunning = false;
+
+  private mswHttpHandler?: MSWHttpHandler;
 
   private httpHandlersByMethod: {
     [Method in HttpMethod]: HttpHandler[];
@@ -46,38 +53,50 @@ class LocalHttpInterceptorWorker extends HttpInterceptorWorker {
     super();
   }
 
+  get class() {
+    return LocalHttpInterceptorWorker;
+  }
+
   get type() {
     return 'local' as const;
   }
 
-  get internalWorkerOrThrow() {
+  get mswWorkerOrThrow() {
     /* istanbul ignore if -- @preserve
      * Trying to access the internal worker when it does not exist should not happen. */
-    if (!this.internalWorker) {
+    if (!this.class.mswWorker) {
       throw new NotRunningHttpInterceptorError();
     }
-    return this.internalWorker;
+    return this.class.mswWorker;
   }
 
-  get internalWorkerOrCreate() {
-    this.internalWorker ??= this.createInternalWorker();
-    return this.internalWorker;
+  async getMSWWorkerOrCreate() {
+    this.class.mswWorker ??= await this.createMSWWorker();
+    return this.class.mswWorker;
   }
 
-  private createInternalWorker() {
-    const mswHttpHandler = http.all('*', async (context) => {
-      const request = context.request satisfies Request as HttpRequest;
-      const response = await this.createResponseForRequest(request);
-      return response;
-    });
+  private async createMSWWorker() {
+    if (isServerSide()) {
+      const mswNode = await importMSWNode();
 
-    if (isServerSide() && 'setupServer' in mswNode) {
-      return mswNode.setupServer(mswHttpHandler);
+      /* istanbul ignore else -- @preserve
+       * We still check if we actually imported the server module in case our `isServerSide()` check returns true, but
+       * the environment actually resolves the browser module. */
+      if ('setupServer' in mswNode) {
+        return mswNode.setupServer();
+      }
     }
 
     /* istanbul ignore else -- @preserve */
-    if (isClientSide() && 'setupWorker' in mswBrowser) {
-      return mswBrowser.setupWorker(mswHttpHandler);
+    if (isClientSide()) {
+      const mswBrowser = await importMSWBrowser();
+
+      /* istanbul ignore else -- @preserve
+       * We still check if we actually imported the browser module in case our `isClientSide()` check returns true, but
+       * the environment actually resolves the server module. */
+      if ('setupWorker' in mswBrowser) {
+        return mswBrowser.setupWorker();
+      }
     }
 
     /* istanbul ignore next -- @preserve
@@ -87,65 +106,85 @@ class LocalHttpInterceptorWorker extends HttpInterceptorWorker {
 
   async start() {
     await super.sharedStart(async () => {
-      const internalWorker = this.internalWorkerOrCreate;
+      const mswWorker = await this.getMSWWorkerOrCreate();
 
       const sharedOptions: MSWWorkerSharedOptions = {
         onUnhandledRequest: 'bypass',
       };
 
-      if (this.isInternalBrowserWorker(internalWorker)) {
+      this.mswHttpHandler = http.all('*', async (context) => {
+        const request = context.request satisfies Request as HttpRequest;
+        const response = await this.createResponseForRequest(request);
+        return response;
+      });
+
+      mswWorker.use(this.mswHttpHandler);
+
+      if (this.isInternalBrowserWorker(mswWorker)) {
         this.platform = 'browser';
-        await this.startInBrowser(internalWorker, sharedOptions);
+
+        // Even after https://github.com/mswjs/msw/issues/2714 was fixed, there are collateral effects preventing us
+        // from restarting the global browser worker even if unused. Restarting it causes interception issues in MSW.
+        if (!this.class.isMSWWorkerRunning) {
+          await this.startInBrowser(mswWorker, sharedOptions);
+          this.class.isMSWWorkerRunning = true;
+        }
       } else {
         this.platform = 'node';
-        this.startInNode(internalWorker, sharedOptions);
+        this.startInNode(mswWorker, sharedOptions);
+        this.class.isMSWWorkerRunning = true;
       }
 
       this.isRunning = true;
     });
   }
 
-  private async startInBrowser(internalWorker: BrowserMSWWorker, sharedOptions: MSWWorkerSharedOptions) {
+  private async startInBrowser(mswWorker: BrowserMSWWorker, sharedOptions: MSWWorkerSharedOptions) {
     try {
-      await internalWorker.start({ ...sharedOptions, quiet: true });
+      await mswWorker.start({ ...sharedOptions, quiet: true });
     } catch (error) {
       this.handleBrowserWorkerStartError(error);
     }
   }
 
   private handleBrowserWorkerStartError(error: unknown) {
+    /* istanbul ignore else -- @preserve
+     * Since we start the internal worker once and do not stop it, tests may not be able exercise this branch. */
     if (UnregisteredBrowserServiceWorkerError.matchesRawError(error)) {
       throw new UnregisteredBrowserServiceWorkerError();
+    } else {
+      throw error;
     }
-    throw error;
   }
 
-  private startInNode(internalWorker: NodeMSWWorker, sharedOptions: MSWWorkerSharedOptions) {
-    internalWorker.listen(sharedOptions);
+  private startInNode(mswWorker: NodeMSWWorker, sharedOptions: MSWWorkerSharedOptions) {
+    mswWorker.listen(sharedOptions);
   }
 
   async stop() {
-    await super.sharedStop(() => {
-      const internalWorker = this.internalWorkerOrCreate;
+    await super.sharedStop(async () => {
+      const mswWorker = await this.getMSWWorkerOrCreate();
+
+      this.clearHandlers();
+
+      const newMSWHandlers = mswWorker.listHandlers().filter((handler) => handler !== this.mswHttpHandler);
+      mswWorker.resetHandlers(...newMSWHandlers);
 
-      if (this.isInternalBrowserWorker(internalWorker)) {
-        this.stopInBrowser(internalWorker);
+      if (this.isInternalBrowserWorker(mswWorker)) {
+        // Even after https://github.com/mswjs/msw/issues/2714 was fixed, restarting browser workers causes interception
+        // issues, so we keep it running and just remove our handlers.
       } else {
-        this.stopInNode(internalWorker);
+        this.stopInNode(mswWorker);
+        this.class.isMSWWorkerRunning = false;
       }
-      this.clearHandlers();
 
-      this.internalWorker = undefined;
+      this.mswHttpHandler = undefined;
       this.isRunning = false;
     });
   }
 
-  private stopInBrowser(internalWorker: BrowserMSWWorker) {
-    internalWorker.stop();
-  }
-
-  private stopInNode(internalWorker: NodeMSWWorker) {
-    internalWorker.close();
+  private stopInNode(mswWorker: NodeMSWWorker) {
+    mswWorker.close();
   }
 
   private isInternalBrowserWorker(worker: MSWWorker) {
@@ -153,7 +192,7 @@ class LocalHttpInterceptorWorker extends HttpInterceptorWorker {
   }
 
   hasInternalBrowserWorker() {
-    return this.isInternalBrowserWorker(this.internalWorkerOrThrow);
+    return this.isInternalBrowserWorker(this.mswWorkerOrThrow);
   }
 
   hasInternalNodeWorker() {

package/src/http/interceptorWorker/types/msw.ts

@@ -1,7 +1,7 @@
-import type { HttpHandler as MSWHandler } from 'msw';
+import type { HttpHandler as MSWHttpHandler } from 'msw';
 import type { SetupWorker as BrowserMSWWorker } from 'msw/browser';
 import type { SetupServer as NodeMSWWorker } from 'msw/node';
 
-export type { MSWHandler, NodeMSWWorker, BrowserMSWWorker };
+export type { MSWHttpHandler, NodeMSWWorker, BrowserMSWWorker };
 
 export type MSWWorker = NodeMSWWorker | BrowserMSWWorker;