@modern-js/create-request 2.0.0-beta.0 → 2.0.0-beta.2

package/dist/js/modern/browser.js

@@ -3,9 +3,7 @@ import qs from 'query-string';
 import { handleRes } from "./handleRes";
 let realRequest;
 let realAllowedHeaders;
-
 const originFetch = (...params) => fetch(...params).then(handleRes);
-
 export const configure = options => {
   const {
     request,
@@ -13,17 +11,16 @@ export const configure = options => {
     allowedHeaders
   } = options;
   realRequest = request || originFetch;
-
   if (interceptor && !request) {
     realRequest = interceptor(fetch);
   }
-
   if (Array.isArray(allowedHeaders)) {
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     realAllowedHeaders = allowedHeaders;
   }
 };
-export const createRequest = (path, method, port, // 后续可能要修改，暂时先保留
+export const createRequest = (path, method, port,
+// 后续可能要修改，暂时先保留
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 fetch = originFetch) => {
   const getFinalPath = compile(path, {
@@ -31,13 +28,12 @@ fetch = originFetch) => {
   });
   const keys = [];
   pathToRegexp(path, keys);
-
   const sender = async (...args) => {
     const fetcher = realRequest || originFetch;
     const payload = typeof args[args.length - 1] === 'object' ? args[args.length - 1] : {};
     payload.params = payload.params || {};
-    const requestParams = args[0]; // 这种场景下是使用 schema，所以 params 要从 args[0] 中获取
-
+    const requestParams = args[0];
+    // 这种场景下是使用 schema，所以 params 要从 args[0] 中获取
     if (typeof requestParams === 'object' && requestParams.params) {
       const {
         params
@@ -50,27 +46,26 @@ fetch = originFetch) => {
         payload.params[key.name] = args[index];
       });
     }
-
     const finalPath = getFinalPath(payload.params);
     const finalURL = payload.query ? `${finalPath}?${qs.stringify(payload.query)}` : finalPath;
     const headers = payload.headers || {};
     let body = payload.data && typeof payload.data === 'object' ? JSON.stringify(payload.data) : payload.body;
-
     if (payload.data) {
       headers['Content-Type'] = 'application/json';
       body = typeof payload.data === 'object' ? JSON.stringify(payload.data) : payload.body;
     } else if (payload.body) {
-      headers['Content-Type'] = 'text/plain'; // eslint-disable-next-line prefer-destructuring
-
+      headers['Content-Type'] = 'text/plain';
+      // eslint-disable-next-line prefer-destructuring
       body = payload.body;
     } else if (payload.formData) {
-      body = payload.formData; // https://stackoverflow.com/questions/44919424/bad-content-type-header-no-multipart-boundary-nodejs
+      body = payload.formData;
+      // https://stackoverflow.com/questions/44919424/bad-content-type-header-no-multipart-boundary-nodejs
       // need multipart boundary aotu attached by browser when multipart is true
       // headers['Content-Type'] = 'multipart/form-data';
     } else if (payload.formUrlencoded) {
       headers['Content-Type'] = 'application/x-www-form-urlencoded';
-
-      if (typeof payload.formUrlencoded === 'object' && // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      if (typeof payload.formUrlencoded === 'object' &&
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
       // @ts-expect-error
       // eslint-disable-next-line node/prefer-global/url-search-params,node/no-unsupported-features/node-builtins
       !(payload.formUrlencoded instanceof URLSearchParams)) {
@@ -79,13 +74,11 @@ fetch = originFetch) => {
         body = payload.formUrlencoded;
       }
     }
-
     return fetcher(finalURL, {
       method,
       body,
       headers
     });
   };
-
   return sender;
 };

package/dist/js/modern/handleRes.js

@@ -1,29 +1,24 @@
 const handleRes = async res => {
-  const contentType = res.headers.get('content-type'); // https://developer.mozilla.org/en-US/docs/Web/API/Response/ok
+  const contentType = res.headers.get('content-type');
 
+  // https://developer.mozilla.org/en-US/docs/Web/API/Response/ok
   if (!res.ok) {
     const data = await res.json();
     res.data = data;
     throw res;
   }
-
   if (contentType !== null && contentType !== void 0 && contentType.includes('application/json') || contentType !== null && contentType !== void 0 && contentType.includes('text/json')) {
     return res.json();
   }
-
   if (contentType !== null && contentType !== void 0 && contentType.includes('text/html') || contentType !== null && contentType !== void 0 && contentType.includes('text/plain')) {
     return res.text();
   }
-
   if ((contentType !== null && contentType !== void 0 && contentType.includes('application/x-www-form-urlencoded') || contentType !== null && contentType !== void 0 && contentType.includes('multipart/form-data')) && res instanceof Response) {
     return res.formData();
   }
-
   if (contentType !== null && contentType !== void 0 && contentType.includes('application/octet-stream')) {
     return res.arrayBuffer();
   }
-
   return res.text();
 };
-
 export { handleRes };

package/dist/js/modern/index.js

@@ -1,7 +1,5 @@
 import { isBrowser } from '@modern-js/utils';
 import { createRequest as browser } from "./browser";
 import { createRequest as node } from "./node";
-
 const createRequest = (...args) => isBrowser() ? browser(...args) : node(...args);
-
 export default createRequest;

package/dist/js/modern/node.js

@@ -5,9 +5,7 @@ import qs from 'query-string';
 import { handleRes } from "./handleRes";
 let realRequest;
 let realAllowedHeaders = [];
-
 const originFetch = (...params) => nodeFetch(...params).then(handleRes);
-
 export const configure = options => {
   const {
     request,
@@ -15,16 +13,15 @@ export const configure = options => {
     allowedHeaders
   } = options;
   realRequest = request || originFetch;
-
   if (interceptor && !request) {
     realRequest = interceptor(nodeFetch);
   }
-
   if (Array.isArray(allowedHeaders)) {
     realAllowedHeaders = allowedHeaders;
   }
 };
-export const createRequest = (path, method, port, // 后续可能要修改，暂时先保留
+export const createRequest = (path, method, port,
+// 后续可能要修改，暂时先保留
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 fetch = nodeFetch) => {
   const getFinalPath = compile(path, {
@@ -32,13 +29,12 @@ fetch = nodeFetch) => {
   });
   const keys = [];
   pathToRegexp(path, keys);
-
   const sender = (...args) => {
     const webRequestHeaders = useHeaders();
     const payload = typeof args[args.length - 1] === 'object' ? args[args.length - 1] : {};
     payload.params = payload.params || {};
-    const requestParams = args[0]; // 这种场景下是使用 schema，所以 params 要从 args[0] 中获取
-
+    const requestParams = args[0];
+    // 这种场景下是使用 schema，所以 params 要从 args[0] 中获取
     if (typeof requestParams === 'object' && requestParams.params) {
       const {
         params
@@ -51,39 +47,35 @@ fetch = nodeFetch) => {
         payload.params[key.name] = args[index];
       });
     }
-
     const plainPath = getFinalPath(payload.params);
     const finalPath = payload.query ? `${plainPath}?${qs.stringify(payload.query)}` : plainPath;
     const headers = payload.headers || {};
     let body;
-
     for (const key of realAllowedHeaders) {
       if (typeof webRequestHeaders[key] !== 'undefined') {
         headers[key] = webRequestHeaders[key];
       }
     }
-
     if (payload.data) {
       headers['Content-Type'] = 'application/json';
       body = typeof payload.data === 'object' ? JSON.stringify(payload.data) : payload.body;
     } else if (payload.body) {
-      headers['Content-Type'] = 'text/plain'; // eslint-disable-next-line prefer-destructuring
-
+      headers['Content-Type'] = 'text/plain';
+      // eslint-disable-next-line prefer-destructuring
       body = payload.body;
     } else if (payload.formData) {
-      body = payload.formData; // https://stackoverflow.com/questions/44919424/bad-content-type-header-no-multipart-boundary-nodejs
+      body = payload.formData;
+      // https://stackoverflow.com/questions/44919424/bad-content-type-header-no-multipart-boundary-nodejs
       // need multipart boundary auto attached by node-fetch when multipart is true
       // headers['Content-Type'] = 'multipart/form-data';
     } else if (payload.formUrlencoded) {
       headers['Content-Type'] = 'application/x-www-form-urlencoded';
-
       if (typeof payload.formUrlencoded === 'object') {
         body = qs.stringify(payload.formUrlencoded);
       } else {
         body = payload.formUrlencoded;
       }
     }
-
     const url = `http://localhost:${port}${finalPath}`;
     const fetcher = realRequest || originFetch;
     return fetcher(url, {
@@ -92,6 +84,5 @@ fetch = nodeFetch) => {
       headers
     });
   };
-
   return sender;
 };

package/dist/js/node/browser.js

@@ -4,20 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createRequest = exports.configure = void 0;
-
 var _pathToRegexp = require("path-to-regexp");
-
 var _queryString = _interopRequireDefault(require("query-string"));
-
 var _handleRes = require("./handleRes");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 let realRequest;
 let realAllowedHeaders;
-
 const originFetch = (...params) => fetch(...params).then(_handleRes.handleRes);
-
 const configure = options => {
   const {
     request,
@@ -25,20 +18,17 @@ const configure = options => {
     allowedHeaders
   } = options;
   realRequest = request || originFetch;
-
   if (interceptor && !request) {
     realRequest = interceptor(fetch);
   }
-
   if (Array.isArray(allowedHeaders)) {
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     realAllowedHeaders = allowedHeaders;
   }
 };
-
 exports.configure = configure;
-
-const createRequest = (path, method, port, // 后续可能要修改，暂时先保留
+const createRequest = (path, method, port,
+// 后续可能要修改，暂时先保留
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 fetch = originFetch) => {
   const getFinalPath = (0, _pathToRegexp.compile)(path, {
@@ -46,13 +36,12 @@ fetch = originFetch) => {
   });
   const keys = [];
   (0, _pathToRegexp.pathToRegexp)(path, keys);
-
   const sender = async (...args) => {
     const fetcher = realRequest || originFetch;
     const payload = typeof args[args.length - 1] === 'object' ? args[args.length - 1] : {};
     payload.params = payload.params || {};
-    const requestParams = args[0]; // 这种场景下是使用 schema，所以 params 要从 args[0] 中获取
-
+    const requestParams = args[0];
+    // 这种场景下是使用 schema，所以 params 要从 args[0] 中获取
     if (typeof requestParams === 'object' && requestParams.params) {
       const {
         params
@@ -65,27 +54,26 @@ fetch = originFetch) => {
         payload.params[key.name] = args[index];
       });
     }
-
     const finalPath = getFinalPath(payload.params);
     const finalURL = payload.query ? `${finalPath}?${_queryString.default.stringify(payload.query)}` : finalPath;
     const headers = payload.headers || {};
     let body = payload.data && typeof payload.data === 'object' ? JSON.stringify(payload.data) : payload.body;
-
     if (payload.data) {
       headers['Content-Type'] = 'application/json';
       body = typeof payload.data === 'object' ? JSON.stringify(payload.data) : payload.body;
     } else if (payload.body) {
-      headers['Content-Type'] = 'text/plain'; // eslint-disable-next-line prefer-destructuring
-
+      headers['Content-Type'] = 'text/plain';
+      // eslint-disable-next-line prefer-destructuring
       body = payload.body;
     } else if (payload.formData) {
-      body = payload.formData; // https://stackoverflow.com/questions/44919424/bad-content-type-header-no-multipart-boundary-nodejs
+      body = payload.formData;
+      // https://stackoverflow.com/questions/44919424/bad-content-type-header-no-multipart-boundary-nodejs
       // need multipart boundary aotu attached by browser when multipart is true
       // headers['Content-Type'] = 'multipart/form-data';
     } else if (payload.formUrlencoded) {
       headers['Content-Type'] = 'application/x-www-form-urlencoded';
-
-      if (typeof payload.formUrlencoded === 'object' && // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      if (typeof payload.formUrlencoded === 'object' &&
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
       // @ts-expect-error
       // eslint-disable-next-line node/prefer-global/url-search-params,node/no-unsupported-features/node-builtins
       !(payload.formUrlencoded instanceof URLSearchParams)) {
@@ -94,15 +82,12 @@ fetch = originFetch) => {
         body = payload.formUrlencoded;
       }
     }
-
     return fetcher(finalURL, {
       method,
       body,
       headers
     });
   };
-
   return sender;
 };
-
 exports.createRequest = createRequest;

package/dist/js/node/handleRes.js

@@ -4,33 +4,27 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.handleRes = void 0;
-
 const handleRes = async res => {
-  const contentType = res.headers.get('content-type'); // https://developer.mozilla.org/en-US/docs/Web/API/Response/ok
+  const contentType = res.headers.get('content-type');
 
+  // https://developer.mozilla.org/en-US/docs/Web/API/Response/ok
   if (!res.ok) {
     const data = await res.json();
     res.data = data;
     throw res;
   }
-
   if (contentType !== null && contentType !== void 0 && contentType.includes('application/json') || contentType !== null && contentType !== void 0 && contentType.includes('text/json')) {
     return res.json();
   }
-
   if (contentType !== null && contentType !== void 0 && contentType.includes('text/html') || contentType !== null && contentType !== void 0 && contentType.includes('text/plain')) {
     return res.text();
   }
-
   if ((contentType !== null && contentType !== void 0 && contentType.includes('application/x-www-form-urlencoded') || contentType !== null && contentType !== void 0 && contentType.includes('multipart/form-data')) && res instanceof Response) {
     return res.formData();
   }
-
   if (contentType !== null && contentType !== void 0 && contentType.includes('application/octet-stream')) {
     return res.arrayBuffer();
   }
-
   return res.text();
 };
-
 exports.handleRes = handleRes;

package/dist/js/node/index.js

@@ -4,14 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _utils = require("@modern-js/utils");
-
 var _browser = require("./browser");
-
 var _node = require("./node");
-
 const createRequest = (...args) => (0, _utils.isBrowser)() ? (0, _browser.createRequest)(...args) : (0, _node.createRequest)(...args);
-
 var _default = createRequest;
 exports.default = _default;

package/dist/js/node/node.js

@@ -4,24 +4,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createRequest = exports.configure = void 0;
-
 var _nodeFetch = _interopRequireDefault(require("node-fetch"));
-
 var _pathToRegexp = require("path-to-regexp");
-
 var _ssr = require("@modern-js/utils/ssr");
-
 var _queryString = _interopRequireDefault(require("query-string"));
-
 var _handleRes = require("./handleRes");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 let realRequest;
 let realAllowedHeaders = [];
-
 const originFetch = (...params) => (0, _nodeFetch.default)(...params).then(_handleRes.handleRes);
-
 const configure = options => {
   const {
     request,
@@ -29,19 +20,16 @@ const configure = options => {
     allowedHeaders
   } = options;
   realRequest = request || originFetch;
-
   if (interceptor && !request) {
     realRequest = interceptor(_nodeFetch.default);
   }
-
   if (Array.isArray(allowedHeaders)) {
     realAllowedHeaders = allowedHeaders;
   }
 };
-
 exports.configure = configure;
-
-const createRequest = (path, method, port, // 后续可能要修改，暂时先保留
+const createRequest = (path, method, port,
+// 后续可能要修改，暂时先保留
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 fetch = _nodeFetch.default) => {
   const getFinalPath = (0, _pathToRegexp.compile)(path, {
@@ -49,13 +37,12 @@ fetch = _nodeFetch.default) => {
   });
   const keys = [];
   (0, _pathToRegexp.pathToRegexp)(path, keys);
-
   const sender = (...args) => {
     const webRequestHeaders = (0, _ssr.useHeaders)();
     const payload = typeof args[args.length - 1] === 'object' ? args[args.length - 1] : {};
     payload.params = payload.params || {};
-    const requestParams = args[0]; // 这种场景下是使用 schema，所以 params 要从 args[0] 中获取
-
+    const requestParams = args[0];
+    // 这种场景下是使用 schema，所以 params 要从 args[0] 中获取
     if (typeof requestParams === 'object' && requestParams.params) {
       const {
         params
@@ -68,39 +55,35 @@ fetch = _nodeFetch.default) => {
         payload.params[key.name] = args[index];
       });
     }
-
     const plainPath = getFinalPath(payload.params);
     const finalPath = payload.query ? `${plainPath}?${_queryString.default.stringify(payload.query)}` : plainPath;
     const headers = payload.headers || {};
     let body;
-
     for (const key of realAllowedHeaders) {
       if (typeof webRequestHeaders[key] !== 'undefined') {
         headers[key] = webRequestHeaders[key];
       }
     }
-
     if (payload.data) {
       headers['Content-Type'] = 'application/json';
       body = typeof payload.data === 'object' ? JSON.stringify(payload.data) : payload.body;
     } else if (payload.body) {
-      headers['Content-Type'] = 'text/plain'; // eslint-disable-next-line prefer-destructuring
-
+      headers['Content-Type'] = 'text/plain';
+      // eslint-disable-next-line prefer-destructuring
       body = payload.body;
     } else if (payload.formData) {
-      body = payload.formData; // https://stackoverflow.com/questions/44919424/bad-content-type-header-no-multipart-boundary-nodejs
+      body = payload.formData;
+      // https://stackoverflow.com/questions/44919424/bad-content-type-header-no-multipart-boundary-nodejs
       // need multipart boundary auto attached by node-fetch when multipart is true
       // headers['Content-Type'] = 'multipart/form-data';
     } else if (payload.formUrlencoded) {
       headers['Content-Type'] = 'application/x-www-form-urlencoded';
-
       if (typeof payload.formUrlencoded === 'object') {
         body = _queryString.default.stringify(payload.formUrlencoded);
       } else {
         body = payload.formUrlencoded;
       }
     }
-
     const url = `http://localhost:${port}${finalPath}`;
     const fetcher = realRequest || originFetch;
     return fetcher(url, {
@@ -109,8 +92,6 @@ fetch = _nodeFetch.default) => {
       headers
     });
   };
-
   return sender;
 };
-
 exports.createRequest = createRequest;

package/dist/js/treeshaking/browser.js

@@ -6,21 +6,17 @@ import qs from 'query-string';
 import { handleRes } from "./handleRes";
 var realRequest;
 var realAllowedHeaders;
-
 var originFetch = function originFetch() {
   return fetch.apply(void 0, arguments).then(handleRes);
 };
-
 export var configure = function configure(options) {
   var request = options.request,
-      interceptor = options.interceptor,
-      allowedHeaders = options.allowedHeaders;
+    interceptor = options.interceptor,
+    allowedHeaders = options.allowedHeaders;
   realRequest = request || originFetch;
-
   if (interceptor && !request) {
     realRequest = interceptor(fetch);
   }
-
   if (Array.isArray(allowedHeaders)) {
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     realAllowedHeaders = allowedHeaders;
@@ -33,22 +29,20 @@ export var createRequest = function createRequest(path, method, port) {
   });
   var keys = [];
   pathToRegexp(path, keys);
-
   var sender = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _len,
-          args,
-          _key,
-          fetcher,
-          payload,
-          requestParams,
-          params,
-          finalPath,
-          finalURL,
-          headers,
-          body,
-          _args = arguments;
-
+        args,
+        _key,
+        fetcher,
+        payload,
+        requestParams,
+        params,
+        finalPath,
+        finalURL,
+        headers,
+        body,
+        _args = arguments;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
@@ -56,12 +50,10 @@ export var createRequest = function createRequest(path, method, port) {
               for (_len = _args.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
                 args[_key] = _args[_key];
               }
-
               fetcher = realRequest || originFetch;
               payload = _typeof(args[args.length - 1]) === 'object' ? args[args.length - 1] : {};
               payload.params = payload.params || {};
               requestParams = args[0]; // 这种场景下是使用 schema，所以 params 要从 args[0] 中获取
-
               if (_typeof(requestParams) === 'object' && requestParams.params) {
                 params = requestParams.params;
                 keys.forEach(function (key) {
@@ -72,27 +64,26 @@ export var createRequest = function createRequest(path, method, port) {
                   payload.params[key.name] = args[index];
                 });
               }
-
               finalPath = getFinalPath(payload.params);
               finalURL = payload.query ? "".concat(finalPath, "?").concat(qs.stringify(payload.query)) : finalPath;
               headers = payload.headers || {};
               body = payload.data && _typeof(payload.data) === 'object' ? JSON.stringify(payload.data) : payload.body;
-
               if (payload.data) {
                 headers['Content-Type'] = 'application/json';
                 body = _typeof(payload.data) === 'object' ? JSON.stringify(payload.data) : payload.body;
               } else if (payload.body) {
-                headers['Content-Type'] = 'text/plain'; // eslint-disable-next-line prefer-destructuring
-
+                headers['Content-Type'] = 'text/plain';
+                // eslint-disable-next-line prefer-destructuring
                 body = payload.body;
               } else if (payload.formData) {
-                body = payload.formData; // https://stackoverflow.com/questions/44919424/bad-content-type-header-no-multipart-boundary-nodejs
+                body = payload.formData;
+                // https://stackoverflow.com/questions/44919424/bad-content-type-header-no-multipart-boundary-nodejs
                 // need multipart boundary aotu attached by browser when multipart is true
                 // headers['Content-Type'] = 'multipart/form-data';
               } else if (payload.formUrlencoded) {
                 headers['Content-Type'] = 'application/x-www-form-urlencoded';
-
-                if (_typeof(payload.formUrlencoded) === 'object' && // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                if (_typeof(payload.formUrlencoded) === 'object' &&
+                // eslint-disable-next-line @typescript-eslint/ban-ts-comment
                 // @ts-expect-error
                 // eslint-disable-next-line node/prefer-global/url-search-params,node/no-unsupported-features/node-builtins
                 !(payload.formUrlencoded instanceof URLSearchParams)) {
@@ -101,13 +92,11 @@ export var createRequest = function createRequest(path, method, port) {
                   body = payload.formUrlencoded;
                 }
               }
-
               return _context.abrupt("return", fetcher(finalURL, {
                 method: method,
                 body: body,
                 headers: headers
               }));
-
             case 12:
             case "end":
               return _context.stop();
@@ -115,11 +104,9 @@ export var createRequest = function createRequest(path, method, port) {
         }
       }, _callee);
     }));
-
     return function sender() {
       return _ref.apply(this, arguments);
     };
   }();
-
   return sender;
 };

package/dist/js/treeshaking/handleRes.js

@@ -1,6 +1,5 @@
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-
 var handleRes = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(res) {
     var contentType, data;
@@ -9,55 +8,42 @@ var handleRes = /*#__PURE__*/function () {
         switch (_context.prev = _context.next) {
           case 0:
             contentType = res.headers.get('content-type'); // https://developer.mozilla.org/en-US/docs/Web/API/Response/ok
-
             if (res.ok) {
               _context.next = 7;
               break;
             }
-
             _context.next = 4;
             return res.json();
-
           case 4:
             data = _context.sent;
             res.data = data;
             throw res;
-
           case 7:
             if (!(contentType !== null && contentType !== void 0 && contentType.includes('application/json') || contentType !== null && contentType !== void 0 && contentType.includes('text/json'))) {
               _context.next = 9;
               break;
             }
-
             return _context.abrupt("return", res.json());
-
           case 9:
             if (!(contentType !== null && contentType !== void 0 && contentType.includes('text/html') || contentType !== null && contentType !== void 0 && contentType.includes('text/plain'))) {
               _context.next = 11;
               break;
             }
-
             return _context.abrupt("return", res.text());
-
           case 11:
             if (!((contentType !== null && contentType !== void 0 && contentType.includes('application/x-www-form-urlencoded') || contentType !== null && contentType !== void 0 && contentType.includes('multipart/form-data')) && res instanceof Response)) {
               _context.next = 13;
               break;
             }
-
             return _context.abrupt("return", res.formData());
-
           case 13:
             if (!(contentType !== null && contentType !== void 0 && contentType.includes('application/octet-stream'))) {
               _context.next = 15;
               break;
             }
-
             return _context.abrupt("return", res.arrayBuffer());
-
           case 15:
             return _context.abrupt("return", res.text());
-
           case 16:
           case "end":
             return _context.stop();
@@ -65,10 +51,8 @@ var handleRes = /*#__PURE__*/function () {
       }
     }, _callee);
   }));
-
   return function handleRes(_x) {
     return _ref.apply(this, arguments);
   };
 }();
-
 export { handleRes };

package/dist/js/treeshaking/index.js

@@ -1,9 +1,7 @@
 import { isBrowser } from '@modern-js/utils';
 import { createRequest as browser } from "./browser";
 import { createRequest as node } from "./node";
-
 var createRequest = function createRequest() {
   return isBrowser() ? browser.apply(void 0, arguments) : node.apply(void 0, arguments);
 };
-
 export default createRequest;

package/dist/js/treeshaking/node.js

@@ -7,21 +7,17 @@ import qs from 'query-string';
 import { handleRes } from "./handleRes";
 var realRequest;
 var realAllowedHeaders = [];
-
 var originFetch = function originFetch() {
   return nodeFetch.apply(void 0, arguments).then(handleRes);
 };
-
 export var configure = function configure(options) {
   var request = options.request,
-      interceptor = options.interceptor,
-      allowedHeaders = options.allowedHeaders;
+    interceptor = options.interceptor,
+    allowedHeaders = options.allowedHeaders;
   realRequest = request || originFetch;
-
   if (interceptor && !request) {
     realRequest = interceptor(nodeFetch);
   }
-
   if (Array.isArray(allowedHeaders)) {
     realAllowedHeaders = allowedHeaders;
   }
@@ -33,17 +29,15 @@ export var createRequest = function createRequest(path, method, port) {
   });
   var keys = [];
   pathToRegexp(path, keys);
-
   var sender = function sender() {
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
-
     var webRequestHeaders = useHeaders();
     var payload = _typeof(args[args.length - 1]) === 'object' ? args[args.length - 1] : {};
     payload.params = payload.params || {};
-    var requestParams = args[0]; // 这种场景下是使用 schema，所以 params 要从 args[0] 中获取
-
+    var requestParams = args[0];
+    // 这种场景下是使用 schema，所以 params 要从 args[0] 中获取
     if (_typeof(requestParams) === 'object' && requestParams.params) {
       var params = requestParams.params;
       keys.forEach(function (key) {
@@ -54,19 +48,15 @@ export var createRequest = function createRequest(path, method, port) {
         payload.params[key.name] = args[index];
       });
     }
-
     var plainPath = getFinalPath(payload.params);
     var finalPath = payload.query ? "".concat(plainPath, "?").concat(qs.stringify(payload.query)) : plainPath;
     var headers = payload.headers || {};
     var body;
-
     var _iterator = _createForOfIteratorHelper(realAllowedHeaders),
-        _step;
-
+      _step;
     try {
       for (_iterator.s(); !(_step = _iterator.n()).done;) {
         var key = _step.value;
-
         if (typeof webRequestHeaders[key] !== 'undefined') {
           headers[key] = webRequestHeaders[key];
         }
@@ -76,28 +66,26 @@ export var createRequest = function createRequest(path, method, port) {
     } finally {
       _iterator.f();
     }
-
     if (payload.data) {
       headers['Content-Type'] = 'application/json';
       body = _typeof(payload.data) === 'object' ? JSON.stringify(payload.data) : payload.body;
     } else if (payload.body) {
-      headers['Content-Type'] = 'text/plain'; // eslint-disable-next-line prefer-destructuring
-
+      headers['Content-Type'] = 'text/plain';
+      // eslint-disable-next-line prefer-destructuring
       body = payload.body;
     } else if (payload.formData) {
-      body = payload.formData; // https://stackoverflow.com/questions/44919424/bad-content-type-header-no-multipart-boundary-nodejs
+      body = payload.formData;
+      // https://stackoverflow.com/questions/44919424/bad-content-type-header-no-multipart-boundary-nodejs
       // need multipart boundary auto attached by node-fetch when multipart is true
       // headers['Content-Type'] = 'multipart/form-data';
     } else if (payload.formUrlencoded) {
       headers['Content-Type'] = 'application/x-www-form-urlencoded';
-
       if (_typeof(payload.formUrlencoded) === 'object') {
         body = qs.stringify(payload.formUrlencoded);
       } else {
         body = payload.formUrlencoded;
       }
     }
-
     var url = "http://localhost:".concat(port).concat(finalPath);
     var fetcher = realRequest || originFetch;
     return fetcher(url, {
@@ -106,6 +94,5 @@ export var createRequest = function createRequest(path, method, port) {
       headers: headers
     });
   };
-
   return sender;
 };

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.0.0-beta.0",
+  "version": "2.0.0-beta.2",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -63,21 +63,21 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.18.0",
-    "@modern-js/utils": "2.0.0-beta.0",
     "node-fetch": "^2.6.1",
     "path-to-regexp": "^6.2.0",
-    "query-string": "^7.1.1"
+    "query-string": "^7.1.1",
+    "@modern-js/utils": "2.0.0-beta.2"
   },
   "devDependencies": {
-    "@scripts/build": "2.0.0-beta.0",
-    "@scripts/jest-config": "2.0.0-beta.0",
     "@types/jest": "^27",
     "@types/node": "^14",
     "@types/node-fetch": "^2.6.1",
     "isomorphic-fetch": "^3.0.0",
     "jest": "^27",
     "nock": "^13.2.1",
-    "typescript": "^4"
+    "typescript": "^4",
+    "@scripts/build": "2.0.0-beta.2",
+    "@scripts/jest-config": "2.0.0-beta.2"
   },
   "sideEffects": false,
   "publishConfig": {
@@ -85,8 +85,8 @@
     "access": "public"
   },
   "scripts": {
-    "new": "modern new",
-    "build": "modern build",
+    "new": "modern-lib new",
+    "build": "modern-lib build",
     "test": "jest --passWithNoTests"
   }
 }