@proteinjs/build 1.1.4 → 1.2.0

package/dist/src/workspaceCommand.js

@@ -63,6 +63,7 @@ exports.workspaceCommand = void 0;
 var path = __importStar(require("path"));
 var util_node_1 = require("@proteinjs/util-node");
 var util_1 = require("@proteinjs/util");
+var logColors_1 = require("./logColors");
 /**
  * Run a npm command against all packages in the workspace, in dependency order.
  *
@@ -73,12 +74,13 @@ var util_1 = require("@proteinjs/util");
  * --skip=@some/package,@another/package
  */
 var workspaceCommand = function () { return __awaiter(void 0, void 0, void 0, function () {
-    var command, logger, args, workspacePath, _a, packageMap, sortedPackageNames, filteredPackageNames, _i, filteredPackageNames_1, packageName, localPackage, packageDir;
+    var command, cw, logger, args, workspacePath, _a, packageMap, sortedPackageNames, filteredPackageNames, _i, filteredPackageNames_1, packageName, localPackage, packageDir;
     return __generator(this, function (_b) {
         switch (_b.label) {
             case 0:
                 command = process.argv[2];
-                logger = new util_1.Logger("workspace:".concat(command));
+                cw = new util_node_1.LogColorWrapper();
+                logger = new util_1.Logger(cw.color('workspace:', logColors_1.primaryLogColor) + cw.color(command, logColors_1.secondaryLogColor));
                 args = getArgs();
                 workspacePath = process.cwd();
                 return [4 /*yield*/, util_node_1.PackageUtil.getWorkspaceMetadata(workspacePath)];
@@ -100,7 +102,7 @@ var workspaceCommand = function () { return __awaiter(void 0, void 0, void 0, fu
                 packageName = filteredPackageNames_1[_i];
                 localPackage = packageMap[packageName];
                 packageDir = path.dirname(localPackage.filePath);
-                return [4 /*yield*/, (0, util_node_1.cmd)('npm', ['run', command], { cwd: packageDir }, { logPrefix: "[".concat(packageName, "] ") })];
+                return [4 /*yield*/, (0, util_node_1.cmd)('npm', ['run', command], { cwd: packageDir }, { logPrefix: "[".concat(cw.color(packageName), "] ") })];
             case 3:
                 _b.sent();
                 _b.label = 4;

package/dist/src/workspaceCommand.js.map

@@ -1 +1 @@
-{"version":3,"file":"workspaceCommand.js","sourceRoot":"","sources":["../../src/workspaceCommand.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"workspaceCommand.js","sourceRoot":"","sources":["../../src/workspaceCommand.ts"],"names":[],"mappings":"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"}

package/dist/src/workspacePackageCommand.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workspacePackageCommand.d.ts","sourceRoot":"","sources":["../../src/workspacePackageCommand.ts"],"names":[],"mappings":"AAIA;;;;;GAKG;AACH,eAAO,MAAM,uBAAuB,qBAenC,CAAA"}
+{"version":3,"file":"workspacePackageCommand.d.ts","sourceRoot":"","sources":["../../src/workspacePackageCommand.ts"],"names":[],"mappings":"AAKA;;;;;GAKG;AACH,eAAO,MAAM,uBAAuB,qBAgBnC,CAAA"}

package/dist/src/workspacePackageCommand.js

@@ -63,6 +63,7 @@ exports.workspacePackageCommand = void 0;
 var path = __importStar(require("path"));
 var util_node_1 = require("@proteinjs/util-node");
 var util_1 = require("@proteinjs/util");
+var logColors_1 = require("./logColors");
 /**
  * Run a command in the directory of the specified package.
  * If running an npm command, this utility re-symlinks dependencies afterwards.
@@ -70,23 +71,24 @@ var util_1 = require("@proteinjs/util");
  * ie: `npx workspace-package @my/package npm i react`
  */
 var workspacePackageCommand = function () { return __awaiter(void 0, void 0, void 0, function () {
-    var packageName, command, args, logger, workspacePath, packageMap, localPackage, packageDir;
+    var packageName, command, args, cw, logger, workspacePath, packageMap, localPackage, packageDir;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
                 packageName = process.argv[2];
                 command = process.argv[3];
                 args = process.argv.slice(4);
-                logger = new util_1.Logger("workspace-package(".concat(packageName, "):").concat(command));
+                cw = new util_node_1.LogColorWrapper();
+                logger = new util_1.Logger("workspace-package(".concat(cw.color(packageName, logColors_1.primaryLogColor), "):").concat(command));
                 workspacePath = process.cwd();
                 return [4 /*yield*/, util_node_1.PackageUtil.getWorkspaceMetadata(workspacePath)];
             case 1:
                 packageMap = (_a.sent()).packageMap;
                 localPackage = packageMap[packageName];
                 if (!localPackage)
-                    throw new Error("Package (".concat(packageName, ") does not exist in workspace: ").concat(workspacePath));
+                    throw new Error("Package (".concat(cw.color(packageName, logColors_1.primaryLogColor), ") does not exist in workspace: ").concat(workspacePath));
                 packageDir = path.dirname(localPackage.filePath);
-                return [4 /*yield*/, (0, util_node_1.cmd)(command, args, { cwd: packageDir }, { logPrefix: "[".concat(packageName, "] ") })];
+                return [4 /*yield*/, (0, util_node_1.cmd)(command, args, { cwd: packageDir }, { logPrefix: "[".concat(cw.color(packageName, logColors_1.primaryLogColor), "] ") })];
             case 2:
                 _a.sent();
                 if (!(command === 'npm')) return [3 /*break*/, 4];

package/dist/src/workspacePackageCommand.js.map

@@ -1 +1 @@
-{"version":3,"file":"workspacePackageCommand.js","sourceRoot":"","sources":["../../src/workspacePackageCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yCAA4B;AAC5B,kDAAuD;AACvD,wCAAwC;AAExC;;;;;GAKG;AACI,IAAM,uBAAuB,GAAG;;;;;gBAC/B,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;gBAC7B,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAC1B,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBAC7B,MAAM,GAAG,IAAI,aAAM,CAAC,4BAAqB,WAAW,eAAK,OAAO,CAAE,CAAC,CAAC;gBACpE,aAAa,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;gBACb,qBAAM,uBAAW,CAAC,oBAAoB,CAAC,aAAa,CAAC,EAAA;;gBAApE,UAAU,GAAK,CAAA,SAAqD,CAAA,WAA1D;gBACZ,YAAY,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC;gBAC7C,IAAI,CAAC,YAAY;oBACf,MAAM,IAAI,KAAK,CAAC,mBAAY,WAAW,4CAAkC,aAAa,CAAE,CAAC,CAAA;gBAErF,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;gBACvD,qBAAM,IAAA,eAAG,EAAC,OAAO,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE,EAAE,EAAE,SAAS,EAAE,WAAI,WAAW,OAAI,EAAE,CAAC,EAAA;;gBAAjF,SAAiF,CAAC;qBAC9E,CAAA,OAAO,KAAK,KAAK,CAAA,EAAjB,wBAAiB;gBACnB,qBAAM,uBAAW,CAAC,mBAAmB,CAAC,YAAY,EAAE,UAAU,EAAE,MAAM,CAAC,EAAA;;gBAAvE,SAAuE,CAAC;;;;;KAC3E,CAAA;AAfY,QAAA,uBAAuB,2BAenC"}
+{"version":3,"file":"workspacePackageCommand.js","sourceRoot":"","sources":["../../src/workspacePackageCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yCAA4B;AAC5B,kDAAwE;AACxE,wCAAwC;AACxC,yCAA6C;AAE7C;;;;;GAKG;AACI,IAAM,uBAAuB,GAAG;;;;;gBAC/B,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;gBAC7B,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAC1B,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBAC7B,EAAE,GAAG,IAAI,2BAAe,EAAE,CAAC;gBAC3B,MAAM,GAAG,IAAI,aAAM,CAAC,4BAAqB,EAAE,CAAC,KAAK,CAAC,WAAW,EAAE,2BAAe,CAAC,eAAK,OAAO,CAAE,CAAC,CAAC;gBAC/F,aAAa,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;gBACb,qBAAM,uBAAW,CAAC,oBAAoB,CAAC,aAAa,CAAC,EAAA;;gBAApE,UAAU,GAAK,CAAA,SAAqD,CAAA,WAA1D;gBACZ,YAAY,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC;gBAC7C,IAAI,CAAC,YAAY;oBACf,MAAM,IAAI,KAAK,CAAC,mBAAY,EAAE,CAAC,KAAK,CAAC,WAAW,EAAE,2BAAe,CAAC,4CAAkC,aAAa,CAAE,CAAC,CAAA;gBAEhH,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;gBACvD,qBAAM,IAAA,eAAG,EAAC,OAAO,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE,EAAE,EAAE,SAAS,EAAE,WAAI,EAAE,CAAC,KAAK,CAAC,WAAW,EAAE,2BAAe,CAAC,OAAI,EAAE,CAAC,EAAA;;gBAA5G,SAA4G,CAAC;qBACzG,CAAA,OAAO,KAAK,KAAK,CAAA,EAAjB,wBAAiB;gBACnB,qBAAM,uBAAW,CAAC,mBAAmB,CAAC,YAAY,EAAE,UAAU,EAAE,MAAM,CAAC,EAAA;;gBAAvE,SAAuE,CAAC;;;;;KAC3E,CAAA;AAhBY,QAAA,uBAAuB,2BAgBnC"}

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@proteinjs/build",
-  "version": "1.1.4",
+  "version": "1.2.0",
   "description": "Workspace build tools",
   "main": "./dist/generated/index.js",
   "types": "./dist/generated/index.d.ts",
   "bin": {
-    "clean-workspace": "dist/src/runCleanWorkspace.js",
-    "build-workspace": "dist/src/runBuildWorkspace.js",
-    "test-workspace": "dist/src/runTestWorkspace.js",
-    "watch-workspace": "dist/src/runWatchWorkspace.js",
-    "workspace": "dist/src/runWorkspaceCommand.js",
-    "version-workspace": "dist/src/runVersionWorkspace.js",
-    "workspace-package": "dist/src/runWorkspacePackageCommand.js"
+    "clean-workspace": "dist/src/bin/runCleanWorkspace.js",
+    "build-workspace": "dist/src/bin/runBuildWorkspace.js",
+    "test-workspace": "dist/src/bin/runTestWorkspace.js",
+    "watch-workspace": "dist/src/bin/runWatchWorkspace.js",
+    "workspace": "dist/src/bin/runWorkspaceCommand.js",
+    "version-workspace": "dist/src/bin/runVersionWorkspace.js",
+    "workspace-package": "dist/src/bin/runWorkspacePackageCommand.js"
   },
   "publishConfig": {
     "access": "public"
@@ -27,7 +27,7 @@
   "author": "Brent Bahry",
   "license": "MIT",
   "scripts": {
-    "clean": "rm -rf dist/ node_modules/ package-lock.json",
+    "clean": "rm -rf dist/ node_modules/",
     "build": "tsc",
     "watch": "tsc -w -p .",
     "build-dist": "tsc && webpack --mode production"
@@ -35,18 +35,21 @@
   "dependencies": {
     "@octokit/core": "6.1.2",
     "@proteinjs/util": "1.1.0",
-    "@proteinjs/util-node": "1.1.0"
+    "@proteinjs/util-node": "1.2.0",
+    "semver": "7.6.0"
   },
   "devDependencies": {
     "@babel/core": "7.23.7",
     "@babel/preset-env": "7.23.8",
     "@types/jest": "29.5.5",
     "@types/node": "14.0.27",
+    "@types/semver": "7.5.8",
     "babel-loader": "9.1.3",
     "jest": "29.7.0",
     "ts-jest": "29.1.1",
     "typescript": "5.2.2",
     "webpack": "5.90.0",
     "webpack-cli": "5.1.4"
-  }
-}
+  },
+  "gitHead": "93d31ea6e722a8e5e926a051f29f2df3e9fac04a"
+}

package/src/bin/runBuildWorkspace.ts

@@ -0,0 +1,5 @@
+#!/usr/bin/env node
+
+import { buildWorkspace } from '../buildWorkspace'
+
+buildWorkspace();

package/src/bin/runCleanWorkspace.ts

@@ -0,0 +1,5 @@
+#!/usr/bin/env node
+
+import { cleanWorkspace } from '../cleanWorkspace'
+
+cleanWorkspace();

package/src/bin/runTestWorkspace.ts

@@ -0,0 +1,5 @@
+#!/usr/bin/env node
+
+import { testWorkspace } from '../testWorkspace'
+
+testWorkspace();

package/src/bin/runVersionWorkspace.ts

@@ -0,0 +1,5 @@
+#!/usr/bin/env node
+
+import { versionWorkspace } from '../versionWorkspace'
+
+versionWorkspace();

package/src/bin/runWatchWorkspace.ts

@@ -0,0 +1,5 @@
+#!/usr/bin/env node
+
+import { watchWorkspace } from '../watchWorkspace'
+
+watchWorkspace();

package/src/bin/runWorkspaceCommand.ts

@@ -0,0 +1,5 @@
+#!/usr/bin/env node
+
+import { workspaceCommand } from '../workspaceCommand'
+
+workspaceCommand();

package/src/bin/runWorkspacePackageCommand.ts

@@ -0,0 +1,5 @@
+#!/usr/bin/env node
+
+import { workspacePackageCommand } from '../workspacePackageCommand'
+
+workspacePackageCommand();

package/src/buildWorkspace.ts

@@ -1,6 +1,7 @@
 import * as path from 'path'
-import { PackageUtil, cmd, parseArgsMap } from '@proteinjs/util-node'
+import { LogColorWrapper, PackageUtil, cmd, parseArgsMap } from '@proteinjs/util-node'
 import { Logger } from '@proteinjs/util'
+import { primaryLogColor, secondaryLogColor } from './logColors'
 
 /**
  * Install and build workspace, in dependency order.
@@ -12,7 +13,8 @@ import { Logger } from '@proteinjs/util'
  * --skip=@some/package,@another/package
  */
 export async function buildWorkspace() {
-  const logger = new Logger('workspace:build');
+  const cw = new LogColorWrapper();
+  const logger = new Logger(cw.color('workspace:', primaryLogColor) + cw.color('build', secondaryLogColor));
   const args = getArgs();
   const workspacePath = process.cwd();
   const { packageMap, sortedPackageNames } = await PackageUtil.getWorkspaceMetadata(workspacePath);
@@ -29,14 +31,14 @@ export async function buildWorkspace() {
     const packageDir = path.dirname(localPackage.filePath);
 
     if (!args.noInstall || !args.noInstall.includes(packageName)) {
-      await cmd('npm', ['install'], { cwd: packageDir }, { logPrefix: `[${packageName}] ` });
+      await cmd('npm', ['install'], { cwd: packageDir }, { logPrefix: `[${cw.color(packageName)}] ` });
       await PackageUtil.symlinkDependencies(localPackage, packageMap, logger);
-      logger.info(`Installed ${packageName} (${packageDir})`);
+      logger.info(`Installed ${cw.color(packageName)} (${packageDir})`);
     }
 
     if (!args.noBuild || !args.noBuild.includes(packageName)) {
-      await cmd('npm', ['run', 'build'], { cwd: packageDir }, { logPrefix: `[${packageName}] ` });
-      logger.info(`Built ${packageName} (${packageDir})`);
+      await cmd('npm', ['run', 'build'], { cwd: packageDir }, { logPrefix: `[${cw.color(packageName)}] ` });
+      logger.info(`Built ${cw.color(packageName)} (${packageDir})`);
     }
   }
 

package/src/cleanWorkspace.ts

@@ -3,7 +3,7 @@ import { PackageUtil, cmd, WorkspaceMetadata } from '@proteinjs/util-node'
 import { Logger } from '@proteinjs/util'
 
 export const cleanWorkspace = async (workspaceMetadata?: WorkspaceMetadata) => {
-  const logger = new Logger('cleanWorkspace');
+  const logger = new Logger('workspace:clean');
   const workspacePath = process.cwd();
   const { packageMap, sortedPackageNames } = workspaceMetadata ? workspaceMetadata : await PackageUtil.getWorkspaceMetadata(workspacePath);
   const filteredPackageNames = sortedPackageNames.filter(packageName => !!packageMap[packageName].packageJson.scripts?.clean);

package/src/logColors.ts

@@ -0,0 +1,2 @@
+export const primaryLogColor = { r: 81, g: 0, b: 135 };
+export const secondaryLogColor = { r: 253, g: 197, b: 0 };

package/src/testWorkspace.ts

@@ -3,7 +3,7 @@ import { PackageUtil, cmd, WorkspaceMetadata } from '@proteinjs/util-node'
 import { Logger } from '@proteinjs/util'
 
 export const testWorkspace = async (workspaceMetadata?: WorkspaceMetadata) => {
-  const logger = new Logger('testWorkspace');
+  const logger = new Logger('workspace:test');
   const workspacePath = process.cwd();
   const { packageMap, sortedPackageNames } = workspaceMetadata ? workspaceMetadata : await PackageUtil.getWorkspaceMetadata(workspacePath);
   const filteredPackageNames = sortedPackageNames.filter(packageName => !!packageMap[packageName].packageJson.scripts?.test);

package/src/versionWorkspace.ts

@@ -1,10 +1,14 @@
 import * as path from 'path'
 import { exec } from 'child_process'
-import { LocalPackage, LocalPackageMap, PackageUtil, cmd, Fs } from '@proteinjs/util-node'
+import { LocalPackage, LocalPackageMap, PackageUtil, cmd, Fs, LogColorWrapper } from '@proteinjs/util-node'
 import { Logger } from '@proteinjs/util'
+import semver from 'semver'
 import { Commit } from './Github'
+import { primaryLogColor, secondaryLogColor } from './logColors'
 
-const logger = new Logger('workspace:version');
+const cw = new LogColorWrapper();
+const logger = new Logger(cw.color('workspace:', primaryLogColor) + cw.color('version', secondaryLogColor));
+const fixedVersionWorkspacesToVersion: {[workspacePath: string]: boolean} = {};
 
 export async function versionWorkspace() {
   // fail fast if npm token is not available
@@ -12,7 +16,7 @@ export async function versionWorkspace() {
 
   const workspacePath = process.cwd();
   await pullWorkspace(workspacePath);
-  const { packageMap, packageGraph, sortedPackageNames } = await PackageUtil.getWorkspaceMetadata(workspacePath);
+  const { packageMap, packageGraph, sortedPackageNames, workspaceToPackageMap } = await PackageUtil.getWorkspaceMetadata(workspacePath);
   const filteredPackageNames = sortedPackageNames.filter(packageName => {
     const localPackage = packageMap[packageName];
     return !!localPackage.packageJson.scripts?.clean
@@ -29,19 +33,20 @@ export async function versionWorkspace() {
       continue;
 
     await buildAndTest(localPackage);
-    await push(localPackage);
+    if (localPackage.workspace?.lernaJson?.version === 'fixed') {
+      fixedVersionWorkspacesToVersion[localPackage.workspace.path] = true;
+      logger.info(`(${cw.color(packageName)}) skipping version push for package in a fixed-version workspace`);
+      continue;
+    }
+
+    await pushAndTag(localPackage);
     if (!localPackage.packageJson.private && localPackage.packageJson.publishConfig?.access === 'public')
       await publish(localPackage);
   }
 
+  await syncFixedVersionWorkspaces(Object.keys(fixedVersionWorkspacesToVersion), packageMap, workspaceToPackageMap);
   await pushMetarepos(workspacePath);
-  logger.info(`> Symlinking local dependencies in workspace (${workspacePath})`);
-  for (let packageName of filteredPackageNames) {
-    const localPackage = packageMap[packageName];
-    await PackageUtil.symlinkDependencies(localPackage, packageMap, logger);
-  }
-
-  logger.info(`> Symlinked local dependencies in workspace (${workspacePath})`);
+  await symlinkWorkspace(workspacePath, filteredPackageNames, packageMap);
   logger.info(`> Finished versioning workspace (${workspacePath})`);
 }
 
@@ -75,7 +80,7 @@ async function bumpDependencies(localPackage: LocalPackage, packageMap: LocalPac
     const localDependencyVersion = localDependencyPackage.packageJson.version as string;
     const currentDependencyVersion = getDependencyVersion(localDependency, localPackage);
     if (!currentDependencyVersion)
-      throw new Error(`Package (${localPackage.name}) has dependency on ${localDependency}, but cannot find version in ${localPackage.name}'s package.json`);
+      throw new Error(`Package (${cw.color(localPackage.name)}) has dependency on ${localDependency}, but cannot find version in ${cw.color(localPackage.name)}'s package.json`);
 
     if (currentDependencyVersion.isLocalPath)
       continue;
@@ -89,10 +94,9 @@ async function bumpDependencies(localPackage: LocalPackage, packageMap: LocalPac
   }
 
   if (dependenciesChanged) {
-    const bumpPatchVersion = (version: string) => version.replace(/(\d+)\.(\d+)\.(\d+)$/, (_, major, minor, patch) => `${major}.${minor}.${parseInt(patch, 10) + 1}`);
     const currentVersion = localPackage.packageJson.version;
-    localPackage.packageJson.version = bumpPatchVersion(currentVersion);
-    logger.info(`(${localPackage.name}) bumping version from ${currentVersion} -> ${localPackage.packageJson.version}`);
+    localPackage.packageJson.version = semver.inc(currentVersion, 'patch');
+    logger.info(`(${cw.color(localPackage.name)}) bumping version from ${currentVersion} -> ${localPackage.packageJson.version}`);
     await Fs.writeFiles([{ path: localPackage.filePath, content: JSON.stringify(localPackage.packageJson, null, 2) }]);
   }
 
@@ -124,42 +128,120 @@ function setDependencyVersion(dependencyPackageName: string, currentVersion: Dep
     localPackage.packageJson.devDependencies[dependencyPackageName] = newRawVersion;
 
   const currentRawVersion = currentVersion.prefix ? currentVersion.prefix + currentVersion.version : currentVersion.version;
-  logger.info(`(${localPackage.name}) updating dependency version of ${dependencyPackageName} (${currentRawVersion} -> ${newRawVersion})`);
+  logger.info(`(${cw.color(localPackage.name)}) updating dependency version of ${cw.color(dependencyPackageName)} (${currentRawVersion} -> ${newRawVersion})`);
+}
+
+async function syncFixedVersionWorkspaces(fixedVersionWorkspacePaths: string[], packageMap: LocalPackageMap, workspaceToPackageMap: {[workspacePath: string]: string[]}) {
+  if (fixedVersionWorkspacePaths.length == 0)
+    return;
+
+  logger.info(`> Syncing fixed-version workspaces`);
+  for (let workspacePath of fixedVersionWorkspacePaths) {
+    const workspacePackages = workspaceToPackageMap[workspacePath]
+      .filter(packageName => packageName != 'typescript-parser')
+      .map(packageName => packageMap[packageName])
+    ;
+    if (workspacePackages.length == 0)
+      continue;
+
+    const syncedVersion = await syncFixedVersions(workspacePackages);
+    if (!syncedVersion)
+      continue;
+
+    await pushAndTagFixedVersionRepo(workspacePath, syncedVersion);
+  }
+
+  logger.info(`> Synced fixed-version workspaces`);
+}
+
+async function syncFixedVersions(localPackages: LocalPackage[]): Promise<string|false> {
+  let highestVersion: string|undefined;
+  for (let localPackage of localPackages) {
+    if (!highestVersion) {
+      highestVersion = localPackage.packageJson.version;
+      continue;
+    }
+
+    if (semver.gt(localPackage.packageJson.version, highestVersion))
+      highestVersion = localPackage.packageJson.version;
+  }
+
+  if (!highestVersion)
+    throw new Error(`Unable to find version for packages`);
+
+  let syncedFixedVersions = false;
+  for (let localPackage of localPackages) {
+    const currentVersion = localPackage.packageJson.version;
+    if (currentVersion === highestVersion)
+      continue;
+
+    localPackage.packageJson.version = highestVersion;
+    logger.info(`(${cw.color(localPackage.name)}) bumping version from ${currentVersion} -> ${localPackage.packageJson.version}`);
+    await Fs.writeFiles([{ path: localPackage.filePath, content: JSON.stringify(localPackage.packageJson, null, 2) }]);
+    syncedFixedVersions = true;
+  }
+
+  return syncedFixedVersions ? highestVersion : false;
 }
 
 async function buildAndTest(localPackage: LocalPackage) {
   const packageDir = path.dirname(localPackage.filePath);
-  await cmd('npm', ['run', 'clean'], { cwd: packageDir }, { logPrefix: `[${localPackage.name}] ` });
-  logger.info(`(${localPackage.name}) cleaned package (${packageDir})`);
-  await cmd('npm', ['install'], { cwd: packageDir }, { logPrefix: `[${localPackage.name}] ` });
-  logger.info(`(${localPackage.name}) installed latest dependency versions (${packageDir})`);
-  await cmd('npm', ['run', 'build'], { cwd: packageDir }, { logPrefix: `[${localPackage.name}] ` });
-  logger.info(`(${localPackage.name}) built version ${localPackage.packageJson.version} (${packageDir})`);
+  logger.info(`(${cw.color(localPackage.name)}) cleaning package (${packageDir})`);
+  await cmd('npm', ['run', 'clean'], { cwd: packageDir }, { logPrefix: `[${cw.color(localPackage.name)}] ` });
+  logger.info(`(${cw.color(localPackage.name)}) cleaned package (${packageDir})`);
+  logger.info(`(${cw.color(localPackage.name)}) installing latest dependency versions (${packageDir})`);
+  await cmd('npm', ['install'], { cwd: packageDir }, { logPrefix: `[${cw.color(localPackage.name)}] ` });
+  logger.info(`(${cw.color(localPackage.name)}) installed latest dependency versions (${packageDir})`);
+  logger.info(`(${cw.color(localPackage.name)}) building version ${localPackage.packageJson.version} (${packageDir})`);
+  await cmd('npm', ['run', 'build'], { cwd: packageDir }, { logPrefix: `[${cw.color(localPackage.name)}] ` });
+  logger.info(`(${cw.color(localPackage.name)}) built version ${localPackage.packageJson.version} (${packageDir})`);
   if (localPackage.packageJson.scripts?.test) {
-    await cmd('npm', ['run', 'test'], { cwd: packageDir }, { logPrefix: `[${localPackage.name}] ` });
-    logger.info(`(${localPackage.name}) tested version ${localPackage.packageJson.version} (${packageDir})`);
+    logger.info(`(${cw.color(localPackage.name)}) testing version ${localPackage.packageJson.version} (${packageDir})`);
+    await cmd('npm', ['run', 'test'], { cwd: packageDir }, { logPrefix: `[${cw.color(localPackage.name)}] ` });
+    logger.info(`(${cw.color(localPackage.name)}) tested version ${localPackage.packageJson.version} (${packageDir})`);
   }
 }
 
 async function pull(localPackage: LocalPackage) {
   const packageDir = path.dirname(localPackage.filePath);
-  await cmd('git', ['pull'], { cwd: packageDir }, { logPrefix: `[${localPackage.name}] ` });
-  logger.info(`(${localPackage.name}) pulled latest changes`);
+  logger.info(`(${cw.color(localPackage.name)}) pulling latest changes`);
+  await cmd('git', ['pull'], { cwd: packageDir }, { logPrefix: `[${cw.color(localPackage.name)}] ` });
+  logger.info(`(${cw.color(localPackage.name)}) pulled latest changes`);
 }
 
-async function push(localPackage: LocalPackage): Promise<Commit> {
+async function pushAndTag(localPackage: LocalPackage): Promise<Commit> {
   const packageDir = path.dirname(localPackage.filePath);
-  await cmd('git', ['add', '.'], { cwd: packageDir }, { logPrefix: `[${localPackage.name}] ` });
-  await cmd('git', ['commit', '-m', `chore(version): bumping dependency versions for ${localPackage.name} [skip ci]`], { cwd: packageDir }, { logPrefix: `[${localPackage.name}] ` });
-  await cmd('git', ['push'], { cwd: packageDir }, { logPrefix: `[${localPackage.name}] ` });
-  logger.info(`(${localPackage.name}) pushed latest version (${localPackage.packageJson.version})`);
+  logger.info(`(${cw.color(localPackage.name)}) pushing latest version (${localPackage.packageJson.version})`);
+  await cmd('git', ['add', '.'], { cwd: packageDir }, { logPrefix: `[${cw.color(localPackage.name)}] ` });
+  await cmd('git', ['commit', '-m', `chore(version): bumping dependency versions for ${cw.color(localPackage.name)} [skip ci]`], { cwd: packageDir }, { logPrefix: `[${cw.color(localPackage.name)}] ` });
+  await cmd('git', ['push'], { cwd: packageDir }, { logPrefix: `[${cw.color(localPackage.name)}] ` });
+  logger.info(`(${cw.color(localPackage.name)}) pushed latest version (${localPackage.packageJson.version})`);
   const latestCommitSha = await getLatestCommitSha(packageDir);
   const repoInfo = await getRepoInfo(packageDir);
   const commit = { sha: latestCommitSha, ...repoInfo };
   const tagName = `${localPackage.name}@${localPackage.packageJson.version}`;
-  await cmd('git', ['tag', '-a', tagName, '-m', `Release ${tagName}`], { cwd: packageDir }, { logPrefix: `[${localPackage.name}] ` });
-  await cmd('git', ['push', 'origin', tagName], { cwd: packageDir }, { logPrefix: `[${localPackage.name}] ` });
-  logger.info(`(${localPackage.name}) pushed tag (${tagName})`);
+  logger.info(`(${cw.color(localPackage.name)}) pushing tag (${tagName})`);
+  await cmd('git', ['tag', '-a', tagName, '-m', `Release ${tagName}`], { cwd: packageDir }, { logPrefix: `[${cw.color(localPackage.name)}] ` });
+  await cmd('git', ['push', 'origin', tagName], { cwd: packageDir }, { logPrefix: `[${cw.color(localPackage.name)}] ` });
+  logger.info(`(${cw.color(localPackage.name)}) pushed tag (${tagName})`);
+  return commit;
+}
+
+async function pushAndTagFixedVersionRepo(dir: string, version: string): Promise<Commit> {
+  const repoName = path.basename(dir.endsWith(path.sep) ? dir.slice(0, -1) : dir);
+  logger.info(`(${cw.color(repoName)}) pushing latest version (${version})`);
+  await cmd('git', ['add', '.'], { cwd: dir }, { logPrefix: `[${cw.color(repoName)}] ` });
+  await cmd('git', ['commit', '-m', `chore(version): bumping dependency versions [skip ci]`], { cwd: dir }, { logPrefix: `[${cw.color(repoName)}] ` });
+  await cmd('git', ['push'], { cwd: dir }, { logPrefix: `[${cw.color(repoName)}] ` });
+  logger.info(`(${cw.color(repoName)}) pushed latest version (${version})`);
+  const latestCommitSha = await getLatestCommitSha(dir);
+  const repoInfo = await getRepoInfo(dir);
+  const commit = { sha: latestCommitSha, ...repoInfo };
+  const tagName = `v${version}`;
+  logger.info(`(${cw.color(repoName)}) pushing tag (${tagName})`);
+  await cmd('git', ['tag', '-a', tagName, '-m', `Release ${tagName}`], { cwd: dir }, { logPrefix: `[${cw.color(repoName)}] ` });
+  await cmd('git', ['push', 'origin', tagName], { cwd: dir }, { logPrefix: `[${cw.color(repoName)}] ` });
+  logger.info(`(${cw.color(repoName)}) pushed tag (${tagName})`);
   return commit;
 }
 
@@ -173,10 +255,23 @@ async function pushMetarepos(dir: string) {
 }
 
 async function pushMetarepo(dir: string) {
-  await cmd('git', ['add', '.'], { cwd: dir }, { logPrefix: `[workspace] ` });
-  await cmd('git', ['commit', '-m', `chore(version): bumping submodule versions [skip ci]`], { cwd: dir }, { logPrefix: `[workspace] ` });
-  await cmd('git', ['push'], { cwd: dir }, { logPrefix: `[workspace] ` });
-  logger.info(`(workspace) pushed metarepo (${dir})`);
+  const repoName = path.basename(dir.endsWith(path.sep) ? dir.slice(0, -1) : dir);
+  logger.info(`(${cw.color(repoName)}) pushing metarepo (${dir})`);
+  await cmd('git', ['add', '.'], { cwd: dir }, { logPrefix: `[${cw.color(repoName)}] ` });
+  await cmd('git', ['commit', '-m', `chore(version): bumping submodule versions [skip ci]`], { cwd: dir }, { logPrefix: `[${cw.color(repoName)}] ` });
+  await cmd('git', ['pull'], { cwd: dir }, { logPrefix: `[${cw.color(repoName)}] ` });
+  await cmd('git', ['push'], { cwd: dir }, { logPrefix: `[${cw.color(repoName)}] ` });
+  logger.info(`(${cw.color(repoName)}) pushed metarepo (${dir})`);
+}
+
+async function symlinkWorkspace(workspacePath: string, packageNames: string[], packageMap: LocalPackageMap) {
+  logger.info(`> Symlinking local dependencies in workspace (${workspacePath})`);
+  for (let packageName of packageNames) {
+    const localPackage = packageMap[packageName];
+    await PackageUtil.symlinkDependencies(localPackage, packageMap, logger);
+  }
+
+  logger.info(`> Symlinked local dependencies in workspace (${workspacePath})`);
 }
 
 async function getLatestCommitSha(dir: string): Promise<string> {
@@ -223,19 +318,20 @@ async function getRepoInfo(dir: string): Promise<RepoInfo> {
 
 async function publish(localPackage: LocalPackage) {
   if (localPackage.packageJson.private) {
-    logger.info(`Preventing publish of private package: ${localPackage.name}`);
+    logger.info(`Preventing publish of private package: ${cw.color(localPackage.name)}`);
     return;
   }
 
   if (!localPackage.name.startsWith('@proteinjs/')) {
-    logger.warn(`Preventing publish of non-proteinjs package: ${localPackage.name}`);
+    logger.warn(`Preventing publish of non-proteinjs package: ${cw.color(localPackage.name)}`);
     return;
   }
 
   const packageDir = path.dirname(localPackage.filePath);
-  await cmd('npm', ['set', `//registry.npmjs.org/:_authToken=${getNpmToken()}`], { cwd: packageDir }, { logPrefix: `[${localPackage.name}] ` });
-  await cmd('npm', ['publish', '--tag', 'latest', '--access', 'public'], { cwd: packageDir }, { logPrefix: `[${localPackage.name}] ` });
-  logger.info(`(${localPackage.name}) published latest version (${localPackage.packageJson.version})`);
+  logger.info(`(${cw.color(localPackage.name)}) publishing latest version (${localPackage.packageJson.version})`);
+  await cmd('npm', ['set', `//registry.npmjs.org/:_authToken=${getNpmToken()}`], { cwd: packageDir }, { logPrefix: `[${cw.color(localPackage.name)}] ` });
+  await cmd('npm', ['publish', '--tag', 'latest', '--access', 'public'], { cwd: packageDir }, { logPrefix: `[${cw.color(localPackage.name)}] ` });
+  logger.info(`(${cw.color(localPackage.name)}) published latest version (${localPackage.packageJson.version})`);
 }
 
 function getNpmToken() {

package/src/watchWorkspace.ts

@@ -1,9 +1,11 @@
 import * as path from 'path'
-import { PackageUtil, WorkspaceMetadata, cmd } from '@proteinjs/util-node'
+import { PackageUtil, WorkspaceMetadata, cmd, LogColorWrapper } from '@proteinjs/util-node'
 import { Logger } from '@proteinjs/util'
+import { primaryLogColor, secondaryLogColor } from './logColors';
 
 export const watchWorkspace = async (workspaceMetadata?: WorkspaceMetadata) => {
-  const logger = new Logger('watchWorkspace');
+  const cw = new LogColorWrapper();
+  const logger = new Logger(cw.color('workspace:', primaryLogColor) + cw.color('watch', secondaryLogColor));
   const workspacePath = process.cwd();
   const { packageMap, sortedPackageNames } = workspaceMetadata ? workspaceMetadata : await PackageUtil.getWorkspaceMetadata(workspacePath);
   const filteredPackageNames = sortedPackageNames.filter(packageName => !!packageMap[packageName].packageJson.scripts?.watch);
@@ -15,7 +17,7 @@ export const watchWorkspace = async (workspaceMetadata?: WorkspaceMetadata) => {
     const packageDir = path.dirname(localPackage.filePath);
     const loggingEnabledState = { loggingEnabled: false };
     setTimeout(() => loggingEnabledState.loggingEnabled = true, loggingStartDelay);
-    const logPrefix = `[${packageName}] `;
+    const logPrefix = `[${cw.color(packageName)}] `;
     let inMultiLineLog = false;
     const stdoutFilter = (log: string) => {
       if (log.includes('File change detected. Starting incremental compilation'))

package/src/workspaceCommand.ts

@@ -1,6 +1,7 @@
 import * as path from 'path'
-import { LocalPackageMap, PackageUtil, cmd, parseArgsMap } from '@proteinjs/util-node'
+import { LocalPackageMap, LogColorWrapper, PackageUtil, cmd, parseArgsMap } from '@proteinjs/util-node'
 import { Logger } from '@proteinjs/util'
+import { primaryLogColor, secondaryLogColor } from './logColors'
 
 /**
  * Run a npm command against all packages in the workspace, in dependency order.
@@ -13,7 +14,8 @@ import { Logger } from '@proteinjs/util'
  */
 export const workspaceCommand = async () => {
   const command = process.argv[2]
-  const logger = new Logger(`workspace:${command}`);
+  const cw = new LogColorWrapper();
+  const logger = new Logger(cw.color('workspace:', primaryLogColor) + cw.color(command, secondaryLogColor));
   const args = getArgs();
   const workspacePath = process.cwd();
   const { packageMap, sortedPackageNames } = await PackageUtil.getWorkspaceMetadata(workspacePath);
@@ -30,7 +32,7 @@ export const workspaceCommand = async () => {
   for (let packageName of filteredPackageNames) {
     const localPackage = packageMap[packageName];
     const packageDir = path.dirname(localPackage.filePath);
-    await cmd('npm', ['run', command], { cwd: packageDir }, { logPrefix: `[${packageName}] ` });
+    await cmd('npm', ['run', command], { cwd: packageDir }, { logPrefix: `[${cw.color(packageName)}] ` });
   }
   logger.info(`> Ran \`npm run ${command}\` for ${filteredPackageNames.length} package${filteredPackageNames.length != 1 ? 's' : ''} in workspace (${workspacePath})`);
 }

package/src/workspacePackageCommand.ts

@@ -1,6 +1,7 @@
 import * as path from 'path'
-import { PackageUtil, cmd } from '@proteinjs/util-node'
+import { LogColorWrapper, PackageUtil, cmd } from '@proteinjs/util-node'
 import { Logger } from '@proteinjs/util'
+import { primaryLogColor } from './logColors'
 
 /**
  * Run a command in the directory of the specified package.
@@ -12,15 +13,16 @@ export const workspacePackageCommand = async () => {
   const packageName = process.argv[2]
   const command = process.argv[3];
   const args = process.argv.slice(4);
-  const logger = new Logger(`workspace-package(${packageName}):${command}`);
+  const cw = new LogColorWrapper();
+  const logger = new Logger(`workspace-package(${cw.color(packageName, primaryLogColor)}):${command}`);
   const workspacePath = process.cwd();
   const { packageMap } = await PackageUtil.getWorkspaceMetadata(workspacePath);
   const localPackage = packageMap[packageName];
   if (!localPackage)
-    throw new Error(`Package (${packageName}) does not exist in workspace: ${workspacePath}`)
+    throw new Error(`Package (${cw.color(packageName, primaryLogColor)}) does not exist in workspace: ${workspacePath}`)
   
   const packageDir = path.dirname(localPackage.filePath);
-  await cmd(command, args, { cwd: packageDir }, { logPrefix: `[${packageName}] ` });
+  await cmd(command, args, { cwd: packageDir }, { logPrefix: `[${cw.color(packageName, primaryLogColor)}] ` });
   if (command === 'npm')
     await PackageUtil.symlinkDependencies(localPackage, packageMap, logger);
 }