@builder.io/mitosis 0.5.2 → 0.5.3

package/dist/src/generators/react/generator.js

@@ -250,20 +250,23 @@ const getPropsDefinition = ({ json }) => {
         .join(',');
     return `${json.name}.defaultProps = {${defaultPropsString}};`;
 };
-const checkShouldAddUseClientDirective = (json, options) => {
+const isRSC = (json, options) => {
     var _a, _b;
+    // When using RSC generator, we check `componentType` field in metadata to determine if it's a server component
+    const componentType = (_b = (_a = json.meta.useMetadata) === null || _a === void 0 ? void 0 : _a.rsc) === null || _b === void 0 ? void 0 : _b.componentType;
+    if (options.rsc && (0, nullable_1.checkIsDefined)(componentType)) {
+        return componentType === 'server';
+    }
+    return !(0, rsc_1.checkIfIsClientComponent)(json);
+};
+const checkShouldAddUseClientDirective = (json, options) => {
     if (!options.addUseClientDirectiveIfNeeded)
         return false;
     if (options.type === 'native')
         return false;
     if (options.preact)
         return false;
-    // When using RSC generator, we check `componentType` field in metadata to determine if it's a server component
-    const componentType = (_b = (_a = json.meta.useMetadata) === null || _a === void 0 ? void 0 : _a.rsc) === null || _b === void 0 ? void 0 : _b.componentType;
-    if (options.rsc && (0, nullable_1.checkIsDefined)(componentType)) {
-        return componentType === 'client';
-    }
-    return (0, rsc_1.checkIfIsClientComponent)(json);
+    return !isRSC(json, options);
 };
 const _componentToReact = (json, options, isSubComponent = false) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
@@ -320,7 +323,9 @@ const _componentToReact = (json, options, isSubComponent = false) => {
     if ((0, context_1.hasContext)(json) && options.contextType !== 'prop-drill') {
         reactLibImports.add('useContext');
     }
-    if (allRefs.length || ((_g = json.hooks.onInit) === null || _g === void 0 ? void 0 : _g.code)) {
+    const shouldAddUseClientDirective = checkShouldAddUseClientDirective(json, options);
+    const shouldInlineOnInitHook = !shouldAddUseClientDirective && options.rsc && isRSC(json, options);
+    if (allRefs.length || (((_g = json.hooks.onInit) === null || _g === void 0 ? void 0 : _g.code) && !shouldInlineOnInitHook)) {
         reactLibImports.add('useRef');
     }
     if (!options.preact && hasPropRef) {
@@ -382,13 +387,15 @@ const _componentToReact = (json, options, isSubComponent = false) => {
     ${contextStr || ''}
 
     ${((_o = json.hooks.onInit) === null || _o === void 0 ? void 0 : _o.code)
-        ? `
+        ? shouldInlineOnInitHook
+            ? (0, state_2.processHookCode)({ str: json.hooks.onInit.code, options })
+            : `
         const hasInitialized = useRef(false);
         if (!hasInitialized.current) {
           ${(0, state_2.processHookCode)({
-            str: json.hooks.onInit.code,
-            options,
-        })}
+                str: json.hooks.onInit.code,
+                options,
+            })}
           hasInitialized.current = true;
         }
         `
@@ -445,7 +452,6 @@ const _componentToReact = (json, options, isSubComponent = false) => {
       ${wrap ? (0, helpers_2.closeFrag)(options) : ''}
     );
   `;
-    const shouldAddUseClientDirective = checkShouldAddUseClientDirective(json, options);
     const str = (0, dedent_1.dedent) `
   ${shouldAddUseClientDirective ? `'use client';` : ''}
   ${getDefaultImport(json, options)}

package/package.json

@@ -22,7 +22,7 @@
     "name": "Builder.io",
     "url": "https://www.builder.io"
   },
-  "version": "0.5.2",
+  "version": "0.5.3",
   "homepage": "https://github.com/BuilderIO/mitosis",
   "main": "./dist/src/index.js",
   "exports": {