fix: copy configuration should only works in main(web) environment (#…

…6340)

.changeset/nine-suns-knock.md

@@ -0,0 +1,5 @@
+---
+'@modern-js/app-tools': patch
+---
+
+fix: copy configuration should only works in main(web) environment

packages/cli/uni-builder/src/types.ts

@@ -379,6 +379,7 @@ export type OverridesUniBuilderInstance = {
     plugins: Array<UniBuilderPlugin | LooseRsbuildPlugin>,
     options?: {
       before?: string;
+      environment?: string;
     },
   ) => void;
 };

packages/solutions/app-tools/src/builder/builder-rspack/index.ts

@@ -1,11 +1,9 @@
 import { generateBuilder } from '../generator';
 import type { BuilderOptions } from '../shared';
-import { builderPluginAdpaterCopy } from './adapterCopy';
 
 export async function createRspackBuilderForModern(
   options: BuilderOptions<'rspack'>,
 ) {
   const builder = await generateBuilder(options, 'rspack');
-  builder.addPlugins([builderPluginAdpaterCopy(options)]);
   return builder;
 }

packages/solutions/app-tools/src/builder/builder-webpack/index.ts

@@ -1,6 +1,5 @@
 import { generateBuilder } from '../generator';
 import type { BuilderOptions } from '../shared';
-import { builderPluginAdapterModern } from './adapterModern';
 
 export async function createWebpackBuilderForModern(
   options: BuilderOptions<'webpack'>,
@@ -16,7 +15,5 @@ export async function createWebpackBuilderForModern(
     builder.addPlugins([pluginEsbuild(esbuildOptions)]);
   }
 
-  builder.addPlugins([builderPluginAdapterModern(options)]);
-
   return builder;
 }

packages/solutions/app-tools/src/builder/builder-webpack/adapterModern.ts → packages/solutions/app-tools/src/builder/generator/adapterCopy.ts

@@ -2,18 +2,15 @@ import type { RsbuildPlugin } from '@modern-js/uni-builder';
 import type { BuilderOptions } from '../shared';
 import { createPublicPattern } from './createCopyPattern';
 
-/**
- * Provides default configuration consistent with modern.js v1
- */
-export const builderPluginAdapterModern = (
-  options: BuilderOptions<'webpack'>,
+export const builderPluginAdapterCopy = (
+  options: BuilderOptions<'shared'>,
 ): RsbuildPlugin => ({
-  name: 'builder-plugin-adapter-modern',
+  name: 'builder-plugin-adapter-copy',
 
   setup(api) {
     const { normalizedConfig: modernConfig, appContext } = options;
 
-    api.modifyWebpackChain((chain, { CHAIN_ID }) => {
+    api.modifyBundlerChain((chain, { CHAIN_ID }) => {
       // apply copy plugin
       if (chain.plugins.has(CHAIN_ID.PLUGIN.COPY)) {
         const defaultCopyPattern = createPublicPattern(

packages/solutions/app-tools/src/builder/generator/createBuilderProviderConfig.ts

@@ -1,5 +1,5 @@
 import type { AppNormalizedConfig, Bundler, IAppContext } from '../../types';
-import { createUploadPattern } from '../builder-webpack/createCopyPattern';
+import { createUploadPattern } from './createCopyPattern';
 
 function modifyOutputConfig<B extends Bundler>(
   config: AppNormalizedConfig<B>,

packages/solutions/app-tools/src/builder/generator/getBuilderEnvironments.ts

@@ -7,11 +7,12 @@ import {
   isUseSSRBundle,
 } from '@modern-js/utils';
 import type { RsbuildConfig } from '@rsbuild/core';
-import type { AppNormalizedConfig } from '../../types';
+import type { AppNormalizedConfig, Bundler } from '../../types';
 
-export function getBuilderEnvironments(
+export function getBuilderEnvironments<B extends Bundler>(
   normalizedConfig: AppNormalizedConfig<'shared'>,
   appContext: IAppContext,
+  tempBuilderConfig: Omit<AppNormalizedConfig<B>, 'plugins'>,
 ) {
   // create entries
   type Entries = Record<string, string[]>;
@@ -49,6 +50,13 @@ export function getBuilderEnvironments(
     },
   };
 
+  // copy config should only works in main (web) environment
+  if (tempBuilderConfig.output?.copy) {
+    environments.web.output!.copy = tempBuilderConfig.output.copy;
+
+    delete tempBuilderConfig.output.copy;
+  }
+
   const useNodeTarget = isProd()
     ? isUseSSRBundle(normalizedConfig)
     : isSSR(normalizedConfig);
@@ -77,5 +85,8 @@ export function getBuilderEnvironments(
     };
   }
 
-  return environments;
+  return {
+    environments,
+    builderConfig: tempBuilderConfig,
+  };
 }

packages/solutions/app-tools/src/builder/generator/index.ts

@@ -6,6 +6,7 @@ import {
 import { mergeRsbuildConfig } from '@rsbuild/core';
 import type { Bundler } from '../../types';
 import type { BuilderOptions } from '../shared';
+import { builderPluginAdapterCopy } from './adapterCopy';
 import { createBuilderProviderConfig } from './createBuilderProviderConfig';
 import { getBuilderEnvironments } from './getBuilderEnvironments';
 
@@ -21,12 +22,16 @@ export async function generateBuilder<B extends Bundler>(
   const { normalizedConfig, appContext } = options;
 
   // create provider
-  const builderConfig = createBuilderProviderConfig<B>(
+  const tempBuilderConfig = createBuilderProviderConfig<B>(
     normalizedConfig,
     appContext,
   );
 
-  const environments = getBuilderEnvironments(normalizedConfig, appContext);
+  const { environments, builderConfig } = getBuilderEnvironments(
+    normalizedConfig,
+    appContext,
+    tempBuilderConfig,
+  );
 
   builderConfig.environments = builderConfig.environments
     ? mergeRsbuildConfig(environments, builderConfig.environments)
@@ -60,6 +65,10 @@ async function applyBuilderPlugins<B extends Bundler>(
     builderPluginAdapterHtml(options),
   ]);
 
+  builder.addPlugins([builderPluginAdapterCopy(options)], {
+    environment: 'web',
+  });
+
   const { normalizedConfig } = options;
   if (!normalizedConfig.output.disableNodePolyfill) {
     const { pluginNodePolyfill } = await import(