@modern-js/plugin-data-loader 2.0.0-beta.0 → 2.0.0-beta.1

package/dist/js/modern/cli/create-request.js

@@ -1,8 +1,6 @@
 // eslint-disable-next-line eslint-comments/disable-enable-pair
-
 /* eslint-disable node/prefer-global/url */
 // eslint-disable-next-line eslint-comments/disable-enable-pair
-
 /* eslint-disable node/no-unsupported-features/node-builtins */
 import { compile } from 'path-to-regexp';
 export const getRequestUrl = ({
@@ -29,7 +27,6 @@ export const createRequest = (routeId, method = 'get') => {
       request,
       routeId
     });
-
     try {
       const res = await fetch(url, {
         method,

package/dist/js/modern/cli/generate-client.js

@@ -2,11 +2,12 @@ import path from 'path';
 import { getRouteId } from '@modern-js/utils';
 export const generateClient = ({
   basedir,
-  filename
+  filename,
+  entryName
 }) => {
   // TODO: loader 的约定变更
   const componentPath = path.join(path.dirname(filename), 'layout.ts');
-  const routeId = getRouteId(componentPath, basedir);
+  const routeId = getRouteId(componentPath, basedir, entryName);
   const requestCreatorPath = path.join(__dirname, './create-request').replace('node', 'treeshaking').replace(/\\/g, '/');
   const importCode = `
     import { createRequest } from '${requestCreatorPath}';

package/dist/js/modern/cli/loader.js

@@ -1,21 +1,19 @@
 // eslint-disable-next-line eslint-comments/disable-enable-pair
-
 /* eslint-disable @babel/no-invalid-this */
+
 import { generateClient } from "./generate-client";
 export default async function loader(source) {
   var _this$_compiler;
-
   this.cacheable();
   const target = (_this$_compiler = this._compiler) === null || _this$_compiler === void 0 ? void 0 : _this$_compiler.options.target;
-
   if (target === 'node') {
     return source;
   }
-
   const options = this.getOptions();
   const code = generateClient({
     basedir: options.routesDir,
-    filename: this.resourcePath
+    filename: this.resourcePath,
+    entryName: options.entryName
   });
   return code;
 }

package/dist/js/modern/server/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 { installGlobals, writeReadableStreamToWritable, Response as NodeResponse } from '@remix-run/node';
 import { matchRoutes } from 'react-router-dom';
 // Polyfill Web Fetch API
@@ -16,23 +13,20 @@ export function isRedirectResponse(response) {
 export function isResponse(value) {
   return value != null && typeof value.status === 'number' && typeof value.statusText === 'string' && typeof value.headers === 'object' && typeof value.body !== 'undefined';
 }
-
 const json = (data, init = {}) => {
   const responseInit = typeof init === 'number' ? {
     status: init
   } : init;
   const headers = new Headers(responseInit.headers);
-
   if (!headers.has('Content-Type')) {
     headers.set('Content-Type', 'application/json; charset=utf-8');
   }
-
   return new NodeResponse(JSON.stringify(data), _objectSpread(_objectSpread({}, responseInit), {}, {
     headers
   }));
-}; // TODO: 添加 context
-
+};
 
+// TODO: 添加 context
 const callRouteLoader = async ({
   routeId,
   loader,
@@ -44,9 +38,7 @@ const callRouteLoader = async ({
   if (!loader) {
     throw new Error(`You made a ${request.method} request to ${request.url} but did not provide ` + `a default component or \`loader\` for route "${routeId}", ` + `so there is no way to handle the request.`);
   }
-
   let result;
-
   try {
     result = await loader({
       request,
@@ -56,20 +48,15 @@ const callRouteLoader = async ({
     if (!isResponse(error)) {
       throw error;
     }
-
     result = error;
   }
-
   if (result === undefined) {
     throw new Error(`You defined a loader for route "${routeId}" but didn't return ` + `anything from your \`loader\` function. Please return a value or \`null\`.`);
   }
-
   return isResponse(result) ? result : json(result);
 };
-
 const createLoaderHeaders = requestHeaders => {
   const headers = new Headers();
-
   for (const [key, values] of Object.entries(requestHeaders)) {
     if (values) {
       if (Array.isArray(values)) {
@@ -81,13 +68,11 @@ const createLoaderHeaders = requestHeaders => {
       }
     }
   }
-
   return headers;
 };
-
 const createLoaderRequest = context => {
-  const origin = `${context.protocol}://${context.host}`; // eslint-disable-next-line node/no-unsupported-features/node-builtins, node/prefer-global/url
-
+  const origin = `${context.protocol}://${context.host}`;
+  // eslint-disable-next-line node/no-unsupported-features/node-builtins, node/prefer-global/url
   const url = new URL(context.url, origin);
   const controller = new AbortController();
   const init = {
@@ -97,34 +82,27 @@ const createLoaderRequest = context => {
   };
   return new Request(url.href, init);
 };
-
 const sendLoaderResponse = async (res, nodeResponse) => {
   res.statusMessage = nodeResponse.statusText;
   res.statusCode = nodeResponse.status;
-
   for (const [key, value] of nodeResponse.headers.entries()) {
     res.setHeader(key, value);
   }
-
   if (nodeResponse.body) {
     await writeReadableStreamToWritable(nodeResponse.body, res);
   } else {
     res.end();
   }
 };
-
 export const getPathWithoutEntry = (pathname, entryPath) => {
   if (entryPath === '/') {
     return pathname;
   }
-
   return pathname.replace(entryPath, '');
 };
-
 const matchEntry = (pathname, entries) => {
   return entries.find(entry => pathname.startsWith(entry.urlPath));
 };
-
 export const handleRequest = async ({
   context,
   serverRoutes,
@@ -135,48 +113,37 @@ export const handleRequest = async ({
     query
   } = context;
   const routeId = query[LOADER_SEARCH_PARAM];
-
   if (!routeId || method.toLowerCase() !== 'get') {
     return;
   }
-
   const entry = matchEntry(context.path, serverRoutes);
-
   if (!entry) {
     return;
   }
-
   const {
     routes
   } = await import(`${distDir}/loader-routes/${entry.entryName}`);
-
   if (!routes) {
     return;
   }
-
   const {
     res
   } = context;
   const pathname = getPathWithoutEntry(context.path, entry.urlPath);
   const matches = matchRoutes(routes, pathname);
-
   if (!matches) {
     res.statusCode = 403;
     res.end(`Route ${pathname} was not matched`);
     return;
   }
-
   const match = matches === null || matches === void 0 ? void 0 : matches.find(match => match.route.id === routeId);
-
   if (!match) {
     res.statusCode = 403;
     res.end(`Route ${routeId} does not match URL ${context.path}`);
     return;
   }
-
   const request = createLoaderRequest(context);
   let response;
-
   try {
     response = await callRouteLoader({
       loader: match.route.loader,
@@ -184,7 +151,8 @@ export const handleRequest = async ({
       params: match.params,
       request,
       loadContext: {}
-    }); // TODO: 处理 redirect
+    });
+    // TODO: 处理 redirect
   } catch (error) {
     const message = String(error);
     response = new NodeResponse(message, {
@@ -194,7 +162,6 @@ export const handleRequest = async ({
       }
     });
   }
-
   sendLoaderResponse(res, response);
 };
 export default (() => ({
@@ -212,6 +179,5 @@ export default (() => ({
         });
       };
     }
-
   })
 }));

package/dist/js/node/cli/create-request.js

@@ -4,15 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getRequestUrl = exports.createRequest = void 0;
-
 var _pathToRegexp = require("path-to-regexp");
-
 // eslint-disable-next-line eslint-comments/disable-enable-pair
-
 /* eslint-disable node/prefer-global/url */
 // eslint-disable-next-line eslint-comments/disable-enable-pair
-
 /* eslint-disable node/no-unsupported-features/node-builtins */
+
 const getRequestUrl = ({
   params,
   request,
@@ -27,9 +24,7 @@ const getRequestUrl = ({
   url.searchParams.append('_loader', routeId);
   return url;
 };
-
 exports.getRequestUrl = getRequestUrl;
-
 const createRequest = (routeId, method = 'get') => {
   return async ({
     params,
@@ -40,7 +35,6 @@ const createRequest = (routeId, method = 'get') => {
       request,
       routeId
     });
-
     try {
       const res = await fetch(url, {
         method,
@@ -53,5 +47,4 @@ const createRequest = (routeId, method = 'get') => {
     }
   };
 };
-
 exports.createRequest = createRequest;

package/dist/js/node/cli/generate-client.js

@@ -4,24 +4,18 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.generateClient = void 0;
-
 var _path = _interopRequireDefault(require("path"));
-
 var _utils = require("@modern-js/utils");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const generateClient = ({
   basedir,
-  filename
+  filename,
+  entryName
 }) => {
   // TODO: loader 的约定变更
   const componentPath = _path.default.join(_path.default.dirname(filename), 'layout.ts');
-
-  const routeId = (0, _utils.getRouteId)(componentPath, basedir);
-
+  const routeId = (0, _utils.getRouteId)(componentPath, basedir, entryName);
   const requestCreatorPath = _path.default.join(__dirname, './create-request').replace('node', 'treeshaking').replace(/\\/g, '/');
-
   const importCode = `
     import { createRequest } from '${requestCreatorPath}';
   `;
@@ -35,5 +29,4 @@ const generateClient = ({
     ${requestCode}
   `;
 };
-
 exports.generateClient = generateClient;

package/dist/js/node/cli/loader.js

@@ -4,26 +4,22 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = loader;
-
 var _generateClient = require("./generate-client");
-
 // eslint-disable-next-line eslint-comments/disable-enable-pair
-
 /* eslint-disable @babel/no-invalid-this */
+
 async function loader(source) {
   var _this$_compiler;
-
   this.cacheable();
   const target = (_this$_compiler = this._compiler) === null || _this$_compiler === void 0 ? void 0 : _this$_compiler.options.target;
-
   if (target === 'node') {
     return source;
   }
-
   const options = this.getOptions();
   const code = (0, _generateClient.generateClient)({
     basedir: options.routesDir,
-    filename: this.resourcePath
+    filename: this.resourcePath,
+    entryName: options.entryName
   });
   return code;
 }

package/dist/js/node/server/index.js

@@ -6,50 +6,37 @@ Object.defineProperty(exports, "__esModule", {
 exports.handleRequest = exports.getPathWithoutEntry = exports.default = void 0;
 exports.isRedirectResponse = isRedirectResponse;
 exports.isResponse = isResponse;
-
 var _node = require("@remix-run/node");
-
 var _reactRouterDom = require("react-router-dom");
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 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; }
-
 // Polyfill Web Fetch API
 (0, _node.installGlobals)();
 const LOADER_SEARCH_PARAM = '_loader';
 const redirectStatusCodes = new Set([301, 302, 303, 307, 308]);
-
 function isRedirectResponse(response) {
   return redirectStatusCodes.has(response.status);
 }
-
 function isResponse(value) {
   return value != null && typeof value.status === 'number' && typeof value.statusText === 'string' && typeof value.headers === 'object' && typeof value.body !== 'undefined';
 }
-
 const json = (data, init = {}) => {
   const responseInit = typeof init === 'number' ? {
     status: init
   } : init;
   const headers = new Headers(responseInit.headers);
-
   if (!headers.has('Content-Type')) {
     headers.set('Content-Type', 'application/json; charset=utf-8');
   }
-
   return new _node.Response(JSON.stringify(data), _objectSpread(_objectSpread({}, responseInit), {}, {
     headers
   }));
-}; // TODO: 添加 context
-
+};
 
+// TODO: 添加 context
 const callRouteLoader = async ({
   routeId,
   loader,
@@ -61,9 +48,7 @@ const callRouteLoader = async ({
   if (!loader) {
     throw new Error(`You made a ${request.method} request to ${request.url} but did not provide ` + `a default component or \`loader\` for route "${routeId}", ` + `so there is no way to handle the request.`);
   }
-
   let result;
-
   try {
     result = await loader({
       request,
@@ -73,20 +58,15 @@ const callRouteLoader = async ({
     if (!isResponse(error)) {
       throw error;
     }
-
     result = error;
   }
-
   if (result === undefined) {
     throw new Error(`You defined a loader for route "${routeId}" but didn't return ` + `anything from your \`loader\` function. Please return a value or \`null\`.`);
   }
-
   return isResponse(result) ? result : json(result);
 };
-
 const createLoaderHeaders = requestHeaders => {
   const headers = new Headers();
-
   for (const [key, values] of Object.entries(requestHeaders)) {
     if (values) {
       if (Array.isArray(values)) {
@@ -98,13 +78,11 @@ const createLoaderHeaders = requestHeaders => {
       }
     }
   }
-
   return headers;
 };
-
 const createLoaderRequest = context => {
-  const origin = `${context.protocol}://${context.host}`; // eslint-disable-next-line node/no-unsupported-features/node-builtins, node/prefer-global/url
-
+  const origin = `${context.protocol}://${context.host}`;
+  // eslint-disable-next-line node/no-unsupported-features/node-builtins, node/prefer-global/url
   const url = new URL(context.url, origin);
   const controller = new AbortController();
   const init = {
@@ -114,36 +92,28 @@ const createLoaderRequest = context => {
   };
   return new Request(url.href, init);
 };
-
 const sendLoaderResponse = async (res, nodeResponse) => {
   res.statusMessage = nodeResponse.statusText;
   res.statusCode = nodeResponse.status;
-
   for (const [key, value] of nodeResponse.headers.entries()) {
     res.setHeader(key, value);
   }
-
   if (nodeResponse.body) {
     await (0, _node.writeReadableStreamToWritable)(nodeResponse.body, res);
   } else {
     res.end();
   }
 };
-
 const getPathWithoutEntry = (pathname, entryPath) => {
   if (entryPath === '/') {
     return pathname;
   }
-
   return pathname.replace(entryPath, '');
 };
-
 exports.getPathWithoutEntry = getPathWithoutEntry;
-
 const matchEntry = (pathname, entries) => {
   return entries.find(entry => pathname.startsWith(entry.urlPath));
 };
-
 const handleRequest = async ({
   context,
   serverRoutes,
@@ -154,48 +124,37 @@ const handleRequest = async ({
     query
   } = context;
   const routeId = query[LOADER_SEARCH_PARAM];
-
   if (!routeId || method.toLowerCase() !== 'get') {
     return;
   }
-
   const entry = matchEntry(context.path, serverRoutes);
-
   if (!entry) {
     return;
   }
-
   const {
     routes
   } = await Promise.resolve(`${distDir}/loader-routes/${entry.entryName}`).then(s => _interopRequireWildcard(require(s)));
-
   if (!routes) {
     return;
   }
-
   const {
     res
   } = context;
   const pathname = getPathWithoutEntry(context.path, entry.urlPath);
   const matches = (0, _reactRouterDom.matchRoutes)(routes, pathname);
-
   if (!matches) {
     res.statusCode = 403;
     res.end(`Route ${pathname} was not matched`);
     return;
   }
-
   const match = matches === null || matches === void 0 ? void 0 : matches.find(match => match.route.id === routeId);
-
   if (!match) {
     res.statusCode = 403;
     res.end(`Route ${routeId} does not match URL ${context.path}`);
     return;
   }
-
   const request = createLoaderRequest(context);
   let response;
-
   try {
     response = await callRouteLoader({
       loader: match.route.loader,
@@ -203,7 +162,8 @@ const handleRequest = async ({
       params: match.params,
       request,
       loadContext: {}
-    }); // TODO: 处理 redirect
+    });
+    // TODO: 处理 redirect
   } catch (error) {
     const message = String(error);
     response = new _node.Response(message, {
@@ -213,12 +173,9 @@ const handleRequest = async ({
       }
     });
   }
-
   sendLoaderResponse(res, response);
 };
-
 exports.handleRequest = handleRequest;
-
 var _default = () => ({
   name: '@modern-js/plugin-data-loader',
   setup: () => ({
@@ -234,8 +191,6 @@ var _default = () => ({
         });
       };
     }
-
   })
 });
-
 exports.default = _default;

package/dist/js/treeshaking/cli/create-request.js

@@ -1,16 +1,14 @@
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 // eslint-disable-next-line eslint-comments/disable-enable-pair
-
 /* eslint-disable node/prefer-global/url */
 // eslint-disable-next-line eslint-comments/disable-enable-pair
-
 /* eslint-disable node/no-unsupported-features/node-builtins */
 import { compile } from 'path-to-regexp';
 export var getRequestUrl = function getRequestUrl(_ref) {
   var params = _ref.params,
-      request = _ref.request,
-      routeId = _ref.routeId;
+    request = _ref.request,
+    routeId = _ref.routeId;
   var url = new URL(request.url);
   var toPath = compile(url.pathname, {
     encode: encodeURIComponent
@@ -41,17 +39,14 @@ export var createRequest = function createRequest(routeId) {
                 method: method,
                 signal: request.signal
               });
-
             case 5:
               res = _context.sent;
               return _context.abrupt("return", res);
-
             case 9:
               _context.prev = 9;
               _context.t0 = _context["catch"](2);
               console.error(_context.t0);
               throw _context.t0;
-
             case 13:
             case "end":
               return _context.stop();
@@ -59,7 +54,6 @@ export var createRequest = function createRequest(routeId) {
         }
       }, _callee, null, [[2, 9]]);
     }));
-
     return function (_x) {
       return _ref3.apply(this, arguments);
     };

package/dist/js/treeshaking/cli/generate-client.js

@@ -2,10 +2,11 @@ import path from 'path';
 import { getRouteId } from '@modern-js/utils';
 export var generateClient = function generateClient(_ref) {
   var basedir = _ref.basedir,
-      filename = _ref.filename;
+    filename = _ref.filename,
+    entryName = _ref.entryName;
   // TODO: loader 的约定变更
   var componentPath = path.join(path.dirname(filename), 'layout.ts');
-  var routeId = getRouteId(componentPath, basedir);
+  var routeId = getRouteId(componentPath, basedir, entryName);
   var requestCreatorPath = path.join(__dirname, './create-request').replace('node', 'treeshaking').replace(/\\/g, '/');
   var importCode = "\n    import { createRequest } from '".concat(requestCreatorPath, "';\n  ");
   var requestCode = "\n    const loader = createRequest('".concat(routeId, "');\n    export default loader;\n    export { loader };\n  ");

package/dist/js/treeshaking/cli/loader.js

@@ -1,17 +1,15 @@
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 // eslint-disable-next-line eslint-comments/disable-enable-pair
-
 /* eslint-disable @babel/no-invalid-this */
+
 import { generateClient } from "./generate-client";
 export default function loader(_x) {
   return _loader.apply(this, arguments);
 }
-
 function _loader() {
   _loader = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(source) {
     var _this$_compiler;
-
     var target, options, code;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) {
@@ -19,22 +17,19 @@ function _loader() {
           case 0:
             this.cacheable();
             target = (_this$_compiler = this._compiler) === null || _this$_compiler === void 0 ? void 0 : _this$_compiler.options.target;
-
             if (!(target === 'node')) {
               _context.next = 4;
               break;
             }
-
             return _context.abrupt("return", source);
-
           case 4:
             options = this.getOptions();
             code = generateClient({
               basedir: options.routesDir,
-              filename: this.resourcePath
+              filename: this.resourcePath,
+              entryName: options.entryName
             });
             return _context.abrupt("return", code);
-
           case 7:
           case "end":
             return _context.stop();

package/dist/js/treeshaking/server/index.js

@@ -16,24 +16,21 @@ export function isRedirectResponse(response) {
 export function isResponse(value) {
   return value != null && typeof value.status === 'number' && typeof value.statusText === 'string' && _typeof(value.headers) === 'object' && typeof value.body !== 'undefined';
 }
-
 var json = function json(data) {
   var init = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var responseInit = typeof init === 'number' ? {
     status: init
   } : init;
   var headers = new Headers(responseInit.headers);
-
   if (!headers.has('Content-Type')) {
     headers.set('Content-Type', 'application/json; charset=utf-8');
   }
-
   return new NodeResponse(JSON.stringify(data), _objectSpread(_objectSpread({}, responseInit), {}, {
     headers: headers
   }));
-}; // TODO: 添加 context
-
+};
 
+// TODO: 添加 context
 var callRouteLoader = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
     var routeId, loader, params, request, loadContext, result;
@@ -42,14 +39,11 @@ var callRouteLoader = /*#__PURE__*/function () {
         switch (_context.prev = _context.next) {
           case 0:
             routeId = _ref.routeId, loader = _ref.loader, params = _ref.params, request = _ref.request, loadContext = _ref.loadContext;
-
             if (loader) {
               _context.next = 3;
               break;
             }
-
             throw new Error("You made a ".concat(request.method, " request to ").concat(request.url, " but did not provide ") + "a default component or `loader` for route \"".concat(routeId, "\", ") + "so there is no way to handle the request.");
-
           case 3:
             _context.prev = 3;
             _context.next = 6;
@@ -57,37 +51,28 @@ var callRouteLoader = /*#__PURE__*/function () {
               request: request,
               params: params
             });
-
           case 6:
             result = _context.sent;
             _context.next = 14;
             break;
-
           case 9:
             _context.prev = 9;
             _context.t0 = _context["catch"](3);
-
             if (isResponse(_context.t0)) {
               _context.next = 13;
               break;
             }
-
             throw _context.t0;
-
           case 13:
             result = _context.t0;
-
           case 14:
             if (!(result === undefined)) {
               _context.next = 16;
               break;
             }
-
             throw new Error("You defined a loader for route \"".concat(routeId, "\" but didn't return ") + "anything from your `loader` function. Please return a value or `null`.");
-
           case 16:
             return _context.abrupt("return", isResponse(result) ? result : json(result));
-
           case 17:
           case "end":
             return _context.stop();
@@ -95,25 +80,20 @@ var callRouteLoader = /*#__PURE__*/function () {
       }
     }, _callee, null, [[3, 9]]);
   }));
-
   return function callRouteLoader(_x) {
     return _ref2.apply(this, arguments);
   };
 }();
-
 var createLoaderHeaders = function createLoaderHeaders(requestHeaders) {
   var headers = new Headers();
-
   for (var _i = 0, _Object$entries = Object.entries(requestHeaders); _i < _Object$entries.length; _i++) {
     var _Object$entries$_i = _slicedToArray(_Object$entries[_i], 2),
-        _key = _Object$entries$_i[0],
-        values = _Object$entries$_i[1];
-
+      _key = _Object$entries$_i[0],
+      values = _Object$entries$_i[1];
     if (values) {
       if (Array.isArray(values)) {
         var _iterator = _createForOfIteratorHelper(values),
-            _step;
-
+          _step;
         try {
           for (_iterator.s(); !(_step = _iterator.n()).done;) {
             var value = _step.value;
@@ -129,13 +109,11 @@ var createLoaderHeaders = function createLoaderHeaders(requestHeaders) {
       }
     }
   }
-
   return headers;
 };
-
 var createLoaderRequest = function createLoaderRequest(context) {
-  var origin = "".concat(context.protocol, "://").concat(context.host); // eslint-disable-next-line node/no-unsupported-features/node-builtins, node/prefer-global/url
-
+  var origin = "".concat(context.protocol, "://").concat(context.host);
+  // eslint-disable-next-line node/no-unsupported-features/node-builtins, node/prefer-global/url
   var url = new URL(context.url, origin);
   var controller = new AbortController();
   var init = {
@@ -145,11 +123,9 @@ var createLoaderRequest = function createLoaderRequest(context) {
   };
   return new Request(url.href, init);
 };
-
 var sendLoaderResponse = /*#__PURE__*/function () {
   var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(res, nodeResponse) {
     var _iterator2, _step2, _step2$value, _key2, value;
-
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
@@ -157,7 +133,6 @@ var sendLoaderResponse = /*#__PURE__*/function () {
             res.statusMessage = nodeResponse.statusText;
             res.statusCode = nodeResponse.status;
             _iterator2 = _createForOfIteratorHelper(nodeResponse.headers.entries());
-
             try {
               for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
                 _step2$value = _slicedToArray(_step2.value, 2), _key2 = _step2$value[0], value = _step2$value[1];
@@ -168,22 +143,17 @@ var sendLoaderResponse = /*#__PURE__*/function () {
             } finally {
               _iterator2.f();
             }
-
             if (!nodeResponse.body) {
               _context2.next = 9;
               break;
             }
-
             _context2.next = 7;
             return writeReadableStreamToWritable(nodeResponse.body, res);
-
           case 7:
             _context2.next = 10;
             break;
-
           case 9:
             res.end();
-
           case 10:
           case "end":
             return _context2.stop();
@@ -191,30 +161,24 @@ var sendLoaderResponse = /*#__PURE__*/function () {
       }
     }, _callee2);
   }));
-
   return function sendLoaderResponse(_x2, _x3) {
     return _ref3.apply(this, arguments);
   };
 }();
-
 export var getPathWithoutEntry = function getPathWithoutEntry(pathname, entryPath) {
   if (entryPath === '/') {
     return pathname;
   }
-
   return pathname.replace(entryPath, '');
 };
-
 var matchEntry = function matchEntry(pathname, entries) {
   return entries.find(function (entry) {
     return pathname.startsWith(entry.urlPath);
   });
 };
-
 export var handleRequest = /*#__PURE__*/function () {
   var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref4) {
     var context, serverRoutes, distDir, method, query, routeId, entry, _yield$import, routes, res, pathname, matches, match, request, response, message;
-
     return _regeneratorRuntime().wrap(function _callee3$(_context3) {
       while (1) {
         switch (_context3.prev = _context3.next) {
@@ -222,67 +186,51 @@ export var handleRequest = /*#__PURE__*/function () {
             context = _ref4.context, serverRoutes = _ref4.serverRoutes, distDir = _ref4.distDir;
             method = context.method, query = context.query;
             routeId = query[LOADER_SEARCH_PARAM];
-
             if (!(!routeId || method.toLowerCase() !== 'get')) {
               _context3.next = 5;
               break;
             }
-
             return _context3.abrupt("return");
-
           case 5:
             entry = matchEntry(context.path, serverRoutes);
-
             if (entry) {
               _context3.next = 8;
               break;
             }
-
             return _context3.abrupt("return");
-
           case 8:
             _context3.next = 10;
             return import("".concat(distDir, "/loader-routes/").concat(entry.entryName));
-
           case 10:
             _yield$import = _context3.sent;
             routes = _yield$import.routes;
-
             if (routes) {
               _context3.next = 14;
               break;
             }
-
             return _context3.abrupt("return");
-
           case 14:
             res = context.res;
             pathname = getPathWithoutEntry(context.path, entry.urlPath);
             matches = matchRoutes(routes, pathname);
-
             if (matches) {
               _context3.next = 21;
               break;
             }
-
             res.statusCode = 403;
             res.end("Route ".concat(pathname, " was not matched"));
             return _context3.abrupt("return");
-
           case 21:
             match = matches === null || matches === void 0 ? void 0 : matches.find(function (match) {
               return match.route.id === routeId;
             });
-
             if (match) {
               _context3.next = 26;
               break;
             }
-
             res.statusCode = 403;
             res.end("Route ".concat(routeId, " does not match URL ").concat(context.path));
             return _context3.abrupt("return");
-
           case 26:
             request = createLoaderRequest(context);
             _context3.prev = 27;
@@ -294,12 +242,10 @@ export var handleRequest = /*#__PURE__*/function () {
               request: request,
               loadContext: {}
             });
-
           case 30:
             response = _context3.sent;
             _context3.next = 37;
             break;
-
           case 33:
             _context3.prev = 33;
             _context3.t0 = _context3["catch"](27);
@@ -310,10 +256,8 @@ export var handleRequest = /*#__PURE__*/function () {
                 'Content-Type': 'text/plain'
               }
             });
-
           case 37:
             sendLoaderResponse(res, response);
-
           case 38:
           case "end":
             return _context3.stop();
@@ -321,7 +265,6 @@ export var handleRequest = /*#__PURE__*/function () {
       }
     }, _callee3, null, [[27, 33]]);
   }));
-
   return function handleRequest(_x4) {
     return _ref5.apply(this, arguments);
   };
@@ -333,7 +276,7 @@ export default (function () {
       return {
         preparebeforeRouteHandler: function preparebeforeRouteHandler(_ref6) {
           var serverRoutes = _ref6.serverRoutes,
-              distDir = _ref6.distDir;
+            distDir = _ref6.distDir;
           return /*#__PURE__*/function () {
             var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(context) {
               return _regeneratorRuntime().wrap(function _callee4$(_context4) {
@@ -345,7 +288,6 @@ export default (function () {
                         distDir: distDir,
                         context: context
                       }));
-
                     case 1:
                     case "end":
                       return _context4.stop();
@@ -353,7 +295,6 @@ export default (function () {
                 }
               }, _callee4);
             }));
-
             return function (_x5) {
               return _ref7.apply(this, arguments);
             };

package/dist/types/cli/generate-client.d.ts

@@ -1,7 +1,9 @@
 export declare const generateClient: ({
   basedir,
-  filename
+  filename,
+  entryName
 }: {
   basedir: string;
   filename: string;
+  entryName: string;
 }) => string;

package/dist/types/cli/loader.d.ts

@@ -1,4 +1,5 @@
 import type { LoaderContext } from 'webpack';
 export default function loader(this: LoaderContext<{
   routesDir: string;
+  entryName: string;
 }>, source: string): Promise<string>;

package/dist/types/server/index.d.ts

@@ -14,7 +14,5 @@ export declare const handleRequest: ({
   serverRoutes: ServerRoute[];
   distDir: string;
 }) => Promise<void>;
-
 declare const _default: () => ServerPlugin;
-
 export default _default;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.0.0-beta.0",
+  "version": "2.0.0-beta.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -40,19 +40,13 @@
   "dependencies": {
     "@babel/core": "^7.18.0",
     "@babel/runtime": "^7.18.0",
-    "@modern-js/babel-compiler": "2.0.0-beta.0",
-    "@modern-js/utils": "2.0.0-beta.0",
     "@remix-run/node": "^1.7.0",
     "path-to-regexp": "^6.2.0",
-    "react-router-dom": "^6.4.2"
+    "react-router-dom": "^6.4.2",
+    "@modern-js/babel-compiler": "2.0.0-beta.1",
+    "@modern-js/utils": "2.0.0-beta.1"
   },
   "devDependencies": {
-    "@modern-js/core": "2.0.0-beta.0",
-    "@modern-js/runtime": "2.0.0-beta.0",
-    "@modern-js/server-core": "2.0.0-beta.0",
-    "@modern-js/types": "2.0.0-beta.0",
-    "@scripts/build": "2.0.0-beta.0",
-    "@scripts/jest-config": "2.0.0-beta.0",
     "@types/babel__core": "^7.1.15",
     "@types/jest": "^27",
     "@types/node": "^14",
@@ -64,7 +58,13 @@
     "ts-jest": "^27.0.5",
     "typescript": "^4",
     "webpack": "^5.74.0",
-    "webpack-chain": "^6.5.1"
+    "webpack-chain": "^6.5.1",
+    "@modern-js/core": "2.0.0-beta.1",
+    "@modern-js/runtime": "2.0.0-beta.1",
+    "@modern-js/server-core": "2.0.0-beta.1",
+    "@modern-js/types": "2.0.0-beta.1",
+    "@scripts/build": "2.0.0-beta.1",
+    "@scripts/jest-config": "2.0.0-beta.1"
   },
   "sideEffects": false,
   "publishConfig": {