Merge pull request #3 from mpvue/develop

Develop

Author: anchengjian

lib/mp-compiler/index.js

@@ -2,6 +2,7 @@
 const compiler = require('mpvue-template-compiler')
 const htmlBeautify = require('js-beautify').html
 
+const path = require('path')
 const babel = require('babel-core')
 const { parseConfig, parseComponentsDeps } = require('./parse')
 const { genScript, genStyle, genPageWxml } = require('./templates')
@@ -91,7 +92,8 @@ function compileWxml (compiled, html) {
 // 针对 .vue 单文件的脚本逻辑的处理
 // 处理出当前单文件组件的子组件依赖
 function compileMPScript (script, optioins, moduleId) {
-  const { metadata } = babel.transform(script.content, { plugins: [parseComponentsDeps] })
+  const babelrc = optioins.globalBabelrc ? optioins.globalBabelrc : path.resolve('./.babelrc')
+  const { metadata } = babel.transform(script.content, { extends: babelrc, plugins: [parseComponentsDeps] })
 
   // metadata: importsMap, components
   const { importsMap, components: originComponents } = metadata
@@ -135,7 +137,9 @@ const startPageReg = /^\^/
 
 function compileMP (content, optioins) {
   const { resourcePath, emitError, emitFile, emitWarning, resolve, context } = this
-  const { metadata } = babel.transform(content, { plugins: [parseConfig] })
+
+  const babelrc = optioins.globalBabelrc ? optioins.globalBabelrc : path.resolve('./.babelrc')
+  const { metadata } = babel.transform(content, { extends: babelrc, plugins: [parseConfig] })
 
   // metadata: config
   const { config, rootComponent } = metadata

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mpvue-loader",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "mpvue single-file component loader for Webpack",
   "main": "index.js",
   "repository": {