@mpxjs/webpack-plugin 2.6.114-alpha.6 → 2.6.114-alpha.7

package/lib/native-loader.js

@@ -1,39 +1,29 @@
 const path = require('path')
 const JSON5 = require('json5')
 const parseRequest = require('./utils/parse-request')
-const loaderUtils = require('loader-utils')
 const config = require('./config')
 const createHelpers = require('./helpers')
-const InjectDependency = require('./dependency/InjectDependency')
-const addQuery = require('./utils/add-query')
-const mpxJSON = require('./utils/mpx-json')
+const getJSONContent = require('./utils/get-json-content')
 const async = require('async')
-const matchCondition = require('./utils/match-condition')
+const { matchCondition } = require('./utils/match-condition')
 const fixUsingComponent = require('./utils/fix-using-component')
-const getMainCompilation = require('./utils/get-main-compilation')
+const { JSON_JS_EXT } = require('./utils/const')
 
 module.exports = function (content) {
   this.cacheable()
 
-  const mainCompilation = getMainCompilation(this._compilation)
-  const mpx = mainCompilation.__mpx__
+  const mpx = this.getMpx()
   if (!mpx) {
     return content
   }
 
   const nativeCallback = this.async()
-
   const loaderContext = this
   const isProduction = this.minimize || process.env.NODE_ENV === 'production'
-  const options = Object.assign({}, mpx.loaderOptions, loaderUtils.getOptions(this))
-
   const filePath = this.resourcePath
-
   const moduleId = 'm' + mpx.pathHash(filePath)
   const { resourcePath, queryObj } = parseRequest(this.resource)
-  const projectRoot = mpx.projectRoot
   const mode = mpx.mode
-  const defs = mpx.defs
   const globalSrcMode = mpx.srcMode
   const localSrcMode = queryObj.mode
   const packageName = queryObj.packageRoot || mpx.currentPackageRoot || 'main'
@@ -41,14 +31,12 @@ module.exports = function (content) {
   const componentsMap = mpx.componentsMap[packageName]
   const parsed = path.parse(resourcePath)
   const resourceName = path.join(parsed.dir, parsed.name)
-  const isApp = !pagesMap[resourcePath] && !componentsMap[resourcePath]
+  const isApp = !(pagesMap[resourcePath] || componentsMap[resourcePath])
   const srcMode = localSrcMode || globalSrcMode
-  const fs = this._compiler.inputFileSystem
   const typeExtMap = config[srcMode].typeExtMap
   const typeResourceMap = {}
   const autoScope = matchCondition(resourcePath, mpx.autoScopeRules)
 
-  const EXT_MPX_JSON = '.json.js'
   const CSS_LANG_EXT_MAP = {
     less: '.less',
     stylus: '.styl',
@@ -56,40 +44,18 @@ module.exports = function (content) {
     scss: '.scss'
   }
 
-  let useMPXJSON = false
+  let useJSONJS = false
   let cssLang = ''
   const hasScoped = (queryObj.scoped || autoScope) && mode === 'ali'
   const hasComment = false
   const isNative = true
 
-  const tryEvalMPXJSON = (callback) => {
-    const { rawResourcePath } = parseRequest(typeResourceMap['json'])
-    const _src = rawResourcePath
-    this.addDependency(_src)
-    fs.readFile(_src, (err, raw) => {
-      if (err) {
-        callback(err)
-      } else {
-        try {
-          const source = raw.toString('utf-8')
-          const text = mpxJSON.compileMPXJSONText({ source, defs, filePath: _src })
-          callback(null, text)
-        } catch (e) {
-          callback(e)
-        }
-      }
-    })
-  }
-
   const checkFileExists = (extName, callback) => {
-    this.resolve(parsed.dir, resourceName + extName, (err, result) => {
-      err = null
-      callback(err, result)
-    })
+    this.resolve(parsed.dir, resourceName + extName, callback)
   }
 
   function checkCSSLangFiles (callback) {
-    const langs = mpx.nativeOptions.cssLangs || ['less', 'stylus', 'scss', 'sass']
+    const langs = mpx.nativeConfig.cssLangs || ['less', 'stylus', 'scss', 'sass']
     const results = []
     async.eachOf(langs, function (lang, i, callback) {
       if (!CSS_LANG_EXT_MAP[lang]) {
@@ -99,7 +65,7 @@ module.exports = function (content) {
         if (!err && result) {
           results[i] = result
         }
-        callback(err)
+        callback()
       })
     }, function (err) {
       for (let i = 0; i < langs.length; i++) {
@@ -113,14 +79,13 @@ module.exports = function (content) {
     })
   }
 
-  function checkMPXJSONFile (callback) {
-    // checkFileExists(EXT_MPX_JSON, (err, result) => {
-    checkFileExists(EXT_MPX_JSON, (err, result) => {
+  function checkJSONJSFile (callback) {
+    checkFileExists(JSON_JS_EXT, (err, result) => {
       if (!err && result) {
         typeResourceMap.json = result
-        useMPXJSON = true
+        useJSONJS = true
       }
-      callback(err)
+      callback()
     })
   }
 
@@ -129,138 +94,111 @@ module.exports = function (content) {
     (callback) => {
       async.parallel([
         checkCSSLangFiles,
-        checkMPXJSONFile
+        checkJSONJSFile
       ], (err) => {
         callback(err)
       })
     },
     (callback) => {
       async.forEachOf(typeExtMap, (ext, key, callback) => {
-        // 检测到mpxJson或cssLang时跳过对应类型文件检测
-        if ((key === 'json' && useMPXJSON) || (key === 'styles' && cssLang)) {
+        // 检测到jsonjs或cssLang时跳过对应类型文件检测
+        if (typeResourceMap[key]) {
           return callback()
         }
         checkFileExists(ext, (err, result) => {
           if (!err && result) {
             typeResourceMap[key] = result
           }
-          callback(err)
+          callback()
         })
       }, callback)
     },
     (callback) => {
-      // 对原生写法增强json写法，可以用js来写json，尝试找.json.js文件，找不到用回json的内容
-      if (useMPXJSON) {
-        tryEvalMPXJSON(callback)
-      } else {
-        if (typeResourceMap['json']) {
-          // eslint-disable-next-line handle-callback-err
-          const { rawResourcePath } = parseRequest(typeResourceMap['json'])
-          fs.readFile(rawResourcePath, (err, raw) => {
-            if (err) {
-              callback(err)
-            } else {
-              callback(null, raw.toString('utf-8'))
-            }
-          })
-        } else {
-          callback(null, '{}')
-        }
-      }
+      getJSONContent({
+        src: typeResourceMap.json,
+        useJSONJS
+      }, this, callback)
     }, (content, callback) => {
-      let usingComponents = [].concat(Object.keys(mpx.usingComponents))
+      let json
       try {
-        let ret = JSON5.parse(content)
-        if (ret.usingComponents) {
-          fixUsingComponent(ret.usingComponents, mode)
-          usingComponents = usingComponents.concat(Object.keys(ret.usingComponents))
-        }
+        json = JSON5.parse(content)
       } catch (e) {
+        return callback(e)
+      }
+      let usingComponents = Object.keys(mpx.usingComponents)
+      if (json.usingComponents) {
+        fixUsingComponent(json.usingComponents, mode)
+        usingComponents = usingComponents.concat(Object.keys(json.usingComponents))
       }
       const {
-        getRequireForSrc,
-        getNamedExportsForSrc
-      } = createHelpers({
-        loaderContext,
-        options,
-        moduleId,
-        hasScoped,
-        hasComment,
-        usingComponents,
-        srcMode,
-        isNative,
-        projectRoot
-      })
-
-      const getRequire = (type) => {
-        const localQuery = Object.assign({}, queryObj)
-        let src = typeResourceMap[type]
-        localQuery.resourcePath = resourcePath
-        if (type !== 'script') {
-          this.addDependency(src)
-        }
-        if (type === 'template' && isApp) {
-          return ''
-        }
-        if (type === 'json' && !useMPXJSON) {
-          localQuery.__component = true
+        getRequire
+      } = createHelpers(loaderContext)
+
+      const getRequireByType = (type) => {
+        const src = typeResourceMap[type]
+        const part = { src }
+        const extraOptions = {
+          ...queryObj,
+          resourcePath
         }
-        src = addQuery(src, localQuery, true)
-        const partsOpts = { src }
 
-        if (type === 'script') {
-          return getNamedExportsForSrc(type, partsOpts)
+        switch (type) {
+          case 'template':
+            if (isApp) return ''
+            Object.assign(extraOptions, {
+              hasScoped,
+              hasComment,
+              isNative,
+              moduleId,
+              usingComponents
+            })
+            break
+          case 'styles':
+            if (cssLang) part.lang = cssLang
+            Object.assign(extraOptions, {
+              moduleId,
+              scoped: hasScoped
+            })
+            break
+          case 'json':
+            if (useJSONJS) part.useJSONJS = true
+            break
         }
-        if (type === 'styles') {
-          if (cssLang) {
-            partsOpts.lang = cssLang
-          }
-          if (hasScoped) {
-            return getRequireForSrc(type, partsOpts, 0, true)
-          }
-        }
-        return getRequireForSrc(type, partsOpts)
+        return getRequire(type, part, extraOptions)
       }
 
       // 注入模块id及资源路径
-      let globalInjectCode = `global.currentModuleId = ${JSON.stringify(moduleId)}\n`
+      let output = `global.currentModuleId = ${JSON.stringify(moduleId)}\n`
       if (!isProduction) {
-        globalInjectCode += `global.currentResource = ${JSON.stringify(filePath)}\n`
+        output += `global.currentResource = ${JSON.stringify(filePath)}\n`
       }
 
       // 注入构造函数
       let ctor = 'App'
+      let ctorType = 'app'
       if (pagesMap[resourcePath]) {
-        if (mpx.forceUsePageCtor || mode === 'ali') {
+        ctorType = 'page'
+        if (mpx.forceUsePageCtor || mode === 'ali' || mode === 'swan') {
           ctor = 'Page'
         } else {
           ctor = 'Component'
         }
       } else if (componentsMap[resourcePath]) {
         ctor = 'Component'
+        ctorType = 'component'
       }
-      globalInjectCode += `global.currentCtor = ${ctor}\n`
-      globalInjectCode += `global.currentCtorType = ${JSON.stringify(ctor.replace(/^./, (match) => {
+      output += `global.currentCtor = ${ctor}\n`
+      output += `global.currentCtorType = ${JSON.stringify(ctor.replace(/^./, (match) => {
         return match.toLowerCase()
       }))}\n`
+      output += `global.currentResourceType = ${JSON.stringify(ctorType)}\n`
 
       if (srcMode) {
-        globalInjectCode += `global.currentSrcMode = ${JSON.stringify(srcMode)}\n`
+        output += `global.currentSrcMode = ${JSON.stringify(srcMode)}\n`
       }
 
-      if (!mpx.forceDisableInject) {
-        const dep = new InjectDependency({
-          content: globalInjectCode,
-          index: -3
-        })
-        this._module.addDependency(dep)
-      }
-
-      // 触发webpack global var 注入
-      let output = 'global.currentModuleId;\n'
-
       for (let type in typeResourceMap) {
-        output += `/* ${type} */\n${getRequire(type)}\n\n`
+        output += `/* ${type} */\n${getRequireByType(type)}\n\n`
       }
 
       callback(null, output)

package/lib/parser.js

@@ -6,7 +6,7 @@ const SourceMapGenerator = require('source-map').SourceMapGenerator
 const splitRE = /\r?\n/g
 const emptyRE = /^(?:\/\/)?\s*$/
 
-module.exports = (content, { filePath, needMap, mode, defs, env }) => {
+module.exports = (content, { filePath, needMap, mode, env }) => {
   // 缓存需要mode隔离，不同mode经过区块条件编译parseComponent得到的内容并不一致
   const cacheKey = hash(filePath + content + mode + env)
 
@@ -14,7 +14,6 @@ module.exports = (content, { filePath, needMap, mode, defs, env }) => {
   if (output) return JSON.parse(output)
   output = compiler.parseComponent(content, {
     mode,
-    defs,
     filePath,
     pad: 'line',
     env

package/lib/partial-compile/index.js

@@ -0,0 +1,35 @@
+const { matchCondition } = require('../utils/match-condition')
+const { parseQuery } = require('loader-utils')
+
+class MpxPartialCompilePlugin {
+  constructor (condition) {
+    this.condition = condition
+  }
+
+  isResolvingPage (obj) {
+    // valid query should start with '?'
+    const query = obj.query || '?'
+    return parseQuery(query).isPage
+  }
+
+  apply (compiler) {
+    compiler.resolverFactory.hooks.resolver.intercept({
+      factory: (type, hook) => {
+        hook.tap('MpxPartialCompilePlugin', (resolver) => {
+          resolver.hooks.result.tapAsync({
+            name: 'MpxPartialCompilePlugin',
+            stage: -100
+          }, (obj, resolverContext, callback) => {
+            if (this.isResolvingPage(obj) && !matchCondition(obj.path, this.condition)) {
+              obj.path = false
+            }
+            callback(null, obj)
+          })
+        })
+        return hook
+      }
+    })
+  }
+}
+
+module.exports = MpxPartialCompilePlugin

package/lib/platform/json/wx/index.js

@@ -246,7 +246,7 @@ module.exports = function getSpec ({ warn, error }) {
         jd: deletePath()
       },
       {
-        test: 'navigateToMiniProgramAppIdList|networkTimeout|permission',
+        test: 'navigateToMiniProgramAppIdList|networkTimeout',
         ali: deletePath(),
         jd: deletePath()
       },

package/lib/platform/template/normalize-component-rules.js

@@ -4,7 +4,7 @@ const runRules = require('../run-rules')
  * @desc 针对每一个组件(属性，event，指令等)执行规则判断
  * @params cfgs [{test: 'camera', props:[], event: []}] 组件配置列表
  * @params spec ../index.js中公共的spec
-*/
+ */
 module.exports = function normalizeComponentRules (cfgs, spec) {
   return cfgs.map((cfg) => {
     const result = {}
@@ -25,9 +25,8 @@ module.exports = function normalizeComponentRules (cfgs, spec) {
           data
         }
         el.attrsList.forEach((attr) => {
-          let rAttr = runRules(spec.preAttrs, attr, options)
           const meta = {}
-          rAttr = runRules(spec.directive, rAttr, {
+          let rAttr = runRules(spec.directive, attr, {
             ...options,
             meta
           })

package/lib/platform/template/wx/index.js

@@ -265,14 +265,40 @@ module.exports = function getSpec ({ warn, error }) {
           }
         }
       },
+      {
+        // style样式绑定
+        test: /^(style|wx:style)$/,
+        web ({ value }, { el }) {
+          if (el.isStyleParsed) {
+            return false
+          }
+          let styleBinding = []
+          el.isStyleParsed = true
+          el.attrsList.map((item, index) => {
+            const parsed = parseMustache(item.value)
+            if (item.name === 'style') {
+              if (parsed.hasBinding || parsed.result.indexOf('rpx') > -1) {
+                styleBinding.push(parseMustache(item.value).result)
+              } else {
+                styleBinding.push(JSON.stringify(item.value))
+              }
+            } else if (item.name === 'wx:style') {
+              styleBinding.push(parseMustache(item.value).result)
+            }
+          })
+          return {
+            name: ':style',
+            value: `[${styleBinding}] | transRpxStyle`
+          }
+        }
+      },
       {
         // 样式类名绑定
-        test: /^wx:(class|style)$/,
-        web ({ name, value }) {
-          const dir = this.test.exec(name)[1]
+        test: /^wx:(class)$/,
+        web ({ value }) {
           const parsed = parseMustache(value)
           return {
-            name: ':' + dir,
+            name: ':class',
             value: parsed.result
           }
         },

package/lib/record-loader.js

@@ -0,0 +1,11 @@
+const parseRequest = require('./utils/parse-request')
+const RecordResourceMapDependency = require('./dependencies/RecordResourceMapDependency')
+
+module.exports = function (source) {
+  const mpx = this.getMpx()
+  const { resourcePath, queryObj } = parseRequest(this.resource)
+  const file = mpx.getExtractedFile(this.resource)
+  const packageRoot = queryObj.packageRoot || ''
+  this._module.addPresentationalDependency(new RecordResourceMapDependency(resourcePath, 'staticResource', file, packageRoot))
+  return source
+}

package/lib/resolver/AddEnvPlugin.js

@@ -2,7 +2,8 @@ const path = require('path')
 const stringifyQuery = require('../utils/stringify-query')
 const parseQuery = require('loader-utils').parseQuery
 const addInfix = require('../utils/add-infix')
-const matchCondition = require('../utils/match-condition')
+const { matchCondition } = require('../utils/match-condition')
+const { JSON_JS_EXT } = require('../utils/const')
 
 module.exports = class AddEnvPlugin {
   constructor (source, env, fileConditionRules, target) {
@@ -24,8 +25,8 @@ module.exports = class AddEnvPlugin {
       }
       const resourcePath = request.path
       let extname = ''
-      if (resourcePath.endsWith('.json.js')) {
-        extname = '.json.js'
+      if (resourcePath.endsWith(JSON_JS_EXT)) {
+        extname = JSON_JS_EXT
       } else {
         extname = path.extname(resourcePath)
       }

package/lib/resolver/AddModePlugin.js

@@ -1,8 +1,9 @@
 const path = require('path')
 const stringifyQuery = require('../utils/stringify-query')
 const parseQuery = require('loader-utils').parseQuery
-const matchCondition = require('../utils/match-condition')
+const { matchCondition } = require('../utils/match-condition')
 const addInfix = require('../utils/add-infix')
+const { JSON_JS_EXT } = require('../utils/const')
 
 module.exports = class AddModePlugin {
   constructor (source, mode, fileConditionRules, target) {
@@ -24,8 +25,8 @@ module.exports = class AddModePlugin {
       }
       const resourcePath = request.path
       let extname = ''
-      if (resourcePath.endsWith('.json.js')) {
-        extname = '.json.js'
+      if (resourcePath.endsWith(JSON_JS_EXT)) {
+        extname = JSON_JS_EXT
       } else {
         extname = path.extname(resourcePath)
       }

package/lib/resolver/FixDescriptionInfoPlugin.js

@@ -0,0 +1,28 @@
+const path = require('path')
+
+module.exports = class FixDescriptionInfoPlugin {
+  apply (resolver) {
+    resolver.hooks.result.tap('FixDescriptionInfoPlugin', (request) => {
+      const { path: resourcePath } = request
+      const segments = resourcePath.split(path.sep)
+      let rootIndex = -1
+      for (let i = segments.length - 1; i >= 0; i--) {
+        const segment = segments[i]
+        if (segment === 'node_modules') {
+          rootIndex = segments[i + 1].startsWith('@') ? i + 2 : i + 1
+          break
+        }
+      }
+      if (rootIndex !== -1) {
+        const descriptionFileRoot = segments.slice(0, rootIndex + 1).join(path.sep)
+        const descriptionFilePath = path.join(descriptionFileRoot, 'package.json')
+        if (descriptionFilePath !== request.descriptionFilePath) {
+          Object.assign(request, {
+            descriptionFileRoot,
+            descriptionFilePath
+          })
+        }
+      }
+    })
+  }
+}

package/lib/resolver/PackageEntryPlugin.js

@@ -1,55 +1,42 @@
 const path = require('path')
-/**
- * @desc 获取小程序npm包资源入口目录
- */
-const getEntry = (name, miniprogram) => {
-  return path.join(name, miniprogram)
-}
+const toPosix = require('../utils/to-posix')
 
 module.exports = class PackageEntryPlugin {
-  constructor (source, miniNpmPackage, target) {
+  constructor (source, miniNpmPackages, target) {
     this.source = source
     this.target = target
-    this.miniNpmPackage = miniNpmPackage
+    this.miniNpmPackages = miniNpmPackages
   }
 
   /**
    * 判断是否需要更改innerRequest
    * 小程序发布npm包约束: package.json配置miniprogram 或默认 miniprogram_dist目录
-   * 0. 前提: request中含有package.json中name字段
    * 1. package.json中配置了miniprogram, 且request中不含miniprogram，尝试拼接
-   * 2. 用户配置miniNpmPackage说明是小程序npm包，如果package.json中没配置miniprogram字段，则尝试拼接默认miniprogram_dist目录
+   * 2. 用户配置miniNpmPackages说明是小程序npm包，如果package.json中没配置miniprogram字段，则尝试拼接默认miniprogram_dist目录
    */
   apply (resolver) {
     const target = resolver.ensureHook(this.target)
-    resolver.getHook(this.source).tapAsync('PackagePlugin', (request, resolveContext, callback) => {
-      const innerRequest = request.request || request.path
-      if (!innerRequest || request.miniprogram) return callback()
+    resolver.getHook(this.source).tapAsync('PackageEntryPlugin', (request, resolveContext, callback) => {
+      if (request.miniprogram) return callback()
+      let { path: resourcePath, descriptionFileData, descriptionFileRoot } = request
+      if (request.miniprogram || !descriptionFileData) return callback()
+
+      let { name, miniprogram } = descriptionFileData
+      if (!miniprogram && this.miniNpmPackages.includes(name)) miniprogram = 'miniprogram_dist'
+      if (!miniprogram) return callback()
+
+      let relativePath = path.relative(descriptionFileRoot, resourcePath)
+      if (relativePath.startsWith(miniprogram)) return callback()
+
+      relativePath = path.join(miniprogram, relativePath)
 
-      const descriptionFileData = request.descriptionFileData || {}
-      const { name = '', miniprogram } = descriptionFileData
-      let newEntry = ''
-      // request.path和系统环境有关：windows和linux
-      let normalizedName = path.normalize(name)
-      if (innerRequest.indexOf(normalizedName) === -1) {
-        return callback()
-      }
-      if (miniprogram) {
-        newEntry = getEntry(normalizedName, miniprogram)
-      } else if (this.miniNpmPackage.includes(name)) {
-        newEntry = getEntry(normalizedName, 'miniprogram_dist')
-      }
+      const obj = Object.assign({}, request, {
+        path: path.join(descriptionFileRoot, relativePath),
+        relativePath: './' + toPosix(relativePath),
+        miniprogram: true
+      })
 
-      if (newEntry) {
-        const newRequest = innerRequest.replace(normalizedName, newEntry)
-        const obj = Object.assign({}, request, {
-          request: newRequest,
-          miniprogram: true
-        })
-        resolver.doResolve(target, obj, `change request ${innerRequest} to :` + newRequest, resolveContext, callback)
-      } else {
-        callback()
-      }
+      resolver.doResolve(target, obj, 'add miniprogram dist: ' + miniprogram, resolveContext, callback)
     })
   }
 }

package/lib/runtime/base.styl

@@ -120,3 +120,8 @@ html, body, .app {
   font-family "weui"
   src url('data:application/octet-stream;base64,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') format('truetype')
 }
+
+.mpx-root-view {
+  display: inline
+  line-height: normal
+}