@meteorjs/rspack 2.1.0 → 2.2.0-beta.0

package/lib/localDependenciesHelpers.js

@@ -20,7 +20,7 @@ function extractLocalDependencies(configFilePath) {
 
     // Parse the file into an AST
     const ast = swc.parseSync(content, {
-      syntax: 'ecmascript',
+      syntax: /\.[mc]?tsx?$/.test(configFilePath) ? 'typescript' : 'ecmascript',
       dynamicImport: true,
       target: 'es2020',
     });
@@ -30,10 +30,10 @@ function extractLocalDependencies(configFilePath) {
       let modulePath = null;
 
       // Handle require() calls: require('./plugin')
-      if (node.type === 'CallExpression' && 
-          node.callee.type === 'Identifier' && 
-          node.callee.value === 'require' &&
-          node.arguments.length > 0) {
+      if (node.type === 'CallExpression' &&
+        node.callee.type === 'Identifier' &&
+        node.callee.value === 'require' &&
+        node.arguments.length > 0) {
         const arg = node.arguments[0];
         if (arg.expression?.type === 'StringLiteral') {
           modulePath = arg.expression.value;
@@ -42,8 +42,8 @@ function extractLocalDependencies(configFilePath) {
 
       // Handle dynamic import() calls: import('./plugin')
       if (node.type === 'CallExpression' &&
-          node.callee.type === 'Import' &&
-          node.arguments.length > 0) {
+        node.callee.type === 'Import' &&
+        node.arguments.length > 0) {
         const arg = node.arguments[0];
         if (arg.expression?.type === 'StringLiteral') {
           modulePath = arg.expression.value;
@@ -163,7 +163,7 @@ function resolveLocalModule(modulePath, configDir, projectDir) {
     const resolvedReal = fs.realpathSync(resolvedPath);
     const projectReal = fs.realpathSync(projectDir);
 
-    const isWithinProject = 
+    const isWithinProject =
       resolvedReal === projectReal ||
       resolvedReal.startsWith(projectReal + path.sep);
     const hasNodeModulesSegment = resolvedReal.split(path.sep).includes('node_modules');

package/lib/test.js

@@ -74,14 +74,14 @@ const generateEagerTestFile = ({
     exclude: ${excludeFoldersRegex.toString()},
     mode: 'eager',
   });
-  ctx.keys().filter((k) => {
+  await Promise.all(ctx.keys().filter((k) => {
     ${
       excludeMeteorIgnoreRegex
         ? `// Only exclude based on *relative* path segments.
     return !MeteorIgnoreRegex.test(k);`
         : "return true;"
     }
-  }).forEach(ctx);
+  }).map(ctx));
   ${
     extraEntry
       ? `const extra = import.meta.webpackContext('${toPosix(path.dirname(

package/package.json

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

package/plugins/RequireExtenalsPlugin.js

@@ -172,8 +172,24 @@ class RequireExternalsPlugin {
       // 2) Re-load existing requires from disk on every run
       const existing = this._readExistingRequires();
 
-      // 2a) Compute the *current* externals in this build
-      const info = stats.toJson({ modules: true });
+      // 2a) Compute the *current* externals in this build.
+      // Only module names are needed, so start from `all: false` instead of
+      // serializing the whole stats object (chunks, assets, reasons, ...)
+      // on every compilation — a fixed cost per rebuild that grows with app
+      // size. `cachedModules: true` keeps unchanged modules in the list on
+      // incremental rebuilds, so their requires are not wrongly removed.
+      // `orphanModules: true` is required in production: module
+      // concatenation absorbs the externals' importers, marking the
+      // external modules themselves as orphans, and without this flag
+      // they vanish from the list entirely — which stripped every
+      // mirrored require (meteor/*, Blaze .html) from the meteor entry.
+      // See meteor/meteor#14568.
+      const info = stats.toJson({
+        all: false,
+        modules: true,
+        cachedModules: true,
+        orphanModules: true,
+      });
       const current = new Set();
       for (const m of info.modules) {
         const matchInfo = this._isExternalModule(m.name);
@@ -497,17 +513,22 @@ class RequireExternalsPlugin {
 
   _readExistingRequires() {
     const existing = new Set();
+    // Generated Rspack bridge imports are not managed externals. Relative
+    // imports such as Blaze HTML files still belong to this plugin.
+    const isRspackBridgeImport = (modulePath) =>
+      typeof modulePath === 'string' &&
+      /(?:^|[/\\])[^/\\]*-rspack\.(?:js|cjs)$/.test(modulePath);
     try {
       const content = fs.readFileSync(this.filePath, 'utf-8');
       // Check for require statements
       let match;
       while ((match = STANDALONE_REQUIRE_REGEX.exec(content)) !== null) {
-        existing.add(match[1]);
+        if (!isRspackBridgeImport(match[1])) existing.add(match[1]);
       }
 
       // Also check for import statements (used in the new format)
       while ((match = STANDALONE_IMPORT_REGEX.exec(content)) !== null) {
-        existing.add(match[1]);
+        if (!isRspackBridgeImport(match[1])) existing.add(match[1]);
       }
     } catch {
       // ignore if file missing or unreadable

package/rspack.config.js

@@ -101,8 +101,13 @@ function createCacheStrategy(
         type: "persistent",
         storage: {
           type: "filesystem",
+          // Include the mode in the directory (not just the version):
+          // rspack invalidates a persistent cache on version mismatch, so
+          // sharing one directory between development and production would
+          // wipe the cache on every `meteor run` <-> `meteor build` switch
+          // instead of keeping both warm. See meteor/meteor#14568.
           directory: `node_modules/.cache/rspack/${
-            [buildContext, side].filter(Boolean).join('-') || 'default'
+            [buildContext, side, mode].filter(Boolean).join('-') || 'default'
           }`,
         },
         ...(buildDependencies.length > 0 && {
@@ -401,7 +406,11 @@ module.exports = async function (inMeteor = {}, argv = {}) {
   cacheStrategy = createCacheStrategy(
     mode,
     (Meteor.isClient && "client") || "server",
-    { projectConfigPath, configPath }
+    // buildContext must be passed here too: this reassignment is the
+    // effective cache strategy, and omitting it made the cache directory
+    // collide across build contexts (e.g. custom METEOR_LOCAL_DIR setups).
+    // See meteor/meteor#14568.
+    { projectConfigPath, configPath, buildContext }
   );
 
   // Determine run point
@@ -488,7 +497,7 @@ module.exports = async function (inMeteor = {}, argv = {}) {
     ...(Meteor.isBlazeEnabled && {
       externals: /\.html$/,
       isEagerImport: (module) => module.endsWith(".html"),
-      ...(isProd && {
+      ...((isProd || (isTest && isClient)) && {
         lastImports: [`./${outputFilename}`],
       }),
     }),
@@ -806,8 +815,12 @@ module.exports = async function (inMeteor = {}, argv = {}) {
       isDevEnvironment || isNative || isTest
         ? "source-map"
         : "hidden-source-map",
-    ...((isDevEnvironment || (isTest && !isTestEager) || isNative) &&
-      cacheStrategy),
+    // Apply the persistent cache to production builds too (the client
+    // config always has it); previously `meteor build` recompiled the
+    // entire server bundle cold every time. Eager server test builds are
+    // still excluded, since their generated entry changes on every run.
+    // See meteor/meteor#14568.
+    ...(!(isTest && isTestEager) && cacheStrategy),
     ...lazyCompilationConfig,
     ...loggingConfig,
   };