small refactoring to existing script

base setup for how the check would work in the bump-oss script

change export

test comment

Revert "test comment"

This reverts commit 84312514ba365debbd5e64fc200df9a099f40a66.

another test

fix

another fix

remove comment

checkpoint

tweak

add the command to package.json

asd

refactoring

tweak

missing ROOT

fix

fix

keep going

fix

fix

tweak

fix for root

one more

tweak

tweak

twy

twea

asd

remove blocking comment

cleanup

package.json

@@ -41,7 +41,8 @@
  "test-ios": "./scripts/objc-test.sh test",
  "test-typescript": "dtslint packages/react-native/types",
  "test-typescript-offline": "dtslint --localTs node_modules/typescript/lib packages/react-native/types",
- "bump-all-updated-packages": "node ./scripts/monorepo/bump-all-updated-packages"
+ "bump-all-updated-packages": "node ./scripts/monorepo/bump-all-updated-packages",
+ "bump-oss-version": "node ./scripts/bump-oss-version.js"
  },
  "workspaces": [
  "packages/*"

scripts/bump-oss-version.js

@@ -14,14 +14,21 @@
  * This script walks a releaser through bumping the version for a release
  * It will commit the appropriate tags to trigger the CircleCI jobs.
  */
-const {exit} = require('shelljs');
+const {exit, echo} = require('shelljs');
+const chalk = require('chalk');
 const yargs = require('yargs');
 const inquirer = require('inquirer');
 const request = require('request');
+const path = require('path');
 const {getBranchName, exitIfNotOnGit} = require('./scm-utils');
 
 const {parseVersion, isReleaseBranch} = require('./version-utils');
 const {failIfTagExists} = require('./release-utils');
+const checkForGitChanges = require('./monorepo/check-for-git-changes');
+const forEachPackage = require('./monorepo/for-each-package');
+const detectPackageUnreleasedChanges = require('./monorepo/bump-all-updated-packages/bump-utils.js');
+
+const ROOT_LOCATION = path.join(__dirname, '..');
 
 let argv = yargs
  .option('r', {
@@ -57,6 +64,52 @@ function exitIfNotOnReleaseBranch(branch) {
  }
 }
 
+const buildExecutor =
+ (packageAbsolutePath, packageRelativePathFromRoot, packageManifest) =>
+ async () => {
+ const {name: packageName} = packageManifest;
+ if (packageManifest.private) {
+ return;
+ }
+
+ if (
+ detectPackageUnreleasedChanges(
+ packageRelativePathFromRoot,
+ packageName,
+ ROOT_LOCATION,
+ )
+ ) {
+ // if I enter here, I want to throw an error upward
+ throw new Error(
+ `Package ${packageName} has unreleased changes. Please release it first.`,
+ );
+ }
+ };
+
+const buildAllExecutors = () => {
+ const executors = [];
+
+ forEachPackage((...params) => {
+ executors.push(buildExecutor(...params));
+ });
+
+ return executors;
+};
+
+async function exitIfUnreleasedPackages() {
+ // use the other script to verify that there's no packages in the monorepo
+ // that have changes that haven't been released
+
+ const executors = buildAllExecutors();
+ for (const executor of executors) {
+ await executor().catch(error => {
+ echo(chalk.red(error));
+ // need to throw upward
+ throw error;
+ });
+ }
+}
+
 function triggerReleaseWorkflow(options) {
  return new Promise((resolve, reject) => {
  request(options, function (error, response, body) {
@@ -74,6 +127,24 @@ async function main() {
  () => getBranchName(),
  "Not in git. You can't invoke bump-oss-versions.js from outside a git repo.",
  );
+
+ // check for uncommitted changes
+ if (checkForGitChanges()) {
+ echo(
+ chalk.red(
+ 'Found uncommitted changes. Please commit or stash them before running this script',
+ ),
+ );
+ exit(1);
+ }
+
+ // now check for unreleased packages
+ try {
+ await exitIfUnreleasedPackages();
+ } catch (error) {
+ exit(1);
+ }
+
  const token = argv.token;
  const releaseVersion = argv.toVersion;
  failIfTagExists(releaseVersion, 'release');

scripts/monorepo/bump-all-updated-packages/bump-utils.js

@@ -0,0 +1,49 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ */
+
+const chalk = require('chalk');
+const {echo, exec} = require('shelljs');
+
+const detectPackageUnreleasedChanges = (
+ packageRelativePathFromRoot,
+ packageName,
+ ROOT_LOCATION,
+) => {
+ const hashOfLastCommitInsidePackage = exec(
+ `git log -n 1 --format=format:%H -- ${packageRelativePathFromRoot}`,
+ {cwd: ROOT_LOCATION, silent: true},
+ ).stdout.trim();
+
+ const hashOfLastCommitThatChangedVersion = exec(
+ `git log -G\\"version\\": --format=format:%H -n 1 -- ${packageRelativePathFromRoot}/package.json`,
+ {cwd: ROOT_LOCATION, silent: true},
+ ).stdout.trim();
+
+ if (hashOfLastCommitInsidePackage === hashOfLastCommitThatChangedVersion) {
+ echo(
+ `\uD83D\uDD0E No changes for package ${chalk.green(
+ packageName,
+ )} since last version bump`,
+ );
+ return false;
+ } else {
+ echo(`\uD83D\uDCA1 Found changes for ${chalk.yellow(packageName)}:`);
+ exec(
+ `git log --pretty=oneline ${hashOfLastCommitThatChangedVersion}..${hashOfLastCommitInsidePackage} ${packageRelativePathFromRoot}`,
+ {
+ cwd: ROOT_LOCATION,
+ },
+ );
+ echo();
+
+ return true;
+ }
+};
+
+module.exports = detectPackageUnreleasedChanges;

scripts/monorepo/bump-all-updated-packages/index.js

@@ -25,6 +25,7 @@ const {
 const forEachPackage = require('../for-each-package');
 const checkForGitChanges = require('../check-for-git-changes');
 const bumpPackageVersion = require('./bump-package-version');
+const detectPackageUnreleasedChanges = require('./bump-utils');
 
 const ROOT_LOCATION = path.join(__dirname, '..', '..', '..');
 
@@ -62,35 +63,16 @@ const buildExecutor =
  return;
  }
 
- const hashOfLastCommitInsidePackage = exec(
- `git log -n 1 --format=format:%H -- ${packageRelativePathFromRoot}`,
- {cwd: ROOT_LOCATION, silent: true},
- ).stdout.trim();
-
- const hashOfLastCommitThatChangedVersion = exec(
- `git log -G\\"version\\": --format=format:%H -n 1 -- ${packageRelativePathFromRoot}/package.json`,
- {cwd: ROOT_LOCATION, silent: true},
- ).stdout.trim();
-
- if (hashOfLastCommitInsidePackage === hashOfLastCommitThatChangedVersion) {
- echo(
- `\uD83D\uDD0E No changes for package ${chalk.green(
- packageName,
- )} since last version bump`,
- );
-
+ if (
+ !detectPackageUnreleasedChanges(
+ packageRelativePathFromRoot,
+ packageName,
+ ROOT_LOCATION,
+ )
+ ) {
  return;
  }
 
- echo(`\uD83D\uDCA1 Found changes for ${chalk.yellow(packageName)}:`);
- exec(
- `git log --pretty=oneline ${hashOfLastCommitThatChangedVersion}..${hashOfLastCommitInsidePackage} ${packageRelativePathFromRoot}`,
- {
- cwd: ROOT_LOCATION,
- },
- );
- echo();
-
  await inquirer
  .prompt([
  {