Skip to content

Commit c53b902

Browse files
josephperrottjosephperrott
authored
build: migrate to use the new layout of the @angular/dev-infra-private package (#23366)
* build: migrate to use the new layout of the @angular/dev-infra-private package * build: add mainBranchName to Github configuration
1 parent df4c32d commit c53b902

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+476
-102
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/caretaker/config';
1+
import {CaretakerConfig} from '@angular/dev-infra-private/ng-dev/caretaker/config';
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/commit-message/config';
1+
import {CommitMessageConfig} from '@angular/dev-infra-private/ng-dev/commit-message/config';
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/format/config';
1+
import {FormatConfig} from '@angular/dev-infra-private/ng-dev/format/config';
22

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

‎.ng-dev/github.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
import {GithubConfig} from '@angular/dev-infra-private/utils/config';
1+
import {GithubConfig} from '@angular/dev-infra-private/ng-dev/utils/config';
22

33
/**
44
* Github configuration for the ng-dev command. This repository is
55
* uses as remote for the merge script.
66
*/
77
export const github: GithubConfig = {
88
owner: 'angular',
9-
name: 'components'
9+
name: 'components',
10+
mainBranchName: 'master',
1011
};

‎.ng-dev/merge.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import {DevInfraMergeConfig} from '@angular/dev-infra-private/pr/merge/config';
2-
import {getDefaultTargetLabelConfiguration} from '@angular/dev-infra-private/pr/merge/defaults';
1+
import {DevInfraMergeConfig} from '@angular/dev-infra-private/ng-dev/pr/merge/config';
2+
import {getDefaultTargetLabelConfiguration} from '@angular/dev-infra-private/ng-dev/pr/merge/defaults';
33
import {github} from './github';
44
import {release} from './release';
55

‎.ng-dev/release.ts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
import {BuiltPackage, ReleaseConfig} from '@angular/dev-infra-private/release/config';
2-
import {ReleaseAction} from '@angular/dev-infra-private/release/publish/actions';
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';
33
import {SemVer} from 'semver';
44
import {assertValidNpmPackageOutput} from '../tools/release-checks/npm-package-output';
55
import {fork} from 'child_process';
66
import {join} from 'path';
7-
import {FatalReleaseActionError} from '@angular/dev-infra-private/release/publish/actions-error';
7+
import {
8+
FatalReleaseActionError
9+
} from '@angular/dev-infra-private/ng-dev/release/publish/actions-error';
810

911
const actionProto = ReleaseAction.prototype as any;
1012
const _origStageFn = actionProto.stageVersionForBranchAndCreatePullRequest;

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
"@angular-devkit/schematics": "12.1.2",
7878
"@angular/bazel": "https://github.com/angular/bazel-builds.git#2566cc859235399edc72749a957f1cdcba2dc121",
7979
"@angular/compiler-cli": "12.1.2",
80-
"@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#0057daca63205a10c26256b6733b02af835497c0",
80+
"@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#a3bc7727bbceb6418e7b220900ea8b396cb82580",
8181
"@angular/localize": "12.1.2",
8282
"@angular/platform-browser-dynamic": "12.1.2",
8383
"@angular/platform-server": "12.1.2",

‎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/release/config';
11+
import {BuiltPackage} from '@angular/dev-infra-private/ng-dev/release/config';
1212
import {chmod, cp, mkdir, rm, set, test} from 'shelljs';
1313

1414
// ShellJS should exit if a command fails.

‎test/benchmarks/cdk/testing/component-harness/BUILD.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
1+
load("@npm//@angular/dev-infra-private/bazel/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
22
load("//tools:defaults.bzl", "ng_test_library", "ng_web_test_suite", "ts_library")
33

44
package(default_visibility = ["//visibility:public"])

‎test/benchmarks/cdk/testing/component-harness/protractor-benchmark-utilities.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* found in the LICENSE file at https://angular.io/license
77
*/
88

9-
import {runBenchmark} from '@angular/dev-infra-private/benchmark/driver-utilities';
9+
import {runBenchmark} from '@angular/dev-infra-private/bazel/benchmark/driver-utilities';
1010
import {USE_BENCHPRESS} from './constants';
1111

1212
/**

0 commit comments

Comments
 (0)