Move useMemoCache hook to react/compiler-runtime

For Meta-internal purposes, we keep the export on `react` itself to reduce churn.
facebook · Apr 29, 2024 · e2aa58f · e2aa58f
1 parent 190cc99
commit e2aa58f
Show file tree

Hide file tree

Showing 15 changed files with 61 additions and 11 deletions.
diff --git a/packages/react-debug-tools/src/__tests__/ReactHooksInspectionIntegration-test.js b/packages/react-debug-tools/src/__tests__/ReactHooksInspectionIntegration-test.js
@@ -37,7 +37,7 @@ describe('ReactHooksInspectionIntegration', () => {
     ReactDOM = require('react-dom');
     act = require('internal-test-utils').act;
     ReactDebugTools = require('react-debug-tools');
-    useMemoCache = React.unstable_useMemoCache;
+    useMemoCache = require('react/compiler-runtime').c;
   });
 
   it('should inspect the current state of useState hooks', async () => {

diff --git a/packages/react-devtools-shell/src/app/InspectableElements/UseMemoCache.js b/packages/react-devtools-shell/src/app/InspectableElements/UseMemoCache.js
@@ -1,7 +1,8 @@
 import * as React from 'react';
+import {c} from 'react/compiler-runtime';
 
 export default function UseMemoCache(): React.Node {
-  React.unstable_useMemoCache(1);
+  c(1);
 
   return null;
 }
diff --git a/packages/react-reconciler/src/__tests__/useMemoCache-test.js b/packages/react-reconciler/src/__tests__/useMemoCache-test.js
@@ -27,8 +27,8 @@ describe('useMemoCache()', () => {
     Scheduler = require('scheduler');
     act = require('internal-test-utils').act;
     assertLog = require('internal-test-utils').assertLog;
+    useMemoCache = require('react/compiler-runtime').c;
     useState = React.useState;
-    useMemoCache = React.unstable_useMemoCache;
     MemoCacheSentinel = Symbol.for('react.memo_cache_sentinel');
 
     class _ErrorBoundary extends React.Component {

diff --git a/packages/react/compiler-runtime.js b/packages/react/compiler-runtime.js
@@ -0,0 +1,10 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ */
+
+export {useMemoCache as c} from './src/ReactHooks';
diff --git a/packages/react/index.classic.fb.js b/packages/react/index.classic.fb.js
@@ -36,7 +36,6 @@ export {
   unstable_SuspenseList,
   unstable_getCacheForType,
   unstable_useCacheRefresh,
-  unstable_useMemoCache,
   useId,
   useCallback,
   useContext,
@@ -57,4 +56,12 @@ export {
   useActionState,
   version,
 } from './src/ReactClient';
+
 export {jsx, jsxs, jsxDEV} from './src/jsx/ReactJSX';
+
+// export for backwards compatibility during upgrade
+export {useMemoCache as unstable_useMemoCache} from './src/ReactHooks';
+
+// export to match the name of the OSS function typically exported from
+// react/compiler-runtime
+export {useMemoCache as c} from './src/ReactHooks';
diff --git a/packages/react/index.experimental.js b/packages/react/index.experimental.js
@@ -34,7 +34,6 @@ export {
   unstable_getCacheForType,
   unstable_SuspenseList,
   unstable_useCacheRefresh,
-  unstable_useMemoCache,
   useId,
   useCallback,
   useContext,

diff --git a/packages/react/index.js b/packages/react/index.js
@@ -57,7 +57,6 @@ export {
   unstable_TracingMarker,
   unstable_getCacheForType,
   unstable_useCacheRefresh,
-  unstable_useMemoCache,
   useId,
   useCallback,
   useContext,

diff --git a/packages/react/index.modern.fb.js b/packages/react/index.modern.fb.js
@@ -36,7 +36,6 @@ export {
   unstable_TracingMarker,
   unstable_getCacheForType,
   unstable_useCacheRefresh,
-  unstable_useMemoCache,
   useId,
   useCallback,
   useContext,
@@ -58,3 +57,10 @@ export {
   version,
 } from './src/ReactClient';
 export {jsx, jsxs, jsxDEV} from './src/jsx/ReactJSX';
+
+// export for backwards compatibility during upgrade
+export {useMemoCache as unstable_useMemoCache} from './src/ReactHooks';
+
+// export to match the name of the OSS function typically exported from
+// react/compiler-runtime
+export {useMemoCache as c} from './src/ReactHooks';
diff --git a/packages/react/npm/compiler-runtime.js b/packages/react/npm/compiler-runtime.js
@@ -0,0 +1,7 @@
+'use strict';
+
+if (process.env.NODE_ENV === 'production') {
+  module.exports = require('./cjs/react-compiler-runtime.production.js');
+} else {
+  module.exports = require('./cjs/react-compiler-runtime.development.js');
+}
diff --git a/packages/react/npm/jsx-dev-runtime.js b/packages/react/npm/jsx-dev-runtime.js
@@ -1,3 +1,10 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
 'use strict';
 
 if (process.env.NODE_ENV === 'production') {

diff --git a/packages/react/package.json b/packages/react/package.json
@@ -13,6 +13,7 @@
     "README.md",
     "index.js",
     "cjs/",
+    "compiler-runtime.js",
     "jsx-runtime.js",
     "jsx-runtime.react-server.js",
     "jsx-dev-runtime.js",
@@ -34,6 +35,10 @@
       "react-server": "./jsx-dev-runtime.react-server.js",
       "default": "./jsx-dev-runtime.js"
     },
+    "./compiler-runtime": {
+      "react-server": "./compiler-runtime.js",
+      "default": "./compiler-runtime.js"
+    },
     "./src/*": "./src/*"
   },
   "repository": {

diff --git a/packages/react/src/ReactClient.js b/packages/react/src/ReactClient.js
@@ -55,7 +55,6 @@ import {
   useId,
   useCacheRefresh,
   use,
-  useMemoCache,
   useOptimistic,
   useActionState,
 } from './ReactHooks';
@@ -117,7 +116,6 @@ export {
   getCacheForType as unstable_getCacheForType,
   useCacheRefresh as unstable_useCacheRefresh,
   use,
-  useMemoCache as unstable_useMemoCache,
   // enableScopeAPI
   REACT_SCOPE_TYPE as unstable_Scope,
   // enableTransitionTracing

diff --git a/packages/shared/ReactFeatureFlags.js b/packages/shared/ReactFeatureFlags.js
@@ -102,7 +102,7 @@ export const enableSuspenseAvoidThisFallbackFizz = false;
 
 export const enableCPUSuspense = __EXPERIMENTAL__;
 
-// Enables unstable_useMemoCache hook, intended as a compilation target for
+// Enables useMemoCache hook, intended as a compilation target for
 // auto-memoization.
 export const enableUseMemoCacheHook = __EXPERIMENTAL__;
 // Test this at Meta before enabling.

diff --git a/packages/shared/forks/ReactFeatureFlags.test-renderer.js b/packages/shared/forks/ReactFeatureFlags.test-renderer.js
@@ -36,7 +36,7 @@ export const disableTextareaChildren = false;
 export const enableSuspenseAvoidThisFallback = false;
 export const enableSuspenseAvoidThisFallbackFizz = false;
 export const enableCPUSuspense = false;
-export const enableUseMemoCacheHook = true;
+export const enableUseMemoCacheHook = __EXPERIMENTAL__;
 export const enableNoCloningMemoCache = false;
 export const enableUseEffectEventHook = false;
 export const favorSafetyOverHydrationPerf = true;

diff --git a/scripts/rollup/bundles.js b/scripts/rollup/bundles.js
@@ -115,6 +115,17 @@ const bundles = [
     externals: ['react', 'ReactNativeInternalFeatureFlags'],
   },
 
+  /******* Compiler Runtime *******/
+  {
+    bundleTypes: [NODE_DEV, NODE_PROD, NODE_PROFILING],
+    moduleType: ISOMORPHIC,
+    entry: 'react/compiler-runtime',
+    global: 'CompilerRuntime',
+    minifyWithProdErrorCodes: true,
+    wrapWithModuleBoundaries: false,
+    externals: ['react'],
+  },
+
   /******* React JSX Runtime React Server *******/
   {
     bundleTypes: [NODE_DEV, NODE_PROD],