Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions packages/angular_devkit/architect_cli/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,13 @@ ts_project(
name = "architect_cli",
srcs = [
"bin/architect.ts",
] + glob(["src/**/*.ts"]),
],
deps = [
":node_modules/@angular-devkit/architect",
":node_modules/@angular-devkit/core",
":node_modules/ansi-colors",
":node_modules/progress",
":node_modules/yargs-parser",
"//:node_modules/@types/node",
"//:node_modules/@types/progress",
"//:node_modules/@types/yargs-parser",
],
)
Expand Down
55 changes: 1 addition & 54 deletions packages/angular_devkit/architect_cli/bin/architect.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,14 @@
* found in the LICENSE file at https://angular.dev/license
*/

import { Architect, BuilderInfo, BuilderProgressState, Target } from '@angular-devkit/architect';
import { Architect } from '@angular-devkit/architect';
import { WorkspaceNodeModulesArchitectHost } from '@angular-devkit/architect/node';
import { JsonValue, json, logging, schema, tags, workspaces } from '@angular-devkit/core';
import { NodeJsSyncHost, createConsoleLogger } from '@angular-devkit/core/node';
import * as ansiColors from 'ansi-colors';
import { existsSync } from 'node:fs';
import * as path from 'node:path';
import yargsParser, { camelCase, decamelize } from 'yargs-parser';
import { MultiProgressBar } from '../src/progress';

function findUp(names: string | string[], from: string) {
if (!Array.isArray(names)) {
Expand Down Expand Up @@ -59,16 +58,6 @@ function usage(logger: logging.Logger, exitCode = 0): never {
return process.exit(exitCode);
}

function _targetStringFromTarget({ project, target, configuration }: Target) {
return `${project}:${target}${configuration !== undefined ? ':' + configuration : ''}`;
}

interface BarInfo {
status?: string;
builder: BuilderInfo;
target?: Target;
}

// Create a separate instance to prevent unintended global changes to the color configuration
const colors = ansiColors.create();

Expand Down Expand Up @@ -106,47 +95,6 @@ async function _executeTarget(
}

const run = await architect.scheduleTarget(targetSpec, camelCasedOptions, { logger });
const bars = new MultiProgressBar<number, BarInfo>(':name :bar (:current/:total) :status');

run.progress.subscribe((update) => {
const data = bars.get(update.id) || {
id: update.id,
builder: update.builder,
target: update.target,
status: update.status || '',
name: (
(update.target ? _targetStringFromTarget(update.target) : update.builder.name) +
' '.repeat(80)
).substring(0, 40),
};

if (update.status !== undefined) {
data.status = update.status;
}

switch (update.state) {
case BuilderProgressState.Error:
data.status = 'Error: ' + update.error;
bars.update(update.id, data);
break;

case BuilderProgressState.Stopped:
data.status = 'Done.';
bars.complete(update.id);
bars.update(update.id, data, update.total, update.total);
break;

case BuilderProgressState.Waiting:
bars.update(update.id, data);
break;

case BuilderProgressState.Running:
bars.update(update.id, data, update.current, update.total);
break;
}

bars.render();
});

// Wait for full completion of the builder.
try {
Expand All @@ -163,7 +111,6 @@ async function _executeTarget(
logs.splice(0);

await run.stop();
bars.terminate();

return result.success ? 0 : 1;
} catch (err) {
Expand Down
4 changes: 0 additions & 4 deletions packages/angular_devkit/architect_cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
"@angular-devkit/architect": "workspace:0.0.0-EXPERIMENTAL-PLACEHOLDER",
"@angular-devkit/core": "workspace:0.0.0-PLACEHOLDER",
"ansi-colors": "4.1.3",
"progress": "2.0.3",
"yargs-parser": "22.0.0"
},
"devDependencies": {
"@types/progress": "2.0.7"
}
}
102 changes: 0 additions & 102 deletions packages/angular_devkit/architect_cli/src/progress.ts

This file was deleted.

7 changes: 0 additions & 7 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.