merge develop

Author: aOrz

bin/mpvue-simple

@@ -5,6 +5,11 @@ upgradeLogger()
 
 var argv = require('yargs').argv;
 
+if (argv.version || argv.v) {
+  const { version } = require('../package.json')
+  return process.stdout.write(version)
+}
+
 if (argv.build) {
   require('../build/build.js')
 } else {

build/dev-server.js

@@ -13,7 +13,7 @@ var proxyMiddleware = require('http-proxy-middleware')
 var webpackConfig = require('./webpack.dev.conf')
 
 // default port where dev server listens for incoming traffic
-var port = process.env.PORT || config.dev.port
+var port = config.dev.port || 8080
 // automatically open browser, if not set will be false
 var autoOpenBrowser = !!config.dev.autoOpenBrowser
 // Define HTTP proxies to your custom API backend

config/argv.js

@@ -1,5 +1,8 @@
 var path = require('path')
 var fs = require('fs')
+var util = require('util')
+var resolve = require('resolve')
+var glob = require('glob')
 // const { NpmAutoInstallWebpackPlugin } = require('npm-auto-install-webpack-plugin')
 
 function saveEntryMain(index, src, mpType) {
@@ -22,34 +25,66 @@ export default {
   return fileSrc
 }
 
-function searchEntry(dir, config, entryName, mpType) {
-  if (!fs.existsSync(dir)) {
-    return
+function resolveEntry (src, cwd) {
+  try {
+    return resolve.sync(src, { basedir: cwd })
+  } catch (err) {
+    // console.log(err)
   }
+  return ''
+}
 
-  const files = fs.readdirSync(dir)
-  if (files.includes('main.js')) {
-    config.entry[entryName || path.basename(dir)] = path.resolve(dir, 'main.js')
-    return
+// 如果有 main.js 就不找 app.vue 了，免得混乱
+function searchEntry(pattern, entryName, cwd, config) {
+  const entryFiles = glob.sync(pattern, { cwd })
+  if (!entryFiles.length) {
+    return false
   }
 
-  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)
-    }
+  if (entryFiles.length === 1) {
+    const realSrc = path.resolve(cwd, entryFiles[0])
+    config.entry[getEntryName(realSrc, entryName)] = realSrc
+    return true
+  }
+
+  entryFiles.forEach((k, i) => {
+    const src = path.resolve(cwd, k)
+    config.entry[getEntryName(src)] = src
   })
+
+  return true
 }
 
+function getEntryName (src, pageName) {
+  if (pageName) {
+    return pageName
+  }
+  const { dir, name } = path.parse(src)
+  if (['app', 'App', 'main', 'index'].includes(name)) {
+    return path.parse(dir).name
+  }
+  return name
+}
+
+// 暂时只想到这么做缓存
 let argvOptions = null
-let searchPath = ['./', './src', './src/pages', './mpvue-pages']
-let searchFileFilter = [/.*?\.vue$/, /main\.js/]
 function injectArgvOptions (options) {
   argvOptions = options
 }
 
+// 默认优先为完整路径的单文件
+// 其次是 glob 格式扫描到的文件
+// 其次是 node.js 本地运行时传递的 object
+// 再次是一个路径下，默认扫描
+// 最后才是默认路径，默认扫描
+// component 针对所有扫描到的 .vue SFC entry 才有用
+// 有且只有一个 entry 的时候 pageName 才有效
 function mergeArgvConfig (config) {
   // 默认初始化
+  const cwd = path.resolve()
+  const defConfig = { entry: {}, resolve: { alias: {} } }
+  const floders = ['./src/', './mpvue-pages/']
+  const searchFilters = ['./**/**/main.js', './**/**/app.vue', './**/**/App.vue', './**/**/index.vue']
   config.argvConfig = {
     // plugins: [
     //   new NpmAutoInstallWebpackPlugin()
@@ -59,42 +94,47 @@ 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, ./src/, ./src/**/main.js, { page: './page/main.js' }, undefined
+    pageName: argvPageName,           // nameStrng, undefined
+    component: argvComponent,         // true, undefined
+    output: argvOutput,               // pathString, undefined
+    config: argvCnf,                  // pathString, undefined
     ...resetConfig
   } = argv
-  const defConfig = { entry: {}, resolve: { alias: {} } }
   const mpType = argvComponent ? 'component' : 'page'
 
-  if (typeof argvPageName === 'string') {
-    searchPath = searchPath.concat(argvPageName.split(','))
-  }
-
+  // 开始获取 entry
   if (typeof argvEntry === 'string') {
-    const entryPath = path.resolve(argvEntry)
-    if (typeof argvPageName === 'string') {
-      const entryName = argvPageName || path.parse(entryPath).name
-      defConfig.entry[entryName] = entryPath
-    } else if (fs.existsSync(entryPath)) {
-      defConfig.entry[path.parse(entryPath).name] = entryPath
+    // 首先判断是不是完整路径
+    const curEntry = resolveEntry(argvEntry, cwd)
+    // const absEntry = path.resolve(argvEntry)
+    if (curEntry) {
+      defConfig.entry[getEntryName(curEntry, argvPageName)] = curEntry
     } else {
-      searchEntry(entryPath, defConfig, argvPageName, mpType)
+      // 先检查是否是 glob 格式的 filter
+      // 再检查这是不是路径
+      if (!searchEntry(argvEntry, argvPageName, cwd, defConfig)) {
+        floders.unpop()
+      }
     }
+  } else if (util.isObject(argvEntry)) {
+    defConfig.entry = argvEntry
   } else {
-    searchPath.forEach(s => {
-      searchEntry(path.resolve(s), defConfig, argvPageName, mpType)
+    const allPattern = floders.reduce((r, floder) => {
+      return r.concat(searchFilters.map(v => path.join(floder, v)))
+    }, [])
+    allPattern.some(pattern => {
+      return searchEntry(pattern, argvPageName, cwd, defConfig)
     })
   }
 
+  // 输出文件夹
   if (argvOutput) {
     const assetsRoot = path.resolve(argvOutput)
     defConfig.assetsRoot = assetsRoot
   }
 
+  // 合并自定义 webpack config
   if (typeof argvCnf === 'string') {
     try {
       config.argvConfig = require('webpack-merge')(config.argvConfig, require(path.resolve(argvCnf)))
@@ -104,6 +144,19 @@ function mergeArgvConfig (config) {
   Object.assign(config.build, resetConfig, defConfig)
   Object.assign(config.dev, resetConfig, defConfig)
 
+  const allEntry = Object.keys(defConfig.entry)
+
+  if (!allEntry.length) {
+    throw Error('At least one entry is needed: http://mpvue.com/mpvue/simple/')
+  }
+
+  // 处理 component 和 .vue 的 entry
+  allEntry.forEach((v, i) => {
+    if (path.extname(v) === '.vue') {
+      defConfig.entry[v] = saveEntryMain(i, v, mpType)
+    }
+  })
+
   return config
 }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mpvue-simple",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "辅助 mpvue 快速开发 Page / Component 级小程序页面的工具",
   "main": "index.js",
   "bin": "bin/mpvue-simple",
@@ -11,15 +11,14 @@
     "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",
     "npm-auto-install-webpack-plugin": "^0.2.0",
     "yargs": "^11.0.0",
-    "autoprefixer": "^7.1.2",
     "babel-core": "^6.22.1",
     "babel-loader": "^7.1.1",
     "babel-plugin-transform-runtime": "^6.22.0",
@@ -38,7 +37,6 @@
     "friendly-errors-webpack-plugin": "^1.1.3",
     "html-webpack-plugin": "^2.28.0",
     "http-proxy-middleware": "^0.17.3",
-    "opn": "^5.1.0",
     "optimize-css-assets-webpack-plugin": "^2.0.0",
     "ora": "^1.2.0",
     "postcss-loader": "^2.0.6",
@@ -49,9 +47,7 @@
     "vue-style-loader": "^3.0.1",
     "webpack": "^2.6.1",
     "webpack-bundle-analyzer": "^2.2.1",
-    "webpack-dev-middleware": "^1.10.0",
     "webpack-dev-middleware-hard-disk": "^1.10.0",
-    "webpack-hot-middleware": "^2.18.0",
     "webpack-merge": "^4.1.0"
   },
   "engines": {