@meteorjs/rspack 2.1.0-beta.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/swc.js

@@ -14,7 +14,13 @@ function getMeteorAppSwcrc(file = '.swcrc') {
       
       if (file.endsWith('.ts')) {
         try {
-          const swc = require('@swc/core');
+          let swc;
+          try {
+            swc = require(require.resolve('@swc/core', { paths: [process.cwd()] }));
+          } catch (e) {
+            if (e.code !== 'MODULE_NOT_FOUND') throw e;
+            swc = require('@swc/core');
+          }
           const result = swc.transformSync(content, {
             jsc: {
               parser: {

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/lib/testClientNodePolyfills.js

@@ -0,0 +1,66 @@
+const { ProvidePlugin } = require("@rspack/core");
+
+let meteorNodeStubs;
+try {
+  const stubPath = require.resolve("meteor-node-stubs", { paths: [process.cwd()] });
+  meteorNodeStubs = require(stubPath);
+} catch (e) {
+  if (e.code !== 'MODULE_NOT_FOUND') throw e;
+  try {
+    meteorNodeStubs = require("meteor-node-stubs");
+  } catch (fallbackError) {
+    if (fallbackError.code !== 'MODULE_NOT_FOUND') throw fallbackError;
+    // It's optional. If not installed, meteorNodeStubs remains undefined.
+  }
+}
+
+const TEST_CLIENT_NODE_POLYFILLS = [
+  "assert",
+  "buffer",
+  "constants",
+  "crypto",
+  "events",
+  "fs",
+  "http",
+  "https",
+  "os",
+  "path",
+  "querystring",
+  "stream",
+  "string_decoder",
+  "sys",
+  "timers",
+  "tty",
+  "url",
+  "util",
+  "vm",
+  "zlib",
+];
+
+function createTestClientNodePolyfillConfig() {
+  const fallback = Object.fromEntries(
+    TEST_CLIENT_NODE_POLYFILLS.map((name) => [name, meteorNodeStubs?.[name] ?? false]),
+  );
+
+  const plugins = [];
+  
+  if (meteorNodeStubs?.buffer) {
+    plugins.push(
+      new ProvidePlugin({
+        Buffer: [meteorNodeStubs.buffer, "Buffer"],
+      })
+    );
+  }
+
+  return {
+    resolve: {
+      alias: {
+        "timers/promises$": require.resolve("isomorphic-timers-promises"),
+      },
+      fallback,
+    },
+    plugins,
+  };
+}
+
+module.exports = { createTestClientNodePolyfillConfig };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meteorjs/rspack",
-  "version": "2.1.0-beta.0",
+  "version": "2.2.0-beta.0",
   "description": "Configuration logic for using Rspack in Meteor projects",
   "main": "index.js",
   "type": "commonjs",
@@ -13,7 +13,7 @@
   "dependencies": {
     "fast-deep-equal": "^3.1.3",
     "ignore-loader": "^0.1.2",
-    "node-polyfill-webpack-plugin": "^4.1.0",
+    "isomorphic-timers-promises": "^1.0.1",
     "webpack-merge": "^6.0.1"
   },
   "devDependencies": {
@@ -22,6 +22,12 @@
   "peerDependencies": {
     "@rspack/cli": ">=1.3.0",
     "@rspack/core": ">=1.3.0",
-    "@swc/core": ">=1.3.0"
+    "@swc/core": ">=1.3.0",
+    "meteor-node-stubs": ">=1.2.0"
+  },
+  "peerDependenciesMeta": {
+    "meteor-node-stubs": {
+      "optional": true
+    }
   }
 }

package/plugins/RequireExtenalsPlugin.js

@@ -13,6 +13,18 @@ const path = require('path');
 // Normalize a path to always use forward slashes (POSIX style).
 // Module identifiers in bundled JS must use '/' regardless of OS.
 const toPosix = (p) => p.replace(/\\/g, '/');
+const escapeRegExp = (value) => value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+const buildStandaloneRequireRegex = (pkg) =>
+  new RegExp(`^\\s*require\\('${escapeRegExp(pkg)}'\\);?.*(\\r?\\n)?`, 'gm');
+const buildStandaloneImportRegex = (pkg) =>
+  new RegExp(
+    `^[\\t ]*import[\\t ]+'${escapeRegExp(pkg)}';?[^\\r\\n]*(?:\\r?\\n|$)`,
+    'gm'
+  );
+const MANAGED_IMPORT_BLOCK_REGEX =
+  /^\/\/\s*\(function\s+(?:eagerExternalImports\d+|lastImports(?:\d+)?)\s*\(\)\s*\{\s*\r?\n[\s\S]*?^\/\/\s*\}\)\s*(?:\r?\n|$)/gm;
+const STANDALONE_REQUIRE_REGEX = /^\s*require\('([^']+)'\)/gm;
+const STANDALONE_IMPORT_REGEX = /^\s*import\s+'([^']+)'/gm;
 
 class RequireExternalsPlugin {
   constructor({
@@ -160,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);
@@ -173,15 +201,22 @@ class RequireExternalsPlugin {
         }
       }
 
-      // 2b) Remove any requires that are no longer in `current`
+      // 2b) Remove any dependencies that are no longer in `current`
       const toRemove = [...existing].filter(p => !current.has(p));
       if (toRemove.length) {
         let content = fs.readFileSync(this.filePath, 'utf-8');
 
-        // Strip stale require(...) lines
+        // Strip stale requires and imports generated by this plugin. Other
+        // standalone imports link Meteor entry and Rspack output files and
+        // must remain intact.
         for (const pkg of toRemove) {
-          const re = new RegExp(`^.*require\\('${pkg}'\\);?.*(\\r?\\n)?`, 'gm');
-          content = content.replace(re, '');
+          const requireRe = buildStandaloneRequireRegex(pkg);
+          const importRe = buildStandaloneImportRegex(pkg);
+          content = content.replace(requireRe, '');
+          content = content.replace(
+            MANAGED_IMPORT_BLOCK_REGEX,
+            (block) => block.replace(importRe, '')
+          );
         }
 
         // Strip out any now-empty helper functions:
@@ -206,11 +241,11 @@ class RequireExternalsPlugin {
         // Re-populate `existing` so the add-diff is accurate
         existing.clear();
         // Check for require statements
-        for (const match of content.matchAll(/require\('([^']+)'\)/g)) {
+        for (const match of content.matchAll(STANDALONE_REQUIRE_REGEX)) {
           existing.add(match[1]);
         }
         // Also check for import statements (used in the new format)
-        for (const match of content.matchAll(/import\s+'([^']+)'/g)) {
+        for (const match of content.matchAll(STANDALONE_IMPORT_REGEX)) {
           existing.add(match[1]);
         }
       }
@@ -478,19 +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
-      const requireRegex = /require\('([^']+)'\)/g;
       let match;
-      while ((match = requireRegex.exec(content)) !== null) {
-        existing.add(match[1]);
+      while ((match = STANDALONE_REQUIRE_REGEX.exec(content)) !== null) {
+        if (!isRspackBridgeImport(match[1])) existing.add(match[1]);
       }
 
       // Also check for import statements (used in the new format)
-      const importRegex = /import\s+'([^']+)'/g;
-      while ((match = importRegex.exec(content)) !== null) {
-        existing.add(match[1]);
+      while ((match = STANDALONE_IMPORT_REGEX.exec(content)) !== null) {
+        if (!isRspackBridgeImport(match[1])) existing.add(match[1]);
       }
     } catch {
       // ignore if file missing or unreadable

package/rspack.config.js

@@ -3,7 +3,6 @@ const fs = require('fs');
 const { inspect } = require('node:util');
 const path = require('path');
 const { merge } = require('webpack-merge');
-const NodePolyfillPlugin = require('node-polyfill-webpack-plugin');
 
 const { cleanOmittedPaths, mergeSplitOverlap } = require("./lib/mergeRulesSplitOverlap.js");
 const { getMeteorAppSwcConfig } = require('./lib/swc.js');
@@ -30,7 +29,7 @@ const {
 const { loadUserAndOverrideConfig } = require('./lib/meteorRspackConfigHelpers.js');
 const { prepareMeteorRspackConfig } = require("./lib/meteorRspackConfigFactory");
 const { extractLocalDependencies } = require('./lib/localDependenciesHelpers.js');
-
+const { createTestClientNodePolyfillConfig } = require("./lib/testClientNodePolyfills.js");
 
 // Safe require that doesn't throw if the module isn't found
 function safeRequire(moduleName) {
@@ -102,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 && {
@@ -127,15 +131,13 @@ function createSwcConfig({
 }) {
   const defaultConfig = {
     jsc: {
-      baseUrl: process.cwd(),
-      paths: { '/*': ['*', '/*'] },
       parser: {
         syntax: isTypescriptEnabled ? 'typescript' : 'ecmascript',
         ...(isTsxEnabled && { tsx: true }),
         ...(isJsxEnabled && { jsx: true }),
         ...(isAngularEnabled && { decorators: true }),
       },
-      target: 'es2015',
+      target: isClient ? 'es2015' : 'es2022',
       ...(isReactEnabled && {
         transform: {
           react: {
@@ -404,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
@@ -426,7 +432,7 @@ module.exports = async function (inMeteor = {}, argv = {}) {
   // Additional ignore entries
   const additionalEntries = [
     "**/.meteor/local/**",
-    "**/dist/**",
+    path.join(projectDir, "dist", "**").replace(/\\/g, "/"),
     ...(isTest && isTestEager
       ? [`**/${buildContext}/**`, "**/.meteor/local/**", "node_modules/**"]
       : []),
@@ -491,7 +497,7 @@ module.exports = async function (inMeteor = {}, argv = {}) {
     ...(Meteor.isBlazeEnabled && {
       externals: /\.html$/,
       isEagerImport: (module) => module.endsWith(".html"),
-      ...(isProd && {
+      ...((isProd || (isTest && isClient)) && {
         lastImports: [`./${outputFilename}`],
       }),
     }),
@@ -650,7 +656,7 @@ module.exports = async function (inMeteor = {}, argv = {}) {
         ...extraRules,
       ],
     },
-    resolve: { extensions, alias, fallback },
+    resolve: { extensions, alias, fallback, roots: [path.resolve(projectDir)] },
     externals,
     plugins: [
       ...[
@@ -774,6 +780,7 @@ module.exports = async function (inMeteor = {}, argv = {}) {
       alias,
       modules: ["node_modules", path.resolve(projectDir)],
       conditionNames: ["import", "require", "node", "default"],
+      roots: [path.resolve(projectDir)],
     },
     externals,
     externalsPresets: { node: true },
@@ -808,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,
   };
@@ -841,7 +852,7 @@ module.exports = async function (inMeteor = {}, argv = {}) {
           optimization: {
             splitChunks: false,
           },
-          plugins: [new NodePolyfillPlugin()],
+          ...createTestClientNodePolyfillConfig(),
         }
       : {};