chore: prepare write in writeResourcesToDisk

farm-fe · Dec 10, 2024 · 7788db0 · 7788db0
1 parent 3f589d1
commit 7788db0
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 17 deletions.
diff --git a/examples/vue3/farm.config.ts b/examples/vue3/farm.config.ts
@@ -16,7 +16,7 @@ import path from "path";
 const logger = new Logger({});
 const compressionMiddleware = () => {
   return {
-    name: "compression",
+    name: "compression,
     configureServer(server) {
       // console.log("server", server.middlewares);
       const _printUrls = server.printUrls.bind(server);
@@ -88,7 +88,7 @@ export default defineConfig({
     // Inspector({
     //   enabled: true,
     // }),
-    // compressionMiddleware(),
+    compressionMiddleware(),
     myCustomPlugin(),
     // createHtmlPlugin({
     //   minify: true,

diff --git a/packages/core/src/config/index.ts b/packages/core/src/config/index.ts
@@ -106,7 +106,6 @@ export async function resolveConfig(
   defaultNodeEnv: CompilationMode = 'development',
   isPreview = false
 ): Promise<ResolvedUserConfig> {
-  // TODO mode 这块还是不对 要区分 mode 和 build 还是 dev 环境
   const compileMode = defaultMode;
 
   const mode = inlineOptions.mode || defaultMode;

diff --git a/packages/core/src/plugin/js/constants.ts b/packages/core/src/plugin/js/constants.ts
@@ -46,7 +46,8 @@ export const RESERVED_OBJECT_PROPERTIES: string[] = [
   'then',
   'length',
   'constructor',
-  'prototype'
+  'prototype',
+  'stack'
 ];
 
 export const EXTERNAL_KEYS: string[] = [

diff --git a/packages/core/src/plugin/js/farm-to-vite-config.ts b/packages/core/src/plugin/js/farm-to-vite-config.ts
@@ -1,3 +1,4 @@
+import { WatchOptions } from 'chokidar';
 import type { UserConfig as ViteUserConfig } from 'vite';
 import type { UserConfig } from '../../config/types.js';
 import { Logger } from '../../index.js';
@@ -350,17 +351,6 @@ export function viteConfigToFarmConfig(
         if (!farmConfig.compilation.resolve.alias) {
           farmConfig.compilation.resolve.alias = [];
         }
-
-        const farmRegexPrefix = '$__farm_regex:';
-
-        // for (const { find, replacement } of config.resolve.alias) {
-        //   if (find instanceof RegExp) {
-        //     const key = farmRegexPrefix + find.source;
-        //     farmConfig.compilation.resolve.alias[key] = replacement;
-        //   } else {
-        //     farmConfig.compilation.resolve.alias[find] = replacement;
-        //   }
-        // }
       }
     }
 
@@ -388,8 +378,9 @@ export function viteConfigToFarmConfig(
             : {})
         };
       }
-      // TODO think about vite has two watch options `server.watch` | `build.watch` only build watch
-      // farmConfig.watch = config.server.watch;
+      if (config.mode === 'development') {
+        farmConfig.watch = config.server.watch;
+      }
     }
 
     if (typeof config.server.host === 'string') {
@@ -406,6 +397,9 @@ export function viteConfigToFarmConfig(
   }
 
   if (config.build) {
+    if (config.mode === 'production') {
+      farmConfig.watch = config.build.watch as WatchOptions;
+    }
     farmConfig.compilation.output ??= {};
     farmConfig.compilation.output.path = config.build.outDir;
 

diff --git a/packages/core/src/server/index.ts b/packages/core/src/server/index.ts
@@ -128,6 +128,7 @@ export class Server extends httpServer {
    */
   constructor(readonly inlineConfig: FarmCliOptions & UserConfig) {
     super();
+    this.logger = new Logger();
   }
 
   /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -128,6 +128,7 @@ export class Server extends httpServer { @@
        */
       constructor(readonly inlineConfig: FarmCliOptions & UserConfig) {
         super();
+        this.logger = new Logger();
       }
       /**
@@ Expand Down @@