@modern-js/plugin-proxy 2.35.1 → 2.36.0

package/dist/cjs/index.js

@@ -1,25 +1,39 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-function _export(target, all) {
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
   for (var name in all)
-    Object.defineProperty(target, name, {
-      enumerable: true,
-      get: all[name]
-    });
-}
-_export(exports, {
-  proxyPlugin: function() {
-    return proxyPlugin;
-  },
-  default: function() {
-    return _default;
+    __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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var src_exports = {};
+__export(src_exports, {
+  default: () => src_default,
+  proxyPlugin: () => proxyPlugin
 });
-const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
-const _createProxyRule = require("./utils/createProxyRule");
-const _whistleProxy = /* @__PURE__ */ _interop_require_default._(require("./utils/whistleProxy"));
+module.exports = __toCommonJS(src_exports);
+var import_createProxyRule = require("./utils/createProxyRule");
+var import_whistleProxy = __toESM(require("./utils/whistleProxy"));
 const proxyPlugin = () => {
   let proxyServer;
   return {
@@ -44,9 +58,9 @@ const proxyPlugin = () => {
         if (!(dev === null || dev === void 0 ? void 0 : dev.proxy)) {
           return;
         }
-        const rule = (0, _createProxyRule.createProxyRule)(internalDirectory, dev.proxy);
+        const rule = (0, import_createProxyRule.createProxyRule)(internalDirectory, dev.proxy);
         if (!proxyServer) {
-          proxyServer = new _whistleProxy.default({
+          proxyServer = new import_whistleProxy.default({
             port: 8899,
             rule
           });
@@ -59,4 +73,8 @@ const proxyPlugin = () => {
     })
   };
 };
-const _default = proxyPlugin;
+var src_default = proxyPlugin;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  proxyPlugin
+});

package/dist/cjs/utils/createProxyRule.js

@@ -1,18 +1,40 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "createProxyRule", {
-  enumerable: true,
-  get: function() {
-    return createProxyRule;
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var createProxyRule_exports = {};
+__export(createProxyRule_exports, {
+  createProxyRule: () => createProxyRule
 });
-const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
-const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
-const _utils = require("@modern-js/utils");
+module.exports = __toCommonJS(createProxyRule_exports);
+var import_path = __toESM(require("path"));
+var import_utils = require("@modern-js/utils");
 const createWhistleProxyRule = (ruleDirectory, rules) => {
-  const dest = _path.default.resolve(ruleDirectory, "proxy.rule.js");
+  const dest = import_path.default.resolve(ruleDirectory, "proxy.rule.js");
   let code = `/.*/ enable://intercept
 `;
   for (const rule of rules) {
@@ -20,7 +42,7 @@ const createWhistleProxyRule = (ruleDirectory, rules) => {
     code += `${pattern} ${target}
 `;
   }
-  _utils.fs.outputFileSync(dest, `exports.name = 'modernjs proxy rule';
+  import_utils.fs.outputFileSync(dest, `exports.name = 'modernjs proxy rule';
 exports.rules = \`${code}\`;`);
   return dest;
 };
@@ -33,7 +55,7 @@ const createProxyRule = (appDirectory, proxyOptions) => {
     for (const pattern of Object.keys(proxyOptions)) {
       const target = proxyOptions[pattern];
       if (!target || typeof target !== "string") {
-        _utils.logger.error(`dev.proxy.${pattern} value should be string type`);
+        import_utils.logger.error(`dev.proxy.${pattern} value should be string type`);
         process.exit(1);
       }
       rules.push({
@@ -44,3 +66,7 @@ const createProxyRule = (appDirectory, proxyOptions) => {
   }
   return createWhistleProxyRule(appDirectory, rules);
 };
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  createProxyRule
+});

package/dist/cjs/utils/execSync.js

@@ -1,19 +1,32 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "default", {
-  enumerable: true,
-  get: function() {
-    return _default;
+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 execSync_exports = {};
+__export(execSync_exports, {
+  default: () => execSync_default
 });
-const _child_process = require("child_process");
+module.exports = __toCommonJS(execSync_exports);
+var import_child_process = require("child_process");
 function execSync(cmd) {
   let stdout;
   let status = 0;
   try {
-    stdout = (0, _child_process.execSync)(cmd);
+    stdout = (0, import_child_process.execSync)(cmd);
   } catch (err) {
     stdout = err.stdout;
     status = err.status;
@@ -23,4 +36,4 @@ function execSync(cmd) {
     status
   };
 }
-const _default = execSync;
+var execSync_default = execSync;

package/dist/cjs/utils/macCAManager.js

@@ -1,60 +1,70 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-function _export(target, all) {
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
   for (var name in all)
-    Object.defineProperty(target, name, {
-      enumerable: true,
-      get: all[name]
-    });
-}
-_export(exports, {
-  defaultRootCA: function() {
-    return defaultRootCA;
-  },
-  trustRootCA: function() {
-    return trustRootCA;
-  },
-  isRootCAExists: function() {
-    return isRootCAExists;
-  },
-  generateRootCA: function() {
-    return generateRootCA;
+    __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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var macCAManager_exports = {};
+__export(macCAManager_exports, {
+  defaultRootCA: () => defaultRootCA,
+  generateRootCA: () => generateRootCA,
+  isRootCAExists: () => isRootCAExists,
+  trustRootCA: () => trustRootCA
 });
-const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
-const _os = /* @__PURE__ */ _interop_require_default._(require("os"));
-const _http = /* @__PURE__ */ _interop_require_default._(require("http"));
-const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
-const _utils = require("@modern-js/utils");
-const _execSync = /* @__PURE__ */ _interop_require_default._(require("./execSync"));
-const defaultCertDir = _path.default.resolve(_os.default.homedir(), "./.whistle-proxy");
-const defaultRootCA = _path.default.resolve(defaultCertDir, "./rootCA.crt");
+module.exports = __toCommonJS(macCAManager_exports);
+var import_os = __toESM(require("os"));
+var import_http = __toESM(require("http"));
+var import_path = __toESM(require("path"));
+var import_utils = require("@modern-js/utils");
+var import_execSync = __toESM(require("./execSync"));
+const defaultCertDir = import_path.default.resolve(import_os.default.homedir(), "./.whistle-proxy");
+const defaultRootCA = import_path.default.resolve(defaultCertDir, "./rootCA.crt");
 const trustRootCA = () => {
-  _utils.logger.info(`please type the password to trust the https certificate`);
-  const { status } = (0, _execSync.default)(`sudo security add-trusted-cert -d -k /Library/Keychains/System.keychain ${defaultRootCA}`);
+  import_utils.logger.info(`please type the password to trust the https certificate`);
+  const { status } = (0, import_execSync.default)(`sudo security add-trusted-cert -d -k /Library/Keychains/System.keychain ${defaultRootCA}`);
   if (status === 0) {
-    _utils.logger.info("Root CA install, you are ready to intercept the https now");
+    import_utils.logger.info("Root CA install, you are ready to intercept the https now");
   } else {
-    _utils.logger.info("Failed to trust the root CA, please trust it manually");
+    import_utils.logger.info("Failed to trust the root CA, please trust it manually");
   }
 };
 const isRootCATrusted = () => {
 };
 const isRootCAExists = () => {
-  if (_utils.fs.existsSync(defaultRootCA)) {
+  if (import_utils.fs.existsSync(defaultRootCA)) {
     return true;
   }
   return false;
 };
 const generateRootCA = (port) => new Promise((resolve, reject) => {
-  if (_utils.fs.existsSync(defaultRootCA)) {
-    _utils.fs.removeSync(defaultRootCA);
+  if (import_utils.fs.existsSync(defaultRootCA)) {
+    import_utils.fs.removeSync(defaultRootCA);
   }
-  _utils.fs.ensureDirSync(defaultCertDir);
-  const stream = _utils.fs.createWriteStream(defaultRootCA);
-  _http.default.get(`http://localhost:${port}/cgi-bin/rootca`, (response) => {
+  import_utils.fs.ensureDirSync(defaultCertDir);
+  const stream = import_utils.fs.createWriteStream(defaultRootCA);
+  import_http.default.get(`http://localhost:${port}/cgi-bin/rootca`, (response) => {
     response.pipe(stream);
     stream.on("finish", () => {
       resolve(defaultRootCA);
@@ -62,7 +72,14 @@ const generateRootCA = (port) => new Promise((resolve, reject) => {
       reject(err);
     });
   }).on("error", (err) => {
-    _utils.fs.unlink(defaultRootCA);
+    import_utils.fs.unlink(defaultRootCA);
     reject(err);
   });
 });
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  defaultRootCA,
+  generateRootCA,
+  isRootCAExists,
+  trustRootCA
+});

package/dist/cjs/utils/macProxyManager.js

@@ -1,33 +1,48 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-function _export(target, all) {
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
   for (var name in all)
-    Object.defineProperty(target, name, {
-      enumerable: true,
-      get: all[name]
-    });
-}
-_export(exports, {
-  enableGlobalProxy: function() {
-    return enableGlobalProxy;
-  },
-  disableGlobalProxy: function() {
-    return disableGlobalProxy;
+    __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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var macProxyManager_exports = {};
+__export(macProxyManager_exports, {
+  disableGlobalProxy: () => disableGlobalProxy,
+  enableGlobalProxy: () => enableGlobalProxy
 });
-const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
-const _execSync = /* @__PURE__ */ _interop_require_default._(require("./execSync"));
+module.exports = __toCommonJS(macProxyManager_exports);
+var import_execSync = __toESM(require("./execSync"));
 const networkTypes = [
   "Ethernet",
   "Thunderbolt Ethernet",
   "Wi-Fi"
 ];
+const isMacOS = () => process.platform === "darwin";
 const getNetworkType = () => {
   for (let i = 0; i < networkTypes.length; i++) {
     const type = networkTypes[i];
-    const result = (0, _execSync.default)(`networksetup -getwebproxy ${type}`);
+    const result = (0, import_execSync.default)(`networksetup -getwebproxy ${type}`);
     if (result.status === 0) {
       return type;
     }
@@ -35,12 +50,23 @@ const getNetworkType = () => {
   throw new Error("Unknown network type");
 };
 const enableGlobalProxy = (ip, port) => {
+  if (!isMacOS()) {
+    return;
+  }
   const networkType = getNetworkType();
-  (0, _execSync.default)(`networksetup -setwebproxy ${networkType} ${ip} ${port}`);
-  (0, _execSync.default)(`networksetup -setsecurewebproxy ${networkType} ${ip} ${port}`);
+  (0, import_execSync.default)(`networksetup -setwebproxy ${networkType} ${ip} ${port}`);
+  (0, import_execSync.default)(`networksetup -setsecurewebproxy ${networkType} ${ip} ${port}`);
 };
 const disableGlobalProxy = () => {
+  if (!isMacOS()) {
+    return;
+  }
   const networkType = getNetworkType();
-  (0, _execSync.default)(`networksetup -setwebproxystate ${networkType} off`);
-  (0, _execSync.default)(`networksetup -setsecurewebproxystate ${networkType} off`);
+  (0, import_execSync.default)(`networksetup -setwebproxystate ${networkType} off`);
+  (0, import_execSync.default)(`networksetup -setsecurewebproxystate ${networkType} off`);
 };
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  disableGlobalProxy,
+  enableGlobalProxy
+});

package/dist/cjs/utils/whistleProxy.js

@@ -1,26 +1,48 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "default", {
-  enumerable: true,
-  get: function() {
-    return WhistleProxy;
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var whistleProxy_exports = {};
+__export(whistleProxy_exports, {
+  default: () => WhistleProxy
 });
-const _define_property = require("@swc/helpers/_/_define_property");
-const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
-const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
-const _utils = require("@modern-js/utils");
-const _execSync = /* @__PURE__ */ _interop_require_default._(require("./execSync"));
-const _macCAManager = require("./macCAManager");
+module.exports = __toCommonJS(whistleProxy_exports);
+var import_define_property = require("@swc/helpers/_/_define_property");
+var import_path = __toESM(require("path"));
+var import_utils = require("@modern-js/utils");
+var import_execSync = __toESM(require("./execSync"));
+var import_macCAManager = require("./macCAManager");
 const { disableGlobalProxy, enableGlobalProxy } = require("./macProxyManager");
 class WhistleProxy {
   async installRootCA() {
     try {
-      if (!(0, _macCAManager.isRootCAExists)()) {
-        await (0, _macCAManager.generateRootCA)(this.port);
-        (0, _macCAManager.trustRootCA)();
+      if (!(0, import_macCAManager.isRootCAExists)()) {
+        await (0, import_macCAManager.generateRootCA)(this.port);
+        (0, import_macCAManager.trustRootCA)();
       }
     } catch (err) {
       this.close();
@@ -28,27 +50,27 @@ class WhistleProxy {
     }
   }
   async start() {
-    _utils.logger.info(`Starting proxy server.....`);
-    (0, _execSync.default)(`${this.bin} start --certDir=${this.certDir} --port=${this.port}`);
-    (0, _execSync.default)(`${this.bin} use ${this.rule} --force`);
+    import_utils.logger.info(`Starting proxy server.....`);
+    (0, import_execSync.default)(`${this.bin} start --certDir=${this.certDir} --port=${this.port}`);
+    (0, import_execSync.default)(`${this.bin} use ${this.rule} --force`);
     await this.installRootCA();
     enableGlobalProxy("localhost", this.port);
-    _utils.logger.info(`Proxy server start on localhost:${this.port}
+    import_utils.logger.info(`Proxy server start on localhost:${this.port}
 `);
   }
   close() {
-    (0, _execSync.default)(`${this.bin} stop`);
+    (0, import_execSync.default)(`${this.bin} stop`);
     disableGlobalProxy();
-    _utils.logger.info(`Proxy Server has been closed`);
+    import_utils.logger.info(`Proxy Server has been closed`);
   }
   constructor(config) {
-    _define_property._(this, "rule", void 0);
-    _define_property._(this, "port", void 0);
-    _define_property._(this, "bin", void 0);
-    _define_property._(this, "certDir", void 0);
+    (0, import_define_property._)(this, "rule", void 0);
+    (0, import_define_property._)(this, "port", void 0);
+    (0, import_define_property._)(this, "bin", void 0);
+    (0, import_define_property._)(this, "certDir", void 0);
     this.rule = config.rule;
     this.port = config.port;
-    this.bin = _path.default.resolve(_path.default.dirname(require.resolve("whistle")), "bin/whistle.js");
-    this.certDir = _path.default.dirname(_macCAManager.defaultRootCA);
+    this.bin = import_path.default.resolve(import_path.default.dirname(require.resolve("whistle")), "bin/whistle.js");
+    this.certDir = import_path.default.dirname(import_macCAManager.defaultRootCA);
   }
 }

package/dist/esm/index.js

@@ -1,6 +1,6 @@
 import { createProxyRule } from "./utils/createProxyRule";
 import WhistleProxy from "./utils/whistleProxy";
-export const proxyPlugin = () => {
+const proxyPlugin = () => {
   let proxyServer;
   return {
     name: "@modern-js/plugin-proxy",
@@ -39,4 +39,8 @@ export const proxyPlugin = () => {
     })
   };
 };
-export default proxyPlugin;
+var src_default = proxyPlugin;
+export {
+  src_default as default,
+  proxyPlugin
+};

package/dist/esm/utils/createProxyRule.js

@@ -13,7 +13,7 @@ const createWhistleProxyRule = (ruleDirectory, rules) => {
 exports.rules = \`${code}\`;`);
   return dest;
 };
-export const createProxyRule = (appDirectory, proxyOptions) => {
+const createProxyRule = (appDirectory, proxyOptions) => {
   const rules = [];
   if (proxyOptions && typeof proxyOptions === "string") {
     return proxyOptions;
@@ -33,3 +33,6 @@ export const createProxyRule = (appDirectory, proxyOptions) => {
   }
   return createWhistleProxyRule(appDirectory, rules);
 };
+export {
+  createProxyRule
+};

package/dist/esm/utils/execSync.js

@@ -13,4 +13,7 @@ function execSync(cmd) {
     status
   };
 }
-export default execSync;
+var execSync_default = execSync;
+export {
+  execSync_default as default
+};

package/dist/esm/utils/macCAManager.js

@@ -4,8 +4,8 @@ import path from "path";
 import { fs, logger } from "@modern-js/utils";
 import execSync from "./execSync";
 const defaultCertDir = path.resolve(os.homedir(), "./.whistle-proxy");
-export const defaultRootCA = path.resolve(defaultCertDir, "./rootCA.crt");
-export const trustRootCA = () => {
+const defaultRootCA = path.resolve(defaultCertDir, "./rootCA.crt");
+const trustRootCA = () => {
   logger.info(`please type the password to trust the https certificate`);
   const { status } = execSync(`sudo security add-trusted-cert -d -k /Library/Keychains/System.keychain ${defaultRootCA}`);
   if (status === 0) {
@@ -16,13 +16,13 @@ export const trustRootCA = () => {
 };
 const isRootCATrusted = () => {
 };
-export const isRootCAExists = () => {
+const isRootCAExists = () => {
   if (fs.existsSync(defaultRootCA)) {
     return true;
   }
   return false;
 };
-export const generateRootCA = (port) => new Promise((resolve, reject) => {
+const generateRootCA = (port) => new Promise((resolve, reject) => {
   if (fs.existsSync(defaultRootCA)) {
     fs.removeSync(defaultRootCA);
   }
@@ -40,3 +40,9 @@ export const generateRootCA = (port) => new Promise((resolve, reject) => {
     reject(err);
   });
 });
+export {
+  defaultRootCA,
+  generateRootCA,
+  isRootCAExists,
+  trustRootCA
+};

package/dist/esm/utils/macProxyManager.js

@@ -4,6 +4,7 @@ const networkTypes = [
   "Thunderbolt Ethernet",
   "Wi-Fi"
 ];
+const isMacOS = () => process.platform === "darwin";
 const getNetworkType = () => {
   for (let i = 0; i < networkTypes.length; i++) {
     const type = networkTypes[i];
@@ -14,13 +15,23 @@ const getNetworkType = () => {
   }
   throw new Error("Unknown network type");
 };
-export const enableGlobalProxy = (ip, port) => {
+const enableGlobalProxy = (ip, port) => {
+  if (!isMacOS()) {
+    return;
+  }
   const networkType = getNetworkType();
   execSync(`networksetup -setwebproxy ${networkType} ${ip} ${port}`);
   execSync(`networksetup -setsecurewebproxy ${networkType} ${ip} ${port}`);
 };
-export const disableGlobalProxy = () => {
+const disableGlobalProxy = () => {
+  if (!isMacOS()) {
+    return;
+  }
   const networkType = getNetworkType();
   execSync(`networksetup -setwebproxystate ${networkType} off`);
   execSync(`networksetup -setsecurewebproxystate ${networkType} off`);
 };
+export {
+  disableGlobalProxy,
+  enableGlobalProxy
+};

package/dist/esm/utils/whistleProxy.js

@@ -41,4 +41,6 @@ class WhistleProxy {
     this.certDir = path.dirname(defaultRootCA);
   }
 }
-export { WhistleProxy as default };
+export {
+  WhistleProxy as default
+};

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.35.1",
+  "version": "2.36.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -36,16 +36,16 @@
   "dependencies": {
     "whistle": "^2.7.18",
     "@swc/helpers": "0.5.1",
-    "@modern-js/utils": "2.35.1"
+    "@modern-js/utils": "2.36.0"
   },
   "devDependencies": {
     "@types/jest": "^29",
     "@types/node": "^14",
     "typescript": "^5",
     "jest": "^29",
-    "@modern-js/core": "2.35.1",
-    "@scripts/build": "2.35.1",
-    "@scripts/jest-config": "2.35.1"
+    "@scripts/build": "2.36.0",
+    "@scripts/jest-config": "2.36.0",
+    "@modern-js/core": "2.36.0"
   },
   "sideEffects": false,
   "publishConfig": {