@unpackjs/plugin-react 1.6.4 → 1.7.1

package/dist/click-to-component/index.cjs

@@ -27,7 +27,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var click_to_component_exports = {};
 __export(click_to_component_exports, {
-  addClickToComponentSupport: () => addClickToComponentSupport
+  applyClickToComponentConfig: () => applyClickToComponentConfig
 });
 module.exports = __toCommonJS(click_to_component_exports);
 var import_node_fs = __toESM(require("node:fs"));
@@ -60,7 +60,7 @@ const createServer = () => {
     });
   });
 };
-const addClickToComponentSupport = async ({
+const applyClickToComponentConfig = async ({
   config,
   unpackConfig
 }) => {
@@ -99,5 +99,5 @@ import '${(0, import_core.getPathInJs)(import_node_path.default.resolve(Object.v
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  addClickToComponentSupport
+  applyClickToComponentConfig
 });

package/dist/click-to-component/index.d.ts

@@ -1,5 +1,5 @@
 import { type BundlerConfiguration, type UnpackConfig } from '@unpackjs/core';
-export declare const addClickToComponentSupport: ({ config, unpackConfig, }: {
+export declare const applyClickToComponentConfig: ({ config, unpackConfig, }: {
     config: BundlerConfiguration;
     unpackConfig: UnpackConfig;
 }) => Promise<BundlerConfiguration>;

package/dist/click-to-component/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/click-to-component/index.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,KAAK,oBAAoB,EAEzB,KAAK,YAAY,EAGlB,MAAM,gBAAgB,CAAA;AA4BvB,eAAO,MAAM,0BAA0B,8BAGpC;IACD,MAAM,EAAE,oBAAoB,CAAA;IAC5B,YAAY,EAAE,YAAY,CAAA;CAC3B,KAAG,OAAO,CAAC,oBAAoB,CA+B/B,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/click-to-component/index.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,KAAK,oBAAoB,EAEzB,KAAK,YAAY,EAGlB,MAAM,gBAAgB,CAAA;AA4BvB,eAAO,MAAM,2BAA2B,8BAGrC;IACD,MAAM,EAAE,oBAAoB,CAAA;IAC5B,YAAY,EAAE,YAAY,CAAA;CAC3B,KAAG,OAAO,CAAC,oBAAoB,CA+B/B,CAAA"}

package/dist/click-to-component/index.js

@@ -41,7 +41,7 @@ const createServer = () => {
     });
   });
 };
-const addClickToComponentSupport = async ({
+const applyClickToComponentConfig = async ({
   config,
   unpackConfig
 }) => {
@@ -79,5 +79,5 @@ import '${getPathInJs(path2.resolve(Object.values(config.entry)[0]))}'
   return config;
 };
 export {
-  addClickToComponentSupport
+  applyClickToComponentConfig
 };

package/dist/index.cjs

@@ -42,17 +42,18 @@ const pluginReact = (options = {}) => {
   const { clickToComponent, reactCompiler } = options;
   return {
     name: PLUGIN_NAME,
-    bundlerConfig: async (originalConfig, { unpackConfig, mergeConfig }) => {
+    bundlerConfig: async (originalConfig, { unpackConfig, mergeConfig, bundler }) => {
       let config = originalConfig;
-      config = (0, import_mpa.addMpaSupport)({ config, unpackConfig, mergeConfig });
+      const isRspack = unpackConfig.bundler === "rspack";
+      const HtmlPlugin = isRspack ? bundler.HtmlRspackPlugin : import_core.HtmlWebpackPlugin;
+      config = (0, import_mpa.applyMpaConfig)({ config, unpackConfig, mergeConfig, HtmlPlugin });
       if ((0, import_core.isDev)() && clickToComponent) {
-        config = await (0, import_click_to_component.addClickToComponentSupport)({ config, unpackConfig });
+        config = await (0, import_click_to_component.applyClickToComponentConfig)({ config, unpackConfig });
       }
       if (reactCompiler && !(0, import_core.getUserDepPath)(unpackConfig.root, "react-compiler-runtime")) {
         import_core.logger.error('Dependency "react-compiler-runtime" not found. Did you install it?');
         process.exit(1);
       }
-      const isRspack = unpackConfig.bundler === "rspack";
       const jsExclude = [/node_modules[\\/](?!\.unpack)/];
       const swcLoader = isRspack ? "builtin:swc-loader" : require.resolve("swc-loader");
       const ReactRefreshPlugin = isRspack ? import_plugin_react_refresh.default : import_react_refresh_webpack_plugin.default;
@@ -84,8 +85,12 @@ const pluginReact = (options = {}) => {
             {
               test: /\.(j|t)s$/,
               exclude: jsExclude,
-              loader: swcLoader,
-              options: getSwcOptions({ tsx: false })
+              use: [
+                {
+                  loader: swcLoader,
+                  options: getSwcOptions({ tsx: false })
+                }
+              ]
             },
             {
               test: /\.(j|t)sx$/,

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAGL,KAAK,YAAY,EAMlB,MAAM,gBAAgB,CAAA;AAIvB,eAAO,MAAM,WAAW,iBAAiB,CAAA;AAEzC,MAAM,MAAM,kBAAkB,GAAG;IAC/B,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,aAAa,CAAC,EAAE,OAAO,CAAA;CACxB,CAAA;AACD,eAAO,MAAM,WAAW,aAAa,kBAAkB,KAAQ,YAsF9D,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAIL,KAAK,YAAY,EAMlB,MAAM,gBAAgB,CAAA;AAIvB,eAAO,MAAM,WAAW,iBAAiB,CAAA;AAEzC,MAAM,MAAM,kBAAkB,GAAG;IAC/B,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,aAAa,CAAC,EAAE,OAAO,CAAA;CACxB,CAAA;AACD,eAAO,MAAM,WAAW,aAAa,kBAAkB,KAAQ,YA4F9D,CAAA"}

package/dist/index.js

@@ -12,6 +12,7 @@ import WebpackReactRefreshPlugin from "@pmmmwh/react-refresh-webpack-plugin";
 import RspackReactRefreshPlugin from "@rspack/plugin-react-refresh";
 import {
   DEFAULT_BROWSERSLIST,
+  HtmlWebpackPlugin,
   THREAD_OPTIONS,
   getUserDepPath,
   getUserDepVersion,
@@ -19,24 +20,25 @@ import {
   isDevServer,
   logger
 } from "@unpackjs/core";
-import { addClickToComponentSupport } from "./click-to-component/index.js";
-import { addMpaSupport } from "./mpa.js";
+import { applyClickToComponentConfig } from "./click-to-component/index.js";
+import { applyMpaConfig } from "./mpa.js";
 const PLUGIN_NAME = "unpack:react";
 const pluginReact = (options = {}) => {
   const { clickToComponent, reactCompiler } = options;
   return {
     name: PLUGIN_NAME,
-    bundlerConfig: async (originalConfig, { unpackConfig, mergeConfig }) => {
+    bundlerConfig: async (originalConfig, { unpackConfig, mergeConfig, bundler }) => {
       let config = originalConfig;
-      config = addMpaSupport({ config, unpackConfig, mergeConfig });
+      const isRspack = unpackConfig.bundler === "rspack";
+      const HtmlPlugin = isRspack ? bundler.HtmlRspackPlugin : HtmlWebpackPlugin;
+      config = applyMpaConfig({ config, unpackConfig, mergeConfig, HtmlPlugin });
       if (isDev() && clickToComponent) {
-        config = await addClickToComponentSupport({ config, unpackConfig });
+        config = await applyClickToComponentConfig({ config, unpackConfig });
       }
       if (reactCompiler && !getUserDepPath(unpackConfig.root, "react-compiler-runtime")) {
         logger.error('Dependency "react-compiler-runtime" not found. Did you install it?');
         process.exit(1);
       }
-      const isRspack = unpackConfig.bundler === "rspack";
       const jsExclude = [/node_modules[\\/](?!\.unpack)/];
       const swcLoader = isRspack ? "builtin:swc-loader" : require.resolve("swc-loader");
       const ReactRefreshPlugin = isRspack ? RspackReactRefreshPlugin : WebpackReactRefreshPlugin;
@@ -68,8 +70,12 @@ const pluginReact = (options = {}) => {
             {
               test: /\.(j|t)s$/,
               exclude: jsExclude,
-              loader: swcLoader,
-              options: getSwcOptions({ tsx: false })
+              use: [
+                {
+                  loader: swcLoader,
+                  options: getSwcOptions({ tsx: false })
+                }
+              ]
             },
             {
               test: /\.(j|t)sx$/,

package/dist/mpa.cjs

@@ -27,20 +27,21 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var mpa_exports = {};
 __export(mpa_exports, {
-  addMpaSupport: () => addMpaSupport
+  applyMpaConfig: () => applyMpaConfig
 });
 module.exports = __toCommonJS(mpa_exports);
 var import_node_fs = __toESM(require("node:fs"));
 var import_node_path = __toESM(require("node:path"));
 var import_core = require("@unpackjs/core");
-var import_html_webpack_plugin = __toESM(require("html-webpack-plugin"));
-const addMpaSupport = ({
+const applyMpaConfig = ({
   config,
   unpackConfig,
-  mergeConfig
+  mergeConfig,
+  HtmlPlugin
 }) => {
   if (!unpackConfig.mpa)
     return config;
+  const isRspack = unpackConfig.bundler === "rspack";
   const tempDirectory = import_node_path.default.join(import_core.TEMP_DIR, "mpa");
   const userOptions = (0, import_core.isPlainObject)(unpackConfig.mpa) ? unpackConfig.mpa : {};
   const getPageConfig = (indexPath) => {
@@ -52,7 +53,7 @@ const addMpaSupport = ({
     return pageConfig;
   };
   const createTempFile = (entry2) => {
-    import_node_fs.default.rmSync(import_node_path.default.join(unpackConfig.root, tempDirectory), { recursive: true, force: true });
+    (0, import_core.removeDir)(import_node_path.default.join(unpackConfig.root, tempDirectory));
     const globalImport = userOptions.globalImport?.reduce((acc, curr) => {
       return `${acc}
 import '${(0, import_core.getPathInJs)(import_node_path.default.resolve(unpackConfig.root, curr))}'`;
@@ -114,16 +115,17 @@ ${renderer}
           pageConfig.template = import_node_path.default.join(indexFilePath, "../", pageConfig.template);
         }
         html2.push({
-          template: unpackConfig.html?.template || "",
-          templateContent: unpackConfig.html?.templateContent || import_core.TEMPLATE_CONTENT,
+          template: unpackConfig.html?.template || (isRspack ? void 0 : ""),
+          // @ts-expect-error
+          templateContent: unpackConfig.html?.templateContent || (!unpackConfig.html?.template ? import_core.TEMPLATE_CONTENT : isRspack ? void 0 : false),
           minify: false,
           filename: `${entryName}.html`,
           chunks: [entryName],
           ...pageConfig,
           templateParameters: {
             mountId: unpackConfig.html?.mountId,
-            title: (0, import_core.isFunction)(unpackConfig.html?.title) ? unpackConfig.html?.title({ entryName }) : unpackConfig.html?.title,
-            headTag: unpackConfig.html?.headTag,
+            title: (0, import_core.isFunction)(unpackConfig.html?.title) ? unpackConfig.html?.title({ entryName }) : unpackConfig.html?.title || "",
+            headTag: unpackConfig.html?.headTag || "",
             ...unpackConfig.html?.templateParameters,
             ...pageConfig.templateParameters
           }
@@ -138,11 +140,11 @@ ${renderer}
   const { entry, html } = collectEntry();
   config = mergeConfig(config, {
     entry: createTempFile(entry),
-    plugins: html.map((h) => new import_html_webpack_plugin.default(h))
+    plugins: html.map((h) => new HtmlPlugin(h))
   });
   return config;
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  addMpaSupport
+  applyMpaConfig
 });

package/dist/mpa.d.ts

@@ -1,7 +1,8 @@
 import { type BundlerConfiguration, type UnpackConfig } from '@unpackjs/core';
-export declare const addMpaSupport: ({ config, unpackConfig, mergeConfig, }: {
+export declare const applyMpaConfig: ({ config, unpackConfig, mergeConfig, HtmlPlugin, }: {
     config: BundlerConfiguration;
     unpackConfig: UnpackConfig;
     mergeConfig: (...configs: BundlerConfiguration[]) => BundlerConfiguration;
+    HtmlPlugin: any;
 }) => BundlerConfiguration;
 //# sourceMappingURL=mpa.d.ts.map

package/dist/mpa.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mpa.d.ts","sourceRoot":"","sources":["../src/mpa.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,KAAK,oBAAoB,EAGzB,KAAK,YAAY,EAOlB,MAAM,gBAAgB,CAAA;AAavB,eAAO,MAAM,aAAa,2CAIvB;IACD,MAAM,EAAE,oBAAoB,CAAA;IAC5B,YAAY,EAAE,YAAY,CAAA;IAC1B,WAAW,EAAE,CAAC,GAAG,OAAO,EAAE,oBAAoB,EAAE,KAAK,oBAAoB,CAAA;CAC1E,KAAG,oBAyGH,CAAA"}
+{"version":3,"file":"mpa.d.ts","sourceRoot":"","sources":["../src/mpa.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,KAAK,oBAAoB,EAGzB,KAAK,YAAY,EAQlB,MAAM,gBAAgB,CAAA;AAYvB,eAAO,MAAM,cAAc,uDAKxB;IACD,MAAM,EAAE,oBAAoB,CAAA;IAC5B,YAAY,EAAE,YAAY,CAAA;IAC1B,WAAW,EAAE,CAAC,GAAG,OAAO,EAAE,oBAAoB,EAAE,KAAK,oBAAoB,CAAA;IACzE,UAAU,EAAE,GAAG,CAAA;CAChB,KAAG,oBA6GH,CAAA"}

package/dist/mpa.js

@@ -17,16 +17,18 @@ import {
   isDevServer,
   isFunction,
   isPlainObject,
-  logger
+  logger,
+  removeDir
 } from "@unpackjs/core";
-import HtmlWebpackPlugin from "html-webpack-plugin";
-const addMpaSupport = ({
+const applyMpaConfig = ({
   config,
   unpackConfig,
-  mergeConfig
+  mergeConfig,
+  HtmlPlugin
 }) => {
   if (!unpackConfig.mpa)
     return config;
+  const isRspack = unpackConfig.bundler === "rspack";
   const tempDirectory = path2.join(TEMP_DIR, "mpa");
   const userOptions = isPlainObject(unpackConfig.mpa) ? unpackConfig.mpa : {};
   const getPageConfig = (indexPath) => {
@@ -38,7 +40,7 @@ const addMpaSupport = ({
     return pageConfig;
   };
   const createTempFile = (entry2) => {
-    fs.rmSync(path2.join(unpackConfig.root, tempDirectory), { recursive: true, force: true });
+    removeDir(path2.join(unpackConfig.root, tempDirectory));
     const globalImport = userOptions.globalImport?.reduce((acc, curr) => {
       return `${acc}
 import '${getPathInJs(path2.resolve(unpackConfig.root, curr))}'`;
@@ -100,16 +102,17 @@ ${renderer}
           pageConfig.template = path2.join(indexFilePath, "../", pageConfig.template);
         }
         html2.push({
-          template: unpackConfig.html?.template || "",
-          templateContent: unpackConfig.html?.templateContent || TEMPLATE_CONTENT,
+          template: unpackConfig.html?.template || (isRspack ? void 0 : ""),
+          // @ts-expect-error
+          templateContent: unpackConfig.html?.templateContent || (!unpackConfig.html?.template ? TEMPLATE_CONTENT : isRspack ? void 0 : false),
           minify: false,
           filename: `${entryName}.html`,
           chunks: [entryName],
           ...pageConfig,
           templateParameters: {
             mountId: unpackConfig.html?.mountId,
-            title: isFunction(unpackConfig.html?.title) ? unpackConfig.html?.title({ entryName }) : unpackConfig.html?.title,
-            headTag: unpackConfig.html?.headTag,
+            title: isFunction(unpackConfig.html?.title) ? unpackConfig.html?.title({ entryName }) : unpackConfig.html?.title || "",
+            headTag: unpackConfig.html?.headTag || "",
             ...unpackConfig.html?.templateParameters,
             ...pageConfig.templateParameters
           }
@@ -124,10 +127,10 @@ ${renderer}
   const { entry, html } = collectEntry();
   config = mergeConfig(config, {
     entry: createTempFile(entry),
-    plugins: html.map((h) => new HtmlWebpackPlugin(h))
+    plugins: html.map((h) => new HtmlPlugin(h))
   });
   return config;
 };
 export {
-  addMpaSupport
+  applyMpaConfig
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unpackjs/plugin-react",
-  "version": "1.6.4",
+  "version": "1.7.1",
   "description": "",
   "type": "module",
   "exports": {
@@ -28,14 +28,13 @@
     "@babel/plugin-transform-class-properties": "7.25.9",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.15",
     "@rspack/plugin-react-refresh": "1.0.0",
-    "@swc/core": "1.9.1",
-    "@swc/helpers": "0.5.13",
+    "@swc/core": "1.9.2",
+    "@swc/helpers": "0.5.15",
     "babel-plugin-react-compiler": "latest",
-    "html-webpack-plugin": "5.6.3",
     "launch-editor": "2.9.1",
     "react-refresh": "0.14.2",
     "swc-loader": "0.2.6",
-    "@unpackjs/core": "^1.6.4"
+    "@unpackjs/core": "^1.7.1"
   },
   "scripts": {
     "dev": "modern build --watch",