[feat] add define plugins using objects defined in pkg.spm.define(for…

…mat prod) or type from client(format ENV:prod,LOG:false,NUMBER:-1)
spmjs · Nov 4, 2015 · b74a16e · b74a16e
1 parent 0848355
commit b74a16e
Show file tree

Hide file tree

Showing 9 changed files with 214 additions and 16 deletions.
diff --git a/cli.js b/cli.js
@@ -27,6 +27,7 @@ program
   .option('--no-color', 'disable colorful print')
   .option('--no-install', 'disable install')
   .option('--sourcemap', 'enable sourcemap for build')
+  .option('--define [value]', 'add define plugins using objects defined in pkg.spm.define(format prod) or type from client(format ENV:prod,LOG:false,NUMBER:-1)')
   .parse(process.argv);
 
 log.config(program);
@@ -71,7 +72,8 @@ var args = {
   debug: program.debug,
   progress: program.progress,
 
-  sourcemap: program.sourcemap
+  sourcemap: program.sourcemap,
+  define: program.define
 };
 
 if (entry && entry.length) {

diff --git a/lib/build.js b/lib/build.js
@@ -191,8 +191,27 @@ function getWebpackOpts(opts, callback) {
     }));
   }
 
-  if (opts.build.define && typeof opts.build.define === 'object') {
-    args.plugins.push(new webpack.DefinePlugin(opts.build.define));
+  if(opts.build.define){
+
+    var pkgDefine = {};
+
+    if(opts.build.define.indexOf(':') === -1){
+
+      pkgDefine = opts.build.pkg.spm.define && opts.build.pkg.spm.define[opts.build.define] || {};
+
+      for(var i in pkgDefine){
+        pkgDefine[i] = parseDefineValue(pkgDefine[i]);
+      }
+
+    }else {
+
+      opts.build.define && opts.build.define.split(',').forEach(function(pairs){
+        var ele = pairs.split(':');
+        ele[1] !== undefined && (pkgDefine[ele[0]] = parseDefineValue(ele[1]));
+      });
+
+    }
+    args.plugins.push(new webpack.DefinePlugin(pkgDefine));
   }
 
   args.files = files;
@@ -272,3 +291,15 @@ function getWebpackOpts(opts, callback) {
   if (callback) return callback(null, args);
   else return args;
 }
+
+function parseDefineValue(param){
+  if(typeof(param) === 'string'){
+
+    if(param === 'true') return true;
+    else if(param === 'false') return false;
+    else return isNaN(param) ? JSON.stringify(param) : param - 0;
+
+  }else {
+    return param;
+  }
+}
diff --git a/test/build-spec.js b/test/build-spec.js
@@ -247,12 +247,23 @@ describe('lib/build.js', function() {
   it('define', function*() {
     yield build({
       debug: true,
+      define: 'prod',
       cwd: join(fixtures, 'define'),
       dest: dest
     });
     assert(dest, 'define');
   });
 
+  it('define-cli', function*() {
+    yield build({
+      debug: true,
+      define: 'NAME:cli,AGE:999,FLAG:true',
+      cwd: join(fixtures, 'define-cli'),
+      dest: dest
+    });
+    assert(dest, 'define-cli');
+  });
+
   it('css-output-background', function*() {
     yield build({
       debug: true,

diff --git a/test/expected/define-cli/a.js b/test/expected/define-cli/a.js
@@ -0,0 +1,75 @@
+/******/ (function(modules) { // webpackBootstrap
+/******/ 	// The module cache
+/******/ 	var installedModules = {};
+
+/******/ 	// The require function
+/******/ 	function __webpack_require__(moduleId) {
+
+/******/ 		// Check if module is in cache
+/******/ 		if(installedModules[moduleId])
+/******/ 			return installedModules[moduleId].exports;
+
+/******/ 		// Create a new module (and put it into the cache)
+/******/ 		var module = installedModules[moduleId] = {
+/******/ 			exports: {},
+/******/ 			id: moduleId,
+/******/ 			loaded: false
+/******/ 		};
+
+/******/ 		// Execute the module function
+/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
+
+/******/ 		// Flag the module as loaded
+/******/ 		module.loaded = true;
+
+/******/ 		// Return the exports of the module
+/******/ 		return module.exports;
+/******/ 	}
+
+
+/******/ 	// expose the modules object (__webpack_modules__)
+/******/ 	__webpack_require__.m = modules;
+
+/******/ 	// expose the module cache
+/******/ 	__webpack_require__.c = installedModules;
+
+/******/ 	// __webpack_public_path__
+/******/ 	__webpack_require__.p = "";
+
+/******/ 	// Load entry module and return exports
+/******/ 	return __webpack_require__(0);
+/******/ })
+/************************************************************************/
+/******/ ([
+/* 0 */
+/***/ function(module, exports, __webpack_require__) {
+
+	module.exports = __webpack_require__(1);
+
+
+/***/ },
+/* 1 */
+/***/ function(module, exports, __webpack_require__) {
+
+	if(true){
+	  console.log('NAME correct');
+	}else {
+	  console.log('NAME wrong');
+	}
+
+
+	if(true){
+	  console.log('AGE correct')
+	}else {
+	  console.log('AGE wrong');
+	}
+
+
+	if(true){
+	  console.log('FLAG correct');
+	}else {
+	  console.log('FLAG wrong');
+	}
+
+/***/ }
+/******/ ]);
diff --git a/test/expected/define/a.js b/test/expected/define/a.js
@@ -51,11 +51,25 @@
 /* 1 */
 /***/ function(module, exports, __webpack_require__) {
 
-
-	if (false) {
-	  console.log(1);
+	if(true){
+	  console.log('NAME correct');
+	}else {
+	  console.log('NAME wrong');
 	}
 
 
+	if((-1) === -1){
+	  console.log('AGE correct')
+	}else {
+	  console.log('AGE wrong');
+	}
+
+
+	if(true){
+	  console.log('FLAG correct');
+	}else {
+	  console.log('FLAG wrong');
+	}
+
 /***/ }
 /******/ ]);
diff --git a/test/fixtures/define-cli/a.js b/test/fixtures/define-cli/a.js
@@ -0,0 +1,19 @@
+if(NAME === 'cli'){
+  console.log('NAME correct');
+}else {
+  console.log('NAME wrong');
+}
+
+
+if(AGE === 999){
+  console.log('AGE correct')
+}else {
+  console.log('AGE wrong');
+}
+
+
+if(FLAG === true){
+  console.log('FLAG correct');
+}else {
+  console.log('FLAG wrong');
+}
diff --git a/test/fixtures/define-cli/package.json b/test/fixtures/define-cli/package.json
@@ -0,0 +1,24 @@
+{
+  "spm": {
+    "output": [
+      "a.js"
+    ],
+    "define": {
+      "dev": {
+        "NAME": "dev",
+        "AGE": 0,
+        "FLAG": true
+      },
+      "test": {
+        "NAME": "test",
+        "AGE": 2000000000,
+        "FLAG": false
+      },
+      "prod": {
+        "NAME": "prod",
+        "AGE": -1,
+        "FLAG": false
+      }
+    }
+  }
+}
diff --git a/test/fixtures/define/a.js b/test/fixtures/define/a.js
@@ -1,4 +1,19 @@
+if(NAME === 'prod'){
+  console.log('NAME correct');
+}else {
+  console.log('NAME wrong');
+}
+
 
-if (DEBUG) {
-  console.log(1);
+if(AGE === -1){
+  console.log('AGE correct')
+}else {
+  console.log('AGE wrong');
 }
+
+
+if(FLAG === false){
+  console.log('FLAG correct');
+}else {
+  console.log('FLAG wrong');
+}
diff --git a/test/fixtures/define/package.json b/test/fixtures/define/package.json
@@ -3,14 +3,21 @@
     "output": [
       "a.js"
     ],
-    "build": {
-      "define": {
-        "DEBUG": false
-      }
-    },
-    "server": {
-      "define": {
-        "DEBUG": true
+    "define": {
+      "dev": {
+        "NAME": "dev",
+        "AGE": 0,
+        "FLAG": true
+      },
+      "test": {
+        "NAME": "test",
+        "AGE": 2000000000,
+        "FLAG": false
+      },
+      "prod": {
+        "NAME": "prod",
+        "AGE": -1,
+        "FLAG": false
       }
     }
   }