diff --git a/integration/helpers/create-fixture.ts b/integration/helpers/create-fixture.ts index 7b2ba9b3485..63b09e26263 100644 --- a/integration/helpers/create-fixture.ts +++ b/integration/helpers/create-fixture.ts @@ -376,11 +376,11 @@ function build( }); // These logs are helpful for debugging. Remove comments if needed. - // console.log("spawning node " + buildArgs.join(" ") + ":\n"); - // console.log(" STDOUT:"); - // console.log(" " + buildSpawn.stdout.toString("utf-8")); - // console.log(" STDERR:"); - // console.log(" " + buildSpawn.stderr.toString("utf-8")); + console.log("spawning node " + buildArgs.join(" ") + ":\n"); + console.log(" STDOUT:"); + console.log(" " + buildSpawn.stdout.toString("utf-8")); + console.log(" STDERR:"); + console.log(" " + buildSpawn.stderr.toString("utf-8")); if (buildStdio) { buildStdio.write(buildSpawn.stdout.toString("utf-8")); diff --git a/packages/remix-dev/config/flat-routes.ts b/packages/remix-dev/config/flat-routes.ts index 8b7bb5586e4..1c4338c5d13 100644 --- a/packages/remix-dev/config/flat-routes.ts +++ b/packages/remix-dev/config/flat-routes.ts @@ -104,7 +104,7 @@ export function flatRoutes( let routes: string[] = []; for (let entry of entries) { - let filepath = path.join(routesDir, entry.name); + let filepath = normalizeSlashes(path.join(routesDir, entry.name)); let route: string | null = null; // If it's a directory, don't recurse into it, instead just look for a route module @@ -117,6 +117,7 @@ export function flatRoutes( } else if (entry.isFile()) { route = findRouteModuleForFile(appDirectory, filepath, ignoredFileRegex); } + console.log({ filepath, route }); if (route) routes.push(route); } @@ -150,6 +151,15 @@ export function flatRoutesUniversal( .relative(normalizedApp, normalizedFile) .slice(0, -routeExt.length) : path.posix.relative(normalizedApp, routeDir); + console.log({ + type: "routeId", + routeId, + normalizedApp, + prefix, + normalizedFile, + routeExt, + routeDir, + }); let conflict = routeIds.get(routeId); if (conflict) { @@ -183,6 +193,7 @@ export function flatRoutesUniversal( let childRouteIds = prefixLookup.findAndRemove(routeId, (value) => { return [".", "/"].includes(value.slice(routeId.length).charAt(0)); }); + console.log("add:", routeId); prefixLookup.add(routeId); if (childRouteIds.length > 0) { @@ -304,6 +315,14 @@ function findRouteModuleForFile( ): string | null { let relativePath = path.relative(appDirectory, filepath); let isIgnored = ignoredFileRegex.some((regex) => regex.test(relativePath)); + console.log({ + type: "find", + filepath, + isIgnored, + isIgnored2: ignoredFileRegex.some((rg) => + rg.test(normalizeSlashes(relativePath.replace("/", "\\"))) + ), + }); if (isIgnored) return null; return filepath; } diff --git a/packages/remix-dev/vite/plugin.ts b/packages/remix-dev/vite/plugin.ts index 0c174f22f35..8c5b7b84a1b 100644 --- a/packages/remix-dev/vite/plugin.ts +++ b/packages/remix-dev/vite/plugin.ts @@ -1441,6 +1441,7 @@ export const remixVitePlugin: RemixVitePlugin = (remixUserConfig = {}) => { async transform(code, id, options) { if (options?.ssr) return; + // change to trigger windows ci 1 let route = getRoute(ctx.remixConfig, id); if (!route) return;