Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit ae99687

Browse files
committed
fix(@angular/build): reverts the test output location to its original and removes unique UUID folders. closes #30713 
1 parent f9ac82e commit ae99687

File tree

4 files changed

+15
-13
lines changed

4 files changed

+15
-13
lines changed

‎packages/angular/build/src/builders/karma/application_builder.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
import type { BuilderContext, BuilderOutput } from '@angular-devkit/architect';
1010
import type { Config, ConfigOptions, FilePattern, InlinePluginDef, Server } from 'karma';
11-
import { randomUUID } from 'node:crypto';
1211
import * as fs from 'node:fs/promises';
1312
import type { IncomingMessage, ServerResponse } from 'node:http';
1413
import { createRequire } from 'node:module';
@@ -24,9 +23,9 @@ import { ApplicationBuilderInternalOptions } from '../application/options';
2423
import { Result, ResultFile, ResultKind } from '../application/results';
2524
import { OutputHashing } from '../application/schema';
2625
import { findTests, getTestEntrypoints } from './find-tests';
26+
import type { KarmaBuilderTransformsOptions } from './index';
2727
import { NormalizedKarmaBuilderOptions, normalizeOptions } from './options';
2828
import { Schema as KarmaBuilderOptions } from './schema';
29-
import type { KarmaBuilderTransformsOptions } from './index';
3029

3130
const localResolve = createRequire(__filename).resolve;
3231
const isWindows = process.platform === 'win32';
@@ -380,7 +379,8 @@ async function initializeApplication(
380379
): Promise<
381380
[typeof import('karma'), Config & ConfigOptions, BuildOptions, AsyncIterator<Result> | null]
382381
> {
383-
const outputPath = path.join(context.workspaceRoot, 'dist/test-out', randomUUID());
382+
const testOutput = '.angular/cache/test-out'; // Could be extended later to optionally allow for a randomUUID or a custom outputPath.
383+
const outputPath = path.join(context.workspaceRoot, testOutput);
384384
const projectSourceRoot = await getProjectSourceRoot(context);
385385

386386
const [karma, entryPoints] = await Promise.all([

‎packages/angular/build/src/builders/unit-test/runners/vitest/executor.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
import type { BuilderOutput } from '@angular-devkit/architect';
1010
import assert from 'node:assert';
11-
import { randomUUID } from 'node:crypto';
1211
import { createRequire } from 'node:module';
1312
import path from 'node:path';
1413
import type { InlineConfig, Vitest } from 'vitest/node';
@@ -255,10 +254,10 @@ function setupBrowserConfiguration(
255254
}
256255

257256
function generateOutputPath(): string {
258-
constdatePrefix=newDate().toISOString().replaceAll(/[-:.]/g,'');
259-
const uuidSuffix = randomUUID().slice(0,8);
257+
// Could be extended later to optionally allow for a randomUUID or a custom outputPath.
258+
const testOutput = '.angular/cache/test-out';
260259

261-
return path.join('dist','test-out',`${datePrefix}-${uuidSuffix}`);
260+
return path.join(testOutput);
262261
}
263262

264263
function generateCoverageOption(

‎packages/angular_devkit/build_angular/src/builders/jest/index.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@
66
* found in the LICENSE file at https://angular.dev/license
77
*/
88

9-
import { ResultKind, buildApplicationInternal } from '@angular/build/private';
109
import { BuilderContext, BuilderOutput, createBuilder } from '@angular-devkit/architect';
10+
import { ResultKind, buildApplicationInternal } from '@angular/build/private';
1111
import { execFile as execFileCb } from 'node:child_process';
12-
import { randomUUID } from 'node:crypto';
1312
import * as fs from 'node:fs/promises';
1413
import * as path from 'node:path';
1514
import { promisify } from 'node:util';
@@ -30,7 +29,10 @@ export default createBuilder(
3029
);
3130

3231
const options = normalizeOptions(schema);
33-
const testOut = path.join(context.workspaceRoot, 'dist/test-out', randomUUID()); // TODO(dgp1130): Hide in temp directory.
32+
// Could be extended later to optionally allow for a randomUUID or a custom outputPath.
33+
const testOutput = '.angular/cache/test-out';
34+
35+
const testOut = path.join(context.workspaceRoot, testOutput);
3436

3537
// Verify Jest installation and get the path to it's binary.
3638
// We need to `node_modules/.bin/jest`, but there is no means to resolve that directly. Fortunately Jest's `package.json` exports the

‎packages/angular_devkit/build_angular/src/builders/web-test-runner/index.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@
66
* found in the LICENSE file at https://angular.dev/license
77
*/
88

9-
import { Result, ResultKind, buildApplicationInternal } from '@angular/build/private';
109
import { BuilderContext, BuilderOutput, createBuilder } from '@angular-devkit/architect';
10+
import { Result, ResultKind, buildApplicationInternal } from '@angular/build/private';
1111
import type * as WebTestRunner from '@web/test-runner';
12-
import { randomUUID } from 'node:crypto';
1312
import fs from 'node:fs/promises';
1413
import { createRequire } from 'node:module';
1514
import path from 'node:path';
@@ -43,8 +42,10 @@ export default createBuilder(
4342
}
4443

4544
const options = normalizeOptions(schema);
45+
// Could be extended later to optionally allow for a randomUUID or a custom outputPath.
46+
const testOutput = '.angular/cache/test-out';
4647

47-
const testDir = path.join(ctx.workspaceRoot, 'dist/test-out',randomUUID());
48+
const testDir = path.join(ctx.workspaceRoot, testOutput);
4849

4950
// Parallelize startup work.
5051
const [testFiles] = await Promise.all([

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /