@meteorjs/rspack 0.0.33 → 0.0.35

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meteorjs/rspack",
-  "version": "0.0.33",
+  "version": "0.0.35",
   "description": "Configuration logic for using Rspack in Meteor projects",
   "main": "index.js",
   "type": "module",

package/rspack.config.js

@@ -7,7 +7,6 @@ import { merge } from 'webpack-merge';
 
 import { cleanOmittedPaths, mergeSplitOverlap } from "./lib/mergeRulesSplitOverlap.js";
 import { getMeteorAppSwcConfig } from './lib/swc.js';
-import CleanBuildAssetsPlugin from './plugins/CleanBuildAssetsPlugin.js';
 import HtmlRspackPlugin from './plugins/HtmlRspackPlugin.js';
 import { RequireExternalsPlugin } from './plugins/RequireExtenalsPlugin.js';
 
@@ -87,9 +86,9 @@ function createSwcConfig({
 function keepOutsideBuild() {
   return (p) => {
     const normalized = '/' + path.normalize(p).replaceAll(path.sep, '/').replace(/^\/+/, '');
-    const isInBuildRoot = /\/_build(\/|$)/.test(normalized);
-    const isInBuildStar = /\/_build-[^/]+(\/|$)/.test(normalized);
-    return !(isInBuildRoot || isInBuildStar); // true => KEEP, false => DELETE
+    const isInBuildRoot = /\/build(\/|$)/.test(normalized);
+    const isInBuildStar = /\/build-[^/]+(\/|$)/.test(normalized);
+    return !(isInBuildRoot || isInBuildStar);
   };
 }
 
@@ -100,7 +99,7 @@ const defaultWatchOptions = {
 
 /**
  * @param {{ isClient: boolean; isServer: boolean; isDevelopment?: boolean; isProduction?: boolean; isTest?: boolean }} Meteor
- * @param {{ mode?: string; clientEntry?: string; serverEntry?: string; clientOutputFolder?: string; serverOutputFolder?: string; bundlesContext?: string; assetsContext?: string; serverAssetsContext?: string }} argv
+ * @param {{ mode?: string; clientEntry?: string; serverEntry?: string; clientOutputFolder?: string; serverOutputFolder?: string; chunksContext?: string; assetsContext?: string; serverAssetsContext?: string }} argv
  * @returns {import('@rspack/cli').Configuration[]}
  */
 export default function (inMeteor = {}, argv = {}) {
@@ -133,7 +132,7 @@ export default function (inMeteor = {}, argv = {}) {
     Meteor.isJsxEnabled || (!isTypescriptEnabled && isReactEnabled) || false;
   const isTsxEnabled =
     Meteor.isTsxEnabled || (isTypescriptEnabled && isReactEnabled) || false;
-
+  const isBundleVisualizerEnabled = Meteor.isBundleVisualizerEnabled || false;
 
   // Determine entry points
   const entryPath = Meteor.entryPath;
@@ -156,8 +155,8 @@ export default function (inMeteor = {}, argv = {}) {
 
   // Determine context for bundles and assets
   const buildContext = Meteor.buildContext || '_build';
-  const bundlesContext = Meteor.bundlesContext || 'bundles';
-  const assetsContext = Meteor.assetsContext || 'assets';
+  const assetsContext = Meteor.assetsContext || 'build-assets';
+  const chunksContext = Meteor.chunksContext || 'build-chunks';
 
   // Determine build output and pass to Meteor
   const buildOutputDir = path.resolve(process.cwd(), buildContext, outputDir);
@@ -252,6 +251,17 @@ export default function (inMeteor = {}, argv = {}) {
     enableGlobalPolyfill: isDevEnvironment,
   });
 
+  const rsdoctorModule = isBundleVisualizerEnabled
+    ? safeRequire('@rsdoctor/rspack-plugin')
+    : null;
+  const doctorPluginConfig = isBundleVisualizerEnabled && rsdoctorModule?.RsdoctorRspackPlugin
+    ? [
+        new rsdoctorModule.RsdoctorRspackPlugin({
+          port: isClient ? 8081 : 8082,
+        }),
+      ]
+    : [];
+
   const clientNameConfig = `[${(isTest && 'test-') || ''}${
     (isTestModule && 'module') || 'client'
   }-rspack]`;
@@ -267,12 +277,12 @@ export default function (inMeteor = {}, argv = {}) {
         isDevEnvironment ? outputFilename : `../${buildContext}/${outputPath}`,
       libraryTarget: 'commonjs',
       publicPath: '/',
-      chunkFilename: `${bundlesContext}/[id]${isProd ? '.[chunkhash]' : ''}.js`,
+      chunkFilename: `${chunksContext}/[id]${isProd ? '.[chunkhash]' : ''}.js`,
       assetModuleFilename: `${assetsContext}/[hash][ext][query]`,
-      cssFilename: `${assetsContext}/[name]${
+      cssFilename: `${chunksContext}/[name]${
         isProd ? '.[contenthash]' : ''
       }.css`,
-      cssChunkFilename: `${assetsContext}/[id]${
+      cssChunkFilename: `${chunksContext}/[id]${
         isProd ? '.[contenthash]' : ''
       }.css`,
       ...(isProd && { clean: { keep: keepOutsideBuild() } }),
@@ -298,13 +308,6 @@ export default function (inMeteor = {}, argv = {}) {
     resolve: { extensions, alias },
     externals,
     plugins: [
-      ...(isProd
-        ? [
-            new CleanBuildAssetsPlugin({
-              verbose: Meteor.isDebug || Meteor.isVerbose,
-            }),
-          ]
-        : []),
       ...[
         ...(isReactEnabled && reactRefreshModule && isDevEnvironment
           ? [new reactRefreshModule()]
@@ -324,6 +327,7 @@ export default function (inMeteor = {}, argv = {}) {
         entryOnly: true,
       }),
       Meteor.HtmlRspackPlugin(),
+      ...doctorPluginConfig,
     ],
     watchOptions,
     devtool: isDevEnvironment || isNative || isTest ? 'source-map' : 'hidden-source-map',
@@ -362,7 +366,7 @@ export default function (inMeteor = {}, argv = {}) {
       path: serverOutputDir,
       filename: () => `../${buildContext}/${outputPath}`,
       libraryTarget: 'commonjs',
-      chunkFilename: `${bundlesContext}/[id]${isProd ? '.[chunkhash]' : ''}.js`,
+      chunkFilename: `${chunksContext}/[id]${isProd ? '.[chunkhash]' : ''}.js`,
       assetModuleFilename: `${assetsContext}/[hash][ext][query]`,
       ...(isProd && { clean: { keep: keepOutsideBuild() } }),
     },
@@ -405,6 +409,7 @@ export default function (inMeteor = {}, argv = {}) {
         entryOnly: true,
       }),
       isTestModule && requireExternalsPlugin,
+      ...doctorPluginConfig,
     ],
     watchOptions,
     devtool: isDevEnvironment || isNative || isTest ? 'source-map' : 'hidden-source-map',

package/plugins/CleanBuildAssetsPlugin.js

@@ -1,52 +0,0 @@
-import fs from 'fs/promises';
-import path from 'path';
-
-/**
- * Rspack plugin to clean and recreate build directories
- * before each compilation.
- *
- * Options:
- * - targets {string[]} : Directories to clean.
- *   Defaults:
- *     - public/_build-assets
- *     - public/_build-bundles
- *     - private/_build-assets
- * - verbose {boolean} : If true, logs cleaning operations. Default: false
- */
-export default class CleanBuildAssetsPlugin {
-  constructor(options = {}) {
-    const defaults = [
-      'public/_build-assets',
-      'private/_build-assets',
-    ];
-
-    this.targets = Array.isArray(options.targets)
-      ? options.targets
-      : defaults;
-
-    this.verbose = options.verbose || false;
-  }
-
-  apply(compiler) {
-    compiler.hooks.beforeRun.tapPromise(
-      'CleanBuildAssetsPlugin',
-      async () => {
-        for (const target of this.targets) {
-          const dir = path.resolve(compiler.context, target);
-          try {
-            await fs.rm(dir, { recursive: true, force: true });
-            await fs.mkdir(dir, { recursive: true });
-            if (this.verbose) {
-              console.log(`[CleanBuildAssetsPlugin] Cleaned: ${dir}`);
-            }
-          } catch (err) {
-            console.warn(
-              `[CleanBuildAssetsPlugin] Failed to clean ${dir}:`,
-              err.message
-            );
-          }
-        }
-      }
-    )
-  }
-}