@modern-js/plugin-data-loader 0.0.0-next-20221209071922 → 0.0.0-next-20221209080421

package/CHANGELOG.md

@@ -1,39 +1,46 @@
 # @modern-js/plugin-data-loader
 
-## 0.0.0-next-20221209071922
+## 0.0.0-next-20221209080421
 
 ### Major Changes
 
-- dda38c9c3: chore: v2
+- dda38c9c3e: chore: v2
 
 ### Minor Changes
 
-- b710adb84: feat: extract the data loader
+- b710adb843: feat: extract the data loader
   feat: 提取 data loader
-- 543be9558: feat: compile server loader and support handle loader request
+- 543be9558e: feat: compile server loader and support handle loader request
   feat: 编译 server loader 并支持处理 loader 的请求
 
 ### Patch Changes
 
-- 2e6031955: fix: some optimizations for router and loader
+- 6604f1b8b3: feat: support router basename
+  feat: router 插件支持设置 basename
+- 2e6031955e: fix: some optimizations for router and loader
   fix: 一些 router 和 loader 的优化
   q
-- Updated dependencies [6aca87501]
-- Updated dependencies [2e6031955]
-- Updated dependencies [92f0eade3]
-- Updated dependencies [edd1cfb1a]
-- Updated dependencies [cc971eabf]
-- Updated dependencies [5b9049f2e]
-- Updated dependencies [92004d190]
-- Updated dependencies [b8bbe036c]
-- Updated dependencies [d5a31df78]
-- Updated dependencies [dda38c9c3]
-- Updated dependencies [3bbea92b2]
-- Updated dependencies [b710adb84]
-- Updated dependencies [bbe4c4ab6]
-- Updated dependencies [e4558a0bc]
-- Updated dependencies [abf3421a7]
-- Updated dependencies [543be9558]
-- Updated dependencies [14b712da8]
-  - @modern-js/utils@0.0.0-next-20221209071922
-  - @modern-js/babel-compiler@0.0.0-next-20221209071922
+- ea7cf06257: chore: bump webpack/babel-loader/postcss-loader/tsconfig-paths
+
+  chore: 升级 webpack/babel-loader/postcss-loader/tsconfig-paths 版本
+
+- Updated dependencies [6aca875011]
+- Updated dependencies [2e6031955e]
+- Updated dependencies [92f0eade39]
+- Updated dependencies [edd1cfb1af]
+- Updated dependencies [cc971eabfc]
+- Updated dependencies [5b9049f2e9]
+- Updated dependencies [92004d1906]
+- Updated dependencies [b8bbe036c7]
+- Updated dependencies [d5a31df781]
+- Updated dependencies [dda38c9c3e]
+- Updated dependencies [3bbea92b2a]
+- Updated dependencies [b710adb843]
+- Updated dependencies [ea7cf06257]
+- Updated dependencies [bbe4c4ab64]
+- Updated dependencies [e4558a0bc4]
+- Updated dependencies [abf3421a75]
+- Updated dependencies [543be9558e]
+- Updated dependencies [14b712da84]
+  - @modern-js/utils@0.0.0-next-20221209080421
+  - @modern-js/babel-compiler@0.0.0-next-20221209080421

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

@@ -1,26 +1,10 @@
-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 { compile } from "path-to-regexp";
-import { redirect } from "react-router-dom";
-const getRequestUrl = ({
+// 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';
+import { redirect } from 'react-router-dom';
+export const getRequestUrl = ({
   params,
   request,
   routeId
@@ -31,25 +15,31 @@ const getRequestUrl = ({
   });
   const newPathName = toPath(params);
   url.pathname = newPathName;
-  url.searchParams.append("_loader", routeId);
+  url.searchParams.append('_loader', routeId);
   return url;
 };
-const handleRedirectResponse = (res) => {
-  const { headers } = res;
-  const location = headers.get("X-Modernjs-Redirect");
+const handleRedirectResponse = res => {
+  const {
+    headers
+  } = res;
+  const location = headers.get('X-Modernjs-Redirect');
   if (location) {
     return redirect(location);
   }
   return res;
 };
-const createRequest = (routeId, method = "get") => {
-  return (_0) => __async(void 0, [_0], function* ({
+export const createRequest = (routeId, method = 'get') => {
+  return async ({
     params,
     request
-  }) {
-    const url = getRequestUrl({ params, request, routeId });
+  }) => {
+    const url = getRequestUrl({
+      params,
+      request,
+      routeId
+    });
     try {
-      const res = yield fetch(url, {
+      const res = await fetch(url, {
         method,
         signal: request.signal
       });
@@ -58,9 +48,5 @@ const createRequest = (routeId, method = "get") => {
       console.error(error);
       throw error;
     }
-  });
-};
-export {
-  createRequest,
-  getRequestUrl
-};
+  };
+};

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

@@ -1,18 +1,20 @@
-import path from "path";
-const generateClient = ({ mapFile }) => {
+import path from 'path';
+export const generateClient = ({
+  mapFile
+}) => {
   const loadersMap = require(mapFile);
-  const requestCode = Object.keys(loadersMap).map((loaderId) => {
+  const requestCode = Object.keys(loadersMap).map(loaderId => {
     const routeId = loadersMap[loaderId];
     return `
       const ${loaderId} = createRequest('${routeId}');
     `;
-  }).join("");
+  }).join('');
   let exportsCode = `export {`;
   for (const loader of Object.keys(loadersMap)) {
     exportsCode += `${loader},`;
   }
-  exportsCode += "}";
-  const requestCreatorPath = path.join(__dirname, "./create-request").replace("node", "treeshaking").replace(/\\/g, "/");
+  exportsCode += '}';
+  const requestCreatorPath = path.join(__dirname, './create-request').replace('node', 'treeshaking').replace(/\\/g, '/');
   const importCode = `
     import { createRequest } from '${requestCreatorPath}';
   `;
@@ -21,7 +23,4 @@ const generateClient = ({ mapFile }) => {
     ${requestCode}
     ${exportsCode}
   `;
-};
-export {
-  generateClient
-};
+};

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

@@ -1,39 +1,17 @@
-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());
-  });
-};
+// eslint-disable-next-line eslint-comments/disable-enable-pair
+/* eslint-disable @babel/no-invalid-this */
+
 import { generateClient } from "./generate-client";
-function loader(source) {
-  return __async(this, null, function* () {
-    var _a;
-    this.cacheable();
-    const target = (_a = this._compiler) == null ? void 0 : _a.options.target;
-    if (target === "node") {
-      return source;
-    }
-    const options = this.getOptions();
-    const code = generateClient({
-      mapFile: options.mapFile
-    });
-    return code;
+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({
+    mapFile: options.mapFile
   });
-}
-export {
-  loader as default
-};
+  return code;
+}

package/dist/js/modern/server/index.js

@@ -1,85 +1,47 @@
-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 {
-  installGlobals,
-  writeReadableStreamToWritable,
-  Response as NodeResponse
-} from "@remix-run/node";
-import {
-  matchRoutes
-} from "react-router-dom";
-import { LOADER_ROUTES_DIR } from "@modern-js/utils";
+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';
+import { LOADER_ROUTES_DIR } from '@modern-js/utils';
+// Polyfill Web Fetch API
 installGlobals();
-const LOADER_SEARCH_PARAM = "_loader";
-const redirectStatusCodes = /* @__PURE__ */ new Set([301, 302, 303, 307, 308]);
-function isRedirectResponse(response) {
+const LOADER_SEARCH_PARAM = '_loader';
+const redirectStatusCodes = new Set([301, 302, 303, 307, 308]);
+export 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";
+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 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");
+  if (!headers.has('Content-Type')) {
+    headers.set('Content-Type', 'application/json; charset=utf-8');
   }
-  return new NodeResponse(JSON.stringify(data), __spreadProps(__spreadValues({}, responseInit), {
+  return new NodeResponse(JSON.stringify(data), _objectSpread(_objectSpread({}, responseInit), {}, {
     headers
   }));
 };
-const callRouteLoader = (_0) => __async(void 0, [_0], function* ({
+
+// TODO: 添加 context
+const callRouteLoader = async ({
   routeId,
   loader,
   params,
   request,
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   loadContext
-}) {
+}) => {
   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.`
-    );
+    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 = yield loader({
+    result = await loader({
       request,
       params
     });
@@ -89,14 +51,12 @@ const callRouteLoader = (_0) => __async(void 0, [_0], function* ({
     }
     result = error;
   }
-  if (result === void 0) {
-    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\`.`
-    );
+  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 createLoaderHeaders = requestHeaders => {
   const headers = new Headers();
   for (const [key, values] of Object.entries(requestHeaders)) {
     if (values) {
@@ -111,8 +71,9 @@ const createLoaderHeaders = (requestHeaders) => {
   }
   return headers;
 };
-const createLoaderRequest = (context) => {
+const createLoaderRequest = context => {
   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 = {
@@ -122,46 +83,53 @@ const createLoaderRequest = (context) => {
   };
   return new Request(url.href, init);
 };
-const sendLoaderResponse = (res, nodeResponse) => __async(void 0, null, function* () {
+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) {
-    yield writeReadableStreamToWritable(nodeResponse.body, res);
+    await writeReadableStreamToWritable(nodeResponse.body, res);
   } else {
     res.end();
   }
-});
-const getPathWithoutEntry = (pathname, entryPath) => {
-  if (entryPath === "/") {
+};
+export const getPathWithoutEntry = (pathname, entryPath) => {
+  if (entryPath === '/') {
     return pathname;
   }
-  return pathname.replace(entryPath, "");
+  return pathname.replace(entryPath, '');
 };
 const matchEntry = (pathname, entries) => {
-  return entries.find((entry) => pathname.startsWith(entry.urlPath));
+  return entries.find(entry => pathname.startsWith(entry.urlPath));
 };
-const handleRequest = (_0) => __async(void 0, [_0], function* ({
+export const handleRequest = async ({
   context,
   serverRoutes,
   distDir
-}) {
-  const { method, query } = context;
+}) => {
+  const {
+    method,
+    query
+  } = context;
   const routeId = query[LOADER_SEARCH_PARAM];
-  if (!routeId || method.toLowerCase() !== "get") {
+  if (!routeId || method.toLowerCase() !== 'get') {
     return;
   }
   const entry = matchEntry(context.path, serverRoutes);
   if (!entry) {
     return;
   }
-  const { routes } = yield import(`${distDir}/${LOADER_ROUTES_DIR}/${entry.entryName}`);
+  const {
+    routes
+  } = await import(`${distDir}/${LOADER_ROUTES_DIR}/${entry.entryName}`);
   if (!routes) {
     return;
   }
-  const { res } = context;
+  const {
+    res
+  } = context;
   const pathname = getPathWithoutEntry(context.path, entry.urlPath);
   const matches = matchRoutes(routes, pathname);
   if (!matches) {
@@ -169,7 +137,7 @@ const handleRequest = (_0) => __async(void 0, [_0], function* ({
     res.end(`Route ${pathname} was not matched`);
     return;
   }
-  const match = matches == null ? void 0 : matches.find((match2) => match2.route.id === routeId);
+  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}`);
@@ -178,7 +146,7 @@ const handleRequest = (_0) => __async(void 0, [_0], function* ({
   const request = createLoaderRequest(context);
   let response;
   try {
-    response = yield callRouteLoader({
+    response = await callRouteLoader({
       loader: match.route.loader,
       routeId: match.route.id,
       params: match.params,
@@ -187,8 +155,8 @@ const handleRequest = (_0) => __async(void 0, [_0], function* ({
     });
     if (isRedirectResponse(response)) {
       const headers = new Headers(response.headers);
-      headers.set("X-Modernjs-Redirect", headers.get("Location"));
-      headers.delete("Location");
+      headers.set('X-Modernjs-Redirect', headers.get('Location'));
+      headers.delete('Location');
       response = new NodeResponse(null, {
         status: 204,
         headers
@@ -199,33 +167,26 @@ const handleRequest = (_0) => __async(void 0, [_0], function* ({
     response = new NodeResponse(message, {
       status: 500,
       headers: {
-        "Content-Type": "text/plain"
+        'Content-Type': 'text/plain'
       }
     });
   }
   sendLoaderResponse(res, response);
-});
-var server_default = () => ({
-  name: "@modern-js/plugin-data-loader",
+};
+export default (() => ({
+  name: '@modern-js/plugin-data-loader',
   setup: () => ({
     preparebeforeRouteHandler({
       serverRoutes,
       distDir
     }) {
-      return (context) => __async(this, null, function* () {
+      return async context => {
         return handleRequest({
           serverRoutes,
           distDir,
           context
         });
-      });
+      };
     }
   })
-});
-export {
-  server_default as default,
-  getPathWithoutEntry,
-  handleRequest,
-  isRedirectResponse,
-  isResponse
-};
+}));

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

@@ -1,78 +1,53 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
-  createRequest: () => createRequest,
-  getRequestUrl: () => getRequestUrl
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(stdin_exports);
-var import_path_to_regexp = require("path-to-regexp");
-var import_react_router_dom = require("react-router-dom");
-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());
-  });
-};
+exports.getRequestUrl = exports.createRequest = void 0;
+var _pathToRegexp = require("path-to-regexp");
+var _reactRouterDom = require("react-router-dom");
+// 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,
   routeId
 }) => {
   const url = new URL(request.url);
-  const toPath = (0, import_path_to_regexp.compile)(url.pathname, {
+  const toPath = (0, _pathToRegexp.compile)(url.pathname, {
     encode: encodeURIComponent
   });
   const newPathName = toPath(params);
   url.pathname = newPathName;
-  url.searchParams.append("_loader", routeId);
+  url.searchParams.append('_loader', routeId);
   return url;
 };
-const handleRedirectResponse = (res) => {
-  const { headers } = res;
-  const location = headers.get("X-Modernjs-Redirect");
+exports.getRequestUrl = getRequestUrl;
+const handleRedirectResponse = res => {
+  const {
+    headers
+  } = res;
+  const location = headers.get('X-Modernjs-Redirect');
   if (location) {
-    return (0, import_react_router_dom.redirect)(location);
+    return (0, _reactRouterDom.redirect)(location);
   }
   return res;
 };
-const createRequest = (routeId, method = "get") => {
-  return (_0) => __async(void 0, [_0], function* ({
+const createRequest = (routeId, method = 'get') => {
+  return async ({
     params,
     request
-  }) {
-    const url = getRequestUrl({ params, request, routeId });
+  }) => {
+    const url = getRequestUrl({
+      params,
+      request,
+      routeId
+    });
     try {
-      const res = yield fetch(url, {
+      const res = await fetch(url, {
         method,
         signal: request.signal
       });
@@ -81,5 +56,6 @@ const createRequest = (routeId, method = "get") => {
       console.error(error);
       throw error;
     }
-  });
+  };
 };
+exports.createRequest = createRequest;