From 55b23b2d9605448dad21b6cecdea1d88719fccb6 Mon Sep 17 00:00:00 2001
From: mehmet-erim <bilgi@mehmeterim.com>
Date: Tue, 10 Dec 2019 15:43:11 +0300
Subject: [PATCH] feat(scripts): add git commit child process to publish script
 #2346

---
 npm/lerna.json                                      |  5 +----
 .../{lerna.exec.json => lerna.publish.json}         |  0
 npm/ng-packs/package.json                           |  2 +-
 npm/ng-packs/scripts/build.js                       |  6 ------
 npm/ng-packs/scripts/package.json                   |  2 +-
 npm/ng-packs/scripts/publish.js                     | 13 ++++++++++---
 npm/publish.ps1                                     |  2 +-
 7 files changed, 14 insertions(+), 16 deletions(-)
 rename npm/ng-packs/{lerna.exec.json => lerna.publish.json} (100%)

diff --git a/npm/lerna.json b/npm/lerna.json
index 4a5fb86cc8..83e48173f4 100644
--- a/npm/lerna.json
+++ b/npm/lerna.json
@@ -1,9 +1,6 @@
 {
   "version": "1.1.0",
-  "packages": [
-    "ng-packs/dist/*",
-    "packs/*"
-  ],
+  "packages": ["packs/*"],
   "npmClient": "yarn",
   "lerna": "3.18.4"
 }
diff --git a/npm/ng-packs/lerna.exec.json b/npm/ng-packs/lerna.publish.json
similarity index 100%
rename from npm/ng-packs/lerna.exec.json
rename to npm/ng-packs/lerna.publish.json
diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json
index 3df5026dde..242592d121 100644
--- a/npm/ng-packs/package.json
+++ b/npm/ng-packs/package.json
@@ -8,7 +8,7 @@
     "commit": "git-cz",
     "lint": "ng lint",
     "scripts:build": "cd scripts && npm install && yarn build",
-    "prepare:workspace": "yarn scripts:build --noCommit",
+    "prepare:workspace": "yarn scripts:build",
     "ci": "yarn prepare:workspace && yarn ci:test && yarn ng lint",
     "ci:test": "ng test --coverage=false",
     "lerna": "lerna"
diff --git a/npm/ng-packs/scripts/build.js b/npm/ng-packs/scripts/build.js
index beef97ca29..f2cf7f1eb1 100644
--- a/npm/ng-packs/scripts/build.js
+++ b/npm/ng-packs/scripts/build.js
@@ -4,7 +4,6 @@ import fse from 'fs-extra';
 import program from 'commander';
 
 (async () => {
-  program.option('-c, --noCommit', 'skip commit process', false);
   program.option('-i, --noInstall', 'skip updating package.json and installation', false);
 
   program.parse(process.argv);
@@ -59,10 +58,5 @@ import program from 'commander';
     process.exit(1);
   }
 
-  if (!program.noCommit) {
-    await execa('git', ['add', '../dist/*', '../package.json'], { stdout: 'inherit' });
-    await execa('git', ['commit', '-m', 'Build ng packages', '--no-verify'], { stdout: 'inherit' });
-  }
-
   process.exit(0);
 })();
diff --git a/npm/ng-packs/scripts/package.json b/npm/ng-packs/scripts/package.json
index 5e7f86bd33..5388e306e9 100644
--- a/npm/ng-packs/scripts/package.json
+++ b/npm/ng-packs/scripts/package.json
@@ -6,7 +6,7 @@
   "modules": "[build.js, sync.js]",
   "scripts": {
     "build": "node -r esm build.js",
-    "publish": "node -r esm publish.js",
+    "publish-packages": "node -r esm publish.js",
     "install-new-dependencies": "node -r esm install-new-dependencies.js",
     "sync": "node -r esm sync.js",
     "test": "echo \"Error: no test specified\" && exit 1"
diff --git a/npm/ng-packs/scripts/publish.js b/npm/ng-packs/scripts/publish.js
index fe7d44b6ef..43f5879d8c 100644
--- a/npm/ng-packs/scripts/publish.js
+++ b/npm/ng-packs/scripts/publish.js
@@ -30,14 +30,21 @@ if (versions.indexOf(nextSemanticVersion) < 0) {
 
     await execa('yarn', ['build', '--noInstall'], { stdout: 'inherit' });
 
-    await fse.rename('../lerna.exec.json', '../lerna.json');
+    await fse.rename('../lerna.publish.json', '../lerna.json');
 
-    await execa('yarn', ['lerna', 'exec', '--', 'npm', 'publish'], {
+    await execa('yarn', ['lerna', 'exec', '--', '"npm publish"'], {
       stdout: 'inherit',
       cwd: '../',
     });
 
-    await fse.rename('../lerna.json', '../lerna.exec.json');
+    await fse.rename('../lerna.json', '../lerna.publish.json');
+
+    await execa('git', ['add', '../packages/*', '../package.json', '../lerna.version.json'], {
+      stdout: 'inherit',
+    });
+    await execa('git', ['commit', '-m', 'Upgrade ng package versions', '--no-verify'], {
+      stdout: 'inherit',
+    });
   } catch (error) {
     console.error(error.stderr);
     process.exit(1);
diff --git a/npm/publish.ps1 b/npm/publish.ps1
index ed22cdce51..94a8e4a8c3 100644
--- a/npm/publish.ps1
+++ b/npm/publish.ps1
@@ -3,7 +3,7 @@
 & npm run build
 & cd ../../
 & yarn
-& yarn lerna publish patch --no-push --yes --no-git-reset --no-commit-hooks --no-git-tag-version
+& yarn lerna publish patch --no-push --yes --no-git-reset --no-commit-hooks --no-git-tag-version --force-publish
 & cd ng-packs\scripts
 & npm run sync
 & cd ../../