feat(cmd): init 和 build 命令可以添加 registry 参数

Author: yuhaoju

lib/commands/build.js

@@ -19,11 +19,20 @@ exports.usage = '线上编译';
 exports.setOptions = function (optimist) {
     optimist.alias('m', 'min');
     optimist.describe('m', '是否压缩资源');
+    optimist.alias('r', 'registry');
+    optimist.describe('r', '指定 npm 仓库');
 };
 
 exports.npmInstall = function () {
     var currentNpm = null;
     var cwd = process.cwd();
+    var userRegistry = 'http://npmrepo.corp.qunar.com';
+
+    for (var i = 0; i < process.argv.length; i++) {
+        if (process.argv[i] === '--registry' || process.argv[i] === '-r') {
+            userRegistry = process.argv[i + 1];
+        }
+    }
 
     // 检测是否存在 ykit.*.js
     var configFile = globby.sync(['ykit.*.js', 'ykit.js'], { cwd: cwd })[0];
@@ -70,11 +79,11 @@ exports.npmInstall = function () {
     }
 
     // install
-    var installParams = '--registry https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar ';
+    var installParams = '--registry ' + userRegistry;
     if (currentNpm === 'npm_cache_share') {
-        installParams += '-d';
+        installParams += ' -d';
     } else if (currentNpm === 'yarn') {
-        installParams += '--non-interactive';
+        installParams += ' --non-interactive';
     }
     var installCmd = currentNpm + ' install ' + installParams;
 

lib/commands/init.js

@@ -11,9 +11,14 @@ var UtilFs = require('../utils/fs.js');
 exports.usage = '项目初始化';
 exports.abbr = 'i';
 
-exports.setOptions = function () {};
+exports.setOptions = function () {
+	optimist.alias('r', 'registry');
+	optimist.describe('r', '指定 npm 仓库');
+};
 
 exports.run = function (options) {
+	var userRegistry = options.r || options.registry;
+
 	Manager.reloadRC();
 
 	var cwd = options.cwd,
@@ -35,7 +40,7 @@ exports.run = function (options) {
 		var checkConfigPkg = function checkConfigPkg(callback, packageName, registry) {
 			if (!isInitReady) {
 				var timeout = void 0;
-				var child = shell.exec('npm view ' + packageName + ' --registry https://' + registry, {
+				var child = shell.exec('npm view ' + packageName + ' --registry ' + registry, {
 					silent: true
 				}, function (code, stdout, stderr) {
 					if (stdout) {
@@ -56,24 +61,24 @@ exports.run = function (options) {
 		};
 
 		var initParam = process.argv[3];
-		var qunarRegistry = 'repo.corp.qunar.com/artifactory/api/npm/npm-qunar';
-		var taobaoRegistry = 'registry.npm.taobao.org';
+		var qunarRegistry = 'http://npmrepo.corp.qunar.com';
+		var taobaoRegistry = 'https://registry.npm.taobao.org';
 		var isInitReady = false;
 
 		spinner.start();
 		spinner.text = 'Checking package ykit-config-' + initParam;
 		async.series([
 		// qnpm 寻找是否存在 @qnpm/ykit-config-xxx 的插件
 		function (callback) {
-			checkConfigPkg(callback, '@qnpm/ykit-config-' + initParam, qunarRegistry);
+			checkConfigPkg(callback, '@qnpm/ykit-config-' + initParam, userRegistry || qunarRegistry);
 		},
 		// qnpm 寻找是否存在 ykit-config-xxx 的插件
 		function (callback) {
-			checkConfigPkg(callback, 'ykit-config-' + initParam, qunarRegistry);
+			checkConfigPkg(callback, 'ykit-config-' + initParam, userRegistry || qunarRegistry);
 		},
 		// cnpm 寻找是否存在 ykit-config-xxx 的插件
 		function (callback) {
-			checkConfigPkg(callback, 'ykit-config-' + initParam, taobaoRegistry);
+			checkConfigPkg(callback, 'ykit-config-' + initParam, userRegistry || taobaoRegistry);
 		}], function () {
 			if (isInitReady) {
 				spinner.stop();
@@ -116,7 +121,7 @@ exports.run = function (options) {
 	function installConfigPlugin(callback, configPkgName, registry) {
 		log('Install ' + configPkgName + '...');
 
-		shell.exec('npm install ' + configPkgName + ' --registry https://' + registry + ' --save', {
+		shell.exec('npm install ' + configPkgName + ' --registry ' + registry + ' --save', {
 			silent: false
 		}, function (code, stdout, stderr) {
 			callback(null); // npm install 中的警告也会当成 stderr 输出，所以不在这里做错误处理

src/commands/build.js

@@ -19,11 +19,20 @@ exports.usage = '线上编译';
 exports.setOptions = (optimist) => {
     optimist.alias('m', 'min');
     optimist.describe('m', '是否压缩资源');
+    optimist.alias('r', 'registry');
+    optimist.describe('r', '指定 npm 仓库');
 };
 
 exports.npmInstall = function() {
     let currentNpm = null;
     const cwd = process.cwd();
+    let userRegistry = 'http://npmrepo.corp.qunar.com';
+
+    for(let i = 0; i < process.argv.length; i++) {
+        if(process.argv[i] === '--registry' || process.argv[i] === '-r' ) {
+            userRegistry = process.argv[i + 1];
+        }
+    }
 
     // 检测是否存在 ykit.*.js
     const configFile = globby.sync(['ykit.*.js', 'ykit.js'], { cwd: cwd })[0];
@@ -70,11 +79,11 @@ exports.npmInstall = function() {
     }
 
     // install
-    let installParams = '--registry https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar ';
+    let installParams = '--registry ' + userRegistry;
     if(currentNpm === 'npm_cache_share') {
-        installParams += '-d';
+        installParams += ' -d';
     } else if (currentNpm === 'yarn') {
-        installParams += '--non-interactive';
+        installParams += ' --non-interactive';
     }
     const installCmd = (
         `${currentNpm} install ${installParams}`

src/commands/init.js

@@ -11,9 +11,14 @@ const UtilFs = require('../utils/fs.js');
 exports.usage = '项目初始化';
 exports.abbr = 'i';
 
-exports.setOptions = () => {};
+exports.setOptions = () => {
+	optimist.alias('r', 'registry');
+    optimist.describe('r', '指定 npm 仓库');
+};
 
 exports.run = function(options) {
+	const userRegistry = options.r || options.registry;
+
 	Manager.reloadRC();
 
 	let cwd = options.cwd,
@@ -33,24 +38,24 @@ exports.run = function(options) {
 	// 如果初始化时带着初始化类型
 	if (typeof process.argv[3] === 'string') {
 		const initParam = process.argv[3];
-		const qunarRegistry = 'repo.corp.qunar.com/artifactory/api/npm/npm-qunar';
-		const taobaoRegistry = 'registry.npm.taobao.org';
+		const qunarRegistry = 'http://npmrepo.corp.qunar.com';
+		const taobaoRegistry = 'https://registry.npm.taobao.org';
 		let isInitReady = false;
 
 		spinner.start();
 		spinner.text = `Checking package ykit-config-${initParam}`;
 		async.series([
 			// qnpm 寻找是否存在 @qnpm/ykit-config-xxx 的插件
 			(callback) => {
-				checkConfigPkg(callback, `@qnpm/ykit-config-${initParam}`, qunarRegistry);
+				checkConfigPkg(callback, `@qnpm/ykit-config-${initParam}`, userRegistry || qunarRegistry);
 			},
 			// qnpm 寻找是否存在 ykit-config-xxx 的插件
 			(callback) => {
-				checkConfigPkg(callback, `ykit-config-${initParam}`, qunarRegistry);
+				checkConfigPkg(callback, `ykit-config-${initParam}`, userRegistry || qunarRegistry);
 			},
 			// cnpm 寻找是否存在 ykit-config-xxx 的插件
 			(callback) => {
-				checkConfigPkg(callback, `ykit-config-${initParam}`, taobaoRegistry);
+				checkConfigPkg(callback, `ykit-config-${initParam}`, userRegistry || taobaoRegistry);
 			}
 		], () => {
 			if (isInitReady) {
@@ -64,7 +69,7 @@ exports.run = function(options) {
 		function checkConfigPkg(callback, packageName, registry) {
 			if (!isInitReady) {
 				let timeout;
-				const child = shell.exec(`npm view ${packageName} --registry https://${registry}`, {
+				const child = shell.exec(`npm view ${packageName} --registry ${registry}`, {
 					silent: true
 				}, (code, stdout, stderr) => {
 					if (stdout) {
@@ -112,7 +117,7 @@ exports.run = function(options) {
 	function installConfigPlugin(callback, configPkgName, registry) {
 		log('Install ' + configPkgName + '...');
 
-		shell.exec(`npm install ${configPkgName} --registry https://${registry} --save`, {
+		shell.exec(`npm install ${configPkgName} --registry ${registry} --save`, {
 			silent: false
 		}, (code, stdout, stderr) => {
 			callback(null); // npm install 中的警告也会当成 stderr 输出，所以不在这里做错误处理