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"); + }); +});