From 4469700bb60ffd62caf112e47bcfa51afdd40e47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Markb=C3=A5ge?= Date: Fri, 28 Feb 2020 13:09:02 -0800 Subject: [PATCH] Change ReactVersion from CJS to ES module (#18181) --- packages/shared/ReactVersion.js | 4 +--- .../publish-commands/update-stable-version-numbers.js | 2 +- scripts/release/utils.js | 5 +---- scripts/tasks/version-check.js | 9 +++++++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/shared/ReactVersion.js b/packages/shared/ReactVersion.js index 25252441e8d9b..46c1d6bd7da96 100644 --- a/packages/shared/ReactVersion.js +++ b/packages/shared/ReactVersion.js @@ -5,7 +5,5 @@ * LICENSE file in the root directory of this source tree. */ -'use strict'; - // TODO: this is special because it gets imported during build. -module.exports = '16.13.0'; +export default '16.13.0'; diff --git a/scripts/release/publish-commands/update-stable-version-numbers.js b/scripts/release/publish-commands/update-stable-version-numbers.js index 0a56d8e39c66b..76a6d6f1622ca 100644 --- a/scripts/release/publish-commands/update-stable-version-numbers.js +++ b/scripts/release/publish-commands/update-stable-version-numbers.js @@ -44,7 +44,7 @@ const run = async ({cwd, packages, skipPackages, tags}) => { const sourceReactVersion = readFileSync( sourceReactVersionPath, 'utf8' - ).replace(/module\.exports = '[^']+';/, `module.exports = '${version}';`); + ).replace(/export default '[^']+';/, `export default '${version}';`); writeFileSync(sourceReactVersionPath, sourceReactVersion); } }; diff --git a/scripts/release/utils.js b/scripts/release/utils.js index 60785482174a9..cb0873d1c77f0 100644 --- a/scripts/release/utils.js +++ b/scripts/release/utils.js @@ -209,10 +209,7 @@ const updateVersionsForNext = async (cwd, reactVersion, version) => { const sourceReactVersion = readFileSync( sourceReactVersionPath, 'utf8' - ).replace( - /module\.exports = '[^']+';/, - `module.exports = '${reactVersion}';` - ); + ).replace(/export default '[^']+';/, `export default '${reactVersion}';`); writeFileSync(sourceReactVersionPath, sourceReactVersion); // Update the root package.json. diff --git a/scripts/tasks/version-check.js b/scripts/tasks/version-check.js index 81de48e28e92f..57dcfdfba6388 100644 --- a/scripts/tasks/version-check.js +++ b/scripts/tasks/version-check.js @@ -7,7 +7,12 @@ 'use strict'; -const reactVersion = require('../../package.json').version; +const fs = require('fs'); +const ReactVersionSrc = fs.readFileSync( + require.resolve('../../packages/shared/ReactVersion') +); +const reactVersion = /export default '([^']+)';/.exec(ReactVersionSrc)[1]; + const versions = { 'packages/react/package.json': require('../../packages/react/package.json') .version, @@ -15,7 +20,7 @@ const versions = { .version, 'packages/react-test-renderer/package.json': require('../../packages/react-test-renderer/package.json') .version, - 'packages/shared/ReactVersion.js': require('../../packages/shared/ReactVersion'), + 'packages/shared/ReactVersion.js': reactVersion, }; let allVersionsMatch = true;