Merge pull request #20142 from cypress-io/9b967e06f5-master-into-develop

chore: merge master (9b967e0) into develop

Author: Blue F

npm/react/examples/react-scripts/cypress/plugins/index.js

@@ -8,7 +8,7 @@ const devServer = require('@cypress/react/plugins/react-scripts')
  * @type {Cypress.PluginConfig}
  */
 module.exports = (on, config) => {
-  devServer(on, config)
+  devServer(on, config, {})
 
   // IMPORTANT to return the config object
   // with the any changed environment variables

npm/react/plugins/react-scripts/findReactScriptsWebpackConfig.js

@@ -7,9 +7,11 @@ const { getTranspileFolders } = require('../utils/get-transpile-folders')
 const { addFolderToBabelLoaderTranspileInPlace } = require('../utils/babel-helpers')
 const { reactScriptsFiveModifications, isReactScripts5 } = require('../../dist/react-scripts/reactScriptsFive')
 
-module.exports = function findReactScriptsWebpackConfig (config, {
-  webpackConfigPath,
-} = { webpackConfigPath: 'react-scripts/config/webpack.config' }) {
+module.exports = function findReactScriptsWebpackConfig (config, devServerOptions) {
+  const webpackConfigPath = (devServerOptions && devServerOptions.webpackConfigPath)
+    ? devServerOptions.webpackConfigPath
+    : 'react-scripts/config/webpack.config'
+
   // this is required because
   // 1) we use our own HMR and we don't need react-refresh transpiling overhead
   // 2) it doesn't work with process.env=test @see https://github.com/cypress-io/cypress-realworld-app/pull/832

npm/vue/src/shims-vue.d.ts

@@ -2,4 +2,4 @@ declare module '*.vue' {
 	import { DefineComponent } from 'vue'
 	const component: DefineComponent<{}, {}, any>
 	export default component
-  }
+}