From b4c99699ba421cc0d0086a3df3971c1d6627750b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= Date: Tue, 17 Feb 2026 17:10:56 +0100 Subject: [PATCH 1/8] add support for `meteorIgnoreEntries` to refine file exclusion logic in test generation and adjust rspack configuration accordingly --- npm-packages/meteor-rspack/lib/test.js | 24 +++++++++++++++++---- npm-packages/meteor-rspack/rspack.config.js | 12 +++++++---- 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/npm-packages/meteor-rspack/lib/test.js b/npm-packages/meteor-rspack/lib/test.js index e35c7e17dc..2cade65b7e 100644 --- a/npm-packages/meteor-rspack/lib/test.js +++ b/npm-packages/meteor-rspack/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, @@ -41,6 +43,15 @@ const generateEagerTestFile = ({ createIgnoreGlobConfig(ignoreEntries) ); + const excludeMeteorIgnoreRegex = createIgnoreRegex( + createIgnoreGlobConfig(inMeteorIgnoreEntries) + ); + console.log( + "--> (test.js-Line: 41)\n createIgnoreGlobConfig(ignoreEntries): ", + createIgnoreGlobConfig(ignoreEntries), + excludeFoldersRegex.toString() + ); + const prefix = (inPrefix && `${inPrefix}-`) || ""; const filename = isAppTest ? `${prefix}eager-app-tests.mjs` @@ -51,15 +62,20 @@ 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) => { + // Only exclude based on *relative* path segments. + return !MeteorIgnoreRegex.test(rel); + }).forEach(ctx); ${ extraEntry ? `const extra = import.meta.webpackContext('${path.dirname( diff --git a/npm-packages/meteor-rspack/rspack.config.js b/npm-packages/meteor-rspack/rspack.config.js index f24536ef4c..0bbb3a0eb9 100644 --- a/npm-packages/meteor-rspack/rspack.config.js +++ b/npm-packages/meteor-rspack/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,7 +446,8 @@ module.exports = async function (inMeteor = {}, argv = {}) { isClient: true, projectDir, buildContext, - ignoreEntries: [...meteorIgnoreEntries, "**/server/**"], + ignoreEntries: ["**/server/**"], + meteorIgnoreEntries, prefix: "client", globalImportPath: path.resolve(projectDir, buildContext, entryPath), }) @@ -560,7 +562,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 +572,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), }) From b92aa93ca87433bb3025a282f7e73a4ae1d466be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= Date: Tue, 17 Feb 2026 17:15:47 +0100 Subject: [PATCH 2/8] refine relative path handling in test file filtering logic --- npm-packages/meteor-rspack/lib/test.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/npm-packages/meteor-rspack/lib/test.js b/npm-packages/meteor-rspack/lib/test.js index 2cade65b7e..db4cfb9a86 100644 --- a/npm-packages/meteor-rspack/lib/test.js +++ b/npm-packages/meteor-rspack/lib/test.js @@ -73,6 +73,9 @@ const generateEagerTestFile = ({ mode: 'eager', }); 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); From 5902a86aece8b8b9efc3e5b891da2814145ae200 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= Date: Tue, 17 Feb 2026 17:16:52 +0100 Subject: [PATCH 3/8] remove debug logs and refine relative path handling in test file exclusion logic --- npm-packages/meteor-rspack/lib/test.js | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/npm-packages/meteor-rspack/lib/test.js b/npm-packages/meteor-rspack/lib/test.js index db4cfb9a86..46537314ab 100644 --- a/npm-packages/meteor-rspack/lib/test.js +++ b/npm-packages/meteor-rspack/lib/test.js @@ -42,15 +42,10 @@ const generateEagerTestFile = ({ const excludeFoldersRegex = createIgnoreRegex( createIgnoreGlobConfig(ignoreEntries) ); - + // Create regex from meteor ignore entries const excludeMeteorIgnoreRegex = createIgnoreRegex( createIgnoreGlobConfig(inMeteorIgnoreEntries) ); - console.log( - "--> (test.js-Line: 41)\n createIgnoreGlobConfig(ignoreEntries): ", - createIgnoreGlobConfig(ignoreEntries), - excludeFoldersRegex.toString() - ); const prefix = (inPrefix && `${inPrefix}-`) || ""; const filename = isAppTest @@ -75,7 +70,9 @@ const generateEagerTestFile = ({ 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(/^\\.\\//, ''); + const rel = k.startsWith('${projectDir}') ? k.slice(${ + projectDir.length + }) : k.replace(/^\\.\\//, ''); // Only exclude based on *relative* path segments. return !MeteorIgnoreRegex.test(rel); }).forEach(ctx); From 8aed659ce6ee41805cd135a32e7a35e712e8b64e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= Date: Tue, 17 Feb 2026 17:38:10 +0100 Subject: [PATCH 4/8] add test coverage on the regression fixed --- npm-packages/meteor-rspack/package-lock.json | 4 ++-- npm-packages/meteor-rspack/package.json | 2 +- npm-packages/meteor-rspack/rspack.config.js | 10 ---------- packages/rspack/lib/constants.js | 2 +- tools/modern-tests/apps/react-router/.meteorignore | 1 + .../apps/react-router/react-router/server.app-test.js | 1 + 6 files changed, 6 insertions(+), 14 deletions(-) create mode 100644 tools/modern-tests/apps/react-router/.meteorignore create mode 100644 tools/modern-tests/apps/react-router/react-router/server.app-test.js diff --git a/npm-packages/meteor-rspack/package-lock.json b/npm-packages/meteor-rspack/package-lock.json index cf2ece90f6..e4d92c823d 100644 --- a/npm-packages/meteor-rspack/package-lock.json +++ b/npm-packages/meteor-rspack/package-lock.json @@ -1,12 +1,12 @@ { "name": "@meteorjs/rspack", - "version": "1.1.0-beta.2", + "version": "1.1.0-beta.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@meteorjs/rspack", - "version": "1.1.0-beta.2", + "version": "1.1.0-beta.4", "license": "ISC", "dependencies": { "fast-deep-equal": "^3.1.3", diff --git a/npm-packages/meteor-rspack/package.json b/npm-packages/meteor-rspack/package.json index 1306b93e26..ace6b6ee48 100644 --- a/npm-packages/meteor-rspack/package.json +++ b/npm-packages/meteor-rspack/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", diff --git a/npm-packages/meteor-rspack/rspack.config.js b/npm-packages/meteor-rspack/rspack.config.js index 0bbb3a0eb9..4e92ad24d4 100644 --- a/npm-packages/meteor-rspack/rspack.config.js +++ b/npm-packages/meteor-rspack/rspack.config.js @@ -454,11 +454,6 @@ module.exports = async function (inMeteor = {}, argv = {}) { : 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 = { @@ -581,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, diff --git a/packages/rspack/lib/constants.js b/packages/rspack/lib/constants.js index 3a16c20419..91e577810c 100644 --- a/packages/rspack/lib/constants.js +++ b/packages/rspack/lib/constants.js @@ -5,7 +5,7 @@ export const DEFAULT_RSPACK_VERSION = '1.7.1'; -export const DEFAULT_METEOR_RSPACK_VERSION = '1.1.0-beta.2'; +export const DEFAULT_METEOR_RSPACK_VERSION = '1.1.0-beta.4'; export const DEFAULT_METEOR_RSPACK_REACT_HMR_VERSION = '1.4.3'; diff --git a/tools/modern-tests/apps/react-router/.meteorignore b/tools/modern-tests/apps/react-router/.meteorignore new file mode 100644 index 0000000000..b6cff6faa1 --- /dev/null +++ b/tools/modern-tests/apps/react-router/.meteorignore @@ -0,0 +1 @@ +react-router* diff --git a/tools/modern-tests/apps/react-router/react-router/server.app-test.js b/tools/modern-tests/apps/react-router/react-router/server.app-test.js new file mode 100644 index 0000000000..609d8d8cad --- /dev/null +++ b/tools/modern-tests/apps/react-router/react-router/server.app-test.js @@ -0,0 +1 @@ +throw new Error("test should be ignored by eager test loading"); From 4391d4959abe070bcc50e5e87773aaad2251efc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= Date: Tue, 17 Feb 2026 18:17:56 +0100 Subject: [PATCH 5/8] update @meteorjs/rspack to 1.1.0-beta.5 and refine test file exclusion logic --- npm-packages/meteor-rspack/lib/ignore.js | 2 +- npm-packages/meteor-rspack/lib/test.js | 26 ++++++++++--------- npm-packages/meteor-rspack/package-lock.json | 4 +-- npm-packages/meteor-rspack/package.json | 2 +- packages/rspack/lib/constants.js | 2 +- .../react-router-wxyz/ignore.app-test.js | 5 ++++ .../react-router/server.app-test.js | 1 - 7 files changed, 24 insertions(+), 18 deletions(-) create mode 100644 tools/modern-tests/apps/react-router/react-router-wxyz/ignore.app-test.js delete mode 100644 tools/modern-tests/apps/react-router/react-router/server.app-test.js diff --git a/npm-packages/meteor-rspack/lib/ignore.js b/npm-packages/meteor-rspack/lib/ignore.js index 17058cce19..3294c28f5c 100644 --- a/npm-packages/meteor-rspack/lib/ignore.js +++ b/npm-packages/meteor-rspack/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 + (pattern.endsWith('*') ? '' : '$'); return regexPattern; }).filter(pattern => pattern !== null); diff --git a/npm-packages/meteor-rspack/lib/test.js b/npm-packages/meteor-rspack/lib/test.js index 46537314ab..432551af0d 100644 --- a/npm-packages/meteor-rspack/lib/test.js +++ b/npm-packages/meteor-rspack/lib/test.js @@ -43,9 +43,9 @@ const generateEagerTestFile = ({ createIgnoreGlobConfig(ignoreEntries) ); // Create regex from meteor ignore entries - const excludeMeteorIgnoreRegex = createIgnoreRegex( - createIgnoreGlobConfig(inMeteorIgnoreEntries) - ); + const excludeMeteorIgnoreRegex = inMeteorIgnoreEntries.length > 0 + ? createIgnoreRegex(createIgnoreGlobConfig(inMeteorIgnoreEntries)) + : null; const prefix = (inPrefix && `${inPrefix}-`) || ""; const filename = isAppTest @@ -58,9 +58,12 @@ const generateEagerTestFile = ({ const content = `${ globalImportPath ? `import '${globalImportPath}';\n\n` : "" + }${ + excludeMeteorIgnoreRegex + ? `const MeteorIgnoreRegex = ${excludeMeteorIgnoreRegex.toString()};` + : "" } - const MeteorIgnoreRegex = ${excludeMeteorIgnoreRegex.toString()}; - { +{ const ctx = import.meta.webpackContext('${projectDir}', { recursive: true, regExp: ${regExp}, @@ -68,13 +71,12 @@ const generateEagerTestFile = ({ mode: 'eager', }); 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); + ${ + excludeMeteorIgnoreRegex + ? `// Only exclude based on *relative* path segments. + return !MeteorIgnoreRegex.test(k);` + : "return true;" + } }).forEach(ctx); ${ extraEntry diff --git a/npm-packages/meteor-rspack/package-lock.json b/npm-packages/meteor-rspack/package-lock.json index e4d92c823d..1213343e3e 100644 --- a/npm-packages/meteor-rspack/package-lock.json +++ b/npm-packages/meteor-rspack/package-lock.json @@ -1,12 +1,12 @@ { "name": "@meteorjs/rspack", - "version": "1.1.0-beta.4", + "version": "1.1.0-beta.5", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@meteorjs/rspack", - "version": "1.1.0-beta.4", + "version": "1.1.0-beta.5", "license": "ISC", "dependencies": { "fast-deep-equal": "^3.1.3", diff --git a/npm-packages/meteor-rspack/package.json b/npm-packages/meteor-rspack/package.json index ace6b6ee48..6978169c53 100644 --- a/npm-packages/meteor-rspack/package.json +++ b/npm-packages/meteor-rspack/package.json @@ -1,6 +1,6 @@ { "name": "@meteorjs/rspack", - "version": "1.1.0-beta.4", + "version": "1.1.0-beta.5", "description": "Configuration logic for using Rspack in Meteor projects", "main": "index.js", "type": "commonjs", diff --git a/packages/rspack/lib/constants.js b/packages/rspack/lib/constants.js index 91e577810c..3ceefd78fd 100644 --- a/packages/rspack/lib/constants.js +++ b/packages/rspack/lib/constants.js @@ -5,7 +5,7 @@ export const DEFAULT_RSPACK_VERSION = '1.7.1'; -export const DEFAULT_METEOR_RSPACK_VERSION = '1.1.0-beta.4'; +export const DEFAULT_METEOR_RSPACK_VERSION = '1.1.0-beta.5'; export const DEFAULT_METEOR_RSPACK_REACT_HMR_VERSION = '1.4.3'; diff --git a/tools/modern-tests/apps/react-router/react-router-wxyz/ignore.app-test.js b/tools/modern-tests/apps/react-router/react-router-wxyz/ignore.app-test.js new file mode 100644 index 0000000000..dfa87e115b --- /dev/null +++ b/tools/modern-tests/apps/react-router/react-router-wxyz/ignore.app-test.js @@ -0,0 +1,5 @@ +describe("Ignore", () => { + it("should not run as ignored", () => { + throw new Error("test should be ignored by eager test loading"); + }); +}); diff --git a/tools/modern-tests/apps/react-router/react-router/server.app-test.js b/tools/modern-tests/apps/react-router/react-router/server.app-test.js deleted file mode 100644 index 609d8d8cad..0000000000 --- a/tools/modern-tests/apps/react-router/react-router/server.app-test.js +++ /dev/null @@ -1 +0,0 @@ -throw new Error("test should be ignored by eager test loading"); From a1eb3c237a74aa4572206b28ddfd8e2b87f8d9ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= Date: Tue, 17 Feb 2026 18:43:38 +0100 Subject: [PATCH 6/8] refine test file exclusion logic by expanding ignore patterns and updating regex handling --- npm-packages/meteor-rspack/lib/ignore.js | 2 +- npm-packages/meteor-rspack/package-lock.json | 4 ++-- npm-packages/meteor-rspack/package.json | 2 +- packages/rspack/lib/constants.js | 2 +- tools/modern-tests/apps/react-router/.meteorignore | 5 +++++ .../apps/react-router/file-to-ignore.app-test.js | 5 +++++ .../apps/react-router/folder-to-ignore/ignore.app-test.js | 5 +++++ .../apps/react-router/prefix-test/ignore.app-test.js | 5 +++++ .../apps/react-router/react-router-wxyz/ignore.app-test.js | 2 +- .../apps/react-router/some-test-suffix/ignore.app-test.js | 5 +++++ .../react-router/some/nested/glob-ignore/ignore.app-test.js | 5 +++++ 11 files changed, 36 insertions(+), 6 deletions(-) create mode 100644 tools/modern-tests/apps/react-router/file-to-ignore.app-test.js create mode 100644 tools/modern-tests/apps/react-router/folder-to-ignore/ignore.app-test.js create mode 100644 tools/modern-tests/apps/react-router/prefix-test/ignore.app-test.js create mode 100644 tools/modern-tests/apps/react-router/some-test-suffix/ignore.app-test.js create mode 100644 tools/modern-tests/apps/react-router/some/nested/glob-ignore/ignore.app-test.js diff --git a/npm-packages/meteor-rspack/lib/ignore.js b/npm-packages/meteor-rspack/lib/ignore.js index 3294c28f5c..7abc3ba959 100644 --- a/npm-packages/meteor-rspack/lib/ignore.js +++ b/npm-packages/meteor-rspack/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 + (pattern.endsWith('*') ? '' : '$'); + regexPattern = '(?:^|/)' + regexPattern; return regexPattern; }).filter(pattern => pattern !== null); diff --git a/npm-packages/meteor-rspack/package-lock.json b/npm-packages/meteor-rspack/package-lock.json index 1213343e3e..4b2c4e1836 100644 --- a/npm-packages/meteor-rspack/package-lock.json +++ b/npm-packages/meteor-rspack/package-lock.json @@ -1,12 +1,12 @@ { "name": "@meteorjs/rspack", - "version": "1.1.0-beta.5", + "version": "1.1.0-beta.6", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@meteorjs/rspack", - "version": "1.1.0-beta.5", + "version": "1.1.0-beta.6", "license": "ISC", "dependencies": { "fast-deep-equal": "^3.1.3", diff --git a/npm-packages/meteor-rspack/package.json b/npm-packages/meteor-rspack/package.json index 6978169c53..71b4960bb7 100644 --- a/npm-packages/meteor-rspack/package.json +++ b/npm-packages/meteor-rspack/package.json @@ -1,6 +1,6 @@ { "name": "@meteorjs/rspack", - "version": "1.1.0-beta.5", + "version": "1.1.0-beta.6", "description": "Configuration logic for using Rspack in Meteor projects", "main": "index.js", "type": "commonjs", diff --git a/packages/rspack/lib/constants.js b/packages/rspack/lib/constants.js index 3ceefd78fd..c9073b740d 100644 --- a/packages/rspack/lib/constants.js +++ b/packages/rspack/lib/constants.js @@ -5,7 +5,7 @@ export const DEFAULT_RSPACK_VERSION = '1.7.1'; -export const DEFAULT_METEOR_RSPACK_VERSION = '1.1.0-beta.5'; +export const DEFAULT_METEOR_RSPACK_VERSION = '1.1.0-beta.6'; export const DEFAULT_METEOR_RSPACK_REACT_HMR_VERSION = '1.4.3'; diff --git a/tools/modern-tests/apps/react-router/.meteorignore b/tools/modern-tests/apps/react-router/.meteorignore index b6cff6faa1..6b53260afa 100644 --- a/tools/modern-tests/apps/react-router/.meteorignore +++ b/tools/modern-tests/apps/react-router/.meteorignore @@ -1 +1,6 @@ react-router* +folder-to-ignore/ +file-to-ignore.app-test.js +**/glob-ignore/*.app-test.js +prefix-* +*-suffix diff --git a/tools/modern-tests/apps/react-router/file-to-ignore.app-test.js b/tools/modern-tests/apps/react-router/file-to-ignore.app-test.js new file mode 100644 index 0000000000..2fca97e5e9 --- /dev/null +++ b/tools/modern-tests/apps/react-router/file-to-ignore.app-test.js @@ -0,0 +1,5 @@ +describe("file-to-ignore.app-test.js pattern", () => { + it("should not run as ignored", () => { + throw new Error("test should be ignored by eager test loading"); + }); +}); diff --git a/tools/modern-tests/apps/react-router/folder-to-ignore/ignore.app-test.js b/tools/modern-tests/apps/react-router/folder-to-ignore/ignore.app-test.js new file mode 100644 index 0000000000..f0c849ec65 --- /dev/null +++ b/tools/modern-tests/apps/react-router/folder-to-ignore/ignore.app-test.js @@ -0,0 +1,5 @@ +describe("folder-to-ignore/ pattern", () => { + it("should not run as ignored", () => { + throw new Error("test should be ignored by eager test loading"); + }); +}); diff --git a/tools/modern-tests/apps/react-router/prefix-test/ignore.app-test.js b/tools/modern-tests/apps/react-router/prefix-test/ignore.app-test.js new file mode 100644 index 0000000000..faeb6ad5ec --- /dev/null +++ b/tools/modern-tests/apps/react-router/prefix-test/ignore.app-test.js @@ -0,0 +1,5 @@ +describe("prefix-* pattern", () => { + it("should not run as ignored", () => { + throw new Error("test should be ignored by eager test loading"); + }); +}); diff --git a/tools/modern-tests/apps/react-router/react-router-wxyz/ignore.app-test.js b/tools/modern-tests/apps/react-router/react-router-wxyz/ignore.app-test.js index dfa87e115b..6252f64b5b 100644 --- a/tools/modern-tests/apps/react-router/react-router-wxyz/ignore.app-test.js +++ b/tools/modern-tests/apps/react-router/react-router-wxyz/ignore.app-test.js @@ -1,4 +1,4 @@ -describe("Ignore", () => { +describe("react-router* pattern", () => { it("should not run as ignored", () => { throw new Error("test should be ignored by eager test loading"); }); diff --git a/tools/modern-tests/apps/react-router/some-test-suffix/ignore.app-test.js b/tools/modern-tests/apps/react-router/some-test-suffix/ignore.app-test.js new file mode 100644 index 0000000000..22830f7edc --- /dev/null +++ b/tools/modern-tests/apps/react-router/some-test-suffix/ignore.app-test.js @@ -0,0 +1,5 @@ +describe("*-suffix pattern", () => { + it("should not run as ignored", () => { + throw new Error("test should be ignored by eager test loading"); + }); +}); diff --git a/tools/modern-tests/apps/react-router/some/nested/glob-ignore/ignore.app-test.js b/tools/modern-tests/apps/react-router/some/nested/glob-ignore/ignore.app-test.js new file mode 100644 index 0000000000..6b220fd38f --- /dev/null +++ b/tools/modern-tests/apps/react-router/some/nested/glob-ignore/ignore.app-test.js @@ -0,0 +1,5 @@ +describe("**/glob-ignore/*.app-test.js pattern", () => { + it("should not run as ignored", () => { + throw new Error("test should be ignored by eager test loading"); + }); +}); From 00d1e6f485c42591d0f0d11dadefda0c98c5e803 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= Date: Wed, 18 Feb 2026 16:55:21 +0100 Subject: [PATCH 7/8] expand and refine test exclusion patterns by updating `.meteorignore` and test file structure --- npm-packages/meteor-rspack/lib/test.js | 1 + .../apps/react-router/.meteorignore | 22 ++++++++++++++----- .../react-router/file-to-ignored.app-test.js | 5 +++++ ...th-multiple-extensions-ignored.app-test.js | 5 +++++ .../ignore.app-test.js | 2 +- .../apps/react-router/important.app-test.js | 7 ++++++ .../integration/test-ignored.app-test.js | 5 +++++ .../ignore.app-test.js | 2 +- .../ignore.app-test.js | 2 +- .../ignore.app-test.js | 2 +- .../nested/glob-ignore/ignore.app-test.js | 5 ----- .../nested/glob-ignored/ignore.app-test.js | 5 +++++ .../some/unit/test-ignored.app-test.js | 5 +++++ .../specific-file-ignored.app-test.js | 5 +++++ ...st.js => test-example-ignored.app-test.js} | 2 +- .../test.temp-ignored.app-test.js | 5 +++++ 16 files changed, 64 insertions(+), 16 deletions(-) create mode 100644 tools/modern-tests/apps/react-router/file-to-ignored.app-test.js create mode 100644 tools/modern-tests/apps/react-router/file-with-multiple-extensions-ignored.app-test.js rename tools/modern-tests/apps/react-router/{folder-to-ignore => folder-to-ignored}/ignore.app-test.js (72%) create mode 100644 tools/modern-tests/apps/react-router/important.app-test.js create mode 100644 tools/modern-tests/apps/react-router/integration/test-ignored.app-test.js rename tools/modern-tests/apps/react-router/{some-test-suffix => prefix-test-ignored}/ignore.app-test.js (72%) rename tools/modern-tests/apps/react-router/{react-router-wxyz => react-router-wxyz-ignored}/ignore.app-test.js (70%) rename tools/modern-tests/apps/react-router/{prefix-test => some-test-ignored-suffix}/ignore.app-test.js (72%) delete mode 100644 tools/modern-tests/apps/react-router/some/nested/glob-ignore/ignore.app-test.js create mode 100644 tools/modern-tests/apps/react-router/some/nested/glob-ignored/ignore.app-test.js create mode 100644 tools/modern-tests/apps/react-router/some/unit/test-ignored.app-test.js create mode 100644 tools/modern-tests/apps/react-router/specific-file-ignored.app-test.js rename tools/modern-tests/apps/react-router/{file-to-ignore.app-test.js => test-example-ignored.app-test.js} (68%) create mode 100644 tools/modern-tests/apps/react-router/test.temp-ignored.app-test.js diff --git a/npm-packages/meteor-rspack/lib/test.js b/npm-packages/meteor-rspack/lib/test.js index 432551af0d..6ea5a04cf4 100644 --- a/npm-packages/meteor-rspack/lib/test.js +++ b/npm-packages/meteor-rspack/lib/test.js @@ -42,6 +42,7 @@ 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)) diff --git a/tools/modern-tests/apps/react-router/.meteorignore b/tools/modern-tests/apps/react-router/.meteorignore index 6b53260afa..e8c59338fc 100644 --- a/tools/modern-tests/apps/react-router/.meteorignore +++ b/tools/modern-tests/apps/react-router/.meteorignore @@ -1,6 +1,16 @@ -react-router* -folder-to-ignore/ -file-to-ignore.app-test.js -**/glob-ignore/*.app-test.js -prefix-* -*-suffix +# Folder combination patterns +react-router*-ignored +folder-to-ignored/ +file-to-ignored.app-test.js +**/glob-ignored/*.app-test.js +prefix-*-ignored +*-ignored-suffix + +# File combination patterns +specific-file-ignored.app-test.js +*.temp-ignored.app-test.js +**/unit/*.app-test.js +integration/*-ignored.app-test.js +!important.app-test.js +test-*-ignored.app-test.js +file-with-multiple-extensions-ignored.app-test.js diff --git a/tools/modern-tests/apps/react-router/file-to-ignored.app-test.js b/tools/modern-tests/apps/react-router/file-to-ignored.app-test.js new file mode 100644 index 0000000000..c4d16204ae --- /dev/null +++ b/tools/modern-tests/apps/react-router/file-to-ignored.app-test.js @@ -0,0 +1,5 @@ +describe("file-to-ignored.app-test.js pattern", () => { + it("should not run as ignored", () => { + throw new Error("test should be ignored by eager test loading"); + }); +}); diff --git a/tools/modern-tests/apps/react-router/file-with-multiple-extensions-ignored.app-test.js b/tools/modern-tests/apps/react-router/file-with-multiple-extensions-ignored.app-test.js new file mode 100644 index 0000000000..08e2e26dd3 --- /dev/null +++ b/tools/modern-tests/apps/react-router/file-with-multiple-extensions-ignored.app-test.js @@ -0,0 +1,5 @@ +describe("file-with-multiple-extensions-ignored.app-test.js pattern", () => { + it("should not run as ignored", () => { + throw new Error("test should be ignored by eager test loading"); + }); +}); diff --git a/tools/modern-tests/apps/react-router/folder-to-ignore/ignore.app-test.js b/tools/modern-tests/apps/react-router/folder-to-ignored/ignore.app-test.js similarity index 72% rename from tools/modern-tests/apps/react-router/folder-to-ignore/ignore.app-test.js rename to tools/modern-tests/apps/react-router/folder-to-ignored/ignore.app-test.js index f0c849ec65..27968893ac 100644 --- a/tools/modern-tests/apps/react-router/folder-to-ignore/ignore.app-test.js +++ b/tools/modern-tests/apps/react-router/folder-to-ignored/ignore.app-test.js @@ -1,4 +1,4 @@ -describe("folder-to-ignore/ pattern", () => { +describe("folder-to-ignored/ pattern", () => { it("should not run as ignored", () => { throw new Error("test should be ignored by eager test loading"); }); diff --git a/tools/modern-tests/apps/react-router/important.app-test.js b/tools/modern-tests/apps/react-router/important.app-test.js new file mode 100644 index 0000000000..a9cb841908 --- /dev/null +++ b/tools/modern-tests/apps/react-router/important.app-test.js @@ -0,0 +1,7 @@ +import assert from "assert"; + +describe("!important.app-test.js pattern", () => { + it("should run as it's not ignored (negation)", () => { + assert(true, "should run"); + }); +}); diff --git a/tools/modern-tests/apps/react-router/integration/test-ignored.app-test.js b/tools/modern-tests/apps/react-router/integration/test-ignored.app-test.js new file mode 100644 index 0000000000..23dcb26b19 --- /dev/null +++ b/tools/modern-tests/apps/react-router/integration/test-ignored.app-test.js @@ -0,0 +1,5 @@ +describe("integration/*-ignored.app-test.js pattern", () => { + it("should not run as ignored", () => { + throw new Error("test should be ignored by eager test loading"); + }); +}); diff --git a/tools/modern-tests/apps/react-router/some-test-suffix/ignore.app-test.js b/tools/modern-tests/apps/react-router/prefix-test-ignored/ignore.app-test.js similarity index 72% rename from tools/modern-tests/apps/react-router/some-test-suffix/ignore.app-test.js rename to tools/modern-tests/apps/react-router/prefix-test-ignored/ignore.app-test.js index 22830f7edc..cbe835f668 100644 --- a/tools/modern-tests/apps/react-router/some-test-suffix/ignore.app-test.js +++ b/tools/modern-tests/apps/react-router/prefix-test-ignored/ignore.app-test.js @@ -1,4 +1,4 @@ -describe("*-suffix pattern", () => { +describe("prefix-*-ignored pattern", () => { it("should not run as ignored", () => { throw new Error("test should be ignored by eager test loading"); }); diff --git a/tools/modern-tests/apps/react-router/react-router-wxyz/ignore.app-test.js b/tools/modern-tests/apps/react-router/react-router-wxyz-ignored/ignore.app-test.js similarity index 70% rename from tools/modern-tests/apps/react-router/react-router-wxyz/ignore.app-test.js rename to tools/modern-tests/apps/react-router/react-router-wxyz-ignored/ignore.app-test.js index 6252f64b5b..bf67b299e7 100644 --- a/tools/modern-tests/apps/react-router/react-router-wxyz/ignore.app-test.js +++ b/tools/modern-tests/apps/react-router/react-router-wxyz-ignored/ignore.app-test.js @@ -1,4 +1,4 @@ -describe("react-router* pattern", () => { +describe("react-router*-ignored pattern", () => { it("should not run as ignored", () => { throw new Error("test should be ignored by eager test loading"); }); diff --git a/tools/modern-tests/apps/react-router/prefix-test/ignore.app-test.js b/tools/modern-tests/apps/react-router/some-test-ignored-suffix/ignore.app-test.js similarity index 72% rename from tools/modern-tests/apps/react-router/prefix-test/ignore.app-test.js rename to tools/modern-tests/apps/react-router/some-test-ignored-suffix/ignore.app-test.js index faeb6ad5ec..30282297ed 100644 --- a/tools/modern-tests/apps/react-router/prefix-test/ignore.app-test.js +++ b/tools/modern-tests/apps/react-router/some-test-ignored-suffix/ignore.app-test.js @@ -1,4 +1,4 @@ -describe("prefix-* pattern", () => { +describe("*-ignored-suffix pattern", () => { it("should not run as ignored", () => { throw new Error("test should be ignored by eager test loading"); }); diff --git a/tools/modern-tests/apps/react-router/some/nested/glob-ignore/ignore.app-test.js b/tools/modern-tests/apps/react-router/some/nested/glob-ignore/ignore.app-test.js deleted file mode 100644 index 6b220fd38f..0000000000 --- a/tools/modern-tests/apps/react-router/some/nested/glob-ignore/ignore.app-test.js +++ /dev/null @@ -1,5 +0,0 @@ -describe("**/glob-ignore/*.app-test.js pattern", () => { - it("should not run as ignored", () => { - throw new Error("test should be ignored by eager test loading"); - }); -}); diff --git a/tools/modern-tests/apps/react-router/some/nested/glob-ignored/ignore.app-test.js b/tools/modern-tests/apps/react-router/some/nested/glob-ignored/ignore.app-test.js new file mode 100644 index 0000000000..a17df041dc --- /dev/null +++ b/tools/modern-tests/apps/react-router/some/nested/glob-ignored/ignore.app-test.js @@ -0,0 +1,5 @@ +describe("**/glob-ignored/*.app-test.js pattern", () => { + it("should not run as ignored", () => { + throw new Error("test should be ignored by eager test loading"); + }); +}); diff --git a/tools/modern-tests/apps/react-router/some/unit/test-ignored.app-test.js b/tools/modern-tests/apps/react-router/some/unit/test-ignored.app-test.js new file mode 100644 index 0000000000..08de39fdcc --- /dev/null +++ b/tools/modern-tests/apps/react-router/some/unit/test-ignored.app-test.js @@ -0,0 +1,5 @@ +describe("**/unit/*.app-test.js pattern", () => { + it("should not run as ignored", () => { + throw new Error("test should be ignored by eager test loading"); + }); +}); diff --git a/tools/modern-tests/apps/react-router/specific-file-ignored.app-test.js b/tools/modern-tests/apps/react-router/specific-file-ignored.app-test.js new file mode 100644 index 0000000000..17a1203f93 --- /dev/null +++ b/tools/modern-tests/apps/react-router/specific-file-ignored.app-test.js @@ -0,0 +1,5 @@ +describe("specific-file-ignored.app-test.js pattern", () => { + it("should not run as ignored", () => { + throw new Error("test should be ignored by eager test loading"); + }); +}); diff --git a/tools/modern-tests/apps/react-router/file-to-ignore.app-test.js b/tools/modern-tests/apps/react-router/test-example-ignored.app-test.js similarity index 68% rename from tools/modern-tests/apps/react-router/file-to-ignore.app-test.js rename to tools/modern-tests/apps/react-router/test-example-ignored.app-test.js index 2fca97e5e9..4e872e6c8b 100644 --- a/tools/modern-tests/apps/react-router/file-to-ignore.app-test.js +++ b/tools/modern-tests/apps/react-router/test-example-ignored.app-test.js @@ -1,4 +1,4 @@ -describe("file-to-ignore.app-test.js pattern", () => { +describe("test-*-ignored.app-test.js pattern", () => { it("should not run as ignored", () => { throw new Error("test should be ignored by eager test loading"); }); diff --git a/tools/modern-tests/apps/react-router/test.temp-ignored.app-test.js b/tools/modern-tests/apps/react-router/test.temp-ignored.app-test.js new file mode 100644 index 0000000000..d7dd5b6748 --- /dev/null +++ b/tools/modern-tests/apps/react-router/test.temp-ignored.app-test.js @@ -0,0 +1,5 @@ +describe("*.temp-ignored.app-test.js pattern", () => { + it("should not run as ignored", () => { + throw new Error("test should be ignored by eager test loading"); + }); +}); From 0bd094dea4ee3645ad02acece0cfd8f546d75340 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= Date: Wed, 18 Feb 2026 17:10:25 +0100 Subject: [PATCH 8/8] expand test file exclusion --- .../apps/react-router/.meteorignore | 20 +++++++++---------- ...th-multiple-extensions-ignored.app-test.js | 5 ----- .../ignored}/file-to-ignored.app-test.js | 2 +- .../folder-to-ignored/ignore.app-test.js | 2 +- .../integration}/test-ignored.app-test.js | 2 +- .../prefix-test-ignored}/ignore.app-test.js | 2 +- .../ignore.app-test.js | 2 +- .../ignore.app-test.js | 2 +- .../nested/glob-ignored/ignore.app-test.js | 5 +++++ .../some/unit}/test-ignored.app-test.js | 2 +- .../specific-file-ignored.app-test.js | 2 +- .../ignored}/test-example-ignored.app-test.js | 2 +- .../ignored}/test.temp-ignored.app-test.js | 2 +- 13 files changed, 25 insertions(+), 25 deletions(-) delete mode 100644 tools/modern-tests/apps/react-router/file-with-multiple-extensions-ignored.app-test.js rename tools/modern-tests/apps/react-router/{ => tests/ignored}/file-to-ignored.app-test.js (63%) rename tools/modern-tests/apps/react-router/{ => tests/ignored}/folder-to-ignored/ignore.app-test.js (66%) rename tools/modern-tests/apps/react-router/{some/unit => tests/ignored/integration}/test-ignored.app-test.js (61%) rename tools/modern-tests/apps/react-router/{some/nested/glob-ignored => tests/ignored/prefix-test-ignored}/ignore.app-test.js (67%) rename tools/modern-tests/apps/react-router/{some-test-ignored-suffix => tests/ignored/react-router-wxyz-ignored}/ignore.app-test.js (65%) rename tools/modern-tests/apps/react-router/{prefix-test-ignored => tests/ignored/some-test-ignored-suffix}/ignore.app-test.js (67%) create mode 100644 tools/modern-tests/apps/react-router/tests/ignored/some/nested/glob-ignored/ignore.app-test.js rename tools/modern-tests/apps/react-router/{integration => tests/ignored/some/unit}/test-ignored.app-test.js (61%) rename tools/modern-tests/apps/react-router/{ => tests/ignored}/specific-file-ignored.app-test.js (61%) rename tools/modern-tests/apps/react-router/{ => tests/ignored}/test-example-ignored.app-test.js (63%) rename tools/modern-tests/apps/react-router/{ => tests/ignored}/test.temp-ignored.app-test.js (63%) diff --git a/tools/modern-tests/apps/react-router/.meteorignore b/tools/modern-tests/apps/react-router/.meteorignore index e8c59338fc..269a4e9cc4 100644 --- a/tools/modern-tests/apps/react-router/.meteorignore +++ b/tools/modern-tests/apps/react-router/.meteorignore @@ -1,16 +1,16 @@ # Folder combination patterns -react-router*-ignored -folder-to-ignored/ -file-to-ignored.app-test.js +react-router* +tests/ignored/react-router*-ignored +tests/ignored/folder-to-ignored/ +tests/ignored/file-to-ignored.app-test.js **/glob-ignored/*.app-test.js -prefix-*-ignored -*-ignored-suffix +tests/ignored/prefix-*-ignored +tests/ignored/*-ignored-suffix # File combination patterns -specific-file-ignored.app-test.js -*.temp-ignored.app-test.js +tests/ignored/specific-file-ignored.app-test.js +tests/ignored/*.temp-ignored.app-test.js **/unit/*.app-test.js -integration/*-ignored.app-test.js +tests/ignored/integration/*-ignored.app-test.js +tests/ignored/test-*-ignored.app-test.js !important.app-test.js -test-*-ignored.app-test.js -file-with-multiple-extensions-ignored.app-test.js diff --git a/tools/modern-tests/apps/react-router/file-with-multiple-extensions-ignored.app-test.js b/tools/modern-tests/apps/react-router/file-with-multiple-extensions-ignored.app-test.js deleted file mode 100644 index 08e2e26dd3..0000000000 --- a/tools/modern-tests/apps/react-router/file-with-multiple-extensions-ignored.app-test.js +++ /dev/null @@ -1,5 +0,0 @@ -describe("file-with-multiple-extensions-ignored.app-test.js pattern", () => { - it("should not run as ignored", () => { - throw new Error("test should be ignored by eager test loading"); - }); -}); diff --git a/tools/modern-tests/apps/react-router/file-to-ignored.app-test.js b/tools/modern-tests/apps/react-router/tests/ignored/file-to-ignored.app-test.js similarity index 63% rename from tools/modern-tests/apps/react-router/file-to-ignored.app-test.js rename to tools/modern-tests/apps/react-router/tests/ignored/file-to-ignored.app-test.js index c4d16204ae..c67d43d5d9 100644 --- a/tools/modern-tests/apps/react-router/file-to-ignored.app-test.js +++ b/tools/modern-tests/apps/react-router/tests/ignored/file-to-ignored.app-test.js @@ -1,4 +1,4 @@ -describe("file-to-ignored.app-test.js pattern", () => { +describe("tests/ignored/file-to-ignored.app-test.js pattern", () => { it("should not run as ignored", () => { throw new Error("test should be ignored by eager test loading"); }); diff --git a/tools/modern-tests/apps/react-router/folder-to-ignored/ignore.app-test.js b/tools/modern-tests/apps/react-router/tests/ignored/folder-to-ignored/ignore.app-test.js similarity index 66% rename from tools/modern-tests/apps/react-router/folder-to-ignored/ignore.app-test.js rename to tools/modern-tests/apps/react-router/tests/ignored/folder-to-ignored/ignore.app-test.js index 27968893ac..5878c51755 100644 --- a/tools/modern-tests/apps/react-router/folder-to-ignored/ignore.app-test.js +++ b/tools/modern-tests/apps/react-router/tests/ignored/folder-to-ignored/ignore.app-test.js @@ -1,4 +1,4 @@ -describe("folder-to-ignored/ pattern", () => { +describe("tests/ignored/folder-to-ignored/ pattern", () => { it("should not run as ignored", () => { throw new Error("test should be ignored by eager test loading"); }); diff --git a/tools/modern-tests/apps/react-router/some/unit/test-ignored.app-test.js b/tools/modern-tests/apps/react-router/tests/ignored/integration/test-ignored.app-test.js similarity index 61% rename from tools/modern-tests/apps/react-router/some/unit/test-ignored.app-test.js rename to tools/modern-tests/apps/react-router/tests/ignored/integration/test-ignored.app-test.js index 08de39fdcc..6c85dda4f6 100644 --- a/tools/modern-tests/apps/react-router/some/unit/test-ignored.app-test.js +++ b/tools/modern-tests/apps/react-router/tests/ignored/integration/test-ignored.app-test.js @@ -1,4 +1,4 @@ -describe("**/unit/*.app-test.js pattern", () => { +describe("tests/ignored/integration/*-ignored.app-test.js pattern", () => { it("should not run as ignored", () => { throw new Error("test should be ignored by eager test loading"); }); diff --git a/tools/modern-tests/apps/react-router/some/nested/glob-ignored/ignore.app-test.js b/tools/modern-tests/apps/react-router/tests/ignored/prefix-test-ignored/ignore.app-test.js similarity index 67% rename from tools/modern-tests/apps/react-router/some/nested/glob-ignored/ignore.app-test.js rename to tools/modern-tests/apps/react-router/tests/ignored/prefix-test-ignored/ignore.app-test.js index a17df041dc..a8a1c30c5a 100644 --- a/tools/modern-tests/apps/react-router/some/nested/glob-ignored/ignore.app-test.js +++ b/tools/modern-tests/apps/react-router/tests/ignored/prefix-test-ignored/ignore.app-test.js @@ -1,4 +1,4 @@ -describe("**/glob-ignored/*.app-test.js pattern", () => { +describe("tests/ignored/prefix-*-ignored pattern", () => { it("should not run as ignored", () => { throw new Error("test should be ignored by eager test loading"); }); diff --git a/tools/modern-tests/apps/react-router/some-test-ignored-suffix/ignore.app-test.js b/tools/modern-tests/apps/react-router/tests/ignored/react-router-wxyz-ignored/ignore.app-test.js similarity index 65% rename from tools/modern-tests/apps/react-router/some-test-ignored-suffix/ignore.app-test.js rename to tools/modern-tests/apps/react-router/tests/ignored/react-router-wxyz-ignored/ignore.app-test.js index 30282297ed..217570f7b1 100644 --- a/tools/modern-tests/apps/react-router/some-test-ignored-suffix/ignore.app-test.js +++ b/tools/modern-tests/apps/react-router/tests/ignored/react-router-wxyz-ignored/ignore.app-test.js @@ -1,4 +1,4 @@ -describe("*-ignored-suffix pattern", () => { +describe("tests/ignored/react-router*-ignored pattern", () => { it("should not run as ignored", () => { throw new Error("test should be ignored by eager test loading"); }); diff --git a/tools/modern-tests/apps/react-router/prefix-test-ignored/ignore.app-test.js b/tools/modern-tests/apps/react-router/tests/ignored/some-test-ignored-suffix/ignore.app-test.js similarity index 67% rename from tools/modern-tests/apps/react-router/prefix-test-ignored/ignore.app-test.js rename to tools/modern-tests/apps/react-router/tests/ignored/some-test-ignored-suffix/ignore.app-test.js index cbe835f668..ad7167d7c5 100644 --- a/tools/modern-tests/apps/react-router/prefix-test-ignored/ignore.app-test.js +++ b/tools/modern-tests/apps/react-router/tests/ignored/some-test-ignored-suffix/ignore.app-test.js @@ -1,4 +1,4 @@ -describe("prefix-*-ignored pattern", () => { +describe("tests/ignored/*-ignored-suffix pattern", () => { it("should not run as ignored", () => { throw new Error("test should be ignored by eager test loading"); }); diff --git a/tools/modern-tests/apps/react-router/tests/ignored/some/nested/glob-ignored/ignore.app-test.js b/tools/modern-tests/apps/react-router/tests/ignored/some/nested/glob-ignored/ignore.app-test.js new file mode 100644 index 0000000000..403124d0b5 --- /dev/null +++ b/tools/modern-tests/apps/react-router/tests/ignored/some/nested/glob-ignored/ignore.app-test.js @@ -0,0 +1,5 @@ +describe("tests/ignored/some/nested/glob-ignored/ignore.app-test.js pattern", () => { + it("should not run as ignored", () => { + throw new Error("test should be ignored by eager test loading"); + }); +}); diff --git a/tools/modern-tests/apps/react-router/integration/test-ignored.app-test.js b/tools/modern-tests/apps/react-router/tests/ignored/some/unit/test-ignored.app-test.js similarity index 61% rename from tools/modern-tests/apps/react-router/integration/test-ignored.app-test.js rename to tools/modern-tests/apps/react-router/tests/ignored/some/unit/test-ignored.app-test.js index 23dcb26b19..3d8cab2346 100644 --- a/tools/modern-tests/apps/react-router/integration/test-ignored.app-test.js +++ b/tools/modern-tests/apps/react-router/tests/ignored/some/unit/test-ignored.app-test.js @@ -1,4 +1,4 @@ -describe("integration/*-ignored.app-test.js pattern", () => { +describe("tests/ignored/some/unit/test-ignored.app-test.js pattern", () => { it("should not run as ignored", () => { throw new Error("test should be ignored by eager test loading"); }); diff --git a/tools/modern-tests/apps/react-router/specific-file-ignored.app-test.js b/tools/modern-tests/apps/react-router/tests/ignored/specific-file-ignored.app-test.js similarity index 61% rename from tools/modern-tests/apps/react-router/specific-file-ignored.app-test.js rename to tools/modern-tests/apps/react-router/tests/ignored/specific-file-ignored.app-test.js index 17a1203f93..4eda02edf5 100644 --- a/tools/modern-tests/apps/react-router/specific-file-ignored.app-test.js +++ b/tools/modern-tests/apps/react-router/tests/ignored/specific-file-ignored.app-test.js @@ -1,4 +1,4 @@ -describe("specific-file-ignored.app-test.js pattern", () => { +describe("tests/ignored/specific-file-ignored.app-test.js pattern", () => { it("should not run as ignored", () => { throw new Error("test should be ignored by eager test loading"); }); diff --git a/tools/modern-tests/apps/react-router/test-example-ignored.app-test.js b/tools/modern-tests/apps/react-router/tests/ignored/test-example-ignored.app-test.js similarity index 63% rename from tools/modern-tests/apps/react-router/test-example-ignored.app-test.js rename to tools/modern-tests/apps/react-router/tests/ignored/test-example-ignored.app-test.js index 4e872e6c8b..9fdbbda403 100644 --- a/tools/modern-tests/apps/react-router/test-example-ignored.app-test.js +++ b/tools/modern-tests/apps/react-router/tests/ignored/test-example-ignored.app-test.js @@ -1,4 +1,4 @@ -describe("test-*-ignored.app-test.js pattern", () => { +describe("tests/ignored/test-*-ignored.app-test.js pattern", () => { it("should not run as ignored", () => { throw new Error("test should be ignored by eager test loading"); }); diff --git a/tools/modern-tests/apps/react-router/test.temp-ignored.app-test.js b/tools/modern-tests/apps/react-router/tests/ignored/test.temp-ignored.app-test.js similarity index 63% rename from tools/modern-tests/apps/react-router/test.temp-ignored.app-test.js rename to tools/modern-tests/apps/react-router/tests/ignored/test.temp-ignored.app-test.js index d7dd5b6748..72d4d3d0e1 100644 --- a/tools/modern-tests/apps/react-router/test.temp-ignored.app-test.js +++ b/tools/modern-tests/apps/react-router/tests/ignored/test.temp-ignored.app-test.js @@ -1,4 +1,4 @@ -describe("*.temp-ignored.app-test.js pattern", () => { +describe("tests/ignored/*.temp-ignored.app-test.js pattern", () => { it("should not run as ignored", () => { throw new Error("test should be ignored by eager test loading"); });