@modern-js/plugin-proxy 1.2.1 → 1.2.4

package/CHANGELOG.md

@@ -1,5 +1,40 @@
 # @modern-js/plugin-proxy
 
+## 1.2.4
+
+### Patch Changes
+
+- 681a1ff9: feat: remove unnecessary peerDependencies
+- Updated dependencies [c2046f37]
+  - @modern-js/utils@1.3.6
+
+## 1.2.3
+
+### Patch Changes
+
+- 9b2640fe: fix: dev.proxy type not work
+- Updated dependencies [5bf5868d]
+- Updated dependencies [80d3cfb7]
+- Updated dependencies [42c6b136]
+- Updated dependencies [4e7dcbd5]
+- Updated dependencies [9e8bc4ab]
+- Updated dependencies [0c556e59]
+- Updated dependencies [80d8ddfe]
+- Updated dependencies [2008fdbd]
+  - @modern-js/utils@1.3.5
+  - @modern-js/core@1.5.0
+
+## 1.2.2
+
+### Patch Changes
+
+- 83166714: change .npmignore
+- Updated dependencies [83166714]
+- Updated dependencies [c3de9882]
+- Updated dependencies [33ff48af]
+  - @modern-js/core@1.3.2
+  - @modern-js/utils@1.2.2
+
 ## 1.2.1
 
 ### Patch Changes

package/dist/js/modern/index.js

@@ -1,42 +1,43 @@
-import { createPlugin, useAppContext, useResolvedConfigContext } from '@modern-js/core';
 import { PLUGIN_SCHEMAS } from '@modern-js/utils';
 import { createProxyRule } from "./utils/createProxyRule";
 import WhistleProxy from "./utils/whistleProxy";
-let proxyServer;
-export default createPlugin(() => ({
-  validateSchema() {
-    return PLUGIN_SCHEMAS['@modern-js/plugin-proxy'];
-  },
+import "./types";
+export default (() => {
+  let proxyServer;
+  return {
+    name: '@modern-js/plugin-proxy',
+    setup: api => ({
+      validateSchema() {
+        return PLUGIN_SCHEMAS['@modern-js/plugin-proxy'];
+      },
 
-  async afterDev() {
-    /* eslint-disable react-hooks/rules-of-hooks */
-    const {
-      dev
-    } = useResolvedConfigContext();
-    const {
-      internalDirectory
-    } = useAppContext();
-    /* eslint-enable react-hooks/rules-of-hooks */
+      async afterDev() {
+        const {
+          dev
+        } = api.useResolvedConfigContext();
+        const {
+          internalDirectory
+        } = api.useAppContext();
 
-    if (!(dev !== null && dev !== void 0 && dev.proxy)) {
-      return;
-    }
+        if (!(dev !== null && dev !== void 0 && dev.proxy)) {
+          return;
+        }
 
-    const rule = createProxyRule(internalDirectory, dev.proxy);
-    proxyServer = new WhistleProxy({
-      port: 8899,
-      rule
-    });
-    await proxyServer.start();
-  },
+        const rule = createProxyRule(internalDirectory, dev.proxy);
+        proxyServer = new WhistleProxy({
+          port: 8899,
+          rule
+        });
+        await proxyServer.start();
+      },
 
-  beforeExit() {
-    var _proxyServer;
+      beforeExit() {
+        var _proxyServer;
 
-    // terminate whistle proxy
-    (_proxyServer = proxyServer) === null || _proxyServer === void 0 ? void 0 : _proxyServer.close();
-  }
+        // terminate whistle proxy
+        (_proxyServer = proxyServer) === null || _proxyServer === void 0 ? void 0 : _proxyServer.close();
+      }
 
-}), {
-  name: '@modern-js/plugin-proxy'
+    })
+  };
 });

package/dist/js/modern/types.js

@@ -0,0 +1 @@
+import '@modern-js/core';

package/dist/js/node/index.js

@@ -5,54 +5,54 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _core = require("@modern-js/core");
-
 var _utils = require("@modern-js/utils");
 
 var _createProxyRule = require("./utils/createProxyRule");
 
 var _whistleProxy = _interopRequireDefault(require("./utils/whistleProxy"));
 
+require("./types");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-let proxyServer;
-
-var _default = (0, _core.createPlugin)(() => ({
-  validateSchema() {
-    return _utils.PLUGIN_SCHEMAS['@modern-js/plugin-proxy'];
-  },
-
-  async afterDev() {
-    /* eslint-disable react-hooks/rules-of-hooks */
-    const {
-      dev
-    } = (0, _core.useResolvedConfigContext)();
-    const {
-      internalDirectory
-    } = (0, _core.useAppContext)();
-    /* eslint-enable react-hooks/rules-of-hooks */
-
-    if (!(dev !== null && dev !== void 0 && dev.proxy)) {
-      return;
-    }
-
-    const rule = (0, _createProxyRule.createProxyRule)(internalDirectory, dev.proxy);
-    proxyServer = new _whistleProxy.default({
-      port: 8899,
-      rule
-    });
-    await proxyServer.start();
-  },
-
-  beforeExit() {
-    var _proxyServer;
-
-    // terminate whistle proxy
-    (_proxyServer = proxyServer) === null || _proxyServer === void 0 ? void 0 : _proxyServer.close();
-  }
-
-}), {
-  name: '@modern-js/plugin-proxy'
-});
+var _default = () => {
+  let proxyServer;
+  return {
+    name: '@modern-js/plugin-proxy',
+    setup: api => ({
+      validateSchema() {
+        return _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
+        });
+        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/types.js

@@ -0,0 +1,3 @@
+"use strict";
+
+require("@modern-js/core");

package/dist/types/index.d.ts

@@ -1,9 +1,6 @@
-declare const _default: any;
+import type { CliPlugin } from '@modern-js/core';
+import './types';
 
-export default _default;
-export declare type ProxyOptions = string | Record<string, string>;
-declare module '@modern-js/core' {
-  interface DevConfig {
-    proxy?: ProxyOptions;
-  }
-}
+declare const _default: () => CliPlugin;
+
+export default _default;

package/dist/types/types.d.ts

@@ -0,0 +1,7 @@
+import '@modern-js/core';
+export declare type ProxyOptions = string | Record<string, string>;
+declare module '@modern-js/core' {
+  interface DevConfig {
+    proxy?: ProxyOptions;
+  }
+}

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

@@ -1,2 +1,2 @@
-import type { ProxyOptions } from '..';
+import type { ProxyOptions } from '../types';
 export declare const createProxyRule: (appDirectory: string, proxyOptions: ProxyOptions) => string;

package/modern.config.js

@@ -1,2 +1,6 @@
 /** @type {import('@modern-js/module-tools').UserConfig} */
-module.exports = {};
+module.exports = {
+  output: {
+    packageMode: 'node-js',
+  },
+};

package/package.json

@@ -11,12 +11,22 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.2.1",
+  "version": "1.2.4",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
   "module": "./dist/js/treeshaking/index.js",
   "jsnext:modern": "./dist/js/modern/index.js",
+  "typesVersions": {
+    "*": {
+      ".": [
+        "./dist/types/index.d.ts"
+      ],
+      "types": [
+        "./dist/types/types.d.ts"
+      ]
+    }
+  },
   "exports": {
     ".": {
       "node": {
@@ -29,38 +39,38 @@
     "./cli": {
       "jsnext:source": "./src/index.ts",
       "default": "./dist/js/node/index.js"
+    },
+    "./types": {
+      "node": {
+        "import": "./dist/js/modern/types.js",
+        "require": "./dist/js/node/types.js",
+        "types": "./dist/types/types.d.ts"
+      },
+      "default": "./dist/js/treeshaking/types.js"
     }
   },
   "dependencies": {
     "@babel/runtime": "^7",
-    "@modern-js/utils": "^1.2.1",
+    "@modern-js/utils": "^1.3.6",
     "whistle": "^2.7.18"
   },
   "devDependencies": {
     "@types/jest": "^26",
     "@types/node": "^14",
     "typescript": "^4",
-    "@modern-js/core": "^1.3.1",
+    "@modern-js/core": "^1.6.0",
     "@scripts/build": "0.0.0",
     "jest": "^27",
     "@scripts/jest-config": "0.0.0"
   },
-  "peerDependencies": {
-    "@modern-js/core": "^1.3.1"
-  },
   "sideEffects": false,
-  "modernConfig": {
-    "output": {
-      "packageMode": "node-js"
-    }
-  },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public",
-    "types": "./dist/types/index.d.ts"
+    "access": "public"
   },
   "scripts": {
     "new": "modern new",
+    "dev": "modern build --watch",
     "build": "modern build",
     "test": "jest --passWithNoTests"
   },

package/src/index.ts

@@ -1,44 +0,0 @@
-import {
-  createPlugin,
-  useAppContext,
-  useResolvedConfigContext,
-} from '@modern-js/core';
-import { PLUGIN_SCHEMAS } from '@modern-js/utils';
-import { createProxyRule } from './utils/createProxyRule';
-import WhistleProxy from './utils/whistleProxy';
-
-let proxyServer: WhistleProxy;
-export default createPlugin(
-  () => ({
-    validateSchema() {
-      return PLUGIN_SCHEMAS['@modern-js/plugin-proxy'];
-    },
-    async afterDev() {
-      /* eslint-disable react-hooks/rules-of-hooks */
-      const { dev } = useResolvedConfigContext();
-      const { internalDirectory } = useAppContext();
-      /* eslint-enable react-hooks/rules-of-hooks */
-
-      if (!dev?.proxy) {
-        return;
-      }
-
-      const rule = createProxyRule(internalDirectory, dev.proxy);
-      proxyServer = new WhistleProxy({ port: 8899, rule });
-      await proxyServer.start();
-    },
-    beforeExit() {
-      // terminate whistle proxy
-      proxyServer?.close();
-    },
-  }),
-  { name: '@modern-js/plugin-proxy' },
-) as any;
-
-export type ProxyOptions = string | Record<string, string>;
-
-declare module '@modern-js/core' {
-  export interface DevConfig {
-    proxy?: ProxyOptions;
-  }
-}

package/src/utils/createProxyRule.ts

@@ -1,50 +0,0 @@
-import path from 'path';
-import { logger, fs } from '@modern-js/utils';
-import type { ProxyOptions } from '..';
-
-interface ProxyRule {
-  pattern: string;
-  target: string;
-}
-
-const createWhistleProxyRule = (ruleDirectory: string, rules: ProxyRule[]) => {
-  const dest = path.resolve(ruleDirectory, 'proxy.rule.js');
-
-  let code = `/.*/ enable://intercept\n`;
-
-  for (const rule of rules) {
-    const { pattern, target } = rule;
-    code += `${pattern} ${target}\n`;
-  }
-
-  fs.outputFileSync(
-    dest,
-    `exports.name = 'modernjs proxy rule';\nexports.rules = \`${code}\`;`,
-  );
-  return dest;
-};
-
-export const createProxyRule = (
-  appDirectory: string,
-  proxyOptions: 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
-        process.exit(1);
-      }
-      rules.push({ pattern, target });
-    }
-  }
-
-  return createWhistleProxyRule(appDirectory, rules);
-};

package/src/utils/execSync.ts

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

package/src/utils/macCAManager.ts

@@ -1,58 +0,0 @@
-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 = () => {
-  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) {
-    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
-};
-
-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 => {
-        response.pipe(stream);
-        stream
-          .on('finish', () => {
-            resolve(defaultRootCA);
-          })
-          .on('error', err => {
-            reject(err);
-          });
-      })
-      .on('error', err => {
-        fs.unlink(defaultRootCA); // Delete the file
-        reject(err);
-      });
-  });

package/src/utils/macProxyManager.ts

@@ -1,31 +0,0 @@
-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: string, port: string) => {
-  const networkType = getNetworkType();
-
-  // && networksetup -setproxybypassdomains ${networkType} localhost localhost
-  execSync(`networksetup -setwebproxy ${networkType} ${ip} ${port}`);
-  execSync(`networksetup -setsecurewebproxy ${networkType} ${ip} ${port}`);
-};
-
-export const disableGlobalProxy = () => {
-  const networkType = getNetworkType();
-  execSync(`networksetup -setwebproxystate ${networkType} off`);
-  execSync(`networksetup -setsecurewebproxystate ${networkType} off`);
-};

package/src/utils/whistleProxy.ts

@@ -1,67 +0,0 @@
-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');
-
-interface ProxyConfig {
-  rule: string;
-  port: number;
-  // mode: 'pureProxy'|'debug'|'multiEnv'
-}
-
-export default class WhistleProxy {
-  private readonly rule: string;
-
-  private readonly port: number;
-
-  private readonly bin: string;
-
-  private readonly certDir: string;
-
-  constructor(config: ProxyConfig) {
-    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.certDir = path.dirname(defaultRootCA);
-  }
-
-  async installRootCA() {
-    try {
-      if (!isRootCAExists()) {
-        await generateRootCA();
-        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}\n`);
-  }
-
-  close() {
-    execSync(`${this.bin} stop`);
-    disableGlobalProxy();
-    logger.info(`Proxy Server has been closed`);
-  }
-}