@modern-js/app-tools 2.5.1-alpha.0 → 2.6.0

package/dist/js/modern/analyze/nestedRoutes.js

@@ -1,157 +0,0 @@
-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));
-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 * as path from "path";
-import { fs, getRouteId } from "@modern-js/utils";
-import { JS_EXTENSIONS, NESTED_ROUTE } from "./constants";
-import { replaceWithAlias } from "./utils";
-const conventionNames = Object.values(NESTED_ROUTE);
-const replaceDynamicPath = (routePath) => {
-  return routePath.replace(/\[(.*?)\]/g, ":$1");
-};
-const createIndexRoute = (routeInfo, rootDir, filename, entryName) => {
-  return createRoute(
-    __spreadProps(__spreadValues({}, routeInfo), {
-      index: true,
-      children: void 0
-    }),
-    rootDir,
-    filename,
-    entryName
-  );
-};
-const createRoute = (routeInfo, rootDir, filename, entryName) => {
-  const id = getRouteId(filename, rootDir, entryName);
-  return __spreadProps(__spreadValues({}, routeInfo), {
-    id,
-    type: "nested"
-  });
-};
-const walk = (dirname, rootDir, alias, entryName) => __async(void 0, null, function* () {
-  var _a, _b, _c;
-  if (!(yield fs.pathExists(dirname))) {
-    return null;
-  }
-  const isDirectory = (yield fs.stat(dirname)).isDirectory();
-  if (!isDirectory) {
-    return null;
-  }
-  const relativeDir = path.relative(rootDir, dirname);
-  const pathSegments = relativeDir.split(path.sep);
-  const lastSegment = pathSegments[pathSegments.length - 1];
-  const isRoot = lastSegment === "";
-  const isPathlessLayout = lastSegment.startsWith("__");
-  const isWithoutLayoutPath = lastSegment.includes(".");
-  let routePath = isRoot || isPathlessLayout ? "/" : `${lastSegment}`;
-  if (isWithoutLayoutPath) {
-    routePath = lastSegment.split(".").join("/");
-  }
-  routePath = replaceDynamicPath(routePath);
-  const route = {
-    path: routePath,
-    children: [],
-    isRoot
-  };
-  let pageLoaderFile = "";
-  let pageRoute = null;
-  const items = yield fs.readdir(dirname);
-  for (const item of items) {
-    const itemPath = path.join(dirname, item);
-    const extname = path.extname(item);
-    const itemWithoutExt = item.slice(0, -extname.length);
-    const isDirectory2 = (yield fs.stat(itemPath)).isDirectory();
-    if (isDirectory2) {
-      const childRoute = yield walk(itemPath, rootDir, alias, entryName);
-      if (childRoute) {
-        (_a = route.children) == null ? void 0 : _a.push(childRoute);
-      }
-    }
-    if (extname && (!JS_EXTENSIONS.includes(extname) || !conventionNames.includes(itemWithoutExt))) {
-      continue;
-    }
-    if (itemWithoutExt === NESTED_ROUTE.LAYOUT_LOADER_FILE) {
-      if (!route.loader) {
-        route.loader = itemPath;
-      }
-    }
-    if (itemWithoutExt === NESTED_ROUTE.LAYOUT_FILE) {
-      route._component = replaceWithAlias(alias.basename, itemPath, alias.name);
-    }
-    if (itemWithoutExt === NESTED_ROUTE.PAGE_LOADER_FILE) {
-      pageLoaderFile = itemPath;
-    }
-    if (itemWithoutExt === NESTED_ROUTE.PAGE_FILE) {
-      pageRoute = createIndexRoute(
-        {
-          _component: replaceWithAlias(alias.basename, itemPath, alias.name)
-        },
-        rootDir,
-        itemPath,
-        entryName
-      );
-      if (pageLoaderFile) {
-        pageRoute.loader = pageLoaderFile;
-      }
-      (_b = route.children) == null ? void 0 : _b.push(pageRoute);
-    }
-    if (itemWithoutExt === NESTED_ROUTE.LOADING_FILE) {
-      route.loading = replaceWithAlias(alias.basename, itemPath, alias.name);
-    }
-    if (itemWithoutExt === NESTED_ROUTE.ERROR_FILE) {
-      route.error = replaceWithAlias(alias.basename, itemPath, alias.name);
-    }
-  }
-  const finalRoute = createRoute(
-    route,
-    rootDir,
-    path.join(dirname, `${NESTED_ROUTE.LAYOUT_FILE}.ts`),
-    entryName
-  );
-  if (isPathlessLayout) {
-    delete finalRoute.path;
-  }
-  route.children = (_c = route.children) == null ? void 0 : _c.filter((childRoute) => childRoute);
-  if (route.children && route.children.length === 0 && !route.index) {
-    return null;
-  }
-  return finalRoute;
-});
-export {
-  walk
-};

package/dist/js/modern/analyze/templates.js

@@ -1,334 +0,0 @@
-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));
-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 path from "path";
-import { fs, slash } from "@modern-js/utils";
-import { APP_CONFIG_NAME, TEMP_LOADERS_DIR } from "./constants";
-const index = ({
-  mountId,
-  imports,
-  renderFunction: renderFunction2,
-  exportStatement
-}) => `
-const IS_BROWSER = typeof window !== 'undefined' && window.name !== 'nodejs';
-const IS_REACT18 = process.env.IS_REACT18 === 'true';
-const MOUNT_ID = '${mountId}';
-
-${imports}
-
-let AppWrapper = null;
-
-let root = null;
-
-function render() {
-  ${renderFunction2}
-}
-
-AppWrapper = render();
-
-${exportStatement};
-`;
-const renderFunction = ({
-  plugins,
-  customBootstrap,
-  fileSystemRoutes: fileSystemRoutes2
-}) => {
-  return `
-  const finalAppConfig = {
-    ...App.config,
-    ...typeof ${APP_CONFIG_NAME} === 'function' ? ${APP_CONFIG_NAME}() : {},
-  }
-
-  AppWrapper = createApp({
-    plugins: [
-     ${plugins.map(
-    ({ name, options, args }) => `${name}({...${options}, ...finalAppConfig?.${args || name}}),`
-  ).join("\n")}
-    ]
-  })(${fileSystemRoutes2 ? "" : `App`})
-
-
-  if(!AppWrapper.init && typeof appInit !== 'undefined') {
-    AppWrapper.init = appInit;
-  }
-
-
-  if (IS_BROWSER) {
-    ${customBootstrap ? `customBootstrap(AppWrapper);` : `bootstrap(AppWrapper, MOUNT_ID, root, ReactDOM);`}
-  }
-
-  return AppWrapper
-`;
-};
-const html = (partials) => `
-<!DOCTYPE html>
-<html>
-<head>
-  <%= meta %>
-  <title><%= title %></title>
-
-  ${partials.top.join("\n")}
-
-  <script>
-    window.__assetPrefix__ = '<%= assetPrefix %>';
-  <\/script>
-  ${partials.head.join("\n")}
-
-  <!--<?- chunksMap.css ?>-->
-</head>
-
-<body>
-  <noscript>
-    We're sorry but react app doesn't work properly without JavaScript enabled. Please enable it to continue.
-  </noscript>
-  <div id="<%= mountId %>"><!--<?- html ?>--></div>
-  ${partials.body.join("\n")}
-  <!--<?- chunksMap.js ?>-->
-  <!--<?- SSRDataScript ?>-->
-  <!--<?- bottomTemplate ?>-->
-</body>
-
-</html>
-`;
-const routesForServer = ({
-  routes
-}) => {
-  const loaders = [];
-  const traverseRouteTree = (route) => {
-    var _a;
-    let children;
-    if ("children" in route && route.children) {
-      children = (_a = route == null ? void 0 : route.children) == null ? void 0 : _a.map(traverseRouteTree);
-    }
-    let loader;
-    if (route.type === "nested") {
-      if (route.loader) {
-        loaders.push(route.loader);
-        loader = `loader_${loaders.length - 1}`;
-      }
-    }
-    const finalRoute = __spreadProps(__spreadValues({}, route), {
-      loader,
-      children
-    });
-    return finalRoute;
-  };
-  let routesCode = `
-  export const routes = [
-  `;
-  for (const route of routes) {
-    if ("type" in route) {
-      const newRoute = traverseRouteTree(route);
-      routesCode += `${JSON.stringify(newRoute, null, 2).replace(
-        /"(loader_[^"])"/g,
-        "$1"
-      )},`;
-    } else {
-      routesCode += `${JSON.stringify(route, null, 2)}`;
-    }
-  }
-  routesCode += `
-];`;
-  let importLoadersCode = "";
-  if (loaders.length > 0) {
-    importLoadersCode = loaders.map((loader, index2) => {
-      return `import loader_${index2} from "${slash(loader)}"`;
-    }).join("\n");
-  }
-  return `
-    ${importLoadersCode}
-    ${routesCode}
-  `;
-};
-const fileSystemRoutes = (_0) => __async(void 0, [_0], function* ({
-  routes,
-  ssrMode,
-  nestedRoutesEntry,
-  entryName,
-  internalDirectory
-}) {
-  const loadings = [];
-  const errors = [];
-  const loaders = [];
-  const loadersMap = {};
-  const loadersMapFile = path.join(
-    internalDirectory,
-    entryName,
-    TEMP_LOADERS_DIR,
-    "map.json"
-  );
-  const importLazyCode = `
-    import { lazy } from "react";
-    import loadable, { lazy as loadableLazy } from "@modern-js/runtime/loadable"
-  `;
-  let rootLayoutCode = ``;
-  let componentLoaderPath = "";
-  const getDataLoaderPath = (loaderId) => {
-    if (!ssrMode) {
-      return "";
-    }
-    let dataLoaderPath = require.resolve("@modern-js/plugin-data-loader/loader");
-    if (nestedRoutesEntry) {
-      dataLoaderPath = `${slash(dataLoaderPath)}?mapFile=${slash(
-        loadersMapFile
-      )}&loaderId=${loaderId}!`;
-    }
-    return dataLoaderPath;
-  };
-  if (ssrMode) {
-    componentLoaderPath = `${path.join(
-      __dirname,
-      "../builder/loaders/routerLoader"
-    )}!`;
-  }
-  const traverseRouteTree = (route) => {
-    var _a;
-    let children;
-    if ("children" in route && route.children) {
-      children = (_a = route == null ? void 0 : route.children) == null ? void 0 : _a.map(traverseRouteTree);
-    }
-    let loading;
-    let error;
-    let loader;
-    let component = "";
-    let lazyImport = null;
-    if (route.type === "nested") {
-      if (route.loading) {
-        loadings.push(route.loading);
-        loading = `loading_${loadings.length - 1}`;
-      }
-      if (route.error) {
-        errors.push(route.error);
-        error = `error_${errors.length - 1}`;
-      }
-      if (route.loader) {
-        loaders.push(route.loader);
-        const loaderId = loaders.length - 1;
-        loader = `loader_${loaderId}`;
-        loadersMap[loader] = {
-          routeId: route.id,
-          filePath: route.loader,
-          inline: false
-        };
-      }
-      if (route._component) {
-        if (route.isRoot) {
-          rootLayoutCode = `import RootLayout from '${route._component}'`;
-          component = `RootLayout`;
-        } else if (ssrMode === "string") {
-          lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${componentLoaderPath}${route._component}')`;
-          component = `loadable(${lazyImport})`;
-        } else {
-          lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${componentLoaderPath}${route._component}')`;
-          component = `lazy(${lazyImport})`;
-        }
-      }
-    } else if (route._component) {
-      lazyImport = `() => import('${route._component}')`;
-      component = `loadable(${lazyImport})`;
-    }
-    const finalRoute = __spreadProps(__spreadValues({}, route), {
-      lazyImport,
-      loading,
-      loader,
-      error,
-      children
-    });
-    if (route._component) {
-      finalRoute.component = component;
-    }
-    return finalRoute;
-  };
-  let routeComponentsCode = `
-    export const routes = [
-  `;
-  for (const route of routes) {
-    if ("type" in route) {
-      const newRoute = traverseRouteTree(route);
-      routeComponentsCode += `${JSON.stringify(newRoute, null, 2).replace(/"(loadable.*\))"/g, "$1").replace(/"(loadableLazy.*\))"/g, "$1").replace(/"(\(\)[^,]+)",/g, "$1,").replace(/"(lazy\(.*\))"/g, "$1").replace(/"(loading_[^"])"/g, "$1").replace(/"(loader_[^"])"/g, "$1").replace(/"(RootLayout)"/g, "$1").replace(/"(error_[^"])"/g, "$1").replace(/\\"/g, '"')},`;
-    } else {
-      const component = `loadable(() => import('${route._component}'))`;
-      const finalRoute = __spreadProps(__spreadValues({}, route), {
-        component
-      });
-      routeComponentsCode += `${JSON.stringify(finalRoute, null, 2).replace(/"(loadable[^"]*)"/g, "$1").replace(/"(lazy[^"]*)"/g, "$1")},`;
-    }
-  }
-  routeComponentsCode += `
-];`;
-  const importLoadingCode = loadings.map((loading, index2) => {
-    return `import loading_${index2} from '${loading}';
-`;
-  }).join("");
-  const importErrorComponentsCode = errors.map((error, index2) => {
-    return `import error_${index2} from '${error}';
-`;
-  }).join("");
-  let importLoadersCode = "";
-  for (const [key, loaderInfo] of Object.entries(loadersMap)) {
-    if (loaderInfo.inline) {
-      importLoadersCode += `import { loader as ${key} } from "${getDataLoaderPath(
-        key
-      )}${slash(loaderInfo.filePath)}";
-`;
-    } else {
-      importLoadersCode += `import ${key} from "${getDataLoaderPath(
-        key
-      )}${slash(loaderInfo.filePath)}";
-`;
-    }
-  }
-  yield fs.ensureFile(loadersMapFile);
-  yield fs.writeJSON(loadersMapFile, loadersMap);
-  return `
-    ${importLazyCode}
-    ${rootLayoutCode}
-    ${importLoadingCode}
-    ${importErrorComponentsCode}
-    ${importLoadersCode}
-    ${routeComponentsCode}
-  `;
-});
-export {
-  fileSystemRoutes,
-  html,
-  index,
-  renderFunction,
-  routesForServer
-};

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

@@ -1,141 +0,0 @@
-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,
-  JS_EXTENSIONS,
-  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)];
-  } else {
-    return [...previous, filePath];
-  }
-}, []);
-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);
-  if (fileSystemRoutes) {
-    const route = {
-      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)
-        )
-      });
-    } else {
-      route.initialize = "const App = false;";
-    }
-    imports.push(route);
-  } else {
-    imports.push({
-      specifiers: [{ local: "App" }],
-      value: normalizeToPosixPath(
-        entry.replace(srcDirectory, internalSrcAlias)
-      )
-    });
-  }
-  return imports;
-};
-const isPageComponentFile = (filePath) => {
-  if (/\.(d|test|spec|e2e)\.(js|jsx|ts|tsx)$/.test(filePath)) {
-    return false;
-  }
-  if ([".js", ".jsx", ".ts", ".tsx"].includes(path.extname(filePath))) {
-    return true;
-  }
-  return false;
-};
-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 (JS_EXTENSIONS.some((ext) => filename.endsWith(ext))) {
-    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);
-});
-const getServerLoadersFile = (internalDirectory, entryName) => {
-  return path.join(internalDirectory, entryName, "route-server-loaders.js");
-};
-export {
-  getDefaultImports,
-  getServerLoadersFile,
-  hasLoader,
-  isPageComponentFile,
-  parseModule,
-  replaceWithAlias,
-  walkDirectory
-};