@modern-js/runtime 1.21.5 → 2.0.0-beta.1

package/dist/js/modern/core/loader/useLoader.js

@@ -1,14 +1,10 @@
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 import { useContext, useRef, useMemo, useState, useCallback, useEffect } from 'react';
 import invariant from 'invariant';
 import { RuntimeReactContext } from "../../runtime-context";
 import { LoaderStatus } from "./loaderManager";
-
 const useLoader = (loaderFn, options = {
   params: undefined
 }) => {
@@ -18,29 +14,24 @@ const useLoader = (loaderFn, options = {
     loaderManager
   } = context;
   const loaderRef = useRef();
-  const unlistenLoaderChangeRef = useRef(null); // SSR render should ignore `_cache` prop
+  const unlistenLoaderChangeRef = useRef(null);
 
+  // SSR render should ignore `_cache` prop
   if (isSSRRender && Object.prototype.hasOwnProperty.call(options, '_cache')) {
     delete options._cache;
   }
-
   const load = useCallback(params => {
     var _unlistenLoaderChange, _window, _window$_SSR_DATA, _window$_SSR_DATA$dat, _window$_SSR_DATA$dat2, _loaderRef$current2;
-
     if (typeof params === 'undefined') {
       var _loaderRef$current;
-
       return (_loaderRef$current = loaderRef.current) === null || _loaderRef$current === void 0 ? void 0 : _loaderRef$current.load();
     }
-
     const id = loaderManager.add(() => {
       try {
         const res = loaderFn(context, params);
-
         if (res instanceof Promise) {
           return res;
         }
-
         return Promise.resolve(res);
       } catch (e) {
         return Promise.reject(e);
@@ -48,37 +39,31 @@ const useLoader = (loaderFn, options = {
     }, _objectSpread(_objectSpread({}, options), {}, {
       params
     }));
-    loaderRef.current = loaderManager.get(id); // unsubscribe old loader onChange event
-
+    loaderRef.current = loaderManager.get(id);
+    // unsubscribe old loader onChange event
     (_unlistenLoaderChange = unlistenLoaderChangeRef.current) === null || _unlistenLoaderChange === void 0 ? void 0 : _unlistenLoaderChange.call(unlistenLoaderChangeRef);
-
     if (isSSRRender) {
       return undefined;
-    } // skip this loader, then try to unlisten loader change
-
+    }
 
+    // skip this loader, then try to unlisten loader change
     if (options.skip) {
       return undefined;
-    } // do not load data again in CSR hydrate stage if SSR data exists
-
+    }
 
+    // do not load data again in CSR hydrate stage if SSR data exists
     if (context._hydration && ((_window = window) === null || _window === void 0 ? void 0 : (_window$_SSR_DATA = _window._SSR_DATA) === null || _window$_SSR_DATA === void 0 ? void 0 : (_window$_SSR_DATA$dat = _window$_SSR_DATA.data) === null || _window$_SSR_DATA$dat === void 0 ? void 0 : (_window$_SSR_DATA$dat2 = _window$_SSR_DATA$dat.loadersData[id]) === null || _window$_SSR_DATA$dat2 === void 0 ? void 0 : _window$_SSR_DATA$dat2.error) === null) {
       return undefined;
     }
-
     const res = loaderRef.current.load();
     unlistenLoaderChangeRef.current = (_loaderRef$current2 = loaderRef.current) === null || _loaderRef$current2 === void 0 ? void 0 : _loaderRef$current2.onChange((_status, _result) => {
       setResult(_result);
-
       if (_status === LoaderStatus.fulfilled) {
         var _options$onSuccess;
-
         options === null || options === void 0 ? void 0 : (_options$onSuccess = options.onSuccess) === null || _options$onSuccess === void 0 ? void 0 : _options$onSuccess.call(options, _result.data);
       }
-
       if (_status === LoaderStatus.rejected) {
         var _options$onError;
-
         options === null || options === void 0 ? void 0 : (_options$onError = options.onError) === null || _options$onError === void 0 ? void 0 : _options$onError.call(options, _result.error);
       }
     });
@@ -86,12 +71,10 @@ const useLoader = (loaderFn, options = {
   }, [options.skip]);
   useEffect(() => () => {
     var _unlistenLoaderChange2;
-
     (_unlistenLoaderChange2 = unlistenLoaderChangeRef.current) === null || _unlistenLoaderChange2 === void 0 ? void 0 : _unlistenLoaderChange2.call(unlistenLoaderChangeRef);
   }, []);
   useMemo(() => {
     var _options$params;
-
     const p = (_options$params = options.params) !== null && _options$params !== void 0 ? _options$params : loaderFn.id;
     invariant(typeof p !== 'undefined' && p !== null, 'Params is required in useLoader');
     load(p);
@@ -101,5 +84,4 @@ const useLoader = (loaderFn, options = {
     reload: load
   });
 };
-
 export default useLoader;

package/dist/js/modern/core/plugin.js

@@ -1,12 +1,8 @@
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 import { createManager, createPipeline, createAsyncPipeline } from '@modern-js/plugin';
 import { createLoaderManager } from "./loader/loaderManager";
-const hoc = createPipeline(); // eslint-disable-next-line @typescript-eslint/no-empty-interface
+const hoc = createPipeline();
+
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
 
 const provide = createPipeline();
 const client = createAsyncPipeline();
@@ -21,43 +17,25 @@ const runtimeHooks = {
   init,
   pickContext
 };
+
 /** All hooks of runtime plugin. */
 
 export const createRuntime = () => createManager(runtimeHooks);
+
 /**
  * register init hook. It would be revoked both ssr and csr.
  */
-
 const registerInit = (App, _init) => {
   const originalInit = App.init;
-
   App.init = async context => {
     if (!context.loaderManager) {
       context.loaderManager = createLoaderManager({});
     }
-
     await Promise.all([originalInit === null || originalInit === void 0 ? void 0 : originalInit(context), _init === null || _init === void 0 ? void 0 : _init(context)]);
   };
 };
-/**
- * register prefetch hook. It would be revoked both ssr and csr.
- * But if ssr success, It wont exec in csr again.
- * If ssr prefetch failed, It will fallback to exec in csr.
- */
-
-
-const registerPrefetch = (App, prefetch) => {
-  const originalPrefetch = App.prefetch;
-
-  App.prefetch = async context => {
-    const originResult = await (originalPrefetch === null || originalPrefetch === void 0 ? void 0 : originalPrefetch(context));
-    const result = await (prefetch === null || prefetch === void 0 ? void 0 : prefetch(context));
-    return _objectSpread(_objectSpread({}, originResult), result);
-  };
-};
-
 export const runtime = createRuntime();
 export const {
   createPlugin
 } = runtime;
-export { registerInit, registerPrefetch };
+export { registerInit };

package/dist/js/modern/document/Body.js

@@ -0,0 +1,17 @@
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+import React, { useContext } from 'react';
+import { DOCUMENT_CHUNKSMAP_PLACEHOLDER, DOCUMENT_SSRDATASCRIPT_PLACEHOLDER } from "./constants";
+import { DocumentStructrueContext } from "./DocumentStructrueContext";
+import { DefaultRoot } from "./Root";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+export function Body(props) {
+  const {
+    hasSetRoot
+  } = useContext(DocumentStructrueContext);
+  const {
+    children
+  } = props;
+  return /*#__PURE__*/_jsxs("body", {
+    children: [hasSetRoot ? null : DefaultRoot, children, `${DOCUMENT_CHUNKSMAP_PLACEHOLDER}`, `${DOCUMENT_SSRDATASCRIPT_PLACEHOLDER}`]
+  });
+}

package/dist/js/modern/document/DocumentContext.js

@@ -0,0 +1,6 @@
+import React from 'react';
+export const DocumentContext = /*#__PURE__*/React.createContext({
+  config: {},
+  templateParams: {},
+  processEnv: {}
+});

package/dist/js/modern/document/DocumentStructrueContext.js

@@ -0,0 +1,7 @@
+import React from 'react';
+export const DocumentStructrueContext = /*#__PURE__*/React.createContext({
+  hasSetHead: false,
+  hasSetScripts: false,
+  hasSetBody: false,
+  hasSetRoot: false
+});

package/dist/js/modern/document/Head.js

@@ -0,0 +1,24 @@
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+import React, { useContext } from 'react';
+import { DocumentStructrueContext } from "./DocumentStructrueContext";
+import { Scripts } from "./Scripts";
+import { DOCUMENT_META_PLACEHOLDER } from "./constants";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+export function Head(props) {
+  const {
+    hasSetScripts
+  } = useContext(DocumentStructrueContext);
+  const {
+    children
+  } = props;
+  // todo: verify the children
+  return /*#__PURE__*/_jsxs("head", {
+    children: [`${DOCUMENT_META_PLACEHOLDER}`, !hasSetScripts && /*#__PURE__*/_jsx(Scripts, {}), children]
+  });
+}
+export function DefaultHead() {
+  return /*#__PURE__*/_jsx("head", {
+    children: `${DOCUMENT_META_PLACEHOLDER}`
+  });
+}

package/dist/js/modern/document/Html.js

@@ -0,0 +1,92 @@
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+import React from 'react';
+import { Body } from "./Body";
+import { DocumentStructrueContext } from "./DocumentStructrueContext";
+import { Head } from "./Head";
+
+/**
+ * get the directly son element
+ */
+import { jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
+function findTargetChild(tag, children) {
+  return children.find(item => getEleType(item) === tag);
+}
+
+/**
+ * get the type of react element
+ */
+function getEleType(ele) {
+  // fixme: 非 react 的类型，有点儿问题。
+  return typeof (ele === null || ele === void 0 ? void 0 : ele.type) === 'function' ? ele.type.name : ele === null || ele === void 0 ? void 0 : ele.type;
+}
+
+/**
+ * get the children(grandChild included) with target type
+ * @param tag the element type
+ * @param children son element
+ * @returns target element
+ */
+function findTargetElement(tag, children) {
+  if (children.length === 0) {
+    return null;
+  }
+  let nextChildren = [];
+  for (const item of children) {
+    var _item$props;
+    if (tag === getEleType(item)) {
+      return item;
+    }
+    if (item !== null && item !== void 0 && (_item$props = item.props) !== null && _item$props !== void 0 && _item$props.children) {
+      nextChildren = nextChildren.concat(item.props.children);
+    }
+  }
+  return findTargetElement(tag, nextChildren);
+}
+export function Html(props) {
+  const {
+    children
+  } = props;
+
+  // deal with the component with default
+  const hasSetHead = Boolean(findTargetChild('Head', children));
+  const hasSetScripts = Boolean(findTargetElement('Scripts', children));
+  const hasSetBody = Boolean(findTargetChild('Body', children));
+  const hasSetRoot = Boolean(findTargetElement('Root', children));
+  const notMissMustChild = [hasSetHead, hasSetBody
+  // hasSetScripts,
+  // hasSetRoot,
+  ].every(item => item);
+
+  // todo: or throw an error
+  if (!notMissMustChild) {
+    return /*#__PURE__*/_jsx("html", {
+      children: /*#__PURE__*/_jsxs("body", {
+        style: {
+          color: 'red'
+        },
+        children: [`Miss the `, [hasSetHead, hasSetBody
+        // hasSetScripts,
+        // hasSetRoot,
+        ].map((item, index) => {
+          return item ? null : ['Head', 'Body'
+          // 'Scripts',
+          // 'Root',
+          ][index];
+        }), ` Element`]
+      })
+    });
+  }
+  return /*#__PURE__*/_jsx("html", {
+    children: /*#__PURE__*/_jsxs(DocumentStructrueContext.Provider, {
+      value: {
+        hasSetHead,
+        hasSetScripts,
+        hasSetRoot,
+        hasSetBody,
+        docChild: children
+      },
+      children: [!hasSetHead && /*#__PURE__*/_jsx(Head, {}), !hasSetBody && /*#__PURE__*/_jsx(Body, {}), children]
+    })
+  });
+}

package/dist/js/modern/document/Root.js

@@ -0,0 +1,31 @@
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+import React, { useContext } from 'react';
+import { DocumentContext } from "./DocumentContext";
+import { DOCUMENT_SSR_PLACEHOLDER } from "./constants";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+export function Root(props) {
+  const {
+    rootId,
+    children
+  } = props;
+  const {
+    templateParams: {
+      mountId = 'root'
+    }
+  } = useContext(DocumentContext);
+  return /*#__PURE__*/_jsxs("div", {
+    id: `${rootId || mountId}`,
+    children: [`${DOCUMENT_SSR_PLACEHOLDER}`, children]
+  });
+}
+export function DefaultRoot(props) {
+  const {
+    templateParams: {
+      mountId
+    }
+  } = useContext(DocumentContext);
+  return /*#__PURE__*/_jsxs("div", {
+    id: `${mountId}`,
+    children: [`${DOCUMENT_SSR_PLACEHOLDER}`, props.children]
+  });
+}

package/dist/js/modern/document/Scripts.js

@@ -0,0 +1,10 @@
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+import React from 'react';
+import { DOCUMENT_SCRIPTS_PLACEHOLDER } from "./constants";
+import { Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
+export function Scripts() {
+  return /*#__PURE__*/_jsx(_Fragment, {
+    children: `${DOCUMENT_SCRIPTS_PLACEHOLDER}`
+  });
+}

package/dist/js/modern/document/cli/index.js

@@ -0,0 +1,130 @@
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+import path from 'path';
+import React from 'react';
+import ReactDomServer from 'react-dom/server';
+import { build } from 'esbuild';
+import { createDebugger, findExists } from '@modern-js/utils';
+import { DocumentContext } from "../DocumentContext";
+import { DOCUMENT_SCRIPTS_PLACEHOLDER, DOCUMENT_FILE_NAME, DOCUMENT_META_PLACEHOLDER, PLACEHOLDER_REPLACER_MAP, DOC_EXT, DOCUMENT_SSR_PLACEHOLDER, DOCUMENT_CHUNKSMAP_PLACEHOLDER, DOCUMENT_SSRDATASCRIPT_PLACEHOLDER, HTML_SEPARATOR } from "../constants";
+const debug = createDebugger('html_genarate');
+const getDocumenByEntryName = function getDocumenByEntryName(entrypoints, entryName) {
+  var _entrypoints$find;
+  const entryDir = (_entrypoints$find = entrypoints.find(item => item.entryName === entryName)) === null || _entrypoints$find === void 0 ? void 0 : _entrypoints$find.absoluteEntryDir;
+  const docFile = findExists(DOC_EXT.map(item => `${entryDir}${path.sep}${DOCUMENT_FILE_NAME}.${item}`));
+  return docFile || undefined;
+};
+export default (() => ({
+  name: '@modern-js/plugin-document',
+  pre: ['@modern-js/plugin-analyze'],
+  setup: async api => {
+    // get params for document.tsx
+    function getDocParams(params) {
+      const {
+        config,
+        templateParameters,
+        entryName
+      } = params;
+      // for enough params, devide as：process, config, templateParams
+      return {
+        processEnv: process.env,
+        config: {
+          output: config.output
+        },
+        entryName,
+        templateParams: templateParameters
+      };
+    }
+    const documentEntry = (entryName, templateParameters) => {
+      const {
+        entrypoints,
+        internalDirectory
+      } = api.useAppContext();
+      // search the document.[tsx|jsx|js|ts] under entry
+      // if not, use main as default
+      let documentFilePath = getDocumenByEntryName(entrypoints, entryName);
+      if (!documentFilePath) {
+        documentFilePath = getDocumenByEntryName(entrypoints, 'main');
+      }
+      // if no document file, do nothing as default
+      if (!documentFilePath) {
+        return null;
+      }
+      return async ({
+        htmlWebpackPlugin
+      }) => {
+        const documentParams = getDocParams({
+          config: api.useConfigContext(),
+          entryName,
+          templateParameters
+        });
+        const htmlOutputFile = path.join(internalDirectory, `./document/_${entryName}.html.js`);
+        // transform document file to html string
+        await build({
+          entryPoints: [documentFilePath],
+          // write: false,
+          outfile: htmlOutputFile,
+          platform: 'node',
+          target: 'es6',
+          loader: {
+            '.ts': 'ts',
+            '.tsx': 'tsx'
+          },
+          bundle: true,
+          plugins: [{
+            name: 'make-all-packages-external',
+            setup(build) {
+              // https://github.com/evanw/esbuild/issues/619#issuecomment-751995294
+              build.onResolve({
+                filter: /^[^./]|^\.[^./]|^\.\.[^/]/
+              }, args => {
+                let external = true;
+                // FIXME: windows external entrypoint
+                if (args.kind === 'entry-point') {
+                  external = false;
+                }
+                return {
+                  path: args.path,
+                  external
+                };
+              });
+            }
+          }]
+        });
+        const Document = (await import(htmlOutputFile)).default;
+        const HTMLElement = /*#__PURE__*/React.createElement(DocumentContext.Provider, {
+          value: documentParams
+        }, /*#__PURE__*/React.createElement(Document, null));
+        const html = ReactDomServer.renderToStaticMarkup(HTMLElement);
+        debug("entry %s's document jsx rendered html: %o", entryName, html);
+        const scripts = [htmlWebpackPlugin.tags.headTags.filter(item => item.tagName === 'script').join(''), htmlWebpackPlugin.tags.bodyTags.toString()].join('');
+        const metas = [templateParameters.meta, htmlWebpackPlugin.tags.headTags.filter(item => item.tagName !== 'script').join('')].join('');
+
+        // replace the html placeholder while transfer string to jsx component is not a easy way
+        return `<!DOCTYPE html>${html}`.replace(DOCUMENT_META_PLACEHOLDER, metas).replace(DOCUMENT_SSR_PLACEHOLDER, HTML_SEPARATOR).replace(DOCUMENT_SCRIPTS_PLACEHOLDER, scripts).replace(DOCUMENT_CHUNKSMAP_PLACEHOLDER, PLACEHOLDER_REPLACER_MAP[DOCUMENT_CHUNKSMAP_PLACEHOLDER]).replace(DOCUMENT_SSRDATASCRIPT_PLACEHOLDER, PLACEHOLDER_REPLACER_MAP[DOCUMENT_SSRDATASCRIPT_PLACEHOLDER]);
+      };
+    };
+    return {
+      config: () => {
+        return {
+          tools: {
+            htmlPlugin: (options, entry) => {
+              // just for reuse the baseParames calculate by builder:
+              // https://github.com/modern-js-dev/modern.js/blob/1abb452a87ae1adbcf8da47d62c05da39cbe4d69/packages/builder/builder-webpack-provider/src/plugins/html.ts#L69-L103
+              const hackParameters = typeof (options === null || options === void 0 ? void 0 : options.templateParameters) === 'function' ? options === null || options === void 0 ? void 0 : options.templateParameters({}, {}, {}, {}) : _objectSpread({}, options === null || options === void 0 ? void 0 : options.templateParameters);
+              const templateContent = documentEntry(entry.entryName,
+              // options,
+              hackParameters);
+              const documentHtmlOptions = templateContent ? {
+                templateContent,
+                inject: false
+              } : {};
+              return _objectSpread(_objectSpread({}, options), documentHtmlOptions);
+            }
+          }
+        };
+      }
+    };
+  }
+}));

package/dist/js/modern/document/constants.js

@@ -0,0 +1,19 @@
+export const DOC_EXT = ['jsx', 'tsx', 'ts', 'js'];
+export const DOCUMENT_META_PLACEHOLDER = encodeURIComponent('<%= meta %>');
+export const HTML_SEPARATOR = '<!--<?- html ?>-->';
+export const HTML_CHUNKSMAP_SEPARATOR = '<!--<?- chunksMap.js ?>-->';
+export const HTML_SSRDATASCRIPT_SEPARATOR = '<!--<?- SSRDataScript ?>-->';
+// export const HTML_BOTTOMTPL_SEPARATOR = '<!--<?- bottomTemplate ?>-->'; // document jsx not need bottom
+
+export const DOCUMENT_SSR_PLACEHOLDER = encodeURIComponent(HTML_SEPARATOR);
+export const DOCUMENT_CHUNKSMAP_PLACEHOLDER = encodeURIComponent(HTML_CHUNKSMAP_SEPARATOR);
+export const DOCUMENT_SSRDATASCRIPT_PLACEHOLDER = encodeURIComponent(HTML_SSRDATASCRIPT_SEPARATOR);
+export const DOCUMENT_FILE_NAME = 'document';
+export const DOCUMENT_SCRIPTS_PLACEHOLDER = encodeURIComponent('<!-- chunk scripts placeholder -->');
+export const DOCUMENT_NO_SCRIPTE_PLACEHOLDER = encodeURIComponent('<!-- no-script -->');
+export const PLACEHOLDER_REPLACER_MAP = {
+  [DOCUMENT_NO_SCRIPTE_PLACEHOLDER]: `We're sorry but react app doesn't work properly without JavaScript enabled. Please enable it to continue.`,
+  [DOCUMENT_SSR_PLACEHOLDER]: HTML_SEPARATOR,
+  [DOCUMENT_CHUNKSMAP_PLACEHOLDER]: HTML_CHUNKSMAP_SEPARATOR,
+  [DOCUMENT_SSRDATASCRIPT_PLACEHOLDER]: HTML_SSRDATASCRIPT_SEPARATOR
+};

package/dist/js/modern/document/index.js

@@ -0,0 +1,8 @@
+export * from "./Html";
+export * from "./DocumentContext";
+export * from "./DocumentStructrueContext";
+export * from "./Head";
+export * from "./Body";
+export * from "./Root";
+export * from "./Scripts";
+export * from "./constants";

package/dist/js/modern/index.js

@@ -1 +1,2 @@
-export { createApp, createPlugin, useLoader, bootstrap, RuntimeReactContext, registerPrefetch, defineConfig, registerInit, useRuntimeContext } from "./core";
+export { isBrowser } from "./common";
+export { createApp, createPlugin, useLoader, bootstrap, RuntimeReactContext, defineConfig, registerInit, useRuntimeContext } from "./core";

package/dist/js/modern/router/cli/index.js

@@ -1,9 +1,6 @@
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 import { getEntryOptions, createRuntimeExportsUtils, PLUGIN_SCHEMAS } from '@modern-js/utils';
 const PLUGIN_IDENTIFIER = 'router';
 const ROUTES_IDENTIFIER = 'routes';
@@ -25,47 +22,47 @@ export default (() => ({
           }
         };
       },
-
       validateSchema() {
         return PLUGIN_SCHEMAS['@modern-js/plugin-router'];
       },
-
       modifyEntryImports({
         entrypoint,
         imports
       }) {
+        var _userConfig$runtime, _userConfig$runtime$r;
         const {
           entryName,
           fileSystemRoutes
         } = entrypoint;
         const userConfig = api.useResolvedConfigContext();
+        const isLegacy = Boolean(userConfig === null || userConfig === void 0 ? void 0 : (_userConfig$runtime = userConfig.runtime) === null || _userConfig$runtime === void 0 ? void 0 : (_userConfig$runtime$r = _userConfig$runtime.router) === null || _userConfig$runtime$r === void 0 ? void 0 : _userConfig$runtime$r.legacy);
         const {
           packageName
         } = api.useAppContext();
         const runtimeConfig = getEntryOptions(entryName, userConfig.runtime, userConfig.runtimeByEntries, packageName);
         runtimeConfigMap.set(entryName, runtimeConfig);
-
         if (runtimeConfig !== null && runtimeConfig !== void 0 && runtimeConfig.router) {
-          imports.push({
-            value: '@modern-js/runtime/plugins',
-            specifiers: [{
-              imported: PLUGIN_IDENTIFIER
-            }]
-          });
+          if (!isLegacy) {
+            imports.push({
+              value: '@modern-js/runtime/plugins',
+              specifiers: [{
+                imported: PLUGIN_IDENTIFIER
+              }]
+            });
+          }
         } else if (fileSystemRoutes) {
           throw new Error(`should enable runtime.router for entry ${entryName}`);
         }
-
         return {
           entrypoint,
           imports
         };
       },
-
       modifyEntryRuntimePlugins({
         entrypoint,
         plugins
       }) {
+        var _userConfig$runtime2, _userConfig$runtime2$;
         const {
           entryName,
           fileSystemRoutes
@@ -73,9 +70,10 @@ export default (() => ({
         const {
           serverRoutes
         } = api.useAppContext();
+        const userConfig = api.useResolvedConfigContext();
+        const isLegacy = Boolean(userConfig === null || userConfig === void 0 ? void 0 : (_userConfig$runtime2 = userConfig.runtime) === null || _userConfig$runtime2 === void 0 ? void 0 : (_userConfig$runtime2$ = _userConfig$runtime2.router) === null || _userConfig$runtime2$ === void 0 ? void 0 : _userConfig$runtime2$.legacy);
         const runtimeConfig = runtimeConfigMap.get(entryName);
-
-        if (runtimeConfig.router) {
+        if (runtimeConfig.router && !isLegacy) {
           // Todo: plugin-router best to only handle manage client route.
           // here support base server route usage, part for compatibility
           const serverBase = serverRoutes.filter(route => route.entryName === entryName).map(route => route.urlPath).sort((a, b) => a.length - b.length > 0 ? -1 : 1);
@@ -88,17 +86,19 @@ export default (() => ({
             })).replace(/"routesConfig"\s*:\s*"((\S|\s)+)"/g, '"routesConfig": $1,')
           });
         }
-
         return {
           entrypoint,
           plugins
         };
       },
-
       addRuntimeExports() {
-        pluginsExportsUtils.addExport(`export { default as router } from '@modern-js/runtime/router'`);
+        var _userConfig$runtime3, _userConfig$runtime3$;
+        const userConfig = api.useResolvedConfigContext();
+        const isLegacy = Boolean(userConfig === null || userConfig === void 0 ? void 0 : (_userConfig$runtime3 = userConfig.runtime) === null || _userConfig$runtime3 === void 0 ? void 0 : (_userConfig$runtime3$ = _userConfig$runtime3.router) === null || _userConfig$runtime3$ === void 0 ? void 0 : _userConfig$runtime3$.legacy);
+        if (!isLegacy) {
+          pluginsExportsUtils.addExport(`export { default as router } from '@modern-js/runtime/router'`);
+        }
       }
-
     };
   }
 }));

package/dist/js/modern/router/runtime/index.js

@@ -1,4 +1,4 @@
 import { routerPlugin } from "./plugin";
 export default routerPlugin;
 export * from 'react-router-dom';
-export * from 'history';
+export * from "./withRouter";