Skip to content

Commit d496ff3

Browse files
devversionandrewseguin
authored andcommitted
build: account for recent packaging changes in shared dev-infra package
The dev-infra package now bundles dependencies properly and no longer lists them as `dependencies`. This results in our deep imports breaking due to missing dependencies. The solution is the use of the bundled entry-points so that we get all the required transitive dependencies without needing to install them manually.
1 parent f1d04d5 commit d496ff3

11 files changed

+19
-16
lines changed

.ng-dev/caretaker.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {CaretakerConfig} from '@angular/dev-infra-private/ng-dev/caretaker/config';
1+
import {CaretakerConfig} from '@angular/dev-infra-private/ng-dev';
22

33
/** The configuration for `ng-dev caretaker` commands. */
44
export const caretaker: CaretakerConfig = {

.ng-dev/commit-message.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {CommitMessageConfig} from '@angular/dev-infra-private/ng-dev/commit-message/config';
1+
import {CommitMessageConfig} from '@angular/dev-infra-private/ng-dev';
22

33
/**
44
* The configuration for `ng-dev commit-message` commands.

.ng-dev/format.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {FormatConfig} from '@angular/dev-infra-private/ng-dev/format/config';
1+
import {FormatConfig} from '@angular/dev-infra-private/ng-dev';
22

33
/**
44
* Configuration for the ng-dev format command. We currently only use the buildifier

.ng-dev/github.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {GithubConfig} from '@angular/dev-infra-private/ng-dev/utils/config';
1+
import {GithubConfig} from '@angular/dev-infra-private/ng-dev';
22

33
/**
44
* Github configuration for the ng-dev command. This repository is

.ng-dev/pull-request.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {PullRequestConfig} from '@angular/dev-infra-private/ng-dev/pr/config';
1+
import {PullRequestConfig} from '@angular/dev-infra-private/ng-dev';
22

33
/**
44
* Configuration for the pull request commands in `ng-dev`. This includes the

.ng-dev/release.ts

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
1-
import {BuiltPackage, ReleaseConfig} from '@angular/dev-infra-private/ng-dev/release/config';
2-
import {ReleaseAction} from '@angular/dev-infra-private/ng-dev/release/publish/actions';
1+
import {
2+
BuiltPackage,
3+
ReleaseConfig,
4+
FatalReleaseActionError,
5+
} from '@angular/dev-infra-private/ng-dev';
36
import {SemVer} from 'semver';
47
import {assertValidNpmPackageOutput} from '../tools/release-checks/npm-package-output';
58
import {fork} from 'child_process';
69
import {join} from 'path';
7-
import {FatalReleaseActionError} from '@angular/dev-infra-private/ng-dev/release/publish/actions-error';
810

9-
const actionProto = ReleaseAction.prototype as any;
11+
// The `ng-dev` release tool exposes the `ReleaseAction` instance through `global`,
12+
// allowing it to be monkey-patched for our release checks. This can be removed
13+
// when the release tool has a public API for release checks.
14+
const actionProto = (global as any).ReleaseAction.prototype;
1015
const _origStageFn = actionProto.stageVersionForBranchAndCreatePullRequest;
1116
const _origVerifyFn = actionProto._verifyPackageVersions;
1217

scripts/build-packages-dist.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import {execSync} from 'child_process';
1010
import {join} from 'path';
11-
import {BuiltPackage} from '@angular/dev-infra-private/ng-dev/release/config';
11+
import {BuiltPackage} from '@angular/dev-infra-private/ng-dev';
1212
import {chmod, cp, mkdir, rm, set, test} from 'shelljs';
1313

1414
// ShellJS should exit if a command fails.

tools/release-checks/check-framework-peer-dependency.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import {FatalReleaseActionError} from '@angular/dev-infra-private/ng-dev/release/publish/actions-error';
2-
import {error} from '@angular/dev-infra-private/ng-dev/utils/console';
1+
import {error, FatalReleaseActionError} from '@angular/dev-infra-private/ng-dev';
32
import {SemVer} from 'semver';
43
import {join} from 'path';
54
import {existsSync, readFileSync} from 'fs';

tools/release-checks/check-migration-collections.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {error} from '@angular/dev-infra-private/ng-dev/utils/console';
1+
import {error} from '@angular/dev-infra-private/ng-dev';
22
import {dirname, join} from 'path';
33
import chalk from 'chalk';
44
import {releasePackages} from '../../.ng-dev/release';

tools/release-checks/npm-package-output/check-package.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {error} from '@angular/dev-infra-private/ng-dev/utils/console';
1+
import {error} from '@angular/dev-infra-private/ng-dev';
22
import chalk from 'chalk';
33
import {existsSync} from 'fs';
44
import {sync as glob} from 'glob';

tools/release-checks/npm-package-output/index.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import {SemVer} from 'semver';
22
import {checkReleasePackage} from './check-package';
3-
import {BuiltPackage} from '@angular/dev-infra-private/ng-dev/release/config';
4-
import {error} from '@angular/dev-infra-private/ng-dev/utils/console';
3+
import {BuiltPackage, error} from '@angular/dev-infra-private/ng-dev';
54
import chalk from 'chalk';
65

76
/** Asserts that the given built packages are valid for public consumption. */

0 commit comments

Comments
 (0)