From 9f6090170b0675d25b26b98cd0f987a5e395ab78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Barth=C3=A9l=C3=A9my=20Ledoux?= Date: Thu, 3 Mar 2022 14:15:51 -0600 Subject: [PATCH 1/3] fix: avoid nextjs unsafeCache and watchOptions (#20440) --- npm/react/plugins/next/findNextWebpackConfig.js | 9 +++++++++ npm/webpack-dev-server/src/makeWebpackConfig.ts | 8 ++++++++ 2 files changed, 17 insertions(+) diff --git a/npm/react/plugins/next/findNextWebpackConfig.js b/npm/react/plugins/next/findNextWebpackConfig.js index 2b4acfb59837..26e01ac8b38c 100644 --- a/npm/react/plugins/next/findNextWebpackConfig.js +++ b/npm/react/plugins/next/findNextWebpackConfig.js @@ -41,6 +41,15 @@ async function getNextWebpackConfig (config) { checkSWC(nextWebpackConfig, config) + if (nextWebpackConfig.watchOptions && Array.isArray(nextWebpackConfig.watchOptions.ignored)) { + nextWebpackConfig.watchOptions = { + ...nextWebpackConfig.watchOptions, + ignored: [...nextWebpackConfig.watchOptions.ignored.filter((pattern) => !/node_modules/.test(pattern)), '**/node_modules/!(@cypress/webpack-dev-server/dist/browser.js)**'], + } + + debug('found options next.js watchOptions.ignored %O', nextWebpackConfig.watchOptions.ignored) + } + return nextWebpackConfig } diff --git a/npm/webpack-dev-server/src/makeWebpackConfig.ts b/npm/webpack-dev-server/src/makeWebpackConfig.ts index b2f44d7df911..e4a8d6b7a621 100644 --- a/npm/webpack-dev-server/src/makeWebpackConfig.ts +++ b/npm/webpack-dev-server/src/makeWebpackConfig.ts @@ -78,6 +78,14 @@ export async function makeWebpackConfig (userWebpackConfig: webpack.Configuratio }) } + if (typeof userWebpackConfig?.module?.unsafeCache === 'function') { + const originalCachePredicate = userWebpackConfig.module.unsafeCache + + userWebpackConfig.module.unsafeCache = (module: any) => { + return originalCachePredicate(module) && !/[\\/]webpack-dev-server[\\/]dist[\\/]browser\.js/.test(module.resource) + } + } + const mergedConfig = merge( userWebpackConfig, makeDefaultWebpackConfig(template), From 852c026dd4fedbe0df427fe50e997dc72da9eb46 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Thu, 3 Mar 2022 15:43:59 -0500 Subject: [PATCH 2/3] chore: release @cypress/react-v5.12.4 [skip ci] --- npm/react/CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/npm/react/CHANGELOG.md b/npm/react/CHANGELOG.md index ef127dafa1fe..2049bff3929a 100644 --- a/npm/react/CHANGELOG.md +++ b/npm/react/CHANGELOG.md @@ -1,3 +1,10 @@ +# [@cypress/react-v5.12.4](https://github.com/cypress-io/cypress/compare/@cypress/react-v5.12.3...@cypress/react-v5.12.4) (2022-03-03) + + +### Bug Fixes + +* avoid nextjs unsafeCache and watchOptions ([#20440](https://github.com/cypress-io/cypress/issues/20440)) ([9f60901](https://github.com/cypress-io/cypress/commit/9f6090170b0675d25b26b98cd0f987a5e395ab78)) + # [@cypress/react-v5.12.3](https://github.com/cypress-io/cypress/compare/@cypress/react-v5.12.2...@cypress/react-v5.12.3) (2022-02-10) From 024308b5d7199aa52e09678697028c1eaa2f239d Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Thu, 3 Mar 2022 15:44:11 -0500 Subject: [PATCH 3/3] chore: release @cypress/webpack-dev-server-v1.8.2 [skip ci] --- npm/webpack-dev-server/CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/npm/webpack-dev-server/CHANGELOG.md b/npm/webpack-dev-server/CHANGELOG.md index ea184db3f042..613f85c1f45a 100644 --- a/npm/webpack-dev-server/CHANGELOG.md +++ b/npm/webpack-dev-server/CHANGELOG.md @@ -1,3 +1,11 @@ +# [@cypress/webpack-dev-server-v1.8.2](https://github.com/cypress-io/cypress/compare/@cypress/webpack-dev-server-v1.8.1...@cypress/webpack-dev-server-v1.8.2) (2022-03-03) + + +### Bug Fixes + +* avoid nextjs unsafeCache and watchOptions ([#20440](https://github.com/cypress-io/cypress/issues/20440)) ([9f60901](https://github.com/cypress-io/cypress/commit/9f6090170b0675d25b26b98cd0f987a5e395ab78)) +* error regression - strip ansi colors out of cy.fixture() error message ([#20335](https://github.com/cypress-io/cypress/issues/20335)) ([e0bd6ac](https://github.com/cypress-io/cypress/commit/e0bd6ac2aaf8d00b9233fffefed8f6ed2484bf45)) + # [@cypress/webpack-dev-server-v1.8.1](https://github.com/cypress-io/cypress/compare/@cypress/webpack-dev-server-v1.8.0...@cypress/webpack-dev-server-v1.8.1) (2022-02-08)