Skip to content

Commit

Permalink
fix(dev-infra): correct build setup for dev-infra (#38815)
Browse files Browse the repository at this point in the history
Correct's the missing dependencies and incorrect build dependencies for the
dev-infra bazel targets.

PR Close #38815
  • Loading branch information
josephperrott authored and AndrewKushnir committed Sep 11, 2020
1 parent b05d79d commit aa43cbf
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 43 deletions.
25 changes: 10 additions & 15 deletions dev-infra/caretaker/BUILD.bazel
Expand Up @@ -2,25 +2,20 @@ load("@npm_bazel_typescript//:index.bzl", "ts_library")

ts_library(
name = "caretaker",
srcs = [
"cli.ts",
],
srcs = glob([
"**/*.ts",
]),
module_name = "@angular/dev-infra-private/caretaker",
visibility = ["//dev-infra:__subpackages__"],
deps = [
"//dev-infra/caretaker/check",
"//dev-infra/utils",
"@npm//@types/node",
"@npm//@types/node-fetch",
"@npm//@types/yargs",
"@npm//multimatch",
"@npm//node-fetch",
"@npm//typed-graphqlify",
"@npm//yaml",
"@npm//yargs",
],
)

ts_library(
name = "config",
srcs = [
"config.ts",
],
visibility = ["//dev-infra:__subpackages__"],
deps = [
"//dev-infra/utils",
],
)
21 changes: 0 additions & 21 deletions dev-infra/caretaker/check/BUILD.bazel

This file was deleted.

2 changes: 1 addition & 1 deletion dev-infra/caretaker/check/g3.ts
Expand Up @@ -6,7 +6,7 @@
* found in the LICENSE file at https://angular.io/license
*/

import {existsSync, readFileSync} from 'fs-extra';
import {existsSync, readFileSync} from 'fs';
import * as multimatch from 'multimatch';
import {join} from 'path';
import {parse as parseYaml} from 'yaml';
Expand Down
1 change: 1 addition & 0 deletions dev-infra/pr/common/BUILD.bazel
Expand Up @@ -3,6 +3,7 @@ load("@npm_bazel_typescript//:index.bzl", "ts_library")
ts_library(
name = "common",
srcs = glob(["*.ts"]),
module_name = "@angular/dev-infra-private/pr/common",
visibility = ["//dev-infra:__subpackages__"],
deps = [
"//dev-infra/utils",
Expand Down
6 changes: 3 additions & 3 deletions dev-infra/tmpl-package.json
Expand Up @@ -12,11 +12,13 @@
"@angular/benchpress": "0.2.1",
"@octokit/graphql": "<from-root>",
"@octokit/types": "<from-root>",
"@octokit/rest": "<from-root>",
"brotli": "<from-root>",
"chalk": "<from-root>",
"cli-progress": "<from-root>",
"glob": "<from-root>",
"inquirer": "<from-root>",
"inquirer-autocomplete-prompt": "<from-root>",
"minimatch": "<from-root>",
"multimatch": "<from-root>",
"node-fetch": "<from-root>",
Expand All @@ -26,9 +28,7 @@
"tslib": "<from-root>",
"typed-graphqlify": "<from-root>",
"yaml": "<from-root>",
"yargs": "<from-root>"
},
"peerDependencies": {
"yargs": "<from-root>",
"@bazel/buildifier": "<from-root>",
"clang-format": "<from-root>",
"protractor": "<from-root>",
Expand Down
2 changes: 0 additions & 2 deletions dev-infra/utils/BUILD.bazel
Expand Up @@ -12,13 +12,11 @@ ts_library(
"@npm//@octokit/graphql",
"@npm//@octokit/rest",
"@npm//@octokit/types",
"@npm//@types/fs-extra",
"@npm//@types/inquirer",
"@npm//@types/node",
"@npm//@types/shelljs",
"@npm//@types/yargs",
"@npm//chalk",
"@npm//fs-extra",
"@npm//inquirer",
"@npm//inquirer-autocomplete-prompt",
"@npm//shelljs",
Expand Down
2 changes: 1 addition & 1 deletion dev-infra/utils/console.ts
Expand Up @@ -7,7 +7,7 @@
*/

import chalk from 'chalk';
import {writeFileSync} from 'fs-extra';
import {writeFileSync} from 'fs';
import {createPromptModule, ListChoiceOptions, prompt} from 'inquirer';
import * as inquirerAutocomplete from 'inquirer-autocomplete-prompt';
import {join} from 'path';
Expand Down

0 comments on commit aa43cbf

Please sign in to comment.