From 3322f6bf31b5c2fe724eae039b28d5a893fe3cd7 Mon Sep 17 00:00:00 2001 From: Brian Vaughn Date: Wed, 15 Nov 2017 08:17:15 -0800 Subject: [PATCH] Re-add haste modules for ReactTypes and ReactNativeRTTypes shims (#11557) * Re-add haste module for ReactNativeRTTypes * Re-added ReactTypes @providesModule annotation as well * Updated expected provides modules list * Improved clarity of check_modules.sh error message * Added ReactTypes to provides module whitelist --- packages/react-rt-renderer/src/ReactNativeRTTypes.js | 1 + packages/shared/ReactTypes.js | 1 + scripts/circleci/check_modules.sh | 8 +++++++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/react-rt-renderer/src/ReactNativeRTTypes.js b/packages/react-rt-renderer/src/ReactNativeRTTypes.js index 02e9ced1cf..f6eb64f138 100644 --- a/packages/react-rt-renderer/src/ReactNativeRTTypes.js +++ b/packages/react-rt-renderer/src/ReactNativeRTTypes.js @@ -5,6 +5,7 @@ * LICENSE file in the root directory of this source tree. * * @flow + * @providesModule ReactNativeRTTypes */ /** diff --git a/packages/shared/ReactTypes.js b/packages/shared/ReactTypes.js index 4efa9a3851..900582e5d5 100644 --- a/packages/shared/ReactTypes.js +++ b/packages/shared/ReactTypes.js @@ -5,6 +5,7 @@ * LICENSE file in the root directory of this source tree. * * @flow + * @providesModule ReactTypes */ export type ReactNode = diff --git a/scripts/circleci/check_modules.sh b/scripts/circleci/check_modules.sh index 8ecd67dfbb..9f900beb02 100755 --- a/scripts/circleci/check_modules.sh +++ b/scripts/circleci/check_modules.sh @@ -5,11 +5,17 @@ set -e # Make sure we don't introduce accidental @providesModule annotations. EXPECTED='packages/react-cs-renderer/src/ReactNativeCSTypes.js packages/react-native-renderer/src/ReactNativeTypes.js +packages/react-rt-renderer/src/ReactNativeRTTypes.js +packages/shared/ReactTypes.js scripts/rollup/wrappers.js' ACTUAL=$(git grep -l @providesModule -- './*.js' ':!scripts/rollup/shims/*.js') +# Colors +red=$'\e[1;31m' +end=$'\e[0m' + if [ "$EXPECTED" != "$ACTUAL" ]; then - echo "@providesModule crept into some new files?" + printf "%s\n" "${red}ERROR: @providesModule crept into some new files?${end}" diff -u <(echo "$EXPECTED") <(echo "$ACTUAL") || true exit 1 fi