chore: merge master into develop for release (#23803)

cypress-io · Sep 13, 2022 · 864ab8e · 864ab8e · cypress-bot · Sep 13, 2022
1 parent 75a9f96
commit 864ab8e
Show file tree

Hide file tree

Showing 19 changed files with 102 additions and 12 deletions.
diff --git a/npm/angular/CHANGELOG.md b/npm/angular/CHANGELOG.md
@@ -1,3 +1,15 @@
+# [@cypress/angular-v1.1.0](https://github.com/cypress-io/cypress/compare/@cypress/angular-v1.0.0...@cypress/angular-v1.1.0) (2022-08-30)
+
+
+### Bug Fixes
+
+* angular 14.2 mount compilation error ([#23593](https://github.com/cypress-io/cypress/issues/23593)) ([2f337db](https://github.com/cypress-io/cypress/commit/2f337dbfa2bb212754c8fa82e3f4548a2f3a07a4))
+
+
+### Features
+
+* adding svelte component testing support ([#23553](https://github.com/cypress-io/cypress/issues/23553)) ([f6eaad4](https://github.com/cypress-io/cypress/commit/f6eaad40e1836fa9db87c60defa5ae6f390c8fd8))
+
 # @cypress/angular-v1.0.0 (2022-08-17)
 
 

diff --git a/npm/cypress-schematic/.npmignore b/npm/cypress-schematic/.npmignore
@@ -1,9 +1,4 @@
 # Ignores TypeScript files, but keeps definitions.
 *.ts
 !*.d.ts
-
 *.js.map
-!src/**/__files__/**/*.js
-!src/**/files/**/*.ts
-*.vscode
-sandbox
diff --git a/npm/cypress-schematic/CHANGELOG.md b/npm/cypress-schematic/CHANGELOG.md
@@ -1,3 +1,22 @@
+# [@cypress/schematic-v2.1.1](https://github.com/cypress-io/cypress/compare/@cypress/schematic-v2.1.0...@cypress/schematic-v2.1.1) (2022-08-31)
+
+
+### Bug Fixes
+
+* **cypress-schematic:** suffix template files so they are not ignored ([#23645](https://github.com/cypress-io/cypress/issues/23645)) ([3fd56bc](https://github.com/cypress-io/cypress/commit/3fd56bc1f21224150569434e94b64e781b22008d))
+
+# [@cypress/schematic-v2.1.0](https://github.com/cypress-io/cypress/compare/@cypress/schematic-v2.0.3...@cypress/schematic-v2.1.0) (2022-08-30)
+
+
+### Bug Fixes
+
+* angular 14.2 mount compilation error ([#23593](https://github.com/cypress-io/cypress/issues/23593)) ([2f337db](https://github.com/cypress-io/cypress/commit/2f337dbfa2bb212754c8fa82e3f4548a2f3a07a4))
+
+
+### Features
+
+* **cypress/schematic:** add support for component testing ([#23385](https://github.com/cypress-io/cypress/issues/23385)) ([99562af](https://github.com/cypress-io/cypress/commit/99562af65a10abb0fab211fd97b13f98e2b0f959))
+
 # [@cypress/schematic-v2.0.3](https://github.com/cypress-io/cypress/compare/@cypress/schematic-v2.0.2...@cypress/schematic-v2.0.3) (2022-08-17)
 
 

diff --git a/.../ng-add/files-core/cypress/e2e/spec.cy.ts → ...iles-core/cypress/e2e/spec.cy.ts.template b/.../ng-add/files-core/cypress/e2e/spec.cy.ts → ...iles-core/cypress/e2e/spec.cy.ts.template
diff --git a/.../files-core/cypress/fixtures/example.json → ...re/cypress/fixtures/example.json.template b/.../files-core/cypress/fixtures/example.json → ...re/cypress/fixtures/example.json.template
diff --git a/...dd/files-core/cypress/support/commands.ts → ...core/cypress/support/commands.ts.template b/...dd/files-core/cypress/support/commands.ts → ...core/cypress/support/commands.ts.template
diff --git a/.../ng-add/files-core/cypress/support/e2e.ts → ...iles-core/cypress/support/e2e.ts.template b/.../ng-add/files-core/cypress/support/e2e.ts → ...iles-core/cypress/support/e2e.ts.template
diff --git a/...s/ng-add/files-core/cypress/tsconfig.json → ...files-core/cypress/tsconfig.json.template b/...s/ng-add/files-core/cypress/tsconfig.json → ...files-core/cypress/tsconfig.json.template
diff --git a/...tics/ng-add/files-ct/component-index.html → ...dd/files-ct/component-index.html.template b/...tics/ng-add/files-ct/component-index.html → ...dd/files-ct/component-index.html.template
diff --git a/...c/schematics/ng-add/files-ct/component.ts → ...ics/ng-add/files-ct/component.ts.template b/...c/schematics/ng-add/files-ct/component.ts → ...ics/ng-add/files-ct/component.ts.template
diff --git a/npm/mount-utils/CHANGELOG.md b/npm/mount-utils/CHANGELOG.md
@@ -1,3 +1,10 @@
+# [@cypress/mount-utils-v2.1.0](https://github.com/cypress-io/cypress/compare/@cypress/mount-utils-v2.0.1...@cypress/mount-utils-v2.1.0) (2022-08-30)
+
+
+### Features
+
+* adding svelte component testing support ([#23553](https://github.com/cypress-io/cypress/issues/23553)) ([f6eaad4](https://github.com/cypress-io/cypress/commit/f6eaad40e1836fa9db87c60defa5ae6f390c8fd8))
+
 # [@cypress/mount-utils-v2.0.1](https://github.com/cypress-io/cypress/compare/@cypress/mount-utils-v2.0.0...@cypress/mount-utils-v2.0.1) (2022-08-11)
 
 

diff --git a/npm/react/CHANGELOG.md b/npm/react/CHANGELOG.md
@@ -1,3 +1,10 @@
+# [@cypress/react-v6.2.0](https://github.com/cypress-io/cypress/compare/@cypress/react-v6.1.1...@cypress/react-v6.2.0) (2022-08-30)
+
+
+### Features
+
+* adding svelte component testing support ([#23553](https://github.com/cypress-io/cypress/issues/23553)) ([f6eaad4](https://github.com/cypress-io/cypress/commit/f6eaad40e1836fa9db87c60defa5ae6f390c8fd8))
+
 # [@cypress/react-v6.1.1](https://github.com/cypress-io/cypress/compare/@cypress/react-v6.1.0...@cypress/react-v6.1.1) (2022-08-15)
 
 

diff --git a/npm/react18/CHANGELOG.md b/npm/react18/CHANGELOG.md
@@ -1,3 +1,10 @@
+# [@cypress/react18-v1.1.0](https://github.com/cypress-io/cypress/compare/@cypress/react18-v1.0.1...@cypress/react18-v1.1.0) (2022-08-30)
+
+
+### Features
+
+* adding svelte component testing support ([#23553](https://github.com/cypress-io/cypress/issues/23553)) ([f6eaad4](https://github.com/cypress-io/cypress/commit/f6eaad40e1836fa9db87c60defa5ae6f390c8fd8))
+
 # [@cypress/react18-v1.0.1](https://github.com/cypress-io/cypress/compare/@cypress/react18-v1.0.0...@cypress/react18-v1.0.1) (2022-08-15)
 
 

diff --git a/npm/svelte/CHANGELOG.md b/npm/svelte/CHANGELOG.md
@@ -0,0 +1,6 @@
+# @cypress/svelte-v1.0.0 (2022-08-30)
+
+
+### Features
+
+* adding svelte component testing support ([#23553](https://github.com/cypress-io/cypress/issues/23553)) ([f6eaad4](https://github.com/cypress-io/cypress/commit/f6eaad40e1836fa9db87c60defa5ae6f390c8fd8))
diff --git a/npm/vue/CHANGELOG.md b/npm/vue/CHANGELOG.md
@@ -1,3 +1,10 @@
+# [@cypress/vue-v4.2.0](https://github.com/cypress-io/cypress/compare/@cypress/vue-v4.1.0...@cypress/vue-v4.2.0) (2022-08-30)
+
+
+### Features
+
+* adding svelte component testing support ([#23553](https://github.com/cypress-io/cypress/issues/23553)) ([f6eaad4](https://github.com/cypress-io/cypress/commit/f6eaad40e1836fa9db87c60defa5ae6f390c8fd8))
+
 # [@cypress/vue-v4.1.0](https://github.com/cypress-io/cypress/compare/@cypress/vue-v4.0.0...@cypress/vue-v4.1.0) (2022-08-11)
 
 

diff --git a/npm/vue2/CHANGELOG.md b/npm/vue2/CHANGELOG.md
@@ -1,3 +1,10 @@
+# [@cypress/vue2-v1.1.0](https://github.com/cypress-io/cypress/compare/@cypress/vue2-v1.0.2...@cypress/vue2-v1.1.0) (2022-08-30)
+
+
+### Features
+
+* adding svelte component testing support ([#23553](https://github.com/cypress-io/cypress/issues/23553)) ([f6eaad4](https://github.com/cypress-io/cypress/commit/f6eaad40e1836fa9db87c60defa5ae6f390c8fd8))
+
 # [@cypress/vue2-v1.0.2](https://github.com/cypress-io/cypress/compare/@cypress/vue2-v1.0.1...@cypress/vue2-v1.0.2) (2022-08-11)
 
 

diff --git a/npm/webpack-dev-server/CHANGELOG.md b/npm/webpack-dev-server/CHANGELOG.md
@@ -1,3 +1,15 @@
+# [@cypress/webpack-dev-server-v2.3.0](https://github.com/cypress-io/cypress/compare/@cypress/webpack-dev-server-v2.2.0...@cypress/webpack-dev-server-v2.3.0) (2022-08-30)
+
+
+### Bug Fixes
+
+* **webpack-dev-server:** add custom project config to handler ([a07a2a1](https://github.com/cypress-io/cypress/commit/a07a2a118d7b62b90e790ef475c86959ae894b3b))
+
+
+### Features
+
+* adding svelte component testing support ([#23553](https://github.com/cypress-io/cypress/issues/23553)) ([f6eaad4](https://github.com/cypress-io/cypress/commit/f6eaad40e1836fa9db87c60defa5ae6f390c8fd8))
+
 # [@cypress/webpack-dev-server-v2.2.0](https://github.com/cypress-io/cypress/compare/@cypress/webpack-dev-server-v2.1.0...@cypress/webpack-dev-server-v2.2.0) (2022-08-15)
 
 

diff --git a/npm/webpack-dev-server/src/helpers/angularHandler.ts b/npm/webpack-dev-server/src/helpers/angularHandler.ts
@@ -133,7 +133,7 @@ export async function generateTsConfig (devServerConfig: AngularWebpackDevServer
   includePaths.push(cypressTypes)
 
   const tsConfigContent = JSON.stringify({
-    extends: getProjectFilePath('tsconfig.json'),
+    extends: getProjectFilePath(buildOptions.tsConfig ?? 'tsconfig.json'),
     compilerOptions: {
       outDir: getProjectFilePath('out-tsc/cy'),
       allowSyntheticDefaultImports: true,

diff --git a/npm/webpack-dev-server/test/handlers/angularHandler.spec.ts b/npm/webpack-dev-server/test/handlers/angularHandler.spec.ts
@@ -195,7 +195,8 @@ const expectGeneratesTsConfig = async (devServerConfig: AngularWebpackDevServerC
   let tsConfig = JSON.parse(await fs.readFile(tsConfigPath, 'utf8'))
 
   expect(tsConfig).to.deep.eq({
-    extends: toPosix(path.join(projectRoot, 'tsconfig.json')),
+    // verifies the default `tsconfig.app.json` is extended
+    extends: toPosix(path.join(projectRoot, 'tsconfig.app.json')),
     compilerOptions: {
       outDir: toPosix(path.join(projectRoot, 'out-tsc/cy')),
       allowSyntheticDefaultImports: true,
@@ -211,6 +212,7 @@ const expectGeneratesTsConfig = async (devServerConfig: AngularWebpackDevServerC
   const modifiedBuildOptions = cloneDeep(buildOptions)
 
   delete modifiedBuildOptions.polyfills
+  modifiedBuildOptions.tsConfig = 'tsconfig.cy.json'
 
   const modifiedDevServerConfig = cloneDeep(devServerConfig)
   const supportFile = path.join(projectRoot, 'cypress', 'support', 'component.ts')
@@ -220,9 +222,18 @@ const expectGeneratesTsConfig = async (devServerConfig: AngularWebpackDevServerC
   tsConfigPath = await generateTsConfig(modifiedDevServerConfig, modifiedBuildOptions)
   tsConfig = JSON.parse(await fs.readFile(tsConfigPath, 'utf8'))
 
-  expect(tsConfig.include).to.deep.equal([
-    toPosix(path.join(projectRoot, 'src/**/*.cy.ts')),
-    toPosix(supportFile),
-    toPosix(path.join(projectRoot, 'node_modules/cypress/types/index.d.ts')),
-  ])
+  expect(tsConfig).to.deep.eq({
+    // verifies the custom `tsconfig.cy.json` is extended
+    extends: toPosix(path.join(projectRoot, 'tsconfig.cy.json')),
+    compilerOptions: {
+      outDir: toPosix(path.join(projectRoot, 'out-tsc/cy')),
+      allowSyntheticDefaultImports: true,
+      skipLibCheck: true,
+    },
+    include: [
+      toPosix(path.join(projectRoot, 'src/**/*.cy.ts')),
+      toPosix(supportFile),
+      toPosix(path.join(projectRoot, 'node_modules/cypress/types/index.d.ts')),
+    ],
+  })
 }