From 2d8a3482a00a36300b16ce68cf9bd453ed65acc3 Mon Sep 17 00:00:00 2001
From: Brandon Roberts <robertsbt@gmail.com>
Date: Fri, 26 Jun 2020 07:13:52 -0500
Subject: [PATCH] build: use build target instead of build-release for bunding
 packages

---
 .circleci/config.yml |  7 ------
 angular.json         | 54 ++++++++++++++++++++++----------------------
 nx.json              |  1 -
 package.json         |  2 +-
 4 files changed, 28 insertions(+), 36 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 999d9f16fc..9c493b0785 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -151,9 +151,6 @@ jobs:
           root: dist
           paths:
             - modules/*
-      - run:
-          name: Build Docs
-          command: yarn nx run-many --target=build --projects=docs-app
       # Store artifacts from docs build
       - persist_to_workspace:
           root: projects/ngrx.io/dist
@@ -171,10 +168,6 @@ jobs:
       # Build
       - run: yarn
       - write_master_hash
-      - run:
-          name: Run Affected Release Builds
-          command: yarn nx affected --target=build-release --base=$(cat ~/project/master.txt) --head=$CIRCLE_SHA1
-      # Build docs if necessary
       - run:
           name: Run Affected Builds
           command: yarn nx affected --target=build --base=$(cat ~/project/master.txt) --head=$CIRCLE_SHA1
diff --git a/angular.json b/angular.json
index b5a98b5158..7a047fd70d 100644
--- a/angular.json
+++ b/angular.json
@@ -123,20 +123,20 @@
       "sourceRoot": "modules/store/src",
       "prefix": "ngrx",
       "architect": {
-        "build": {
+        "build-package": {
           "builder": "@angular-devkit/build-ng-packagr:build",
           "options": {
             "tsConfig": "modules/store/tsconfig-build.json",
             "project": "modules/store/ng-package.json"
           }
         },
-        "build-release": {
+        "build": {
           "builder": "@nrwl/workspace:run-commands",
           "options": {
             "parallel": false,
             "commands": [
               {
-                "command": "ng build store"
+                "command": "ng run store:build-package"
               },
               {
                 "command": "yarn tsc -p modules/store/tsconfig.schematics.json"
@@ -178,20 +178,20 @@
       "sourceRoot": "modules/effects/src",
       "prefix": "ngrx",
       "architect": {
-        "build": {
+        "build-package": {
           "builder": "@angular-devkit/build-ng-packagr:build",
           "options": {
             "tsConfig": "modules/effects/tsconfig-build.json",
             "project": "modules/effects/ng-package.json"
           }
         },
-        "build-release": {
+        "build": {
           "builder": "@nrwl/workspace:run-commands",
           "options": {
             "parallel": false,
             "commands": [
               {
-                "command": "ng build effects"
+                "command": "ng run effects:build-package"
               },
               {
                 "command": "yarn tsc -p modules/effects/tsconfig.schematics.json"
@@ -233,20 +233,20 @@
       "sourceRoot": "modules/data/src",
       "prefix": "ngrx",
       "architect": {
-        "build": {
+        "build-package": {
           "builder": "@angular-devkit/build-ng-packagr:build",
           "options": {
             "tsConfig": "modules/data/tsconfig-build.json",
             "project": "modules/data/ng-package.json"
           }
         },
-        "build-release": {
+        "build": {
           "builder": "@nrwl/workspace:run-commands",
           "options": {
             "parallel": false,
             "commands": [
               {
-                "command": "ng build data"
+                "command": "ng run data:build-package"
               },
               {
                 "command": "yarn tsc -p modules/data/tsconfig.schematics.json"
@@ -282,20 +282,20 @@
       "sourceRoot": "modules/entity/src",
       "prefix": "ngrx",
       "architect": {
-        "build": {
+        "build-package": {
           "builder": "@angular-devkit/build-ng-packagr:build",
           "options": {
             "tsConfig": "modules/entity/tsconfig-build.json",
             "project": "modules/entity/ng-package.json"
           }
         },
-        "build-release": {
+        "build": {
           "builder": "@nrwl/workspace:run-commands",
           "options": {
             "parallel": false,
             "commands": [
               {
-                "command": "ng build entity"
+                "command": "ng run entity:build-package"
               },
               {
                 "command": "yarn tsc -p modules/entity/tsconfig.schematics.json"
@@ -337,20 +337,20 @@
       "sourceRoot": "modules/store-devtools/src",
       "prefix": "ngrx",
       "architect": {
-        "build": {
+        "build-package": {
           "builder": "@angular-devkit/build-ng-packagr:build",
           "options": {
             "tsConfig": "modules/store-devtools/tsconfig-build.json",
             "project": "modules/store-devtools/ng-package.json"
           }
         },
-        "build-release": {
+        "build": {
           "builder": "@nrwl/workspace:run-commands",
           "options": {
             "parallel": false,
             "commands": [
               {
-                "command": "ng build store-devtools"
+                "command": "ng run store-devtools:build-package"
               },
               {
                 "command": "yarn tsc -p modules/store-devtools/tsconfig.schematics.json"
@@ -386,20 +386,20 @@
       "sourceRoot": "modules/router-store/src",
       "prefix": "ngrx",
       "architect": {
-        "build": {
+        "build-package": {
           "builder": "@angular-devkit/build-ng-packagr:build",
           "options": {
             "tsConfig": "modules/router-store/tsconfig-build.json",
             "project": "modules/router-store/ng-package.json"
           }
         },
-        "build-release": {
+        "build": {
           "builder": "@nrwl/workspace:run-commands",
           "options": {
             "parallel": false,
             "commands": [
               {
-                "command": "ng build router-store"
+                "command": "ng run router-store:build-package"
               },
               {
                 "command": "yarn tsc -p modules/router-store/tsconfig.schematics.json"
@@ -453,7 +453,7 @@
             "runInBand": true
           }
         },
-        "build": {
+        "build-package": {
           "builder": "@nrwl/node:package",
           "options": {
             "outputPath": "dist/modules/schematics",
@@ -476,13 +476,13 @@
             ]
           }
         },
-        "build-release": {
+        "build": {
           "builder": "@nrwl/workspace:run-commands",
           "options": {
             "parallel": false,
             "commands": [
               {
-                "command": "nx build schematics"
+                "command": "nx build-package schematics"
               },
               {
                 "command": "yarn tsc -p modules/schematics/tsconfig.schematics.json"
@@ -519,20 +519,20 @@
       "sourceRoot": "modules/component/src",
       "prefix": "ngrx",
       "architect": {
-        "build": {
+        "build-package": {
           "builder": "@angular-devkit/build-ng-packagr:build",
           "options": {
             "tsConfig": "modules/component/tsconfig-build.json",
             "project": "modules/component/ng-package.json"
           }
         },
-        "build-release": {
+        "build": {
           "builder": "@nrwl/workspace:run-commands",
           "options": {
             "parallel": false,
             "commands": [
               {
-                "command": "ng build component"
+                "command": "ng run component:build-package"
               }
             ]
           }
@@ -565,20 +565,20 @@
       "sourceRoot": "modules/component-store/src",
       "prefix": "ngrx",
       "architect": {
-        "build": {
+        "build-package": {
           "builder": "@angular-devkit/build-ng-packagr:build",
           "options": {
             "tsConfig": "modules/component-store/tsconfig-build.json",
             "project": "modules/component-store/ng-package.json"
           }
         },
-        "build-release": {
+        "build": {
           "builder": "@nrwl/workspace:run-commands",
           "options": {
             "parallel": false,
             "commands": [
               {
-                "command": "ng build component-store"
+                "command": "ng run component-store:build-package"
               }
             ]
           }
diff --git a/nx.json b/nx.json
index e43fafb95c..898005fc1f 100644
--- a/nx.json
+++ b/nx.json
@@ -15,7 +15,6 @@
     "default": {
       "runner": "@nrwl/workspace/tasks-runners/default",
       "options": {
-        "strictlyOrderedTargets": ["build-release"],
         "cacheableOperations": ["build", "build-release", "test", "lint", "e2e"]
       }
     }
diff --git a/package.json b/package.json
index cce49e59f8..13699d06a3 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "description": "monorepo for ngrx development",
   "scripts": {
     "ng": "ng",
-    "build": "nx run-many --target=build-release --all",
+    "build": "nx run-many --target=build --all",
     "build:bazel": "bazel build //modules/...",
     "deploy:builds": "ts-node ./build/deploy-build.ts",
     "deploy:preview": "ts-node ./build/deploy-preview.ts",