Merge branch 'master' into develop

Author: mjhenkes

circle.yml

@@ -1642,14 +1642,14 @@ jobs:
             yarn workspace @cypress/schematic build:all
           working_directory: npm/cypress-schematic
       - run:
-          name: Launch
+          name: Run unit tests
           command: |
-            yarn launch:test
+            yarn test
           working_directory: npm/cypress-schematic
       - run:
-          name: Run unit tests
+          name: Launch Sandbox and Install Schematic
           command: |
-            yarn test
+            yarn launch:test12
           working_directory: npm/cypress-schematic
       - store-npm-logs
 

npm/cypress-schematic/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [@cypress/schematic-v1.7.0](https://github.com/cypress-io/cypress/compare/@cypress/schematic-v1.6.0...@cypress/schematic-v1.7.0) (2022-05-11)
+
+
+### Features
+
+* **cypress/schematic:** add headed option and other fixes ([#21415](https://github.com/cypress-io/cypress/issues/21415)) ([8de7594](https://github.com/cypress-io/cypress/commit/8de7594446e398048a3693066f043d2d7be903f6))
+
 # [@cypress/schematic-v1.6.0](https://github.com/cypress-io/cypress/compare/@cypress/schematic-v1.5.3...@cypress/schematic-v1.6.0) (2021-11-10)
 
 

npm/cypress-schematic/README.md

@@ -9,7 +9,7 @@
     </a>
 </p>
 
- Add this schematic to quickly get up and running with [Cypress](https://cypress.io) in your Angular project.
+ Add this schematic to quickly get up and running with [Cypress](https://cypress.io) in your Angular project. 
 
  ___
 
@@ -27,13 +27,18 @@
 
 ✅  Optional: prompt you to add or update the default `ng e2e` command to use Cypress.
 
+## Requirements
+
+- Angular 12+
+
 ## Usage ⏯
 
 Install the schematic:
 
 ```shell
 ng add @cypress/schematic
 ```
+
 To run Cypress in `open` mode within your project: 
 
 ```shell script
@@ -171,6 +176,40 @@ You may want to specify a custom reporter. Cypress works with any reporters buil
 
 Read our docs to learn more about working with [reporters](https://on.cypress.io/reporters).
 
+### 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: 
+
+```json
+"cypress-open": {
+  "builder": "@cypress/schematic:cypress",
+  "options": {
+    "devServerTarget": "{project-name}:serve",
+    "watch": true,
+    "headless": false
+  },
+  "configurations": {
+    "production": {
+      "devServerTarget": "{project-name}:serve:production"
+    },
+    "local-dev": {
+      "devServerTarget": "{project-name}:serve:development",
+      "baseUrl": "http://localhost:4002"
+    },
+    "another-env": {
+      "devServerTarget": "{project-name}:serve:development",
+      "baseUrl": "http://localhost:4004"
+    }
+  }
+}
+```
+
+In order to prevent the application from building, add the following to the end of your command:
+
+```shell
+--dev-server-target=''
+```
+
 ## Generator Options
 
 ### Specify Filename (bypassing CLI prompt)

npm/cypress-schematic/package.json

@@ -9,25 +9,25 @@
     "build:test": "tsc -p tsconfig.spec.json",
     "build:all": "tsc -p tsconfig.json && tsc -p tsconfig.spec.json",
     "build:watch": "tsc -p tsconfig.json --watch",
-    "clean": "git checkout HEAD -- sandbox && git clean -f -d sandbox",
-    "launch": "yarn link:sandbox && cd sandbox && ng add @cypress/schematic && cd ..",
-    "launch:test": "yarn link:sandbox && cd sandbox && ng add @cypress/schematic --e2eUpdate=true && cd ..",
-    "link:sandbox": "yarn link && cd sandbox && yarn link @cypress/schematic",
+    "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 ..",
+    "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:sandbox": "cd sandbox && ng run sandbox:cypress-run",
-    "unlink:sandbox": "cd sandbox && yarn unlink @cypress/schematic && cd .. && yarn unlink"
+    "test:e2e:sandbox12": "cd sandbox12 && ng run sandbox:cypress-run",
+    "unlink:sandbox12": "cd sandbox12 && yarn unlink @cypress/schematic && cd .. && yarn unlink"
   },
   "dependencies": {
     "@angular-devkit/architect": "^0.1202.10",
-    "@angular-devkit/core": "^12.2.10",
-    "@angular-devkit/schematics": "^12.2.10",
-    "@schematics/angular": "^12.2.10",
+    "@angular-devkit/core": "^12.2.17",
+    "@angular-devkit/schematics": "^12.2.17",
+    "@schematics/angular": "^12.2.17",
     "jsonc-parser": "^3.0.0",
     "rxjs": "~6.6.0"
   },
   "devDependencies": {
-    "@angular-devkit/schematics-cli": "^12.2.10",
-    "@angular/cli": "^12",
+    "@angular-devkit/schematics-cli": "^12.2.17",
+    "@angular/cli": "^12.2.17",
     "@types/chai-enzyme": "0.6.7",
     "@types/mocha": "8.0.3",
     "@types/node": "^12.11.1",
@@ -36,6 +36,10 @@
     "mocha": "3.5.3",
     "typescript": "~4.2.4"
   },
+  "peerDependencies": {
+    "@angular/cli": ">=12",
+    "@angular/core": ">=12"
+  },
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -48,7 +52,9 @@
     "schematics",
     "cypress",
     "e2e",
-    "testing"
+    "testing",
+    "angular",
+    "automation"
   ],
   "publishConfig": {
     "access": "public"
@@ -58,4 +64,4 @@
     "save": "devDependencies"
   },
   "schematics": "./src/schematics/collection.json"
-}
+}