@meteorjs/rspack 1.1.0-beta.2 → 1.1.0-beta.4

package/lib/test.js

@@ -9,6 +9,7 @@ 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
  */
@@ -17,6 +18,7 @@ const generateEagerTestFile = ({
   projectDir,
   buildContext,
   ignoreEntries: inIgnoreEntries = [],
+  meteorIgnoreEntries: inMeteorIgnoreEntries = [],
   prefix: inPrefix = '',
   extraEntry,
   globalImportPath,
@@ -40,6 +42,10 @@ const generateEagerTestFile = ({
   const excludeFoldersRegex = createIgnoreRegex(
     createIgnoreGlobConfig(ignoreEntries)
   );
+  // Create regex from meteor ignore entries
+  const excludeMeteorIgnoreRegex = createIgnoreRegex(
+    createIgnoreGlobConfig(inMeteorIgnoreEntries)
+  );
 
   const prefix = (inPrefix && `${inPrefix}-`) || "";
   const filename = isAppTest
@@ -51,15 +57,25 @@ const generateEagerTestFile = ({
     : "/\\.(?:test|spec)s?\\.[^.]+$/";
 
   const content = `${
-    globalImportPath ? `import '${globalImportPath}';\n\n` : ''
-  }{
-  const ctx = import.meta.webpackContext('/', {
+    globalImportPath ? `import '${globalImportPath}';\n\n` : ""
+  }
+  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) => {
+    // Make the check strictly relative to the context root.
+    // If k is absolute and starts with root, strip it; if it's already relative, leave it.
+    const rel = k.startsWith('${projectDir}') ? k.slice(${
+    projectDir.length
+  }) : k.replace(/^\\.\\//, '');
+    // Only exclude based on *relative* path segments.
+    return !MeteorIgnoreRegex.test(rel);
+  }).forEach(ctx);
   ${
     extraEntry
       ? `const extra = import.meta.webpackContext('${path.dirname(

package/package.json

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

package/rspack.config.js

@@ -434,7 +434,8 @@ module.exports = async function (inMeteor = {}, argv = {}) {
           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),
@@ -445,18 +446,14 @@ module.exports = async function (inMeteor = {}, argv = {}) {
           isClient: true,
           projectDir,
           buildContext,
-          ignoreEntries: [...meteorIgnoreEntries, "**/server/**"],
+          ignoreEntries: ["**/server/**"],
+          meteorIgnoreEntries,
           prefix: "client",
           globalImportPath: path.resolve(projectDir, buildContext, entryPath),
         })
       : isClient && isTest && testEntry
       ? path.resolve(process.cwd(), testEntry)
       : path.resolve(process.cwd(), buildContext, entryPath);
-  console.log(
-    "--> (rspack.config.js-Line: 431)\n clientEntry: ",
-    clientEntry,
-    entryPath
-  );
   const clientNameConfig = `[${(isTest && 'test-') || ''}client-rspack]`;
   // Base client config
   let clientConfig = {
@@ -560,7 +557,8 @@ module.exports = async function (inMeteor = {}, argv = {}) {
           isAppTest: true,
           projectDir,
           buildContext,
-          ignoreEntries: [...meteorIgnoreEntries, "**/client/**"],
+          ignoreEntries: ["**/client/**"],
+          meteorIgnoreEntries,
           prefix: "server",
           globalImportPath: path.resolve(projectDir, buildContext, entryPath),
         })
@@ -569,7 +567,8 @@ module.exports = async function (inMeteor = {}, argv = {}) {
           isAppTest: false,
           projectDir,
           buildContext,
-          ignoreEntries: [...meteorIgnoreEntries, "**/client/**"],
+          ignoreEntries: ["**/client/**"],
+          meteorIgnoreEntries,
           prefix: "server",
           globalImportPath: path.resolve(projectDir, buildContext, entryPath),
         })
@@ -577,11 +576,6 @@ module.exports = async function (inMeteor = {}, argv = {}) {
       ? path.resolve(process.cwd(), testEntry)
       : path.resolve(projectDir, buildContext, entryPath);
   const serverNameConfig = `[${(isTest && 'test-') || ''}server-rspack]`;
-  console.log(
-    "--> (rspack.config.js-Line: 576)\n serverEntry: ",
-    serverEntry,
-    entryPath
-  );
   // Base server config
   let serverConfig = {
     name: serverNameConfig,