@plasmicapp/loader-react 1.0.415 → 1.0.417

package/dist/react-server.esm.js

@@ -55,7 +55,7 @@ import "server-only";
 
 // src/loader-server.tsx
 import { PlasmicModulesFetcher as PlasmicModulesFetcher2 } from "@plasmicapp/loader-core";
-import React2 from "react";
+import React3 from "react";
 import ReactDOM from "react-dom";
 import * as jsxDevRuntime from "react/jsx-dev-runtime";
 import * as jsxRuntime from "react/jsx-runtime";
@@ -926,6 +926,19 @@ var PlasmicComponentLoader = class {
   }
 };
 
+// src/react-utils.ts
+import * as React2 from "react";
+var REACT_MAJOR_VERSION = +React2.version.split(".")[0];
+function reactCurrentDispatcher() {
+  var _a2, _b, _c, _d, _e;
+  const r = React2;
+  if (REACT_MAJOR_VERSION <= 18) {
+    return (_b = (_a2 = r["__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED"]) == null ? void 0 : _a2.ReactCurrentDispatcher) == null ? void 0 : _b.current;
+  } else {
+    return (_e = (_c = r["__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE"]) == null ? void 0 : _c.H) != null ? _e : (_d = r["__SERVER_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE"]) == null ? void 0 : _d.H;
+  }
+}
+
 // src/swr-util.ts
 function swrSerialize(key) {
   if (typeof key === "function") {
@@ -1017,13 +1030,13 @@ function FakeDataProvider({
   const { readContextValue, setContextValue } = getPrepassContextEnv();
   const existingEnv = (_a2 = readContextValue(FakeDataContext)) != null ? _a2 : {};
   if (!name) {
-    return /* @__PURE__ */ React2.createElement(React2.Fragment, null, children);
+    return /* @__PURE__ */ React3.createElement(React3.Fragment, null, children);
   } else {
     setContextValue(FakeDataContext, __spreadProps(__spreadValues({}, existingEnv), {
       [name]: data,
       [mkMetaName(name)]: { hidden, advanced, label }
     }));
-    return /* @__PURE__ */ React2.createElement(React2.Fragment, null, children);
+    return /* @__PURE__ */ React3.createElement(React3.Fragment, null, children);
   }
 }
 var fakeApplySelector = (rawData, selector) => {
@@ -1100,7 +1113,7 @@ var FakeReactComponent = (_a = class {
   }
   initRender(props) {
     this.props = props;
-    const dispatcher = React2.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentDispatcher.current;
+    const dispatcher = reactCurrentDispatcher();
     const [state, setState] = dispatcher.useState({});
     this.state = state;
     this.setState = setState;
@@ -1130,14 +1143,14 @@ var InternalPrepassPlasmicLoader = class extends BaseInternalPlasmicComponentLoa
       },
       fetcher: new PlasmicModulesFetcher2(opts),
       builtinModules: {
-        react: __spreadProps(__spreadValues(__spreadProps(__spreadValues(__spreadValues({}, React2), { isRSC: true }), {
+        react: __spreadProps(__spreadValues(__spreadProps(__spreadValues(__spreadValues({}, React3), { isRSC: true }), {
           createContext: (defaultValue) => {
             const context = {
               _currentValue: defaultValue,
               displayName: "FakeContext",
               Provider: ({ value, children }) => {
                 getPrepassContextEnv().setContextValue(context, value);
-                return /* @__PURE__ */ React2.createElement(React2.Fragment, null, children);
+                return /* @__PURE__ */ React3.createElement(React3.Fragment, null, children);
               },
               Consumer: ({ children }) => children(getPrepassContextEnv().readContextValue(context))
             };
@@ -1147,24 +1160,34 @@ var InternalPrepassPlasmicLoader = class extends BaseInternalPlasmicComponentLoa
           [
             "useCallback",
             "useContext",
+            "useDebugValue",
             "useEffect",
             "useImperativeHandle",
-            "useDebugValue",
-            "useInsertionEffect",
             "useLayoutEffect",
             "useMemo",
-            "useSyncExternalStore",
             "useReducer",
             "useRef",
-            "useState"
+            "useState",
+            // React 18+
+            "useId",
+            "useInsertionEffect",
+            "useSyncExternalStore",
+            // React 19+
+            "use",
+            "useActionState",
+            "useEffectEvent",
+            "useOptimistic"
           ].map((hook) => [
             hook,
             (...args) => {
-              const dispatcher = React2.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentDispatcher.current;
+              const dispatcher = reactCurrentDispatcher();
               return dispatcher[hook](...args);
             }
           ])
         )), {
+          // TODO: ensure correct implementation in react-ssr-prepass and
+          //       merge with above array to rely on dispatcher
+          // React 18+
           useDeferredValue: (v) => v,
           useTransition: () => [
             false,
@@ -1172,10 +1195,10 @@ var InternalPrepassPlasmicLoader = class extends BaseInternalPlasmicComponentLoa
               f();
             }
           ],
-          createFactory: (type) => React2.createElement.bind(null, type),
+          createFactory: (type) => React3.createElement.bind(null, type),
           Component: FakeReactComponent,
           PureComponent: FakeReactComponent,
-          createElement: fakeCreateElement(React2.createElement)
+          createElement: fakeCreateElement(React3.createElement)
         }),
         "react-dom": ReactDOM,
         "react/jsx-runtime": __spreadValues(__spreadValues(__spreadValues(__spreadValues({}, jsxRuntime), jsxRuntime.jsx ? { jsx: fakeCreateElement(jsxRuntime.jsx) } : {}), jsxRuntime.jsxs ? { jsxs: fakeCreateElement(jsxRuntime.jsxs) } : {}), jsxRuntime.jsxDEV ? { jsxDEV: fakeCreateElement(jsxRuntime.jsxDEV) } : {}),
@@ -1184,7 +1207,7 @@ var InternalPrepassPlasmicLoader = class extends BaseInternalPlasmicComponentLoa
           addLoadingStateListener: () => noop,
           isPlasmicPrepass: () => true,
           PlasmicPrepassContext: {},
-          PlasmicQueryDataProvider: ({ children }) => /* @__PURE__ */ React2.createElement(React2.Fragment, null, children),
+          PlasmicQueryDataProvider: ({ children }) => /* @__PURE__ */ React3.createElement(React3.Fragment, null, children),
           useMutablePlasmicQueryData: fakeUseMutablePlasmicQueryData,
           usePlasmicDataConfig: fakeUsePlasmicDataConfig,
           usePlasmicQueryData: fakeUseMutablePlasmicQueryData,
@@ -1193,7 +1216,7 @@ var InternalPrepassPlasmicLoader = class extends BaseInternalPlasmicComponentLoa
           HeadMetadataContext: {
             _currentValue: {},
             displayName: "FakeHeadMetadataContext",
-            Provider: ({ children }) => /* @__PURE__ */ React2.createElement(React2.Fragment, null, children),
+            Provider: ({ children }) => /* @__PURE__ */ React3.createElement(React3.Fragment, null, children),
             Consumer: ({ children }) => children({})
           }
         },
@@ -1207,7 +1230,7 @@ var InternalPrepassPlasmicLoader = class extends BaseInternalPlasmicComponentLoa
               ({ children, value }) => {
                 const { setContextValue } = getPrepassContextEnv();
                 setContextValue(FakePlasmicDataSourceContext, value);
-                return /* @__PURE__ */ React2.createElement(React2.Fragment, null, children);
+                return /* @__PURE__ */ React3.createElement(React3.Fragment, null, children);
               },
               {
                 $$typeof: REACT_PROVIDER_TYPE,
@@ -1238,13 +1261,13 @@ var InternalPrepassPlasmicLoader = class extends BaseInternalPlasmicComponentLoa
               _currentValue: void 0
               // default value
             },
-            GlobalActionsProvider: ({ children }) => /* @__PURE__ */ React2.createElement(React2.Fragment, null, children),
+            GlobalActionsProvider: ({ children }) => /* @__PURE__ */ React3.createElement(React3.Fragment, null, children),
             mkMetaName,
             mkMetaValue: identity,
-            PageParamsProvider: ({ children }) => /* @__PURE__ */ React2.createElement(React2.Fragment, null, children),
+            PageParamsProvider: ({ children }) => /* @__PURE__ */ React3.createElement(React3.Fragment, null, children),
             PlasmicCanvasContext: { _currentValue: false },
             PlasmicCanvasHost: () => null,
-            PlasmicLinkProvider: ({ children }) => /* @__PURE__ */ React2.createElement(React2.Fragment, null, children),
+            PlasmicLinkProvider: ({ children }) => /* @__PURE__ */ React3.createElement(React3.Fragment, null, children),
             registerComponent: noop,
             registerFunction: noop,
             registerGlobalContext: noop,
@@ -1263,7 +1286,7 @@ var InternalPrepassPlasmicLoader = class extends BaseInternalPlasmicComponentLoa
             usePlasmicTranslator: () => void 0,
             PlasmicTranslatorContext: { _currentValue: void 0 },
             usePlasmicCanvasContext: () => false,
-            usePlasmicLink: () => (props) => /* @__PURE__ */ React2.createElement("a", __spreadValues({}, props)),
+            usePlasmicLink: () => (props) => /* @__PURE__ */ React3.createElement("a", __spreadValues({}, props)),
             usePlasmicLinkMaybe: () => void 0,
             useSelector: fakeUseSelector,
             useSelectors: fakeUseSelectors,
@@ -1312,18 +1335,18 @@ var InternalPrepassPlasmicLoader = class extends BaseInternalPlasmicComponentLoa
           const children = Array.isArray(serverInfo.children) ? serverInfo.children : [serverInfo.children];
           children.forEach((childData) => {
             contents.push(
-              /* @__PURE__ */ React2.createElement(ContextAndDataProviderWrapper, { contextAndData: childData }, childData.node)
+              /* @__PURE__ */ React3.createElement(ContextAndDataProviderWrapper, { contextAndData: childData }, childData.node)
             );
           });
-          return /* @__PURE__ */ React2.createElement(ContextAndDataProviderWrapper, { contextAndData: serverInfo }, contents);
+          return /* @__PURE__ */ React3.createElement(ContextAndDataProviderWrapper, { contextAndData: serverInfo }, contents);
         } else {
-          return /* @__PURE__ */ React2.createElement(
+          return /* @__PURE__ */ React3.createElement(
             ContextAndDataProviderWrapper,
             {
               contextAndData: serverInfo != null ? serverInfo : {}
             },
             Object.values(props).flat(Infinity).filter(
-              (v) => v && typeof v == "object" && v.$$typeof && React2.isValidElement(v)
+              (v) => v && typeof v == "object" && v.$$typeof && React3.isValidElement(v)
             )
           );
         }
@@ -1482,7 +1505,7 @@ function handlePrepassPlasmicComponent(props) {
     return null;
   }
   const Component = lookup.getComponent(spec, opts);
-  let element = /* @__PURE__ */ React2.createElement(Component, __spreadValues({}, componentProps));
+  let element = /* @__PURE__ */ React3.createElement(Component, __spreadValues({}, componentProps));
   if (isRootLoader) {
     const ReactWebRootProvider = lookup.getRootProvider();
     const GlobalContextsProvider = lookup.getGlobalContextsProvider({
@@ -1490,7 +1513,7 @@ function handlePrepassPlasmicComponent(props) {
       projectId
     });
     setContextValue(FakePlasmicComponentContext, true);
-    element = /* @__PURE__ */ React2.createElement(
+    element = /* @__PURE__ */ React3.createElement(
       ReactWebRootProvider,
       __spreadProps(__spreadValues({}, rest), {
         userAuthToken,
@@ -1504,7 +1527,7 @@ function handlePrepassPlasmicComponent(props) {
       element
     );
     if (GlobalContextsProvider) {
-      element = /* @__PURE__ */ React2.createElement(GlobalContextsProvider, __spreadValues({}, globalContextsProps), element);
+      element = /* @__PURE__ */ React3.createElement(GlobalContextsProvider, __spreadValues({}, globalContextsProps), element);
     }
   }
   return element;
@@ -1535,7 +1558,7 @@ function ContextAndDataProviderWrapper({
     });
   });
   setContextValue(FakeDataContext, $ctx);
-  return /* @__PURE__ */ React2.createElement(React2.Fragment, null, children);
+  return /* @__PURE__ */ React3.createElement(React3.Fragment, null, children);
 }
 
 // src/prepass-server.ts