Revert "build: package-build & release scripts should handle new pkg_…

…npm naming (#34589)" (#34730) This reverts commit 053b23d. PR Close #34730
angular · Jan 10, 2020 · 7e9ac76 · 7e9ac76
1 parent 7eddbe5
commit 7e9ac76
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/scripts/package-builder.js b/scripts/package-builder.js
@@ -61,7 +61,7 @@ function buildTargetPackages(destPath, enableIvy, description) {
   // all carriage return (`\r`) characters form the query output, because otherwise the carriage
   // return is part of the bazel target name and bazel will complain.
   const getTargetsCmd =
-      `${bazelCmd} query --output=label "attr('tags', '\\[.*release-with-framework.*\\]', //packages/...) intersect kind('ng_package|pkg_npm', //packages/...)"`;
+      `${bazelCmd} query --output=label "attr('tags', '\\[.*release-with-framework.*\\]', //packages/...) intersect kind('.*_package', //packages/...)"`;
   const targets = exec(getTargetsCmd, true).split(/\r?\n/);
 
   // Use `--config=release` so that snapshot builds get published with embedded version info.

diff --git a/scripts/release/publish-latest b/scripts/release/publish-latest
@@ -14,7 +14,7 @@ BAZEL_OUTPUT_BASE=$(mktemp -d -t angular-release-latest.XXXXXXX)
 BAZEL="$BAZEL_BIN --output_base=$BAZEL_OUTPUT_BASE"
 
 # query for all npm packages to be released as part of the framework release
-NPM_PACKAGE_LABELS=`${BAZEL_BIN} query --output=label 'attr("tags", "\[.*release-with-framework.*\]", //packages/...) intersect kind("ng_package|pkg_npm", //packages/...)'`
+NPM_PACKAGE_LABELS=`${BAZEL_BIN} query --output=label 'attr("tags", "\[.*release-with-framework.*\]", //packages/...) intersect kind(".*_package", //packages/...)'`
 # build all npm packages in parallel
 $BAZEL build --config=release $NPM_PACKAGE_LABELS
 # publish all packages in sequence to make it easier to spot any errors or warnings

diff --git a/scripts/release/publish-next b/scripts/release/publish-next
@@ -14,7 +14,7 @@ BAZEL_OUTPUT_BASE=$(mktemp -d -t angular-release-next.XXXXXXX)
 BAZEL="$BAZEL_BIN --output_base=$BAZEL_OUTPUT_BASE"
 
 # query for all npm packages to be released as part of the framework release
-NPM_PACKAGE_LABELS=`${BAZEL_BIN} query --output=label 'attr("tags", "\[.*release-with-framework.*\]", //packages/...) intersect kind("ng_package|pkg_npm", //packages/...)'`
+NPM_PACKAGE_LABELS=`${BAZEL_BIN} query --output=label 'attr("tags", "\[.*release-with-framework.*\]", //packages/...) intersect kind(".*_package", //packages/...)'`
 # build all npm packages in parallel
 $BAZEL build --config=release $NPM_PACKAGE_LABELS
 # publish all packages in sequence to make it easier to spot any errors or warnings