Merge branch 'master' into develop

Author: mjhenkes

npm/cypress-schematic/CHANGELOG.md

@@ -1,3 +1,19 @@
+# [@cypress/schematic-v2.0.1](https://github.com/cypress-io/cypress/compare/@cypress/schematic-v2.0.0...@cypress/schematic-v2.0.1) (2022-07-25)
+
+
+### Bug Fixes
+
+* cypress-schematic ci issue with @types/eslint ([#22636](https://github.com/cypress-io/cypress/issues/22636)) ([62199b7](https://github.com/cypress-io/cypress/commit/62199b7379cbf600f045f9a8508b7d15af4c4359))
+* **cypress/schematic:** run configuration does not work anymore without baseUrl ([#21629](https://github.com/cypress-io/cypress/issues/21629)) ([3ed93e1](https://github.com/cypress-io/cypress/commit/3ed93e1dae8e540ab45cbbf4e3ff5e33630ff386))
+
+# [@cypress/schematic-v2.0.1](https://github.com/cypress-io/cypress/compare/@cypress/schematic-v2.0.0...@cypress/schematic-v2.0.1) (2022-07-25)
+
+
+### Bug Fixes
+
+* cypress-schematic ci issue with @types/eslint ([#22636](https://github.com/cypress-io/cypress/issues/22636)) ([62199b7](https://github.com/cypress-io/cypress/commit/62199b7379cbf600f045f9a8508b7d15af4c4359))
+* **cypress/schematic:** run configuration does not work anymore without baseUrl ([#21629](https://github.com/cypress-io/cypress/issues/21629)) ([3ed93e1](https://github.com/cypress-io/cypress/commit/3ed93e1dae8e540ab45cbbf4e3ff5e33630ff386))
+
 # [@cypress/schematic-v2.0.0](https://github.com/cypress-io/cypress/compare/@cypress/schematic-v1.7.0...@cypress/schematic-v2.0.0) (2022-06-01)
 
 

npm/cypress-schematic/README.md

@@ -178,7 +178,9 @@ Read our docs to learn more about working with [reporters](https://on.cypress.io
 
 ### Running the builder with a different baseUrl
 
-You can specify a `baseUrl` that is different than the one in `cypress.json`. To do this, add `baseUrl` to `configurations` like the following: 
+You can specify a `baseUrl` that is different than the one in `cypress.json`. There are two ways to do this.
+
+1. Add `baseUrl` to `configurations` like the following: 
 
 ```json
 "cypress-open": {
@@ -204,6 +206,15 @@ You can specify a `baseUrl` that is different than the one in `cypress.json`. To
 }
 ```
 
+2. Add custom options to `devServerTarget` in `angular.json`:
+
+```json
+"options": {
+  "host": "localhost",
+  "port": 4200
+},
+```
+
 In order to prevent the application from building, add the following to the end of your command:
 
 ```shell

npm/cypress-schematic/package.json

@@ -10,7 +10,7 @@
     "build:watch": "tsc -p tsconfig.json --watch",
     "clean12": "git checkout HEAD -- sandbox12 && git clean -f -d sandbox12",
     "launch12": "yarn link:sandbox12 && cd sandbox12 && ng add @cypress/schematic && cd ..",
-    "launch:test12": "yarn link:sandbox12 && cd sandbox12 && ng add @cypress/schematic --e2eUpdate=true && cd ..",
+    "launch:test12": "yarn link:sandbox12 && cd sandbox12 && ng add @cypress/schematic --e2eUpdate && cd ..",
     "link:sandbox12": "yarn link && cd sandbox12 && yarn link @cypress/schematic",
     "test": "mocha -r @packages/ts/register --reporter mocha-multi-reporters --reporter-options configFile=../../mocha-reporter-config.json src/**/*.spec.ts",
     "test:e2e:sandbox12": "cd sandbox12 && ng run sandbox:cypress-run",

npm/cypress-schematic/src/builders/cypress/index.ts

@@ -83,12 +83,10 @@ function initCypress (userOptions: CypressBuilderOptions): Observable<BuilderOut
   }
 
   if (userOptions.configFile === undefined) {
-    options.config = {}
+    options.config = { e2e: { baseUrl: userOptions.devServerBaseUrl as string } }
   }
 
-  if (userOptions.baseUrl) {
-    options.config = { ...options.config, e2e: { ...options.config?.e2e, baseUrl: userOptions.baseUrl } }
-  }
+  options.config = { ...options.config }
 
   const { watch, headless } = userOptions
 

npm/webpack-dev-server/src/createWebpackDevServer.ts

@@ -52,7 +52,7 @@ export async function createWebpackDevServer (
   }
 
   if (webpackDevServerMajorVersion === 3) {
-    debug('using webpack-dev-server v4')
+    debug('using webpack-dev-server v3')
 
     return webpackDevServer3(config, webpackCompiler, finalWebpackConfig)
   }