fix: error

farm-fe · Jul 19, 2024 · 519597d · 519597d
1 parent b0920f4
commit 519597d
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 3 deletions.
diff --git a/crates/toolkit/src/html/mod.rs b/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
 }
 

diff --git a/examples/vite-adapter-react/farm.config.ts b/examples/vite-adapter-react/farm.config.ts
@@ -9,6 +9,11 @@ export default defineConfig({
   ],
   compilation:{
     persistentCache: false,
+    minify: false,
+    output: {
+      publicPath: '/a',
+      targetEnv: 'browser',
+    }
   },
   vitePlugins: [
     Pages({

diff --git a/packages/core/src/config/normalize-config/normalize-output.ts b/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;
 }

diff --git a/packages/core/src/plugin/js/utils.ts b/packages/core/src/plugin/js/utils.ts
@@ -304,16 +304,16 @@ 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 = String.fromCharCode(...source);
+      source = Buffer.from(resource.bytes).toString('utf-8');
     }
-
     return {
       fileName: resource.name,
       name: resource.name,

diff --git a/packages/core/src/server/middlewares/static.ts b/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}`;