fix: dev imports

TanStack · Jan 7, 2025 · 497a83f · 497a83f
1 parent d37a786
commit 497a83f
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 691 deletions.
diff --git a/packages/directive-functions-plugin/src/compilers.ts b/packages/directive-functions-plugin/src/compilers.ts
@@ -44,7 +44,7 @@ export type CompileDirectivesOpts = ParseAstOptions & {
     directiveFnsById: Record<string, DirectiveFn>
   }) => string
   replacer: ReplacerFn
-  devSplitImporter: string
+  // devSplitImporter: string
 }
 
 export type ParseAstOptions = {
@@ -247,7 +247,7 @@ export function findDirectives(
     replacer?: ReplacerFn
     splitFunctionName?: string | null
     directiveSplitParam: string
-    devSplitImporter: string
+    // devSplitImporter: string
   },
 ) {
   const directiveFnsById: Record<string, DirectiveFn> = {}
@@ -481,10 +481,7 @@ export function findDirectives(
           : {}),
         ...(replacer.includes('$$splitImportFn$$')
           ? {
-              $$splitImportFn$$:
-                process.env.NODE_ENV === 'production'
-                  ? `(...args) => import(${JSON.stringify(splitFilename)}).then(module => module.default(...args))`
-                  : `(...args) => ${opts.devSplitImporter}(${JSON.stringify(splitFilename)}).then(module => module.default(...args))`,
+              $$splitImportFn$$: `(...args) => import(${JSON.stringify(splitFilename)}).then(module => module.default(...args))`,
             }
           : {}),
       })

diff --git a/packages/directive-functions-plugin/src/index.ts b/packages/directive-functions-plugin/src/index.ts
@@ -12,6 +12,7 @@ export type { DirectiveFn, CompileDirectivesOpts } from './compilers'
 export type DirectiveFunctionsViteOptions = Pick<
   CompileDirectivesOpts,
   'directive' | 'directiveLabel' | 'getRuntimeCode' | 'replacer'
+  // | 'devSplitImporter'
 >
 
 const createDirectiveRx = (directive: string) =>
@@ -48,7 +49,6 @@ export function TanStackDirectiveFunctionsPlugin(
         filename: id,
         // globalThis.app currently refers to Vinxi's app instance. In the future, it can just be the
         // vite dev server instance we get from Nitro.
-        devSplitImporter: `(globalThis.app.getRouter('server').internals.devServer.ssrLoadModule)`,
       })
 
       opts.onDirectiveFnsById?.(directiveFnsById)

diff --git a/packages/directive-functions-plugin/tests/compiler.test.ts b/packages/directive-functions-plugin/tests/compiler.test.ts
@@ -14,7 +14,7 @@ const clientConfig: Omit<CompileDirectivesOpts, 'code'> = {
     filename: ${JSON.stringify(opts.filename)},
     functionId: ${JSON.stringify(opts.functionId)},
   })`,
-  devSplitImporter: `devImport`,
+  // devSplitImporter: `devImport`,
 }
 
 const ssrConfig: Omit<CompileDirectivesOpts, 'code'> = {
@@ -28,7 +28,7 @@ const ssrConfig: Omit<CompileDirectivesOpts, 'code'> = {
     filename: ${JSON.stringify(opts.filename)},
     functionId: ${JSON.stringify(opts.functionId)},
   })`,
-  devSplitImporter: `devImport`,
+  // devSplitImporter: `devImport`,
 }
 
 const serverConfig: Omit<CompileDirectivesOpts, 'code'> = {
@@ -49,7 +49,7 @@ const serverConfig: Omit<CompileDirectivesOpts, 'code'> = {
     filename: ${JSON.stringify(opts.filename)},
     functionId: ${JSON.stringify(opts.functionId)},
   })`,
-  devSplitImporter: `devImport`,
+  // devSplitImporter: `devImport`,
 }
 
 describe('server function compilation', () => {
@@ -641,7 +641,7 @@ describe('server function compilation', () => {
       });
       outer(outer_useServer);
       const outer_useServer_1 = createServerRpc({
-        fn: (...args) => devImport("test.ts?tsr-directive-use-server-split=outer_useServer_1").then(module => module.default(...args)),
+        fn: (...args) => import("test.ts?tsr-directive-use-server-split=outer_useServer_1").then(module => module.default(...args)),
         filename: "test.ts",
         functionId: "test_ts_tsr-directive-use-server-split_outer_useServer--outer_useServer_1"
       });
@@ -653,7 +653,7 @@ describe('server function compilation', () => {
 
       import { createServerRpc } from "my-rpc-lib-server";
       const outer_useServer = createServerRpc({
-        fn: (...args) => devImport("test.ts?tsr-directive-use-server-split=outer_useServer").then(module => module.default(...args)),
+        fn: (...args) => import("test.ts?tsr-directive-use-server-split=outer_useServer").then(module => module.default(...args)),
         filename: "test.ts",
         functionId: "test_ts_tsr-directive-use-server-split_outer_useServer_1--outer_useServer"
       });
@@ -878,7 +878,7 @@ describe('server function compilation', () => {
         return 'hello from the server';
       };
       const myServerFn_createServerFn_handler = createServerRpc({
-        fn: (...args) => devImport("test.ts?tsr-directive-use-server-split=myServerFn_createServerFn_handler").then(module => module.default(...args)),
+        fn: (...args) => import("test.ts?tsr-directive-use-server-split=myServerFn_createServerFn_handler").then(module => module.default(...args)),
         filename: "test.ts",
         functionId: "test_ts_tsr-directive-use-server-split_myServerFn2_createServerFn_handler--myServerFn_createServerFn_handler"
       });