@meteorjs/rspack 1.0.0 → 1.1.0-beta.10

package/lib/ignore.js

@@ -117,7 +117,7 @@ function createIgnoreRegex(globPatterns) {
 
     // For absolute paths, we don't want to force the pattern to match from the beginning
     // but we still want to ensure it matches to the end of the path segment
-    regexPattern = '(?:^|/)' + regexPattern + '$';
+    regexPattern = '(?:^|/)' + regexPattern;
 
     return regexPattern;
   }).filter(pattern => pattern !== null);

package/lib/meteorRspackHelpers.js

@@ -202,6 +202,12 @@ function disablePlugins(config, matchers) {
   return config;
 }
 
+function outputMeteorRspack(data) {
+  const jsonString = JSON.stringify(data);
+  const output = `[Meteor-Rspack]${jsonString}[/Meteor-Rspack]`;
+  console.log(output);
+}
+
 module.exports = {
   compileWithMeteor,
   compileWithRspack,
@@ -210,4 +216,5 @@ module.exports = {
   extendSwcConfig,
   makeWebNodeBuiltinsAlias,
   disablePlugins,
+  outputMeteorRspack,
 };

package/lib/test.js

@@ -9,17 +9,20 @@ const { createIgnoreRegex, createIgnoreGlobConfig } = require("./ignore.js");
  * @param {string} options.projectDir - The project directory
  * @param {string} options.buildContext - The build context
  * @param {string[]} options.ignoreEntries - Array of ignore patterns
+ * @param {string[]} options.meteorIgnoreEntries - Array of meteor ignore patterns
  * @param {string} options.extraEntry - Extra entry to load
  * @returns {string} The path to the generated file
  */
 const generateEagerTestFile = ({
-                                 isAppTest,
-                                 projectDir,
-                                 buildContext,
-                                 ignoreEntries: inIgnoreEntries = [],
-                                 prefix: inPrefix = '',
-                                 extraEntry,
-                               }) => {
+  isAppTest,
+  projectDir,
+  buildContext,
+  ignoreEntries: inIgnoreEntries = [],
+  meteorIgnoreEntries: inMeteorIgnoreEntries = [],
+  prefix: inPrefix = '',
+  extraEntry,
+  globalImportPath,
+}) => {
   const distDir = path.resolve(projectDir, ".meteor/local/test");
   if (!fs.existsSync(distDir)) {
     fs.mkdirSync(distDir, { recursive: true });
@@ -39,6 +42,11 @@ const generateEagerTestFile = ({
   const excludeFoldersRegex = createIgnoreRegex(
     createIgnoreGlobConfig(ignoreEntries)
   );
+  console.log("inMeteorIgnoreEntries", inMeteorIgnoreEntries);
+  // Create regex from meteor ignore entries
+  const excludeMeteorIgnoreRegex = inMeteorIgnoreEntries.length > 0
+    ? createIgnoreRegex(createIgnoreGlobConfig(inMeteorIgnoreEntries))
+    : null;
 
   const prefix = (inPrefix && `${inPrefix}-`) || "";
   const filename = isAppTest
@@ -49,25 +57,39 @@ const generateEagerTestFile = ({
     ? "/\\.app-(?:test|spec)s?\\.[^.]+$/"
     : "/\\.(?:test|spec)s?\\.[^.]+$/";
 
-  const content = `{
-  const ctx = import.meta.webpackContext('/', {
+  const content = `${
+    globalImportPath ? `import '${globalImportPath}';\n\n` : ""
+  }${
+    excludeMeteorIgnoreRegex
+      ? `const MeteorIgnoreRegex = ${excludeMeteorIgnoreRegex.toString()};`
+      : ""
+  }
+{
+  const ctx = import.meta.webpackContext('${projectDir}', {
     recursive: true,
     regExp: ${regExp},
     exclude: ${excludeFoldersRegex.toString()},
     mode: 'eager',
   });
-  ctx.keys().forEach(ctx);
+  ctx.keys().filter((k) => {
+    ${
+      excludeMeteorIgnoreRegex
+        ? `// Only exclude based on *relative* path segments.
+    return !MeteorIgnoreRegex.test(k);`
+        : "return true;"
+    }
+  }).forEach(ctx);
   ${
     extraEntry
       ? `const extra = import.meta.webpackContext('${path.dirname(
-        extraEntry
-      )}', {
+          extraEntry
+        )}', {
     recursive: false,
     regExp: ${new RegExp(`${path.basename(extraEntry)}$`).toString()},
     mode: 'eager',
   });
   extra.keys().forEach(extra);`
-      : ''
+      : ""
   }
 }`;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meteorjs/rspack",
-  "version": "1.0.0",
+  "version": "1.1.0-beta.10",
   "description": "Configuration logic for using Rspack in Meteor projects",
   "main": "index.js",
   "type": "commonjs",

package/plugins/MeteorRspackOutputPlugin.js

@@ -0,0 +1,36 @@
+// MeteorRspackOutputPlugin.js
+//
+// This plugin outputs a JSON stringified with a tag delimiter each time
+// a new Rspack compilation happens. The JSON content is configurable
+// via plugin instantiation options.
+
+const { outputMeteorRspack } = require('../lib/meteorRspackHelpers');
+
+class MeteorRspackOutputPlugin {
+  constructor(options = {}) {
+    this.pluginName = 'MeteorRspackOutputPlugin';
+    this.options = options;
+    this.compilationCount = 0;
+    // The data to be output as JSON, can be a static object or a function
+    this.getData =
+      typeof options.getData === 'function'
+        ? options.getData
+        : () => options.data || {};
+  }
+
+  apply(compiler) {
+    // Hook into the 'done' event which fires after each compilation completes
+    compiler.hooks.done.tap(this.pluginName, stats => {
+      this.compilationCount++;
+      const data = {
+        ...(this.getData(stats, {
+          compilationCount: this.compilationCount,
+          isRebuild: this.compilationCount > 1,
+        }) || {}),
+      };
+      outputMeteorRspack(data);
+    });
+  }
+}
+
+module.exports = { MeteorRspackOutputPlugin };

package/rspack.config.js

@@ -10,6 +10,7 @@ const { getMeteorAppSwcConfig } = require('./lib/swc.js');
 const HtmlRspackPlugin = require('./plugins/HtmlRspackPlugin.js');
 const { RequireExternalsPlugin } = require('./plugins/RequireExtenalsPlugin.js');
 const { AssetExternalsPlugin } = require('./plugins/AssetExternalsPlugin.js');
+const { MeteorRspackOutputPlugin } = require('./plugins/MeteorRspackOutputPlugin.js');
 const { generateEagerTestFile } = require("./lib/test.js");
 const { getMeteorIgnoreEntries, createIgnoreGlobConfig } = require("./lib/ignore");
 const { mergeMeteorRspackFragments } = require("./lib/meteorRspackConfigFactory.js");
@@ -21,6 +22,7 @@ const {
   extendSwcConfig,
   makeWebNodeBuiltinsAlias,
   disablePlugins,
+  outputMeteorRspack,
 } = require('./lib/meteorRspackHelpers.js');
 const { prepareMeteorRspackConfig } = require("./lib/meteorRspackConfigFactory");
 
@@ -225,13 +227,13 @@ module.exports = async function (inMeteor = {}, argv = {}) {
   const isTestLike = !!Meteor.isTestLike;
   const swcExternalHelpers = !!Meteor.swcExternalHelpers;
   const isNative = !!Meteor.isNative;
+  const isProfile = !!Meteor.isProfile;
+  const isVerbose = !!Meteor.isVerbose;
   const mode = isProd ? 'production' : 'development';
   const projectDir = process.cwd();
   const projectConfigPath = Meteor.projectConfigPath || path.resolve(projectDir, 'rspack.config.js');
   const configPath = Meteor.configPath;
   const testEntry = Meteor.testEntry;
-  const testClientEntry = Meteor.testClientEntry;
-  const testServerEntry = Meteor.testServerEntry;
 
   const isTypescriptEnabled = Meteor.isTypescriptEnabled || false;
   const isJsxEnabled =
@@ -429,30 +431,36 @@ module.exports = async function (inMeteor = {}, argv = {}) {
     : [];
   // Not supported in Meteor yet (Rspack 1.7+ is enabled by default)
   const lazyCompilationConfig = { lazyCompilation: false };
+  const shouldLogVerbose = isProfile || isVerbose;
+  const loggingConfig = shouldLogVerbose
+    ? {}
+    : { stats: "errors-warnings", infrastructureLogging: { level: "warn" } };
 
   const clientEntry =
-    isTest && isTestEager && isTestFullApp
+    isClient && isTest && isTestEager && isTestFullApp
       ? generateEagerTestFile({
           isAppTest: true,
           projectDir,
           buildContext,
-          ignoreEntries: [...meteorIgnoreEntries, "**/server/**"],
+          ignoreEntries: ["**/server/**"],
+          meteorIgnoreEntries,
           prefix: "client",
           extraEntry: path.resolve(process.cwd(), Meteor.mainClientEntry),
+          globalImportPath: path.resolve(projectDir, buildContext, entryPath),
         })
-      : isTest && isTestEager
+      : isClient && isTest && isTestEager
       ? generateEagerTestFile({
           isAppTest: false,
           isClient: true,
           projectDir,
           buildContext,
-          ignoreEntries: [...meteorIgnoreEntries, "**/server/**"],
+          ignoreEntries: ["**/server/**"],
+          meteorIgnoreEntries,
           prefix: "client",
+          globalImportPath: path.resolve(projectDir, buildContext, entryPath),
         })
-      : isTest && testEntry
+      : isClient && isTest && testEntry
       ? path.resolve(process.cwd(), testEntry)
-      : isTest && testClientEntry
-      ? path.resolve(process.cwd(), testClientEntry)
       : path.resolve(process.cwd(), buildContext, entryPath);
   const clientNameConfig = `[${(isTest && 'test-') || ''}client-rspack]`;
   // Base client config
@@ -545,33 +553,43 @@ module.exports = async function (inMeteor = {}, argv = {}) {
           writeToDisk: filePath =>
             /\.(html)$/.test(filePath) && !filePath.includes('.hot-update.'),
         },
+        onListening(devServer) {
+          if (!devServer) return;
+          const { host, port } = devServer.options;
+          const protocol = devServer.options.server?.type === "https" ? "https" : "http";
+          const devServerUrl = `${protocol}://${host || "localhost"}:${port}`;
+          outputMeteorRspack({ devServerUrl });
+        },
       },
     }),
     ...merge(cacheStrategy, { experiments: { css: true } }),
     ...lazyCompilationConfig,
+    ...loggingConfig,
   };
 
   const serverEntry =
-    isTest && isTestEager && isTestFullApp
+    isServer && isTest && isTestEager && isTestFullApp
       ? generateEagerTestFile({
           isAppTest: true,
           projectDir,
           buildContext,
-          ignoreEntries: [...meteorIgnoreEntries, "**/client/**"],
+          ignoreEntries: ["**/client/**"],
+          meteorIgnoreEntries,
           prefix: "server",
+          globalImportPath: path.resolve(projectDir, buildContext, entryPath),
         })
-      : isTest && isTestEager
+      : isServer && isTest && isTestEager
       ? generateEagerTestFile({
           isAppTest: false,
           projectDir,
           buildContext,
-          ignoreEntries: [...meteorIgnoreEntries, "**/client/**"],
+          ignoreEntries: ["**/client/**"],
+          meteorIgnoreEntries,
           prefix: "server",
+          globalImportPath: path.resolve(projectDir, buildContext, entryPath),
         })
-      : isTest && testEntry
+      : isServer && isTest && testEntry
       ? path.resolve(process.cwd(), testEntry)
-      : isTest && testServerEntry
-      ? path.resolve(process.cwd(), testServerEntry)
       : path.resolve(projectDir, buildContext, entryPath);
   const serverNameConfig = `[${(isTest && 'test-') || ''}server-rspack]`;
   // Base server config
@@ -637,6 +655,7 @@ module.exports = async function (inMeteor = {}, argv = {}) {
     ...((isDevEnvironment || (isTest && !isTestEager) || isNative) &&
       cacheStrategy),
     ...lazyCompilationConfig,
+    ...loggingConfig,
   };
 
   // Helper function to load and process config files
@@ -696,6 +715,8 @@ module.exports = async function (inMeteor = {}, argv = {}) {
   // Load and apply project-level overrides for the selected build
   // Check if we're in a Meteor package directory by looking at the path
   const isMeteorPackageConfig = projectDir.includes('/packages/rspack');
+  // Track if user config overrides stats and infrastructureLogging
+  let statsOverrided = false;
   if (fs.existsSync(projectConfigPath) && !isMeteorPackageConfig) {
     // Check if there's a .mjs or .cjs version of the config file
     const mjsConfigPath = projectConfigPath.replace(/\.js$/, '.mjs');
@@ -716,7 +737,11 @@ module.exports = async function (inMeteor = {}, argv = {}) {
       isAngularEnabled
     );
 
+    // Track if user config overrides stats
     if (nextUserConfig) {
+      if (nextUserConfig.stats != null) {
+        statsOverrided = true;
+      }
       if (Meteor.isClient) {
         clientConfig = mergeSplitOverlap(clientConfig, nextUserConfig);
       }
@@ -807,5 +832,20 @@ module.exports = async function (inMeteor = {}, argv = {}) {
     );
   }
 
+  // Add MeteorRspackOutputPlugin as the last plugin to output compilation info
+  const meteorRspackOutputPlugin = new MeteorRspackOutputPlugin({
+    getData: (stats, { isRebuild, compilationCount }) => ({
+      name: config.name,
+      mode: config.mode,
+      hasErrors: stats.hasErrors(),
+      hasWarnings: stats.hasWarnings(),
+      timestamp: Date.now(),
+      statsOverrided,
+      compilationCount,
+      isRebuild,
+    }),
+  });
+  config.plugins = [meteorRspackOutputPlugin, ...(config.plugins || [])];
+
   return [config];
 }