fix: frontend app not target config

easy-team · Sep 28, 2018 · 92976b3 · 92976b3
1 parent 0d35aae
commit 92976b3
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/lib/builder.js b/lib/builder.js
@@ -26,13 +26,12 @@ exports.getWebpackBuilder = config => {
       pkg: 'easywebpack'
     }
   };
-
+  const pkgFile = path.join(config.baseDir, 'package.json');
+  const pkg = require(pkgFile);
   if (!config.framework) {
-    const pkgFile = path.join(config.baseDir, 'package.json');
-    const pkg = require(pkgFile);
-    if (pkg.dependencies['egg-view-vue-ssr'] || pkg.dependencies[m.vue.pkg] || pkg.devDependencies[m.vue.pkg]) {
+    if (pkg.dependencies[m.vue.pkg] || pkg.devDependencies[m.vue.pkg]) {
       config.framework = 'vue';
-    } else if (pkg.dependencies['egg-view-react-ssr'] || pkg.dependencies[m.react.pkg] || pkg.devDependencies[m.react.pkg]) {
+    } else if (pkg.dependencies[m.react.pkg] || pkg.devDependencies[m.react.pkg]) {
       config.framework = 'react';
     } else if (config.template && (pkg.dependencies[m.html.pkg] || pkg.devDependencies[m.html.pkg])) {
       config.framework = 'html';
@@ -42,6 +41,11 @@ exports.getWebpackBuilder = config => {
       console.warn('webpack.config.js missing framework config');
     }
   }
+  if (!config.target) {
+    if (!pkg.dependencies['egg-view-vue-ssr'] && !pkg.dependencies['egg-view-react-ssr']){
+      config.target = 'web';
+    }
+  }
   const build = m[config.framework];
 
   let builder = utils.getInstallPackage(build.pkg, config.baseDir);