fix path resolution issue

Author: zth

CHANGELOG.md

@@ -1,5 +1,7 @@
 # master
 
+- Fix minor path resolution issue in the new static assets setup.
+
 # 1.4.0
 
 - Add Bun single-file executable support to the Vite plugin via `staticAssetRoutes.mode`, including an `embedded` mode for `bun build --compile` and normalized build-time asset URLs for generated browser assets like `resXClient_js`.

res-x-vite-plugin.mjs

@@ -350,8 +350,6 @@ export default function resXVitePlugin(options = {}) {
         delete bundle[fileName];
       });
 
-      const resolvedOutDir = resolveConfiguredPath(projectRoot, outDir);
-      const resolvedPublicDir = resolveConfiguredPath(projectRoot, publicDir);
       const bundleFileNames = Object.values(bundle)
         .map(output => output.fileName)
         .filter(Boolean);
@@ -360,8 +358,9 @@ export default function resXVitePlugin(options = {}) {
         bundleFileNames,
         clientFileNameByFieldName,
         manifest,
-        outDir: resolvedOutDir,
-        publicDir: resolvedPublicDir,
+        outDir,
+        projectRoot,
+        publicDir,
         staticAssetRoutes,
       });
 
@@ -997,12 +996,12 @@ function getDummyStaticAssetRoutesFile(
     exactEntries: buildStaticAssetRouteEntries({
       publicEntries: getPublicRouteEntries({
         baseDir: resolvedPublicDir,
-        fileDir: resolvedPublicDir,
+        fileDir: publicDir,
       }),
       assetEntries: getAssetDirContent(resolvedAssetDir).map(assetPath => ({
         kind: "asset",
         routePath: toRoutePath(path.join(assetRouteBase, assetPath)),
-        sourcePath: path.resolve(resolvedAssetDir, assetPath),
+        sourcePath: path.join(assetDir, assetPath),
       })),
       exactEntries:
         resXClientLocation == null
@@ -1011,7 +1010,7 @@ function getDummyStaticAssetRoutesFile(
               {
                 kind: "client",
                 routePath: toRoutePath(resXClientLocation),
-                sourcePath: resolveConfiguredPath(projectRoot, resXClientLocation),
+                sourcePath: resXClientLocation,
               },
             ],
       headers: staticAssetRoutes.headers,
@@ -1026,9 +1025,11 @@ function getGeneratedBuildManifest({
   clientFileNameByFieldName,
   manifest,
   outDir,
+  projectRoot,
   publicDir,
   staticAssetRoutes,
 }) {
+  const resolvedPublicDir = resolveConfiguredPath(projectRoot, publicDir);
   const exposedAssetEntries = manifest.flatMap(entry => {
     const generatedPath =
       entry.kind === "asset"
@@ -1044,20 +1045,20 @@ function getGeneratedBuildManifest({
         fieldName: entry.fieldName,
         kind: entry.kind,
         routePath: toRoutePath(generatedPath),
-        sourcePath: path.resolve(outDir, generatedPath),
+        sourcePath: path.join(outDir, generatedPath),
       },
     ];
   });
 
   const serverAssetEntries = buildStaticAssetRouteEntries({
     publicEntries: getPublicRouteEntries({
-      baseDir: publicDir,
+      baseDir: resolvedPublicDir,
       fileDir: outDir,
     }),
     assetEntries: bundleFileNames.map(fileName => ({
       kind: "bundle",
       routePath: toRoutePath(fileName),
-      sourcePath: path.resolve(outDir, fileName),
+      sourcePath: path.join(outDir, fileName),
     })),
     exactEntries: exposedAssetEntries,
     headers: staticAssetRoutes.headers,
@@ -1120,7 +1121,7 @@ function getPublicRouteEntries({ baseDir, fileDir }) {
   return getPublicDirContent(baseDir).map(publicPath => ({
     kind: "public",
     routePath: toRoutePath(publicPath),
-    sourcePath: path.resolve(fileDir, publicPath),
+    sourcePath: path.join(fileDir, publicPath),
   }));
 }
 

test/StaticAssetRoutes.test.js

@@ -506,6 +506,7 @@ describe("static asset routes", () => {
           },
         ],
         outDir,
+        projectRoot: tempDir,
         publicDir,
         staticAssetRoutes: createStaticAssetRoutesConfig({
           headers: {
@@ -618,6 +619,7 @@ describe("static asset routes", () => {
           },
         ],
         outDir,
+        projectRoot: tempDir,
         publicDir,
         staticAssetRoutes,
       });
@@ -718,4 +720,54 @@ console.log(server.port);
       }
     });
   });
+
+  test("filesystem build routes keep outside-root outDir relative", async () => {
+    const {
+      createStaticAssetRoutesConfig,
+      getBuildStaticAssetRoutesFile,
+      getGeneratedBuildManifest,
+    } = await getPluginTestHelpers();
+
+    await withTempDir(async tempDir => {
+      const projectRoot = path.join(tempDir, "app");
+      const outDir = "../dist";
+      const publicDir = "public";
+      const generatedDir = path.join(projectRoot, "src", "__generated__");
+      const modulePath = path.join(generatedDir, "res-x-static-routes.js");
+
+      fs.mkdirSync(path.join(projectRoot, publicDir), { recursive: true });
+      fs.mkdirSync(path.join(tempDir, "dist", "assets"), { recursive: true });
+      fs.mkdirSync(generatedDir, { recursive: true });
+      fs.writeFileSync(
+        path.join(projectRoot, publicDir, "robots.txt"),
+        "User-agent: *"
+      );
+      fs.writeFileSync(
+        path.join(tempDir, "dist", "assets", "app.css"),
+        "body { color: red; }"
+      );
+
+      const staticAssetRoutes = createStaticAssetRoutesConfig();
+      const generatedBuildManifest = getGeneratedBuildManifest({
+        assetFileNameByBuildId: new Map(),
+        bundleFileNames: ["assets/app.css"],
+        clientFileNameByFieldName: new Map(),
+        manifest: [],
+        outDir,
+        projectRoot,
+        publicDir,
+        staticAssetRoutes,
+      });
+      const content = getBuildStaticAssetRoutesFile({
+        generatedFilePath: modulePath,
+        projectRoot,
+        serverAssetEntries: generatedBuildManifest.serverAssetEntries,
+        staticAssetRoutes,
+      });
+
+      expect(content.includes('Bun.file("../dist/assets/app.css")')).toBe(true);
+      expect(content.includes('Bun.file("/')).toBe(false);
+      expect(content.includes('Bun.file("../dist/robots.txt")')).toBe(true);
+    });
+  });
 });