diff --git a/packages/shared/src/ReactDOMFrameScheduling.js b/packages/shared/ReactDOMFrameScheduling.js similarity index 100% rename from packages/shared/src/ReactDOMFrameScheduling.js rename to packages/shared/ReactDOMFrameScheduling.js diff --git a/packages/shared/src/ReactElementType.js b/packages/shared/ReactElementType.js similarity index 100% rename from packages/shared/src/ReactElementType.js rename to packages/shared/ReactElementType.js diff --git a/packages/shared/src/utils/ReactErrorUtils.js b/packages/shared/ReactErrorUtils.js similarity index 100% rename from packages/shared/src/utils/ReactErrorUtils.js rename to packages/shared/ReactErrorUtils.js diff --git a/packages/shared/src/utils/ReactFeatureFlags.js b/packages/shared/ReactFeatureFlags.js similarity index 100% rename from packages/shared/src/utils/ReactFeatureFlags.js rename to packages/shared/ReactFeatureFlags.js diff --git a/packages/shared/src/ReactFiberComponentTreeHook.js b/packages/shared/ReactFiberComponentTreeHook.js similarity index 100% rename from packages/shared/src/ReactFiberComponentTreeHook.js rename to packages/shared/ReactFiberComponentTreeHook.js diff --git a/packages/shared/src/ReactFiberTreeReflection.js b/packages/shared/ReactFiberTreeReflection.js similarity index 100% rename from packages/shared/src/ReactFiberTreeReflection.js rename to packages/shared/ReactFiberTreeReflection.js diff --git a/packages/shared/src/ReactGlobalSharedState.js b/packages/shared/ReactGlobalSharedState.js similarity index 100% rename from packages/shared/src/ReactGlobalSharedState.js rename to packages/shared/ReactGlobalSharedState.js diff --git a/packages/shared/src/ReactInstanceMap.js b/packages/shared/ReactInstanceMap.js similarity index 100% rename from packages/shared/src/ReactInstanceMap.js rename to packages/shared/ReactInstanceMap.js diff --git a/packages/shared/src/ReactTreeTraversal.js b/packages/shared/ReactTreeTraversal.js similarity index 100% rename from packages/shared/src/ReactTreeTraversal.js rename to packages/shared/ReactTreeTraversal.js diff --git a/packages/shared/src/ReactTypeOfSideEffect.js b/packages/shared/ReactTypeOfSideEffect.js similarity index 100% rename from packages/shared/src/ReactTypeOfSideEffect.js rename to packages/shared/ReactTypeOfSideEffect.js diff --git a/packages/shared/src/ReactTypeOfWork.js b/packages/shared/ReactTypeOfWork.js similarity index 100% rename from packages/shared/src/ReactTypeOfWork.js rename to packages/shared/ReactTypeOfWork.js diff --git a/packages/shared/src/ReactVersion.js b/packages/shared/ReactVersion.js similarity index 100% rename from packages/shared/src/ReactVersion.js rename to packages/shared/ReactVersion.js diff --git a/packages/shared/src/__tests__/ReactDOMFrameScheduling-test.js b/packages/shared/__tests__/ReactDOMFrameScheduling-test.js similarity index 100% rename from packages/shared/src/__tests__/ReactDOMFrameScheduling-test.js rename to packages/shared/__tests__/ReactDOMFrameScheduling-test.js diff --git a/packages/shared/src/utils/__tests__/ReactErrorUtils-test.js b/packages/shared/__tests__/ReactErrorUtils-test.js similarity index 100% rename from packages/shared/src/utils/__tests__/ReactErrorUtils-test.js rename to packages/shared/__tests__/ReactErrorUtils-test.js diff --git a/packages/shared/src/utils/__tests__/reactProdInvariant-test.js b/packages/shared/__tests__/reactProdInvariant-test.js similarity index 100% rename from packages/shared/src/utils/__tests__/reactProdInvariant-test.js rename to packages/shared/__tests__/reactProdInvariant-test.js diff --git a/packages/shared/src/describeComponentFrame.js b/packages/shared/describeComponentFrame.js similarity index 100% rename from packages/shared/src/describeComponentFrame.js rename to packages/shared/describeComponentFrame.js diff --git a/packages/shared/src/event/BrowserEventConstants.js b/packages/shared/event/BrowserEventConstants.js similarity index 100% rename from packages/shared/src/event/BrowserEventConstants.js rename to packages/shared/event/BrowserEventConstants.js diff --git a/packages/shared/src/event/EventPluginHub.js b/packages/shared/event/EventPluginHub.js similarity index 100% rename from packages/shared/src/event/EventPluginHub.js rename to packages/shared/event/EventPluginHub.js diff --git a/packages/shared/src/event/EventPluginRegistry.js b/packages/shared/event/EventPluginRegistry.js similarity index 100% rename from packages/shared/src/event/EventPluginRegistry.js rename to packages/shared/event/EventPluginRegistry.js diff --git a/packages/shared/src/event/EventPluginUtils.js b/packages/shared/event/EventPluginUtils.js similarity index 100% rename from packages/shared/src/event/EventPluginUtils.js rename to packages/shared/event/EventPluginUtils.js diff --git a/packages/shared/src/event/EventPropagators.js b/packages/shared/event/EventPropagators.js similarity index 100% rename from packages/shared/src/event/EventPropagators.js rename to packages/shared/event/EventPropagators.js diff --git a/packages/shared/src/event/PluginModuleType.js b/packages/shared/event/PluginModuleType.js similarity index 100% rename from packages/shared/src/event/PluginModuleType.js rename to packages/shared/event/PluginModuleType.js diff --git a/packages/shared/src/event/ReactControlledComponent.js b/packages/shared/event/ReactControlledComponent.js similarity index 100% rename from packages/shared/src/event/ReactControlledComponent.js rename to packages/shared/event/ReactControlledComponent.js diff --git a/packages/shared/src/event/ReactEventEmitterMixin.js b/packages/shared/event/ReactEventEmitterMixin.js similarity index 100% rename from packages/shared/src/event/ReactEventEmitterMixin.js rename to packages/shared/event/ReactEventEmitterMixin.js diff --git a/packages/shared/src/event/ReactGenericBatching.js b/packages/shared/event/ReactGenericBatching.js similarity index 100% rename from packages/shared/src/event/ReactGenericBatching.js rename to packages/shared/event/ReactGenericBatching.js diff --git a/packages/shared/src/event/ReactSyntheticEventType.js b/packages/shared/event/ReactSyntheticEventType.js similarity index 100% rename from packages/shared/src/event/ReactSyntheticEventType.js rename to packages/shared/event/ReactSyntheticEventType.js diff --git a/packages/shared/src/event/SyntheticEvent.js b/packages/shared/event/SyntheticEvent.js similarity index 100% rename from packages/shared/src/event/SyntheticEvent.js rename to packages/shared/event/SyntheticEvent.js diff --git a/packages/shared/src/event/__tests__/EventPluginRegistry-test.js b/packages/shared/event/__tests__/EventPluginRegistry-test.js similarity index 100% rename from packages/shared/src/event/__tests__/EventPluginRegistry-test.js rename to packages/shared/event/__tests__/EventPluginRegistry-test.js diff --git a/packages/shared/src/utils/__tests__/accumulateInto-test.js b/packages/shared/event/__tests__/accumulateInto-test.js similarity index 100% rename from packages/shared/src/utils/__tests__/accumulateInto-test.js rename to packages/shared/event/__tests__/accumulateInto-test.js diff --git a/packages/shared/src/utils/accumulate.js b/packages/shared/event/accumulate.js similarity index 100% rename from packages/shared/src/utils/accumulate.js rename to packages/shared/event/accumulate.js diff --git a/packages/shared/src/utils/accumulateInto.js b/packages/shared/event/accumulateInto.js similarity index 100% rename from packages/shared/src/utils/accumulateInto.js rename to packages/shared/event/accumulateInto.js diff --git a/packages/shared/src/event/eventPlugins/ResponderEventPlugin.js b/packages/shared/event/eventPlugins/ResponderEventPlugin.js similarity index 100% rename from packages/shared/src/event/eventPlugins/ResponderEventPlugin.js rename to packages/shared/event/eventPlugins/ResponderEventPlugin.js diff --git a/packages/shared/src/event/eventPlugins/ResponderSyntheticEvent.js b/packages/shared/event/eventPlugins/ResponderSyntheticEvent.js similarity index 100% rename from packages/shared/src/event/eventPlugins/ResponderSyntheticEvent.js rename to packages/shared/event/eventPlugins/ResponderSyntheticEvent.js diff --git a/packages/shared/src/event/eventPlugins/ResponderTouchHistoryStore.js b/packages/shared/event/eventPlugins/ResponderTouchHistoryStore.js similarity index 100% rename from packages/shared/src/event/eventPlugins/ResponderTouchHistoryStore.js rename to packages/shared/event/eventPlugins/ResponderTouchHistoryStore.js diff --git a/packages/shared/src/event/eventPlugins/TouchHistoryMath.js b/packages/shared/event/eventPlugins/TouchHistoryMath.js similarity index 100% rename from packages/shared/src/event/eventPlugins/TouchHistoryMath.js rename to packages/shared/event/eventPlugins/TouchHistoryMath.js diff --git a/packages/shared/src/event/eventPlugins/__tests__/ResponderEventPlugin-test.js b/packages/shared/event/eventPlugins/__tests__/ResponderEventPlugin-test.js similarity index 100% rename from packages/shared/src/event/eventPlugins/__tests__/ResponderEventPlugin-test.js rename to packages/shared/event/eventPlugins/__tests__/ResponderEventPlugin-test.js diff --git a/packages/shared/src/utils/forEachAccumulated.js b/packages/shared/event/forEachAccumulated.js similarity index 100% rename from packages/shared/src/utils/forEachAccumulated.js rename to packages/shared/event/forEachAccumulated.js diff --git a/packages/shared/src/event/getVendorPrefixedEventName.js b/packages/shared/event/getVendorPrefixedEventName.js similarity index 100% rename from packages/shared/src/event/getVendorPrefixedEventName.js rename to packages/shared/event/getVendorPrefixedEventName.js diff --git a/packages/shared/src/utils/getComponentName.js b/packages/shared/getComponentName.js similarity index 100% rename from packages/shared/src/utils/getComponentName.js rename to packages/shared/getComponentName.js diff --git a/packages/shared/src/utils/isTextInputElement.js b/packages/shared/isTextInputElement.js similarity index 100% rename from packages/shared/src/utils/isTextInputElement.js rename to packages/shared/isTextInputElement.js diff --git a/packages/shared/src/utils/lowPriorityWarning.js b/packages/shared/lowPriorityWarning.js similarity index 100% rename from packages/shared/src/utils/lowPriorityWarning.js rename to packages/shared/lowPriorityWarning.js diff --git a/packages/shared/src/utils/reactProdInvariant.js b/packages/shared/reactProdInvariant.js similarity index 100% rename from packages/shared/src/utils/reactProdInvariant.js rename to packages/shared/reactProdInvariant.js diff --git a/packages/shared/src/utils/validateCallback.js b/packages/shared/validateCallback.js similarity index 100% rename from packages/shared/src/utils/validateCallback.js rename to packages/shared/validateCallback.js diff --git a/scripts/prettier/index.js b/scripts/prettier/index.js index 7efc199cc8..70ba9f0b4d 100644 --- a/scripts/prettier/index.js +++ b/scripts/prettier/index.js @@ -38,6 +38,7 @@ const config = { 'packages/*/*.js', // Source files 'packages/*/src/**/*.js', + 'packages/shared/**/*.js', ], ignore: ['**/node_modules/**'], }, diff --git a/scripts/release/build-commands/update-package-versions.js b/scripts/release/build-commands/update-package-versions.js index 3bc41a5370..5ed34f2fab 100644 --- a/scripts/release/build-commands/update-package-versions.js +++ b/scripts/release/build-commands/update-package-versions.js @@ -20,7 +20,7 @@ const update = async ({cwd, dry, version}) => { await writeJson(packagePath, rootPackage, {spaces: 2}); // Update ReactVersion source file - const reactVersionPath = join(cwd, 'packages/shared/src/ReactVersion.js'); + const reactVersionPath = join(cwd, 'packages/shared/ReactVersion.js'); const reactVersion = readFileSync(reactVersionPath, 'utf8').replace( /module\.exports = '[^']+';/, `module.exports = '${version}';` diff --git a/scripts/rollup/modules.js b/scripts/rollup/modules.js index a102bcbf64..e3924e964b 100644 --- a/scripts/rollup/modules.js +++ b/scripts/rollup/modules.js @@ -189,9 +189,7 @@ function getInternalModules(moduleType) { // we tell Rollup where these files are located internally, otherwise // it doesn't pick them up and assumes they're external let aliases = { - reactProdInvariant: resolve( - './packages/shared/src/utils/reactProdInvariant.js' - ), + reactProdInvariant: resolve('./packages/shared/reactProdInvariant.js'), }; if (moduleType === RENDERER) { // Renderers bundle the whole reconciler. diff --git a/scripts/tasks/version-check.js b/scripts/tasks/version-check.js index 49268d2593..bb15db0cc4 100644 --- a/scripts/tasks/version-check.js +++ b/scripts/tasks/version-check.js @@ -15,7 +15,7 @@ const versions = { .version, 'packages/react-test-renderer/package.json': require('../../packages/react-test-renderer/package.json') .version, - 'packages/shared/src/ReactVersion.js': require('../../packages/shared/src/ReactVersion'), + 'packages/shared/ReactVersion.js': require('../../packages/shared/ReactVersion'), }; let allVersionsMatch = true;