merge in develop

circle.yml

@@ -1791,14 +1791,6 @@ jobs:
       - run:
           name: Build
           command: yarn workspace @cypress/angular build
-      - run:
-          name: Run tests
-          command: yarn test-ci
-          working_directory: npm/angular
-      - store_test_results:
-          path: npm/angular/test_results
-      - store_artifacts:
-          path: npm/angular/test_results
       - store-npm-logs
 
   npm-react:

cli/.gitignore

@@ -9,7 +9,7 @@ types/minimatch
 types/sinon
 types/sinon-chai
 # copied from net-stubbing package on build
-types/net-stubbing.ts
+types/net-stubbing.d.ts
 # ignore CLI output build folder
 build
 
@@ -19,3 +19,4 @@ vue
 vue2
 react*
 mount-utils
+angular

cli/package.json

@@ -87,7 +87,7 @@
     "mocha": "6.2.2",
     "mock-fs": "5.1.1",
     "mocked-env": "1.3.2",
-    "nock": "13.0.7",
+    "nock": "13.2.9",
     "postinstall-postinstall": "2.1.0",
     "proxyquire": "2.1.3",
     "resolve-pkg": "2.0.0",
@@ -103,12 +103,12 @@
     "index.js",
     "index.mjs",
     "types/**/*.d.ts",
-    "types/net-stubbing.ts",
     "mount-utils",
     "vue",
     "react",
     "vue2",
-    "react18"
+    "react18",
+    "angular"
   ],
   "bin": {
     "cypress": "bin/cypress"
@@ -150,6 +150,11 @@
     "./mount-utils": {
       "require": "./mount-utils/dist/index.js",
       "types": "./mount-utils/dist/index.d.ts"
+    },
+    "./angular": {
+      "import": "./angular/dist/index.js",
+      "require": "./angular/dist/index.js",
+      "types": "./angular/dist/index.d.ts"
     }
   },
   "workspaces": {

cli/scripts/post-build.js

@@ -12,6 +12,7 @@ const npmModulesToCopy = [
   'react18',
   'vue',
   'vue2',
+  'angular',
 ]
 
 npmModulesToCopy.forEach((folder) => {

cli/scripts/post-install.js

@@ -75,7 +75,7 @@ shell.sed('-i', 'from \'sinon\';', 'from \'../sinon\';', sinonChaiFilename)
 
 // copy experimental network stubbing type definitions
 // so users can import: `import 'cypress/types/net-stubbing'`
-fs.copySync(resolvePkg('@packages/net-stubbing/lib/external-types.ts'), 'types/net-stubbing.ts')
+fs.copySync(resolvePkg('@packages/net-stubbing/lib/external-types.ts'), 'types/net-stubbing.d.ts')
 
 // https://github.com/cypress-io/cypress/issues/18069
 // To avoid type clashes, some files should be commented out entirely by patch-package

cli/types/index.d.ts

@@ -26,7 +26,7 @@
 // hmm, how to load it better?
 /// <reference path="./cypress-npm-api.d.ts" />
 
-/// <reference path="./net-stubbing.ts" />
+/// <reference path="./net-stubbing.d.ts" />
 /// <reference path="./cypress.d.ts" />
 /// <reference path="./cypress-global-vars.d.ts" />
 /// <reference path="./cypress-type-helpers.d.ts" />

cli/types/tslint.json

@@ -38,7 +38,10 @@
       "./mocha/*",
       "./minimatch/*",
       "./sinon/**/*",
-      "./sinon-chai/*"
+      "./sinon-chai/*",
+      // Copied from net-stubbing and renamed to a declaration file. Since it's not originally
+      // a declaration file, we need to exclude it from linting.
+      "./net-stubbing.d.ts"
     ]
   }
 }

npm/angular/.eslintrc

@@ -1,43 +1,17 @@
 {
   "plugins": [
-    "cypress",
-    "@cypress/dev",
-    "@angular-eslint/eslint-plugin"
+    "cypress"
   ],
   "extends": [
-    "plugin:@cypress/dev/general",
     "plugin:@cypress/dev/tests"
   ],
-  "parser": "@typescript-eslint/parser",
   "env": {
     "cypress/globals": true
   },
-  "root": true,
-  "globals": {
-    "jest": "readonly"
-  },
   "rules": {
-    "no-console": "off",
     "mocha/no-global-tests": "off",
-    "no-useless-constructor": "off",
-    "@typescript-eslint/no-useless-constructor": "off",
+    "no-unused-vars": "off",
+    "no-console": "off",
     "@typescript-eslint/no-unused-vars": "off"
-  },
-  "overrides": [
-    {
-      "files": [
-        "lib/*",
-        "src/*"
-      ]
-    },
-    {
-      "files": [
-        "**/*.json"
-      ],
-      "rules": {
-        "quotes": "off",
-        "comma-dangle": "off"
-      }
-    }
-  ]
+  }
 }

npm/angular/.npmignore

@@ -0,0 +1,3 @@
+examples
+src
+cypress

npm/angular/.releaserc.js

@@ -0,0 +1,6 @@
+module.exports = {
+  ...require('../../.releaserc.base'),
+  branches: [
+    { name: 'master', channel: 'latest' },
+  ],
+}