feat(builder): update rspack to 0.1.12 (#3741)

* fix: output.copy not work in rspack * docs: add output.copy changeset * fix: update rspack * docs: add rspack changeset
web-infra-dev · May 23, 2023 · 7d2972e · 7d2972e
1 parent 76a3c51
commit 7d2972e
Show file tree

Hide file tree

Showing 13 changed files with 214 additions and 580 deletions.
diff --git a/.changeset/cold-poets-drum.md b/.changeset/cold-poets-drum.md
@@ -0,0 +1,7 @@
+---
+'@modern-js/builder-rspack-provider': patch
+---
+
+fix(builder): output.copy not work in Rspack
+
+fix(builder): output.copy 在 Rspack 构建时不生效
diff --git a/.changeset/dull-geckos-walk.md b/.changeset/dull-geckos-walk.md
@@ -0,0 +1,8 @@
+---
+'@modern-js/builder-rspack-provider': patch
+'@modern-js/builder-shared': patch
+---
+
+feat(builder): update rspack to 0.1.12
+
+feat(builder): 升级 rspack 到 0.1.12 版本
diff --git a/packages/builder/builder-rspack-provider/package.json b/packages/builder/builder-rspack-provider/package.json
@@ -56,11 +56,11 @@
     "@modern-js/types": "workspace:*",
     "@modern-js/utils": "workspace:*",
     "@babel/preset-typescript": "^7.21.5",
-    "@rspack/core": "0.0.0-canary-22b006c-20230517164249",
-    "@rspack/dev-client": "0.0.0-canary-22b006c-20230517164249",
-    "@rspack/dev-middleware": "0.0.0-canary-22b006c-20230517164249",
-    "@rspack/plugin-html": "0.0.0-canary-22b006c-20230517164249",
-    "@rspack/postcss-loader": "0.0.0-canary-22b006c-20230517164249",
+    "@rspack/core": "0.1.12",
+    "@rspack/dev-client": "0.1.12",
+    "@rspack/dev-middleware": "0.1.12",
+    "@rspack/plugin-html": "0.1.12",
+    "@rspack/postcss-loader": "0.1.12",
     "rspack-manifest-plugin": "5.0.0-alpha0",
     "caniuse-lite": "^1.0.30001451",
     "core-js": "~3.30.0",

diff --git a/packages/builder/builder-rspack-provider/src/plugins/output.ts b/packages/builder/builder-rspack-provider/src/plugins/output.ts
@@ -31,7 +31,16 @@ export const builderPluginOutput = (): BuilderPlugin => ({
       }
 
       if (config.output.copy) {
-        setConfig(rspackConfig, 'builtins.copy', config.output.copy);
+        const { copy } = config.output;
+        const options = Array.isArray(copy) ? { patterns: copy } : copy;
+
+        setConfig(rspackConfig, 'builtins.copy', {
+          ...options,
+          patterns: [
+            ...(rspackConfig?.builtins?.copy?.patterns || []),
+            ...options.patterns,
+          ],
+        });
       }
     });
   },

diff --git a/packages/builder/builder-rspack-provider/src/types/config/output.ts b/packages/builder/builder-rspack-provider/src/types/config/output.ts
@@ -9,7 +9,7 @@ export type OutputConfig = SharedOutputConfig & {
   /**
    * Copies the specified file or directory to the dist directory.
    */
-  copy?: Builtins['copy'];
+  copy?: Builtins['copy'] | NonNullable<Builtins['copy']>['patterns'];
   /**
    * Convert px to rem in CSS.
    */

diff --git a/packages/builder/builder-rspack-provider/tests/plugins/__snapshots__/output.test.ts.snap b/packages/builder/builder-rspack-provider/tests/plugins/__snapshots__/output.test.ts.snap
@@ -58,6 +58,33 @@ exports[`plugins/output > should allow to use copy plugin 1`] = `
 }
 `;
 
+exports[`plugins/output > should allow to use copy plugin with multiply config 1`] = `
+{
+  "builtins": {
+    "copy": {
+      "patterns": [
+        {
+          "from": "test",
+        },
+        "src/assets/",
+        "tests/",
+      ],
+    },
+  },
+  "module": {},
+  "output": {
+    "chunkFilename": "static/js/async/[name].js",
+    "cssChunkFilename": "static/css/async/[name].css",
+    "cssFilename": "static/css/[name].css",
+    "filename": "static/js/[name].js",
+    "hashFunction": "xxhash64",
+    "path": "<ROOT>/dist",
+    "pathinfo": false,
+    "publicPath": "/",
+  },
+}
+`;
+
 exports[`plugins/output > should allow to use filename.js to modify filename 1`] = `
 {
   "module": {},

diff --git a/packages/builder/builder-rspack-provider/tests/plugins/output.test.ts b/packages/builder/builder-rspack-provider/tests/plugins/output.test.ts
@@ -92,4 +92,34 @@ describe('plugins/output', () => {
     } = await builder.inspectConfig();
     expect(bundlerConfigs[0]).toMatchSnapshot();
   });
+
+  it('should allow to use copy plugin with multiply config', async () => {
+    const builder = await createBuilder({
+      plugins: [builderPluginOutput()],
+      builderConfig: {
+        output: {
+          copy: [
+            {
+              from: 'test',
+            },
+            'src/assets/',
+          ],
+        },
+        tools: {
+          rspack: {
+            builtins: {
+              copy: {
+                patterns: ['tests/'],
+              },
+            },
+          },
+        },
+      },
+    });
+
+    const {
+      origin: { bundlerConfigs },
+    } = await builder.inspectConfig();
+    expect(bundlerConfigs[0]).toMatchSnapshot();
+  });
 });
diff --git a/packages/builder/builder-shared/package.json b/packages/builder/builder-shared/package.json
@@ -108,8 +108,7 @@
     "html-webpack-plugin": "5.5.0",
     "terser": "^5.14.1",
     "typescript": "^5",
-    "webpack": "^5.82.1",
-    "@rspack/core": "0.0.0-canary-22b006c-20230517164249"
+    "webpack": "^5.82.1"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",

diff --git a/packages/builder/builder-shared/src/devServer.ts b/packages/builder/builder-shared/src/devServer.ts
@@ -5,6 +5,7 @@ import type {
   BuilderContext,
   OnAfterStartDevServerFn,
   OnBeforeStartDevServerFn,
+  CompilerTapFn,
 } from './types';
 import type { ModernDevServerOptions, Server } from '@modern-js/server';
 import { merge } from '@modern-js/utils/lodash';
@@ -207,10 +208,6 @@ type ServerCallbacks = {
   onDone: (stats: any) => void;
 };
 
-type CompilerTapFn<CallBack extends (...args: any[]) => void> = {
-  tap: (name: string, cb: CallBack) => void;
-};
-
 export const setupServerHooks = (
   compiler: {
     name?: Compiler['name'];

diff --git a/packages/builder/builder-shared/src/patch.ts b/packages/builder/builder-shared/src/patch.ts
@@ -1,13 +1,6 @@
 import path from 'path';
 import { pathToFileURL } from 'url';
-import type {
-  Compiler as WebpackCompiler,
-  MultiCompiler as WebpackMultiCompiler,
-} from 'webpack';
-import type {
-  Compiler as RspackCompiler,
-  MultiCompiler as RspackMultiCompiler,
-} from '@rspack/core';
+import { CompilerTapFn } from './types';
 
 const GLOBAL_PATCHED_SYMBOL: unique symbol = Symbol('GLOBAL_PATCHED_SYMBOL');
 
@@ -33,13 +26,14 @@ export function unpatchGlobalLocation() {
   }
 }
 
-export function patchCompilerGlobalLocation(
-  compiler:
-    | WebpackCompiler
-    | RspackCompiler
-    | WebpackMultiCompiler
-    | RspackMultiCompiler,
-) {
+export function patchCompilerGlobalLocation(compiler: {
+  hooks: {
+    run: CompilerTapFn;
+    watchRun: CompilerTapFn;
+    watchClose: CompilerTapFn;
+    done: CompilerTapFn;
+  };
+}) {
   // https://github.com/webpack/webpack/blob/136b723023f8f26d71eabdd16badf04c1c8554e4/lib/MultiCompiler.js#L64
   compiler.hooks.run.tap('PatchGlobalLocation', patchGlobalLocation);
   compiler.hooks.watchRun.tap('PatchGlobalLocation', patchGlobalLocation);

diff --git a/packages/builder/builder-shared/src/types/utils.ts b/packages/builder/builder-shared/src/types/utils.ts
@@ -37,3 +37,9 @@ export type SharedCompiledPkgNames =
   | 'toml-loader'
   | 'yaml-loader'
   | 'assetsRetry.js';
+
+export type CompilerTapFn<
+  CallBack extends (...args: any[]) => void = () => void,
+> = {
+  tap: (name: string, cb: CallBack) => void;
+};
diff --git a/packages/solutions/app-tools/src/builder/builder-rspack/adapterCopy.ts b/packages/solutions/app-tools/src/builder/builder-rspack/adapterCopy.ts
@@ -16,7 +16,7 @@ export const builderPluginAdpaterCopy = (
         ...(config.builtins || {}),
         copy: {
           patterns: [
-            ...transformCopy(config.builtins?.copy?.patterns),
+            ...(config.builtins?.copy?.patterns || []),
             ...createConfigBuiltinCopy(options),
           ],
         },
@@ -80,22 +80,6 @@ export const builderPluginAdpaterCopy = (
   },
 });
 
-function transformCopy(
-  patterns?: string[] | { from: string; [prop: string]: any }[],
-) {
-  if (patterns) {
-    patterns.map(value => {
-      if (typeof value === 'string') {
-        return {
-          from: value,
-        };
-      }
-      return value;
-    });
-  }
-  return [];
-}
-
 function createConfigBuiltinCopy(options: BuilderOptions<'rspack'>) {
   const { normalizedConfig, appContext } = options;
   const { uploadDir, publicDir } = createCopyInfo(appContext, normalizedConfig);