Skip to content

Commit

Permalink
Revert "build: remove unused angular bazel postinstall patch (#18373)"
Browse files Browse the repository at this point in the history
This reverts commit e7e1ec3.
  • Loading branch information
mmalerba committed Feb 5, 2020
1 parent a35639a commit 1001b70
Show file tree
Hide file tree
Showing 2 changed files with 89 additions and 0 deletions.
77 changes: 77 additions & 0 deletions tools/bazel/angular_bazel_rules_nodejs_1.0.0.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
diff --git node_modules/@angular/bazel/_BUILD.bazel node_modules/@angular/bazel/_BUILD.bazel
index 1e4880f..5654615 100755
--- node_modules/@angular/bazel/_BUILD.bazel
+++ node_modules/@angular/bazel/_BUILD.bazel
@@ -1,6 +1,6 @@
-load("//tools:defaults.bzl", "npm_package")
+load("//tools:defaults.bzl", "pkg_npm")

-npm_package(
+pkg_npm(
name = "npm_package",
srcs = glob(
["*"],
@@ -14,10 +14,10 @@ npm_package(
"//src/schematics:package_assets",
"//third_party/github.com/bazelbuild/bazel/src/main/protobuf:package_assets",
],
- packages = [
+ nested_packages = [
"//docs",
],
- replacements = {
+ substitutions = {
"(#|\/\/)\\s+BEGIN-DEV-ONLY[\\w\W]+?(#|\/\/)\\s+END-DEV-ONLY": "",
"//": "//",
"npm_angular_bazel/": "npm_angular_bazel/",
diff --git node_modules/@angular/bazel/src/ng_package/ng_package.bzl node_modules/@angular/bazel/src/ng_package/ng_package.bzl
index 55bd685..8aaefdc 100755
--- node_modules/@angular/bazel/src/ng_package/ng_package.bzl
+++ node_modules/@angular/bazel/src/ng_package/ng_package.bzl
@@ -15,9 +15,9 @@ specification of this format at https://goo.gl/jB3GVv

load("@build_bazel_rules_nodejs//:providers.bzl", "JSEcmaScriptModuleInfo", "JSNamedModuleInfo", "NpmPackageInfo", "node_modules_aspect")
load(
- "@build_bazel_rules_nodejs//internal/npm_package:npm_package.bzl",
- "NPM_PACKAGE_ATTRS",
- "NPM_PACKAGE_OUTPUTS",
+ "@build_bazel_rules_nodejs//internal/pkg_npm:pkg_npm.bzl",
+ "PKG_NPM_ATTRS",
+ "PKG_NPM_OUTPUTS",
"create_package",
)
load("//src:external.bzl", "FLAT_DTS_FILE_SUFFIX")
@@ -623,7 +623,7 @@ def _ng_package_impl(ctx):
package_dir = create_package(
ctx,
devfiles.to_list(),
- [npm_package_directory] + ctx.files.packages,
+ [npm_package_directory] + ctx.files.nested_packages,
)
return [DefaultInfo(
files = depset([package_dir]),
@@ -631,7 +631,7 @@ def _ng_package_impl(ctx):

_NG_PACKAGE_DEPS_ASPECTS = [esm5_outputs_aspect, ng_package_module_mappings_aspect, node_modules_aspect]

-_NG_PACKAGE_ATTRS = dict(NPM_PACKAGE_ATTRS, **{
+_NG_PACKAGE_ATTRS = dict(PKG_NPM_ATTRS, **{
"srcs": attr.label_list(
doc = """JavaScript source files from the workspace.
These can use ES2015 syntax and ES Modules (import/export)""",
@@ -807,12 +807,12 @@ def _ng_package_outputs(name, entry_point, entry_point_name):
"umd": "%s.umd.js" % basename,
"umd_min": "%s.umd.min.js" % basename,
}
- for key in NPM_PACKAGE_OUTPUTS:
- # NPM_PACKAGE_OUTPUTS is a "normal" dict-valued outputs so it looks like
+ for key in PKG_NPM_OUTPUTS:
+ # PKG_NPM_OUTPUTS is a "normal" dict-valued outputs so it looks like
# "pack": "%{name}.pack",
# But this is a function-valued outputs.
# Bazel won't replace the %{name} token so we have to do it.
- outputs[key] = NPM_PACKAGE_OUTPUTS[key].replace("%{name}", name)
+ outputs[key] = PKG_NPM_OUTPUTS[key].replace("%{name}", name)
return outputs

ng_package = rule(
12 changes: 12 additions & 0 deletions tools/bazel/postinstall-patches.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,18 @@ shelljs.cd(projectDir);
// Workaround for https://github.com/angular/angular/issues/18810.
shelljs.exec('ngc -p angular-tsconfig.json');

try {
// Temporary patch to make @angular/bazel compatible with rules_nodejs 1.0.0.
// This is needed to resolve the dependency sandwich between angular components and
// repo framework. It can be removed with a future @angular/bazel update.
// try/catch needed for this the material CI tests to work in angular/repo
applyPatch(path.join(__dirname, './angular_bazel_rules_nodejs_1.0.0.patch'));
} catch (_) {}

// Temporary patch for ts-api-guardian to be compatible with rules_nodejs 1.0.0.
// TODO: a new ts-api-guardian release is needed.
applyPatch(path.join(__dirname, './ts_api_guardian_rules_nodejs_1.0.0.patch'));

// Workaround for https://github.com/angular/angular/issues/30586. It's not possible to
// enable tsickle decorator processing without enabling import rewriting to closure.
// This replacement allows us to enable decorator processing without rewriting imports.
Expand Down

0 comments on commit 1001b70

Please sign in to comment.