test: remove legacy builtin configuration of builtin test cases (#11857)

Author: LingyuCoder

packages/rspack-test-tools/src/case/builtin.ts

@@ -1,5 +1,4 @@
 import path from "node:path";
-import { rspack } from "@rspack/core";
 import fs from "fs-extra";
 import { merge } from "webpack-merge";
 import { isJavaScript } from "../helper";
@@ -170,30 +169,6 @@ export function defaultOptions<T extends ECompilerType.Rspack>(
 		defaultOptions = merge(defaultOptions, caseOptions);
 	}
 
-	// TODO: remove builtin compatible code
-	const defineOptions = (defaultOptions as any).builtins?.define;
-	if (defineOptions) {
-		defaultOptions.plugins!.push(new rspack.DefinePlugin(defineOptions));
-	}
-
-	const provideOptions = (defaultOptions as any).builtins?.provide;
-	if (provideOptions) {
-		defaultOptions.plugins!.push(new rspack.ProvidePlugin(provideOptions));
-	}
-
-	const htmlOptions = (defaultOptions as any).builtins?.html;
-	if (htmlOptions) {
-		if (Array.isArray(htmlOptions)) {
-			for (const item of htmlOptions) {
-				defaultOptions.plugins!.push(new rspack.HtmlRspackPlugin(item));
-			}
-		} else {
-			defaultOptions.plugins!.push(new rspack.HtmlRspackPlugin(htmlOptions));
-		}
-	}
-
-	delete (defaultOptions as any).builtins;
-
 	if (!global.printLogger) {
 		defaultOptions.infrastructureLogging = {
 			level: "error"

tests/rspack-test/builtinCases/plugin-html/basic/rspack.config.js

@@ -1,6 +1,7 @@
+const { HtmlRspackPlugin } = require("@rspack/core");
 /** @type {import("@rspack/core").Configuration} */
 module.exports = {
-	builtins: {
-		html: [{}]
-	}
+	plugins: [
+		new HtmlRspackPlugin({})
+	],
 };

tests/rspack-test/builtinCases/plugin-html/chunks/rspack.config.js

@@ -1,3 +1,4 @@
+const { HtmlRspackPlugin } = require("@rspack/core");
 /** @type {import("@rspack/core").Configuration} */
 module.exports = {
 	entry: {
@@ -11,13 +12,11 @@ module.exports = {
 			import: ["./chunk3.js"]
 		}
 	},
-	builtins: {
-		html: [
-			{
-				template: "index.html",
-				chunks: ["chunk1", "chunk2"],
-				excludeChunks: ["chunk2"]
-			}
-		]
-	}
+	plugins: [
+		new HtmlRspackPlugin({
+			template: "index.html",
+			chunks: ["chunk1", "chunk2"],
+			excludeChunks: ["chunk2"]
+		})
+	],
 };

tests/rspack-test/builtinCases/plugin-html/favicon/rspack.config.js

@@ -1,15 +1,15 @@
+const { HtmlRspackPlugin } = require("@rspack/core");
 /** @type {import("@rspack/core").Configuration} */
 module.exports = {
 	entry: {
 		index: {
 			import: ["./index.js"]
 		}
 	},
-	builtins: {
-		html: [
-			{
-				favicon: "favicon.ico"
-			}
-		]
-	}
+	plugins: [
+		new HtmlRspackPlugin({
+			favicon: "favicon.ico"
+		})
+	],
+
 };

tests/rspack-test/builtinCases/plugin-html/filename/rspack.config.js

@@ -1,14 +1,14 @@
+const { HtmlRspackPlugin } = require("@rspack/core");
+
 /** @type {import("@rspack/core").Configuration} */
 module.exports = {
-	builtins: {
-		html: [
-			{
-				filename: "[name].[contenthash].html"
-			},
-			{
-				template: "./index.html",
-				filename: "[name].[contenthash].html"
-			}
-		]
-	}
+	plugins: [
+		new HtmlRspackPlugin({
+			filename: "[name].[contenthash].html"
+		}),
+		new HtmlRspackPlugin({
+			template: "./index.html",
+			filename: "[name].[contenthash].html"
+		})
+	],
 };

tests/rspack-test/builtinCases/plugin-html/inject/rspack.config.js

@@ -1,19 +1,18 @@
+const { HtmlRspackPlugin } = require("@rspack/core");
 /** @type {import("@rspack/core").Configuration} */
 module.exports = {
-	builtins: {
-		html: [
-			{
-				filename: "inject_head.html",
-				inject: "head"
-			},
-			{
-				filename: "inject_body.html",
-				inject: "body"
-			},
-			{
-				filename: "inject_false.html",
-				inject: false
-			}
-		]
-	}
+	plugins: [
+		new HtmlRspackPlugin({
+			filename: "inject_head.html",
+			inject: "head"
+		}),
+		new HtmlRspackPlugin({
+			filename: "inject_body.html",
+			inject: "body"
+		}),
+		new HtmlRspackPlugin({
+			filename: "inject_false.html",
+			inject: false
+		})
+	],
 };

tests/rspack-test/builtinCases/plugin-html/meta/rspack.config.js

@@ -1,20 +1,21 @@
+const { HtmlRspackPlugin } = require("@rspack/core");
+
 /** @type {import("@rspack/core").Configuration} */
 module.exports = {
 	entry: {
 		index: {
 			import: ["./index.js"]
 		}
 	},
-	builtins: {
-		html: [
-			{
-				meta: {
-					viewport: {
-						name: "viewport",
-						content: "width=device-width, initial-scale=1, shrink-to-fit=no"
-					}
+	plugins: [
+		new HtmlRspackPlugin({
+			meta: {
+				viewport: {
+					name: "viewport",
+					content: "width=device-width, initial-scale=1, shrink-to-fit=no"
 				}
 			}
-		]
-	}
+		})
+	],
+
 };

tests/rspack-test/builtinCases/plugin-html/minify/rspack.config.js

@@ -1,15 +1,14 @@
+const { HtmlRspackPlugin } = require("@rspack/core");
 /** @type {import("@rspack/core").Configuration} */
 module.exports = {
 	entry: {
 		index: {
 			import: ["./index.js"]
 		}
 	},
-	builtins: {
-		html: [
-			{
-				minify: true
-			}
-		]
-	}
+	plugins: [
+		new HtmlRspackPlugin({
+			minify: true
+		})
+	],
 };

tests/rspack-test/builtinCases/plugin-html/mpa/rspack.config.js

@@ -1,3 +1,4 @@
+const { HtmlRspackPlugin } = require("@rspack/core");
 /** @type {import("@rspack/core").Configuration} */
 module.exports = {
 	entry: {
@@ -11,23 +12,22 @@ module.exports = {
 			import: ["./chunk3.js"]
 		}
 	},
-	builtins: {
-		html: [
-			{
-				template: "index.html",
-				filename: "chunk1.html",
-				chunks: ["chunk1"]
-			},
-			{
-				template: "index.html",
-				filename: "chunk2.html",
-				chunks: ["chunk2"]
-			},
-			{
-				template: "index.html",
-				filename: "chunk3.html",
-				chunks: ["chunk3"]
-			}
-		]
-	}
+	plugins: [
+		new HtmlRspackPlugin({
+			template: "index.html",
+			filename: "chunk1.html",
+			chunks: ["chunk1"]
+		}),
+		new HtmlRspackPlugin({
+			template: "index.html",
+			filename: "chunk2.html",
+			chunks: ["chunk2"]
+		}),
+		new HtmlRspackPlugin({
+			template: "index.html",
+			filename: "chunk3.html",
+			chunks: ["chunk3"]
+		})
+	],
+
 };

tests/rspack-test/builtinCases/plugin-html/public-path/rspack.config.js

@@ -1,3 +1,4 @@
+const { HtmlRspackPlugin } = require("@rspack/core");
 /** @type {import("@rspack/core").Configuration} */
 module.exports = {
 	entry: {
@@ -8,11 +9,9 @@ module.exports = {
 	output: {
 		publicPath: "/base"
 	},
-	builtins: {
-		html: [
-			{
-				favicon: "favicon.ico"
-			}
-		]
-	}
+	plugins: [
+		new HtmlRspackPlugin({
+			favicon: "favicon.ico"
+		})
+	],
 };