Skip to content

Commit 9746e56

Browse files
authored
Merge pull request #6009 from nextcloud/chore/npm-audit-stable32
[stable32] fix: npm audit
2 parents bf5413f + ce3f914 commit 9746e56

3 files changed

Lines changed: 2843 additions & 2385 deletions

File tree

cypress/plugins/index.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ const webpackPreprocessor = require('@cypress/webpack-batteries-included-preproc
2121
module.exports = (on, config) => {
2222
cypressSplit(on, config)
2323

24-
on('file:preprocessor', webpackPreprocessor())
24+
const webpackOptions = webpackPreprocessor.getFullWebpackOptions()
25+
webpackOptions.resolve.conditionNames = ['import', ...(webpackOptions.resolve.conditionNames ?? [])]
26+
27+
on('file:preprocessor', webpackPreprocessor({ webpackOptions }))
2528

2629
return config
2730
}

0 commit comments

Comments
 (0)