From 48649c8fdfc819f3cdcd28a0a7469e40343d97f1 Mon Sep 17 00:00:00 2001
From: vikerman <viks@google.com>
Date: Wed, 25 Sep 2019 15:21:11 -0700
Subject: [PATCH] fix(builders): fix package.json

- include package.json in the npm package
- use templated version numbers for dependencies
- add @nguniversal/builders to the ng update package group
---
 modules/builders/BUILD.bazel  | 1 +
 modules/builders/package.json | 9 ++++++---
 tools/defaults.bzl            | 6 +++++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/modules/builders/BUILD.bazel b/modules/builders/BUILD.bazel
index ec2761736..3fccd38e0 100644
--- a/modules/builders/BUILD.bazel
+++ b/modules/builders/BUILD.bazel
@@ -5,6 +5,7 @@ filegroup(
     srcs = glob([
         "**/schema.json",
     ] + [
+        "package.json",
         "README.md",
         "builders.json",
     ]),
diff --git a/modules/builders/package.json b/modules/builders/package.json
index 79b8324d4..36fa5adb9 100644
--- a/modules/builders/package.json
+++ b/modules/builders/package.json
@@ -14,8 +14,11 @@
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
-    "@angular-devkit/architect": "^0.900.0-next.5",
-    "@angular-devkit/core": "^9.0.0-next.5",
-    "rxjs": "^6.5.3"
+    "@angular-devkit/architect": "DEVKIT_ARCHITECT_VERSION",
+    "@angular-devkit/core": "DEVKIT_CORE_VERSION",
+    "rxjs": "RXJS_VERSION"
+  },
+  "ng-update": {
+    "packageGroup": "NG_UPDATE_PACKAGE_GROUP"
   }
 }
diff --git a/tools/defaults.bzl b/tools/defaults.bzl
index 4a9986c53..2c8c701a9 100644
--- a/tools/defaults.bzl
+++ b/tools/defaults.bzl
@@ -37,13 +37,15 @@ RXJS_VERSION = "^6.4.0"
 HAPI_VERSION = "^17.0.0"
 EXPRESS_VERSION = "^4.15.2"
 EXPRESS_TYPES_VERSION = "^4.17.0"
+DEVKIT_CORE_VERSION = "^9.0.0-next.5"
+DEVKIT_ARCHITECT_VERSION = "^0.900.0-next.5"
 
 NGUNIVERSAL_SCOPED_PACKAGES = ["@nguniversal/%s" % p for p in [
     "aspnetcore-engine",
+    "builders",
     "common",
     "express-engine",
     "hapi-engine",
-    "module-map-ngfactory-loader",
 ]]
 
 PKG_GROUP_REPLACEMENTS = {
@@ -55,6 +57,8 @@ PKG_GROUP_REPLACEMENTS = {
     "HAPI_VERSION": HAPI_VERSION,
     "NG_VERSION": NG_VERSION,
     "RXJS_VERSION": RXJS_VERSION,
+    "DEVKIT_CORE_VERSION": DEVKIT_CORE_VERSION,
+    "DEVKIT_ARCHITECT_VERSION": DEVKIT_ARCHITECT_VERSION,
 }
 
 GLOBALS = {