@modern-js/plugin-proxy 2.4.1-beta.0 → 2.5.0

package/CHANGELOG.md

@@ -1,11 +1,19 @@
 # @modern-js/plugin-proxy
 
-## 2.4.1-beta.0
+## 2.5.0
 
 ### Patch Changes
 
+- 89ca6cc: refactor: merge build-config into scripts/build
+
+  refactor: 把 build-config 合并进 scripts/build
+
+- 30614fa: chore: modify package.json entry fields and build config
+  chore: 更改 package.json entry 字段以及构建配置
+- Updated dependencies [30614fa]
+- Updated dependencies [1b0ce87]
 - Updated dependencies [11c053b]
-  - @modern-js/utils@2.4.1-beta.0
+  - @modern-js/utils@2.5.0
 
 ## 2.4.0
 

package/dist/{js/node → cjs}/index.js

@@ -21,26 +21,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-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_exports = {};
 __export(src_exports, {
   default: () => src_default
@@ -57,17 +37,15 @@ var src_default = () => {
       validateSchema() {
         return import_utils.PLUGIN_SCHEMAS["@modern-js/plugin-proxy"];
       },
-      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();
-        });
+      async afterDev() {
+        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 });
+        await proxyServer.start();
       },
       beforeExit() {
         proxyServer == null ? void 0 : proxyServer.close();

package/dist/{js/node → cjs}/utils/whistleProxy.js

@@ -21,26 +21,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-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 whistleProxy_exports = {};
 __export(whistleProxy_exports, {
   default: () => WhistleProxy
@@ -61,29 +41,25 @@ class WhistleProxy {
     );
     this.certDir = import_path.default.dirname(import_macCAManager.defaultRootCA);
   }
-  installRootCA() {
-    return __async(this, null, function* () {
-      try {
-        if (!(0, import_macCAManager.isRootCAExists)()) {
-          yield (0, import_macCAManager.generateRootCA)(this.port);
-          (0, import_macCAManager.trustRootCA)();
-        }
-      } catch (err) {
-        this.close();
-        throw err;
+  async installRootCA() {
+    try {
+      if (!(0, import_macCAManager.isRootCAExists)()) {
+        await (0, import_macCAManager.generateRootCA)(this.port);
+        (0, import_macCAManager.trustRootCA)();
       }
-    });
+    } catch (err) {
+      this.close();
+      throw err;
+    }
   }
-  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}
+  async start() {
+    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`);
+    await this.installRootCA();
+    enableGlobalProxy("localhost", this.port);
+    import_utils.logger.info(`Proxy Server start on localhost:${this.port}
 `);
-    });
   }
   close() {
     (0, import_execSync.default)(`${this.bin} stop`);

package/dist/esm/index.js

@@ -0,0 +1,30 @@
+import { PLUGIN_SCHEMAS } from "@modern-js/utils";
+import { createProxyRule } from "./utils/createProxyRule";
+import WhistleProxy from "./utils/whistleProxy";
+var src_default = () => {
+  let proxyServer;
+  return {
+    name: "@modern-js/plugin-proxy",
+    setup: (api) => ({
+      validateSchema() {
+        return PLUGIN_SCHEMAS["@modern-js/plugin-proxy"];
+      },
+      async afterDev() {
+        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 });
+        await proxyServer.start();
+      },
+      beforeExit() {
+        proxyServer == null ? void 0 : proxyServer.close();
+      }
+    })
+  };
+};
+export {
+  src_default as default
+};

package/dist/esm/utils/whistleProxy.js

@@ -0,0 +1,49 @@
+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");
+class WhistleProxy {
+  constructor(config) {
+    this.rule = config.rule;
+    this.port = config.port;
+    this.bin = path.resolve(
+      path.dirname(require.resolve("whistle")),
+      "bin/whistle.js"
+    );
+    this.certDir = path.dirname(defaultRootCA);
+  }
+  async installRootCA() {
+    try {
+      if (!isRootCAExists()) {
+        await generateRootCA(this.port);
+        trustRootCA();
+      }
+    } 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}
+`);
+  }
+  close() {
+    execSync(`${this.bin} stop`);
+    disableGlobalProxy();
+    logger.info(`Proxy Server has been closed`);
+  }
+}
+export {
+  WhistleProxy as default
+};

package/package.json

@@ -11,38 +11,37 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.4.1-beta.0",
+  "version": "2.5.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
-  "main": "./dist/js/node/index.js",
-  "jsnext:modern": "./dist/js/modern/index.js",
+  "main": "./dist/cjs/index.js",
   "exports": {
     ".": {
       "node": {
         "jsnext:source": "./src/index.ts",
-        "import": "./dist/js/modern/index.js",
-        "require": "./dist/js/node/index.js"
+        "import": "./dist/esm/index.js",
+        "require": "./dist/cjs/index.js"
       },
-      "default": "./dist/js/node/index.js"
+      "default": "./dist/cjs/index.js"
     },
     "./cli": {
       "jsnext:source": "./src/index.ts",
-      "default": "./dist/js/node/index.js"
+      "default": "./dist/cjs/index.js"
     }
   },
   "dependencies": {
     "@babel/runtime": "^7.18.0",
     "whistle": "^2.7.18",
-    "@modern-js/utils": "2.4.1-beta.0"
+    "@modern-js/utils": "2.5.0"
   },
   "devDependencies": {
     "@types/jest": "^27",
     "@types/node": "^14",
     "typescript": "^4",
     "jest": "^27",
-    "@modern-js/core": "2.4.1-beta.0",
-    "@scripts/jest-config": "2.4.0",
-    "@scripts/build": "2.4.0"
+    "@modern-js/core": "2.5.0",
+    "@scripts/build": "2.5.0",
+    "@scripts/jest-config": "2.5.0"
   },
   "sideEffects": false,
   "publishConfig": {

package/dist/js/modern/index.js

@@ -1,52 +0,0 @@
-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";
-var src_default = () => {
-  let proxyServer;
-  return {
-    name: "@modern-js/plugin-proxy",
-    setup: (api) => ({
-      validateSchema() {
-        return PLUGIN_SCHEMAS["@modern-js/plugin-proxy"];
-      },
-      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();
-        });
-      },
-      beforeExit() {
-        proxyServer == null ? void 0 : proxyServer.close();
-      }
-    })
-  };
-};
-export {
-  src_default as default
-};

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

@@ -1,73 +0,0 @@
-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");
-class WhistleProxy {
-  constructor(config) {
-    this.rule = config.rule;
-    this.port = config.port;
-    this.bin = path.resolve(
-      path.dirname(require.resolve("whistle")),
-      "bin/whistle.js"
-    );
-    this.certDir = path.dirname(defaultRootCA);
-  }
-  installRootCA() {
-    return __async(this, null, function* () {
-      try {
-        if (!isRootCAExists()) {
-          yield generateRootCA(this.port);
-          trustRootCA();
-        }
-      } catch (err) {
-        this.close();
-        throw err;
-      }
-    });
-  }
-  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
-};