From 414379b5fa2ca3ea00d57bedc328a3b66fe3b021 Mon Sep 17 00:00:00 2001
From: Martin Hochel <martinhochel@microsoft.com>
Date: Wed, 3 Jan 2024 12:10:48 +0100
Subject: [PATCH 1/5] chore(srcipts-executors): remove scripts that use lerna
 to run task which are redundant and replaced by nx

---
 package.json                 |   3 --
 scripts/executors/buildTo.js |  31 -----------
 scripts/executors/runTo.js   | 101 -----------------------------------
 3 files changed, 135 deletions(-)
 delete mode 100644 scripts/executors/buildTo.js
 delete mode 100644 scripts/executors/runTo.js

diff --git a/package.json b/package.json
index 057639a2066a11..e3e68660a761a9 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,6 @@
     "buildci": "lage build test lint type-check test-ssr verify-packaging --verbose",
     "builddemo": "yarn build --to public-docsite-resources",
     "buildto": "lage build --verbose --to",
-    "buildto:lerna": "node ./scripts/executors/buildTo.js",
     "bundle": "lage bundle --verbose",
     "change": "beachball change --no-commit",
     "check:change": "beachball check",
@@ -36,7 +35,6 @@
     "generate-version-files": "node -r ./scripts/ts-node/register ./scripts/generators/generate-version-files",
     "lint": "lage lint --verbose",
     "lint:log": "FORCE_COLOR=0 yarn lint > lint.log 2>&1",
-    "lint:log:lerna": "FORCE_COLOR=0 lerna run lint --stream --no-bail > lint.log 2>&1",
     "perf": "yarn workspace @fluentui/perf perf:test",
     "perf:debug": "yarn workspace @fluentui/perf perf:test:debug",
     "postinstall": "node ./scripts/package-manager/postinstall.js",
@@ -50,7 +48,6 @@
     "release:fluentui:post-validation": "node -r ./scripts/ts-node/register ./scripts/fluentui-publish post-publish",
     "rename-package": "node -r ./scripts/ts-node/register ./scripts/generators/rename-package.ts",
     "run:published": "node ./scripts/executors/runPublished.js",
-    "runto:lerna": "node ./scripts/executors/runTo.js",
     "scrub": "node ./scripts/executors/scrub.js",
     "start": "node ./scripts/executors/start.js",
     "start:northstar": "yarn workspace @fluentui/docs start",
diff --git a/scripts/executors/buildTo.js b/scripts/executors/buildTo.js
deleted file mode 100644
index 2f256d756f8efe..00000000000000
--- a/scripts/executors/buildTo.js
+++ /dev/null
@@ -1,31 +0,0 @@
-const { runTo } = require('./runTo');
-
-const isExecutedFromCli = require.main === module;
-
-function main() {
-  const argv = process.argv.slice(2);
-
-  // Display a usage message when there are no projects specified
-  if (argv.length < 1) {
-    console.log(`Usage:
-
-  yarn buildto <packagename1> [<packagename2> ...] [<args>]
-
-This command builds all packages up to and including "packagename1" (and "packagename2" etc).
-The package name can be a substring.
-If multiple packages match a pattern, they will all be built (along with their dependencies).
-`);
-
-    process.exit(0);
-  }
-
-  const restIndex = argv.findIndex(arg => arg.startsWith('--'));
-  const projects = restIndex === -1 ? argv : argv.slice(0, restIndex);
-  const rest = restIndex === -1 ? [] : argv.slice(argv[restIndex] === '--' ? restIndex + 1 : restIndex);
-
-  runTo('build', projects, rest);
-}
-
-if (isExecutedFromCli) {
-  main();
-}
diff --git a/scripts/executors/runTo.js b/scripts/executors/runTo.js
deleted file mode 100644
index 87314390da8b22..00000000000000
--- a/scripts/executors/runTo.js
+++ /dev/null
@@ -1,101 +0,0 @@
-const { spawnSync } = require('child_process');
-const lernaBin = require.resolve('lerna/cli.js');
-const os = require('os');
-
-const { getAllPackageInfo } = require('@fluentui/scripts-monorepo');
-
-const isExecutedFromCli = require.main === module;
-
-/**
- * @param {string} script - Script to run
- * @param {string[]} projects - Projects to run in
- * @param {string[]} rest - Args to pass on
- * @returns {void}
- */
-function runTo(script, projects, rest) {
-  // This script matches substrings of the input for one more many projects
-  const allPackages = getAllPackageInfo();
-
-  const foundProjects = /** @type {string[]} */ ([]);
-
-  for (const project of projects) {
-    if (allPackages[project]) {
-      foundProjects.push(project);
-    } else {
-      const packagesForProject = Object.keys(allPackages).filter(name => name.includes(project));
-      if (packagesForProject.length === 0) {
-        console.log(`There is no project matching "${project}" in this repo`);
-      } else if (packagesForProject.length > 1) {
-        console.log(`More than one project matched: "${packagesForProject.join('", "')}"`);
-      } else {
-        console.log(`Found a matching project named "${packagesForProject[0]}"`);
-      }
-      foundProjects.push(...packagesForProject);
-    }
-  }
-
-  /**
-   * @type {string[]}
-   */
-  const scopes = [];
-  foundProjects.forEach(projectName => {
-    // --scope limits build to a specified package
-    scopes.push('--scope');
-    scopes.push(projectName);
-  });
-
-  // --include-filtered-Dependencies makes the build include dependencies
-  // --stream allows the build to proceed in parallel but still in order
-  const result = spawnSync(
-    process.execPath,
-    [
-      lernaBin,
-      'run',
-      script,
-      ...scopes,
-      '--include-filtered-dependencies', // makes the build include dependencies
-      '--stream', // run in parallel but still in order
-      // Except when running in PR/CI, reduce concurrency so the computer is usable while building
-      ...(process.env.TF_BUILD ? [] : ['--concurrency=' + (os.cpus().length - 2)]),
-      '--',
-      ...rest,
-    ],
-    {
-      stdio: 'inherit',
-    },
-  );
-
-  if (result.status !== 0) {
-    process.exit(result.status ?? undefined);
-  }
-}
-
-function main() {
-  const argv = process.argv.slice(2);
-  // Display a usage message when there are no projects specified
-  if (argv.length < 2) {
-    console.log(`Usage:
-
-  yarn runto <script> <packagename1> [<packagename2> ...] [<args>]
-
-This command runs <script> for all packages up to and including "packagename1" (and "packagename2" etc).
-The package name can be a substring.
-If multiple packages match a pattern, they will all be built (along with their dependencies).
-`);
-
-    process.exit(0);
-  }
-
-  const restIndex = argv.findIndex(arg => arg.startsWith('--'));
-  const script = argv[0];
-  const projects = restIndex === -1 ? argv.slice(1) : argv.slice(1, restIndex);
-  const rest = restIndex === -1 ? [] : argv.slice(argv[restIndex] === '--' ? restIndex + 1 : restIndex);
-
-  runTo(script, projects, rest);
-}
-
-if (isExecutedFromCli) {
-  main();
-}
-
-exports.runTo = runTo;

From c1715bf44c2ee7acd4cea0d9d7de1be670757d84 Mon Sep 17 00:00:00 2001
From: Martin Hochel <martinhochel@microsoft.com>
Date: Wed, 3 Jan 2024 13:49:14 +0100
Subject: [PATCH 2/5] feat(scripts-fluentui-publish): upgrade script to proper
 cli tool

---
 azure-pipelines.release-fluentui.yml |  6 +-
 package.json                         |  6 +-
 scripts/fluentui-publish/index.ts    | 87 +++++++++++++++++++---------
 3 files changed, 62 insertions(+), 37 deletions(-)

diff --git a/azure-pipelines.release-fluentui.yml b/azure-pipelines.release-fluentui.yml
index 7cdbf4052ef663..26841ea18455a3 100644
--- a/azure-pipelines.release-fluentui.yml
+++ b/azure-pipelines.release-fluentui.yml
@@ -103,7 +103,7 @@ extends:
                     today=`date +%Y-%m-%d`
                     echo date today $today
                     echo "##vso[task.setvariable variable=date]$today"
-                    yarn release:fluentui:pack-nightly
+                    yarn northstar:release pack-nightly
 
               - task: AzureUpload@2
                 displayName: '[Nightly] Upload tarballs'
@@ -132,9 +132,7 @@ extends:
                     echo "registry=https://registry.npmjs.org/" >> packages/fluentui/.npmrc
                     echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" >> packages/fluentui/.npmrc
 
-                    yarn release:fluentui:$(releaseVersion) --yes
-
-                    yarn release:fluentui:post-validation
+                    yarn northstar:release bump $(releaseVersion) --yes
 
               - template: .devops/templates/cleanup.yml@self
 
diff --git a/package.json b/package.json
index e3e68660a761a9..687c7313945e7b 100644
--- a/package.json
+++ b/package.json
@@ -41,11 +41,7 @@
     "preinstall": "node ./scripts/package-manager/use-yarn-please.js",
     "publish:beachball": "beachball publish -b origin/master --access public -y",
     "rebuild": "node ./scripts/executors/invalidate-just-cache.js && yarn build --reset-cache",
-    "release:fluentui:canary": "node -r ./scripts/ts-node/register ./scripts/fluentui-publish publish-canary",
-    "release:fluentui:minor": "node -r ./scripts/ts-node/register ./scripts/fluentui-publish publish-minor",
-    "release:fluentui:pack-nightly": "node -r ./scripts/ts-node/register ./scripts/fluentui-publish pack-nightly",
-    "release:fluentui:patch": "node -r ./scripts/ts-node/register ./scripts/fluentui-publish publish-patch",
-    "release:fluentui:post-validation": "node -r ./scripts/ts-node/register ./scripts/fluentui-publish post-publish",
+    "northstar:release": "node -r ./scripts/ts-node/register ./scripts/fluentui-publish",
     "rename-package": "node -r ./scripts/ts-node/register ./scripts/generators/rename-package.ts",
     "run:published": "node ./scripts/executors/runPublished.js",
     "scrub": "node ./scripts/executors/scrub.js",
diff --git a/scripts/fluentui-publish/index.ts b/scripts/fluentui-publish/index.ts
index a6a968189e5897..e351c3ef194c36 100644
--- a/scripts/fluentui-publish/index.ts
+++ b/scripts/fluentui-publish/index.ts
@@ -1,9 +1,11 @@
 import { spawnSync } from 'child_process';
-import * as path from 'path';
 import * as fs from 'fs';
-import { argv } from 'yargs';
+import * as path from 'path';
 
-import { findGitRoot, PackageJson } from '@fluentui/scripts-monorepo';
+import { type PackageJson, findGitRoot } from '@fluentui/scripts-monorepo';
+import * as yargs from 'yargs';
+
+main();
 
 function fluentuiLernaPublish(bumpType: 'patch' | 'minor' | 'canary', skipConfirm = false, npmTagForCanary = 'beta') {
   const gitRoot = findGitRoot();
@@ -16,13 +18,13 @@ function fluentuiLernaPublish(bumpType: 'patch' | 'minor' | 'canary', skipConfir
       lernaPublishArgs = [
         'lerna',
         'publish',
+        bumpType,
         "--tag-version-prefix='@fluentui/react-northstar_v'", // HEADS UP: also see yarn stats:save in azure-pipelines.perf-test.yml
         '--no-git-reset',
         '--force-publish',
         '--registry',
         'https://registry.npmjs.org',
         '--no-verify-access', // Lerna doesn't work with NPM automation tokens (https://github.com/lerna/lerna/issues/2788)
-        bumpType,
       ];
       break;
     case 'canary':
@@ -164,33 +166,62 @@ function packFluentTarballs() {
 /**
  * publish CLI for @fluentui/react-northstar
  */
-function run() {
-  const task = argv._[0];
-  const skipConfirm = !!argv.yes;
-  const tag = argv['dist-tag'] as string;
-
-  switch (task) {
-    case 'pack-nightly':
-      packFluentTarballs();
-      break;
-    case 'publish-canary':
-      fluentuiLernaPublish('canary', skipConfirm, tag);
-      break;
+function main() {
+  const args = processArgs();
+  const command = args._[0];
 
-    case 'publish-patch':
-      fluentuiLernaPublish('patch', skipConfirm);
-      break;
+  if (command === 'pack-nightly') {
+    packFluentTarballs();
+    return;
+  }
 
-    case 'publish-minor':
-      fluentuiLernaPublish('minor', skipConfirm);
-      break;
+  if (command === 'bump') {
+    const { semverType, yes, distTag, postValidate } = args as unknown as {
+      semverType: 'patch' | 'minor' | 'canary';
+      distTag?: string;
+      yes: boolean;
+      postValidate: boolean;
+    };
 
-    case 'post-publish':
-      fluentuiPostPublishValidation();
-      break;
+    fluentuiLernaPublish(semverType, yes, distTag);
+    postValidate && fluentuiPostPublishValidation();
 
-    default:
-      throw new Error(`fluent ui publish script does not recognize task '${task}'`);
+    return;
   }
+
+  throw new Error(`Invalid command/arguments provided`);
+}
+
+function processArgs() {
+  const args = yargs
+    .scriptName('northstar-publish')
+    .command('bump <semver-type>', 'Publish packages', _yargs => {
+      _yargs
+        .positional('semver-type', {
+          description: 'Increment version(s) by semver keyword',
+          choices: ['patch', 'minor', 'canary'] as const,
+          demandOption: true,
+        })
+        .option('yes', {
+          type: 'boolean',
+          default: false,
+          description: 'skip lerna prompts',
+        })
+        .option('post-validate', {
+          type: 'boolean',
+          default: true,
+          description: 'execute validation steps after publish',
+        })
+        .option('dist-tag', {
+          type: 'string',
+          description: 'tag for canary release',
+        });
+    })
+    .command('pack-nightly', 'npm pack packages with nightly versioning')
+    .demandCommand(1)
+    .strict()
+    .version(false)
+    .help().argv;
+
+  return args;
 }
-run();

From 40d52ccc09ef22382221e7f77f1b00041a18bd71 Mon Sep 17 00:00:00 2001
From: Martin Hochel <martinhochel@microsoft.com>
Date: Wed, 3 Jan 2024 14:00:28 +0100
Subject: [PATCH 3/5] fixup! feat(scripts-fluentui-publish): upgrade script to
 proper cli tool

---
 scripts/fluentui-publish/index.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/fluentui-publish/index.ts b/scripts/fluentui-publish/index.ts
index e351c3ef194c36..c5bd2e927304ad 100644
--- a/scripts/fluentui-publish/index.ts
+++ b/scripts/fluentui-publish/index.ts
@@ -2,14 +2,14 @@ import { spawnSync } from 'child_process';
 import * as fs from 'fs';
 import * as path from 'path';
 
-import { type PackageJson, findGitRoot } from '@fluentui/scripts-monorepo';
+import { type PackageJson, workspaceRoot } from '@fluentui/scripts-monorepo';
 import * as yargs from 'yargs';
 
 main();
 
 function fluentuiLernaPublish(bumpType: 'patch' | 'minor' | 'canary', skipConfirm = false, npmTagForCanary = 'beta') {
-  const gitRoot = findGitRoot();
-  const fluentRoot = path.resolve(gitRoot, 'packages', 'fluentui');
+  const gitRoot = workspaceRoot;
+  const fluentRoot = path.resolve(workspaceRoot, 'packages', 'fluentui');
 
   let lernaPublishArgs: string[];
   switch (bumpType) {
@@ -94,7 +94,7 @@ const execCommandSync = (cwd: string, command: string, args: string[]) => {
 };
 
 function fluentuiPostPublishValidation() {
-  const gitRoot = findGitRoot();
+  const gitRoot = workspaceRoot;
 
   const branch = execCommandSync(gitRoot, 'git', ['branch', '--show-current']);
   execCommandSync(gitRoot, 'git', ['fetch', 'origin']);
@@ -115,8 +115,8 @@ function fluentuiPostPublishValidation() {
 
 // pack all public fluent ui packages, used by ci to store nightly built artifacts
 function packFluentTarballs() {
-  const gitRoot = findGitRoot();
-  const fluentRoot = path.resolve(findGitRoot(), 'packages', 'fluentui');
+  const gitRoot = workspaceRoot;
+  const fluentRoot = path.resolve(gitRoot, 'packages', 'fluentui');
 
   const TODAY = new Date().toISOString().split('T')[0]; // yyyy-mm-dd
 

From b20788dad57f2ec8eea82cf3dfcad761c63891fb Mon Sep 17 00:00:00 2001
From: Martin Hochel <martinhochel@microsoft.com>
Date: Wed, 3 Jan 2024 14:36:48 +0100
Subject: [PATCH 4/5] fixup! fixup! feat(scripts-fluentui-publish): upgrade
 script to proper cli tool

---
 package.json                          | 2 +-
 scripts/fluentui-publish/cli.js       | 6 ++++++
 scripts/fluentui-publish/package.json | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 scripts/fluentui-publish/cli.js

diff --git a/package.json b/package.json
index 687c7313945e7b..60781f0f43d697 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
     "preinstall": "node ./scripts/package-manager/use-yarn-please.js",
     "publish:beachball": "beachball publish -b origin/master --access public -y",
     "rebuild": "node ./scripts/executors/invalidate-just-cache.js && yarn build --reset-cache",
-    "northstar:release": "node -r ./scripts/ts-node/register ./scripts/fluentui-publish",
+    "northstar:release": "node ./scripts/fluentui-publish",
     "rename-package": "node -r ./scripts/ts-node/register ./scripts/generators/rename-package.ts",
     "run:published": "node ./scripts/executors/runPublished.js",
     "scrub": "node ./scripts/executors/scrub.js",
diff --git a/scripts/fluentui-publish/cli.js b/scripts/fluentui-publish/cli.js
new file mode 100644
index 00000000000000..6db64c72563325
--- /dev/null
+++ b/scripts/fluentui-publish/cli.js
@@ -0,0 +1,6 @@
+const { joinPathFragments } = require('@nx/devkit');
+const { registerTsProject } = require('nx/src/utils/register');
+
+registerTsProject(joinPathFragments(__dirname, '.'), 'tsconfig.lib.json');
+
+require('./index');
diff --git a/scripts/fluentui-publish/package.json b/scripts/fluentui-publish/package.json
index 34ad7744315e6d..6bfac86f581214 100644
--- a/scripts/fluentui-publish/package.json
+++ b/scripts/fluentui-publish/package.json
@@ -2,7 +2,7 @@
   "name": "@fluentui/scripts-fluentui-publish",
   "version": "0.0.1",
   "private": true,
-  "main": "index.js",
+  "main": "cli.js",
   "scripts": {
     "format": "prettier -w --ignore-path ../../.prettierignore .",
     "format:check": "yarn format -c",

From b08b4dd1881a8a7d1c915938d524164f015f6210 Mon Sep 17 00:00:00 2001
From: Martin Hochel <martinhochel@microsoft.com>
Date: Wed, 3 Jan 2024 15:34:02 +0100
Subject: [PATCH 5/5] chore: aggregate all global northstar npm script aliases
 under northstar: prefix

---
 azure-pipelines.perf-test.yml        |  6 +++---
 azure-pipelines.release-fluentui.yml |  2 +-
 package.json                         | 15 ++++++---------
 packages/fluentui/CONTRIBUTING.md    |  6 +++---
 packages/fluentui/test-a-feature.md  |  4 ++--
 scripts/fluentui-publish/index.ts    |  2 +-
 6 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/azure-pipelines.perf-test.yml b/azure-pipelines.perf-test.yml
index 53e0f5cf972170..007470883b2304 100644
--- a/azure-pipelines.perf-test.yml
+++ b/azure-pipelines.perf-test.yml
@@ -81,18 +81,18 @@ jobs:
           uniqueId: 'perfComment9424'
 
       - script: |
-          yarn stats:build
+          yarn northstar:stats:build
         condition: eq(variables.isPR, false)
         displayName: Bundle Statistics (master only)
 
       - script: |
-          yarn perf
+          yarn northstar:perf
         condition: eq(variables.isPR, false)
         displayName: Performance Tests (master only)
 
       # HEADS UP: also see tag-version-prefix in fluentui-publish.js
       - script: |
-          yarn stats:save --tag=`git tag --points-at HEAD | grep ^@fluentui/react-northstar_v | grep -o 'northstar_v.*'`
+          yarn northstar:stats:save --tag=`git tag --points-at HEAD | grep ^@fluentui/react-northstar_v | grep -o 'northstar_v.*'`
         condition: eq(variables.isPR, false)
         displayName: Save Statistics to DB (master only)
         env:
diff --git a/azure-pipelines.release-fluentui.yml b/azure-pipelines.release-fluentui.yml
index 26841ea18455a3..dc83af3dc76e03 100644
--- a/azure-pipelines.release-fluentui.yml
+++ b/azure-pipelines.release-fluentui.yml
@@ -201,7 +201,7 @@ extends:
                 inputs:
                   script: |
                     echo deployBasePath $(deployBasePath) docsiteVersion $(docsiteVersion) nightlyReleaseDate $(nightlyReleaseDate)
-                    NODE_ENV=production yarn build:fluentui:docs
+                    NODE_ENV=production yarn northstar:build:docs
 
               - task: AzureUpload@2
                 displayName: Upload to Azure
diff --git a/package.json b/package.json
index 60781f0f43d697..1322fc8fdc42dd 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,6 @@
     "dedupe": "npx yarn-deduplicate --strategy fewer",
     "build": "lage build --verbose",
     "build:codesandbox": "yarn build --to @fluentui/react --to @fluentui/react-components",
-    "build:fluentui:docs": "gulp build:docs",
     "buildci": "lage build test lint type-check test-ssr verify-packaging --verbose",
     "builddemo": "yarn build --to public-docsite-resources",
     "buildto": "lage build --verbose --to",
@@ -35,24 +34,22 @@
     "generate-version-files": "node -r ./scripts/ts-node/register ./scripts/generators/generate-version-files",
     "lint": "lage lint --verbose",
     "lint:log": "FORCE_COLOR=0 yarn lint > lint.log 2>&1",
-    "perf": "yarn workspace @fluentui/perf perf:test",
-    "perf:debug": "yarn workspace @fluentui/perf perf:test:debug",
     "postinstall": "node ./scripts/package-manager/postinstall.js",
     "preinstall": "node ./scripts/package-manager/use-yarn-please.js",
     "publish:beachball": "beachball publish -b origin/master --access public -y",
     "rebuild": "node ./scripts/executors/invalidate-just-cache.js && yarn build --reset-cache",
     "northstar:release": "node ./scripts/fluentui-publish",
+    "northstar:build:docs": "yarn workspace @fluentui/docs build",
+    "northstar:start": "yarn workspace @fluentui/docs start",
+    "northstar:perf": "yarn workspace @fluentui/perf perf:test",
+    "northstar:stats:build": "gulp stats",
+    "northstar:stats:save": "gulp stats:save",
+    "northstar:test:circulars": "gulp test:circulars:run",
     "rename-package": "node -r ./scripts/ts-node/register ./scripts/generators/rename-package.ts",
     "run:published": "node ./scripts/executors/runPublished.js",
     "scrub": "node ./scripts/executors/scrub.js",
     "start": "node ./scripts/executors/start.js",
-    "start:northstar": "yarn workspace @fluentui/docs start",
-    "stats:build": "gulp stats",
-    "stats:save": "gulp stats:save",
     "test": "lage test --verbose",
-    "test:fluentui:circulars": "gulp test:circulars:run",
-    "test:fluentui:e2e": "yarn workspace @fluentui/e2e test",
-    "test:fluentui:projects": "yarn workspace @fluentui/projects-test test",
     "update-snapshots": "lage update-snapshots --verbose"
   },
   "devDependencies": {
diff --git a/packages/fluentui/CONTRIBUTING.md b/packages/fluentui/CONTRIBUTING.md
index 143c1ff5b52e44..a432e64adb881e 100644
--- a/packages/fluentui/CONTRIBUTING.md
+++ b/packages/fluentui/CONTRIBUTING.md
@@ -35,16 +35,16 @@ To contribute to packages in this folder, follow [these setup instructions](setu
 From repo root:
 
 ```sh
-yarn start                 # start doc site: choose `@fluentui/docs`
+yarn northstar:start                 # start doc site: choose `@fluentui/docs`
 
 yarn test                  # run all packages' tests once
 
 yarn build                 # build all packages
-yarn build:fluentui:docs   # build docs
+yarn northstar:build:docs   # build docs
 
 yarn lint                  # lint all packages
 
-yarn prettier              # run prettier on changed files
+yarn format              # run prettier on changed files
 ```
 
 From an individual under `packages/fluentui`, such as `packages/fluentui/react-northstar`:
diff --git a/packages/fluentui/test-a-feature.md b/packages/fluentui/test-a-feature.md
index bda972aeeee5b9..80f22093ebadcc 100644
--- a/packages/fluentui/test-a-feature.md
+++ b/packages/fluentui/test-a-feature.md
@@ -280,10 +280,10 @@ Finding the right number of `iterations` is a balancing act between having a fas
 Run test and watch:
 
 ```
-yarn perf:test
+yarn northstar:perf
 ```
 
-After running `perf:test`, results can be viewed in the `packages/fluentui/perf-test-northstar/dist` folder with the main entry file being `packages/fluentui/perf-test-northstar/dist/perfCounts.html`.
+After running `northstar:perf`, results can be viewed in the `packages/fluentui/perf-test-northstar/dist` folder with the main entry file being `packages/fluentui/perf-test-northstar/dist/perfCounts.html`.
 
 There are more detailed commands as well (these must be run from `packages/fluentui/perf-test-northstar` directory):
 
diff --git a/scripts/fluentui-publish/index.ts b/scripts/fluentui-publish/index.ts
index c5bd2e927304ad..562c56341355c8 100644
--- a/scripts/fluentui-publish/index.ts
+++ b/scripts/fluentui-publish/index.ts
@@ -19,7 +19,7 @@ function fluentuiLernaPublish(bumpType: 'patch' | 'minor' | 'canary', skipConfir
         'lerna',
         'publish',
         bumpType,
-        "--tag-version-prefix='@fluentui/react-northstar_v'", // HEADS UP: also see yarn stats:save in azure-pipelines.perf-test.yml
+        "--tag-version-prefix='@fluentui/react-northstar_v'", // HEADS UP: also see yarn northstar:stats:save in azure-pipelines.perf-test.yml
         '--no-git-reset',
         '--force-publish',
         '--registry',