chore: optimize compiler define

farm-fe · Oct 8, 2024 · f510fbf · f510fbf
1 parent 202aed4
commit f510fbf
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/examples/vue3/farm.config.ts b/examples/vue3/farm.config.ts
@@ -37,7 +37,7 @@ function myCustomPlugin() {
     apply: "serve",
     config(config, { command }) {},
     configureServer(server) {
-      console.log(server.moduleGraph.getModuleById);
+      // console.log(server.moduleGraph.getModuleById);
     },
     transformIndexHtml(c) {
       return c.replace(

diff --git a/packages/core/src/compiler/index.ts b/packages/core/src/compiler/index.ts
@@ -42,7 +42,7 @@ export class Compiler {
   constructor(public config: ResolvedUserConfig) {
     this._bindingCompiler = new BindingCompiler({
       // @ts-ignore
-      config: { ...config.compilation, ...config.config },
+      config: config.compilation,
       jsPlugins: config.jsPlugins,
       rustPlugins: config.rustPlugins
     });

diff --git a/packages/core/src/utils/trace-dependencies.ts b/packages/core/src/utils/trace-dependencies.ts
@@ -2,11 +2,12 @@ import { convertErrorMessage } from './error.js';
 
 import * as fs from 'node:fs';
 import { createInlineCompiler } from '../compiler/utils.js';
-import type { Config } from '../types/binding.js';
+import { ResolvedUserConfig } from '../config/types.js';
 
 function createTraceDepCompiler(entry: string) {
   const config = getDefaultTraceDepCompilerConfig(entry);
-  return createInlineCompiler(config, { progress: false });
+
+  return createInlineCompiler(config);
 }
 
 export async function traceDependencies(
@@ -29,9 +30,9 @@ export async function traceDependencies(
   }
 }
 
-function getDefaultTraceDepCompilerConfig(entry: string): Config {
+function getDefaultTraceDepCompilerConfig(entry: string): ResolvedUserConfig {
   return {
-    config: {
+    compilation: {
       input: {
         index: entry
       },
@@ -43,6 +44,7 @@ function getDefaultTraceDepCompilerConfig(entry: string): Config {
       presetEnv: false,
       persistentCache: false,
       minify: false,
+      progress: false,
       lazyCompilation: false
     },
     jsPlugins: [