one 1.1.512 → 1.1.513

package/src/metro-config/getViteMetroPluginOptions.ts

@@ -3,7 +3,10 @@ import module from 'node:module'
 import path from 'node:path'
 import tsconfigPaths from 'tsconfig-paths'
 import mm from 'micromatch'
-import { API_ROUTE_GLOB_PATTERN, ROUTE_NATIVE_EXCLUSION_GLOB_PATTERNS } from '../router/glob-patterns'
+import {
+  API_ROUTE_GLOB_PATTERN,
+  ROUTE_NATIVE_EXCLUSION_GLOB_PATTERNS,
+} from '../router/glob-patterns'
 
 export function getViteMetroPluginOptions({
   projectRoot,
@@ -85,20 +88,21 @@ export function getViteMetroPluginOptions({
           extraNodeModules: {
             ...defaultConfig?.resolver?.extraNodeModules,
             // "vite-tsconfig-paths" for Metro
-            ...Object.fromEntries(
-              Object.entries(tsconfigPathsConfigLoadResult.paths)
-                .map(([k, v]) => {
-                  if (k.endsWith('/*') && v[0]?.endsWith('/*')) {
-                    const key = k.replace(/\/\*$/, '')
-                    let value = v[0].replace(/\/\*$/, '')
-
-                    value = path.join(tsconfigPathsConfigLoadResult.absoluteBaseUrl, value)
-
-                    return [key, value]
-                  }
-                })
-                .filter((i): i is NonNullable<typeof i> => !!i)
-            ),
+            // Commenting out since we are using babel-plugin-module-resolver alias instead
+            // ...Object.fromEntries(
+            //   Object.entries(tsconfigPathsConfigLoadResult.paths)
+            //     .map(([k, v]) => {
+            //       if (k.endsWith('/*') && v[0]?.endsWith('/*')) {
+            //         const key = k.replace(/\/\*$/, '')
+            //         let value = v[0].replace(/\/\*$/, '')
+
+            //         value = path.join(tsconfigPathsConfigLoadResult.absoluteBaseUrl, value)
+
+            //         return [key, value]
+            //       }
+            //     })
+            //     .filter((i): i is NonNullable<typeof i> => !!i)
+            // ),
           },
           nodeModulesPaths: tsconfigPathsConfigLoadResult.absoluteBaseUrl
             ? [
@@ -140,9 +144,19 @@ export function getViteMetroPluginOptions({
           'babel-plugin-module-resolver',
           {
             alias: {
+              // "vite-tsconfig-paths" for Metro
               ...Object.fromEntries(
                 Object.entries(tsconfigPathsConfigLoadResult.paths).map(([k, v]) => {
-                  const key = k.replace(/\/\*$/, '')
+                  const key = (() => {
+                    if (k.endsWith('/*')) {
+                      return k.replace(/\/\*$/, '')
+                    }
+
+                    // If the key does not end with "/*", only alias exact matches.
+                    // Ref: https://www.npmjs.com/package/babel-plugin-module-resolver/v/3.0.0#regular-expression-alias
+                    return `${k}$`
+                  })()
+
                   let value = v[0].replace(/\/\*$/, '')
 
                   if (!value.startsWith('./')) {

package/src/typed-routes/generateRouteTypes.ts

@@ -1,12 +1,23 @@
 import FSExtra from 'fs-extra'
 import { writeFile } from 'node:fs/promises'
 import { dirname } from 'node:path'
+import micromatch from 'micromatch'
 import { globbedRoutesToRouteContext } from '../router/useViteRoutes'
 import { globDir } from '../utils/globDir'
 import { getTypedRoutesDeclarationFile } from './getTypedRoutesDeclarationFile'
 
-export async function generateRouteTypes(outFile: string, routerRoot: string) {
-  const routePaths = globDir(routerRoot)
+export async function generateRouteTypes(
+  outFile: string,
+  routerRoot: string,
+  ignoredRouteFiles?: string[]
+) {
+  let routePaths = globDir(routerRoot)
+  if (ignoredRouteFiles && ignoredRouteFiles.length > 0) {
+    routePaths = micromatch.not(routePaths, ignoredRouteFiles, {
+      // The path starts with './', such as './foo/bar/baz.test.tsx', and ignoredRouteFiles is like ['**/*.test.*'], so we need matchBase here.
+      matchBase: true,
+    })
+  }
   const routes = routePaths.reduce((acc, cur) => {
     acc[cur] = {}
     return acc

package/src/vite/one.ts

@@ -144,7 +144,7 @@ export function one(options: One.PluginOptions = {}): PluginOption {
       __get: options,
     },
 
-    barrelOption === false
+    !barrelOption
       ? null
       : (barrel({
           packages: Array.isArray(barrelOption) ? barrelOption : ['@tamagui/lucide-icons'],

package/src/vite/plugins/generateFileSystemRouteTypesPlugin.tsx

@@ -29,7 +29,7 @@ export function generateFileSystemRouteTypesPlugin(options: One.PluginOptions):
         if (type === 'add' || type === 'delete') {
           if (path.startsWith(appDir)) {
             // generate
-            generateRouteTypes(outFile, routerRoot)
+            generateRouteTypes(outFile, routerRoot, options.router?.ignoredRouteFiles)
           }
         }
       }, 100)
@@ -39,7 +39,7 @@ export function generateFileSystemRouteTypesPlugin(options: One.PluginOptions):
       return () => {
         // once on startup:
 
-        generateRouteTypes(outFile, routerRoot)
+        generateRouteTypes(outFile, routerRoot, options.router?.ignoredRouteFiles)
       }
     },
   } satisfies Plugin

package/types/metro-config/getViteMetroPluginOptions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getViteMetroPluginOptions.d.ts","sourceRoot":"","sources":["../../src/metro-config/getViteMetroPluginOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAO1D,wBAAgB,yBAAyB,CAAC,EACxC,WAAW,EACX,kBAAkB,EAClB,iBAAiB,GAClB,EAAE;IACD,WAAW,EAAE,MAAM,CAAA;IACnB,kBAAkB,EAAE,MAAM,CAAA;IAC1B,iBAAiB,CAAC,EAAE,KAAK,CAAC,OAAO,MAAM,EAAE,CAAC,CAAA;CAC3C,GAAG,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,CA4JpC"}
+{"version":3,"file":"getViteMetroPluginOptions.d.ts","sourceRoot":"","sources":["../../src/metro-config/getViteMetroPluginOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAU1D,wBAAgB,yBAAyB,CAAC,EACxC,WAAW,EACX,kBAAkB,EAClB,iBAAiB,GAClB,EAAE;IACD,WAAW,EAAE,MAAM,CAAA;IACnB,kBAAkB,EAAE,MAAM,CAAA;IAC1B,iBAAiB,CAAC,EAAE,KAAK,CAAC,OAAO,MAAM,EAAE,CAAC,CAAA;CAC3C,GAAG,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,CAuKpC"}

package/types/typed-routes/generateRouteTypes.d.ts

@@ -1,2 +1,2 @@
-export declare function generateRouteTypes(outFile: string, routerRoot: string): Promise<void>;
+export declare function generateRouteTypes(outFile: string, routerRoot: string, ignoredRouteFiles?: string[]): Promise<void>;
 //# sourceMappingURL=generateRouteTypes.d.ts.map

package/types/typed-routes/generateRouteTypes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generateRouteTypes.d.ts","sourceRoot":"","sources":["../../src/typed-routes/generateRouteTypes.ts"],"names":[],"mappings":"AAOA,wBAAsB,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,iBAU3E"}
+{"version":3,"file":"generateRouteTypes.d.ts","sourceRoot":"","sources":["../../src/typed-routes/generateRouteTypes.ts"],"names":[],"mappings":"AAQA,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,iBAAiB,CAAC,EAAE,MAAM,EAAE,iBAiB7B"}