react-cosmos-plugin-rspack 0.1.0 → 0.3.0

package/dist/server/rspackServerPlugin.js

@@ -161,87 +161,16 @@ import {
   moduleExists
 } from "react-cosmos";
 
+// src/server/rspackConfig/getDefaultRspackConfig.ts
+import {
+  HtmlRspackPlugin
+} from "@rspack/core";
+
 // src/server/rspackConfig/getRspackNodeEnv.ts
 function getRspackNodeEnv() {
   return process.env.NODE_ENV === "production" ? "production" : "development";
 }
 
-// src/server/utils/omit.ts
-function omit(o, fields) {
-  const result = { ...o };
-  for (const field of fields) {
-    delete result[field];
-  }
-  return result;
-}
-
-// src/server/rspackConfig/plugins.ts
-function getGlobalsPlugin({ publicUrl }, userRspack, devServerOn) {
-  const cleanPublicUrl = removeTrailingSlash(publicUrl);
-  return new userRspack.DefinePlugin({
-    // "if (__DEV__)" blocks get stripped when compiling a static export build
-    __DEV__: JSON.stringify(devServerOn),
-    "process.env.NODE_ENV": JSON.stringify(getRspackNodeEnv()),
-    "process.env.PUBLIC_URL": JSON.stringify(cleanPublicUrl)
-  });
-}
-function hasPlugin(plugins, pluginName) {
-  return plugins && plugins.filter((p) => isInstanceOfRspackPlugin(p, pluginName)).length > 0;
-}
-function isInstanceOfRspackPlugin(plugin, constructorName) {
-  return plugin.constructor && plugin.constructor.name === constructorName;
-}
-function ignoreEmptyRspackPlugins(plugins = []) {
-  return plugins.filter(Boolean);
-}
-function removeTrailingSlash(url) {
-  return url.replace(/\/$/, "");
-}
-
-// src/server/rspackConfig/htmlPlugin.ts
-function ensureHtmlWebpackPlugin({ rootDir }, plugins) {
-  if (hasPlugin(plugins, "HtmlWebpackPlugin")) {
-    return plugins.map(
-      (plugin) => isHtmlWebpackPlugin(plugin) ? changeHtmlPluginFilename(plugin) : plugin
-    );
-  }
-  const htmlWebpackPlugin = getHtmlWebpackPlugin(rootDir);
-  if (!htmlWebpackPlugin) {
-    return plugins;
-  }
-  return [
-    ...plugins,
-    new htmlWebpackPlugin({
-      title: "React Cosmos",
-      filename: RENDERER_FILENAME
-    })
-  ];
-}
-function getHtmlWebpackPlugin(rootDir) {
-  return requireFromSilent(
-    rootDir,
-    "html-webpack-plugin"
-  );
-}
-function isHtmlWebpackPlugin(plugin) {
-  return isInstanceOfRspackPlugin(plugin, "HtmlWebpackPlugin");
-}
-function changeHtmlPluginFilename(htmlPlugin) {
-  if (!isIndexHtmlWebpackPlugin(htmlPlugin)) {
-    return htmlPlugin;
-  }
-  const options = htmlPlugin.userOptions || htmlPlugin.options;
-  const safeOptions = omit(options, ["chunks"]);
-  return new htmlPlugin.constructor({
-    ...safeOptions,
-    filename: RENDERER_FILENAME
-  });
-}
-function isIndexHtmlWebpackPlugin(htmlPlugin) {
-  const { filename } = htmlPlugin.userOptions || htmlPlugin.options;
-  return filename === "index.html" || typeof filename !== "string" || filename.endsWith("/index.html");
-}
-
 // src/server/rspackConfig/getDefaultRspackConfig.ts
 function getDefaultRspackConfig(rootDir) {
   const postcssLoaderPath = resolveFromSilent(rootDir, "postcss-loader");
@@ -275,10 +204,9 @@ function getDefaultRspackConfig(rootDir) {
     type: "javascript/auto"
   });
   rules.push({
-    test: /\.css?$/,
-    exclude: [/[\\/]node_modules[\\/]/],
-    use: postcssLoaderPath ? [{ loader: postcssLoaderPath }] : void 0,
-    type: "css"
+    test: /\.css$/,
+    use: postcssLoaderPath ? [{ loader: postcssLoaderPath }] : [{ loader: "builtin:lightningcss-loader" }],
+    type: "css/auto"
   });
   if (mdxLoaderPath) {
     rules.push({
@@ -287,15 +215,9 @@ function getDefaultRspackConfig(rootDir) {
       exclude: [/[\\/]node_modules[\\/]/]
     });
   }
-  const htmlWebpackPlugin = getHtmlWebpackPlugin(rootDir);
-  if (htmlWebpackPlugin) {
-    plugins.push(
-      new htmlWebpackPlugin({
-        title: "React Cosmos",
-        filename: RENDERER_FILENAME
-      })
-    );
-  }
+  plugins.push(
+    new HtmlRspackPlugin({ title: "React Cosmos", filename: RENDERER_FILENAME })
+  );
   const config = {
     // Besides other advantages, cheap-module-source-map is compatible with
     // React.componentDidCatch https://github.com/facebook/react/issues/10441
@@ -446,6 +368,77 @@ function addAlias(alias, name, value) {
   return { ...alias, [name]: value };
 }
 
+// src/server/rspackConfig/htmlPlugin.ts
+import {
+  HtmlRspackPlugin as HtmlRspackPlugin2
+} from "@rspack/core";
+
+// src/server/utils/omit.ts
+function omit(o, fields) {
+  const result = { ...o };
+  for (const field of fields) {
+    delete result[field];
+  }
+  return result;
+}
+
+// src/server/rspackConfig/plugins.ts
+function getGlobalsPlugin({ publicUrl }, userRspack, devServerOn) {
+  const cleanPublicUrl = removeTrailingSlash(publicUrl);
+  return new userRspack.DefinePlugin({
+    // "if (__DEV__)" blocks get stripped when compiling a static export build
+    __DEV__: JSON.stringify(devServerOn),
+    "process.env.NODE_ENV": JSON.stringify(getRspackNodeEnv()),
+    "process.env.PUBLIC_URL": JSON.stringify(cleanPublicUrl)
+  });
+}
+function hasPlugin(plugins, pluginName) {
+  return plugins && plugins.filter((p) => isInstanceOfRspackPlugin(p, pluginName)).length > 0;
+}
+function isInstanceOfRspackPlugin(plugin, constructorName) {
+  return plugin.constructor && plugin.constructor.name === constructorName;
+}
+function ignoreEmptyRspackPlugins(plugins = []) {
+  return plugins.filter(Boolean);
+}
+function removeTrailingSlash(url) {
+  return url.replace(/\/$/, "");
+}
+
+// src/server/rspackConfig/htmlPlugin.ts
+function ensureHtmlWebpackPlugin(plugins) {
+  if (hasPlugin(plugins, "HtmlWebpackPlugin")) {
+    return plugins.map(
+      (plugin) => isHtmlWebpackPlugin(plugin) ? changeHtmlPluginFilename(plugin) : plugin
+    );
+  }
+  return [
+    ...plugins,
+    new HtmlRspackPlugin2({
+      title: "React Cosmos",
+      filename: RENDERER_FILENAME
+    })
+  ];
+}
+function isHtmlWebpackPlugin(plugin) {
+  return isInstanceOfRspackPlugin(plugin, "HtmlWebpackPlugin");
+}
+function changeHtmlPluginFilename(htmlPlugin) {
+  if (!isIndexHtmlWebpackPlugin(htmlPlugin)) {
+    return htmlPlugin;
+  }
+  const options = htmlPlugin.userOptions || htmlPlugin.options;
+  const safeOptions = omit(options, ["chunks"]);
+  return new htmlPlugin.constructor({
+    ...safeOptions,
+    filename: RENDERER_FILENAME
+  });
+}
+function isIndexHtmlWebpackPlugin(htmlPlugin) {
+  const { filename } = htmlPlugin.userOptions || htmlPlugin.options;
+  return filename === "index.html" || typeof filename !== "string" || filename.endsWith("/index.html");
+}
+
 // src/server/rspackConfig/rspackConfigTopLevelAwait.ts
 function ensureRspackConfigTopLevelAwait(baseWebpackConfig) {
   const experiments = baseWebpackConfig.experiments || {};
@@ -497,7 +490,7 @@ function getPlugins(cosmosConfig, baseRspackConfig, userRspack) {
     const hmrPlugin = new userRspack.HotModuleReplacementPlugin();
     plugins = [...plugins, hmrPlugin];
   }
-  return ensureHtmlWebpackPlugin(cosmosConfig, plugins);
+  return ensureHtmlWebpackPlugin(plugins);
 }
 function getHotMiddlewareEntry(reloadOnFail) {
   const clientPath = resolve("webpack-hot-middleware/client");
@@ -626,10 +619,7 @@ function getOutput2(cosmosConfig) {
 function getPlugins2(cosmosConfig, baseRspackConfig, userRspack) {
   const existingPlugins = ignoreEmptyRspackPlugins(baseRspackConfig.plugins);
   const globalsPlugin = getGlobalsPlugin(cosmosConfig, userRspack, false);
-  return ensureHtmlWebpackPlugin(cosmosConfig, [
-    ...existingPlugins,
-    globalsPlugin
-  ]);
+  return ensureHtmlWebpackPlugin([...existingPlugins, globalsPlugin]);
 }
 function getExperiments2(baseWebpackConfig) {
   return ensureRspackConfigTopLevelAwait(baseWebpackConfig);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-cosmos-plugin-rspack",
-  "version": "0.1.0",
+  "version": "0.3.0",
   "description": "rspack plugin for React Cosmos",
   "repository": "https://github.com/birchill/react-cosmos-plugin-rspack/",
   "author": "Birchill, Inc.",
@@ -18,10 +18,9 @@
   },
   "devDependencies": {
     "@release-it/conventional-changelog": "8.0.1",
-    "@rspack/core": "0.7.5",
+    "@rspack/core": "1.0.0-beta.5",
     "@types/node": "20.14.9",
     "@types/webpack-hot-middleware": "2.25.9",
-    "html-webpack-plugin": "5.6.0",
     "husky": "9.0.11",
     "knip": "5.23.3",
     "lint-staged": "15.2.7",
@@ -48,7 +47,7 @@
     "prepare": "husky"
   },
   "peerDependencies": {
-    "@rspack/core": ">=0.6.0",
+    "@rspack/core": ">=1.0.0-beta.0",
     "react-cosmos": ">=6.0.0"
   },
   "lint-staged": {