Add support for parsing import assertions & attributes to rsc & clien…

…t loaders
unstubbable · May 14, 2024 · faf0e5d · faf0e5d
1 parent f119bef
commit faf0e5d
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 0 deletions.
diff --git a/.changeset/soft-garlics-do.md b/.changeset/soft-garlics-do.md
@@ -0,0 +1,5 @@
+---
+'@mfng/webpack-rsc': minor
+---
+
+Add support for parsing import assertions & attributes to rsc & client loaders
diff --git a/packages/webpack-rsc/src/webpack-rsc-client-loader.cts b/packages/webpack-rsc/src/webpack-rsc-client-loader.cts
@@ -32,6 +32,7 @@ function webpackRscClientLoader(
   const ast = parser.parse(source, {
     sourceType: `module`,
     sourceFilename: resourcePath,
+    plugins: [`importAssertions`],
   });
 
   let hasUseServerDirective = false;

diff --git a/packages/webpack-rsc/src/webpack-rsc-client-loader.test.ts b/packages/webpack-rsc/src/webpack-rsc-client-loader.test.ts
@@ -133,4 +133,32 @@ export const foo = createServerReference("test#foo", callServer);
 
     expect(output).toEqual(source);
   });
+
+  test(`can parse import assertions`, async () => {
+    const resourcePath = path.resolve(
+      currentDirname,
+      `__fixtures__/import-assertions.js`,
+    );
+
+    const serverReferencesMap = new Map();
+    const output = await callLoader(resourcePath, {serverReferencesMap});
+
+    expect(output.toString().trim()).toEqual(
+      `await import('./foo.json', {assert: {type: 'json'}});`,
+    );
+  });
+
+  test(`can parse import attributes`, async () => {
+    const resourcePath = path.resolve(
+      currentDirname,
+      `__fixtures__/import-attributes.js`,
+    );
+
+    const serverReferencesMap = new Map();
+    const output = await callLoader(resourcePath, {serverReferencesMap});
+
+    expect(output.toString().trim()).toEqual(
+      `await import('./foo.json', {with: {type: 'json'}});`,
+    );
+  });
 });
diff --git a/packages/webpack-rsc/src/webpack-rsc-server-loader.cts b/packages/webpack-rsc/src/webpack-rsc-server-loader.cts
@@ -50,6 +50,7 @@ const webpackRscServerLoader: webpack.LoaderDefinitionFunction<webpackRscServerL
     const ast = parser.parse(source, {
       sourceType: `module`,
       sourceFilename: resourcePath,
+      plugins: [`importAssertions`],
     });
 
     let moduleDirective: 'use client' | 'use server' | undefined;

diff --git a/packages/webpack-rsc/src/webpack-rsc-server-loader.test.ts b/packages/webpack-rsc/src/webpack-rsc-server-loader.test.ts
@@ -211,4 +211,30 @@ export { qux };
 
     expect(output).toEqual(source);
   });
+
+  test(`can parse import assertions`, async () => {
+    const resourcePath = path.resolve(
+      currentDirname,
+      `__fixtures__/import-assertions.js`,
+    );
+
+    const output = await callLoader(resourcePath, new Map(), new Map());
+
+    expect(output.toString().trim()).toEqual(
+      `await import('./foo.json', {assert: {type: 'json'}});`,
+    );
+  });
+
+  test(`can parse import attributes`, async () => {
+    const resourcePath = path.resolve(
+      currentDirname,
+      `__fixtures__/import-attributes.js`,
+    );
+
+    const output = await callLoader(resourcePath, new Map(), new Map());
+
+    expect(output.toString().trim()).toEqual(
+      `await import('./foo.json', {with: {type: 'json'}});`,
+    );
+  });
 });