feat: 路径支持配置

lib/loader.js

@@ -52,12 +52,13 @@ module.exports = function (content) {
   // for mp
   // 针对 entry 的 main.js 处理 page 和 app 的入口文件和配置等
   const mpOptions = loaderUtils.getOptions(this) || {}
+
   if (!mpPages.length) {
     const { entry = {}} = this.options
     Object.keys(entry).forEach(k => {
       mpInfo[entry[k]] = k
       if (k !== 'app') {
-        mpPages.push(`pages/${k}/${k}`)
+        mpPages.push(k)
       }
     })
   }

lib/mp-compiler/index.js

@@ -62,7 +62,7 @@ function createWxml (emitWarning, emitError, emitFile, resourcePath, rootCompone
 
   if (rootComponent) {
     const componentName = getCompNameBySrc(rootComponent)
-    wxmlContent = genPageWxml(componentName)
+    wxmlContent = genPageWxml(componentName, src)
     wxmlSrc = src
   } else {
     // TODO, 这儿传 options 进去
@@ -166,10 +166,10 @@ function compileMP (content, optioins) {
     }
 
     // 生成入口 js
-    emitFile(`${src}.js`, genScript(name, isPage))
+    emitFile(`${src}.js`, genScript(name, isPage, src))
 
     // 生成入口 wxss
-    emitFile(`${src}.wxss`, genStyle(name, isPage))
+    emitFile(`${src}.wxss`, genStyle(name, isPage, src))
 
     // 这儿应该异步在所有的模块都清晰后再生成
     // 生成入口 wxml

lib/mp-compiler/templates.js

@@ -1,20 +1,22 @@
-function genScript (name, isPage) {
-  const prefix = isPage ? '../..' : '.'
+const { getPathPrefix } = require('./util')
+
+function genScript (name, isPage, src) {
+  const prefix = isPage ? getPathPrefix(src) : './'
 
   return `
-  import '${prefix}/static/js/manifest'
-  import '${prefix}/static/js/vendor'
-  import '${prefix}/static/js/${name}'
+  import '${prefix}static/js/manifest'
+  import '${prefix}static/js/vendor'
+  import '${prefix}static/js/${name}'
   `
 }
 
-function genStyle (name, isPage) {
-  const prefix = isPage ? '../..' : '.'
-  return `@import "${prefix}/static/css/${name}.wxss";`
+function genStyle (name, isPage, src) {
+  const prefix = isPage ? getPathPrefix(src) : './'
+  return `@import "${prefix}static/css/${name}.wxss";`
 }
 
-function genPageWxml (templateName) {
-  return `<import src="../../components/${templateName}" /><template is="${templateName}" data="{{ ...$root['0'], $root }}"/>`
+function genPageWxml (templateName, src) {
+  return `<import src="${getPathPrefix(src)}components/${templateName}" /><template is="${templateName}" data="{{ ...$root['0'], $root }}"/>`
 }
 
 module.exports = { genScript, genStyle, genPageWxml }

lib/mp-compiler/util.js

@@ -38,7 +38,7 @@ function resolveTarget (dir, mpInfo = {}) {
   const isPage = pageType === 'page'
 
   // components 目录暂时无用
-  const src = isApp ? 'app' : isPage ? `pages/${name}/${name}` : `components/${name}`
+  const src = isApp ? 'app' : isPage ? name : `components/${name}`
 
   return { pageType, src, name, isApp, isPage }
 }
@@ -63,4 +63,18 @@ function getSlots (slotName) {
   return slotName ? slotsCache[slotName] : slotsCache
 }
 
-module.exports = { cacheFileInfo, getFileInfo, getCompNameBySrc, resolveTarget, covertCCVar, cacheSlots, getSlots }
+function getPathPrefix (src) {
+  const length = src.split('/').length - 1
+  return `${'../'.repeat(length)}`
+}
+
+module.exports = {
+  cacheFileInfo,
+  getFileInfo,
+  getCompNameBySrc,
+  resolveTarget,
+  covertCCVar,
+  cacheSlots,
+  getSlots,
+  getPathPrefix
+}