Merge pull request #5 from MicrosApp/develop

Develop

Author: zyao89

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@micro-app/cli",
-    "version": "0.1.1-rc.1",
+    "version": "0.1.1-rc.3",
     "description": "[CLI] Pluggable micro application framework.",
     "bin": {
         "micro-app": "./bin/micro-app.js",
@@ -34,7 +34,7 @@
         "name": "Zyao89",
         "email": "[email protected]"
     },
-    "license": "ISC",
+    "license": "MIT",
     "devDependencies": {
         "@types/jest": "^24.0.18",
         "babel-eslint": "^10.0.2",
@@ -45,7 +45,7 @@
         "webpack": "^4.39.2"
     },
     "dependencies": {
-        "@micro-app/core": "^0.1.1-rc.3",
+        "@micro-app/core": "^0.1.1-rc.5",
         "koa": "^2.8.1",
         "koa-static": "^5.0.0",
         "opn": "^5.5.0",

plugins/commands/serve/runServe.js

@@ -15,7 +15,7 @@ module.exports = function runServe(api, isDev, { type, onlyNode, progress, port,
         port, host,
     };
 
-    if (isDev) {
+    if (isDev && !onlyNode) {
         const { compiler, devOptions, webpackConfig } = webpackAdapter(api, { type, isDev, progress });
 
         startInfo.compiler = compiler;

src/adapter/index.js

@@ -7,7 +7,7 @@ const _ = require('lodash');
 module.exports = function adapter(api, { type, isDev, progress }) {
     const logger = api.logger;
     let _webpackConfig = api.getState('webpackConfig');
-    let _webpackDevOptions = {};
+    let _webpackDevOptions = _webpackConfig.devServer || {};
 
     if (type === 'vusion') {
         const vusionAdapter = require('./vusion')(_webpackConfig, isDev, {

src/server/createServer.js

@@ -56,10 +56,11 @@ module.exports = function(opts = {}, api) {
             app.use(koaWebpackMiddleware.devMiddleware(compiler, devOptions));
             app.use(koaWebpackMiddleware.hotMiddleware(compiler, devOptions));
         }
-    } else {
-        // static file
-        const { contentBase, options = {} } = serverConfig;
-        const staticOptions = api.applyPluginHooks('modifyStaticServerOptions', { options });
+    }
+    // static file
+    const { contentBase, options = {} } = serverConfig;
+    const staticOptions = api.applyPluginHooks('modifyStaticServerOptions', options) || {};
+    if (staticOptions.disabled !== true) {
         const koaStatic = staticServer(contentBase, staticOptions);
         if (koaStatic) {
             if (opts.type === 'vusion') {

yarn.lock

@@ -379,10 +379,10 @@
     "@types/istanbul-reports" "^1.1.1"
     "@types/yargs" "^13.0.0"
 
-"@micro-app/core@^0.1.1-rc.3":
-  version "0.1.1-rc.3"
-  resolved "https://registry.yarnpkg.com/@micro-app/core/-/core-0.1.1-rc.3.tgz#724aeb1e9df601ee55a705e832c3530ddf08da0e"
-  integrity sha512-hCphfir+E+fxNtvIRZK7tD4JNHj6W/nfKVvJz6qeOJbRuZ1fGq88S8lxw461yp8QxNtLkJw1A7lXY/bBLzL0fQ==
+"@micro-app/core@^0.1.1-rc.5":
+  version "0.1.1-rc.5"
+  resolved "https://registry.yarnpkg.com/@micro-app/core/-/core-0.1.1-rc.5.tgz#0a9167aca0b6583e62c7837950c228b6af2c82f7"
+  integrity sha512-p7cxoWpq/ji8qW3TFPiwJm1U8NHQ37fcChHLv0aQCVuQLYBvlSvhCSTY8wQPJRxr1J1vlopat+0h52I8w4HRZg==
   dependencies:
     ajv "^6.10.2"
     ajv-keywords "^3.4.1"