Merge pull request #2580 from modernweb-dev/feat/remove-local-sw

feat: remove local sw.js
modernweb-dev · Dec 11, 2023 · 089dbc9 · 089dbc9
2 parents cdbc804 + 3ff231a
commit 089dbc9
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 295 deletions.
diff --git a/.changeset/sixty-cups-decide.md b/.changeset/sixty-cups-decide.md
@@ -0,0 +1,5 @@
+---
+"@web/mocks": minor
+---
+
+feat: remove local sw.js, use the service worker as exported by msw instead so the integrity checksums of the SW and browser code are always aligned
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/mocks/package.json b/packages/mocks/package.json
@@ -66,7 +66,7 @@
     "@web/storybook-prebuilt": "^0.1.37",
     "@web/storybook-utils": "^1.0.0",
     "lit": "^2.7.5 || ^3.0.0",
-    "msw": "2.0.10"
+    "msw": "^2.0.11"
   },
   "devDependencies": {
     "@web/dev-server": "^0.4.0",

diff --git a/packages/mocks/rollup-plugin.js b/packages/mocks/rollup-plugin.js
@@ -1,10 +1,10 @@
 // @ts-nocheck
 
 import fs from 'node:fs';
-import { fileURLToPath } from 'node:url';
+import { createRequire } from 'node:module';
 import path from 'node:path';
 
-const __dirname = fileURLToPath(new URL('.', import.meta.url));
+const require = createRequire(import.meta.url);
 
 export function mockRollupPlugin(
   { interceptor } = {
@@ -14,7 +14,7 @@ export function mockRollupPlugin(
   return {
     name: 'rollup-plugin-msw',
     writeBundle(opts) {
-      const serviceWorkerPath = path.resolve(__dirname, './sw.js');
+      const serviceWorkerPath = require.resolve('msw/mockServiceWorker.js');
       const sw = fs.readFileSync(serviceWorkerPath, 'utf8');
       const outPath = path.join(opts.dir, '__msw_sw__.js');
       fs.writeFileSync(outPath, sw);

diff --git a/packages/mocks/sw.js b/packages/mocks/sw.js
diff --git a/packages/mocks/wds-plugin.js b/packages/mocks/wds-plugin.js
@@ -1,8 +1,7 @@
+import { createRequire } from 'node:module';
 import { readFileSync } from 'node:fs';
-import { fileURLToPath } from 'node:url';
-import path from 'node:path';
 
-const __dirname = fileURLToPath(new URL('.', import.meta.url));
+const require = createRequire(import.meta.url);
 
 export function mockPlugin() {
   return {
@@ -12,7 +11,7 @@ export function mockPlugin() {
      */
     serve(context) {
       if (context.request.url === '/__msw_sw__.js') {
-        const serviceWorkerPath = path.resolve(__dirname, './sw.js');
+        const serviceWorkerPath = require.resolve('msw/mockServiceWorker.js');
         return readFileSync(serviceWorkerPath, 'utf8');
       }
     },