@modern-js/plugin-proxy 2.0.0-beta.0 → 2.0.0-beta.2

package/CHANGELOG.md

@@ -1,5 +1,49 @@
 # @modern-js/plugin-proxy
 
+## 2.0.0-beta.2
+
+### Major Changes
+
+- dda38c9c3e: chore: v2
+
+### Patch Changes
+
+- Updated dependencies [92f0ead]
+- Updated dependencies [edd1cfb1af]
+- Updated dependencies [cc971eabfc]
+- Updated dependencies [5b9049f2e9]
+- Updated dependencies [92004d1]
+- Updated dependencies [b8bbe036c7]
+- Updated dependencies [d5a31df781]
+- Updated dependencies [dda38c9c3e]
+- Updated dependencies [3bbea92b2a]
+- Updated dependencies [abf3421a75]
+- Updated dependencies [543be9558e]
+- Updated dependencies [14b712da84]
+  - @modern-js/utils@2.0.0-beta.2
+
+## 2.0.0-beta.1
+
+### Major Changes
+
+- dda38c9: chore: v2
+
+### Patch Changes
+
+- Updated dependencies [92f0ead]
+- Updated dependencies [edd1cfb1af]
+- Updated dependencies [cc971eabfc]
+- Updated dependencies [5b9049f]
+- Updated dependencies [92004d1]
+- Updated dependencies [b8bbe036c7]
+- Updated dependencies [d5a31df781]
+- Updated dependencies [dda38c9]
+- Updated dependencies [3bbea92b2a]
+- Updated dependencies [abf3421]
+- Updated dependencies [543be9558e]
+- Updated dependencies [14b712d]
+  - @modern-js/utils@2.0.0-beta.1
+
 ## 2.0.0-beta.0
 
 ### Major Changes

package/dist/js/modern/index.js

@@ -9,7 +9,6 @@ export default (() => {
       validateSchema() {
         return PLUGIN_SCHEMAS['@modern-js/plugin-proxy'];
       },
-
       async afterDev() {
         const {
           dev
@@ -17,11 +16,9 @@ export default (() => {
         const {
           internalDirectory
         } = api.useAppContext();
-
         if (!(dev !== null && dev !== void 0 && dev.proxy)) {
           return;
         }
-
         const rule = createProxyRule(internalDirectory, dev.proxy);
         proxyServer = new WhistleProxy({
           port: 8899,
@@ -29,14 +26,11 @@ export default (() => {
         });
         await proxyServer.start();
       },
-
       beforeExit() {
         var _proxyServer;
-
         // terminate whistle proxy
         (_proxyServer = proxyServer) === null || _proxyServer === void 0 ? void 0 : _proxyServer.close();
       }
-
     })
   };
 });

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

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

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

@@ -1,9 +1,7 @@
 import { execSync as nodeExecSync } from 'child_process';
-
 function execSync(cmd) {
   let stdout;
   let status = 0;
-
   try {
     stdout = nodeExecSync(cmd);
   } catch (err) {
@@ -18,5 +16,4 @@ function execSync(cmd) {
     status
   };
 }
-
 export default execSync;

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

@@ -10,29 +10,27 @@ export const trustRootCA = () => {
   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');
   } else {
     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
 };
 
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const isRootCATrusted = () => {
+  // current empty
+};
 export const isRootCAExists = () => {
   if (fs.existsSync(defaultRootCA)) {
     return true;
   }
-
   return false;
 };
 export 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 => {
@@ -44,7 +42,6 @@ export const generateRootCA = () => new Promise((resolve, reject) => {
     });
   }).on('error', err => {
     fs.unlink(defaultRootCA); // Delete the file
-
     reject(err);
   });
 });

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

@@ -1,23 +1,20 @@
 import execSync from "./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 = execSync(`networksetup -getwebproxy ${type}`);
-
     if (result.status === 0) {
       return type;
     }
   }
-
   throw new Error('Unknown network type');
 };
-
 export const enableGlobalProxy = (ip, port) => {
-  const networkType = getNetworkType(); // && networksetup -setproxybypassdomains ${networkType} localhost localhost
+  const networkType = getNetworkType();
 
+  // && networksetup -setproxybypassdomains ${networkType} localhost localhost
   execSync(`networksetup -setwebproxy ${networkType} ${ip} ${port}`);
   execSync(`networksetup -setsecurewebproxy ${networkType} ${ip} ${port}`);
 };

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

@@ -1,33 +1,25 @@
 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';
 import execSync from "./execSync";
 import { isRootCAExists, generateRootCA, defaultRootCA, trustRootCA } from "./macCAManager";
-
 const {
   disableGlobalProxy,
   enableGlobalProxy
 } = require("./macProxyManager");
-
 export default 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.port = config.port;
+    // unused
     // this.mode = config.mode; // pureProxy|debug|multiEnv
-
     this.bin = path.resolve(path.dirname(require.resolve('whistle')), 'bin/whistle.js');
     this.certDir = path.dirname(defaultRootCA);
   }
-
   async installRootCA() {
     try {
       if (!isRootCAExists()) {
@@ -39,7 +31,6 @@ export default class WhistleProxy {
       throw err;
     }
   }
-
   async start() {
     logger.info(`Starting the proxy server.....`);
     execSync(`${this.bin} start --certDir=${this.certDir} --port=${this.port}`);
@@ -48,11 +39,9 @@ export default class WhistleProxy {
     enableGlobalProxy('localhost', this.port);
     logger.info(`Proxy Server start on localhost:${this.port}\n`);
   }
-
   close() {
     execSync(`${this.bin} stop`);
     disableGlobalProxy();
     logger.info(`Proxy Server has been closed`);
   }
-
 }

package/dist/js/node/index.js

@@ -4,15 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 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 = () => {
   let proxyServer;
   return {
@@ -21,7 +16,6 @@ var _default = () => {
       validateSchema() {
         return _utils.PLUGIN_SCHEMAS['@modern-js/plugin-proxy'];
       },
-
       async afterDev() {
         const {
           dev
@@ -29,11 +23,9 @@ var _default = () => {
         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,
@@ -41,16 +33,12 @@ var _default = () => {
         });
         await proxyServer.start();
       },
-
       beforeExit() {
         var _proxyServer;
-
         // terminate whistle proxy
         (_proxyServer = proxyServer) === null || _proxyServer === void 0 ? void 0 : _proxyServer.close();
       }
-
     })
   };
 };
-
 exports.default = _default;

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

@@ -4,18 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 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 }; }
-
 const createWhistleProxyRule = (ruleDirectory, rules) => {
   const dest = _path.default.resolve(ruleDirectory, 'proxy.rule.js');
-
   let code = `/.*/ enable://intercept\n`;
-
   for (const rule of rules) {
     const {
       pattern,
@@ -23,38 +17,28 @@ const createWhistleProxyRule = (ruleDirectory, rules) => {
     } = rule;
     code += `${pattern} ${target}\n`;
   }
-
   _utils.fs.outputFileSync(dest, `exports.name = 'modernjs proxy rule';\nexports.rules = \`${code}\`;`);
-
   return dest;
 };
-
 const createProxyRule = (appDirectory, proxyOptions) => {
   const rules = [];
-
   if (proxyOptions && typeof proxyOptions === 'string') {
     return proxyOptions;
   }
-
   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
-
-
+        _utils.logger.error(`dev.proxy.${pattern} value should be string type`);
+        // eslint-disable-next-line no-process-exit
         process.exit(1);
       }
-
       rules.push({
         pattern,
         target
       });
     }
   }
-
   return createWhistleProxyRule(appDirectory, rules);
 };
-
 exports.createProxyRule = createProxyRule;

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

@@ -4,13 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _child_process = require("child_process");
-
 function execSync(cmd) {
   let stdout;
   let status = 0;
-
   try {
     stdout = (0, _child_process.execSync)(cmd);
   } catch (err) {
@@ -25,6 +22,5 @@ function execSync(cmd) {
     status
   };
 }
-
 var _default = execSync;
 exports.default = _default;

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

@@ -4,64 +4,45 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 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;
-
 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}`);
-
   if (status === 0) {
     _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');
   }
-}; // eslint-disable-next-line @typescript-eslint/no-unused-vars
-
+};
 
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 exports.trustRootCA = trustRootCA;
-
-const isRootCATrusted = () => {// current empty
+const isRootCATrusted = () => {
+  // current empty
 };
-
 const isRootCAExists = () => {
   if (_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);
   }
-
   _utils.fs.ensureDirSync(defaultCertDir);
-
   const stream = _utils.fs.createWriteStream(defaultRootCA);
-
   _http.default.get('http://localhost:8899/cgi-bin/rootca', response => {
     response.pipe(stream);
     stream.on('finish', () => {
@@ -71,10 +52,7 @@ const generateRootCA = () => new Promise((resolve, reject) => {
     });
   }).on('error', err => {
     _utils.fs.unlink(defaultRootCA); // Delete the file
-
-
     reject(err);
   });
 });
-
 exports.generateRootCA = generateRootCA;

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

@@ -4,40 +4,31 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 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'];
-
 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}`);
-
     if (result.status === 0) {
       return type;
     }
   }
-
   throw new Error('Unknown network type');
 };
-
 const enableGlobalProxy = (ip, port) => {
-  const networkType = getNetworkType(); // && networksetup -setproxybypassdomains ${networkType} localhost localhost
+  const networkType = getNetworkType();
 
+  // && networksetup -setproxybypassdomains ${networkType} localhost localhost
   (0, _execSync.default)(`networksetup -setwebproxy ${networkType} ${ip} ${port}`);
   (0, _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`);
 };
-
 exports.disableGlobalProxy = disableGlobalProxy;

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

@@ -4,42 +4,29 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 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");
-
 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.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);
   }
-
   async installRootCA() {
     try {
       if (!(0, _macCAManager.isRootCAExists)()) {
@@ -51,25 +38,18 @@ class WhistleProxy {
       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`);
   }
-
   close() {
     (0, _execSync.default)(`${this.bin} stop`);
     disableGlobalProxy();
-
     _utils.logger.info(`Proxy Server has been closed`);
   }
-
 }
-
 exports.default = WhistleProxy;

package/dist/types/index.d.ts

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

package/dist/types/utils/createProxyRule.d.ts

@@ -1,2 +1 @@
-import type { DevProxyOptions } from '@modern-js/core';
-export declare const createProxyRule: (appDirectory: string, proxyOptions: DevProxyOptions) => string;
+export declare const createProxyRule: (appDirectory: string, proxyOptions: any) => string;

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",
@@ -32,17 +32,17 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.18.0",
-    "@modern-js/utils": "2.0.0-beta.0",
-    "whistle": "^2.7.18"
+    "whistle": "^2.7.18",
+    "@modern-js/utils": "2.0.0-beta.2"
   },
   "devDependencies": {
     "@types/jest": "^27",
     "@types/node": "^14",
     "typescript": "^4",
-    "@modern-js/core": "2.0.0-beta.0",
-    "@scripts/build": "2.0.0-beta.0",
     "jest": "^27",
-    "@scripts/jest-config": "2.0.0-beta.0"
+    "@modern-js/core": "2.0.0-beta.2",
+    "@scripts/build": "2.0.0-beta.2",
+    "@scripts/jest-config": "2.0.0-beta.2"
   },
   "sideEffects": false,
   "publishConfig": {
@@ -50,9 +50,9 @@
     "access": "public"
   },
   "scripts": {
-    "new": "modern new",
-    "dev": "modern build --watch",
-    "build": "modern build",
+    "new": "modern-lib new",
+    "dev": "modern-lib build --watch",
+    "build": "modern-lib build",
     "test": "jest --passWithNoTests"
   }
 }