@modern-js/app-tools 2.0.0-beta.3 → 2.0.0-beta.6

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

@@ -1,55 +1,92 @@
-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 * as path from 'path';
-import { fs, getRouteId, normalizeToPosixPath } from '@modern-js/utils';
-import { JS_EXTENSIONS } from "./constants";
+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 { hasLoader, replaceWithAlias } from "./utils";
-const LAYOUT_FILE = 'layout';
-const PAGE_FILE = 'page';
-const LOADING_FILE = 'loading';
-const ERROR_FILE = 'error';
-const LOADER_FILE = 'loader';
-const conventionNames = [LAYOUT_FILE, PAGE_FILE, LOADING_FILE, ERROR_FILE, LOADER_FILE];
-const getLoaderPath = async filename => {
-  if (await hasLoader(filename)) {
-    return normalizeToPosixPath(filename);
+const conventionNames = Object.values(NESTED_ROUTE);
+const getLoaderPath = (filename) => __async(void 0, null, function* () {
+  if (yield hasLoader(filename)) {
+    return filename;
   }
-  return undefined;
-};
-const replaceDynamicPath = routePath => {
-  return routePath.replace(/\[(.*?)\]/g, ':$1');
+  return void 0;
+});
+const replaceDynamicPath = (routePath) => {
+  return routePath.replace(/\[(.*?)\]/g, ":$1");
 };
 const createIndexRoute = (routeInfo, rootDir, filename, entryName) => {
-  return createRoute(_objectSpread(_objectSpread({}, routeInfo), {}, {
-    index: true,
-    children: undefined
-  }), 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 _objectSpread(_objectSpread({}, routeInfo), {}, {
+  return __spreadProps(__spreadValues({}, routeInfo), {
     id,
-    type: 'nested'
+    type: "nested"
   });
 };
-export const walk = async (dirname, rootDir, alias, entryName) => {
-  if (!(await fs.pathExists(dirname))) {
+const walk = (dirname, rootDir, alias, entryName) => __async(void 0, null, function* () {
+  var _a, _b;
+  if (!(yield fs.pathExists(dirname))) {
     return null;
   }
-  const isDirectory = (await fs.stat(dirname)).isDirectory();
+  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}`;
+  const isRoot = lastSegment === "";
+  const isPathlessLayout = lastSegment.startsWith("__");
+  const isWithoutLayoutPath = lastSegment.includes(".");
+  let routePath = isRoot || isPathlessLayout ? "/" : `${lastSegment}`;
   if (isWithoutLayoutPath) {
-    routePath = lastSegment.split('.').join('/');
+    routePath = lastSegment.split(".").join("/");
   }
   routePath = replaceDynamicPath(routePath);
   const route = {
@@ -57,57 +94,73 @@ export const walk = async (dirname, rootDir, alias, entryName) => {
     children: [],
     isRoot
   };
-  const items = await fs.readdir(dirname);
+  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 isDirectory = (await fs.stat(itemPath)).isDirectory();
-    if (isDirectory) {
-      const childRoute = await walk(itemPath, rootDir, alias, entryName);
+    const isDirectory2 = (yield fs.stat(itemPath)).isDirectory();
+    if (isDirectory2) {
+      const childRoute = yield walk(itemPath, rootDir, alias, entryName);
       if (childRoute) {
-        var _route$children;
-        (_route$children = route.children) === null || _route$children === void 0 ? void 0 : _route$children.push(childRoute);
+        (_a = route.children) == null ? void 0 : _a.push(childRoute);
       }
     }
     if (extname && (!JS_EXTENSIONS.includes(extname) || !conventionNames.includes(itemWithoutExt))) {
       continue;
     }
-    if (itemWithoutExt === LAYOUT_FILE) {
+    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);
-      route.loader = await getLoaderPath(itemPath);
+      const loaderPath = yield getLoaderPath(itemPath);
+      if (loaderPath) {
+        route.loader = loaderPath;
+      }
     }
-    if (itemWithoutExt === PAGE_FILE) {
-      var _route$children2;
-      const childRoute = createIndexRoute({
-        _component: replaceWithAlias(alias.basename, itemPath, alias.name)
-      }, rootDir, itemPath, entryName);
-      childRoute.loader = await getLoaderPath(itemPath);
-      (_route$children2 = route.children) === null || _route$children2 === void 0 ? void 0 : _route$children2.push(childRoute);
+    if (itemWithoutExt === NESTED_ROUTE.PAGE_LOADER_FILE) {
+      pageLoaderFile = itemPath;
     }
-
-    // if (itemWithoutExt === LOADER_FILE) {
-    //   route.loader = replaceWithAlias(alias.basename, itemPath, alias.name);
-    // }
-
-    if (itemWithoutExt === LOADING_FILE) {
+    if (itemWithoutExt === NESTED_ROUTE.PAGE_FILE) {
+      pageRoute = createIndexRoute(
+        {
+          _component: replaceWithAlias(alias.basename, itemPath, alias.name)
+        },
+        rootDir,
+        itemPath,
+        entryName
+      );
+      const loaderPath = yield getLoaderPath(itemPath);
+      if (loaderPath) {
+        pageRoute.loader = loaderPath;
+      } else 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 === ERROR_FILE) {
+    if (itemWithoutExt === NESTED_ROUTE.ERROR_FILE) {
       route.error = replaceWithAlias(alias.basename, itemPath, alias.name);
     }
   }
-  const finalRoute = createRoute(route, rootDir, path.join(dirname, `${LAYOUT_FILE}.ts`), entryName);
-
-  /**
-   * when the url is /, the __auth/layout.tsx component should not be rendered
-   * - routes
-   *  - __auth
-   *    - layout.tsx
-   *  - layout.tsx
-   */
+  const finalRoute = createRoute(
+    route,
+    rootDir,
+    path.join(dirname, `${NESTED_ROUTE.LAYOUT_FILE}.ts`),
+    entryName
+  );
   if (isPathlessLayout) {
     delete finalRoute.path;
   }
   return finalRoute;
-};
+});
+export {
+  walk
+};

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

@@ -1,13 +1,49 @@
-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 { fs } 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));
+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 { TEMP_LOADERS_DIR } from "./constants";
-export const index = ({
+const index = ({
   mountId,
   imports,
-  renderFunction,
+  renderFunction: renderFunction2,
   exportStatement
 }) => `
 const IS_BROWSER = typeof window !== 'undefined' && window.name !== 'nodejs';
@@ -21,27 +57,25 @@ let AppWrapper = null;
 let root = null;
 
 function render() {
-  ${renderFunction}
+  ${renderFunction2}
 }
 
 AppWrapper = render();
 
 ${exportStatement};
 `;
-export const renderFunction = ({
+const renderFunction = ({
   plugins,
   customBootstrap,
-  fileSystemRoutes
+  fileSystemRoutes: fileSystemRoutes2
 }) => `
   AppWrapper = createApp({
     plugins: [
-     ${plugins.map(({
-  name,
-  options,
-  args
-}) => `${name}({...${options}, ...App?.config?.${args || name}}),`).join('\n')}
+     ${plugins.map(
+  ({ name, options, args }) => `${name}({...${options}, ...App?.config?.${args || name}}),`
+).join("\n")}
     ]
-  })(${fileSystemRoutes ? '' : `App`})
+  })(${fileSystemRoutes2 ? "" : `App`})
 
   if (IS_BROWSER) {
     ${customBootstrap ? `customBootstrap(AppWrapper);` : `bootstrap(AppWrapper, MOUNT_ID, root, ReactDOM);`}
@@ -49,19 +83,19 @@ export const renderFunction = ({
 
   return AppWrapper
 `;
-export const html = partials => `
+const html = (partials) => `
 <!DOCTYPE html>
 <html>
 <head>
   <%= meta %>
   <title><%= title %></title>
 
-  ${partials.top.join('\n')}
+  ${partials.top.join("\n")}
 
   <script>
     window.__assetPrefix__ = '<%= assetPrefix %>';
-  </script>
-  ${partials.head.join('\n')}
+  <\/script>
+  ${partials.head.join("\n")}
 
   <!--<?- chunksMap.css ?>-->
 </head>
@@ -71,7 +105,7 @@ export const html = partials => `
     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')}
+  ${partials.body.join("\n")}
   <!--<?- chunksMap.js ?>-->
   <!--<?- SSRDataScript ?>-->
   <!--<?- bottomTemplate ?>-->
@@ -79,27 +113,32 @@ export const html = partials => `
 
 </html>
 `;
-export const routesForServer = ({
+const routesForServer = ({
   routes,
   internalDirectory,
   entryName
 }) => {
   const loaders = [];
-  const loaderIndexFile = path.join(internalDirectory, entryName, TEMP_LOADERS_DIR, 'index.js');
-  const traverseRouteTree = route => {
+  const loaderIndexFile = path.join(
+    internalDirectory,
+    entryName,
+    TEMP_LOADERS_DIR,
+    "index.js"
+  );
+  const traverseRouteTree = (route) => {
+    var _a;
     let children;
-    if ('children' in route && route.children) {
-      var _route$children;
-      children = route === null || route === void 0 ? void 0 : (_route$children = route.children) === null || _route$children === void 0 ? void 0 : _route$children.map(traverseRouteTree);
+    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.type === "nested") {
       if (route.loader) {
         loaders.push(route.loader);
         loader = `loader_${loaders.length - 1}`;
       }
     }
-    const finalRoute = _objectSpread(_objectSpread({}, route), {}, {
+    const finalRoute = __spreadProps(__spreadValues({}, route), {
       loader,
       children
     });
@@ -109,62 +148,82 @@ export const routesForServer = ({
   export const routes = [
   `;
   for (const route of routes) {
-    if ('type' in route) {
+    if ("type" in route) {
       const newRoute = traverseRouteTree(route);
-      routesCode += `${JSON.stringify(newRoute, null, 2).replace(/"(loader_[^"])"/g, '$1')},`;
+      routesCode += `${JSON.stringify(newRoute, null, 2).replace(
+        /"(loader_[^"])"/g,
+        "$1"
+      )},`;
     } else {
       routesCode += `${JSON.stringify(route, null, 2)}`;
     }
   }
-  routesCode += `\n];`;
-  let importLoadersCode = '';
+  routesCode += `
+];`;
+  let importLoadersCode = "";
   if (loaders.length > 0) {
     importLoadersCode = `
-    import { ${loaders.map((loader, index) => `loader_${index}`)} } from "${loaderIndexFile}"`;
+    import { ${loaders.map(
+      (loader, index2) => `loader_${index2}`
+    )} } from "${slash(loaderIndexFile)}"`;
   }
   return `
     ${importLoadersCode}
     ${routesCode}
   `;
 };
-export const fileSystemRoutes = async ({
+const fileSystemRoutes = (_0) => __async(void 0, [_0], function* ({
   routes,
   ssrMode,
   nestedRoutesEntry,
   entryName,
-  internalDirectory
-}) => {
+  internalDirectory,
+  internalDirAlias
+}) {
   const loadings = [];
   const errors = [];
   const loaders = [];
   const loadersMap = {};
-  const loadersIndexFile = path.join('@_modern_js_internal', entryName, TEMP_LOADERS_DIR, 'index.js');
-  const loadersMapFile = path.join(internalDirectory, entryName, TEMP_LOADERS_DIR, 'map.json');
+  const loadersIndexFile = path.join(
+    internalDirAlias,
+    entryName,
+    TEMP_LOADERS_DIR,
+    "index.js"
+  );
+  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 dataLoaderPath = '';
-  let componentLoaderPath = '';
+  let dataLoaderPath = "";
+  let componentLoaderPath = "";
   if (ssrMode) {
-    dataLoaderPath = require.resolve(`@modern-js/plugin-data-loader/loader`);
+    dataLoaderPath = require.resolve("@modern-js/plugin-data-loader/loader");
     if (nestedRoutesEntry) {
       dataLoaderPath = `${dataLoaderPath}?routesDir=${nestedRoutesEntry}&mapFile=${loadersMapFile}!`;
     }
-    componentLoaderPath = `${path.join(__dirname, '../builder/loaders/routerLoader')}!`;
+    componentLoaderPath = `${path.join(
+      __dirname,
+      "../builder/loaders/routerLoader"
+    )}!`;
   }
-  const traverseRouteTree = route => {
+  const traverseRouteTree = (route) => {
+    var _a;
     let children;
-    if ('children' in route && route.children) {
-      var _route$children2;
-      children = route === null || route === void 0 ? void 0 : (_route$children2 = route.children) === null || _route$children2 === void 0 ? void 0 : _route$children2.map(traverseRouteTree);
+    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 = '';
-    if (route.type === 'nested') {
+    let component = "";
+    if (route.type === "nested") {
       if (route.loading) {
         loadings.push(route.loading);
         loading = `loading_${loadings.length - 1}`;
@@ -183,17 +242,16 @@ export const fileSystemRoutes = async ({
         if (route.isRoot) {
           rootLayoutCode = `import RootLayout from '${route._component}'`;
           component = `RootLayout`;
-        } else if (ssrMode === 'string') {
+        } else if (ssrMode === "string") {
           component = `loadable(() => import(/* webpackChunkName: "${route.id}" */  '${componentLoaderPath}${route._component}'))`;
         } else {
-          // csr and streaming
           component = `lazy(() => import(/* webpackChunkName: "${route.id}" */  '${componentLoaderPath}${route._component}'))`;
         }
       }
     } else if (route._component) {
       component = `loadable(() => import('${route._component}'))`;
     }
-    const finalRoute = _objectSpread(_objectSpread({}, route), {}, {
+    const finalRoute = __spreadProps(__spreadValues({}, route), {
       loading,
       loader,
       error,
@@ -208,45 +266,69 @@ export const fileSystemRoutes = async ({
     export const routes = [
   `;
   for (const route of routes) {
-    if ('type' in route) {
+    if ("type" in route) {
       const newRoute = traverseRouteTree(route);
-      routeComponentsCode += `${JSON.stringify(newRoute, null, 2).replace(/"(loadable.*\))"/g, '$1').replace(/"(loadableLazy.*\))"/g, '$1').replace(/"(lazy.*\))"/g, '$1').replace(/"(loading_[^"])"/g, '$1').replace(/"(loader_[^"])"/g, '$1').replace(/"(RootLayout)"/g, '$1').replace(/"(error_[^"])"/g, '$1').replace(/\\"/g, '"')},`;
+      routeComponentsCode += `${JSON.stringify(newRoute, null, 2).replace(/"(loadable.*\))"/g, "$1").replace(/"(loadableLazy.*\))"/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 = _objectSpread(_objectSpread({}, route), {}, {
+      const finalRoute = __spreadProps(__spreadValues({}, route), {
         component
       });
-      routeComponentsCode += `${JSON.stringify(finalRoute, null, 2).replace(/"(loadable[^"]*)"/g, '$1').replace(/"(lazy[^"]*)"/g, '$1')},`;
+      routeComponentsCode += `${JSON.stringify(finalRoute, null, 2).replace(/"(loadable[^"]*)"/g, "$1").replace(/"(lazy[^"]*)"/g, "$1")},`;
     }
   }
-  routeComponentsCode += `\n];`;
-  const importLoadingCode = loadings.map((loading, index) => {
-    return `import loading_${index} from '${loading}';\n`;
-  }).join('');
-  const importErrorComponentsCode = errors.map((error, index) => {
-    return `import error_${index} from '${error}';\n`;
-  }).join('');
-  let importLoadersCode = '';
+  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 = "";
   if (loaders.length > 0) {
     importLoadersCode = `
-    import { ${loaders.map((loader, index) => `loader_${index}`)} } from "${dataLoaderPath}${loadersIndexFile}"
+    import { ${loaders.map(
+      (loader, index2) => `loader_${index2}`
+    )} } from "${slash(dataLoaderPath)}${slash(loadersIndexFile)}"
   `;
-    const loaderEntryCode = loaders.map((loader, index) => {
-      return `export * from './loader_${index}.js';`;
-    }).join('\n');
-    const loaderEntryFile = path.join(internalDirectory, entryName, TEMP_LOADERS_DIR, 'entry.js');
-    await fs.ensureFile(loaderEntryFile);
-    await fs.writeFile(loaderEntryFile, loaderEntryCode);
-    await fs.writeJSON(loadersMapFile, loadersMap);
-    await Promise.all(loaders.map(async (loader, index) => {
-      const name = `loader_${index}`;
-      const filename = path.join(internalDirectory, entryName, TEMP_LOADERS_DIR, `${name}.js`);
-      const code = `
-          export { loader as ${name} } from '${loader}'
+    const loaderEntryCode = loaders.map((loader, index2) => {
+      return `export * from './loader_${index2}.js';`;
+    }).join("\n");
+    const loaderEntryFile = path.join(
+      internalDirectory,
+      entryName,
+      TEMP_LOADERS_DIR,
+      "entry.js"
+    );
+    yield fs.ensureFile(loaderEntryFile);
+    yield fs.writeFile(loaderEntryFile, loaderEntryCode);
+    yield fs.writeJSON(loadersMapFile, loadersMap);
+    yield Promise.all(
+      loaders.map((loader, index2) => __async(void 0, null, function* () {
+        const name = `loader_${index2}`;
+        const filename = path.join(
+          internalDirectory,
+          entryName,
+          TEMP_LOADERS_DIR,
+          `${name}.js`
+        );
+        let code = "";
+        if (loader.includes(".loader.")) {
+          code = `
+          export { default as ${name} } from '${slash(loader)}'
+        `;
+        } else {
+          code = `
+          export { loader as ${name} } from '${slash(loader)}'
         `;
-      await fs.ensureFile(filename);
-      await fs.writeFile(filename, code);
-    }));
+        }
+        yield fs.ensureFile(filename);
+        yield fs.writeFile(filename, code);
+      }))
+    );
   }
   return `
     ${importLazyCode}
@@ -256,4 +338,11 @@ export const fileSystemRoutes = async ({
     ${importLoadersCode}
     ${routeComponentsCode}
   `;
-};
+});
+export {
+  fileSystemRoutes,
+  html,
+  index,
+  renderFunction,
+  routesForServer
+};