From c2cdd90d99f47d436e1e4a4401a562ed6c5016c9 Mon Sep 17 00:00:00 2001
From: Maurizio Vitale <maurizio.vitale@alfresco.com>
Date: Tue, 1 Nov 2022 16:23:51 +0000
Subject: [PATCH] Move the cli bundle under dist/libs/cli (#7937)

---
 angular.json          | 27 +++++++--------------------
 lib/cli/package.json  |  2 +-
 lib/cli/tsconfig.json |  2 +-
 3 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/angular.json b/angular.json
index 8b5f5f739e..af94583e50 100644
--- a/angular.json
+++ b/angular.json
@@ -812,7 +812,7 @@
       "projectType": "library",
       "prefix": "adf",
       "architect": {
-        "build-local": {
+        "build": {
           "builder": "@nrwl/node:webpack",
           "options": {
             "projectRoot": "lib/testing",
@@ -871,7 +871,7 @@
           "dependsOn": [
             {
               "projects": "self",
-              "target": "build-local"
+              "target": "build"
             }
           ]
         }
@@ -883,7 +883,7 @@
       "projectType": "library",
       "prefix": "adf",
       "architect": {
-        "build-local": {
+        "build": {
           "builder": "@nrwl/workspace:run-commands",
           "options": {
             "commands": [
@@ -909,22 +909,6 @@
             "copyToNodeModules"
           ]
         },
-        "moveToDist": {
-          "executor": "nx:run-commands",
-          "options": {
-            "commands": [
-              {
-                "command": "mkdir -p ./dist/libs/cli && cp -R ./lib/cli/dist/* dist/libs/cli/"
-              }
-            ]
-          },
-          "dependsOn": [
-            {
-              "projects": "self",
-              "target": "build-local"
-            }
-          ]
-        },
         "copyToNodeModules": {
           "executor": "nx:run-commands",
           "options": {
@@ -935,7 +919,10 @@
             ]
           },
           "dependsOn": [
-            "moveToDist"
+            {
+              "projects": "self",
+              "target": "build"
+            }
           ]
         },
         "lint": {
diff --git a/lib/cli/package.json b/lib/cli/package.json
index e36131a2bb..d6169584c5 100644
--- a/lib/cli/package.json
+++ b/lib/cli/package.json
@@ -17,7 +17,7 @@
   "scripts": {
     "build": "tsc -p tsconfig.json",
     "develop": "tsc -p tsconfig.json --watch",
-    "dist": "rm -rf ./dist/ && npm run build && cp -R ./bin ./dist/ && cp -R ./resources ./dist && cp -R ./templates ./dist && cp ./package.json ./dist/"
+    "dist": "rm -rf ../../dist/libs/cli && npm run build && cp -R ./bin ../../dist/libs/cli && cp -R ./resources ../../dist/libs/cli && cp -R ./templates ../../dist/libs/cli && cp ./package.json ../../dist/libs/cli"
   },
   "dependencies": {
     "@alfresco/js-api": "5.1.0",
diff --git a/lib/cli/tsconfig.json b/lib/cli/tsconfig.json
index a323a98be1..e9bd8b3bf9 100644
--- a/lib/cli/tsconfig.json
+++ b/lib/cli/tsconfig.json
@@ -11,7 +11,7 @@
     "noUnusedParameters": true,
     "noUnusedLocals": true,
     "esModuleInterop": true,
-    "outDir": "./dist",
+    "outDir": "../../dist/libs/cli",
     "rootDir": ".",
     "skipLibCheck": true,
     "strictNullChecks": false,