From 26a85a82ff6597c06835f76d5a3d656352cdba04 Mon Sep 17 00:00:00 2001 From: Alex Rickabaugh Date: Tue, 25 Jun 2019 13:11:49 -0700 Subject: [PATCH] Revert "build: fix build failures with worker mode cache and @types/events (#31019)" (#31267) This reverts commit 6ba42f1da4a5e8abf87e3c4202d423504357fe49. Reason: this causes failures in g3 with i18n extraction. See #31267. PR Close #31267 --- packages/compiler-cli/BUILD.bazel | 3 +-- .../compiler-cli/integrationtest/bazel/ng_module/BUILD.bazel | 1 + packages/zone.js/test/BUILD.bazel | 2 +- tools/defaults.bzl | 2 -- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/compiler-cli/BUILD.bazel b/packages/compiler-cli/BUILD.bazel index fc28345174..ce8922eea7 100644 --- a/packages/compiler-cli/BUILD.bazel +++ b/packages/compiler-cli/BUILD.bazel @@ -43,8 +43,7 @@ ts_library( "//packages/compiler-cli/src/ngtsc/typecheck", "//packages/compiler-cli/src/ngtsc/util", "@npm//@bazel/typescript", - "@npm//@types/chokidar", - "@npm//@types/node", + "@npm//@types", "@npm//reflect-metadata", "@npm//tsickle", "@npm//typescript", diff --git a/packages/compiler-cli/integrationtest/bazel/ng_module/BUILD.bazel b/packages/compiler-cli/integrationtest/bazel/ng_module/BUILD.bazel index 1dc6cf811b..fae0105f2b 100644 --- a/packages/compiler-cli/integrationtest/bazel/ng_module/BUILD.bazel +++ b/packages/compiler-cli/integrationtest/bazel/ng_module/BUILD.bazel @@ -20,6 +20,7 @@ ng_module( ], deps = [ "//packages/core", + "@npm//@types", "@npm//tslib", ], ) diff --git a/packages/zone.js/test/BUILD.bazel b/packages/zone.js/test/BUILD.bazel index c13e89f703..0d35ad8e1f 100644 --- a/packages/zone.js/test/BUILD.bazel +++ b/packages/zone.js/test/BUILD.bazel @@ -171,7 +171,7 @@ ts_library( testonly = True, srcs = ["npm_package/npm_package.spec.ts"], deps = [ - "@npm//@types/shelljs", + "@npm//@types", ], ) diff --git a/tools/defaults.bzl b/tools/defaults.bzl index a7e82efb1a..2c76f83dee 100644 --- a/tools/defaults.bzl +++ b/tools/defaults.bzl @@ -83,7 +83,6 @@ def ts_library(tsconfig = None, testonly = False, deps = [], module_name = None, # Match the types[] in //packages:tsconfig-test.json deps.append("@npm//@types/jasmine") deps.append("@npm//@types/node") - deps.append("@npm//@types/events") if not tsconfig and testonly: tsconfig = _DEFAULT_TSCONFIG_TEST @@ -105,7 +104,6 @@ def ng_module(name, tsconfig = None, entry_point = None, testonly = False, deps # Match the types[] in //packages:tsconfig-test.json deps.append("@npm//@types/jasmine") deps.append("@npm//@types/node") - deps.append("@npm//@types/events") if not tsconfig and testonly: tsconfig = _DEFAULT_TSCONFIG_TEST