@modern-js/app-tools 2.0.0-beta.2 → 2.0.0-beta.4

package/dist/js/modern/analyze/utils.js

@@ -1,8 +1,30 @@
-import fs from 'fs';
-import path from 'path';
-import { isReact18, normalizeToPosixPath } from '@modern-js/utils';
-import { FILE_SYSTEM_ROUTES_FILE_NAME } from "./constants";
-export const walkDirectory = dir => fs.readdirSync(dir).reduce((previous, filename) => {
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+import fs from "fs";
+import path from "path";
+import { isReact18, normalizeToPosixPath, fs as fse } from "@modern-js/utils";
+import { transform } from "esbuild";
+import { parse } from "es-module-lexer";
+import { FILE_SYSTEM_ROUTES_FILE_NAME, LOADER_EXPORT_NAME } from "./constants";
+const walkDirectory = (dir) => fs.readdirSync(dir).reduce((previous, filename) => {
   const filePath = path.join(dir, filename);
   if (fs.statSync(filePath).isDirectory()) {
     return [...previous, ...walkDirectory(filePath)];
@@ -10,77 +32,102 @@ export const walkDirectory = dir => fs.readdirSync(dir).reduce((previous, filena
     return [...previous, filePath];
   }
 }, []);
-export const getDefaultImports = ({
+const getDefaultImports = ({
   entrypoint,
   srcDirectory,
   internalSrcAlias,
   internalDirAlias,
   internalDirectory
 }) => {
-  const {
-    entryName,
-    fileSystemRoutes,
-    customBootstrap,
-    entry
-  } = entrypoint;
-  const imports = [{
-    specifiers: [{
-      local: 'React'
-    }],
-    value: 'react'
-  }, {
-    specifiers: [{
-      local: 'ReactDOM'
-    }],
-    value: isReact18(path.join(internalDirectory, '../../')) ? 'react-dom/client' : 'react-dom'
-  }, {
-    specifiers: [{
-      imported: 'createApp'
-    }, {
-      imported: 'bootstrap'
-    }],
-    value: '@modern-js/runtime'
-  }, customBootstrap && {
-    specifiers: [{
-      local: 'customBootstrap'
-    }],
-    value: normalizeToPosixPath(customBootstrap.replace(srcDirectory, internalSrcAlias))
-  }].filter(Boolean);
+  const { entryName, fileSystemRoutes, customBootstrap, entry } = entrypoint;
+  const imports = [
+    {
+      specifiers: [{ local: "React" }],
+      value: "react"
+    },
+    {
+      specifiers: [{ local: "ReactDOM" }],
+      value: isReact18(path.join(internalDirectory, "../../")) ? "react-dom/client" : "react-dom"
+    },
+    {
+      specifiers: [{ imported: "createApp" }, { imported: "bootstrap" }],
+      value: "@modern-js/runtime"
+    },
+    customBootstrap && {
+      specifiers: [{ local: "customBootstrap" }],
+      value: normalizeToPosixPath(
+        customBootstrap.replace(srcDirectory, internalSrcAlias)
+      )
+    }
+  ].filter(Boolean);
   if (fileSystemRoutes) {
     const route = {
-      specifiers: [{
-        imported: 'routes'
-      }],
-      value: normalizeToPosixPath(`${internalDirAlias}/${entryName}/${FILE_SYSTEM_ROUTES_FILE_NAME}`)
+      specifiers: [{ imported: "routes" }],
+      value: normalizeToPosixPath(
+        `${internalDirAlias}/${entryName}/${FILE_SYSTEM_ROUTES_FILE_NAME.replace(
+          ".js",
+          ""
+        )}`
+      )
     };
     if (fileSystemRoutes.globalApp) {
       imports.push({
-        specifiers: [{
-          local: 'App'
-        }],
-        value: normalizeToPosixPath(fileSystemRoutes.globalApp.replace(srcDirectory, internalSrcAlias))
+        specifiers: [{ local: "App" }],
+        value: normalizeToPosixPath(
+          fileSystemRoutes.globalApp.replace(srcDirectory, internalSrcAlias)
+        )
       });
     } else {
-      route.initialize = 'const App = false;';
+      route.initialize = "const App = false;";
     }
     imports.push(route);
   } else {
     imports.push({
-      specifiers: [{
-        local: 'App'
-      }],
-      value: normalizeToPosixPath(entry.replace(srcDirectory, internalSrcAlias))
+      specifiers: [{ local: "App" }],
+      value: normalizeToPosixPath(
+        entry.replace(srcDirectory, internalSrcAlias)
+      )
     });
   }
   return imports;
 };
-export const isRouteComponentFile = filePath => {
+const isRouteComponentFile = (filePath) => {
   if (/\.(d|test|spec|e2e)\.(js|jsx|ts|tsx)$/.test(filePath)) {
     return false;
   }
-  if (['.js', '.jsx', '.ts', '.tsx'].includes(path.extname(filePath))) {
+  if ([".js", ".jsx", ".ts", ".tsx"].includes(path.extname(filePath))) {
     return true;
   }
   return false;
 };
-export const replaceWithAlias = (base, filePath, alias) => normalizeToPosixPath(path.join(alias, path.relative(base, filePath)));
+const replaceWithAlias = (base, filePath, alias) => normalizeToPosixPath(path.join(alias, path.relative(base, filePath)));
+const parseModule = (_0) => __async(void 0, [_0], function* ({
+  source,
+  filename
+}) {
+  let content = source;
+  if (filename.endsWith(".tsx") || filename.endsWith(".jsx")) {
+    const result = yield transform(content, {
+      loader: path.extname(filename).slice(1),
+      format: "esm"
+    });
+    content = result.code;
+  }
+  return yield parse(content);
+});
+const hasLoader = (filename) => __async(void 0, null, function* () {
+  const source = yield fse.readFile(filename);
+  const [, moduleExports] = yield parseModule({
+    source: source.toString(),
+    filename
+  });
+  return moduleExports.some((e) => e.n === LOADER_EXPORT_NAME);
+});
+export {
+  getDefaultImports,
+  hasLoader,
+  isRouteComponentFile,
+  parseModule,
+  replaceWithAlias,
+  walkDirectory
+};

package/dist/js/modern/builder/builderPlugins/compatModern.js

@@ -1,49 +1,58 @@
-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 { join } from 'path';
-import { mergeBuilderConfig } from '@modern-js/builder-shared';
-import { template as lodashTemplate } from '@modern-js/utils/lodash';
-import HtmlWebpackPlugin from '@modern-js/builder-webpack-provider/html-webpack-plugin';
-import { getEntryOptions } from '@modern-js/utils';
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+import { join } from "path";
+import {
+  mergeBuilderConfig
+} from "@modern-js/builder-shared";
+import { template as lodashTemplate } from "@modern-js/utils/lodash";
+import HtmlWebpackPlugin from "@modern-js/builder-webpack-provider/html-webpack-plugin";
+import { getEntryOptions } from "@modern-js/utils";
 import { BottomTemplatePlugin } from "../webpackPlugins/htmlBottomTemplate";
 import { HtmlAsyncChunkPlugin } from "../webpackPlugins/htmlAsyncChunkPlugin";
 import { createCopyPattern } from "../share";
 import RouterPlugin from "../webpackPlugins/routerPlugin";
-/**
- * Provides default configuration consistent with `@modern-js/webpack`
- */
-export const PluginCompatModern = (appContext, modernConfig, options) => ({
-  name: 'builder-plugin-compat-modern',
+const PluginCompatModern = (appContext, modernConfig, options) => ({
+  name: "builder-plugin-compat-modern",
   setup(api) {
-    api.modifyBuilderConfig(config => {
+    api.modifyBuilderConfig((config) => {
       if (isStreamingSSR(modernConfig)) {
         return mergeBuilderConfig(config, {
           html: {
-            inject: 'body'
+            inject: "body"
           }
         });
       }
       return config;
     });
-    api.modifyWebpackChain((chain, {
-      target,
-      CHAIN_ID,
-      isProd
-    }) => {
+    api.modifyWebpackChain((chain, { target, CHAIN_ID, isProd }) => {
+      var _a, _b;
       const builderNormalizedConfig = api.getNormalizedConfig();
-      // set webpack config name
-      if (target === 'node') {
-        chain.name('server');
-      } else if (target === 'modern-web') {
-        chain.name('modern');
+      if (target === "node") {
+        chain.name("server");
+      } else if (target === "modern-web") {
+        chain.name("modern");
       } else {
-        chain.name('client');
+        chain.name("client");
       }
-      chain.resolve.modules.add('node_modules').add(join(api.context.rootPath, 'node_modules'));
-
-      // apply node compat
-      if (target === 'node') {
+      chain.resolve.modules.add("node_modules").add(join(api.context.rootPath, "node_modules"));
+      if (target === "node") {
         applyNodeCompat(chain, modernConfig, isProd);
       }
       if (isHtmlEnabled(builderNormalizedConfig, target)) {
@@ -60,27 +69,38 @@ export const PluginCompatModern = (appContext, modernConfig, options) => ({
           modernConfig
         });
       }
-
-      // apply copy plugin
       if (chain.plugins.has(CHAIN_ID.PLUGIN.COPY)) {
-        const defaultCopyPattern = createCopyPattern(appContext, modernConfig, 'public', chain);
-        chain.plugin(CHAIN_ID.PLUGIN.COPY).tap(args => {
-          var _args$;
-          return [{
-            patterns: [...(((_args$ = args[0]) === null || _args$ === void 0 ? void 0 : _args$.patterns) || []), defaultCopyPattern]
-          }];
+        const defaultCopyPattern = createCopyPattern(
+          appContext,
+          modernConfig,
+          "public",
+          chain
+        );
+        chain.plugin(CHAIN_ID.PLUGIN.COPY).tap((args) => {
+          var _a2;
+          return [
+            {
+              patterns: [...((_a2 = args[0]) == null ? void 0 : _a2.patterns) || [], defaultCopyPattern]
+            }
+          ];
         });
       }
-      const {
-        entrypoints
-      } = appContext;
-      const existNestedRoutes = entrypoints.some(entrypoint => entrypoint.nestedRoutesEntry);
-      chain.plugin('route-plugin').use(RouterPlugin, [{
-        existNestedRoutes
-      }]);
-      function isHtmlEnabled(config, target) {
-        var _config$tools;
-        return ((_config$tools = config.tools) === null || _config$tools === void 0 ? void 0 : _config$tools.htmlPlugin) !== false && target !== 'node' && target !== 'web-worker';
+      const { entrypoints } = appContext;
+      const existNestedRoutes = entrypoints.some(
+        (entrypoint) => entrypoint.nestedRoutesEntry
+      );
+      const routerManifest = Boolean((_b = (_a = modernConfig == null ? void 0 : modernConfig.runtime) == null ? void 0 : _a.router) == null ? void 0 : _b.manifest);
+      if (existNestedRoutes || routerManifest) {
+        chain.plugin("route-plugin").use(RouterPlugin);
+      }
+      if (target !== "node") {
+        const bareServerModuleReg = /\.(server|node)\.[tj]sx?$/;
+        chain.module.rule(CHAIN_ID.RULE.JS).exclude.add(bareServerModuleReg);
+        chain.module.rule("bare-server-module").test(bareServerModuleReg).use("server-module-loader").loader(require.resolve("../loaders/serverModuleLoader"));
+      }
+      function isHtmlEnabled(config, target2) {
+        var _a2;
+        return ((_a2 = config.tools) == null ? void 0 : _a2.htmlPlugin) !== false && target2 !== "node" && target2 !== "web-worker";
       }
     });
     if (options) {
@@ -88,10 +108,6 @@ export const PluginCompatModern = (appContext, modernConfig, options) => ({
     }
   }
 });
-
-/**
- * register builder hooks callback
- */
 function applyCallbacks(api, options) {
   options.onAfterBuild && api.onAfterBuild(options.onAfterBuild);
   options.onAfterCreateCompiler && api.onAfterCreateCompiler(options.onAfterCreateCompiler);
@@ -102,60 +118,52 @@ function applyCallbacks(api, options) {
   options.onDevCompileDone && api.onDevCompileDone(options.onDevCompileDone);
   options.onExit && api.onExit(options.onExit);
 }
-
-/**
- * compat some config, if target is `node`
- */
 function applyNodeCompat(chain, modernConfig, isProd) {
-  // apply node resolve extensions
-  for (const ext of ['.node.js', '.node.jsx', '.node.ts', '.node.tsx']) {
+  for (const ext of [
+    ".node.js",
+    ".node.jsx",
+    ".node.ts",
+    ".node.tsx",
+    ".server.js",
+    ".server.ts",
+    ".server.ts",
+    ".server.tsx"
+  ]) {
     chain.resolve.extensions.prepend(ext);
   }
-
-  // apply filterEntriesBySSRConfig
-  filterEntriesBySSRConfig(isProd, chain, modernConfig.server, modernConfig.output);
-  function filterEntriesBySSRConfig(isProd, chain, serverConfig, outputConfig) {
-    var _outputConfig$ssg;
-    const entries = chain.entryPoints.entries();
-    // if prod and ssg config is true or function
-    if (isProd && ((outputConfig === null || outputConfig === void 0 ? void 0 : outputConfig.ssg) === true || typeof (outputConfig === null || outputConfig === void 0 ? void 0 : (_outputConfig$ssg = outputConfig.ssg) === null || _outputConfig$ssg === void 0 ? void 0 : _outputConfig$ssg[0]) === 'function')) {
+  filterEntriesBySSRConfig(
+    isProd,
+    chain,
+    modernConfig.server,
+    modernConfig.output
+  );
+  function filterEntriesBySSRConfig(isProd2, chain2, serverConfig, outputConfig) {
+    var _a;
+    const entries = chain2.entryPoints.entries();
+    if (isProd2 && ((outputConfig == null ? void 0 : outputConfig.ssg) === true || typeof ((_a = outputConfig == null ? void 0 : outputConfig.ssg) == null ? void 0 : _a[0]) === "function")) {
       return;
     }
-
-    // if single entry has ssg config
-    // `ssg: {}` is not allowed if multi entry
     const entryNames = Object.keys(entries);
-    if (isProd && entryNames.length === 1 && outputConfig !== null && outputConfig !== void 0 && outputConfig.ssg) {
+    if (isProd2 && entryNames.length === 1 && (outputConfig == null ? void 0 : outputConfig.ssg)) {
       return;
     }
-
-    // collect all ssg entries
     const ssgEntries = [];
-    if (isProd && outputConfig !== null && outputConfig !== void 0 && outputConfig.ssg) {
-      const {
-        ssg
-      } = outputConfig;
-      entryNames.forEach(name => {
+    if (isProd2 && (outputConfig == null ? void 0 : outputConfig.ssg)) {
+      const { ssg } = outputConfig;
+      entryNames.forEach((name) => {
         if (ssg[name]) {
           ssgEntries.push(name);
         }
       });
     }
-    const {
-      ssr,
-      ssrByEntries
-    } = serverConfig || {};
-    entryNames.forEach(name => {
-      if (!ssgEntries.includes(name) && (ssr && (ssrByEntries === null || ssrByEntries === void 0 ? void 0 : ssrByEntries[name]) === false || !ssr && !(ssrByEntries !== null && ssrByEntries !== void 0 && ssrByEntries[name]))) {
-        chain.entryPoints.delete(name);
+    const { ssr, ssrByEntries } = serverConfig || {};
+    entryNames.forEach((name) => {
+      if (!ssgEntries.includes(name) && (ssr && (ssrByEntries == null ? void 0 : ssrByEntries[name]) === false || !ssr && !(ssrByEntries == null ? void 0 : ssrByEntries[name]))) {
+        chain2.entryPoints.delete(name);
       }
     });
   }
 }
-
-/**
- * inject bottom template
- */
 function applyBottomHtmlWebpackPlugin({
   api,
   chain,
@@ -163,33 +171,40 @@ function applyBottomHtmlWebpackPlugin({
   appContext,
   CHAIN_ID
 }) {
-  // inject bottomTemplate into html-webpack-plugin
   for (const entryName of Object.keys(api.context.entry)) {
-    // FIXME: the only need necessary
-    const baseTemplateParams = _objectSpread({
+    const baseTemplateParams = __spreadValues({
       entryName,
-      title: getEntryOptions(entryName, modernConfig.html.title, modernConfig.html.titleByEntries, appContext.packageName),
+      title: getEntryOptions(
+        entryName,
+        modernConfig.html.title,
+        modernConfig.html.titleByEntries,
+        appContext.packageName
+      ),
       mountId: modernConfig.html.mountId
-    }, getEntryOptions(entryName, modernConfig.html.templateParameters, modernConfig.html.templateParametersByEntries, appContext.packageName));
-    chain.plugin(`${CHAIN_ID.PLUGIN.HTML}-${entryName}`).tap(args => [_objectSpread(_objectSpread({}, args[0] || {}), {}, {
-      __internal__: true,
-      bottomTemplate: appContext.htmlTemplates[`__${entryName}-bottom__`] && lodashTemplate(appContext.htmlTemplates[`__${entryName}-bottom__`])(baseTemplateParams)
-    })]);
+    }, getEntryOptions(
+      entryName,
+      modernConfig.html.templateParameters,
+      modernConfig.html.templateParametersByEntries,
+      appContext.packageName
+    ));
+    chain.plugin(`${CHAIN_ID.PLUGIN.HTML}-${entryName}`).tap((args) => [
+      __spreadProps(__spreadValues({}, args[0] || {}), {
+        __internal__: true,
+        bottomTemplate: appContext.htmlTemplates[`__${entryName}-bottom__`] && lodashTemplate(appContext.htmlTemplates[`__${entryName}-bottom__`])(
+          baseTemplateParams
+        )
+      })
+    ]);
   }
   chain.plugin(CHAIN_ID.PLUGIN.BOTTOM_TEMPLATE).use(BottomTemplatePlugin, [HtmlWebpackPlugin]);
 }
-const isStreamingSSR = userConfig => {
-  const isStreaming = ssr => ssr && typeof ssr === 'object' && ssr.mode === 'stream';
-  const {
-    server
-  } = userConfig;
+const isStreamingSSR = (userConfig) => {
+  const isStreaming = (ssr) => ssr && typeof ssr === "object" && ssr.mode === "stream";
+  const { server } = userConfig;
   if (isStreaming(server.ssr)) {
     return true;
   }
-
-  // Since we cannot apply different plugins for different entries,
-  // we regard the whole app as streaming ssr only if one entry meets the requirement.
-  if (server !== null && server !== void 0 && server.ssrByEntries && typeof server.ssrByEntries === 'object') {
+  if ((server == null ? void 0 : server.ssrByEntries) && typeof server.ssrByEntries === "object") {
     for (const name of Object.keys(server.ssrByEntries)) {
       if (isStreaming(server.ssrByEntries[name])) {
         return true;
@@ -206,4 +221,7 @@ function applyAsyncChunkHtmlPlugin({
   if (isStreamingSSR(modernConfig)) {
     chain.plugin(CHAIN_ID.PLUGIN.HTML_ASYNC_CHUNK).use(HtmlAsyncChunkPlugin, [HtmlWebpackPlugin]);
   }
-}
+}
+export {
+  PluginCompatModern
+};