@modern-js/plugin-garfish 2.65.3 → 2.65.5-alpha.0

package/dist/cjs/runtime/provider.js

@@ -25,17 +25,22 @@ var import_jsx_runtime = require("react/jsx-runtime");
 var import_browser = require("@meta/runtime/browser");
 var import_react = require("@meta/runtime/react");
 var import_react_dom = require("react-dom");
+function generateRootDom(dom, id) {
+  const mountNode = dom ? dom.querySelector(`#${id}`) || dom : document.getElementById(id);
+  return mountNode;
+}
 function createProvider(id, { customBootstrap, beforeRender } = {}) {
   return ({ basename, dom }) => {
     let root = null;
     return {
       async render({ basename: basename2, dom: dom2, props }) {
         const ModernRoot = (0, import_react.createRoot)(null);
+        const mountNode = generateRootDom(dom2, id || "root");
         if (customBootstrap) {
           root = await customBootstrap(ModernRoot, () => (0, import_browser.render)(/* @__PURE__ */ (0, import_jsx_runtime.jsx)(ModernRoot, {
             basename: basename2,
             ...props
-          }), dom2));
+          }), mountNode));
         } else {
           if (beforeRender) {
             await beforeRender(ModernRoot, {
@@ -46,7 +51,7 @@ function createProvider(id, { customBootstrap, beforeRender } = {}) {
           root = await (0, import_browser.render)(/* @__PURE__ */ (0, import_jsx_runtime.jsx)(ModernRoot, {
             basename: basename2,
             ...props
-          }), dom2);
+          }), mountNode);
         }
       },
       destroy({ dom: dom2 }) {

package/dist/esm/runtime/provider.js

@@ -5,6 +5,10 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { render } from "@meta/runtime/browser";
 import { createRoot } from "@meta/runtime/react";
 import { createPortal, unmountComponentAtNode } from "react-dom";
+function generateRootDom(dom, id) {
+  var mountNode = dom ? dom.querySelector("#".concat(id)) || dom : document.getElementById(id);
+  return mountNode;
+}
 function createProvider(id) {
   var _ref = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {}, customBootstrap = _ref.customBootstrap, beforeRender = _ref.beforeRender;
   return function(param) {
@@ -14,11 +18,12 @@ function createProvider(id) {
       render: function render1(param2) {
         var basename2 = param2.basename, dom2 = param2.dom, props = param2.props;
         return _async_to_generator(function() {
-          var ModernRoot;
+          var ModernRoot, mountNode;
           return _ts_generator(this, function(_state) {
             switch (_state.label) {
               case 0:
                 ModernRoot = createRoot(null);
+                mountNode = generateRootDom(dom2, id || "root");
                 if (!customBootstrap)
                   return [
                     3,
@@ -29,7 +34,7 @@ function createProvider(id) {
                   customBootstrap(ModernRoot, function() {
                     return render(/* @__PURE__ */ _jsx(ModernRoot, _object_spread({
                       basename: basename2
-                    }, props)), dom2);
+                    }, props)), mountNode);
                   })
                 ];
               case 1:
@@ -58,7 +63,7 @@ function createProvider(id) {
                   4,
                   render(/* @__PURE__ */ _jsx(ModernRoot, _object_spread({
                     basename: basename2
-                  }, props)), dom2)
+                  }, props)), mountNode)
                 ];
               case 5:
                 root = _state.sent();

package/dist/esm-node/runtime/provider.js

@@ -2,17 +2,22 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { render } from "@meta/runtime/browser";
 import { createRoot } from "@meta/runtime/react";
 import { createPortal, unmountComponentAtNode } from "react-dom";
+function generateRootDom(dom, id) {
+  const mountNode = dom ? dom.querySelector(`#${id}`) || dom : document.getElementById(id);
+  return mountNode;
+}
 function createProvider(id, { customBootstrap, beforeRender } = {}) {
   return ({ basename, dom }) => {
     let root = null;
     return {
       async render({ basename: basename2, dom: dom2, props }) {
         const ModernRoot = createRoot(null);
+        const mountNode = generateRootDom(dom2, id || "root");
         if (customBootstrap) {
           root = await customBootstrap(ModernRoot, () => render(/* @__PURE__ */ _jsx(ModernRoot, {
             basename: basename2,
             ...props
-          }), dom2));
+          }), mountNode));
         } else {
           if (beforeRender) {
             await beforeRender(ModernRoot, {
@@ -23,7 +28,7 @@ function createProvider(id, { customBootstrap, beforeRender } = {}) {
           root = await render(/* @__PURE__ */ _jsx(ModernRoot, {
             basename: basename2,
             ...props
-          }), dom2);
+          }), mountNode);
         }
       },
       destroy({ dom: dom2 }) {

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.65.3",
+  "version": "2.65.5-alpha.0",
   "jsnext:source": "./src/cli/index.ts",
   "types": "./dist/types/cli/index.d.ts",
   "typesVersions": {
@@ -69,12 +69,12 @@
     "debug": "4.3.7",
     "garfish": "^1.8.1",
     "react-loadable": "^5.5.0",
-    "@modern-js/plugin-v2": "2.65.3",
-    "@modern-js/runtime-utils": "2.65.3",
-    "@modern-js/utils": "2.65.3"
+    "@modern-js/runtime-utils": "2.65.4",
+    "@modern-js/utils": "2.65.4",
+    "@modern-js/plugin-v2": "2.65.4"
   },
   "peerDependencies": {
-    "@modern-js/runtime": "^2.65.3",
+    "@modern-js/runtime": "^2.65.4",
     "react": ">=17",
     "react-dom": ">=17"
   },
@@ -93,19 +93,18 @@
     "react-dom": "^18.3.1",
     "react-router-dom": "6.27.0",
     "typescript": "^5",
-    "@modern-js/app-tools": "2.65.3",
-    "@modern-js/core": "2.65.3",
-    "@modern-js/plugin-router-v5": "2.65.3",
-    "@modern-js/runtime": "2.65.3",
-    "@modern-js/types": "2.65.3",
-    "@scripts/build": "2.65.3",
-    "@scripts/jest-config": "2.65.3"
+    "@modern-js/app-tools": "2.65.4",
+    "@modern-js/core": "2.65.4",
+    "@modern-js/plugin-router-v5": "2.65.4",
+    "@modern-js/runtime": "2.65.4",
+    "@modern-js/types": "2.65.4",
+    "@scripts/build": "2.65.4",
+    "@scripts/jest-config": "2.65.4"
   },
   "sideEffects": false,
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public",
-    "provenance": true
+    "access": "public"
   },
   "scripts": {
     "new": "modern-lib new",