@mpxjs/webpack-plugin 2.7.52 → 2.8.0-beta.1

package/lib/config.js

@@ -13,7 +13,7 @@ module.exports = {
     },
     event: {
       parseEvent (attr) {
-        let match = /^(bind|catch|capture-bind|capture-catch):?(.*?)(?:\.(.*))?$/.exec(attr)
+        const match = /^(bind|catch|capture-bind|capture-catch):?(.*?)(?:\.(.*))?$/.exec(attr)
         if (match) {
           return {
             prefix: match[1],
@@ -29,8 +29,8 @@ module.exports = {
       defaultModelEvent: 'input',
       defaultModelValuePath: 'value',
       shallowStringify (obj) {
-        let arr = []
-        for (let key in obj) {
+        const arr = []
+        for (const key in obj) {
           let value = obj[key]
           if (Array.isArray(value)) {
             value = `[${value.join(',')}]`
@@ -83,7 +83,7 @@ module.exports = {
     },
     event: {
       parseEvent (attr) {
-        let match = /^(on|catch)([A-Z].*?)(?:\.(.*))?$/.exec(attr)
+        const match = /^(on|catch)([A-Z].*?)(?:\.(.*))?$/.exec(attr)
         if (match) {
           return {
             prefix: match[1],
@@ -103,8 +103,8 @@ module.exports = {
       defaultModelEvent: 'input',
       defaultModelValuePath: 'value',
       shallowStringify (obj) {
-        let arr = []
-        for (let key in obj) {
+        const arr = []
+        for (const key in obj) {
           let value = obj[key]
           if (Array.isArray(value)) {
             value = `[${value.join(',')}]`
@@ -155,7 +155,7 @@ module.exports = {
     },
     event: {
       parseEvent (attr) {
-        let match = /^(bind|catch|capture-bind|capture-catch):?(.*?)(?:\.(.*))?$/.exec(attr)
+        const match = /^(bind|catch|capture-bind|capture-catch):?(.*?)(?:\.(.*))?$/.exec(attr)
         if (match) {
           return {
             prefix: match[1],
@@ -171,8 +171,8 @@ module.exports = {
       defaultModelEvent: 'input',
       defaultModelValuePath: 'value',
       shallowStringify (obj) {
-        let arr = []
-        for (let key in obj) {
+        const arr = []
+        for (const key in obj) {
           let value = obj[key]
           if (Array.isArray(value)) {
             value = `[${value.join(',')}]`
@@ -222,7 +222,7 @@ module.exports = {
     },
     event: {
       parseEvent (attr) {
-        let match = /^(bind|catch|capture-bind|capture-catch):?(.*?)(?:\.(.*))?$/.exec(attr)
+        const match = /^(bind|catch|capture-bind|capture-catch):?(.*?)(?:\.(.*))?$/.exec(attr)
         if (match) {
           return {
             prefix: match[1],
@@ -238,8 +238,8 @@ module.exports = {
       defaultModelEvent: 'input',
       defaultModelValuePath: 'value',
       shallowStringify (obj) {
-        let arr = []
-        for (let key in obj) {
+        const arr = []
+        for (const key in obj) {
           let value = obj[key]
           if (Array.isArray(value)) {
             value = `[${value.join(',')}]`
@@ -289,7 +289,7 @@ module.exports = {
     },
     event: {
       parseEvent (attr) {
-        let match = /^(bind|catch|capture-bind|capture-catch):?(.*?)(?:\.(.*))?$/.exec(attr)
+        const match = /^(bind|catch|capture-bind|capture-catch):?(.*?)(?:\.(.*))?$/.exec(attr)
         if (match) {
           return {
             prefix: match[1],
@@ -305,8 +305,8 @@ module.exports = {
       defaultModelEvent: 'input',
       defaultModelValuePath: 'value',
       shallowStringify (obj) {
-        let arr = []
-        for (let key in obj) {
+        const arr = []
+        for (const key in obj) {
           let value = obj[key]
           if (Array.isArray(value)) {
             value = `[${value.join(',')}]`
@@ -370,7 +370,7 @@ module.exports = {
     },
     event: {
       parseEvent (attr) {
-        let match = /^(bind|catch|capture-bind|capture-catch):?(.*?)(?:\.(.*))?$/.exec(attr)
+        const match = /^(bind|catch|capture-bind|capture-catch):?(.*?)(?:\.(.*))?$/.exec(attr)
         if (match) {
           return {
             prefix: match[1],
@@ -386,8 +386,8 @@ module.exports = {
       defaultModelEvent: 'input',
       defaultModelValuePath: 'value',
       shallowStringify (obj) {
-        let arr = []
-        for (let key in obj) {
+        const arr = []
+        for (const key in obj) {
           let value = obj[key]
           if (Array.isArray(value)) {
             value = `[${value.join(',')}]`
@@ -437,7 +437,7 @@ module.exports = {
     },
     event: {
       parseEvent (attr) {
-        let match = /^(bind|catch|capture-bind|capture-catch):?(.*?)(?:\.(.*))?$/.exec(attr)
+        const match = /^(bind|catch|capture-bind|capture-catch):?(.*?)(?:\.(.*))?$/.exec(attr)
         if (match) {
           return {
             prefix: match[1],
@@ -453,8 +453,8 @@ module.exports = {
       defaultModelEvent: 'input',
       defaultModelValuePath: 'value',
       shallowStringify (obj) {
-        let arr = []
-        for (let key in obj) {
+        const arr = []
+        for (const key in obj) {
           let value = obj[key]
           if (Array.isArray(value)) {
             value = `[${value.join(',')}]`
@@ -504,7 +504,7 @@ module.exports = {
     },
     event: {
       parseEvent (attr) {
-        let match = /^(bind|catch|capture-bind|capture-catch):?(.*?)(?:\.(.*))?$/.exec(attr)
+        const match = /^(bind|catch|capture-bind|capture-catch):?(.*?)(?:\.(.*))?$/.exec(attr)
         if (match) {
           return {
             prefix: match[1],
@@ -520,8 +520,8 @@ module.exports = {
       defaultModelEvent: 'input',
       defaultModelValuePath: 'value',
       shallowStringify (obj) {
-        let arr = []
-        for (let key in obj) {
+        const arr = []
+        for (const key in obj) {
           let value = obj[key]
           if (Array.isArray(value)) {
             value = `[${value.join(',')}]`

package/lib/dependencies/CommonJsVariableDependency.js

@@ -50,7 +50,7 @@ CommonJsVariableDependency.Template = class CommonJsVariableDependencyTemplate e
     }
   ) {
     const importedModule = moduleGraph.getModule(dep)
-    let requireExpr = runtimeTemplate.moduleExports({
+    const requireExpr = runtimeTemplate.moduleExports({
       module: importedModule,
       chunkGraph,
       request: dep.request,

package/lib/dependencies/DynamicEntryDependency.js

@@ -73,13 +73,20 @@ class DynamicEntryDependency extends NullDependency {
           resource = addQuery(resource, { packageRoot }, true)
         }
 
-        const key = resource + filename
-        let addEntryPromise
+        const key = [resource, filename].join('|')
 
         if (alreadyOutputted) {
-          addEntryPromise = mpx.addEntryPromiseMap.get(key) || Promise.resolve()
+          const addEntryPromise = mpx.addEntryPromiseMap.get(key)
+          if (addEntryPromise) {
+            addEntryPromise.then(entryModule => {
+              // 构建entry依赖图，针对alreadyOutputted的entry也需要记录
+              originEntryNode.addChild(mpx.getEntryNode(entryModule, entryType))
+            })
+          }
+          // alreadyOutputted时直接返回，避免存在模块循环引用时死循环
+          return callback(null, { resultPath })
         } else {
-          addEntryPromise = new Promise((resolve, reject) => {
+          const addEntryPromise = new Promise((resolve, reject) => {
             mpx.addEntry(resource, filename, (err, entryModule) => {
               if (err) return reject(err)
               if (entryType === 'export') {
@@ -88,15 +95,15 @@ class DynamicEntryDependency extends NullDependency {
               resolve(entryModule)
             })
           })
+          addEntryPromise
+            .then(entryModule => {
+              originEntryNode.addChild(mpx.getEntryNode(entryModule, entryType))
+              callback(null, { resultPath })
+            })
+            .catch(err => callback(err))
+
           mpx.addEntryPromiseMap.set(key, addEntryPromise)
         }
-
-        addEntryPromise
-          .then(entryModule => {
-            if (entryModule) originEntryNode.addChild(mpx.getEntryNode(entryModule, entryType))
-            callback(null, { resultPath })
-          })
-          .catch(err => callback(err))
       }
     ], callback)
   }

package/lib/extractor.js

@@ -22,7 +22,7 @@ module.exports.pitch = async function (remainingRequest) {
 
   if (needBabel) {
     // 创建js request应用babel
-    let request = addQuery(this.request, {}, true, ['needBabel'])
+    const request = addQuery(this.request, {}, true, ['needBabel'])
     const fakeRequest = addQuery(`${resourcePath}.js`, queryObj)
     return `module.exports = require(${loaderUtils.stringifyRequest(this, `${fakeRequest}!=!${request}`)});\n`
   }

package/lib/helpers.js

@@ -1,6 +1,7 @@
 const loaderUtils = require('loader-utils')
 const normalize = require('./utils/normalize')
 const selectorPath = normalize.lib('selector')
+const scriptSetupPath = normalize.lib('script-setup-compiler/index')
 const addQuery = require('./utils/add-query')
 const parseRequest = require('./utils/parse-request')
 
@@ -68,7 +69,8 @@ module.exports = function createHelpers (loaderContext) {
       return loaderUtils.stringifyRequest(loaderContext, addQuery(src, options, true))
     } else {
       const fakeRequest = getFakeRequest(type, part)
-      const request = `${selectorPath}?mode=${mode}&env=${env}!${addQuery(rawRequest, options, true)}`
+      let request = `${selectorPath}?mode=${mode}&env=${env}!${addQuery(rawRequest, options, true)}`
+      if (part.setup && type === 'script') request = scriptSetupPath + '!' + request
       return loaderUtils.stringifyRequest(loaderContext, `${fakeRequest}!=!${request}`)
     }
   }

package/lib/index.js

@@ -17,6 +17,7 @@ const FileSystemInfo = require('webpack/lib/FileSystemInfo')
 const normalize = require('./utils/normalize')
 const toPosix = require('./utils/to-posix')
 const addQuery = require('./utils/add-query')
+const hasOwn = require('./utils/has-own')
 const { every } = require('./utils/set')
 const DefinePlugin = require('webpack/lib/DefinePlugin')
 const ExternalsPlugin = require('webpack/lib/ExternalsPlugin')
@@ -41,7 +42,7 @@ const PartialCompilePlugin = require('./partial-compile/index')
 const fixRelative = require('./utils/fix-relative')
 const parseRequest = require('./utils/parse-request')
 const { matchCondition } = require('./utils/match-condition')
-const { preProcessDefs } = require('./utils/index')
+const processDefs = require('./utils/process-defs')
 const config = require('./config')
 const hash = require('hash-sum')
 const wxssLoaderPath = normalize.lib('wxss/loader')
@@ -129,9 +130,9 @@ class MpxWebpackPlugin {
     }
     // 通过默认defs配置实现mode及srcMode的注入，简化内部处理逻辑
     options.defs = Object.assign({}, options.defs, {
-      '__mpx_mode__': options.mode,
-      '__mpx_src_mode__': options.srcMode,
-      '__mpx_env__': options.env
+      __mpx_mode__: options.mode,
+      __mpx_src_mode__: options.srcMode,
+      __mpx_env__: options.env
     })
     // 批量指定源码mode
     options.modeRules = options.modeRules || {}
@@ -318,8 +319,8 @@ class MpxWebpackPlugin {
       const optimization = compiler.options.optimization
       optimization.runtimeChunk = {
         name: (entrypoint) => {
-          for (let packageName in mpx.independentSubpackagesMap) {
-            if (mpx.independentSubpackagesMap.hasOwnProperty(packageName) && isChunkInPackage(entrypoint.name, packageName)) {
+          for (const packageName in mpx.independentSubpackagesMap) {
+            if (hasOwn(mpx.independentSubpackagesMap, packageName) && isChunkInPackage(entrypoint.name, packageName)) {
               return `${packageName}/bundle`
             }
           }
@@ -361,7 +362,7 @@ class MpxWebpackPlugin {
     const typeExtMap = config[this.options.mode].typeExtMap
 
     const defsOpt = {
-      '__mpx_wxs__': DefinePlugin.runtimeValue(({ module }) => {
+      __mpx_wxs__: DefinePlugin.runtimeValue(({ module }) => {
         return JSON.stringify(!!module.wxs)
       })
     }
@@ -564,7 +565,7 @@ class MpxWebpackPlugin {
           webConfig: this.options.webConfig,
           vueContentCache: new Map(),
           tabBarMap: {},
-          defs: preProcessDefs(this.options.defs),
+          defs: processDefs(this.options.defs),
           i18n: this.options.i18n,
           checkUsingComponents: this.options.checkUsingComponents,
           forceDisableBuiltInLoader: this.options.forceDisableBuiltInLoader,
@@ -644,7 +645,7 @@ class MpxWebpackPlugin {
               if (!currentResourceMap[resourcePath] || currentResourceMap[resourcePath] === true) {
                 if (!recordOnly) {
                   // 在非recordOnly的模式下，进行输出路径冲突检测，如果存在输出路径冲突，则对输出路径进行重命名
-                  for (let key in currentResourceMap) {
+                  for (const key in currentResourceMap) {
                     // todo 用outputPathMap来检测输出路径冲突
                     if (currentResourceMap[key] === outputPath && key !== resourcePath) {
                       outputPath = mpx.getOutputPath(resourcePath, resourceType, { conflictPath: outputPath })
@@ -860,7 +861,7 @@ class MpxWebpackPlugin {
         if (splitChunksPlugin) {
           let needInit = false
           Object.keys(mpx.componentsMap).forEach((packageName) => {
-            if (!splitChunksOptions.cacheGroups.hasOwnProperty(packageName)) {
+            if (!hasOwn(splitChunksOptions.cacheGroups, packageName)) {
               needInit = true
               splitChunksOptions.cacheGroups[packageName] = getPackageCacheGroup(packageName)
             }
@@ -1083,7 +1084,7 @@ class MpxWebpackPlugin {
             current.addPresentationalDependency(dep)
 
             let needInject = true
-            for (let dep of module.dependencies) {
+            for (const dep of module.dependencies) {
               if (dep instanceof CommonJsVariableDependency && dep.name === name) {
                 needInject = false
                 break
@@ -1213,14 +1214,14 @@ class MpxWebpackPlugin {
             return
           }
 
-          let originalSource = compilation.assets[chunkFile]
+          const originalSource = compilation.assets[chunkFile]
           const source = new ConcatSource()
           source.add(`\nvar ${globalObject} = ${globalObject} || {};\n\n`)
 
           relativeChunks.forEach((relativeChunk, index) => {
             const relativeChunkFile = relativeChunk.files.values().next().value
             if (!relativeChunkFile) return
-            let chunkPath = getTargetFile(chunkFile)
+            const chunkPath = getTargetFile(chunkFile)
             let relativePath = getTargetFile(relativeChunkFile)
             relativePath = path.relative(path.dirname(chunkPath), relativePath)
             relativePath = fixRelative(relativePath, mpx.mode)
@@ -1309,9 +1310,9 @@ try {
           }
 
           let runtimeChunk, entryChunk
-          let middleChunks = []
+          const middleChunks = []
 
-          let chunksLength = chunkGroup.chunks.length
+          const chunksLength = chunkGroup.chunks.length
 
           chunkGroup.chunks.forEach((chunk, index) => {
             if (index === 0) {
@@ -1342,8 +1343,8 @@ try {
     compiler.hooks.normalModuleFactory.tap('MpxWebpackPlugin', (normalModuleFactory) => {
       // resolve前修改原始request
       normalModuleFactory.hooks.beforeResolve.tap('MpxWebpackPlugin', (data) => {
-        let request = data.request
-        let { queryObj, resource } = parseRequest(request)
+        const request = data.request
+        const { queryObj, resource } = parseRequest(request)
         if (queryObj.resolve) {
           // 此处的query用于将资源引用的当前包信息传递给resolveDependency
           const resolveLoaderPath = normalize.lib('resolve-loader')
@@ -1365,7 +1366,7 @@ try {
           const extract = queryObj.extract
           switch (type) {
             case 'styles':
-            case 'template':
+            case 'template': {
               let insertBeforeIndex = -1
               const info = typeLoaderProcessInfo[type]
               loaders.forEach((loader, index) => {
@@ -1383,6 +1384,7 @@ try {
                 })
               }
               break
+            }
             case 'json':
               if (queryObj.isTheme) {
                 loaders.unshift({
@@ -1402,6 +1404,7 @@ try {
               loaders.unshift({
                 loader: wxsLoaderPath
               })
+              break
           }
           if (extract) {
             loaders.unshift({
@@ -1420,11 +1423,11 @@ try {
           let mpxStyleLoaderIndex = -1
           loaders.forEach((loader, index) => {
             const currentLoader = toPosix(loader.loader)
-            if (currentLoader.includes('css-loader') && cssLoaderIndex === -1) {
+            if (currentLoader.includes('css-loader')) {
               cssLoaderIndex = index
-            } else if (currentLoader.includes('vue-loader/lib/loaders/stylePostLoader') && vueStyleLoaderIndex === -1) {
+            } else if (currentLoader.includes('vue-loader/lib/loaders/stylePostLoader')) {
               vueStyleLoaderIndex = index
-            } else if (currentLoader.includes(styleCompilerPath) && mpxStyleLoaderIndex === -1) {
+            } else if (currentLoader.includes(styleCompilerPath)) {
               mpxStyleLoaderIndex = index
             }
           })

package/lib/json-compiler/helper.js

@@ -72,7 +72,7 @@ module.exports = function createJSONHelper ({ loaderContext, emitWarning, custom
               name = info.descriptionFileData.name.replace(/@/g, '')
             }
           }
-          let relative = path.relative(root, resourceName)
+          const relative = path.relative(root, resourceName)
           outputPath = path.join('components', name + pathHash(root), relative)
         } else {
           outputPath = getOutputPath(resourcePath, 'component')

package/lib/json-compiler/index.js

@@ -97,7 +97,7 @@ module.exports = function (content) {
               fs.readFile(file, (err, content) => {
                 if (err) return callback(err)
                 if (!this._compilation) return callback()
-                let targetPath = path.relative(context, file)
+                const targetPath = path.relative(context, file)
                 this._compilation.assets[targetPath] = {
                   size: function size () {
                     return stats.size
@@ -119,7 +119,7 @@ module.exports = function (content) {
     if (err) return nativeCallback(err)
     let output = `var json = ${JSON.stringify(json, null, 2)};\n`
     if (processOutput) output = processOutput(output)
-    output += `module.exports = JSON.stringify(json, null, 2);\n`
+    output += 'module.exports = JSON.stringify(json, null, 2);\n'
     nativeCallback(null, output)
   }
 
@@ -292,10 +292,10 @@ module.exports = function (content) {
               const context = path.dirname(result)
 
               if (content.pages) {
-                let tarRoot = queryObj.root
+                const tarRoot = queryObj.root
                 if (tarRoot) {
                   delete queryObj.root
-                  let subPackage = {
+                  const subPackage = {
                     tarRoot,
                     pages: content.pages,
                     ...queryObj
@@ -335,14 +335,14 @@ module.exports = function (content) {
     }
 
     const getOtherConfig = (config) => {
-      let result = {}
-      let blackListMap = {
+      const result = {}
+      const blackListMap = {
         tarRoot: true,
         srcRoot: true,
         root: true,
         pages: true
       }
-      for (let key in config) {
+      for (const key in config) {
         if (!blackListMap[key]) {
           result[key] = config[key]
         }
@@ -382,8 +382,8 @@ module.exports = function (content) {
           emitError(`Current subpackage root [${subPackage.root}] is not allow starts with '.'`)
           return callback()
         }
-        let tarRoot = subPackage.tarRoot || subPackage.root || ''
-        let srcRoot = subPackage.srcRoot || subPackage.root || ''
+        const tarRoot = subPackage.tarRoot || subPackage.root || ''
+        const srcRoot = subPackage.srcRoot || subPackage.root || ''
         if (!tarRoot || subPackagesCfg[tarRoot]) return callback()
 
         context = path.join(context, srcRoot)
@@ -423,10 +423,10 @@ module.exports = function (content) {
     }
 
     const processTabBar = (output) => {
-      let tabBarCfg = config[mode].tabBar
-      let itemKey = tabBarCfg.itemKey
-      let iconKey = tabBarCfg.iconKey
-      let activeIconKey = tabBarCfg.activeIconKey
+      const tabBarCfg = config[mode].tabBar
+      const itemKey = tabBarCfg.itemKey
+      const iconKey = tabBarCfg.iconKey
+      const activeIconKey = tabBarCfg.activeIconKey
 
       if (json.tabBar && json.tabBar[itemKey]) {
         json.tabBar[itemKey].forEach((item, index) => {
@@ -442,9 +442,9 @@ module.exports = function (content) {
     }
 
     const processOptionMenu = (output) => {
-      let optionMenuCfg = config[mode].optionMenu
+      const optionMenuCfg = config[mode].optionMenu
       if (optionMenuCfg && json.optionMenu) {
-        let iconKey = optionMenuCfg.iconKey
+        const iconKey = optionMenuCfg.iconKey
         if (json.optionMenu[iconKey] && isUrlRequest(json.optionMenu[iconKey])) {
           output += `json.optionMenu.${iconKey} = require("${addQuery(urlToRequest(json.optionMenu[iconKey]), { useLocal: true })}");\n`
         }
@@ -465,7 +465,7 @@ module.exports = function (content) {
 
     const processWorkers = (workers, context, callback) => {
       if (workers) {
-        let workersPath = path.join(context, workers)
+        const workersPath = path.join(context, workers)
         this.addContextDependency(workersPath)
         copydir(workersPath, context, callback)
       } else {
@@ -571,7 +571,7 @@ module.exports = function (content) {
       delete json.subpackages
       delete json.subPackages
       json.pages = localPages
-      for (let root in subPackagesCfg) {
+      for (const root in subPackagesCfg) {
         const subPackageCfg = subPackagesCfg[root]
         // 分包不存在 pages，输出 subPackages 字段会报错
         if (subPackageCfg.pages.length) {

package/lib/json-compiler/plugin.js

@@ -57,7 +57,7 @@ module.exports = function (source) {
     if (err) return nativeCallback(err)
     let output = `var pluginEntry = ${JSON.stringify(pluginEntry, null, 2)};\n`
     if (processOutput) output = processOutput(output)
-    output += `module.exports = JSON.stringify(pluginEntry, null, 2);\n`
+    output += 'module.exports = JSON.stringify(pluginEntry, null, 2);\n'
     nativeCallback(null, output)
   }
 
@@ -105,9 +105,10 @@ module.exports = function (source) {
         const item = publicPages[key]
         reversedMap[item] = key
       })
-      pages = pages.reduce((page, target, index) => {
+      pages = pages.reduce((target, page, index) => {
         const key = reversedMap[page] || `__private_page_${index}__`
         target[key] = page
+        return target
       }, {})
     }
 

package/lib/json-compiler/theme.js

@@ -28,6 +28,6 @@ module.exports = function (raw) {
     }
   })
 
-  output += `module.exports = JSON.stringify(json, null, 2);\n`
+  output += 'module.exports = JSON.stringify(json, null, 2);\n'
   return output
 }

package/lib/loader.js

@@ -105,7 +105,7 @@ module.exports = function (content) {
 
       if (parts.json && parts.json.content) {
         try {
-          let ret = JSON5.parse(parts.json.content)
+          const ret = JSON5.parse(parts.json.content)
           if (ret.usingComponents) {
             fixUsingComponent(ret.usingComponents, mode)
             usingComponents = usingComponents.concat(Object.keys(ret.usingComponents))
@@ -117,7 +117,6 @@ module.exports = function (content) {
           return callback(e)
         }
       }
-
       // 处理mode为web时输出vue格式文件
       if (mode === 'web') {
         if (ctorType === 'app' && !queryObj.isApp) {
@@ -330,7 +329,8 @@ module.exports = function (content) {
           ...script.src
             ? { ...queryObj, resourcePath }
             : null,
-          ctorType
+          ctorType,
+          lang: script.lang || 'js'
         }
         output += getRequire('script', script, extraOptions) + '\n'
       }

package/lib/native-loader.js

@@ -197,7 +197,7 @@ module.exports = function (content) {
         output += `global.currentSrcMode = ${JSON.stringify(srcMode)}\n`
       }
 
-      for (let type in typeResourceMap) {
+      for (const type in typeResourceMap) {
         output += `/* ${type} */\n${getRequireByType(type)}\n\n`
       }
 

package/lib/platform/json/normalize-test.js

@@ -1,3 +1,5 @@
+const hasOwn = require('../../utils/has-own')
+
 module.exports = function normalizeTest (test) {
   if (test) {
     return (input, meta) => {
@@ -5,7 +7,7 @@ module.exports = function normalizeTest (test) {
       meta.paths = []
       let result = false
       for (let i = 0; i < pathArr.length; i++) {
-        if (input.hasOwnProperty(pathArr[i])) {
+        if (hasOwn(input, pathArr[i])) {
           meta.paths.push(pathArr[i])
           result = true
         }

package/lib/platform/run-rules.js

@@ -1,7 +1,7 @@
 const type = require('../utils/type')
 
 function defaultNormalizeTest (rawTest, context) {
-  let testType = type(rawTest)
+  const testType = type(rawTest)
   switch (testType) {
     case 'Function':
       return rawTest.bind(context)
@@ -27,7 +27,7 @@ module.exports = function runRules (rules = [], input, options = {}) {
       mode
     })
     if (tester(testInput, meta) && processor) {
-      let result = processor.call(rule, input, data, meta)
+      const result = processor.call(rule, input, data, meta)
       meta.processed = true
       if (result !== undefined) {
         input = result

package/lib/platform/template/wx/component-config/camera.js

@@ -58,9 +58,9 @@ module.exports = function ({ print }) {
           prop.name = propsMap[prop.name]
           if (prop.name === 'framesize') {
             const valueMap = {
-              'small': 'low',
-              'medium': 'medium',
-              'large': 'high'
+              small: 'low',
+              medium: 'medium',
+              large: 'high'
             }
             prop.value = valueMap[prop.value]
           }

package/lib/platform/template/wx/component-config/canvas.js

@@ -35,11 +35,11 @@ module.exports = function ({ print }) {
         test: /^(touchstart|touchmove|touchend|touchcancel|longtap)$/,
         ali (eventName) {
           const eventMap = {
-            'touchstart': 'touchStart',
-            'touchmove': 'touchMove',
-            'touchend': 'touchEnd',
-            'touchcancel': 'touchCancel',
-            'longtap': 'longTap'
+            touchstart: 'touchStart',
+            touchmove: 'touchMove',
+            touchend: 'touchEnd',
+            touchcancel: 'touchCancel',
+            longtap: 'longTap'
           }
           return eventMap[eventName]
         }