Merge pull request #7 from MicrosApp/develop

🎨 依赖适配

Author: zyao89

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@micro-app/cli",
-    "version": "0.1.2",
+    "version": "0.1.3",
     "description": "[CLI] Pluggable micro application framework.",
     "bin": {
         "micro-app": "./bin/micro-app.js",
@@ -36,6 +36,8 @@
     },
     "license": "MIT",
     "devDependencies": {
+        "@micro-app/core": "^0.1.3",
+        "@micro-app/plugin-webpack-adapter": "^0.0.3",
         "@micro-app/plugin-koa-static-server": "^0.0.1",
         "@micro-app/plugin-koa-webpack-middleware": "^0.0.1",
         "@micro-app/plugin-vue-cli": "^0.0.2",
@@ -48,8 +50,11 @@
         "jest": "^24.9.0",
         "webpack": "^4.39.2"
     },
+    "peerDependencies": {
+        "@micro-app/core": "^0.1.3",
+        "@micro-app/plugin-webpack-adapter": "^0.0.3"
+    },
     "dependencies": {
-        "@micro-app/core": "^0.1.1",
         "koa": "^2.8.1",
         "opn": "^5.5.0",
         "shelljs": "^0.8.3",

plugins/commands/deploy.js

@@ -5,6 +5,7 @@ const path = require('path');
 const chalk = require('chalk');
 const fs = require('fs');
 
+// TODO 抽离
 module.exports = function deployCommand(api, opts) {
 
     api.registerMethod('beforeCommandDeploy', {

src/adapter/index.js

@@ -6,7 +6,7 @@ const _ = require('lodash');
 
 module.exports = function adapter(api, info) {
     const logger = api.logger;
-    const _webpackConfig = api.getState('webpackConfig');
+    const _webpackConfig = api.resolveWebpackConfig();
     const _webpackDevOptions = _webpackConfig.devServer || {};
 
     const webpack = tryRequire('webpack');