fix: bundle asset source

crates/toolkit/src/html/mod.rs

@@ -73,12 +73,12 @@ pub fn codegen_html_document(document: &Document, minify: bool) -> String {
     html_writer,
     CodegenConfig {
       minify,
+      quotes: Some(true),
       ..Default::default()
     },
   );
 
   html_gen.emit(document).unwrap();
-
   html_code
 }
 

examples/vite-adapter-react/farm.config.ts

@@ -1,17 +1,24 @@
 import { defineConfig } from '@farmfe/core';
 import Pages from 'vite-plugin-pages';
 import react from '@farmfe/plugin-react'
+import { viteSingleFile } from "vite-plugin-singlefile"
 
 export default defineConfig({
   plugins: [
     react({ runtime: 'automatic', refresh: true})
   ],
   compilation:{
-    persistentCache: false
+    persistentCache: false,
+    minify: false,
+    output: {
+      publicPath: '/a',
+      targetEnv: 'browser',
+    }
   },
   vitePlugins: [
     Pages({
       resolver: 'react'
-    })
+    }),
+    viteSingleFile()
   ]
 });

examples/vite-adapter-react/package.json

@@ -17,7 +17,8 @@
     "@types/react-dom": "18",
     "farm-plugin-remove-console": "^0.1.4",
     "react-refresh": "^0.14.0",
-    "vite-plugin-pages": "^0.32.0"
+    "vite-plugin-pages": "^0.32.0",
+    "vite-plugin-singlefile": "^2.0.2"
   },
   "scripts": {
     "dev": "farm start",

packages/core/src/config/normalize-config/normalize-output.ts

@@ -180,6 +180,7 @@ function tryGetDefaultPublicPath(
   if (!targetEnv) {
     return publicPath;
   }
+  console.log('🤖 == publicPath:', publicPath);
 
   if (publicPath) {
     if (urlRegex.test(publicPath)) {
@@ -250,6 +251,7 @@ export function normalizePublicPath(
     logger.warn(
       ` (!) Irregular 'publicPath' options: '${publicPath}', it should only be an absolute path like '/publicPath/', './', an url or an empty string.`
     );
+  console.log('🤖 == defaultPublicPath:', defaultPublicPath);
 
   return defaultPublicPath;
 }

packages/core/src/plugin/js/utils.ts

@@ -304,16 +304,21 @@ export function transformResourceInfo2RollupResource(
       type: 'chunk',
       code: source,
       name: resource.name,
+      fileName: resource.name,
       map: undefined,
       sourcemapFileName: null,
       preliminaryFileName: resource.origin.value
     } satisfies OutputChunk;
   } else {
+    let source: string | Uint8Array = Uint8Array.from(resource.bytes);
+    if (resource.resourceType === 'html' || resource.resourceType === 'css') {
+      source = Buffer.from(resource.bytes).toString('utf-8');
+    }
     return {
       fileName: resource.name,
       name: resource.name,
       needsCodeReference: false,
-      source: Uint8Array.from(resource.bytes),
+      source,
       type: 'asset'
     } satisfies OutputAsset;
   }
@@ -331,6 +336,10 @@ export function transformRollupResource2FarmResource(
       name: chunk.name
     };
   } else {
+    if (chunk.fileName.endsWith('.html') || chunk.fileName.endsWith('.css')) {
+      const encoder = new TextEncoder();
+      chunk.source = encoder.encode(chunk.source as string);
+    }
     return {
       bytes: Array.from(chunk.source as Uint8Array) as number[],
       emitted: originResource.emitted,

packages/core/src/plugin/js/vite-plugin-adapter.ts

@@ -778,7 +778,6 @@ export class VitePluginAdapter implements JsPlugin {
             },
             {} as OutputBundle
           );
-
           await hook?.(
             transformFarmConfigToRollupNormalizedOutputOptions(param.config),
             bundles

packages/core/src/server/middlewares/static.ts

@@ -21,11 +21,13 @@ export function staticMiddleware(devServerContext: Server): Middleware {
 
   return async (ctx: Context, next: Next) => {
     const requestPath = ctx.request?.path;
+    console.log('🤖 == return == requestPath:', requestPath);
 
     if (requestPath && requestPath.startsWith(config.output.publicPath)) {
       const modifiedPath = requestPath.substring(
         config.output.publicPath.length
       );
+      console.log('🤖 == return == modifiedPath:', modifiedPath);
 
       ctx.request.path = `/${modifiedPath}`;