diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml index b6b50e09b4fb..8de1a73572a1 100644 --- a/.circleci/workflows.yml +++ b/.circleci/workflows.yml @@ -29,9 +29,8 @@ mainBuildFilters: &mainBuildFilters - develop - /^release\/\d+\.\d+\.\d+$/ # use the following branch as well to ensure that v8 snapshot cache updates are fully tested - - 'update-v8-snapshot-cache-on-develop' - 'publish-binary' - - 'cacie/chore/capture-metadata' + - 'jordanpowell88/update-angular-tsconfig-path' # usually we don't build Mac app - it takes a long time # but sometimes we want to really confirm we are doing the right thing @@ -41,8 +40,7 @@ macWorkflowFilters: &darwin-workflow-filters or: - equal: [ develop, << pipeline.git.branch >> ] # use the following branch as well to ensure that v8 snapshot cache updates are fully tested - - equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ] - - equal: [ cacie/chore/capture-metadata', << pipeline.git.branch >> ] + - equal: [ 'jordanpowell88/update-angular-tsconfig-path', << pipeline.git.branch >> ] - matches: pattern: /^release\/\d+\.\d+\.\d+$/ value: << pipeline.git.branch >> @@ -52,9 +50,8 @@ linuxArm64WorkflowFilters: &linux-arm64-workflow-filters or: - equal: [ develop, << pipeline.git.branch >> ] # use the following branch as well to ensure that v8 snapshot cache updates are fully tested - - equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ] + - equal: [ 'jordanpowell88/update-angular-tsconfig-path', << pipeline.git.branch >> ] - equal: [ 'publish-binary', << pipeline.git.branch >> ] - - equal: [ cacie/chore/capture-metadata', << pipeline.git.branch >> ] - matches: pattern: /^release\/\d+\.\d+\.\d+$/ value: << pipeline.git.branch >> @@ -73,8 +70,7 @@ windowsWorkflowFilters: &windows-workflow-filters or: - equal: [ develop, << pipeline.git.branch >> ] # use the following branch as well to ensure that v8 snapshot cache updates are fully tested - - equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ] - - equal: [ cacie/chore/capture-metadata', << pipeline.git.branch >> ] + - equal: [ 'jordanpowell88/update-angular-tsconfig-path', << pipeline.git.branch >> ] - matches: pattern: /^release\/\d+\.\d+\.\d+$/ value: << pipeline.git.branch >> @@ -144,7 +140,7 @@ commands: name: Set environment variable to determine whether or not to persist artifacts command: | echo "Setting SHOULD_PERSIST_ARTIFACTS variable" - echo 'if ! [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "release/"* && "$CIRCLE_BRANCH" != "publish-binary" && "$CIRCLE_BRANCH" != "update-v8-snapshot-cache-on-develop" && "$CIRCLE_BRANCH" != "ryanm/feat/handle-304s" ]]; then + echo 'if ! [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "release/"* && "$CIRCLE_BRANCH" != "publish-binary" && "$CIRCLE_BRANCH" != "jordanpowell88/update-angular-tsconfig-path" && "$CIRCLE_BRANCH" != "ryanm/feat/handle-304s" ]]; then export SHOULD_PERSIST_ARTIFACTS=true fi' >> "$BASH_ENV" # You must run `setup_should_persist_artifacts` command and be using bash before running this command diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md index 1d7bb07ec36c..4aa25bfd38c6 100644 --- a/cli/CHANGELOG.md +++ b/cli/CHANGELOG.md @@ -1,4 +1,12 @@ +## 13.2.0 + +_Released 09/12/2023 (PENDING)_ + +**Features:** + + - Adds support for Nx users who want to run Angular Component Testing in parallel. Addresses [#27723](https://github.com/cypress-io/cypress/pull/27723). + ## 13.1.0 _Released 08/31/2023_ diff --git a/npm/webpack-dev-server/src/helpers/angularHandler.ts b/npm/webpack-dev-server/src/helpers/angularHandler.ts index 03d004646525..59d9e2ff0e4d 100644 --- a/npm/webpack-dev-server/src/helpers/angularHandler.ts +++ b/npm/webpack-dev-server/src/helpers/angularHandler.ts @@ -154,15 +154,15 @@ export async function generateTsConfig (devServerConfig: AngularWebpackDevServer include: includePaths, }, null, 2) - const tsConfigPath = path.join(await getTempDir(), 'tsconfig.json') + const tsConfigPath = path.join(await getTempDir(path.basename(projectRoot)), 'tsconfig.json') await fs.writeFile(tsConfigPath, tsConfigContent) return tsConfigPath } -export async function getTempDir (): Promise { - const cypressTempDir = path.join(tmpdir(), 'cypress-angular-ct') +export async function getTempDir (projectName: string): Promise { + const cypressTempDir = path.join(tmpdir(), 'cypress-angular-ct', projectName) await fs.ensureDir(cypressTempDir) diff --git a/npm/webpack-dev-server/test/handlers/angularHandler.spec.ts b/npm/webpack-dev-server/test/handlers/angularHandler.spec.ts index b382f279da22..c64ee62d51bf 100644 --- a/npm/webpack-dev-server/test/handlers/angularHandler.spec.ts +++ b/npm/webpack-dev-server/test/handlers/angularHandler.spec.ts @@ -194,7 +194,7 @@ const expectLoadsAngularBuildOptions = (buildOptions: BuildOptions) => { const expectGeneratesTsConfig = async (devServerConfig: AngularWebpackDevServerConfig, buildOptions: any) => { const { projectRoot } = devServerConfig.cypressConfig let tsConfigPath = await generateTsConfig(devServerConfig, buildOptions) - const tempDir = await getTempDir() + const tempDir = await getTempDir(path.basename(projectRoot)) expect(tsConfigPath).to.eq(path.join(tempDir, 'tsconfig.json'))