Merge pull request #3063 from iclanton/put-publishOnlyDependencies-back

Fix an issue with the Rush publish pipeline.

apps/rush-lib/package.json

@@ -52,9 +52,7 @@
     "tapable": "2.2.1",
     "tar": "~5.0.5",
     "true-case-path": "~2.2.1",
-    "z-schema": "~3.18.3",
-    "@rushstack/rush-amazon-s3-build-cache-plugin": "5.57.0",
-    "@rushstack/rush-azure-storage-build-cache-plugin": "5.57.0"
+    "z-schema": "~3.18.3"
   },
   "devDependencies": {
     "@pnpm/logger": "4.0.0",
@@ -79,5 +77,9 @@
     "@types/z-schema": "3.16.31",
     "jest": "~25.4.0",
     "typescript": "~4.4.2"
+  },
+  "publishOnlyDependencies": {
+    "@rushstack/rush-amazon-s3-build-cache-plugin": "workspace:*",
+    "@rushstack/rush-azure-storage-build-cache-plugin": "workspace:*"
   }
 }

common/changes/@microsoft/rush/put-publishOnlyDependencies-back_2021-12-03-02-31.json

@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "",
+      "type": "none",
+      "packageName": "@microsoft/rush"
+    }
+  ],
+  "packageName": "@microsoft/rush",
+  "email": "[email protected]"
+}

common/config/azure-pipelines/npm-publish-rush.yaml

@@ -7,11 +7,12 @@ steps:
   - checkout: self
     persistCredentials: true
   - template: templates/build.yaml
-  - script: 'node apps/rush-lib/scripts/plugins-prepublish.js'
-    displayName: 'Prepublish workaround'
   - template: templates/publish.yaml
     parameters:
       VersionPolicyName: noRush
   - template: templates/publish.yaml
     parameters:
       VersionPolicyName: rush
+      PrePublishSteps:
+        - script: 'node apps/rush-lib/scripts/plugins-prepublish.js'
+          displayName: 'Prepublish workaround'

common/config/azure-pipelines/templates/publish.yaml

@@ -1,9 +1,14 @@
 parameters:
   - name: VersionPolicyName
     type: string
+  - name: PrePublishSteps
+    type: stepList
+    default: []
+
 steps:
   - script: 'node common/scripts/install-run-rush.js version --bump --version-policy ${{ parameters.VersionPolicyName }} --target-branch $(Build.SourceBranchName)'
     displayName: 'Rush Version (Policy: ${{ parameters.VersionPolicyName }})'
+  - ${{ parameters.PrePublishSteps }}
   - script: 'node common/scripts/install-run-rush.js publish --apply --publish --include-all --target-branch $(Build.SourceBranchName) --add-commit-details --set-access-level public'
     displayName: 'Rush Publish (Policy: ${{ parameters.VersionPolicyName }})'
     env: