@modern-js/runtime 2.15.1-alpha.2 → 2.16.1-alpha.0

package/dist/esm-node/document/cli/index.js

@@ -4,110 +4,91 @@ import ReactDomServer from "react-dom/server";
 import { build } from "esbuild";
 import { createDebugger, findExists, fs } from "@modern-js/utils";
 import { DocumentContext } from "../DocumentContext";
-import {
-  DOCUMENT_SCRIPTS_PLACEHOLDER,
-  DOCUMENT_LINKS_PLACEHOLDER,
-  DOCUMENT_FILE_NAME,
-  DOCUMENT_META_PLACEHOLDER,
-  PLACEHOLDER_REPLACER_MAP,
-  DOC_EXT,
-  DOCUMENT_SSR_PLACEHOLDER,
-  DOCUMENT_CHUNKSMAP_PLACEHOLDER,
-  DOCUMENT_SSRDATASCRIPT_PLACEHOLDER,
-  DOCUMENT_SCRIPT_PLACEHOLDER_START,
-  DOCUMENT_SCRIPT_PLACEHOLDER_END,
-  HTML_SEPARATOR,
-  DOCUMENT_COMMENT_PLACEHOLDER_START,
-  DOCUMENT_COMMENT_PLACEHOLDER_END
-} from "../constants";
+import { DOCUMENT_SCRIPTS_PLACEHOLDER, DOCUMENT_LINKS_PLACEHOLDER, DOCUMENT_FILE_NAME, DOCUMENT_META_PLACEHOLDER, PLACEHOLDER_REPLACER_MAP, DOC_EXT, DOCUMENT_SSR_PLACEHOLDER, DOCUMENT_CHUNKSMAP_PLACEHOLDER, DOCUMENT_SSRDATASCRIPT_PLACEHOLDER, DOCUMENT_SCRIPT_PLACEHOLDER_START, DOCUMENT_SCRIPT_PLACEHOLDER_END, HTML_SEPARATOR, DOCUMENT_COMMENT_PLACEHOLDER_START, DOCUMENT_COMMENT_PLACEHOLDER_END } from "../constants";
 const debug = createDebugger("html_genarate");
-const getDocumenByEntryName = function(entrypoints, entryName, fallbackDir) {
-  var _a;
-  const entryDir = (_a = entrypoints.find(
-    (item) => item.entryName === entryName
-  )) == null ? void 0 : _a.absoluteEntryDir;
-  const entryDirs = DOC_EXT.map(
-    (item) => `${entryDir}${path.sep}${DOCUMENT_FILE_NAME}.${item}`
-  );
-  const fallbackDirs = fallbackDir ? DOC_EXT.map(
-    (item) => [fallbackDir, "src", `${DOCUMENT_FILE_NAME}.${item}`].join(path.sep)
-  ) : [];
-  const docFile = findExists([...entryDirs, ...fallbackDirs]);
+export const getDocumenByEntryName = function(entrypoints, entryName, fallbackDir) {
+  var _entrypoints_find;
+  const entryDir = (_entrypoints_find = entrypoints.find((item) => item.entryName === entryName)) === null || _entrypoints_find === void 0 ? void 0 : _entrypoints_find.absoluteEntryDir;
+  const entryDirs = DOC_EXT.map((item) => `${entryDir}${path.sep}${DOCUMENT_FILE_NAME}.${item}`);
+  const fallbackDirs = fallbackDir ? DOC_EXT.map((item) => [
+    fallbackDir,
+    "src",
+    `${DOCUMENT_FILE_NAME}.${item}`
+  ].join(path.sep)) : [];
+  const docFile = findExists([
+    ...entryDirs,
+    ...fallbackDirs
+  ]);
   return docFile || void 0;
 };
-var cli_default = () => ({
-  name: "@modern-js/plugin-document",
-  pre: ["@modern-js/plugin-analyze"],
-  setup: async (api) => {
-    function getDocParams(params) {
-      const { config, templateParameters, entryName } = params;
-      return {
-        processEnv: process.env,
-        config: {
-          output: config.output
-        },
-        entryName,
-        templateParams: templateParameters
-      };
-    }
-    const documentEntry = (entryName, templateParameters) => {
-      const { entrypoints, internalDirectory, appDirectory } = api.useAppContext();
-      const documentFilePath = getDocumenByEntryName(
-        entrypoints,
-        entryName,
-        appDirectory
-      );
-      if (!documentFilePath) {
-        return null;
-      }
-      return async ({ htmlWebpackPlugin }) => {
-        const documentParams = getDocParams({
-          config: api.useResolvedConfigContext(),
+export default () => {
+  return {
+    name: "@modern-js/plugin-document",
+    pre: [
+      "@modern-js/plugin-analyze"
+    ],
+    setup: async (api) => {
+      function getDocParams(params) {
+        const { config, templateParameters, entryName } = params;
+        return {
+          processEnv: process.env,
+          config: {
+            output: config.output
+          },
           entryName,
-          templateParameters
-        });
-        const tempTsConfigFile = path.join(
-          internalDirectory,
-          `./document/_tempTsconfig.json`
-        );
-        const userTsConfigFilePath = path.join(appDirectory, "tsconfig.json");
-        let tsConfig;
-        try {
-          tsConfig = await require(userTsConfigFilePath);
-        } catch (err) {
-          tsConfig = {};
-        }
-        if (tsConfig == null ? void 0 : tsConfig.compilerOptions) {
-          tsConfig.compilerOptions.jsx = "react-jsx";
-        } else {
-          tsConfig.compilerOptions = {
-            jsx: "react-jsx"
-          };
+          templateParams: templateParameters
+        };
+      }
+      const documentEntry = (entryName, templateParameters) => {
+        const { entrypoints, internalDirectory, appDirectory } = api.useAppContext();
+        const documentFilePath = getDocumenByEntryName(entrypoints, entryName, appDirectory);
+        if (!documentFilePath) {
+          return null;
         }
-        fs.outputFileSync(tempTsConfigFile, JSON.stringify(tsConfig));
-        const htmlOutputFile = path.join(
-          internalDirectory,
-          `./document/_${entryName}.html.js`
-        );
-        await build({
-          entryPoints: [documentFilePath],
-          outfile: htmlOutputFile,
-          platform: "node",
-          // change esbuild use the rootDir tsconfig.json as default to tempTsConfigFile
-          tsconfig: tempTsConfigFile,
-          target: "es6",
-          loader: {
-            ".ts": "ts",
-            ".tsx": "tsx"
-          },
-          bundle: true,
-          plugins: [
-            {
-              name: "make-all-packages-external",
-              setup(build2) {
-                build2.onResolve(
-                  { filter: /^[^./]|^\.[^./]|^\.\.[^/]/ },
-                  (args) => {
+        return async ({ htmlWebpackPlugin }) => {
+          const documentParams = getDocParams({
+            config: api.useResolvedConfigContext(),
+            entryName,
+            templateParameters
+          });
+          const tempTsConfigFile = path.join(internalDirectory, `./document/_tempTsconfig.json`);
+          const userTsConfigFilePath = path.join(appDirectory, "tsconfig.json");
+          let tsConfig;
+          try {
+            tsConfig = await require(userTsConfigFilePath);
+          } catch (err) {
+            tsConfig = {};
+          }
+          if (tsConfig === null || tsConfig === void 0 ? void 0 : tsConfig.compilerOptions) {
+            tsConfig.compilerOptions.jsx = "react-jsx";
+          } else {
+            tsConfig.compilerOptions = {
+              jsx: "react-jsx"
+            };
+          }
+          fs.outputFileSync(tempTsConfigFile, JSON.stringify(tsConfig));
+          const htmlOutputFile = path.join(internalDirectory, `./document/_${entryName}.html.js`);
+          await build({
+            entryPoints: [
+              documentFilePath
+            ],
+            outfile: htmlOutputFile,
+            platform: "node",
+            // change esbuild use the rootDir tsconfig.json as default to tempTsConfigFile
+            tsconfig: tempTsConfigFile,
+            target: "es6",
+            loader: {
+              ".ts": "ts",
+              ".tsx": "tsx"
+            },
+            bundle: true,
+            plugins: [
+              {
+                name: "make-all-packages-external",
+                setup(build2) {
+                  build2.onResolve({
+                    filter: /^[^./]|^\.[^./]|^\.\.[^/]/
+                  }, (args) => {
                     let external = true;
                     if (args.kind === "entry-point") {
                       external = false;
@@ -116,94 +97,65 @@ var cli_default = () => ({
                       path: args.path,
                       external
                     };
-                  }
+                  });
+                }
+              }
+            ]
+          });
+          delete require.cache[require.resolve(htmlOutputFile)];
+          const Document = (await require(htmlOutputFile)).default;
+          const HTMLElement = React.createElement(DocumentContext.Provider, {
+            value: documentParams
+          }, React.createElement(Document, null));
+          let 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 links = [
+            htmlWebpackPlugin.tags.headTags.filter((item) => item.tagName === "link").join("")
+          ].join("");
+          const metas = [
+            templateParameters.meta,
+            htmlWebpackPlugin.tags.headTags.filter((item) => item.tagName !== "script" && item.tagName !== "link").join("")
+          ].join("");
+          if (html.includes(DOCUMENT_SCRIPT_PLACEHOLDER_START) && html.includes(DOCUMENT_SCRIPT_PLACEHOLDER_END)) {
+            html = html.replace(new RegExp(`${DOCUMENT_SCRIPT_PLACEHOLDER_START}(.*?)${DOCUMENT_SCRIPT_PLACEHOLDER_END}`, "g"), (_scriptStr, $1) => `<script>${decodeURIComponent($1)}</script>`);
+          }
+          if (html.includes(DOCUMENT_COMMENT_PLACEHOLDER_START) && html.includes(DOCUMENT_COMMENT_PLACEHOLDER_END)) {
+            html = html.replace(new RegExp(`${DOCUMENT_COMMENT_PLACEHOLDER_START}(.*?)${DOCUMENT_COMMENT_PLACEHOLDER_END}`, "g"), (_scriptStr, $1) => `${decodeURIComponent($1)}`);
+          }
+          const finalHtml = `<!DOCTYPE html>${html}`.replace(DOCUMENT_META_PLACEHOLDER, metas).replace(DOCUMENT_SSR_PLACEHOLDER, HTML_SEPARATOR).replace(DOCUMENT_SCRIPTS_PLACEHOLDER, scripts).replace(DOCUMENT_LINKS_PLACEHOLDER, links).replace(DOCUMENT_CHUNKSMAP_PLACEHOLDER, PLACEHOLDER_REPLACER_MAP[DOCUMENT_CHUNKSMAP_PLACEHOLDER]).replace(DOCUMENT_SSRDATASCRIPT_PLACEHOLDER, PLACEHOLDER_REPLACER_MAP[DOCUMENT_SSRDATASCRIPT_PLACEHOLDER]);
+          return finalHtml;
+        };
+      };
+      return {
+        config: () => {
+          return {
+            tools: {
+              htmlPlugin: (options, entry) => {
+                const hackParameters = typeof (options === null || options === void 0 ? void 0 : options.templateParameters) === "function" ? options === null || options === void 0 ? void 0 : options.templateParameters({}, {}, {}, {}) : {
+                  ...options === null || options === void 0 ? void 0 : options.templateParameters
+                };
+                const templateContent = documentEntry(
+                  entry.entryName,
+                  // options,
+                  hackParameters
                 );
+                const documentHtmlOptions = templateContent ? {
+                  templateContent,
+                  inject: false
+                } : {};
+                return {
+                  ...options,
+                  ...documentHtmlOptions
+                };
               }
             }
-          ]
-        });
-        delete require.cache[require.resolve(htmlOutputFile)];
-        const Document = (await require(htmlOutputFile)).default;
-        const HTMLElement = React.createElement(
-          DocumentContext.Provider,
-          { value: documentParams },
-          React.createElement(Document, null)
-        );
-        let 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 links = [
-          htmlWebpackPlugin.tags.headTags.filter((item) => item.tagName === "link").join("")
-        ].join("");
-        const metas = [
-          templateParameters.meta,
-          htmlWebpackPlugin.tags.headTags.filter(
-            (item) => item.tagName !== "script" && item.tagName !== "link"
-          ).join("")
-        ].join("");
-        if (html.includes(DOCUMENT_SCRIPT_PLACEHOLDER_START) && html.includes(DOCUMENT_SCRIPT_PLACEHOLDER_END)) {
-          html = html.replace(
-            new RegExp(
-              `${DOCUMENT_SCRIPT_PLACEHOLDER_START}(.*?)${DOCUMENT_SCRIPT_PLACEHOLDER_END}`,
-              "g"
-            ),
-            (_scriptStr, $1) => `<script>${decodeURIComponent($1)}</script>`
-          );
-        }
-        if (html.includes(DOCUMENT_COMMENT_PLACEHOLDER_START) && html.includes(DOCUMENT_COMMENT_PLACEHOLDER_END)) {
-          html = html.replace(
-            new RegExp(
-              `${DOCUMENT_COMMENT_PLACEHOLDER_START}(.*?)${DOCUMENT_COMMENT_PLACEHOLDER_END}`,
-              "g"
-            ),
-            (_scriptStr, $1) => `${decodeURIComponent($1)}`
-          );
+          };
         }
-        const finalHtml = `<!DOCTYPE html>${html}`.replace(DOCUMENT_META_PLACEHOLDER, metas).replace(DOCUMENT_SSR_PLACEHOLDER, HTML_SEPARATOR).replace(DOCUMENT_SCRIPTS_PLACEHOLDER, scripts).replace(DOCUMENT_LINKS_PLACEHOLDER, links).replace(
-          DOCUMENT_CHUNKSMAP_PLACEHOLDER,
-          PLACEHOLDER_REPLACER_MAP[DOCUMENT_CHUNKSMAP_PLACEHOLDER]
-        ).replace(
-          DOCUMENT_SSRDATASCRIPT_PLACEHOLDER,
-          PLACEHOLDER_REPLACER_MAP[DOCUMENT_SSRDATASCRIPT_PLACEHOLDER]
-        );
-        return finalHtml;
       };
-    };
-    return {
-      config: () => {
-        return {
-          tools: {
-            htmlPlugin: (options, entry) => {
-              const hackParameters = typeof (options == null ? void 0 : options.templateParameters) === "function" ? options == null ? void 0 : options.templateParameters(
-                {},
-                {},
-                {},
-                {}
-              ) : { ...options == null ? void 0 : options.templateParameters };
-              const templateContent = documentEntry(
-                entry.entryName,
-                // options,
-                hackParameters
-              );
-              const documentHtmlOptions = templateContent ? {
-                templateContent,
-                inject: false
-              } : {};
-              return {
-                ...options,
-                ...documentHtmlOptions
-              };
-            }
-          }
-        };
-      }
-    };
-  }
-});
-export {
-  cli_default as default,
-  getDocumenByEntryName
+    }
+  };
 };

package/dist/esm-node/document/constants.js

@@ -1,57 +1,27 @@
-const DOC_EXT = ["jsx", "tsx", "ts", "js"];
-const DOCUMENT_META_PLACEHOLDER = encodeURIComponent("<%= meta %>");
-const HTML_SEPARATOR = "<!--<?- html ?>-->";
-const HTML_CHUNKSMAP_SEPARATOR = "<!--<?- chunksMap.js ?>-->";
-const HTML_SSRDATASCRIPT_SEPARATOR = "<!--<?- SSRDataScript ?>-->";
-const DOCUMENT_SSR_PLACEHOLDER = encodeURIComponent(HTML_SEPARATOR);
-const DOCUMENT_CHUNKSMAP_PLACEHOLDER = encodeURIComponent(
-  HTML_CHUNKSMAP_SEPARATOR
-);
-const DOCUMENT_SSRDATASCRIPT_PLACEHOLDER = encodeURIComponent(
-  HTML_SSRDATASCRIPT_SEPARATOR
-);
-const DOCUMENT_FILE_NAME = "Document";
-const DOCUMENT_SCRIPTS_PLACEHOLDER = encodeURIComponent(
-  "<!-- chunk scripts placeholder -->"
-);
-const DOCUMENT_LINKS_PLACEHOLDER = encodeURIComponent(
-  "<!-- chunk links placeholder -->"
-);
-const DOCUMENT_NO_SCRIPTE_PLACEHOLDER = encodeURIComponent("<!-- no-script -->");
-const DOCUMENT_SCRIPT_PLACEHOLDER_START = encodeURIComponent(
-  "<!-- script-start -->"
-);
-const DOCUMENT_SCRIPT_PLACEHOLDER_END = encodeURIComponent(
-  "<!-- script-end -->"
-);
-const DOCUMENT_COMMENT_PLACEHOLDER_START = encodeURIComponent(
-  "<!-- comment-start -->"
-);
-const DOCUMENT_COMMENT_PLACEHOLDER_END = encodeURIComponent(
-  "<!-- comment-end -->"
-);
-const PLACEHOLDER_REPLACER_MAP = {
+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 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_LINKS_PLACEHOLDER = encodeURIComponent("<!-- chunk links placeholder -->");
+export const DOCUMENT_NO_SCRIPTE_PLACEHOLDER = encodeURIComponent("<!-- no-script -->");
+export const DOCUMENT_SCRIPT_PLACEHOLDER_START = encodeURIComponent("<!-- script-start -->");
+export const DOCUMENT_SCRIPT_PLACEHOLDER_END = encodeURIComponent("<!-- script-end -->");
+export const DOCUMENT_COMMENT_PLACEHOLDER_START = encodeURIComponent("<!-- comment-start -->");
+export const DOCUMENT_COMMENT_PLACEHOLDER_END = encodeURIComponent("<!-- comment-end -->");
+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
 };
-export {
-  DOCUMENT_CHUNKSMAP_PLACEHOLDER,
-  DOCUMENT_COMMENT_PLACEHOLDER_END,
-  DOCUMENT_COMMENT_PLACEHOLDER_START,
-  DOCUMENT_FILE_NAME,
-  DOCUMENT_LINKS_PLACEHOLDER,
-  DOCUMENT_META_PLACEHOLDER,
-  DOCUMENT_NO_SCRIPTE_PLACEHOLDER,
-  DOCUMENT_SCRIPTS_PLACEHOLDER,
-  DOCUMENT_SCRIPT_PLACEHOLDER_END,
-  DOCUMENT_SCRIPT_PLACEHOLDER_START,
-  DOCUMENT_SSRDATASCRIPT_PLACEHOLDER,
-  DOCUMENT_SSR_PLACEHOLDER,
-  DOC_EXT,
-  HTML_CHUNKSMAP_SEPARATOR,
-  HTML_SEPARATOR,
-  HTML_SSRDATASCRIPT_SEPARATOR,
-  PLACEHOLDER_REPLACER_MAP
-};

package/dist/esm-node/exports/head.js

@@ -1,6 +1,3 @@
 import head from "react-helmet";
-var head_default = head;
+export default head;
 export * from "react-helmet";
-export {
-  head_default as default
-};

package/dist/esm-node/exports/loadable.js

@@ -1,6 +1,3 @@
 import loadable from "@loadable/component";
-var loadable_default = loadable;
+export default loadable;
 export * from "@loadable/component";
-export {
-  loadable_default as default
-};

package/dist/esm-node/exports/server.js

@@ -1,4 +1 @@
-const hook = (attacher) => attacher;
-export {
-  hook
-};
+export const hook = (attacher) => attacher;

package/dist/esm-node/exports/styled.js

@@ -1,6 +1,3 @@
 import styled from "styled-components";
-var styled_default = styled;
+export default styled;
 export * from "styled-components";
-export {
-  styled_default as default
-};

package/dist/esm-node/index.js

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