Merge remote-tracking branch 'origin/trunk' into update/sso-use-package

.github/workflows/tests.yml

@@ -327,14 +327,19 @@ jobs:
           pnpm jetpack phan --all -v --format github
       - name: Check baselines
         run: |
-          # Anything changed (with a side of printing the diff)
+          # Anything changed? (with a side of printing the diff)
           if git diff --exit-code --ignore-matching-lines='^    // ' -- .phan/baseline.php '*/.phan/baseline.php'; then
             exit 0
           fi
 
           # Collect which projects changed to suggest the right command.
           PROJECTS=()
           for f in $( git -c core.quotepath=off diff --name-only -- .phan/baseline.php '*/.phan/baseline.php' ); do
+            # --name-only and --ignore-matching-lines don't combine, so we have to do the check separately.
+            if git diff --quiet --exit-code --ignore-matching-lines='^    // ' -- "$f"; then
+              continue
+            fi
+
             if [[ "$f" == ".phan/baseline.php" ]]; then
               SLUG=monorepo
             elif [[ "$f" == projects/*/*/.phan/baseline.php ]]; then

.npmrc

@@ -13,6 +13,9 @@ public-hoist-pattern=[]
 auto-install-peers = false
 dedupe-peer-dependents = false
 
+# Silence this warning. Our `jetpack dependencies build-order` (also used by `jetpack build --all`) checks for cycles itself, plus it has a way to indicate that a dep is only for testing.
+ignore-workspace-cycles = true
+
 # Opinion seems divided on whether the new default 'lowest-direct' is good or bad.
 #  https://github.com/pnpm/pnpm/issues/6463
 #  https://github.com/pnpm/pnpm/issues/6498

docs/monorepo.md

@@ -127,6 +127,7 @@ We use `composer.json` to hold metadata about projects. Much of our generic tool
 * `.extra.changelogger-default-type`: Certain of our tools automatically create Changelogger change entries. This is the value to use for `--type` when doing so. Default type is `changed`.
 * `.extra.dependencies.build`: This optional array specifies the "slugs" of any within-monorepo build dependencies that can't otherwise be inferred. The "slug" consists of the two levels of directory under `projects/`, e.g. `plugins/jetpack` or `packages/lazy-images`.
 * `.extra.dependencies.test`: This optional array specifies the "slugs" of any within-monorepo testing dependencies that can't otherwise be inferred. The "slug" consists of the two levels of directory under `projects/`, e.g. `plugins/jetpack` or `packages/lazy-images`. See [Testing](#testing) for details.
+* `.extra.dependencies.test-only`: This optional array specifies the "slugs" of any within-monorepo dependencies that are only used for testing and/or static analysis and should be ignored otherwise when analyzing intra-monorepo dependencies.
 * `.extra.dev-releases`: Indicate that the plugin will have developer alpha releases. Instead of the mirror repositories showing "VER-alpha", they'll start at "VER-a.0" and you can use the `-a` flag to the release tooling to release "VER-a.1".
 * `.extra.mirror-repo`: This specifies the name of the GitHub mirror repo, i.e. the "Automattic/jetpack-_something_" in "<span>https://</span>github.com/Automattic/jetpack-_something_".
 * `.extra.npmjs-autopublish`: Set truthy to enable automatic publishing of tagged versions to npmjs.com. See [Mirror repositories > Npmjs Auto-publisher](#npmjs-auto-publisher) for details.