chore: solve conflicts

farm-fe · Dec 24, 2023 · 0fa607d · 0fa607d
1 parent 81cecf4
commit 0fa607d
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 42 deletions.
diff --git a/js-plugins/solid/src/index.ts b/js-plugins/solid/src/index.ts
@@ -44,7 +44,7 @@ export default function farmPluginSolid(
 
   return {
     name: 'farm-plugin-solid',
-    config(config, configEnv) {
+    config(config) {
       return {
         compilation: {
           lazyCompilation:
@@ -55,11 +55,13 @@ export default function farmPluginSolid(
         }
       };
     },
-    configResolved(param) {
+    configResolved(config) {
+      const root = config.root ?? process.cwd();
+      const mode = config.compilation?.mode;
       // We inject the dev mode only if the use˜r explicitly wants it or if we are in dev (serve) mode
-      needHmr = param.mode !== 'production';
-      replaceDev = options.dev === true || param.mode === 'development';
-      projectRoot = param.root ?? process.cwd();
+      needHmr = mode !== 'production';
+      replaceDev = options.dev === true || mode === 'development';
+      projectRoot = root ?? process.cwd();
 
       if (!config.compilation.resolve) {
         config.compilation.resolve = {};

diff --git a/packages/core/src/config/index.ts b/packages/core/src/config/index.ts
@@ -35,7 +35,6 @@ import { normalizeOutput } from './normalize-config/normalize-output.js';
 import { traceDependencies } from '../utils/trace-dependencies.js';
 
 import type {
-  ConfigEnv,
   FarmCLIOptions,
   NormalizedServerConfig,
   ResolvedUserConfig,
@@ -108,10 +107,6 @@ export async function resolveConfig(
   }
 
   const { config: userConfig, configFilePath } = loadedUserConfig;
-  const configEnv: ConfigEnv = {
-    mode,
-    command
-  };
 
   const { jsPlugins, rustPlugins } = await resolveFarmPlugins(userConfig);
 
@@ -135,11 +130,7 @@ export async function resolveConfig(
     ...vitePluginAdapters
   ]);
 
-  const config = await resolveConfigHook(
-    userConfig,
-    configEnv,
-    sortFarmJsPlugins
-  );
+  const config = await resolveConfigHook(userConfig, sortFarmJsPlugins);
 
   const mergedUserConfig = mergeInlineCliOptions(config, inlineOptions);
   const resolvedUserConfig = await resolveMergedUserConfig(

diff --git a/packages/core/src/config/types.ts b/packages/core/src/config/types.ts
@@ -35,11 +35,6 @@ export type NormalizedServerConfig = Required<
   }
 >;
 
-export interface ConfigEnv {
-  command: 'build' | 'serve';
-  mode: string;
-}
-
 export interface NormalizedConfig {
   compilationConfig: Config;
   serverConfig?: NormalizedServerConfig;

diff --git a/packages/core/src/plugin/index.ts b/packages/core/src/plugin/index.ts
@@ -3,11 +3,7 @@ import { convertPlugin } from './js/index.js';
 import { rustPluginResolver } from './rust/index.js';
 
 import type { JsPlugin } from './type.js';
-import {
-  ConfigEnv,
-  ResolvedUserConfig,
-  type UserConfig
-} from '../config/index.js';
+import { ResolvedUserConfig, type UserConfig } from '../config/index.js';
 import merge from 'lodash.merge';
 
 export * from './js/index.js';
@@ -75,7 +71,6 @@ export async function resolveAsyncPlugins<T>(arr: T[]): Promise<T[]> {
 
 export async function resolveConfigHook(
   config: UserConfig,
-  configEnv: ConfigEnv,
   plugins: JsPlugin[]
 ): Promise<UserConfig> {
   let conf = config;
@@ -92,7 +87,7 @@ export async function resolveConfigHook(
 
   for (const p of uniqueVitePlugins.values()) {
     if (p.config) {
-      const res = await p.config(conf, configEnv);
+      const res = await p.config(conf);
 
       if (res) {
         conf = merge(conf, res);

diff --git a/packages/core/src/plugin/js/vite-plugin-adapter.ts b/packages/core/src/plugin/js/vite-plugin-adapter.ts
@@ -184,7 +184,7 @@ export class VitePluginAdapter implements JsPlugin {
   // call both config and configResolved
   async config(config: UserConfig) {
     this._farmConfig = config;
-    this._viteConfig = farmConfigToViteConfig(this._farmConfig);
+    this._viteConfig = farmUserConfigToViteConfig(this._farmConfig);
 
     const configHook = this.wrapRawPluginHook('config', this._rawPlugin.config);
 
@@ -215,7 +215,7 @@ export class VitePluginAdapter implements JsPlugin {
     if (!this._rawPlugin.configResolved) return;
     this._farmConfig = config;
     this._viteConfig = proxyViteConfig(
-      farmConfigToViteConfig(config),
+      farmUserConfigToViteConfig(config),
       this.name,
       this._logger
     );
@@ -254,14 +254,14 @@ export class VitePluginAdapter implements JsPlugin {
     }
   }
 
-  // private getViteConfigEnv(): ConfigEnv {
-  //   return {
-  //     ssrBuild: this._farmConfig.compilation?.output?.targetEnv === 'node',
-  //     command:
-  //       this._farmConfig.compilation?.mode === 'production' ? 'build' : 'serve',
-  //     mode: this._farmConfig.compilation?.mode
-  //   };
-  // }
+  private getViteConfigEnv(): ConfigEnv {
+    return {
+      ssrBuild: this._farmConfig.compilation?.output?.targetEnv === 'node',
+      command:
+        this._farmConfig.compilation?.mode === 'production' ? 'build' : 'serve',
+      mode: this._farmConfig.compilation?.mode
+    };
+  }
 
   private shouldExecutePlugin() {
     const command =

diff --git a/packages/core/src/plugin/type.ts b/packages/core/src/plugin/type.ts
@@ -9,7 +9,6 @@ import {
 } from '../../binding/index.js';
 import {
   Compiler,
-  ConfigEnv,
   DevServer,
   ResolvedUserConfig,
   UserConfig
@@ -132,10 +131,7 @@ export interface JsPlugin {
   //   | ((this: void, config: UserConfig, env: ConfigEnv) => boolean);
   // config?: Callback<Config['config'], Config['config']>;
 
-  config?: (
-    config: UserConfig,
-    configEnv?: ConfigEnv
-  ) => UserConfig | Promise<UserConfig>;
+  config?: (config: UserConfig) => UserConfig | Promise<UserConfig>;
 
   configResolved?: (config: ResolvedUserConfig) => void | Promise<void>;