enhance: entry 处理为可以批量监听多个

Author: anchengjian

config/argv.js

@@ -1,5 +1,7 @@
 var path = require('path')
 var fs = require('fs')
+var resolve = require('resolve')
+var glob = require('glob')
 // const { NpmAutoInstallWebpackPlugin } = require('npm-auto-install-webpack-plugin')
 
 function saveEntryMain(index, src, mpType) {
@@ -22,28 +24,34 @@ export default {
   return fileSrc
 }
 
+// 如果有 main.js 就不找 app.vue 了，免得混乱
 function searchEntry(dir, config, entryName, mpType) {
-  if (!fs.existsSync(dir)) {
+  let entryFiles = []
+  searchFilters.some(filter => {
+    entryFiles = glob.sync(filter, { cwd: dir })
+    return entryFiles.length
+  })
+
+  if (!entryFiles || !entryFiles.length) {
     return
   }
 
-  const files = fs.readdirSync(dir)
-  if (files.includes('main.js')) {
-    config.entry[entryName || path.basename(dir)] = path.resolve(dir, 'main.js')
+  if (entryFiles.length === 1) {
+    config.entry[entryName || path.basename(dir)] = path.resolve(dir, entryFiles[0])
     return
   }
 
-  files.forEach((k, i) => {
-    const page = path.resolve(dir, k)
-    if (fs.existsSync(page) && searchFileFilter.some(f => f.test(page))) {
-      config.entry[entryName || path.parse(page).name] = saveEntryMain(i, page, mpType)
-    }
+  entryFiles.forEach((k, i) => {
+    const src = path.resolve(dir, k)
+    const entryPath = path.extname(src) === '.vue' ? saveEntryMain(0, src, mpType) : src
+    config.entry[path.basename(dir)] = entryPath
   })
 }
 
 let argvOptions = null
 let searchPath = ['./', './src', './src/pages', './mpvue-pages']
-let searchFileFilter = [/.*?\.vue$/, /main\.js/]
+let searchFilters = ['**/**/main.js', '**/**/app.vue', '**/**/App.vue', '**/**/index.vue']
+
 function injectArgvOptions (options) {
   argvOptions = options
 }
@@ -59,12 +67,13 @@ function mergeArgvConfig (config) {
   // 拼接自定义的参数
   var argv = Object.assign({}, argvOptions, require('yargs').argv)
   const {
-    entry: argvEntry,
-    output: argvOutput,
-    config: argvCnf,
-    pageName: argvPageName,
-    searchPath: argvSearchPath,
-    component: argvComponent,
+    entry: argvEntry,                 // ./src/main.js, ./src/app.vue, undefined
+    output: argvOutput,               // pathString, undefined
+    pageName: argvPageName,           // nameStrng, undefined
+    component: argvComponent,         // true, undefined
+    searchPath: argvSearchPath,       // pathString, undefined
+    config: argvCnf,                  // pathString, undefined
+    searchFilters: argvSearchFilters,
     ...resetConfig
   } = argv
   const defConfig = { entry: {}, resolve: { alias: {} } }
@@ -74,8 +83,19 @@ function mergeArgvConfig (config) {
     searchPath = searchPath.concat(argvPageName.split(','))
   }
 
+  if (typeof argvSearchFilters === 'string') {
+    searchFilters = argvSearchFilters,split(',')
+  }
+
+  // 为什么这里面的逻辑这么凌乱呢？
+  // 可能是因为还没思考清楚吧
   if (typeof argvEntry === 'string') {
-    const entryPath = path.resolve(argvEntry)
+    let entryPath = resolve.sync(argvEntry, { basedir: path.resolve(), extensions: ['.js', '.vue'] })
+
+    if (path.extname(entryPath) === '.vue') {
+      entryPath = saveEntryMain(0, entryPath, mpType)
+    }
+
     if (typeof argvPageName === 'string') {
       const entryName = argvPageName || path.parse(entryPath).name
       defConfig.entry[entryName] = entryPath
@@ -104,6 +124,12 @@ function mergeArgvConfig (config) {
   Object.assign(config.build, resetConfig, defConfig)
   Object.assign(config.dev, resetConfig, defConfig)
 
+  console.log(defConfig)
+
+  if (!Object.keys(defConfig.entry).length) {
+    throw Error('At least one entry is needed: http://mpvue.com/mpvue/simple/')
+  }
+
   return config
 }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mpvue-simple",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "辅助 mpvue 快速开发 Page / Component 级小程序页面的工具",
   "main": "index.js",
   "bin": "bin/mpvue-simple",
@@ -11,9 +11,9 @@
     "build": "node build/build.js"
   },
   "dependencies": {
-    "mpvue": "^1.0.3",
-    "mpvue-loader": "^1.0.4",
-    "mpvue-template-compiler": "^1.0.3",
+    "mpvue": "^1.0.5",
+    "mpvue-loader": "^1.0.6",
+    "mpvue-template-compiler": "^1.0.5",
     "mpvue-webpack-target": "^1.0.0",
     "postcss-mpvue-wxss": "^1.0.0",
     "px2rpx-loader": "^0.1.8",