Merge pull request #3163 from nextcloud/dependabot/npm_and_yarn/nextc…

…loud/axios-2.4.0
nextcloud · Oct 20, 2023 · b50164f · b50164f
2 parents 8729188 + e2e10ea
commit b50164f
Show file tree

Hide file tree

Showing 4 changed files with 275 additions and 55 deletions.
diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml
@@ -145,6 +145,8 @@ jobs:
           config: defaultCommandTimeout=10000,video=false
           tag: ${{ false && github.event_name }}
         env:
+          # https://github.com/cypress-io/github-action/issues/524
+          npm_package_name: ${{ env.APP_NAME }}
           # https://github.com/cypress-io/github-action/issues/124
           COMMIT_INFO_MESSAGE: ${{ github.event.pull_request.title }}
           COMMIT_INFO_SHA: ${{ github.event.pull_request.head.sha }}

diff --git a/cypress/plugins/index.js b/cypress/plugins/index.js
@@ -11,13 +11,16 @@
 // This function is called when a project is opened or re-opened (e.g. due to
 // the project's config changing)
 
-const browserify = require('@cypress/browserify-preprocessor')
 const cypressSplit = require('cypress-split')
+const browserify = require('@cypress/browserify-preprocessor')
+const webpack = require('@cypress/webpack-preprocessor')
+const webpackOptions = require('@nextcloud/webpack-vue-config')
 
 module.exports = (on, config) => {
 	cypressSplit(on, config)
 
 	on('file:preprocessor', browserify())
+	on('file:preprocessor', webpack({ webpackOptions }))
 
 	return config
 }