Merge pull request #242 from realrunner/bug/sourcemap-fixes-squashed

fix(dev): Preserve source maps in transformations
remix-pwa · Jul 20, 2024 · c6990c7 · c6990c7
2 parents 2f94e3c + 141e7ef
commit c6990c7
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 8 deletions.
diff --git a/packages/client/CHANGELOG.md b/packages/client/CHANGELOG.md
@@ -1,3 +1,10 @@
+## @remix-pwa/client 3.0.5 (2024-05-29)
+
+
+### Bug Fixes
+
+* **client:** added callback feature to installation prompt b17500a
+
 ## @remix-pwa/client 3.0.5-dev.1 (2024-05-29)
 
 

diff --git a/packages/client/package.json b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-pwa/client",
-  "version": "3.0.5-dev.1",
+  "version": "3.0.5",
   "description": "A set of utilities for client-side development to enhance the native feel of your Remix App",
   "repository": {
     "type": "git",

diff --git a/packages/dev/src/plugins/__test__/loader-plugin.test.ts b/packages/dev/src/plugins/__test__/loader-plugin.test.ts
@@ -71,7 +71,7 @@ describe('Remix PWA Vite Loader Plugin', () => {
 
       const transformed = plugin.transform(code, id);
 
-      expect(transformed).toBe(code);
+      expect(transformed).toBe(undefined);
     });
 
     test('should not transform target code when id does not match', () => {
@@ -80,7 +80,7 @@ describe('Remix PWA Vite Loader Plugin', () => {
 
       const transformed = plugin.transform(code, id);
 
-      expect(transformed).toBe(code);
+      expect(transformed).toBe(undefined);
     });
   });
 

diff --git a/packages/dev/src/plugins/__test__/virtual-sw-plugin.test.ts b/packages/dev/src/plugins/__test__/virtual-sw-plugin.test.ts
@@ -308,15 +308,17 @@ describe('Remix PWA Vite VirtualSW Plugin', () => {
          * This is a license comment
          */
         const a = 1;`;
-        expect((await plugin[0].transform(code)).trim()).toBe('const a = 1;');
+        const result = await plugin[0].transform(code);
+        expect(result.code.trim()).toBe('const a = 1;');
+        expect(result.map).toEqual({ mappings: '' });
 
         const code2 = `
 /**
  * @license MIT
  * This is a license comment
  */
 const a = 1;`;
-        expect((await plugin[0].transform(code2)).trimStart()).toBe(`/**
+        expect((await plugin[0].transform(code2)).code.trimStart()).toBe(`/**
  * @license MIT
  * This is a license comment
  */

diff --git a/packages/dev/src/plugins/loader.ts b/packages/dev/src/plugins/loader.ts
@@ -39,8 +39,6 @@ export function LoaderPlugin(ctx: PWAPluginContext): Plugin {
             .join('\n')
             .trim()
         );
-      } else {
-        return code;
       }
     },
   };

diff --git a/packages/dev/src/plugins/virtual-sw.ts b/packages/dev/src/plugins/virtual-sw.ts
@@ -127,10 +127,14 @@ export function VirtualSWPlugins(ctx: PWAPluginContext): Plugin[] {
         const regex = /\/\*\*[\s\S]*?\*\//g;
 
         const licenseComments = code.match(regex)?.filter(predicate => /@license/.test(predicate)) ?? [];
-        return code.replaceAll(regex, match => {
+        code = code.replaceAll(regex, match => {
           if (licenseComments?.includes(match)) return match;
           return '';
         });
+        return {
+          code,
+          map: { mappings: '' },
+        };
       },
     },
     {