Merge pull request #16 from mpvue/develop

Develop

Author: anchengjian

template/build/webpack.base.conf.js

@@ -3,30 +3,32 @@ var fs = require('fs')
 var utils = require('./utils')
 var config = require('../config')
 var vueLoaderConfig = require('./vue-loader.conf')
+var MpvuePlugin = require('webpack-mpvue-asset-plugin')
+var glob = require('glob')
 
 function resolve (dir) {
   return path.join(__dirname, '..', dir)
 }
 
-function getEntry (dir, entryFile) {
-  const files = fs.readdirSync(dir)
-  return files.reduce((res, k) => {
-    const page = path.resolve(dir, k, entryFile)
-    if (fs.existsSync(page)) {
-      res[k] = page
-    }
+function getEntry (rootSrc, pattern) {
+  var files = glob.sync(path.resolve(rootSrc, pattern))
+  return files.reduce((res, file) => {
+    var info = path.parse(file)
+    var key = info.dir.slice(rootSrc.length + 1) + '/' + info.name
+    res[key] = path.resolve(file)
     return res
   }, {})
 }
 
 const appEntry = { app: resolve('./src/main.js') }
-const pagesEntry = getEntry(resolve('./src/pages'), 'main.js')
+const pagesEntry = getEntry(resolve('./src'), 'pages/**/main.js')
 const entry = Object.assign({}, appEntry, pagesEntry)
 
 module.exports = {
-  entry: entry, // 如果要自定义生成的 dist 目录里面的文件路径，
-                // 可以将 entry 写成 {'toPath': 'fromPath'} 的形式，
-                // toPath 为相对于 dist 的路径, 例：index/demo，则生成的文件地址为 dist/index/demo.js
+  // 如果要自定义生成的 dist 目录里面的文件路径，
+  // 可以将 entry 写成 {'toPath': 'fromPath'} 的形式，
+  // toPath 为相对于 dist 的路径, 例：index/demo，则生成的文件地址为 dist/index/demo.js
+  entry,
   target: require('mpvue-webpack-target'),
   output: {
     path: config.build.assetsRoot,
@@ -102,5 +104,8 @@ module.exports = {
         }
       }
     ]
-  }
+  },
+  plugins: [
+    new MpvuePlugin()
+  ]
 }

template/build/webpack.dev.conf.js

@@ -60,7 +60,7 @@ module.exports = merge(baseWebpackConfig, {
           module.resource &&
           /\.js$/.test(module.resource) &&
           module.resource.indexOf('node_modules') >= 0
-        )
+        ) || count > 1
       }
     }),
     new webpack.optimize.CommonsChunkPlugin({

template/build/webpack.prod.conf.js

@@ -81,7 +81,7 @@ var webpackConfig = merge(baseWebpackConfig, {
           module.resource &&
           /\.js$/.test(module.resource) &&
           module.resource.indexOf('node_modules') >= 0
-        )
+        ) || count > 1
       }
     }),
     // extract webpack runtime and module manifest to its own file in order to

template/package.json

@@ -14,17 +14,18 @@
     "lint": "eslint --ext .js,.vue src{{#unit}} test/unit/specs{{/unit}}{{#e2e}} test/e2e/specs{{/e2e}}"{{/lint}}
   },
   "dependencies": {
-    "mpvue": "^1.0.5"{{#vuex}},
+    "mpvue": "^1.0.6"{{#vuex}},
     "vuex": "^2.3.1"{{/vuex}}
   },
   "devDependencies": {
-    "mpvue-loader": "^1.0.7",
+    "mpvue-loader": "^1.0.8",
     "mpvue-webpack-target": "^1.0.0",
-    "mpvue-template-compiler": "^1.0.5",
+    "mpvue-template-compiler": "^1.0.6",
     "postcss-mpvue-wxss": "^1.0.0",
     "px2rpx-loader": "^0.1.8",
-    "autoprefixer": "^7.1.2",
     "babel-core": "^6.22.1",
+    "glob": "^7.1.2",
+    "webpack-mpvue-asset-plugin": "^0.0.1",
     {{#lint}}
     "babel-eslint": "^7.1.1",
     {{/lint}}
@@ -89,15 +90,12 @@
     {{/e2e}}
     "semver": "^5.3.0",
     "shelljs": "^0.7.6",
-    "opn": "^5.1.0",
     "optimize-css-assets-webpack-plugin": "^2.0.0",
     "ora": "^1.2.0",
     "rimraf": "^2.6.0",
     "url-loader": "^0.5.8",
     "vue-style-loader": "^3.0.1",
     "webpack": "^2.6.1",
-    "webpack-dev-middleware": "^1.10.0",
-    "webpack-hot-middleware": "^2.18.0",
     "webpack-dev-middleware-hard-disk": "^1.10.0",
     "webpack-merge": "^4.1.0",
     "postcss-loader": "^2.0.6"

template/src/main.js

@@ -15,7 +15,7 @@ export default {
   // 这个字段走 app.json
   config: {
     // 页面前带有 ^ 符号的，会被编译成首页，其他页面可以选填，我们会自动把 webpack entry 里面的入口页面加进去
-    pages: ['pages/logs/logs', '^pages/index/index'],
+    pages: ['pages/logs/main', '^pages/index/main'],
     window: {
       backgroundTextStyle: 'light',
       navigationBarBackgroundColor: '#fff',

template/src/pages/counter/index.vue

@@ -6,7 +6,7 @@
       <button @click="decrement">-</button>
     </p>
 
-    <a href="/pages/index/index" class="home">去往首页</a>
+    <a href="/pages/index/main" class="home">去往首页</a>
   </div>
 </template>
 

template/src/pages/index/index.vue

@@ -13,13 +13,13 @@
         <card :text="motto"></card>
       </div>
     </div>
-      
+
     <form class="form-container">
       <input type="text" class="form-control" v-model="motto" placeholder="v-model" />
       <input type="text" class="form-control" v-model.lazy="motto" placeholder="v-model.lazy" />
     </form>
     {{#if vuex}}
-    <a href="/pages/counter/counter" class="counter">去往Vuex示例页面</a>
+    <a href="/pages/counter/main" class="counter">去往Vuex示例页面</a>
     {{/if}}
   </div>
 </template>
@@ -41,7 +41,7 @@ export default {
 
   methods: {
     bindViewTap{{#unless_eq lintConfig "airbnb"}} {{/unless_eq}}() {
-      const url = '../logs/logs'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
+      const url = '../logs/main'{{#if_eq lintConfig "airbnb"}};{{/if_eq}}
       wx.navigateTo({ url }){{#if_eq lintConfig "airbnb"}};{{/if_eq}}
     },
     getUserInfo{{#unless_eq lintConfig "airbnb"}} {{/unless_eq}}() {