From 9414c486dade7fffa22858d1c5e2193b4faf0e7d Mon Sep 17 00:00:00 2001 From: Lingfan Gao Date: Thu, 15 Sep 2022 10:55:14 +0200 Subject: [PATCH 1/2] fix(runPublished): v9 release should not include v8 docsite --- scripts/monorepo/runPublished.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/monorepo/runPublished.js b/scripts/monorepo/runPublished.js index 8a1fe2798dbd81..ce9b6733670b7a 100644 --- a/scripts/monorepo/runPublished.js +++ b/scripts/monorepo/runPublished.js @@ -23,6 +23,8 @@ const websitePackages = [ '@fluentui/api-docs', ]; +const releaseScope = process.env.RELEASE_VNEXT ? 'v9' : 'v8'; + // Only include the packages that are published daily by beachball, and some website/doc packages // (which must be built and uploaded with each release). This is similar to "--scope \"!packages/fluentui/*\"" // in the root package.json's publishing-related scripts and will need to be updated if --scope changes. @@ -30,16 +32,17 @@ const beachballPackageScopes = Object.entries(getAllPackageInfo()) .filter(([, { packageJson, packagePath }]) => { const isNorthstar = /[\\/]fluentui[\\/]/.test(packagePath); + // Northstar has separate release tooling, always ignore northstar if (isNorthstar) { return false; } const isConverged = isConvergedPackage({ packagePathOrJson: packageJson }); - if (process.env.RELEASE_VNEXT && isConverged) { + if (releaseScope === 'v9') { return packageJson.private !== true; } - if (!isConverged) { + if (!isConverged && releaseScope === 'v8') { // v8 scope return websitePackages.includes(packageJson.name) || packageJson.private !== true; } From e791e1ce8488ae56086dab9d42702a44ad5f6869 Mon Sep 17 00:00:00 2001 From: Lingfan Gao Date: Thu, 15 Sep 2022 11:04:57 +0200 Subject: [PATCH 2/2] add isConverged back --- scripts/monorepo/runPublished.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/monorepo/runPublished.js b/scripts/monorepo/runPublished.js index ce9b6733670b7a..2bbe85beb00f3e 100644 --- a/scripts/monorepo/runPublished.js +++ b/scripts/monorepo/runPublished.js @@ -38,7 +38,7 @@ const beachballPackageScopes = Object.entries(getAllPackageInfo()) } const isConverged = isConvergedPackage({ packagePathOrJson: packageJson }); - if (releaseScope === 'v9') { + if (releaseScope === 'v9' && isConverged) { return packageJson.private !== true; }