@tanstack/router-plugin 1.167.31 → 1.167.33

package/src/core/router-hmr-plugin.ts

@@ -4,8 +4,10 @@ import { getReferenceRouteCompilerPlugins } from './code-splitter/plugins/framew
 import { createRouteHmrStatement } from './hmr'
 import { debug, normalizePath } from './utils'
 import { getConfig } from './config'
+import { createRouterPluginContext } from './router-plugin-context'
 import type { UnpluginFactory } from 'unplugin'
 import type { Config } from './config'
+import type { RouterPluginContext } from './router-plugin-context'
 
 /**
  * This plugin adds HMR support for file routes.
@@ -18,11 +20,18 @@ const includeCode = [
   'createRootRoute(',
   'createRootRouteWithContext(',
 ]
-export const unpluginRouterHmrFactory: UnpluginFactory<
-  Partial<Config> | undefined
-> = (options = {}) => {
+
+export function createRouterHmrPlugin(
+  options: Partial<Config | (() => Config)> | undefined = {},
+  routerPluginContext: RouterPluginContext,
+): ReturnType<UnpluginFactory<Partial<Config> | undefined>> {
   let ROOT: string = process.cwd()
-  let userConfig = options as Config
+
+  const resolveUserConfig = () => {
+    return getConfig(typeof options === 'function' ? options() : options, ROOT)
+  }
+
+  let userConfig = resolveUserConfig()
 
   return {
     name: 'tanstack-router:hmr',
@@ -37,7 +46,7 @@ export const unpluginRouterHmrFactory: UnpluginFactory<
       },
       handler(code, id) {
         const normalizedId = normalizePath(id)
-        const routeEntry = globalThis.TSR_ROUTES_BY_ID_MAP?.get(normalizedId)
+        const routeEntry = routerPluginContext.routesByFile.get(normalizedId)
         if (!routeEntry) {
           return null
         }
@@ -74,7 +83,7 @@ export const unpluginRouterHmrFactory: UnpluginFactory<
           }
         }
 
-        const ast = parseAst({ code })
+        const ast = parseAst({ code, filename: normalizedId })
         ast.program.body.push(
           ...createRouteHmrStatement([], {
             hmrStyle,
@@ -97,7 +106,7 @@ export const unpluginRouterHmrFactory: UnpluginFactory<
     vite: {
       configResolved(config) {
         ROOT = config.root
-        userConfig = getConfig(options, ROOT)
+        userConfig = resolveUserConfig()
       },
       applyToEnvironment(environment) {
         if (userConfig.plugin?.vite?.environmentName) {
@@ -108,3 +117,9 @@ export const unpluginRouterHmrFactory: UnpluginFactory<
     },
   }
 }
+
+export const unpluginRouterHmrFactory: UnpluginFactory<
+  Partial<Config> | undefined
+> = (options = {}) => {
+  return createRouterHmrPlugin(options, createRouterPluginContext())
+}

package/src/core/router-plugin-context.ts

@@ -0,0 +1,11 @@
+import type { GetRoutesByFileMapResult } from '@tanstack/router-generator'
+
+export type RouterPluginContext = {
+  routesByFile: GetRoutesByFileMapResult
+}
+
+export function createRouterPluginContext(): RouterPluginContext {
+  return {
+    routesByFile: new Map(),
+  }
+}

package/src/esbuild.ts

@@ -1,11 +1,17 @@
 import { createEsbuildPlugin } from 'unplugin'
 
 import { configSchema } from './core/config'
-import { unpluginRouterCodeSplitterFactory } from './core/router-code-splitter-plugin'
-import { unpluginRouterGeneratorFactory } from './core/router-generator-plugin'
+import { createRouterCodeSplitterPlugin } from './core/router-code-splitter-plugin'
+import { createRouterGeneratorPlugin } from './core/router-generator-plugin'
 import { unpluginRouterComposedFactory } from './core/router-composed-plugin'
+import { createRouterPluginContext } from './core/router-plugin-context'
 
 import type { CodeSplittingOptions, Config } from './core/config'
+import type { RouterPluginContext } from './core/router-plugin-context'
+
+type RouterPluginOptions = Partial<Config | (() => Config)> | undefined
+
+const defaultRouterPluginContext = createRouterPluginContext()
 
 /**
  * @example
@@ -16,9 +22,15 @@ import type { CodeSplittingOptions, Config } from './core/config'
  * }
  * ```
  */
-const TanStackRouterGeneratorEsbuild = createEsbuildPlugin(
-  unpluginRouterGeneratorFactory,
-)
+const TanStackRouterGeneratorEsbuild = (
+  options?: RouterPluginOptions,
+  routerPluginContext?: RouterPluginContext,
+) => {
+  const pluginContext = routerPluginContext ?? defaultRouterPluginContext
+  return createEsbuildPlugin((pluginOptions: RouterPluginOptions) =>
+    createRouterGeneratorPlugin(pluginOptions, pluginContext),
+  )(options)
+}
 
 /**
  * @example
@@ -29,9 +41,15 @@ const TanStackRouterGeneratorEsbuild = createEsbuildPlugin(
  * }
  * ```
  */
-const TanStackRouterCodeSplitterEsbuild = createEsbuildPlugin(
-  unpluginRouterCodeSplitterFactory,
-)
+const TanStackRouterCodeSplitterEsbuild = (
+  options?: RouterPluginOptions,
+  routerPluginContext?: RouterPluginContext,
+) => {
+  const pluginContext = routerPluginContext ?? defaultRouterPluginContext
+  return createEsbuildPlugin((pluginOptions: RouterPluginOptions) =>
+    createRouterCodeSplitterPlugin(pluginOptions, pluginContext),
+  )(options)
+}
 
 /**
  * @example
@@ -54,4 +72,4 @@ export {
   tanstackRouter,
 }
 
-export type { Config, CodeSplittingOptions }
+export type { Config, CodeSplittingOptions, RouterPluginContext }

package/src/index.ts

@@ -1,6 +1,7 @@
 export { configSchema, getConfig } from './core/config'
 export { unpluginRouterCodeSplitterFactory } from './core/router-code-splitter-plugin'
 export { unpluginRouterGeneratorFactory } from './core/router-generator-plugin'
+export { createRouterPluginContext } from './core/router-plugin-context'
 export type {
   Config,
   ConfigInput,
@@ -9,6 +10,7 @@ export type {
   DeletableNodes,
   HmrOptions,
 } from './core/config'
+export type { RouterPluginContext } from './core/router-plugin-context'
 export {
   tsrSplit,
   splitRouteIdentNodes,

package/src/rspack.ts

@@ -1,13 +1,17 @@
 import { createRspackPlugin } from 'unplugin'
 
 import { configSchema } from './core/config'
-import { unpluginRouterCodeSplitterFactory } from './core/router-code-splitter-plugin'
-import { unpluginRouterGeneratorFactory } from './core/router-generator-plugin'
+import { createRouterCodeSplitterPlugin } from './core/router-code-splitter-plugin'
+import { createRouterGeneratorPlugin } from './core/router-generator-plugin'
 import { unpluginRouterComposedFactory } from './core/router-composed-plugin'
+import { createRouterPluginContext } from './core/router-plugin-context'
 import type { CodeSplittingOptions, Config } from './core/config'
+import type { RouterPluginContext } from './core/router-plugin-context'
 
 type RspackRouterPluginOptions = Partial<Config> | (() => Partial<Config>)
 
+const defaultRouterPluginContext = createRouterPluginContext()
+
 /**
  * Rspack uses webpack-compatible `module.hot` / `import.meta.webpackHot` HMR.
  * Force `plugin.hmr.style = 'webpack'` so the router HMR adapter emits
@@ -50,9 +54,18 @@ function withWebpackHmrStyle(
  * })
  * ```
  */
-const TanStackRouterGeneratorRspack = /* #__PURE__ */ createRspackPlugin(
-  unpluginRouterGeneratorFactory,
-)
+const TanStackRouterGeneratorRspack = (
+  options?: RspackRouterPluginOptions,
+  routerPluginContext?: RouterPluginContext,
+) => {
+  const pluginContext = routerPluginContext ?? defaultRouterPluginContext
+  return createRspackPlugin((pluginOptions) =>
+    createRouterGeneratorPlugin(
+      pluginOptions as Partial<Config | (() => Config)> | undefined,
+      pluginContext,
+    ),
+  )(options)
+}
 
 /**
  * @example
@@ -67,15 +80,20 @@ const TanStackRouterGeneratorRspack = /* #__PURE__ */ createRspackPlugin(
  * })
  * ```
  */
-const TanStackRouterCodeSplitterRspack = /* #__PURE__ */ createRspackPlugin(
-  (options, meta) =>
-    unpluginRouterCodeSplitterFactory(
+const TanStackRouterCodeSplitterRspack = (
+  options?: RspackRouterPluginOptions,
+  routerPluginContext?: RouterPluginContext,
+) => {
+  const pluginContext = routerPluginContext ?? defaultRouterPluginContext
+  return createRspackPlugin((pluginOptions) =>
+    createRouterCodeSplitterPlugin(
       withWebpackHmrStyle(
-        options as RspackRouterPluginOptions | undefined,
+        pluginOptions as RspackRouterPluginOptions | undefined,
       ) as Partial<Config | (() => Config)>,
-      meta,
+      pluginContext,
     ),
-)
+  )(options)
+}
 
 /**
  * @example
@@ -108,4 +126,4 @@ export {
   TanStackRouterCodeSplitterRspack,
   tanstackRouter,
 }
-export type { Config, CodeSplittingOptions }
+export type { Config, CodeSplittingOptions, RouterPluginContext }

package/src/vite.ts

@@ -1,10 +1,16 @@
 import { createVitePlugin } from 'unplugin'
 
-import { configSchema } from './core/config'
-import { unpluginRouterCodeSplitterFactory } from './core/router-code-splitter-plugin'
-import { unpluginRouterGeneratorFactory } from './core/router-generator-plugin'
+import { configSchema, getConfig } from './core/config'
+import { createRouterCodeSplitterPlugin } from './core/router-code-splitter-plugin'
+import { createRouterGeneratorPlugin } from './core/router-generator-plugin'
 import { unpluginRouterComposedFactory } from './core/router-composed-plugin'
-import type { CodeSplittingOptions, Config, getConfig } from './core/config'
+import { createRouterPluginContext } from './core/router-plugin-context'
+import type { CodeSplittingOptions, Config } from './core/config'
+import type { RouterPluginContext } from './core/router-plugin-context'
+
+type RouterPluginOptions = Partial<Config | (() => Config)> | undefined
+
+const defaultRouterPluginContext = createRouterPluginContext()
 
 /**
  * @example
@@ -15,7 +21,15 @@ import type { CodeSplittingOptions, Config, getConfig } from './core/config'
  * })
  * ```
  */
-const tanstackRouterGenerator = createVitePlugin(unpluginRouterGeneratorFactory)
+const tanstackRouterGenerator = (
+  options?: RouterPluginOptions,
+  routerPluginContext?: RouterPluginContext,
+) => {
+  const pluginContext = routerPluginContext ?? defaultRouterPluginContext
+  return createVitePlugin((pluginOptions: RouterPluginOptions) =>
+    createRouterGeneratorPlugin(pluginOptions, pluginContext),
+  )(options)
+}
 
 /**
  * @example
@@ -26,9 +40,15 @@ const tanstackRouterGenerator = createVitePlugin(unpluginRouterGeneratorFactory)
  * })
  * ```
  */
-const tanStackRouterCodeSplitter = createVitePlugin(
-  unpluginRouterCodeSplitterFactory,
-)
+const tanStackRouterCodeSplitter = (
+  options?: RouterPluginOptions,
+  routerPluginContext?: RouterPluginContext,
+) => {
+  const pluginContext = routerPluginContext ?? defaultRouterPluginContext
+  return createVitePlugin((pluginOptions: RouterPluginOptions) =>
+    createRouterCodeSplitterPlugin(pluginOptions, pluginContext),
+  )(options)
+}
 
 /**
  * @example
@@ -56,4 +76,4 @@ export {
   tanstackRouter,
 }
 
-export type { Config, CodeSplittingOptions }
+export type { Config, CodeSplittingOptions, RouterPluginContext }

package/src/webpack.ts

@@ -1,10 +1,14 @@
 import { createWebpackPlugin } from 'unplugin'
 
 import { configSchema } from './core/config'
-import { unpluginRouterCodeSplitterFactory } from './core/router-code-splitter-plugin'
-import { unpluginRouterGeneratorFactory } from './core/router-generator-plugin'
+import { createRouterCodeSplitterPlugin } from './core/router-code-splitter-plugin'
+import { createRouterGeneratorPlugin } from './core/router-generator-plugin'
 import { unpluginRouterComposedFactory } from './core/router-composed-plugin'
+import { createRouterPluginContext } from './core/router-plugin-context'
 import type { CodeSplittingOptions, Config } from './core/config'
+import type { RouterPluginContext } from './core/router-plugin-context'
+
+const defaultRouterPluginContext = createRouterPluginContext()
 
 /**
  * Webpack uses `module.hot` / `import.meta.webpackHot` HMR. Force
@@ -35,9 +39,15 @@ function withWebpackHmrStyle(
  * }
  * ```
  */
-const TanStackRouterGeneratorWebpack = /* #__PURE__ */ createWebpackPlugin(
-  unpluginRouterGeneratorFactory,
-)
+const TanStackRouterGeneratorWebpack = (
+  options?: Partial<Config>,
+  routerPluginContext?: RouterPluginContext,
+) => {
+  const pluginContext = routerPluginContext ?? defaultRouterPluginContext
+  return createWebpackPlugin((pluginOptions: Partial<Config> | undefined) =>
+    createRouterGeneratorPlugin(pluginOptions, pluginContext),
+  )(options)
+}
 
 /**
  * @example
@@ -48,13 +58,18 @@ const TanStackRouterGeneratorWebpack = /* #__PURE__ */ createWebpackPlugin(
  * }
  * ```
  */
-const TanStackRouterCodeSplitterWebpack = /* #__PURE__ */ createWebpackPlugin(
-  (options, meta) =>
-    unpluginRouterCodeSplitterFactory(
-      withWebpackHmrStyle(options as Partial<Config> | undefined),
-      meta,
+const TanStackRouterCodeSplitterWebpack = (
+  options?: Partial<Config>,
+  routerPluginContext?: RouterPluginContext,
+) => {
+  const pluginContext = routerPluginContext ?? defaultRouterPluginContext
+  return createWebpackPlugin((pluginOptions: Partial<Config> | undefined) =>
+    createRouterCodeSplitterPlugin(
+      withWebpackHmrStyle(pluginOptions),
+      pluginContext,
     ),
-)
+  )(options)
+}
 
 /**
  * @example
@@ -82,4 +97,4 @@ export {
   TanStackRouterCodeSplitterWebpack,
   tanstackRouter,
 }
-export type { Config, CodeSplittingOptions }
+export type { Config, CodeSplittingOptions, RouterPluginContext }

package/bin/intent.js

@@ -1,25 +0,0 @@
-#!/usr/bin/env node
-// Auto-generated by @tanstack/intent setup
-// Exposes the intent end-user CLI for consumers of this library.
-// Commit this file, then add to your package.json:
-//   "bin": { "intent": "./bin/intent.js" }
-try {
-  await import('@tanstack/intent/intent-library')
-} catch (e) {
-  const isModuleNotFound =
-    e?.code === 'ERR_MODULE_NOT_FOUND' || e?.code === 'MODULE_NOT_FOUND'
-  const missingIntentLibrary =
-    typeof e?.message === 'string' && e.message.includes('@tanstack/intent')
-
-  if (isModuleNotFound && missingIntentLibrary) {
-    console.error('@tanstack/intent is not installed.')
-    console.error('')
-    console.error('Install it as a dev dependency:')
-    console.error('  npm add -D @tanstack/intent')
-    console.error('')
-    console.error('Or run directly:')
-    console.error('  npx @tanstack/intent@latest list')
-    process.exit(1)
-  }
-  throw e
-}

package/src/global.d.ts

@@ -1,7 +0,0 @@
-/* eslint-disable no-var */
-import type { GetRoutesByFileMapResult } from '@tanstack/router-generator'
-
-declare global {
-  var TSR_ROUTES_BY_ID_MAP: GetRoutesByFileMapResult | undefined
-}
-export {}