Hello world<\/div>');\n- ReactDOM.render(Hello world again<\/Test>, container);\n- expect(Scheduler).toFlushWithoutYielding();\n- expect(container.innerHTML).toBe('

Hello world again<\/div>');\n- ReactDOM.render(null, container);\n- expect(Scheduler).toFlushWithoutYielding();\n- expect(container.innerHTML).toBe('');\n- });\n-\n- \/\/ @gate experimental\n- it('should render a simple fundamental component without reconcileChildren', () => {\n- const FundamentalComponent = createReactFundamentalComponent({\n- reconcileChildren: false,\n- getInstance(context, props, state) {\n- const instance = document.createElement('div');\n- instance.textContent = 'Hello world';\n- return instance;\n- },\n- });\n-\n- const Test = () => ;\n-\n- const container = document.createElement('div');\n- ReactDOM.render(, container);\n- expect(Scheduler).toFlushWithoutYielding();\n- expect(container.innerHTML).toBe('

Hello world<\/div>');\n- \/\/ Children should be ignored\n- ReactDOM.render(Hello world again<\/Test>, container);\n- expect(Scheduler).toFlushWithoutYielding();\n- expect(container.innerHTML).toBe('

Hello world<\/div>');\n- ReactDOM.render(null, container);\n- expect(Scheduler).toFlushWithoutYielding();\n- expect(container.innerHTML).toBe('');\n- });\n- });\n-\n- describe('ReactDOMServer', () => {\n- beforeEach(() => {\n- initReactDOMServer();\n- });\n-\n- \/\/ @gate experimental\n- it('should render a simple fundamental component with a single child', () => {\n- const getInstance = jest.fn();\n- const FundamentalComponent = createReactFundamentalComponent({\n- reconcileChildren: true,\n- getInstance,\n- getServerSideString(context, props) {\n- return `

`;\n- },\n- getServerSideStringClose(context, props) {\n- return `<\/div>`;\n- },\n- });\n-\n- const Test = ({children}) => (\n- {children}<\/FundamentalComponent>\n- );\n-\n- expect(getInstance).not.toBeCalled();\n- let output = ReactDOMServer.renderToString(Hello world<\/Test>);\n- expect(output).toBe('

Hello world<\/div>');\n- output = ReactDOMServer.renderToString(Hello world again<\/Test>);\n- expect(output).toBe('

Hello world again<\/div>');\n- });\n-\n- \/\/ @gate experimental\n- it('should render a simple fundamental component without reconcileChildren', () => {\n- const FundamentalComponent = createReactFundamentalComponent({\n- reconcileChildren: false,\n- getServerSideString(context, props) {\n- return `

Hello world<\/div>`;\n- },\n- });\n-\n- const Test = () => ;\n-\n- let output = ReactDOMServer.renderToString();\n- expect(output).toBe('

Hello world<\/div>');\n- \/\/ Children should be ignored\n- output = ReactDOMServer.renderToString(Hello world again<\/Test>);\n- expect(output).toBe('

Hello world<\/div>');\n- });\n- });\n-});\ndiff --git a\/packages\/react-reconciler\/src\/forks\/ReactFiberHostConfig.custom.js b\/packages\/react-reconciler\/src\/forks\/ReactFiberHostConfig.custom.js\nindex b9ffc05725..14e43a8222 100644\n--- a\/packages\/react-reconciler\/src\/forks\/ReactFiberHostConfig.custom.js\n+++ b\/packages\/react-reconciler\/src\/forks\/ReactFiberHostConfig.custom.js\n@@ -62,12 +62,6 @@ export const warnsIfNotActing = $$$hostConfig.warnsIfNotActing;\n export const supportsMutation = $$$hostConfig.supportsMutation;\n export const supportsPersistence = $$$hostConfig.supportsPersistence;\n export const supportsHydration = $$$hostConfig.supportsHydration;\n-export const getFundamentalComponentInstance =\n- $$$hostConfig.getFundamentalComponentInstance;\n-export const mountFundamentalComponent =\n- $$$hostConfig.mountFundamentalComponent;\n-export const shouldUpdateFundamentalComponent =\n- $$$hostConfig.shouldUpdateFundamentalComponent;\n export const getInstanceFromNode = $$$hostConfig.getInstanceFromNode;\n export const isOpaqueHydratingObject = $$$hostConfig.isOpaqueHydratingObject;\n export const makeOpaqueHydratingObject =\n@@ -112,10 +106,6 @@ export const hideInstance = $$$hostConfig.hideInstance;\n export const hideTextInstance = $$$hostConfig.hideTextInstance;\n export const unhideInstance = $$$hostConfig.unhideInstance;\n export const unhideTextInstance = $$$hostConfig.unhideTextInstance;\n-export const updateFundamentalComponent =\n- $$$hostConfig.updateFundamentalComponent;\n-export const unmountFundamentalComponent =\n- $$$hostConfig.unmountFundamentalComponent;\n export const clearContainer = $$$hostConfig.clearContainer;\n \n \/\/ -------------------\n@@ -131,7 +121,6 @@ export const finalizeContainerChildren =\n export const replaceContainerChildren = $$$hostConfig.replaceContainerChildren;\n export const cloneHiddenInstance = $$$hostConfig.cloneHiddenInstance;\n export const cloneHiddenTextInstance = $$$hostConfig.cloneHiddenTextInstance;\n-export const cloneFundamentalInstance = $$$hostConfig.cloneInstance;\n \n \/\/ -------------------\n \/\/ Hydration\ndiff --git a\/packages\/react-test-renderer\/src\/ReactTestHostConfig.js b\/packages\/react-test-renderer\/src\/ReactTestHostConfig.js\nindex 5adf1ac406..6110a0de8c 100644\n--- a\/packages\/react-test-renderer\/src\/ReactTestHostConfig.js\n+++ b\/packages\/react-test-renderer\/src\/ReactTestHostConfig.js\n@@ -7,8 +7,6 @@\n * @flow\n *\/\n \n-import type {ReactFundamentalComponentInstance} from 'shared\/ReactTypes';\n-\n import {REACT_OPAQUE_ID_TYPE} from 'shared\/ReactSymbols';\n \n export type Type = string;\n@@ -299,54 +297,6 @@ export function unhideTextInstance(\n textInstance.isHidden = false;\n }\n \n-export function getFundamentalComponentInstance(\n- fundamentalInstance: ReactFundamentalComponentInstance,\n-): Instance {\n- const {impl, props, state} = fundamentalInstance;\n- return impl.getInstance(null, props, state);\n-}\n-\n-export function mountFundamentalComponent(\n- fundamentalInstance: ReactFundamentalComponentInstance,\n-): void {\n- const {impl, instance, props, state} = fundamentalInstance;\n- const onMount = impl.onMount;\n- if (onMount !== undefined) {\n- onMount(null, instance, props, state);\n- }\n-}\n-\n-export function shouldUpdateFundamentalComponent(\n- fundamentalInstance: ReactFundamentalComponentInstance,\n-): boolean {\n- const {impl, prevProps, props, state} = fundamentalInstance;\n- const shouldUpdate = impl.shouldUpdate;\n- if (shouldUpdate !== undefined) {\n- return shouldUpdate(null, prevProps, props, state);\n- }\n- return true;\n-}\n-\n-export function updateFundamentalComponent(\n- fundamentalInstance: ReactFundamentalComponentInstance,\n-): void {\n- const {impl, instance, prevProps, props, state} = fundamentalInstance;\n- const onUpdate = impl.onUpdate;\n- if (onUpdate !== undefined) {\n- onUpdate(null, instance, prevProps, props, state);\n- }\n-}\n-\n-export function unmountFundamentalComponent(\n- fundamentalInstance: ReactFundamentalComponentInstance,\n-): void {\n- const {impl, instance, props, state} = fundamentalInstance;\n- const onUnmount = impl.onUnmount;\n- if (onUnmount !== undefined) {\n- onUnmount(null, instance, props, state);\n- }\n-}\n-\n export function getInstanceFromNode(mockNode: Object) {\n const instance = nodeToInstanceMap.get(mockNode);\n if (instance !== undefined) {\ndiff --git a\/packages\/react\/index.js b\/packages\/react\/index.js\nindex 80e6591171..5319bb80be 100644\n--- a\/packages\/react\/index.js\n+++ b\/packages\/react\/index.js\n@@ -79,7 +79,6 @@ export {\n SuspenseList,\n SuspenseList as unstable_SuspenseList,\n unstable_LegacyHidden,\n- unstable_createFundamental,\n unstable_Scope,\n unstable_useOpaqueIdentifier,\n unstable_getCacheForType,\ndiff --git a\/packages\/react\/src\/React.js b\/packages\/react\/src\/React.js\nindex 84490ef902..70c92ff868 100644\n--- a\/packages\/react\/src\/React.js\n+++ b\/packages\/react\/src\/React.js\n@@ -58,7 +58,6 @@ import {\n } from '.\/ReactElementValidator';\n import {createMutableSource} from '.\/ReactMutableSource';\n import ReactSharedInternals from '.\/ReactSharedInternals';\n-import {createFundamental} from '.\/ReactFundamental';\n import {startTransition} from '.\/ReactStartTransition';\n \n \/\/ TODO: Move this branching into the other module instead and just re-export.\n@@ -116,8 +115,6 @@ export {\n getCacheForType as unstable_getCacheForType,\n useCacheRefresh as unstable_useCacheRefresh,\n REACT_CACHE_TYPE as unstable_Cache,\n- \/\/ enableFundamentalAPI\n- createFundamental as unstable_createFundamental,\n \/\/ enableScopeAPI\n REACT_SCOPE_TYPE as unstable_Scope,\n useOpaqueIdentifier as unstable_useOpaqueIdentifier,\ndiff --git a\/packages\/react\/src\/ReactFundamental.js b\/packages\/react\/src\/ReactFundamental.js\ndeleted file mode 100644\nindex ba5b220bc7..0000000000\n--- a\/packages\/react\/src\/ReactFundamental.js\n+++ \/dev\/null\n@@ -1,33 +0,0 @@\n-\/**\n- * Copyright (c) Facebook, Inc. and its affiliates.\n- *\n- * This source code is licensed under the MIT license found in the\n- * LICENSE file in the root directory of this source tree.\n- * @flow\n- *\/\n-\n-import type {\n- ReactFundamentalImpl,\n- ReactFundamentalComponent,\n-} from 'shared\/ReactTypes';\n-import {REACT_FUNDAMENTAL_TYPE} from 'shared\/ReactSymbols';\n-import {hasBadMapPolyfill} from '.\/BadMapPolyfill';\n-\n-export function createFundamental(\n- impl: ReactFundamentalImpl,\n-): ReactFundamentalComponent {\n- \/\/ We use responder as a Map key later on. When we have a bad\n- \/\/ polyfill, then we can't use it as a key as the polyfill tries\n- \/\/ to add a property to the object.\n- if (__DEV__ && !hasBadMapPolyfill) {\n- Object.freeze(impl);\n- }\n- const fundamentalComponent = {\n- $$typeof: REACT_FUNDAMENTAL_TYPE,\n- impl,\n- };\n- if (__DEV__) {\n- Object.freeze(fundamentalComponent);\n- }\n- return fundamentalComponent;\n-}\ndiff --git a\/packages\/shared\/ReactFeatureFlags.js b\/packages\/shared\/ReactFeatureFlags.js\nindex 53f9b744cb..842bbe4dfa 100644\n--- a\/packages\/shared\/ReactFeatureFlags.js\n+++ b\/packages\/shared\/ReactFeatureFlags.js\n@@ -60,9 +60,6 @@ export const enableSchedulerDebugging = false;\n \/\/ Disable javascript: URL strings in href for XSS protection.\n export const disableJavaScriptURLs = false;\n \n-\/\/ Experimental Host Component support.\n-export const enableFundamentalAPI = false;\n-\n \/\/ Experimental Scope support.\n export const enableScopeAPI = false;\n \ndiff --git a\/packages\/shared\/ReactSymbols.js b\/packages\/shared\/ReactSymbols.js\nindex d490ab417c..c2fcba6324 100644\n--- a\/packages\/shared\/ReactSymbols.js\n+++ b\/packages\/shared\/ReactSymbols.js\n@@ -25,7 +25,6 @@ export let REACT_SUSPENSE_TYPE = 0xead1;\n export let REACT_SUSPENSE_LIST_TYPE = 0xead8;\n export let REACT_MEMO_TYPE = 0xead3;\n export let REACT_LAZY_TYPE = 0xead4;\n-export let REACT_FUNDAMENTAL_TYPE = 0xead5;\n export let REACT_SCOPE_TYPE = 0xead7;\n export let REACT_OPAQUE_ID_TYPE = 0xeae0;\n export let REACT_DEBUG_TRACING_MODE_TYPE = 0xeae1;\n@@ -47,7 +46,6 @@ if (typeof Symbol === 'function' && Symbol.for) {\n REACT_SUSPENSE_LIST_TYPE = symbolFor('react.suspense_list');\n REACT_MEMO_TYPE = symbolFor('react.memo');\n REACT_LAZY_TYPE = symbolFor('react.lazy');\n- REACT_FUNDAMENTAL_TYPE = symbolFor('react.fundamental');\n REACT_SCOPE_TYPE = symbolFor('react.scope');\n REACT_OPAQUE_ID_TYPE = symbolFor('react.opaque.id');\n REACT_DEBUG_TRACING_MODE_TYPE = symbolFor('react.debug_trace_mode');\ndiff --git a\/packages\/shared\/ReactTypes.js b\/packages\/shared\/ReactTypes.js\nindex 99e1bbb9bc..01708f731e 100644\n--- a\/packages\/shared\/ReactTypes.js\n+++ b\/packages\/shared\/ReactTypes.js\n@@ -92,52 +92,6 @@ export const DiscreteEvent: EventPriority = 0;\n export const UserBlockingEvent: EventPriority = 1;\n export const ContinuousEvent: EventPriority = 2;\n \n-export type ReactFundamentalComponentInstance = {|\n- currentFiber: Object,\n- instance: mixed,\n- prevProps: null | Object,\n- props: Object,\n- impl: ReactFundamentalImpl,\n- state: Object,\n-|};\n-\n-export type ReactFundamentalImpl = {\n- displayName: string,\n- reconcileChildren: boolean,\n- getInitialState?: (props: Object) => Object,\n- getInstance: (context: C, props: Object, state: Object) => H,\n- getServerSideString?: (context: C, props: Object) => string,\n- getServerSideStringClose?: (context: C, props: Object) => string,\n- onMount: (context: C, instance: mixed, props: Object, state: Object) => void,\n- shouldUpdate?: (\n- context: C,\n- prevProps: null | Object,\n- nextProps: Object,\n- state: Object,\n- ) => boolean,\n- onUpdate?: (\n- context: C,\n- instance: mixed,\n- prevProps: null | Object,\n- nextProps: Object,\n- state: Object,\n- ) => void,\n- onUnmount?: (\n- context: C,\n- instance: mixed,\n- props: Object,\n- state: Object,\n- ) => void,\n- onHydrate?: (context: C, props: Object, state: Object) => boolean,\n- onFocus?: (context: C, props: Object, state: Object) => boolean,\n- ...\n-};\n-\n-export type ReactFundamentalComponent = {|\n- $$typeof: Symbol | number,\n- impl: ReactFundamentalImpl,\n-|};\n-\n export type ReactScope = {|\n $$typeof: Symbol | number,\n |};\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.native-fb.js b\/packages\/shared\/forks\/ReactFeatureFlags.native-fb.js\nindex a230930cb0..1200892cee 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.native-fb.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.native-fb.js\n@@ -28,7 +28,6 @@ export const disableJavaScriptURLs = false;\n export const disableInputAttributeSyncing = false;\n export const replayFailedUnitOfWorkWithInvokeGuardedCallback = __DEV__;\n export const warnAboutDeprecatedLifecycles = true;\n-export const enableFundamentalAPI = false;\n export const enableScopeAPI = false;\n export const enableCreateEventHandleAPI = false;\n export const warnAboutUnmockedScheduler = true;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js b\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js\nindex 0dc9bed575..3eb2d5e718 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js\n@@ -27,7 +27,6 @@ export const enableCache = false;\n export const disableJavaScriptURLs = false;\n export const disableInputAttributeSyncing = false;\n export const enableSchedulerDebugging = false;\n-export const enableFundamentalAPI = false;\n export const enableScopeAPI = false;\n export const enableCreateEventHandleAPI = false;\n export const warnAboutUnmockedScheduler = false;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js\nindex 5652b66a0b..0e95ccae41 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js\n@@ -27,7 +27,6 @@ export const enableCache = __EXPERIMENTAL__;\n export const disableJavaScriptURLs = false;\n export const disableInputAttributeSyncing = false;\n export const enableSchedulerDebugging = false;\n-export const enableFundamentalAPI = false;\n export const enableScopeAPI = false;\n export const enableCreateEventHandleAPI = false;\n export const warnAboutUnmockedScheduler = false;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.native.js b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.native.js\nindex 8962bcce36..ef7e948b2e 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.native.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.native.js\n@@ -27,7 +27,6 @@ export const enableCache = false;\n export const disableJavaScriptURLs = false;\n export const disableInputAttributeSyncing = false;\n export const enableSchedulerDebugging = false;\n-export const enableFundamentalAPI = false;\n export const enableScopeAPI = false;\n export const enableCreateEventHandleAPI = false;\n export const warnAboutUnmockedScheduler = false;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js\nindex 7905485bce..756c38694e 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js\n@@ -27,7 +27,6 @@ export const enableCache = false;\n export const enableSchedulerDebugging = false;\n export const disableJavaScriptURLs = false;\n export const disableInputAttributeSyncing = false;\n-export const enableFundamentalAPI = false;\n export const enableScopeAPI = true;\n export const enableCreateEventHandleAPI = false;\n export const warnAboutUnmockedScheduler = true;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.testing.js b\/packages\/shared\/forks\/ReactFeatureFlags.testing.js\nindex c1a20dd91a..d2240049e0 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.testing.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.testing.js\n@@ -27,7 +27,6 @@ export const enableCache = false;\n export const disableJavaScriptURLs = false;\n export const disableInputAttributeSyncing = false;\n export const enableSchedulerDebugging = false;\n-export const enableFundamentalAPI = false;\n export const enableScopeAPI = false;\n export const enableCreateEventHandleAPI = false;\n export const warnAboutUnmockedScheduler = false;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.testing.www.js b\/packages\/shared\/forks\/ReactFeatureFlags.testing.www.js\nindex c274d6a376..e80dfde724 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.testing.www.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.testing.www.js\n@@ -27,7 +27,6 @@ export const enableCache = false;\n export const disableJavaScriptURLs = true;\n export const disableInputAttributeSyncing = false;\n export const enableSchedulerDebugging = false;\n-export const enableFundamentalAPI = false;\n export const enableScopeAPI = true;\n export const enableCreateEventHandleAPI = true;\n export const warnAboutUnmockedScheduler = true;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.www.js b\/packages\/shared\/forks\/ReactFeatureFlags.www.js\nindex 2b1ba37ee8..640b0d6f3e 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.www.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.www.js\n@@ -71,8 +71,6 @@ export const disableModulePatternComponents = true;\n \n export const enableCreateEventHandleAPI = true;\n \n-export const enableFundamentalAPI = false;\n-\n export const enableScopeAPI = true;\n \n export const warnAboutUnmockedScheduler = true;\ndiff --git a\/packages\/shared\/isValidElementType.js b\/packages\/shared\/isValidElementType.js\nindex 0a361c4a22..7ad6b0766a 100644\n--- a\/packages\/shared\/isValidElementType.js\n+++ b\/packages\/shared\/isValidElementType.js\n@@ -19,7 +19,6 @@ import {\n REACT_SUSPENSE_LIST_TYPE,\n REACT_MEMO_TYPE,\n REACT_LAZY_TYPE,\n- REACT_FUNDAMENTAL_TYPE,\n REACT_SCOPE_TYPE,\n REACT_LEGACY_HIDDEN_TYPE,\n REACT_CACHE_TYPE,\n@@ -58,7 +57,6 @@ export default function isValidElementType(type: mixed) {\n type.$$typeof === REACT_PROVIDER_TYPE ||\n type.$$typeof === REACT_CONTEXT_TYPE ||\n type.$$typeof === REACT_FORWARD_REF_TYPE ||\n- type.$$typeof === REACT_FUNDAMENTAL_TYPE ||\n \/\/ This needs to include all possible module reference object\n \/\/ types supported by any Flight configuration anywhere since\n \/\/ we don't know which Flight build this will end up being used\n","commit":{"authorEmail":"dan.abramov@gmail.com","revision":"4ecf11977c46966d3deedcdc71f1280a34607d1d","subject":"Remove the Fundamental internals (#20745)","authorName":"Dan Abramov","authoredAt":"2021-02-05T20:36:55+00:00","shortRevision":"4ecf11977c"}}

dillon1000/react

Files changed