Merge branch 'develop' into lmiller/add-runtime-check-for-ct-deps

Author: ZachJW34

browser-versions.json

@@ -1,4 +1,4 @@
 {
-  "chrome:beta": "104.0.5112.57",
+  "chrome:beta": "104.0.5112.65",
   "chrome:stable": "103.0.5060.134"
 }

circle.yml

@@ -873,7 +873,16 @@ commands:
           # Ensure we're installing the node-version for the cloned repo
           command: |
             if [[ -f .node-version ]]; then
-              curl -L https://raw.githubusercontent.com/cypress-io/cypress/<< pipeline.git.branch >>/scripts/ensure-node.sh --output ci-ensure-node.sh
+              branch="<< pipeline.git.branch >>"
+
+              externalBranchPattern='^pull\/[0-9]+'
+              if [[ $branch =~ $externalBranchPattern ]]; then
+                # We are unable to curl from the external PR branch location
+                # so we fall back to develop
+                branch="develop"
+              fi
+
+              curl -L https://raw.githubusercontent.com/cypress-io/cypress/$branch/scripts/ensure-node.sh --output ci-ensure-node.sh
             else 
               # if no .node-version file exists, we no-op the node script and use the global yarn
               echo '' > ci-ensure-node.sh

cli/package.json

@@ -107,8 +107,7 @@
     "vue",
     "react",
     "vue2",
-    "react18",
-    "angular"
+    "react18"
   ],
   "bin": {
     "cypress": "bin/cypress"
@@ -150,11 +149,6 @@
     "./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,7 +12,6 @@ const npmModulesToCopy = [
   'react18',
   'vue',
   'vue2',
-  'angular',
 ]
 
 npmModulesToCopy.forEach((folder) => {

cli/types/cypress.d.ts

@@ -3044,7 +3044,7 @@ declare namespace Cypress {
 
   type DevServerConfigOptions = {
     bundler: 'webpack'
-    framework: 'react' | 'vue' | 'vue-cli' | 'nuxt' | 'create-react-app' | 'next' | 'angular'
+    framework: 'react' | 'vue' | 'vue-cli' | 'nuxt' | 'create-react-app' | 'next'
     webpackConfig?: PickConfigOpt<'webpackConfig'>
   } | {
     bundler: 'vite'

npm/angular/package.json

@@ -6,7 +6,6 @@
   "scripts": {
     "prebuild": "rimraf dist",
     "build": "tsc || echo 'built, with type errors'",
-    "postbuild": "node ../../scripts/sync-exported-npm-with-cli.js",
     "build-prod": "yarn build",
     "check-ts": "tsc --noEmit"
   },

npm/angular/src/mount.ts

@@ -212,14 +212,17 @@ export function mount<T extends object> (
   const fixture = setupFixture(component, testBed, autoDetectChanges)
   const componentInstance = setupComponent(config, fixture)
 
+  const mountResponse: MountResponse<T> = {
+    testBed,
+    fixture,
+    component: componentInstance,
+  }
+
   Cypress.log({
     name: 'mount',
     message: component.name,
+    consoleProps: () => ({ result: mountResponse }),
   })
 
-  return cy.wrap({
-    fixture,
-    testBed,
-    component: componentInstance,
-  }, { log: false })
+  return cy.wrap(mountResponse, { log: false })
 }

npm/webpack-dev-server/cypress/e2e/angular.cy.ts

@@ -12,7 +12,8 @@ for (const project of WEBPACK_REACT) {
     continue
   }
 
-  describe(`Working with ${project}`, () => {
+  // TODO: revert once Angular is slated for release
+  describe.skip(`Working with ${project}`, () => {
     beforeEach(() => {
       cy.scaffoldProject(project)
       cy.openProject(project)

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

@@ -12,7 +12,6 @@ import { nuxtHandler } from './helpers/nuxtHandler'
 import { createReactAppHandler } from './helpers/createReactAppHandler'
 import { nextHandler } from './helpers/nextHandler'
 import { sourceDefaultWebpackDependencies, SourceRelativeWebpackResult } from './helpers/sourceRelativeWebpackModules'
-import { angularHandler } from './helpers/angularHandler'
 
 const debug = debugLib('cypress:webpack-dev-server:devServer')
 
@@ -26,7 +25,7 @@ export type WebpackDevServerConfig = {
   webpackConfig?: unknown // Derived from the user's webpack
 }
 
-export const ALL_FRAMEWORKS = ['create-react-app', 'nuxt', 'react', 'vue-cli', 'next', 'vue', 'angular'] as const
+export const ALL_FRAMEWORKS = ['create-react-app', 'nuxt', 'react', 'vue-cli', 'next', 'vue'] as const
 
 /**
  * @internal
@@ -116,8 +115,9 @@ async function getPreset (devServerConfig: WebpackDevServerConfig): Promise<Opti
     case 'next':
       return await nextHandler(devServerConfig)
 
-    case 'angular':
-      return await angularHandler(devServerConfig)
+      // TODO: revert once Angular is slated for release
+      // case 'angular':
+      //   return await angularHandler(devServerConfig)
 
     case 'react':
     case 'vue':

npm/webpack-dev-server/src/helpers/angularHandler.ts

@@ -85,9 +85,7 @@ export function getAngularBuildOptions (projectConfig: AngularJsonProjectConfig,
     assets: [],
     styles: [],
     scripts: [],
-    budgets: [],
     fileReplacements: [],
-    outputHashing: 'all',
     inlineStyleLanguage: 'css',
     stylePreprocessorOptions: { includePaths: [] },
     resourcesOutputPath: undefined,
@@ -121,6 +119,8 @@ export function getAngularBuildOptions (projectConfig: AngularJsonProjectConfig,
     ...projectConfig.architect.build.configurations?.development || {},
     tsConfig,
     aot: false,
+    outputHashing: 'none',
+    budgets: undefined,
   }
 }