[feat] diff build for spm-webpack-server

Author: jaredleechn

cli.js

@@ -23,6 +23,7 @@ program
   .option('--weinre', 'weinre')
   .option('--https', 'https')
   .option('--verbose', 'show more logging')
+  .option('--define [yourMode]', 'using the value of pkg.spm.define.yourMode or pkg.spm.define.default when "yourMode" is not specified')
   .parse(process.argv);
 
 //log.config(program);
@@ -35,7 +36,8 @@ var args = {
   weinre: program.weinre,
   livereload: program.livereload,
   proxy: program.proxy,
-  port: program.port || 8000
+  port: program.port || 8000,
+  define: program.define
 };
 
 var sw = require('spm-webpack');
@@ -58,16 +60,6 @@ sw.build.installDeps(args, function() {
   var spmArgs = extend(true, {}, {server:{devtool:'#source-map'}}, spmArgv(cwd,wpOpts.pkg));
   wpOpts.devtool = spmArgs.server.devtool;
 
-  if (spmArgs.server.define) {
-    for (var i=0; i<wpOpts.plugins.length; i++) {
-      var p = wpOpts.plugins[i];
-      if (p.definitions) {
-        wpOpts.plugins.splice(i, 1);
-        break;
-      }
-    }
-    wpOpts.plugins.push(new sw.webpack.DefinePlugin(spmArgs.server.define));
-  }
 
   isPortInUse(args.port, function() {
     log.error('error', 'port %s is in use', args.port);

test/fixtures/define/a.js

@@ -0,0 +1 @@
+console.log(NAME, AGE, FLAG);

test/fixtures/define/package.json

@@ -0,0 +1,53 @@
+{
+  "spm": {
+    "output": [
+      "a.js"
+    ],
+    "define": {
+      "dev": {
+        "NAME": "dev",
+        "AGE": 1,
+        "FLAG": true
+      },
+      "test": {
+        "NAME": "test",
+        "AGE": 2000000000,
+        "FLAG": false
+      },
+      "prod": {
+        "NAME": "prod",
+        "AGE": -1,
+        "FLAG": true
+      },
+      "default": {
+        "NAME": "default",
+        "AGE": 0,
+        "FLAG": false
+      }
+    },
+    "build": {
+      "define": {
+        "NAME": "build",
+        "AGE": 0,
+        "FLAG": false,
+        "prod": {
+          "NAME": "dev",
+          "AGE": 1,
+          "FLAG": true
+        }
+      }
+    },
+    "server": {
+      "define": {
+        "NAME": "server",
+        "AGE": 0,
+        "FLAG": false,
+        "prod": {
+          "NAME": "dev",
+          "AGE": 1,
+          "FLAG": true
+        }
+      }
+    }
+  }
+}

test/index.js

@@ -254,3 +254,127 @@ describe('server-with-specify-dest', function() {
 
 });
 
+describe('server-with-define', function() {
+
+  var app = null;
+  var args = null;
+
+  before(function (done) {
+    args = {
+      cwd : join(fixtures, 'define'),
+      define: 'prod',
+      debug: true
+    };
+    process.chdir(args.cwd);
+    var pkgFile = join(args.cwd, 'package.json');
+    if (existsSync(pkgFile)) {
+      args.pkg = JSON.parse(readFileSync(pkgFile, 'utf-8'));
+      args.pkg.spm.hash = false;
+    }
+    sw.build.getWebpackOpts(args, function (err, webpackOpts) {
+      var server = new Server(sw.webpack(webpackOpts), args);
+      app = server.app;
+      server.once('done', done);
+    });
+  });
+
+  it('get /a.js', function(done) {
+    request(app.listen())
+      .get('/a.js')
+      .expect(function(res){
+        if(res.text.indexOf('NAME') > -1 || res.text.indexOf('AGE') > -1 || res.text.indexOf('FLAG') > -1){
+          throw new Error('define param failed');
+        }else if(res.text.indexOf('console.log(("prod"), (-1), (true));') === -1){
+          throw new Error('define param to a wrong value');
+        }
+      })
+      .end(function(err){
+        if (err) return done(err);
+        done();
+      });
+  });
+
+});
+
+describe('server-with-define-default', function() {
+
+  var app = null;
+  var args = null;
+
+  before(function (done) {
+    args = {
+      cwd : join(fixtures, 'define'),
+      define: true,
+      debug: true
+    };
+    process.chdir(args.cwd);
+    var pkgFile = join(args.cwd, 'package.json');
+    if (existsSync(pkgFile)) {
+      args.pkg = JSON.parse(readFileSync(pkgFile, 'utf-8'));
+      args.pkg.spm.hash = false;
+    }
+    sw.build.getWebpackOpts(args, function (err, webpackOpts) {
+      var server = new Server(sw.webpack(webpackOpts), args);
+      app = server.app;
+      server.once('done', done);
+    });
+  });
+
+  it('get /a.js', function(done) {
+    request(app.listen())
+      .get('/a.js')
+      .expect(function(res){
+        if(res.text.indexOf('NAME') > -1 || res.text.indexOf('AGE') > -1 || res.text.indexOf('FLAG') > -1){
+          throw new Error('define param failed');
+        }else if(res.text.indexOf('console.log(("default"), (0), (false));') === -1){
+          throw new Error('define param to a wrong value');
+        }
+      })
+      .end(function(err){
+        if (err) return done(err);
+        done();
+      });
+  });
+
+});
+/*describe('server-with-define-cli', function() {
+
+  var app = null;
+  var args = null;
+
+  before(function (done) {
+    args = {
+      cwd : join(fixtures, 'define'),
+      define: '{NAME:"cli",AGE:999,FLAG:true}',
+      debug: true
+    };
+    process.chdir(args.cwd);
+    var pkgFile = join(args.cwd, 'package.json');
+    if (existsSync(pkgFile)) {
+      args.pkg = JSON.parse(readFileSync(pkgFile, 'utf-8'));
+      args.pkg.spm.hash = false;
+    }
+    sw.build.getWebpackOpts(args, function (err, webpackOpts) {
+      var server = new Server(sw.webpack(webpackOpts), args);
+      app = server.app;
+      server.once('done', done);
+    });
+  });
+
+  it('get /a.js', function(done) {
+    request(app.listen())
+      .get('/a.js')
+      .expect(function(res){
+        if(res.text.indexOf('NAME') > -1 || res.text.indexOf('AGE') > -1 || res.text.indexOf('FLAG') > -1){
+          throw new Error('define param failed');
+        }else if(res.text.indexOf('console.log(("cli"), (999), (true));') === -1){
+          throw new Error('define param to a wrong value');
+        }
+      })
+      .end(function(err){
+        if (err) return done(err);
+        done();
+      });
+  });
+
+});*/