@tanstack/start-plugin-core 1.132.0-alpha.5 → 1.132.0-alpha.6

package/dist/esm/plugin.js

@@ -27,7 +27,7 @@ function TanStackStartVitePluginCore(corePluginOpts, startPluginOpts) {
   }
   return [
     tanStackStartRouter({
-      ...startConfig.tsr,
+      ...startConfig.router,
       target: corePluginOpts.framework,
       autoCodeSplitting: true
     }),
@@ -37,7 +37,7 @@ function TanStackStartVitePluginCore(corePluginOpts, startPluginOpts) {
         const viteAppBase = trimPathRight(viteConfig.base || "/");
         globalThis.TSS_APP_BASE = viteAppBase;
         const root = viteConfig.root || process.cwd();
-        const resolvedSrcDirectory = join(root, startConfig.tsr.srcDirectory);
+        const resolvedSrcDirectory = join(root, startConfig.srcDirectory);
         const routerFilePath = resolveEntry({
           type: "router entry",
           configuredEntry: startConfig.router.entry,

package/dist/esm/plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.js","sources":["../../src/plugin.ts"],"sourcesContent":["import path from 'node:path'\nimport { trimPathRight } from '@tanstack/router-core'\nimport { VIRTUAL_MODULES } from '@tanstack/start-server-core'\nimport { TanStackServerFnPluginEnv } from '@tanstack/server-functions-plugin'\nimport * as vite from 'vite'\nimport { crawlFrameworkPkgs } from 'vitefu'\nimport { join } from 'pathe'\nimport { startManifestPlugin } from './start-manifest-plugin/plugin'\nimport { startCompilerPlugin } from './start-compiler-plugin/plugin'\nimport { ENTRY_POINTS, VITE_ENVIRONMENT_NAMES } from './constants'\nimport { tanStackStartRouter } from './start-router-plugin/plugin'\nimport { loadEnvPlugin } from './load-env-plugin/plugin'\nimport { devServerPlugin } from './dev-server-plugin/plugin'\nimport { parseStartConfig } from './schema'\nimport { resolveEntry } from './resolve-entries'\nimport {\n  getClientOutputDirectory,\n  getServerOutputDirectory,\n} from './output-directory'\nimport { postServerBuild } from './post-server-build'\nimport type { ViteEnvironmentNames } from './constants'\nimport type { TanStackStartInputConfig } from './schema'\nimport type { PluginOption } from 'vite'\nimport type { CompileStartFrameworkOptions } from './start-compiler-plugin/compilers'\n\nexport interface TanStackStartVitePluginCoreOptions {\n  framework: CompileStartFrameworkOptions\n  defaultEntryPaths: {\n    client: string\n    server: string\n  }\n  crawlPackages?: (opts: {\n    name: string\n    peerDependencies: Record<string, any>\n    exports?: Record<string, any> | string\n  }) => 'include' | 'exclude' | undefined\n}\n\nexport function TanStackStartVitePluginCore(\n  corePluginOpts: TanStackStartVitePluginCoreOptions,\n  startPluginOpts: TanStackStartInputConfig,\n): Array<PluginOption> {\n  const startConfig = parseStartConfig(startPluginOpts)\n\n  const capturedBundle: Partial<\n    Record<ViteEnvironmentNames, vite.Rollup.OutputBundle>\n  > = {}\n\n  function getBundle(envName: ViteEnvironmentNames): vite.Rollup.OutputBundle {\n    const bundle = capturedBundle[envName]\n    if (!bundle) {\n      throw new Error(`No bundle captured for environment: ${envName}`)\n    }\n    return bundle\n  }\n\n  return [\n    tanStackStartRouter({\n      ...startConfig.tsr,\n      target: corePluginOpts.framework,\n      autoCodeSplitting: true,\n    }),\n    {\n      name: 'tanstack-start-core:config',\n      async config(viteConfig, { command }) {\n        const viteAppBase = trimPathRight(viteConfig.base || '/')\n        globalThis.TSS_APP_BASE = viteAppBase\n\n        const root = viteConfig.root || process.cwd()\n        const resolvedSrcDirectory = join(root, startConfig.tsr.srcDirectory)\n\n        const routerFilePath = resolveEntry({\n          type: 'router entry',\n          configuredEntry: startConfig.router.entry,\n          defaultEntry: 'router',\n          root,\n          resolvedSrcDirectory,\n          required: true,\n        })\n        const clientEntryPath = resolveEntry({\n          type: 'client entry',\n          configuredEntry: startConfig.client.entry,\n          defaultEntry: 'client',\n          root,\n          resolvedSrcDirectory,\n          required: false,\n        })\n\n        const serverEntryPath = resolveEntry({\n          type: 'server entry',\n          configuredEntry: startConfig.server.entry,\n          defaultEntry: 'server',\n          root,\n          resolvedSrcDirectory,\n          required: false,\n        })\n\n        let clientAlias: string\n        if (clientEntryPath) {\n          clientAlias = vite.normalizePath(\n            path.join('/@fs', path.resolve(root, clientEntryPath)),\n          )\n        } else {\n          clientAlias = corePluginOpts.defaultEntryPaths.client\n        }\n        let serverAlias: string\n        if (serverEntryPath) {\n          serverAlias = vite.normalizePath(path.resolve(root, serverEntryPath))\n        } else {\n          serverAlias = corePluginOpts.defaultEntryPaths.server\n        }\n        const entryAliasConfiguration: Record<\n          (typeof ENTRY_POINTS)[keyof typeof ENTRY_POINTS],\n          string\n        > = {\n          [ENTRY_POINTS.router]: routerFilePath,\n          [ENTRY_POINTS.client]: clientAlias,\n          [ENTRY_POINTS.server]: serverAlias,\n        }\n\n        // TODO\n        /* const nitroOutputPublicDir = await (async () => {\n          // Create a dummy nitro app to get the resolved public output path\n          const dummyNitroApp = await createNitro({\n            preset: startConfig.target,\n            compatibilityDate: '2024-12-01',\n          })\n\n          const nitroOutputPublicDir = dummyNitroApp.options.output.publicDir\n          await dummyNitroApp.close()\n\n          return nitroOutputPublicDir\n        })()*/\n\n        const startPackageName = `@tanstack/${corePluginOpts.framework}-start`\n        const routerPackageName = `@tanstack/${corePluginOpts.framework}-router`\n\n        const additionalOptimizeDeps = {\n          include: new Set<string>(),\n          exclude: new Set<string>(),\n        }\n\n        // crawl packages that have start in \"peerDependencies\"\n        // see https://github.com/svitejs/vitefu/blob/d8d82fa121e3b2215ba437107093c77bde51b63b/src/index.js#L95-L101\n\n        // this is currently uncached; could be implemented similarly as vite handles lock file changes\n        // see https://github.com/vitejs/vite/blob/557f797d29422027e8c451ca50dd84bf8c41b5f0/packages/vite/src/node/optimizer/index.ts#L1282\n\n        const result = await crawlFrameworkPkgs({\n          root: process.cwd(),\n          isBuild: command === 'build',\n          isFrameworkPkgByJson(pkgJson) {\n            if ([routerPackageName, startPackageName].includes(pkgJson.name)) {\n              return false\n            }\n\n            const peerDependencies = pkgJson['peerDependencies']\n\n            if (peerDependencies) {\n              const internalResult = corePluginOpts.crawlPackages?.({\n                name: pkgJson.name,\n                peerDependencies,\n                exports: pkgJson.exports,\n              })\n              if (internalResult) {\n                if (internalResult === 'exclude') {\n                  additionalOptimizeDeps.exclude.add(pkgJson.name)\n                } else {\n                  additionalOptimizeDeps.include.add(pkgJson.name)\n                }\n              }\n              return (\n                startPackageName in peerDependencies ||\n                routerPackageName in peerDependencies\n              )\n            }\n            return false\n          },\n        })\n\n        return {\n          base: viteAppBase,\n          // see https://vite.dev/config/shared-options.html#apptype\n          // this will prevent vite from injecting middlewares that we don't want\n          appType: viteConfig.appType ?? 'custom',\n          environments: {\n            [VITE_ENVIRONMENT_NAMES.client]: {\n              consumer: 'client',\n              build: {\n                rollupOptions: {\n                  input: {\n                    main: ENTRY_POINTS.client,\n                  },\n                },\n                outDir: getClientOutputDirectory(viteConfig),\n              },\n            },\n            [VITE_ENVIRONMENT_NAMES.server]: {\n              consumer: 'server',\n              build: {\n                ssr: true,\n                rollupOptions: {\n                  input:\n                    viteConfig.environments?.[VITE_ENVIRONMENT_NAMES.server]\n                      ?.build?.rollupOptions?.input ?? ENTRY_POINTS.server,\n                },\n                outDir: getServerOutputDirectory(viteConfig),\n                commonjsOptions: {\n                  include: [/node_modules/],\n                },\n                copyPublicDir:\n                  viteConfig.environments?.[VITE_ENVIRONMENT_NAMES.server]\n                    ?.build?.copyPublicDir ?? false,\n              },\n              optimizeDeps: {\n                exclude: [\n                  ...Object.values(VIRTUAL_MODULES),\n                  ...result.optimizeDeps.exclude.sort(),\n                  ...additionalOptimizeDeps.exclude,\n                  `@tanstack/${corePluginOpts.framework}-start/server`,\n                ],\n                include: [\n                  ...additionalOptimizeDeps.include,\n                  ...result.optimizeDeps.include.sort(),\n                ],\n              },\n            },\n          },\n          resolve: {\n            noExternal: [\n              '@tanstack/start**',\n              `@tanstack/${corePluginOpts.framework}-start**`,\n              ...Object.values(VIRTUAL_MODULES),\n              startPackageName,\n              ...result.ssr.noExternal.sort(),\n            ],\n            dedupe: [startPackageName],\n            alias: {\n              ...entryAliasConfiguration,\n            },\n          },\n          optimizeDeps: {\n            exclude: [\n              ...Object.values(VIRTUAL_MODULES),\n              startPackageName,\n              ...result.optimizeDeps.exclude.sort(),\n              ...additionalOptimizeDeps.exclude,\n            ],\n            include: [...additionalOptimizeDeps.include],\n          },\n          /* prettier-ignore */\n          define: {\n            // define is an esbuild function that replaces the any instances of given keys with the given values\n            // i.e: __FRAMEWORK_NAME__ can be replaced with JSON.stringify(\"TanStack Start\")\n            // This is not the same as injecting environment variables.\n\n            ...defineReplaceEnv('TSS_SERVER_FN_BASE', startConfig.serverFns.base),\n            ...defineReplaceEnv('TSS_CLIENT_OUTPUT_DIR', getClientOutputDirectory(viteConfig)),\n            ...defineReplaceEnv('TSS_APP_BASE', viteAppBase),\n            ...(command === 'serve' ? defineReplaceEnv('TSS_SHELL', startConfig.spa?.enabled ? 'true' : 'false') : {}),\n            ...defineReplaceEnv('TSS_DEV_SERVER', command === 'serve' ? 'true' : 'false'),\n          },\n          builder: {\n            sharedPlugins: true,\n            async buildApp(builder) {\n              const client = builder.environments[VITE_ENVIRONMENT_NAMES.client]\n              const server = builder.environments[VITE_ENVIRONMENT_NAMES.server]\n\n              if (!client) {\n                throw new Error('Client environment not found')\n              }\n\n              if (!server) {\n                throw new Error('SSR environment not found')\n              }\n\n              if (!client.isBuilt) {\n                // Build the client bundle first\n                await builder.build(client)\n              }\n              if (!server.isBuilt) {\n                // Build the SSR bundle\n                await builder.build(server)\n              }\n              const serverBundle = getBundle(VITE_ENVIRONMENT_NAMES.server)\n              await postServerBuild({ builder, startConfig, serverBundle })\n            },\n          },\n        }\n      },\n    },\n    // N.B. TanStackStartCompilerPlugin must be before the TanStackServerFnPluginEnv\n    startCompilerPlugin(corePluginOpts.framework, {\n      client: { envName: VITE_ENVIRONMENT_NAMES.client },\n      server: { envName: VITE_ENVIRONMENT_NAMES.server },\n    }),\n    TanStackServerFnPluginEnv({\n      // This is the ID that will be available to look up and import\n      // our server function manifest and resolve its module\n      manifestVirtualImportId: VIRTUAL_MODULES.serverFnManifest,\n      client: {\n        getRuntimeCode: () =>\n          `import { createClientRpc } from '@tanstack/${corePluginOpts.framework}-start/client'`,\n        replacer: (d) => `createClientRpc('${d.functionId}')`,\n        envName: VITE_ENVIRONMENT_NAMES.client,\n      },\n      server: {\n        getRuntimeCode: () =>\n          `import { createServerRpc } from '@tanstack/${corePluginOpts.framework}-start/server'`,\n        replacer: (d) => `createServerRpc('${d.functionId}', ${d.fn})`,\n        envName: VITE_ENVIRONMENT_NAMES.server,\n      },\n    }),\n    loadEnvPlugin(),\n    startManifestPlugin({\n      getClientBundle: () => getBundle(VITE_ENVIRONMENT_NAMES.client),\n    }),\n    devServerPlugin({ startConfig }),\n    {\n      name: 'tanstack-start:core:capture-bundle',\n      applyToEnvironment(e) {\n        return (\n          e.name === VITE_ENVIRONMENT_NAMES.client ||\n          e.name === VITE_ENVIRONMENT_NAMES.server\n        )\n      },\n      enforce: 'post',\n      generateBundle(_options, bundle) {\n        const environment = this.environment.name as ViteEnvironmentNames\n        if (!Object.values(VITE_ENVIRONMENT_NAMES).includes(environment)) {\n          throw new Error(`Unknown environment: ${environment}`)\n        }\n        capturedBundle[environment] = bundle\n      },\n    },\n  ]\n}\n\nfunction defineReplaceEnv<TKey extends string, TValue extends string>(\n  key: TKey,\n  value: TValue,\n): { [P in `process.env.${TKey}` | `import.meta.env.${TKey}`]: TValue } {\n  return {\n    [`process.env.${key}`]: JSON.stringify(value),\n    [`import.meta.env.${key}`]: JSON.stringify(value),\n  } as { [P in `process.env.${TKey}` | `import.meta.env.${TKey}`]: TValue }\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"plugin.js","sources":["../../src/plugin.ts"],"sourcesContent":["import path from 'node:path'\nimport { trimPathRight } from '@tanstack/router-core'\nimport { VIRTUAL_MODULES } from '@tanstack/start-server-core'\nimport { TanStackServerFnPluginEnv } from '@tanstack/server-functions-plugin'\nimport * as vite from 'vite'\nimport { crawlFrameworkPkgs } from 'vitefu'\nimport { join } from 'pathe'\nimport { startManifestPlugin } from './start-manifest-plugin/plugin'\nimport { startCompilerPlugin } from './start-compiler-plugin/plugin'\nimport { ENTRY_POINTS, VITE_ENVIRONMENT_NAMES } from './constants'\nimport { tanStackStartRouter } from './start-router-plugin/plugin'\nimport { loadEnvPlugin } from './load-env-plugin/plugin'\nimport { devServerPlugin } from './dev-server-plugin/plugin'\nimport { parseStartConfig } from './schema'\nimport { resolveEntry } from './resolve-entries'\nimport {\n  getClientOutputDirectory,\n  getServerOutputDirectory,\n} from './output-directory'\nimport { postServerBuild } from './post-server-build'\nimport type { ViteEnvironmentNames } from './constants'\nimport type { TanStackStartInputConfig } from './schema'\nimport type { PluginOption } from 'vite'\nimport type { CompileStartFrameworkOptions } from './start-compiler-plugin/compilers'\n\nexport interface TanStackStartVitePluginCoreOptions {\n  framework: CompileStartFrameworkOptions\n  defaultEntryPaths: {\n    client: string\n    server: string\n  }\n  crawlPackages?: (opts: {\n    name: string\n    peerDependencies: Record<string, any>\n    exports?: Record<string, any> | string\n  }) => 'include' | 'exclude' | undefined\n}\n\nexport function TanStackStartVitePluginCore(\n  corePluginOpts: TanStackStartVitePluginCoreOptions,\n  startPluginOpts: TanStackStartInputConfig,\n): Array<PluginOption> {\n  const startConfig = parseStartConfig(startPluginOpts)\n\n  const capturedBundle: Partial<\n    Record<ViteEnvironmentNames, vite.Rollup.OutputBundle>\n  > = {}\n\n  function getBundle(envName: ViteEnvironmentNames): vite.Rollup.OutputBundle {\n    const bundle = capturedBundle[envName]\n    if (!bundle) {\n      throw new Error(`No bundle captured for environment: ${envName}`)\n    }\n    return bundle\n  }\n\n  return [\n    tanStackStartRouter({\n      ...startConfig.router,\n      target: corePluginOpts.framework,\n      autoCodeSplitting: true,\n    }),\n    {\n      name: 'tanstack-start-core:config',\n      async config(viteConfig, { command }) {\n        const viteAppBase = trimPathRight(viteConfig.base || '/')\n        globalThis.TSS_APP_BASE = viteAppBase\n\n        const root = viteConfig.root || process.cwd()\n        const resolvedSrcDirectory = join(root, startConfig.srcDirectory)\n\n        const routerFilePath = resolveEntry({\n          type: 'router entry',\n          configuredEntry: startConfig.router.entry,\n          defaultEntry: 'router',\n          root,\n          resolvedSrcDirectory,\n          required: true,\n        })\n        const clientEntryPath = resolveEntry({\n          type: 'client entry',\n          configuredEntry: startConfig.client.entry,\n          defaultEntry: 'client',\n          root,\n          resolvedSrcDirectory,\n          required: false,\n        })\n\n        const serverEntryPath = resolveEntry({\n          type: 'server entry',\n          configuredEntry: startConfig.server.entry,\n          defaultEntry: 'server',\n          root,\n          resolvedSrcDirectory,\n          required: false,\n        })\n\n        let clientAlias: string\n        if (clientEntryPath) {\n          clientAlias = vite.normalizePath(\n            path.join('/@fs', path.resolve(root, clientEntryPath)),\n          )\n        } else {\n          clientAlias = corePluginOpts.defaultEntryPaths.client\n        }\n        let serverAlias: string\n        if (serverEntryPath) {\n          serverAlias = vite.normalizePath(path.resolve(root, serverEntryPath))\n        } else {\n          serverAlias = corePluginOpts.defaultEntryPaths.server\n        }\n        const entryAliasConfiguration: Record<\n          (typeof ENTRY_POINTS)[keyof typeof ENTRY_POINTS],\n          string\n        > = {\n          [ENTRY_POINTS.router]: routerFilePath,\n          [ENTRY_POINTS.client]: clientAlias,\n          [ENTRY_POINTS.server]: serverAlias,\n        }\n\n        // TODO\n        /* const nitroOutputPublicDir = await (async () => {\n          // Create a dummy nitro app to get the resolved public output path\n          const dummyNitroApp = await createNitro({\n            preset: startConfig.target,\n            compatibilityDate: '2024-12-01',\n          })\n\n          const nitroOutputPublicDir = dummyNitroApp.options.output.publicDir\n          await dummyNitroApp.close()\n\n          return nitroOutputPublicDir\n        })()*/\n\n        const startPackageName = `@tanstack/${corePluginOpts.framework}-start`\n        const routerPackageName = `@tanstack/${corePluginOpts.framework}-router`\n\n        const additionalOptimizeDeps = {\n          include: new Set<string>(),\n          exclude: new Set<string>(),\n        }\n\n        // crawl packages that have start in \"peerDependencies\"\n        // see https://github.com/svitejs/vitefu/blob/d8d82fa121e3b2215ba437107093c77bde51b63b/src/index.js#L95-L101\n\n        // this is currently uncached; could be implemented similarly as vite handles lock file changes\n        // see https://github.com/vitejs/vite/blob/557f797d29422027e8c451ca50dd84bf8c41b5f0/packages/vite/src/node/optimizer/index.ts#L1282\n\n        const result = await crawlFrameworkPkgs({\n          root: process.cwd(),\n          isBuild: command === 'build',\n          isFrameworkPkgByJson(pkgJson) {\n            if ([routerPackageName, startPackageName].includes(pkgJson.name)) {\n              return false\n            }\n\n            const peerDependencies = pkgJson['peerDependencies']\n\n            if (peerDependencies) {\n              const internalResult = corePluginOpts.crawlPackages?.({\n                name: pkgJson.name,\n                peerDependencies,\n                exports: pkgJson.exports,\n              })\n              if (internalResult) {\n                if (internalResult === 'exclude') {\n                  additionalOptimizeDeps.exclude.add(pkgJson.name)\n                } else {\n                  additionalOptimizeDeps.include.add(pkgJson.name)\n                }\n              }\n              return (\n                startPackageName in peerDependencies ||\n                routerPackageName in peerDependencies\n              )\n            }\n            return false\n          },\n        })\n\n        return {\n          base: viteAppBase,\n          // see https://vite.dev/config/shared-options.html#apptype\n          // this will prevent vite from injecting middlewares that we don't want\n          appType: viteConfig.appType ?? 'custom',\n          environments: {\n            [VITE_ENVIRONMENT_NAMES.client]: {\n              consumer: 'client',\n              build: {\n                rollupOptions: {\n                  input: {\n                    main: ENTRY_POINTS.client,\n                  },\n                },\n                outDir: getClientOutputDirectory(viteConfig),\n              },\n            },\n            [VITE_ENVIRONMENT_NAMES.server]: {\n              consumer: 'server',\n              build: {\n                ssr: true,\n                rollupOptions: {\n                  input:\n                    viteConfig.environments?.[VITE_ENVIRONMENT_NAMES.server]\n                      ?.build?.rollupOptions?.input ?? ENTRY_POINTS.server,\n                },\n                outDir: getServerOutputDirectory(viteConfig),\n                commonjsOptions: {\n                  include: [/node_modules/],\n                },\n                copyPublicDir:\n                  viteConfig.environments?.[VITE_ENVIRONMENT_NAMES.server]\n                    ?.build?.copyPublicDir ?? false,\n              },\n              optimizeDeps: {\n                exclude: [\n                  ...Object.values(VIRTUAL_MODULES),\n                  ...result.optimizeDeps.exclude.sort(),\n                  ...additionalOptimizeDeps.exclude,\n                  `@tanstack/${corePluginOpts.framework}-start/server`,\n                ],\n                include: [\n                  ...additionalOptimizeDeps.include,\n                  ...result.optimizeDeps.include.sort(),\n                ],\n              },\n            },\n          },\n          resolve: {\n            noExternal: [\n              '@tanstack/start**',\n              `@tanstack/${corePluginOpts.framework}-start**`,\n              ...Object.values(VIRTUAL_MODULES),\n              startPackageName,\n              ...result.ssr.noExternal.sort(),\n            ],\n            dedupe: [startPackageName],\n            alias: {\n              ...entryAliasConfiguration,\n            },\n          },\n          optimizeDeps: {\n            exclude: [\n              ...Object.values(VIRTUAL_MODULES),\n              startPackageName,\n              ...result.optimizeDeps.exclude.sort(),\n              ...additionalOptimizeDeps.exclude,\n            ],\n            include: [...additionalOptimizeDeps.include],\n          },\n          /* prettier-ignore */\n          define: {\n            // define is an esbuild function that replaces the any instances of given keys with the given values\n            // i.e: __FRAMEWORK_NAME__ can be replaced with JSON.stringify(\"TanStack Start\")\n            // This is not the same as injecting environment variables.\n\n            ...defineReplaceEnv('TSS_SERVER_FN_BASE', startConfig.serverFns.base),\n            ...defineReplaceEnv('TSS_CLIENT_OUTPUT_DIR', getClientOutputDirectory(viteConfig)),\n            ...defineReplaceEnv('TSS_APP_BASE', viteAppBase),\n            ...(command === 'serve' ? defineReplaceEnv('TSS_SHELL', startConfig.spa?.enabled ? 'true' : 'false') : {}),\n            ...defineReplaceEnv('TSS_DEV_SERVER', command === 'serve' ? 'true' : 'false'),\n          },\n          builder: {\n            sharedPlugins: true,\n            async buildApp(builder) {\n              const client = builder.environments[VITE_ENVIRONMENT_NAMES.client]\n              const server = builder.environments[VITE_ENVIRONMENT_NAMES.server]\n\n              if (!client) {\n                throw new Error('Client environment not found')\n              }\n\n              if (!server) {\n                throw new Error('SSR environment not found')\n              }\n\n              if (!client.isBuilt) {\n                // Build the client bundle first\n                await builder.build(client)\n              }\n              if (!server.isBuilt) {\n                // Build the SSR bundle\n                await builder.build(server)\n              }\n              const serverBundle = getBundle(VITE_ENVIRONMENT_NAMES.server)\n              await postServerBuild({ builder, startConfig, serverBundle })\n            },\n          },\n        }\n      },\n    },\n    // N.B. TanStackStartCompilerPlugin must be before the TanStackServerFnPluginEnv\n    startCompilerPlugin(corePluginOpts.framework, {\n      client: { envName: VITE_ENVIRONMENT_NAMES.client },\n      server: { envName: VITE_ENVIRONMENT_NAMES.server },\n    }),\n    TanStackServerFnPluginEnv({\n      // This is the ID that will be available to look up and import\n      // our server function manifest and resolve its module\n      manifestVirtualImportId: VIRTUAL_MODULES.serverFnManifest,\n      client: {\n        getRuntimeCode: () =>\n          `import { createClientRpc } from '@tanstack/${corePluginOpts.framework}-start/client'`,\n        replacer: (d) => `createClientRpc('${d.functionId}')`,\n        envName: VITE_ENVIRONMENT_NAMES.client,\n      },\n      server: {\n        getRuntimeCode: () =>\n          `import { createServerRpc } from '@tanstack/${corePluginOpts.framework}-start/server'`,\n        replacer: (d) => `createServerRpc('${d.functionId}', ${d.fn})`,\n        envName: VITE_ENVIRONMENT_NAMES.server,\n      },\n    }),\n    loadEnvPlugin(),\n    startManifestPlugin({\n      getClientBundle: () => getBundle(VITE_ENVIRONMENT_NAMES.client),\n    }),\n    devServerPlugin({ startConfig }),\n    {\n      name: 'tanstack-start:core:capture-bundle',\n      applyToEnvironment(e) {\n        return (\n          e.name === VITE_ENVIRONMENT_NAMES.client ||\n          e.name === VITE_ENVIRONMENT_NAMES.server\n        )\n      },\n      enforce: 'post',\n      generateBundle(_options, bundle) {\n        const environment = this.environment.name as ViteEnvironmentNames\n        if (!Object.values(VITE_ENVIRONMENT_NAMES).includes(environment)) {\n          throw new Error(`Unknown environment: ${environment}`)\n        }\n        capturedBundle[environment] = bundle\n      },\n    },\n  ]\n}\n\nfunction defineReplaceEnv<TKey extends string, TValue extends string>(\n  key: TKey,\n  value: TValue,\n): { [P in `process.env.${TKey}` | `import.meta.env.${TKey}`]: TValue } {\n  return {\n    [`process.env.${key}`]: JSON.stringify(value),\n    [`import.meta.env.${key}`]: JSON.stringify(value),\n  } as { [P in `process.env.${TKey}` | `import.meta.env.${TKey}`]: TValue }\n}\n"],"names":[],"mappings":"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"}

package/dist/esm/schema.d.ts

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 export declare function parseStartConfig(opts?: z.input<typeof tanstackStartOptionsSchema>): {
-    tsr: {
+    router: {
         target: "react" | "solid";
         routeFileIgnorePrefix: string;
         routesDirectory: string;
@@ -30,11 +30,9 @@ export declare function parseStartConfig(opts?: z.input<typeof tanstackStartOpti
             enableCodeSplitting?: boolean | undefined;
         } | undefined;
         plugins?: import('@tanstack/router-generator').GeneratorPlugin[] | undefined;
-        srcDirectory: string;
-    };
-    router: {
         entry?: string | undefined;
     };
+    srcDirectory: string;
     client: {
         base: string;
         entry?: string | undefined;
@@ -816,7 +814,14 @@ declare const pageSchema: z.ZodObject<{
     } | undefined;
 }>;
 declare const tanstackStartOptionsSchema: z.ZodDefault<z.ZodOptional<z.ZodObject<{
-    tsr: z.ZodDefault<z.ZodOptional<z.ZodObject<{
+    srcDirectory: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    router: z.ZodDefault<z.ZodOptional<z.ZodIntersection<z.ZodObject<{
+        entry: z.ZodOptional<z.ZodString>;
+    }, "strip", z.ZodTypeAny, {
+        entry?: string | undefined;
+    }, {
+        entry?: string | undefined;
+    }>, z.ZodDefault<z.ZodOptional<z.ZodObject<{
         target: z.ZodOptional<z.ZodDefault<z.ZodOptional<z.ZodEnum<["react", "solid"]>>>>;
         virtualRouteConfig: z.ZodOptional<z.ZodOptional<z.ZodUnion<[z.ZodType<import('@tanstack/virtual-file-routes').VirtualRootRoute, z.ZodTypeDef, import('@tanstack/virtual-file-routes').VirtualRootRoute>, z.ZodString]>>>;
         routeFilePrefix: z.ZodOptional<z.ZodOptional<z.ZodString>>;
@@ -855,10 +860,7 @@ declare const tanstackStartOptionsSchema: z.ZodDefault<z.ZodOptional<z.ZodObject
         }>>>;
         plugins: z.ZodOptional<z.ZodOptional<z.ZodArray<z.ZodType<import('@tanstack/router-generator').GeneratorPlugin, z.ZodTypeDef, import('@tanstack/router-generator').GeneratorPlugin>, "many">>>;
         tmpDir: z.ZodOptional<z.ZodDefault<z.ZodOptional<z.ZodString>>>;
-    } & {
-        srcDirectory: z.ZodDefault<z.ZodOptional<z.ZodString>>;
     }, "strip", z.ZodTypeAny, {
-        srcDirectory: string;
         target?: "react" | "solid" | undefined;
         virtualRouteConfig?: string | import('@tanstack/virtual-file-routes').VirtualRootRoute | undefined;
         routeFilePrefix?: string | undefined;
@@ -916,15 +918,7 @@ declare const tanstackStartOptionsSchema: z.ZodDefault<z.ZodOptional<z.ZodObject
         } | undefined;
         plugins?: import('@tanstack/router-generator').GeneratorPlugin[] | undefined;
         tmpDir?: string | undefined;
-        srcDirectory?: string | undefined;
-    }>>>;
-    router: z.ZodDefault<z.ZodOptional<z.ZodObject<{
-        entry: z.ZodOptional<z.ZodString>;
-    }, "strip", z.ZodTypeAny, {
-        entry?: string | undefined;
-    }, {
-        entry?: string | undefined;
-    }>>>;
+    }>>>>>>;
     client: z.ZodDefault<z.ZodOptional<z.ZodObject<{
         entry: z.ZodOptional<z.ZodString>;
         base: z.ZodDefault<z.ZodOptional<z.ZodString>>;
@@ -2972,8 +2966,10 @@ declare const tanstackStartOptionsSchema: z.ZodDefault<z.ZodOptional<z.ZodObject
         installDevServerMiddleware?: boolean | undefined;
     }>>;
 }, "strip", z.ZodTypeAny, {
-    tsr: {
-        srcDirectory: string;
+    srcDirectory: string;
+    router: {
+        entry?: string | undefined;
+    } & {
         target?: "react" | "solid" | undefined;
         virtualRouteConfig?: string | import('@tanstack/virtual-file-routes').VirtualRootRoute | undefined;
         routeFilePrefix?: string | undefined;
@@ -3003,9 +2999,6 @@ declare const tanstackStartOptionsSchema: z.ZodDefault<z.ZodOptional<z.ZodObject
         plugins?: import('@tanstack/router-generator').GeneratorPlugin[] | undefined;
         tmpDir?: string | undefined;
     };
-    router: {
-        entry?: string | undefined;
-    };
     client: {
         base: string;
         entry?: string | undefined;
@@ -3247,7 +3240,10 @@ declare const tanstackStartOptionsSchema: z.ZodDefault<z.ZodOptional<z.ZodObject
         installDevServerMiddleware?: boolean | undefined;
     } | undefined;
 }, {
-    tsr?: {
+    srcDirectory?: string | undefined;
+    router?: ({
+        entry?: string | undefined;
+    } & {
         target?: "react" | "solid" | undefined;
         virtualRouteConfig?: string | import('@tanstack/virtual-file-routes').VirtualRootRoute | undefined;
         routeFilePrefix?: string | undefined;
@@ -3276,11 +3272,7 @@ declare const tanstackStartOptionsSchema: z.ZodDefault<z.ZodOptional<z.ZodObject
         } | undefined;
         plugins?: import('@tanstack/router-generator').GeneratorPlugin[] | undefined;
         tmpDir?: string | undefined;
-        srcDirectory?: string | undefined;
-    } | undefined;
-    router?: {
-        entry?: string | undefined;
-    } | undefined;
+    }) | undefined;
     client?: {
         entry?: string | undefined;
         base?: string | undefined;

package/dist/esm/schema.js

@@ -1,22 +1,18 @@
 import path from "node:path";
 import { z } from "zod";
 import { getConfig, configSchema } from "@tanstack/router-generator";
-const tsrConfig = configSchema.omit({ autoCodeSplitting: true }).partial().extend({
-  // this is relative to vite root
-  // TODO why is this nested under tsr?
-  srcDirectory: z.string().optional().default("src")
-});
+const tsrConfig = configSchema.omit({ autoCodeSplitting: true }).partial();
 function parseStartConfig(opts) {
   const options = tanstackStartOptionsSchema.parse(opts);
-  const srcDirectory = options.tsr.srcDirectory;
-  const routesDirectory = options.tsr.routesDirectory ?? path.join(srcDirectory, "routes");
-  const generatedRouteTree = options.tsr.generatedRouteTree ?? path.join(srcDirectory, "routeTree.gen.ts");
+  const srcDirectory = options.srcDirectory;
+  const routesDirectory = options.router.routesDirectory ?? path.join(srcDirectory, "routes");
+  const generatedRouteTree = options.router.generatedRouteTree ?? path.join(srcDirectory, "routeTree.gen.ts");
   return {
     ...options,
-    tsr: {
-      ...options.tsr,
+    router: {
+      ...options.router,
       ...getConfig({
-        ...options.tsr,
+        ...options.router,
         routesDirectory,
         generatedRouteTree
       })
@@ -85,11 +81,11 @@ const pageSchema = pageBaseSchema.extend({
   prerender: pagePrerenderOptionsSchema.optional()
 });
 const tanstackStartOptionsSchema = z.object({
-  tsr: tsrConfig.optional().default({}),
+  srcDirectory: z.string().optional().default("src"),
   router: z.object({
-    // TODO naming?
+    // TODO this will move to 'start' once we have `createStart`
     entry: z.string().optional()
-  }).optional().default({}),
+  }).and(tsrConfig.optional().default({})).optional().default({}),
   client: z.object({
     entry: z.string().optional(),
     base: z.string().optional().default("/_build")

package/dist/esm/schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"schema.js","sources":["../../src/schema.ts"],"sourcesContent":["import path from 'node:path'\nimport { z } from 'zod'\nimport { configSchema, getConfig } from '@tanstack/router-generator'\n\nconst tsrConfig = configSchema\n  .omit({ autoCodeSplitting: true })\n  .partial()\n  .extend({\n    // this is relative to vite root\n    // TODO why is this nested under tsr?\n    srcDirectory: z.string().optional().default('src'),\n  })\n\nexport function parseStartConfig(\n  opts?: z.input<typeof tanstackStartOptionsSchema>,\n) {\n  const options = tanstackStartOptionsSchema.parse(opts)\n\n  const srcDirectory = options.tsr.srcDirectory\n\n  const routesDirectory =\n    options.tsr.routesDirectory ?? path.join(srcDirectory, 'routes')\n\n  const generatedRouteTree =\n    options.tsr.generatedRouteTree ??\n    path.join(srcDirectory, 'routeTree.gen.ts')\n\n  return {\n    ...options,\n    tsr: {\n      ...options.tsr,\n      ...getConfig({\n        ...options.tsr,\n        routesDirectory,\n        generatedRouteTree,\n      }),\n    },\n  }\n}\n\nconst pageSitemapOptionsSchema = z.object({\n  exclude: z.boolean().optional(),\n  priority: z.number().min(0).max(1).optional(),\n  changefreq: z\n    .enum(['always', 'hourly', 'daily', 'weekly', 'monthly', 'yearly', 'never'])\n    .optional(),\n  lastmod: z.union([z.string(), z.date()]).optional(),\n  alternateRefs: z\n    .array(\n      z.object({\n        href: z.string(),\n        hreflang: z.string(),\n      }),\n    )\n    .optional(),\n  images: z\n    .array(\n      z.object({\n        loc: z.string(),\n        caption: z.string().optional(),\n        title: z.string().optional(),\n      }),\n    )\n    .optional(),\n  news: z\n    .object({\n      publication: z.object({\n        name: z.string(),\n        language: z.string(),\n      }),\n      publicationDate: z.union([z.string(), z.date()]),\n      title: z.string(),\n    })\n    .optional(),\n})\n\nconst pageBaseSchema = z.object({\n  path: z.string(),\n  sitemap: pageSitemapOptionsSchema.optional(),\n  fromCrawl: z.boolean().optional(),\n})\n\nconst pagePrerenderOptionsSchema = z.object({\n  enabled: z.boolean().optional(),\n  outputPath: z.string().optional(),\n  autoSubfolderIndex: z.boolean().optional(),\n  crawlLinks: z.boolean().optional(),\n  retryCount: z.number().optional(),\n  retryDelay: z.number().optional(),\n  onSuccess: z\n    .function()\n    .args(\n      z.object({\n        page: pageBaseSchema,\n        html: z.string(),\n      }),\n    )\n    .returns(z.any())\n    .optional(),\n  headers: z.record(z.string(), z.string()).optional(),\n})\n\nconst spaSchema = z.object({\n  enabled: z.boolean().optional().default(true),\n  maskPath: z.string().optional().default('/'),\n  prerender: pagePrerenderOptionsSchema\n    .optional()\n    .default({})\n    .transform((opts) => ({\n      outputPath: opts.outputPath ?? '/_shell',\n      crawlLinks: false,\n      retryCount: 0,\n      ...opts,\n      enabled: true,\n    })),\n})\n\nconst pageSchema = pageBaseSchema.extend({\n  prerender: pagePrerenderOptionsSchema.optional(),\n})\n\nconst tanstackStartOptionsSchema = z\n  .object({\n    tsr: tsrConfig.optional().default({}),\n    router: z\n      .object({\n        // TODO naming?\n        entry: z.string().optional(),\n      })\n      .optional()\n      .default({}),\n    client: z\n      .object({\n        entry: z.string().optional(),\n        base: z.string().optional().default('/_build'),\n      })\n      .optional()\n      .default({}),\n    server: z\n      .object({\n        entry: z.string().optional(),\n      })\n      .optional()\n      .default({}),\n    serverFns: z\n      .object({\n        base: z.string().optional().default('/_serverFn'),\n      })\n      .optional()\n      .default({}),\n    public: z\n      .object({\n        dir: z.string().optional().default('public'),\n        base: z.string().optional().default('/'),\n      })\n      .optional()\n      .default({}),\n    pages: z.array(pageSchema).optional().default([]),\n    sitemap: z\n      .object({\n        enabled: z.boolean().optional().default(true),\n        host: z.string().optional(),\n        outputPath: z.string().optional().default('sitemap.xml'),\n      })\n      .optional(),\n    prerender: z\n      .object({\n        enabled: z.boolean().optional(),\n        concurrency: z.number().optional(),\n        filter: z.function().args(pageSchema).returns(z.any()).optional(),\n        failOnError: z.boolean().optional(),\n      })\n      .and(pagePrerenderOptionsSchema.optional())\n      .optional(),\n    spa: spaSchema.optional(),\n    vite: z\n      .object({ installDevServerMiddleware: z.boolean().optional() })\n      .optional(),\n  })\n  .optional()\n  .default({})\n\nexport type Page = z.infer<typeof pageSchema>\n\nexport type TanStackStartInputConfig = z.input<\n  typeof tanstackStartOptionsSchema\n>\nexport type TanStackStartOutputConfig = ReturnType<typeof parseStartConfig>\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"schema.js","sources":["../../src/schema.ts"],"sourcesContent":["import path from 'node:path'\nimport { z } from 'zod'\nimport { configSchema, getConfig } from '@tanstack/router-generator'\n\nconst tsrConfig = configSchema.omit({ autoCodeSplitting: true }).partial()\n\nexport function parseStartConfig(\n  opts?: z.input<typeof tanstackStartOptionsSchema>,\n) {\n  const options = tanstackStartOptionsSchema.parse(opts)\n\n  const srcDirectory = options.srcDirectory\n\n  const routesDirectory =\n    options.router.routesDirectory ?? path.join(srcDirectory, 'routes')\n\n  const generatedRouteTree =\n    options.router.generatedRouteTree ??\n    path.join(srcDirectory, 'routeTree.gen.ts')\n\n  return {\n    ...options,\n    router: {\n      ...options.router,\n      ...getConfig({\n        ...options.router,\n        routesDirectory,\n        generatedRouteTree,\n      }),\n    },\n  }\n}\n\nconst pageSitemapOptionsSchema = z.object({\n  exclude: z.boolean().optional(),\n  priority: z.number().min(0).max(1).optional(),\n  changefreq: z\n    .enum(['always', 'hourly', 'daily', 'weekly', 'monthly', 'yearly', 'never'])\n    .optional(),\n  lastmod: z.union([z.string(), z.date()]).optional(),\n  alternateRefs: z\n    .array(\n      z.object({\n        href: z.string(),\n        hreflang: z.string(),\n      }),\n    )\n    .optional(),\n  images: z\n    .array(\n      z.object({\n        loc: z.string(),\n        caption: z.string().optional(),\n        title: z.string().optional(),\n      }),\n    )\n    .optional(),\n  news: z\n    .object({\n      publication: z.object({\n        name: z.string(),\n        language: z.string(),\n      }),\n      publicationDate: z.union([z.string(), z.date()]),\n      title: z.string(),\n    })\n    .optional(),\n})\n\nconst pageBaseSchema = z.object({\n  path: z.string(),\n  sitemap: pageSitemapOptionsSchema.optional(),\n  fromCrawl: z.boolean().optional(),\n})\n\nconst pagePrerenderOptionsSchema = z.object({\n  enabled: z.boolean().optional(),\n  outputPath: z.string().optional(),\n  autoSubfolderIndex: z.boolean().optional(),\n  crawlLinks: z.boolean().optional(),\n  retryCount: z.number().optional(),\n  retryDelay: z.number().optional(),\n  onSuccess: z\n    .function()\n    .args(\n      z.object({\n        page: pageBaseSchema,\n        html: z.string(),\n      }),\n    )\n    .returns(z.any())\n    .optional(),\n  headers: z.record(z.string(), z.string()).optional(),\n})\n\nconst spaSchema = z.object({\n  enabled: z.boolean().optional().default(true),\n  maskPath: z.string().optional().default('/'),\n  prerender: pagePrerenderOptionsSchema\n    .optional()\n    .default({})\n    .transform((opts) => ({\n      outputPath: opts.outputPath ?? '/_shell',\n      crawlLinks: false,\n      retryCount: 0,\n      ...opts,\n      enabled: true,\n    })),\n})\n\nconst pageSchema = pageBaseSchema.extend({\n  prerender: pagePrerenderOptionsSchema.optional(),\n})\n\nconst tanstackStartOptionsSchema = z\n  .object({\n    srcDirectory: z.string().optional().default('src'),\n    router: z\n      .object({\n        // TODO this will move to 'start' once we have `createStart`\n        entry: z.string().optional(),\n      })\n      .and(tsrConfig.optional().default({}))\n      .optional()\n      .default({}),\n    client: z\n      .object({\n        entry: z.string().optional(),\n        base: z.string().optional().default('/_build'),\n      })\n      .optional()\n      .default({}),\n    server: z\n      .object({\n        entry: z.string().optional(),\n      })\n      .optional()\n      .default({}),\n    serverFns: z\n      .object({\n        base: z.string().optional().default('/_serverFn'),\n      })\n      .optional()\n      .default({}),\n    public: z\n      .object({\n        dir: z.string().optional().default('public'),\n        base: z.string().optional().default('/'),\n      })\n      .optional()\n      .default({}),\n    pages: z.array(pageSchema).optional().default([]),\n    sitemap: z\n      .object({\n        enabled: z.boolean().optional().default(true),\n        host: z.string().optional(),\n        outputPath: z.string().optional().default('sitemap.xml'),\n      })\n      .optional(),\n    prerender: z\n      .object({\n        enabled: z.boolean().optional(),\n        concurrency: z.number().optional(),\n        filter: z.function().args(pageSchema).returns(z.any()).optional(),\n        failOnError: z.boolean().optional(),\n      })\n      .and(pagePrerenderOptionsSchema.optional())\n      .optional(),\n    spa: spaSchema.optional(),\n    vite: z\n      .object({ installDevServerMiddleware: z.boolean().optional() })\n      .optional(),\n  })\n  .optional()\n  .default({})\n\nexport type Page = z.infer<typeof pageSchema>\n\nexport type TanStackStartInputConfig = z.input<\n  typeof tanstackStartOptionsSchema\n>\nexport type TanStackStartOutputConfig = ReturnType<typeof parseStartConfig>\n"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/start-plugin-core",
-  "version": "1.132.0-alpha.5",
+  "version": "1.132.0-alpha.6",
   "description": "Modern and scalable routing for React applications",
   "author": "Tanner Linsley",
   "license": "MIT",

package/src/plugin.ts

@@ -56,7 +56,7 @@ export function TanStackStartVitePluginCore(
 
   return [
     tanStackStartRouter({
-      ...startConfig.tsr,
+      ...startConfig.router,
       target: corePluginOpts.framework,
       autoCodeSplitting: true,
     }),
@@ -67,7 +67,7 @@ export function TanStackStartVitePluginCore(
         globalThis.TSS_APP_BASE = viteAppBase
 
         const root = viteConfig.root || process.cwd()
-        const resolvedSrcDirectory = join(root, startConfig.tsr.srcDirectory)
+        const resolvedSrcDirectory = join(root, startConfig.srcDirectory)
 
         const routerFilePath = resolveEntry({
           type: 'router entry',

package/src/schema.ts

@@ -2,35 +2,28 @@ import path from 'node:path'
 import { z } from 'zod'
 import { configSchema, getConfig } from '@tanstack/router-generator'
 
-const tsrConfig = configSchema
-  .omit({ autoCodeSplitting: true })
-  .partial()
-  .extend({
-    // this is relative to vite root
-    // TODO why is this nested under tsr?
-    srcDirectory: z.string().optional().default('src'),
-  })
+const tsrConfig = configSchema.omit({ autoCodeSplitting: true }).partial()
 
 export function parseStartConfig(
   opts?: z.input<typeof tanstackStartOptionsSchema>,
 ) {
   const options = tanstackStartOptionsSchema.parse(opts)
 
-  const srcDirectory = options.tsr.srcDirectory
+  const srcDirectory = options.srcDirectory
 
   const routesDirectory =
-    options.tsr.routesDirectory ?? path.join(srcDirectory, 'routes')
+    options.router.routesDirectory ?? path.join(srcDirectory, 'routes')
 
   const generatedRouteTree =
-    options.tsr.generatedRouteTree ??
+    options.router.generatedRouteTree ??
     path.join(srcDirectory, 'routeTree.gen.ts')
 
   return {
     ...options,
-    tsr: {
-      ...options.tsr,
+    router: {
+      ...options.router,
       ...getConfig({
-        ...options.tsr,
+        ...options.router,
         routesDirectory,
         generatedRouteTree,
       }),
@@ -121,12 +114,13 @@ const pageSchema = pageBaseSchema.extend({
 
 const tanstackStartOptionsSchema = z
   .object({
-    tsr: tsrConfig.optional().default({}),
+    srcDirectory: z.string().optional().default('src'),
     router: z
       .object({
-        // TODO naming?
+        // TODO this will move to 'start' once we have `createStart`
         entry: z.string().optional(),
       })
+      .and(tsrConfig.optional().default({}))
       .optional()
       .default({}),
     client: z