pxnpm 2.0.3 → 2.0.4

package/README.md

@@ -1,62 +1,67 @@
-pxnpm
-=======
+# 普迅电力-FE-私库
 
-## Requirements
-
-|        | Minimum | Recommended |
-|--------|---------|-------------|
-| NodeJS | 4.0.0   | stable      |
-
-## Install
+## 使用
 
 ```bash
-$ npm install pxnpm -g
+$ npm install -g pxnpm // 外网
+
+$ npm install -g pxnpm --registry=http://10.120.20.50:5507 // 内网
 ```
 
-If you're in China, maybe you should install it from our [China mirror](https://npm.taobao.org):
+### 安装依赖
 
 ```bash
-$ npm install pxnpm -g --registry=https://r.npm.taobao.org
+$ pxnpm install [name]
 ```
 
-## Usage
+### 注册用户
 
-Support all commands just like `npm`.
+```bash
+$ pxnpm adduser
+```
 
-### Sync packages from `npm`
+### 登录 / 登出
 
 ```bash
-$ pxnpm sync [moduleName]
+$ pxnpm login
+$ pxnpm logout
+
 ```
 
-### Open package document or git web url
+### 创建新项目
+
+package.json中name格式需要符合 `@团队名称/项目名` 原则，例如: `@yfzx/xxx, @zrui/query-table`
 
 ```bash
-$ pxnpm doc [name]
-$ pxnpm doc -g [name] # open git web url directly
+pxnpm init
+
 ```
 
-## Build your own private registry npm cli
+### 更新版本号
+
+发布前运行，例如`pxnpm version patch`
 
 ```bash
-$ npm install pxnpm -g
+pxnpm version [<newversion> | major | minor | patch | premajor | preminor | prepatch | prerelease [--preid=<prerelease-id>] | from-git]
 
-# then alias it
-$ alias mynpm='pxnpm --registry=http://registry.npm.example.com \
-  --registryweb=http://npm.example.com \
-  --userconfig=$HOME/.mynpmrc'
 ```
 
-## Install with original npm cli
+- major: 主版本号
+- premajor: 预备主版本
+- minor: 次版本号
+- preminor: 预备次版本
+- patch: 修订号
+- prepatch: 预备修订版
+- prerelease: 预发布版本
+
+### 发布
 
-pxnpm using [npminstall](https://github.com/pxnpm/npminstall) by default.
-If you don't like symlink mode for `node_modules`, you can change the installer to original npm.
-But you will lose the fastest install speed.
+项目根目录运行
 
 ```bash
-$ pxnpm i --by=npm react-native
+$ pxnpm publish
 ```
 
-## License
+### 其他命令
 
-[MIT](LICENSE.txt)
+支持所有其他npm命令

package/bin/pxnpm

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 
 'use strict';
+const pkg = require('../package.json');
 
 const debug = require('debug')('cnpm');
-const pkg = require('../package.json');
 const argv = require('../lib/parse_argv')();
 
 const action = argv.args[0];

package/lib/config.js

@@ -1,27 +1,28 @@
-'use strict';
+"use strict";
 
-const debug = require('debug')('cnpm:config');
-const path = require('path');
-const fs = require('fs');
-const cp = require('child_process');
-const ini = require('ini');
-const ping = require('connection-tester');
+const debug = require("debug")("cnpm:config");
+const path = require("path");
+const fs = require("fs");
+const cp = require("child_process");
+const ini = require("ini");
 
 let root;
-if (process.platform === 'win32') {
+if (process.platform === "win32") {
   root = process.env.USERPROFILE || process.env.APPDATA || process.env.TMP || process.env.TEMP;
 } else {
-  root = process.env.HOME || process.env.TMPDIR || '/tmp';
+  root = process.env.HOME || process.env.TMPDIR || "/tmp";
 }
 
 let prefix = null;
 try {
-  prefix = cp.execSync('npm config get prefix').toString().trim();
+  prefix = cp.execSync("npm config get prefix").toString().trim();
 } catch (err) {
   // ignore it
-  debug('npm config cli error: %s', err);
+  debug("npm config cli error: %s", err);
 }
 
+// =====
+const ping = require("connection-tester");
 const rawArgs = process.argv && process.argv.slice(2);
 const rawAction = rawArgs && rawArgs[0];
 const isPublish = rawAction === "login" || rawAction === "publish";
@@ -29,49 +30,44 @@ const isPublish = rawAction === "login" || rawAction === "publish";
 process.env.outerAddr = JSON.stringify({
   inner: {
     proxy: {
-      protocol: 'http:',
-      host: 'fe-repo.inner.px.nfjbill.ren',
-      port: 8080,
+      protocol: "http:",
+      host: "fe-repo.inner.px.nfjbill.ren",
+      port: 8080
     },
     registry: {
-      protocol: 'http:',
-      host: 'fe-repo.inner.px.nfjbill.ren',
-      port: isPublish ? 5508 : 5507,
-    },
+      protocol: "http:",
+      host: "fe-repo.inner.px.nfjbill.ren",
+      port: isPublish ? 5508 : 5507
+    }
   },
   outer: {
     proxy: {
-      protocol: 'http:',
-      host: 'npm.taobao.org',
-      port: 80,
+      protocol: "http:",
+      host: "npm.taobao.org",
+      port: 80
     },
-    // registry: {
-    //   protocol: 'https:',
-    //   host: 'pips.xt.nfjbill.ren',
-    //   port: isPublish ? 8905 : 38083,
-    // },
     registry: {
-      protocol: 'http:',
-      host: '39.105.197.205',
-      port: isPublish ? 8905 : 38082,
-    },
+      protocol: "http:",
+      host: "pip.xt.huizhixi.cn",
+      port: isPublish ? 8905 : 38082
+    }
   },
   io: {
     proxy: {
-      protocol: 'http:',
-      host: 'r.pxnpm.nfjbill.ren',
-      port: 8080,
+      protocol: "http:",
+      host: "r.pxnpm.nfjbill.ren",
+      port: 8080
     },
     registry: {
-      protocol: 'http:',
-      host: 'registry.pxnpm.nfjbill.ren',
-      port: isPublish ? 5508 : 5507,
-    },
+      protocol: "http:",
+      host: "registry.pxnpm.nfjbill.ren",
+      port: isPublish ? 5508 : 5507
+    }
   },
   // yk3 内部端口
   lp: {
-    addr: 'http://127.0.0.1:38020',
-  },
+    addr: "http://127.0.0.1:38020"
+  }
 });
 
 const outerAddr = JSON.parse(process.env.outerAddr);
@@ -79,11 +75,11 @@ const outerAddr = JSON.parse(process.env.outerAddr);
 const getAddr = function(type) {
   return {
     proxy: `${outerAddr[type].proxy.protocol}//${outerAddr[type].proxy.host}:${outerAddr[type].proxy.port}`,
-    registry: `${outerAddr[type].registry.protocol}//${outerAddr[type].registry.host}:${outerAddr[type].registry.port}`,
+    registry: `${outerAddr[type].registry.protocol}//${outerAddr[type].registry.host}:${outerAddr[type].registry.port}`
   };
 };
 
-let addr = getAddr('io');
+let addr = getAddr("io");
 let pxnpmServer = `http://${outerAddr.io.registry.host}`;
 const timeout = 3000;
 const { success: is } = ping.test(outerAddr.inner.proxy.host, outerAddr.inner.proxy.port, timeout); // registry
@@ -92,28 +88,29 @@ const { success: os } = ping.test(outerAddr.outer.proxy.host, outerAddr.outer.pr
 if (!is && !os) {
   // consola.fatal('没有发现安装源，请调通网络，或重新尝试安装');
   // process.exit(0);
-  addr = getAddr('outer');
+  addr = getAddr("outer");
 }
 
 if (!is && os) {
   // consola.warn('您正在使用协同模式安装，如果安装失败，请多尝试几次，或联系管理员');
-  addr = getAddr('outer');
+  addr = getAddr("outer");
 }
 
 if (is && !os) {
-  addr = getAddr('inner');
+  addr = getAddr("inner");
 }
 
 let proxy = addr.proxy;
 let registry = addr.registry;
 
-const userconfig = path.join(root, '.pxnpmrc');
+// ====
+const userconfig = path.join(root, ".pxnpmrc");
 if (fs.existsSync(userconfig)) {
   let cnpmrc;
   try {
-    cnpmrc = ini.parse(fs.readFileSync(userconfig, 'utf-8'));
+    cnpmrc = ini.parse(fs.readFileSync(userconfig, "utf-8"));
   } catch (err) {
-    console.warn('[cnpm:config] [WARN] read %s ini format error', userconfig);
+    console.warn("[cnpm:config] [WARN] read %s ini format error", userconfig);
   }
 
   if (cnpmrc && cnpmrc.proxy) {
@@ -125,21 +122,12 @@ process.env.__pxnpm_config_proxy = proxy;
 process.env.__pxnpm_config_pxnpmServer = pxnpmServer;
 
 module.exports = {
-  // cnpmHost: 'https://npm.taobao.org',
-  // cnpmRegistry: 'http://cln.grsg.aly.px.nfjbill.xyz:38020/',
-  // disturl: 'https://npm.taobao.org/mirrors/node', // download dist tarball for node-gyp
-  // iojsDisturl: 'https://npm.taobao.org/mirrors/iojs',
-  // cache: path.join(root, '.cnpm'), // cache folder name
-  // userconfig,
-  // proxy,
-  // prefix,
-
   cnpmHost: pxnpmServer,
   cnpmRegistry: registry,
   disturl: `${proxy}/mirrors/node`, // download dist tarball for node-gyp
-  iojsDisturl: `${proxy}/mirrors/iojs`,
-  cache: path.join(root, '.pxnpm'), // cache folder name
+  iojsDisturl: `${proxy}/mirrors/node`,
+  cache: path.join(root, ".pxnpm"), // cache folder name
   userconfig,
   proxy: '',
-  prefix,
+  prefix
 };

package/lib/parse_argv.js

@@ -19,7 +19,7 @@ module.exports = cmd => {
       .option('-c, --cache [cache]', 'cache folder, default is ' + config.cache)
       .option('-u, --userconfig [userconfig]', 'userconfig file, default is ' + config.userconfig)
       .option('-y, --yes', 'yes all confirm')
-      .option('--ignore-custom-config', 'ignore custom .pxnpmrc')
+      .option('--ignore-custom-config', 'ignore custom .cnpmrc')
       .option('--proxy [proxy]', 'set a http proxy, no default');
   }
 

package/package.json

@@ -1,28 +1,29 @@
 {
-  "author": {
-    "name": "fengmk2",
-    "email": "fengmk2@gmail.com",
-    "url": "https://fengmk2.com"
+  "name": "pxnpm",
+  "version": "2.0.4",
+  "description": "pxnpm use cnpm engine",
+  "main": "bin/pxnpm",
+  "files": [
+    "bin",
+    "lib"
+  ],
+  "scripts": {
+    "test": "npm run lint -- --fix && npm run test-local",
+    "test-local": "egg-bin test",
+    "lint": "eslint bin lib test/*.js",
+    "ci": "npm run lint && npm run test",
+    "autod": "autod"
   },
+  "preferGlobal": true,
   "bin": {
     "pxnpm": "bin/pxnpm"
   },
-  "bugs": {
-    "url": "https://github.com/cnpm/cnpm/issues"
-  },
-  "bundleDependencies": false,
-  "ci": {
-    "version": "6, 8, 10, 12",
-    "command": {
-      "travis": "ci",
-      "appveyor": "ci"
-    }
-  },
   "dependencies": {
     "auto-correct": "^1.0.0",
     "bagpipe": "^0.3.5",
     "colors": "^1.1.2",
     "commander": "~2.10.0",
+    "config-chain": "^1.1.13",
     "connection-tester": "^0.2.1",
     "cross-spawn": "~0.2.8",
     "debug": "^2.2.0",
@@ -30,12 +31,10 @@
     "ini": "^1.3.4",
     "npm": "^6.13.4",
     "npm-request": "^1.0.0",
-    "open": "^0.0.5",
-    "pxnpminstall": "^1.0.5",
+    "open": "^8.2.1",
+    "pxnpminstall": "2.0.0",
     "urllib": "^2.17.0"
   },
-  "deprecated": false,
-  "description": "cnpm: npm client for cnpmjs.org",
   "devDependencies": {
     "autod": "^2.7.1",
     "coffee": "^3.3.0",
@@ -47,36 +46,14 @@
     "rimraf": "^2.5.4"
   },
   "engines": {
-    "node": ">= 6.0.0"
+    "node": ">= 10.0.0"
   },
-  "files": [
-    "bin",
-    "lib"
-  ],
-  "homepage": "https://github.com/cnpm/cnpm",
-  "keywords": [
-    "cnpm",
-    "npm",
-    "npminstall"
-  ],
-  "license": "MIT",
-  "main": "bin/cnpm",
-  "name": "pxnpm",
-  "preferGlobal": true,
-  "publishConfig": {
-    "tag": "latest"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/cnpm/cnpm.git"
-  },
-  "scripts": {
-    "autod": "autod",
-    "ci": "npm run lint && npm run test",
-    "lint": "eslint bin lib test/*.js",
-    "test": "npm run lint -- --fix && npm run test-local",
-    "test-local": "egg-bin test",
-    "pub:beta": "npm version prerelease --preid=beta && npm publish --tag beta"
+  "ci": {
+    "type": "github",
+    "version": "10, 12, 14, 16",
+    "os": {
+      "github": "linux, windows, macos"
+    }
   },
-  "version": "2.0.3"
+  "license": "MIT"
 }