fix: sourcemap default value should respect eggScriptConfig (#50)

Author: killagu

lib/command.js

@@ -51,11 +51,6 @@ class Command extends BaseCommand {
       const pkgInfo = require(pkgFile);
       const eggInfo = pkgInfo.egg;
 
-      // read `egg.typescript` from package.json
-      if (eggInfo && eggInfo.typescript) {
-        argv.sourcemap = true;
-      }
-
       // read `eggScriptsConfig.require` from package.json
       const eggScriptsConfig = pkgInfo.eggScriptsConfig;
       let requireFiles = Array.isArray(argv.require) ? argv.require : [];
@@ -82,6 +77,11 @@ class Command extends BaseCommand {
         }
       }
 
+      // read `egg.typescript` from package.json
+      if (eggInfo && eggInfo.typescript && typeof argv.sourcemap === 'undefined') {
+        argv.sourcemap = true;
+      }
+
       delete argv.require;
     }
 

test/fixtures/pkg-config-sourcemap/config/config.default.js

@@ -0,0 +1,8 @@
+'use strict';
+
+exports.keys = '123456';
+
+exports.logger = {
+  level: 'WARN',
+  consoleLevel: 'WARN',
+};

test/fixtures/pkg-config-sourcemap/config/plugin.js

@@ -0,0 +1,148 @@
+'use strict';
+
+module.exports = {
+  // enable plugins
+
+  /**
+   * app global Error Handling
+   * @member {Object} Plugin#onerror
+   * @property {Boolean} enable - `true` by default
+   */
+  onerror: {
+    enable: false,
+    package: 'egg-onerror',
+    path: 'xxxxx',
+  },
+
+  /**
+   * session
+   * @member {Object} Plugin#session
+   * @property {Boolean} enable - `true` by default
+   * @since 1.0.0
+   */
+  session: {
+    enable: false,
+    package: 'egg-session',
+    path: 'xxxxx',
+  },
+
+  /**
+   * i18n
+   * @member {Object} Plugin#i18n
+   * @property {Boolean} enable - `true` by default
+   * @since 1.0.0
+   */
+  i18n: {
+    enable: false,
+    package: 'egg-i18n',
+    path: 'xxxxx',
+  },
+
+  /**
+   * file and dir watcher
+   * @member {Object} Plugin#watcher
+   * @property {Boolean} enable - `true` by default
+   * @since 1.0.0
+   */
+  watcher: {
+    enable: false,
+    package: 'egg-watcher',
+    path: 'xxxxx',
+  },
+
+  /**
+   * multipart
+   * @member {Object} Plugin#multipart
+   * @property {Boolean} enable - `true` by default
+   * @since 1.0.0
+   */
+  multipart: {
+    enable: false,
+    package: 'egg-multipart',
+    path: 'xxxxx',
+  },
+
+  /**
+   * security middlewares and extends
+   * @member {Object} Plugin#security
+   * @property {Boolean} enable - `true` by default
+   * @since 1.0.0
+   */
+  security: {
+    enable: false,
+    package: 'egg-security',
+    path: 'xxxxx',
+  },
+
+  /**
+   * local development helper
+   * @member {Object} Plugin#development
+   * @property {Boolean} enable - `true` by default
+   * @since 1.0.0
+   */
+  development: {
+    enable: false,
+    package: 'egg-development',
+    path: 'xxxxx',
+  },
+
+  /**
+   * logger file rotator
+   * @member {Object} Plugin#logrotator
+   * @property {Boolean} enable - `true` by default
+   * @since 1.0.0
+   */
+  logrotator: {
+    enable: false,
+    package: 'egg-logrotator',
+    path: 'xxxxx',
+  },
+
+  /**
+   * schedule tasks
+   * @member {Object} Plugin#schedule
+   * @property {Boolean} enable - `true` by default
+   * @since 2.7.0
+   */
+  schedule: {
+    enable: false,
+    package: 'egg-schedule',
+    path: 'xxxxx',
+  },
+
+  /**
+   * `app/public` dir static serve
+   * @member {Object} Plugin#static
+   * @property {Boolean} enable - `true` by default
+   * @since 1.0.0
+   */
+  static: {
+    enable: false,
+    package: 'egg-static',
+    path: 'xxxxx',
+  },
+
+  /**
+   * jsonp support for egg
+   * @member {Function} Plugin#jsonp
+   * @property {Boolean} enable - `true` by default
+   * @since 1.0.0
+   */
+  jsonp: {
+    enable: false,
+    package: 'egg-jsonp',
+    path: 'xxxxx',
+  },
+
+  /**
+   * view plugin
+   * @member {Function} Plugin#view
+   * @property {Boolean} enable - `true` by default
+   * @since 1.0.0
+   */
+  view: {
+    enable: false,
+    package: 'egg-view',
+    path: 'xxxxx',
+  },
+};

test/fixtures/pkg-config-sourcemap/node_modules/custom-framework/index.js

@@ -0,0 +1,11 @@
+{
+  "name": "pkg-config-sourcemap",
+  "version": "1.0.0",
+  "egg": {
+    "typescript": true,
+    "framework": "custom-framework"
+  },
+  "eggScriptsConfig": {
+    "sourcemap": false
+  }
+}

test/fixtures/pkg-config-sourcemap/node_modules/custom-framework/package.json

@@ -69,6 +69,30 @@ describe('test/start.test.js', () => {
       });
     });
 
+    describe('sourcemap default value should respect eggScriptConfig', () => {
+      let app;
+      let fixturePath;
+
+      before(function* () {
+        fixturePath = path.join(__dirname, 'fixtures/pkg-config-sourcemap');
+        yield utils.cleanup(fixturePath);
+      });
+
+      after(function* () {
+        app.proc.kill('SIGTERM');
+        yield utils.cleanup(fixturePath);
+      });
+
+      it('should not enable sourcemap-support', function* () {
+        app = coffee.fork(eggBin, [ 'start', '--workers=1' ], { cwd: fixturePath });
+        app.debug();
+        app.expect('code', 0);
+
+        yield sleep(waitTime);
+        assert(!/--require .*\/node_modules\/.*source-map-support/.test(app.stdout));
+      });
+    });
+
     describe('full path', () => {
       let app;