From 963254e2ec31fd5897d46e51862feba5d65a7e5b Mon Sep 17 00:00:00 2001 From: Luna Wei Date: Wed, 1 Sep 2021 01:40:01 -0700 Subject: [PATCH] Copy repo-config dependencies for bumping release version Summary: Changelog: [Internal[Fixed] - Revert, yarn workspaces only used in private packages. Copy dependencies over from repo-config instead Original commit changeset: 1dd2adc6a036 Reviewed By: fkgozali Differential Revision: D30599065 fbshipit-source-id: 0efffaaf38bc23bac339e6e1d917736243e1750e --- repo-config/package.json | 2 +- scripts/bump-oss-version.js | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/repo-config/package.json b/repo-config/package.json index 164f952a2f..bc6712214e 100644 --- a/repo-config/package.json +++ b/repo-config/package.json @@ -8,7 +8,7 @@ "type": "git", "url": "git@github.com:facebook/react-native.git" }, - "devDependencies": { + "dependencies": { "@babel/core": "^7.14.0", "@babel/generator": "^7.14.0", "@babel/template": "^7.0.0", diff --git a/scripts/bump-oss-version.js b/scripts/bump-oss-version.js index ef06e4f1e7..ab582e3666 100755 --- a/scripts/bump-oss-version.js +++ b/scripts/bump-oss-version.js @@ -127,13 +127,13 @@ fs.writeFileSync( ); let packageJson = JSON.parse(cat('package.json')); - packageJson.version = version; - -// Only keep 'repo-config` workspace -packageJson.workspaces = packageJson.workspaces.filter(w => w === 'repo-config'); - +delete packageJson.workspaces; delete packageJson.private; + +// Copy dependencies over from repo-config/package.json +const repoConfigJson = JSON.parse(cat('repo-config/package.json')); +packageJson.devDependencies = {...packageJson.devDependencies, ...repoConfigJson.dependencies}; fs.writeFileSync('package.json', JSON.stringify(packageJson, null, 2), 'utf-8'); // Change ReactAndroid/gradle.properties