@modern-js/plugin-proxy 2.0.0-beta.3 → 2.0.0-beta.4

package/CHANGELOG.md

@@ -1,5 +1,35 @@
 # @modern-js/plugin-proxy
 
+## 2.0.0-beta.4
+
+### Major Changes
+
+- dda38c9c3e: chore: v2
+
+### Patch Changes
+
+- Updated dependencies [7879e8f]
+- Updated dependencies [6aca875]
+- Updated dependencies [2e6031955e]
+- Updated dependencies [7b7d12c]
+- 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 [ea7cf06]
+- Updated dependencies [bbe4c4a]
+- Updated dependencies [e4558a0]
+- Updated dependencies [abf3421a75]
+- Updated dependencies [543be9558e]
+- Updated dependencies [14b712da84]
+  - @modern-js/utils@2.0.0-beta.4
+
 ## 2.0.0-beta.3
 
 ### Major Changes

package/dist/js/modern/index.js

@@ -1,36 +1,52 @@
-import { PLUGIN_SCHEMAS } from '@modern-js/utils';
+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 { PLUGIN_SCHEMAS } from "@modern-js/utils";
 import { createProxyRule } from "./utils/createProxyRule";
 import WhistleProxy from "./utils/whistleProxy";
-export default (() => {
+var src_default = () => {
   let proxyServer;
   return {
-    name: '@modern-js/plugin-proxy',
-    setup: api => ({
+    name: "@modern-js/plugin-proxy",
+    setup: (api) => ({
       validateSchema() {
-        return PLUGIN_SCHEMAS['@modern-js/plugin-proxy'];
+        return PLUGIN_SCHEMAS["@modern-js/plugin-proxy"];
       },
-      async afterDev() {
-        const {
-          dev
-        } = api.useResolvedConfigContext();
-        const {
-          internalDirectory
-        } = api.useAppContext();
-        if (!(dev !== null && dev !== void 0 && dev.proxy)) {
-          return;
-        }
-        const rule = createProxyRule(internalDirectory, dev.proxy);
-        proxyServer = new WhistleProxy({
-          port: 8899,
-          rule
+      afterDev() {
+        return __async(this, null, function* () {
+          const { dev } = api.useResolvedConfigContext();
+          const { internalDirectory } = api.useAppContext();
+          if (!(dev == null ? void 0 : dev.proxy)) {
+            return;
+          }
+          const rule = createProxyRule(internalDirectory, dev.proxy);
+          proxyServer = new WhistleProxy({ port: 8899, rule });
+          yield proxyServer.start();
         });
-        await proxyServer.start();
       },
       beforeExit() {
-        var _proxyServer;
-        // terminate whistle proxy
-        (_proxyServer = proxyServer) === null || _proxyServer === void 0 ? void 0 : _proxyServer.close();
+        proxyServer == null ? void 0 : proxyServer.close();
       }
     })
   };
-});
+};
+export {
+  src_default as default
+};

package/dist/js/modern/utils/createProxyRule.js

@@ -1,39 +1,38 @@
-import path from 'path';
-import { logger, fs } from '@modern-js/utils';
-// FIXME: import DevProxyOptions from somewhere
-// import type { DevProxyOptions } from '@modern-js/core';
-
+import path from "path";
+import { logger, fs } from "@modern-js/utils";
 const createWhistleProxyRule = (ruleDirectory, rules) => {
-  const dest = path.resolve(ruleDirectory, 'proxy.rule.js');
-  let code = `/.*/ enable://intercept\n`;
+  const dest = path.resolve(ruleDirectory, "proxy.rule.js");
+  let code = `/.*/ enable://intercept
+`;
   for (const rule of rules) {
-    const {
-      pattern,
-      target
-    } = rule;
-    code += `${pattern} ${target}\n`;
+    const { pattern, target } = rule;
+    code += `${pattern} ${target}
+`;
   }
-  fs.outputFileSync(dest, `exports.name = 'modernjs proxy rule';\nexports.rules = \`${code}\`;`);
+  fs.outputFileSync(
+    dest,
+    `exports.name = 'modernjs proxy rule';
+exports.rules = \`${code}\`;`
+  );
   return dest;
 };
-export const createProxyRule = (appDirectory, proxyOptions) => {
+const createProxyRule = (appDirectory, proxyOptions) => {
   const rules = [];
-  if (proxyOptions && typeof proxyOptions === 'string') {
+  if (proxyOptions && typeof proxyOptions === "string") {
     return proxyOptions;
   }
-  if (typeof proxyOptions === 'object') {
+  if (typeof proxyOptions === "object") {
     for (const pattern of Object.keys(proxyOptions)) {
       const target = proxyOptions[pattern];
-      if (!target || typeof target !== 'string') {
+      if (!target || typeof target !== "string") {
         logger.error(`dev.proxy.${pattern} value should be string type`);
-        // eslint-disable-next-line no-process-exit
         process.exit(1);
       }
-      rules.push({
-        pattern,
-        target
-      });
+      rules.push({ pattern, target });
     }
   }
   return createWhistleProxyRule(appDirectory, rules);
-};
+};
+export {
+  createProxyRule
+};

package/dist/js/modern/utils/execSync.js

@@ -1,19 +1,19 @@
-import { execSync as nodeExecSync } from 'child_process';
+import { execSync as nodeExecSync } from "child_process";
 function execSync(cmd) {
   let stdout;
   let status = 0;
   try {
     stdout = nodeExecSync(cmd);
   } catch (err) {
-    /* eslint-disable prefer-destructuring */
     stdout = err.stdout;
     status = err.status;
-    /* eslint-enable prefer-destructuring */
   }
-
   return {
     stdout: stdout.toString(),
     status
   };
 }
-export default execSync;
+var execSync_default = execSync;
+export {
+  execSync_default as default
+};

package/dist/js/modern/utils/macCAManager.js

@@ -1,47 +1,50 @@
-import os from 'os';
-import http from 'http';
-import path from 'path';
-import { fs, logger } from '@modern-js/utils';
+import os from "os";
+import http from "http";
+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 defaultCertDir = path.resolve(os.homedir(), "./.whistle-proxy");
+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}`);
+  const { status } = execSync(
+    `sudo security add-trusted-cert -d -k /Library/Keychains/System.keychain ${defaultRootCA}`
+  );
   if (status === 0) {
-    logger.info('Root CA install, you are ready to intercept the https now');
+    logger.info("Root CA install, you are ready to intercept the https now");
   } else {
-    logger.info('Failed to trust the root CA, please trust it manually');
+    logger.info("Failed to trust the root CA, please trust it manually");
   }
 };
-
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
 const isRootCATrusted = () => {
-  // current empty
 };
-export const isRootCAExists = () => {
+const isRootCAExists = () => {
   if (fs.existsSync(defaultRootCA)) {
     return true;
   }
   return false;
 };
-export const generateRootCA = () => new Promise((resolve, reject) => {
+const generateRootCA = () => new Promise((resolve, reject) => {
   if (fs.existsSync(defaultRootCA)) {
     fs.removeSync(defaultRootCA);
   }
   fs.ensureDirSync(defaultCertDir);
   const stream = fs.createWriteStream(defaultRootCA);
-  http.get('http://localhost:8899/cgi-bin/rootca', response => {
+  http.get("http://localhost:8899/cgi-bin/rootca", (response) => {
     response.pipe(stream);
-    stream.on('finish', () => {
+    stream.on("finish", () => {
       resolve(defaultRootCA);
-    }).on('error', err => {
+    }).on("error", (err) => {
       reject(err);
     });
-  }).on('error', err => {
-    fs.unlink(defaultRootCA); // Delete the file
+  }).on("error", (err) => {
+    fs.unlink(defaultRootCA);
     reject(err);
   });
-});
+});
+export {
+  defaultRootCA,
+  generateRootCA,
+  isRootCAExists,
+  trustRootCA
+};

package/dist/js/modern/utils/macProxyManager.js

@@ -1,7 +1,6 @@
 import execSync from "./execSync";
-const networkTypes = ['Ethernet', 'Thunderbolt Ethernet', 'Wi-Fi'];
+const networkTypes = ["Ethernet", "Thunderbolt Ethernet", "Wi-Fi"];
 const getNetworkType = () => {
-  // eslint-disable-next-line @typescript-eslint/prefer-for-of
   for (let i = 0; i < networkTypes.length; i++) {
     const type = networkTypes[i];
     const result = execSync(`networksetup -getwebproxy ${type}`);
@@ -9,17 +8,19 @@ const getNetworkType = () => {
       return type;
     }
   }
-  throw new Error('Unknown network type');
+  throw new Error("Unknown network type");
 };
-export const enableGlobalProxy = (ip, port) => {
+const enableGlobalProxy = (ip, port) => {
   const networkType = getNetworkType();
-
-  // && networksetup -setproxybypassdomains ${networkType} localhost localhost
   execSync(`networksetup -setwebproxy ${networkType} ${ip} ${port}`);
   execSync(`networksetup -setsecurewebproxy ${networkType} ${ip} ${port}`);
 };
-export const disableGlobalProxy = () => {
+const disableGlobalProxy = () => {
   const networkType = getNetworkType();
   execSync(`networksetup -setwebproxystate ${networkType} off`);
   execSync(`networksetup -setsecurewebproxystate ${networkType} off`);
-};
+};
+export {
+  disableGlobalProxy,
+  enableGlobalProxy
+};

package/dist/js/modern/utils/whistleProxy.js

@@ -1,47 +1,73 @@
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-import path from 'path';
-import { logger } from '@modern-js/utils';
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+import path from "path";
+import { logger } from "@modern-js/utils";
 import execSync from "./execSync";
-import { isRootCAExists, generateRootCA, defaultRootCA, trustRootCA } from "./macCAManager";
-const {
-  disableGlobalProxy,
-  enableGlobalProxy
-} = require("./macProxyManager");
-export default class WhistleProxy {
+import {
+  isRootCAExists,
+  generateRootCA,
+  defaultRootCA,
+  trustRootCA
+} from "./macCAManager";
+const { disableGlobalProxy, enableGlobalProxy } = require("./macProxyManager");
+class WhistleProxy {
   constructor(config) {
-    _defineProperty(this, "rule", void 0);
-    _defineProperty(this, "port", void 0);
-    _defineProperty(this, "bin", void 0);
-    _defineProperty(this, "certDir", void 0);
     this.rule = config.rule;
     this.port = config.port;
-    // unused
-    // this.mode = config.mode; // pureProxy|debug|multiEnv
-    this.bin = path.resolve(path.dirname(require.resolve('whistle')), 'bin/whistle.js');
+    this.bin = path.resolve(
+      path.dirname(require.resolve("whistle")),
+      "bin/whistle.js"
+    );
     this.certDir = path.dirname(defaultRootCA);
   }
-  async installRootCA() {
-    try {
-      if (!isRootCAExists()) {
-        await generateRootCA();
-        trustRootCA();
+  installRootCA() {
+    return __async(this, null, function* () {
+      try {
+        if (!isRootCAExists()) {
+          yield generateRootCA();
+          trustRootCA();
+        }
+      } catch (err) {
+        this.close();
+        throw err;
       }
-    } catch (err) {
-      this.close();
-      throw err;
-    }
+    });
   }
-  async start() {
-    logger.info(`Starting the proxy server.....`);
-    execSync(`${this.bin} start --certDir=${this.certDir} --port=${this.port}`);
-    execSync(`${this.bin} use ${this.rule} --force`);
-    await this.installRootCA();
-    enableGlobalProxy('localhost', this.port);
-    logger.info(`Proxy Server start on localhost:${this.port}\n`);
+  start() {
+    return __async(this, null, function* () {
+      logger.info(`Starting the proxy server.....`);
+      execSync(`${this.bin} start --certDir=${this.certDir} --port=${this.port}`);
+      execSync(`${this.bin} use ${this.rule} --force`);
+      yield this.installRootCA();
+      enableGlobalProxy("localhost", this.port);
+      logger.info(`Proxy Server start on localhost:${this.port}
+`);
+    });
   }
   close() {
     execSync(`${this.bin} stop`);
     disableGlobalProxy();
     logger.info(`Proxy Server has been closed`);
   }
-}
+}
+export {
+  WhistleProxy as default
+};

package/dist/js/node/index.js

@@ -1,44 +1,77 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+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(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var stdin_exports = {};
+__export(stdin_exports, {
+  default: () => src_default
 });
-exports.default = void 0;
-var _utils = require("@modern-js/utils");
-var _createProxyRule = require("./utils/createProxyRule");
-var _whistleProxy = _interopRequireDefault(require("./utils/whistleProxy"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-var _default = () => {
+module.exports = __toCommonJS(stdin_exports);
+var import_utils = require("@modern-js/utils");
+var import_createProxyRule = require("./utils/createProxyRule");
+var import_whistleProxy = __toESM(require("./utils/whistleProxy"));
+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());
+  });
+};
+var src_default = () => {
   let proxyServer;
   return {
-    name: '@modern-js/plugin-proxy',
-    setup: api => ({
+    name: "@modern-js/plugin-proxy",
+    setup: (api) => ({
       validateSchema() {
-        return _utils.PLUGIN_SCHEMAS['@modern-js/plugin-proxy'];
+        return import_utils.PLUGIN_SCHEMAS["@modern-js/plugin-proxy"];
       },
-      async afterDev() {
-        const {
-          dev
-        } = api.useResolvedConfigContext();
-        const {
-          internalDirectory
-        } = api.useAppContext();
-        if (!(dev !== null && dev !== void 0 && dev.proxy)) {
-          return;
-        }
-        const rule = (0, _createProxyRule.createProxyRule)(internalDirectory, dev.proxy);
-        proxyServer = new _whistleProxy.default({
-          port: 8899,
-          rule
+      afterDev() {
+        return __async(this, null, function* () {
+          const { dev } = api.useResolvedConfigContext();
+          const { internalDirectory } = api.useAppContext();
+          if (!(dev == null ? void 0 : dev.proxy)) {
+            return;
+          }
+          const rule = (0, import_createProxyRule.createProxyRule)(internalDirectory, dev.proxy);
+          proxyServer = new import_whistleProxy.default({ port: 8899, rule });
+          yield proxyServer.start();
         });
-        await proxyServer.start();
       },
       beforeExit() {
-        var _proxyServer;
-        // terminate whistle proxy
-        (_proxyServer = proxyServer) === null || _proxyServer === void 0 ? void 0 : _proxyServer.close();
+        proxyServer == null ? void 0 : proxyServer.close();
       }
     })
   };
 };
-exports.default = _default;

package/dist/js/node/utils/createProxyRule.js

@@ -1,44 +1,63 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+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(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var stdin_exports = {};
+__export(stdin_exports, {
+  createProxyRule: () => createProxyRule
 });
-exports.createProxyRule = void 0;
-var _path = _interopRequireDefault(require("path"));
-var _utils = require("@modern-js/utils");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+module.exports = __toCommonJS(stdin_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');
-  let code = `/.*/ enable://intercept\n`;
+  const dest = import_path.default.resolve(ruleDirectory, "proxy.rule.js");
+  let code = `/.*/ enable://intercept
+`;
   for (const rule of rules) {
-    const {
-      pattern,
-      target
-    } = rule;
-    code += `${pattern} ${target}\n`;
+    const { pattern, target } = rule;
+    code += `${pattern} ${target}
+`;
   }
-  _utils.fs.outputFileSync(dest, `exports.name = 'modernjs proxy rule';\nexports.rules = \`${code}\`;`);
+  import_utils.fs.outputFileSync(
+    dest,
+    `exports.name = 'modernjs proxy rule';
+exports.rules = \`${code}\`;`
+  );
   return dest;
 };
 const createProxyRule = (appDirectory, proxyOptions) => {
   const rules = [];
-  if (proxyOptions && typeof proxyOptions === 'string') {
+  if (proxyOptions && typeof proxyOptions === "string") {
     return proxyOptions;
   }
-  if (typeof proxyOptions === 'object') {
+  if (typeof proxyOptions === "object") {
     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`);
-        // eslint-disable-next-line no-process-exit
+      if (!target || typeof target !== "string") {
+        import_utils.logger.error(`dev.proxy.${pattern} value should be string type`);
         process.exit(1);
       }
-      rules.push({
-        pattern,
-        target
-      });
+      rules.push({ pattern, target });
     }
   }
   return createWhistleProxyRule(appDirectory, rules);
 };
-exports.createProxyRule = createProxyRule;

package/dist/js/node/utils/execSync.js

@@ -1,26 +1,38 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+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, {
+  default: () => execSync_default
 });
-exports.default = void 0;
-var _child_process = require("child_process");
+module.exports = __toCommonJS(stdin_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) {
-    /* eslint-disable prefer-destructuring */
     stdout = err.stdout;
     status = err.status;
-    /* eslint-enable prefer-destructuring */
   }
-
   return {
     stdout: stdout.toString(),
     status
   };
 }
-var _default = execSync;
-exports.default = _default;
+var execSync_default = execSync;

package/dist/js/node/utils/macCAManager.js

@@ -1,58 +1,75 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+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(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var stdin_exports = {};
+__export(stdin_exports, {
+  defaultRootCA: () => defaultRootCA,
+  generateRootCA: () => generateRootCA,
+  isRootCAExists: () => isRootCAExists,
+  trustRootCA: () => trustRootCA
 });
-exports.trustRootCA = exports.isRootCAExists = exports.generateRootCA = exports.defaultRootCA = void 0;
-var _os = _interopRequireDefault(require("os"));
-var _http = _interopRequireDefault(require("http"));
-var _path = _interopRequireDefault(require("path"));
-var _utils = require("@modern-js/utils");
-var _execSync = _interopRequireDefault(require("./execSync"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-const defaultCertDir = _path.default.resolve(_os.default.homedir(), './.whistle-proxy');
-const defaultRootCA = _path.default.resolve(defaultCertDir, './rootCA.crt');
-exports.defaultRootCA = defaultRootCA;
+module.exports = __toCommonJS(stdin_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");
   }
 };
-
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-exports.trustRootCA = trustRootCA;
 const isRootCATrusted = () => {
-  // current empty
 };
 const isRootCAExists = () => {
-  if (_utils.fs.existsSync(defaultRootCA)) {
+  if (import_utils.fs.existsSync(defaultRootCA)) {
     return true;
   }
   return false;
 };
-exports.isRootCAExists = isRootCAExists;
 const generateRootCA = () => 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:8899/cgi-bin/rootca', response => {
+  import_utils.fs.ensureDirSync(defaultCertDir);
+  const stream = import_utils.fs.createWriteStream(defaultRootCA);
+  import_http.default.get("http://localhost:8899/cgi-bin/rootca", (response) => {
     response.pipe(stream);
-    stream.on('finish', () => {
+    stream.on("finish", () => {
       resolve(defaultRootCA);
-    }).on('error', err => {
+    }).on("error", (err) => {
       reject(err);
     });
-  }).on('error', err => {
-    _utils.fs.unlink(defaultRootCA); // Delete the file
+  }).on("error", (err) => {
+    import_utils.fs.unlink(defaultRootCA);
     reject(err);
   });
 });
-exports.generateRootCA = generateRootCA;

package/dist/js/node/utils/macProxyManager.js

@@ -1,34 +1,51 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+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(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var stdin_exports = {};
+__export(stdin_exports, {
+  disableGlobalProxy: () => disableGlobalProxy,
+  enableGlobalProxy: () => enableGlobalProxy
 });
-exports.enableGlobalProxy = exports.disableGlobalProxy = void 0;
-var _execSync = _interopRequireDefault(require("./execSync"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-const networkTypes = ['Ethernet', 'Thunderbolt Ethernet', 'Wi-Fi'];
+module.exports = __toCommonJS(stdin_exports);
+var import_execSync = __toESM(require("./execSync"));
+const networkTypes = ["Ethernet", "Thunderbolt Ethernet", "Wi-Fi"];
 const getNetworkType = () => {
-  // eslint-disable-next-line @typescript-eslint/prefer-for-of
   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;
     }
   }
-  throw new Error('Unknown network type');
+  throw new Error("Unknown network type");
 };
 const enableGlobalProxy = (ip, port) => {
   const networkType = getNetworkType();
-
-  // && networksetup -setproxybypassdomains ${networkType} localhost localhost
-  (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}`);
 };
-exports.enableGlobalProxy = enableGlobalProxy;
 const disableGlobalProxy = () => {
   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`);
 };
-exports.disableGlobalProxy = disableGlobalProxy;

package/dist/js/node/utils/whistleProxy.js

@@ -1,55 +1,93 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+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(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var stdin_exports = {};
+__export(stdin_exports, {
+  default: () => WhistleProxy
 });
-exports.default = void 0;
-var _path = _interopRequireDefault(require("path"));
-var _utils = require("@modern-js/utils");
-var _execSync = _interopRequireDefault(require("./execSync"));
-var _macCAManager = require("./macCAManager");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-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; }
-const {
-  disableGlobalProxy,
-  enableGlobalProxy
-} = require("./macProxyManager");
+module.exports = __toCommonJS(stdin_exports);
+var import_path = __toESM(require("path"));
+var import_utils = require("@modern-js/utils");
+var import_execSync = __toESM(require("./execSync"));
+var import_macCAManager = require("./macCAManager");
+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());
+  });
+};
+const { disableGlobalProxy, enableGlobalProxy } = require("./macProxyManager");
 class WhistleProxy {
   constructor(config) {
-    _defineProperty(this, "rule", void 0);
-    _defineProperty(this, "port", void 0);
-    _defineProperty(this, "bin", void 0);
-    _defineProperty(this, "certDir", void 0);
     this.rule = config.rule;
     this.port = config.port;
-    // unused
-    // this.mode = config.mode; // pureProxy|debug|multiEnv
-    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);
   }
-  async installRootCA() {
-    try {
-      if (!(0, _macCAManager.isRootCAExists)()) {
-        await (0, _macCAManager.generateRootCA)();
-        (0, _macCAManager.trustRootCA)();
+  installRootCA() {
+    return __async(this, null, function* () {
+      try {
+        if (!(0, import_macCAManager.isRootCAExists)()) {
+          yield (0, import_macCAManager.generateRootCA)();
+          (0, import_macCAManager.trustRootCA)();
+        }
+      } catch (err) {
+        this.close();
+        throw err;
       }
-    } catch (err) {
-      this.close();
-      throw err;
-    }
+    });
   }
-  async start() {
-    _utils.logger.info(`Starting the proxy server.....`);
-    (0, _execSync.default)(`${this.bin} start --certDir=${this.certDir} --port=${this.port}`);
-    (0, _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}\n`);
+  start() {
+    return __async(this, null, function* () {
+      import_utils.logger.info(`Starting the 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`);
+      yield this.installRootCA();
+      enableGlobalProxy("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`);
   }
 }
-exports.default = WhistleProxy;

package/dist/types/index.d.ts

@@ -1,3 +1,5 @@
 import type { CliPlugin } from '@modern-js/core';
+
 declare const _default: () => CliPlugin;
+
 export default _default;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.0.0-beta.3",
+  "version": "2.0.0-beta.4",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -33,16 +33,16 @@
   "dependencies": {
     "@babel/runtime": "^7.18.0",
     "whistle": "^2.7.18",
-    "@modern-js/utils": "2.0.0-beta.3"
+    "@modern-js/utils": "2.0.0-beta.4"
   },
   "devDependencies": {
     "@types/jest": "^27",
     "@types/node": "^14",
     "typescript": "^4",
     "jest": "^27",
-    "@modern-js/core": "2.0.0-beta.3",
-    "@scripts/build": "2.0.0-beta.3",
-    "@scripts/jest-config": "2.0.0-beta.3"
+    "@modern-js/core": "2.0.0-beta.4",
+    "@scripts/build": "2.0.0-beta.4",
+    "@scripts/jest-config": "2.0.0-beta.4"
   },
   "sideEffects": false,
   "publishConfig": {