From 2814a86b4c0c5fc3ef64f3c008ed3f34fe5ab922 Mon Sep 17 00:00:00 2001
From: Jason Jean <jasonjean1993@gmail.com>
Date: Tue, 24 May 2022 19:28:10 -0400
Subject: [PATCH] fix(repo): update package group during publishing (#10411)

---
 package.json                    |  1 +
 packages/workspace/package.json | 40 ++++++++++++++++-----------------
 scripts/nx-release.ts           |  1 -
 scripts/replace-versions.js     |  1 -
 scripts/update-package-group.js | 10 +++++++++
 5 files changed, 31 insertions(+), 22 deletions(-)
 create mode 100644 scripts/update-package-group.js

diff --git a/package.json b/package.json
index 7dea00237cd92..c1aec452f2231 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
     "e2e-build-package-publish": "ts-node -P ./scripts/tsconfig.e2e.json ./scripts/e2e-build-package-publish.ts",
     "format": "nx format",
     "nx-release": "ts-node -P ./scripts/tsconfig.scripts.json ./scripts/nx-release",
+    "prepublishOnly": "node ./scripts/update-package-group.js",
     "depcheck": "ts-node -P ./scripts/tsconfig.scripts.json ./scripts/depcheck",
     "local-registry": "./scripts/local-registry.sh",
     "documentation": "ts-node -P scripts/tsconfig.scripts.json ./scripts/documentation/documentation.ts && yarn check-documentation-map",
diff --git a/packages/workspace/package.json b/packages/workspace/package.json
index 883d06f9d20d8..65bcfed1ed1ba 100644
--- a/packages/workspace/package.json
+++ b/packages/workspace/package.json
@@ -32,27 +32,27 @@
     "requirements": {},
     "migrations": "./migrations.json",
     "packageGroup": {
-      "@nrwl/angular": "file:../angular",
-      "@nrwl/cypress": "file:../cypress",
-      "@nrwl/devkit": "file:../devkit",
-      "@nrwl/eslint-plugin-nx": "file:../eslint-plugin-nx",
-      "@nrwl/express": "file:../express",
-      "@nrwl/jest": "file:../jest",
-      "@nrwl/linter": "file:../linter",
-      "@nrwl/nest": "file:../nest",
-      "@nrwl/next": "file:../next",
-      "@nrwl/node": "file:../node",
-      "@nrwl/nx-plugin": "file:../nx-plugin",
-      "@nrwl/react": "file:../react",
-      "@nrwl/storybook": "file:../storybook",
-      "@nrwl/web": "file:../web",
-      "@nrwl/js": "file:../js",
-      "@nrwl/cli": "file:../cli",
-      "@nrwl/tao": "file:../tao",
+      "@nrwl/angular": "*",
+      "@nrwl/cypress": "*",
+      "@nrwl/devkit": "*",
+      "@nrwl/eslint-plugin-nx": "*",
+      "@nrwl/express": "*",
+      "@nrwl/jest": "*",
+      "@nrwl/linter": "*",
+      "@nrwl/nest": "*",
+      "@nrwl/next": "*",
+      "@nrwl/node": "*",
+      "@nrwl/nx-plugin": "*",
+      "@nrwl/react": "*",
+      "@nrwl/storybook": "*",
+      "@nrwl/web": "*",
+      "@nrwl/js": "*",
+      "@nrwl/cli": "*",
+      "@nrwl/tao": "*",
       "@nrwl/nx-cloud": "latest",
-      "@nrwl/react-native": "file:../react-native",
-      "@nrwl/detox": "file:../detox",
-      "nx": "file:../nx"
+      "@nrwl/react-native": "*",
+      "@nrwl/detox": "*",
+      "nx": "*"
     }
   },
   "peerDependencies": {
diff --git a/scripts/nx-release.ts b/scripts/nx-release.ts
index 62fb8c262bce4..bb4c8bab5ce74 100755
--- a/scripts/nx-release.ts
+++ b/scripts/nx-release.ts
@@ -42,7 +42,6 @@ import * as publish from '@lerna/publish/index';
     message: 'chore(misc): publish %v',
     loglevel: options.loglevel ?? 'info',
     yes: false,
-    ignoreScripts: true,
   };
 
   if (options.local) {
diff --git a/scripts/replace-versions.js b/scripts/replace-versions.js
index 2df8216d6ea10..75959a3270105 100644
--- a/scripts/replace-versions.js
+++ b/scripts/replace-versions.js
@@ -15,5 +15,4 @@ writeFileSync(
   originalContents
     .replace(/TYPESCRIPT_VERSION/g, typescriptVersion)
     .replace(/PRETTIER_VERSION/g, prettierVersion)
-  // .replace(/TYPESCRIPT_VERSION/g, typescriptVersion)
 );
diff --git a/scripts/update-package-group.js b/scripts/update-package-group.js
new file mode 100644
index 0000000000000..61b792dadc09f
--- /dev/null
+++ b/scripts/update-package-group.js
@@ -0,0 +1,10 @@
+const { readFileSync, writeFileSync } = require('fs');
+const { join } = require('path');
+
+console.log('Updating @nrwl/workspace package group');
+const file = join(__dirname, '../build/packages/workspace/package.json');
+const originalContents = readFileSync(file).toString();
+
+const { version } = require(file);
+
+writeFileSync(file, originalContents.replace(/\*/g, version));