@mpxjs/webpack-plugin 2.8.28-beta.1 → 2.8.28

package/lib/dependencies/DynamicEntryDependency.js

@@ -28,10 +28,23 @@ class DynamicEntryDependency extends NullDependency {
     return toPosix([request, entryType, outputPath, packageRoot, relativePath, context, ...range].join('|'))
   }
 
+  collectDynamicRequest (mpx) {
+    if (!this.packageRoot) return
+    const curValue = mpx.dynamicEntryInfo[this.packageRoot] = mpx.dynamicEntryInfo[this.packageRoot] || {
+      hasPage: false,
+      entries: []
+    }
+    if (this.entryType === 'page') {
+      curValue.hasPage = true
+    } else {
+      curValue.entries.push(this.request)
+    }
+  }
+
   addEntry (compilation, callback) {
     const mpx = compilation.__mpx__
     let { request, entryType, outputPath, relativePath, context, originEntryNode, publicPath, resolver } = this
-
+    this.collectDynamicRequest(mpx)
     async.waterfall([
       (callback) => {
         if (context && resolver) {
@@ -43,13 +56,12 @@ class DynamicEntryDependency extends NullDependency {
         }
       },
       (resource, callback) => {
-        const { resourcePath } = parseRequest(resource)
-
         if (!outputPath) {
+          const { resourcePath } = parseRequest(resource)
           outputPath = mpx.getOutputPath(resourcePath, entryType)
         }
 
-        const { packageName, packageRoot, outputPath: filename, alreadyOutputted } = mpx.getPackageInfo({
+        const { packageRoot, outputPath: filename, alreadyOutputted } = mpx.getPackageInfo({
           resource,
           outputPath,
           resourceType: entryType,
@@ -76,13 +88,6 @@ class DynamicEntryDependency extends NullDependency {
 
         const key = [resource, filename].join('|')
 
-        mpx.collectDynamicEntryInfo({
-          resource,
-          packageName,
-          filename,
-          entryType
-        })
-
         if (alreadyOutputted) {
           const addEntryPromise = mpx.addEntryPromiseMap.get(key)
           if (addEntryPromise) {

package/lib/index.js

@@ -454,17 +454,17 @@ class MpxWebpackPlugin {
       stage: -1000
     }, (compilation, callback) => {
       processSubpackagesEntriesMap(compilation, () => {
-        const checkDynamicEntryInfo = () => {
-          for (const packageName in mpx.dynamicEntryInfo) {
-            const entryMap = mpx.dynamicEntryInfo[packageName]
-            if (packageName !== 'main' && !entryMap.hasPage) {
+        const checkRegisterPack = () => {
+          for (const packRoot in mpx.dynamicEntryInfo) {
+            const entryMap = mpx.dynamicEntryInfo[packRoot]
+            if (!entryMap.hasPage) {
               // 引用未注册分包的所有资源
-              const resources = entryMap.entries.map(info => info.resource).join(',')
-              compilation.errors.push(new Error(`资源${resources}通过分包异步声明为${packageName}分包, 但${packageName}分包未注册或不存在相关页面！`))
+              const strRequest = entryMap.entries.join(',')
+              compilation.errors.push(new Error(`资源${strRequest}目标是打入${packRoot}分包, 但是app.json中并未声明${packRoot}分包`))
             }
           }
         }
-        checkDynamicEntryInfo()
+        checkRegisterPack()
         callback()
       })
     })
@@ -524,6 +524,7 @@ class MpxWebpackPlugin {
       compilation.warnings = compilation.warnings.concat(warnings)
       compilation.errors = compilation.errors.concat(errors)
       const moduleGraph = compilation.moduleGraph
+      
       if (!compilation.__mpx__) {
         // init mpx
         mpx = compilation.__mpx__ = {
@@ -550,7 +551,7 @@ class MpxWebpackPlugin {
           subpackagesEntriesMap: {},
           replacePathMap: {},
           exportModules: new Set(),
-          // 记录动态添加入口的分包信息
+          // 动态记录注册的分包与注册页面映射
           dynamicEntryInfo: {},
           // 记录entryModule与entryNode的对应关系，用于体积分析
           entryNodeModulesMap: new Map(),
@@ -593,25 +594,13 @@ class MpxWebpackPlugin {
           removedChunks: [],
           forceProxyEventRules: this.options.forceProxyEventRules,
           enableAliRequireAsync: this.options.enableAliRequireAsync,
-          collectDynamicEntryInfo: ({ resource, packageName, filename, entryType }) => {
-            const curInfo = mpx.dynamicEntryInfo[packageName] = mpx.dynamicEntryInfo[packageName] || {
-              hasPage: false,
-              entries: []
-            }
-            if (entryType === 'page') curInfo.hasPage = true
-            curInfo.entries.push({
-              entryType,
-              resource,
-              filename
-            })
-          },
           pathHash: (resourcePath) => {
             if (this.options.pathHashMode === 'relative' && this.options.projectRoot) {
               return hash(path.relative(this.options.projectRoot, resourcePath))
             }
             return hash(resourcePath)
           },
-          addEntry: (request, name, callback) => {
+          addEntry (request, name, callback) {
             const dep = EntryPlugin.createDependency(request, { name })
             compilation.addEntry(compiler.context, dep, { name }, callback)
             return dep

package/lib/json-compiler/index.js

@@ -98,14 +98,7 @@ module.exports = function (content) {
                 if (err) return callback(err)
                 if (!this._compilation) return callback()
                 const targetPath = path.relative(context, file)
-                this._compilation.assets[targetPath] = {
-                  size: function size () {
-                    return stats.size
-                  },
-                  source: function source () {
-                    return content
-                  }
-                }
+                this.emitFile(targetPath, content)
                 callback()
               })
             }

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

@@ -1,4 +1,5 @@
-const { parseMustache } = require('../../../../template-compiler/compiler')
+const templateCompiler = require('../../../../template-compiler/compiler')
+const parseMustache = templateCompiler.parseMustache
 const normalize = require('../../../../utils/normalize')
 const TAG_NAME = 'component'
 

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

@@ -3,7 +3,9 @@ const JSON5 = require('json5')
 const getComponentConfigs = require('./component-config')
 const normalizeComponentRules = require('../normalize-component-rules')
 const isValidIdentifierStr = require('../../../utils/is-valid-identifier-str')
-const { parseMustacheWithContext, stringifyWithResolveComputed } = require('../../../template-compiler/compiler')
+const templateCompiler = require('../../../template-compiler/compiler')
+const parseMustache = templateCompiler.parseMustache
+const stringifyWithResolveComputed = templateCompiler.stringifyWithResolveComputed
 const normalize = require('../../../utils/normalize')
 
 module.exports = function getSpec ({ warn, error }) {
@@ -15,10 +17,10 @@ module.exports = function getSpec ({ warn, error }) {
     postProps: [
       {
         web ({ name, value }) {
-          const parsed = parseMustacheWithContext(value)
+          const parsed = parseMustache(value)
           if (parsed.hasBinding) {
             return {
-              name: name === 'animation' ? 'v-animation' : ':' + name,
+              name: name === 'animation' ? 'v-' + name : ':' + name,
               value: parsed.result
             }
           }
@@ -32,7 +34,7 @@ module.exports = function getSpec ({ warn, error }) {
         test: 'wx:for',
         swan (obj, data) {
           const attrsMap = data.el.attrsMap
-          const parsed = parseMustacheWithContext(obj.value)
+          const parsed = parseMustache(obj.value)
           let listName = parsed.result
           const el = data.el
 
@@ -46,7 +48,7 @@ module.exports = function getSpec ({ warn, error }) {
           }
 
           if (keyName) {
-            const parsed = parseMustacheWithContext(keyName)
+            const parsed = parseMustache(keyName)
             if (parsed.hasBinding) {
               // keyStr = ` trackBy ${parsed.result.slice(1, -1)}`
             } else if (keyName === '*this') {
@@ -76,7 +78,7 @@ module.exports = function getSpec ({ warn, error }) {
           }
         },
         web ({ value }, { el }) {
-          const parsed = parseMustacheWithContext(value)
+          const parsed = parseMustache(value)
           const attrsMap = el.attrsMap
           const itemName = attrsMap['wx:for-item'] || 'item'
           const indexName = attrsMap['wx:for-index'] || 'index'
@@ -189,15 +191,15 @@ module.exports = function getSpec ({ warn, error }) {
           const styleBinding = []
           el.isStyleParsed = true
           el.attrsList.forEach((item) => {
-            const parsed = parseMustacheWithContext(item.value)
+            const parsed = parseMustache(item.value)
             if (item.name === 'style') {
               if (parsed.hasBinding || parsed.result.indexOf('rpx') > -1) {
-                styleBinding.push(parseMustacheWithContext(item.value).result)
+                styleBinding.push(parseMustache(item.value).result)
               } else {
                 styleBinding.push(JSON.stringify(item.value))
               }
             } else if (item.name === 'wx:style') {
-              styleBinding.push(parseMustacheWithContext(item.value).result)
+              styleBinding.push(parseMustache(item.value).result)
             }
           })
           return {
@@ -210,7 +212,7 @@ module.exports = function getSpec ({ warn, error }) {
         // 样式类名绑定
         test: /^wx:(class)$/,
         web ({ value }) {
-          const parsed = parseMustacheWithContext(value)
+          const parsed = parseMustache(value)
           return {
             name: ':class',
             value: parsed.result
@@ -264,7 +266,7 @@ module.exports = function getSpec ({ warn, error }) {
         },
         web ({ name, value }) {
           let dir = this.test.exec(name)[1]
-          const parsed = parseMustacheWithContext(value)
+          const parsed = parseMustache(value)
           if (dir === 'elif') {
             dir = 'else-if'
           }

package/lib/template-compiler/compiler.js

@@ -967,7 +967,7 @@ function processComponentIs (el, options) {
 
   const is = getAndRemoveAttr(el, 'is').val
   if (is) {
-    el.is = parseMustacheWithContext(is).result
+    el.is = parseMustache(is).result
   } else {
     warn$1('<component> tag should have attrs[is].')
   }
@@ -979,7 +979,7 @@ function parseFuncStr2 (str) {
   const funcRE = /^([^()]+)(\((.*)\))?/
   const match = funcRE.exec(str)
   if (match) {
-    const funcName = parseMustacheWithContext(match[1]).result
+    const funcName = parseMustache(match[1]).result
     const hasArgs = !!match[2]
     let args = match[3] ? `,${match[3]}` : ''
     const ret = /(,|^)\s*(\$event)\s*(,|$)/.exec(args)
@@ -1163,9 +1163,19 @@ function wrapMustache (val) {
   return val && !tagRE.test(val) ? `{{${val}}}` : val
 }
 
-function parseMustacheWithContext (raw = '') {
-  return parseMustache(raw, (exp) => {
-    if (defs) {
+function parseMustache (raw = '') {
+  let replaced = false
+  if (tagRE.test(raw)) {
+    const ret = []
+    let lastLastIndex = 0
+    let match
+    while (match = tagREG.exec(raw)) {
+      const pre = raw.substring(lastLastIndex, match.index)
+      if (pre) {
+        ret.push(stringify(pre))
+      }
+      let exp = match[1]
+
       // eval处理的话，和别的判断条件，比如运行时的判断混用情况下得不到一个结果，还是正则替换
       const defKeys = Object.keys(defs)
       defKeys.forEach((defKey) => {
@@ -1173,70 +1183,42 @@ function parseMustacheWithContext (raw = '') {
         const defREG = new RegExp(`\\b${defKey}\\b`, 'g')
         if (defRE.test(exp)) {
           exp = exp.replace(defREG, stringify(defs[defKey]))
+          replaced = true
         }
       })
-    }
 
-    if (i18n) {
-      for (const i18nFuncName of i18nFuncNames) {
-        const funcNameRE = new RegExp(`(?<![A-Za-z0-9_$.])${i18nFuncName}\\(`)
-        const funcNameREG = new RegExp(`(?<![A-Za-z0-9_$.])${i18nFuncName}\\(`, 'g')
-        if (funcNameRE.test(exp)) {
-          if (i18n.useComputed || !i18nFuncName.startsWith('\\$')) {
-            const i18nInjectComputedKey = `_i${i18nInjectableComputed.length + 1}`
-            i18nInjectableComputed.push(`${i18nInjectComputedKey} () {\nreturn ${exp.trim()}}`)
-            exp = i18nInjectComputedKey
-          } else {
-            exp = exp.replace(funcNameREG, `${i18nModuleName}.$1(null, _l, _fl, `)
+      if (i18n) {
+        for (const i18nFuncName of i18nFuncNames) {
+          const funcNameRE = new RegExp(`(?<![A-Za-z0-9_$.])${i18nFuncName}\\(`)
+          const funcNameREG = new RegExp(`(?<![A-Za-z0-9_$.])${i18nFuncName}\\(`, 'g')
+          if (funcNameRE.test(exp)) {
+            if (i18n.useComputed || !i18nFuncName.startsWith('\\$')) {
+              const i18nInjectComputedKey = `_i${i18nInjectableComputed.length + 1}`
+              i18nInjectableComputed.push(`${i18nInjectComputedKey} () {\nreturn ${exp.trim()}}`)
+              exp = i18nInjectComputedKey
+            } else {
+              exp = exp.replace(funcNameREG, `${i18nModuleName}.$1(null, _l, _fl, `)
+            }
+            hasI18n = true
+            replaced = true
+            break
           }
-          hasI18n = true
-          break
         }
       }
-    }
-
-    return exp
-  })
-}
-
-function parseMustache (raw = '', expHandler = exp => exp, strHandler = str => str) {
-  let replaced = false
-  if (tagRE.test(raw)) {
-    const ret = []
-    let lastLastIndex = 0
-    let match
-    while (match = tagREG.exec(raw)) {
-      const pre = raw.substring(lastLastIndex, match.index)
-      if (pre) {
-        const pre2 = strHandler(pre)
-        if (pre2 !== pre) replaced = true
-        if (pre2) ret.push(stringify(pre2))
-      }
-
-      const exp = match[1].trim()
-      if (exp) {
-        const exp2 = expHandler(exp)
-        if (exp2 !== exp) replaced = true
-        if (exp2) ret.push(`(${exp2})`)
-      }
 
+      ret.push(`(${exp.trim()})`)
       lastLastIndex = tagREG.lastIndex
     }
-
     const post = raw.substring(lastLastIndex)
     if (post) {
-      const post2 = strHandler(post)
-      if (post2 !== post) replaced = true
-      if (post2) ret.push(stringify(post2))
+      ret.push(stringify(post))
     }
-
     let result
     if (ret.length === 1) {
       result = ret[0]
     } else {
       result = `(${ret.join('+')})`
     }
-
     return {
       result,
       hasBinding: true,
@@ -1244,14 +1226,10 @@ function parseMustache (raw = '', expHandler = exp => exp, strHandler = str => s
       replaced
     }
   }
-
-  const raw2 = strHandler(raw)
-  if (raw2 !== raw) replaced = true
-
   return {
-    result: stringify(raw2),
+    result: stringify(raw),
     hasBinding: false,
-    val: raw2,
+    val: raw,
     replaced
   }
 }
@@ -1269,14 +1247,14 @@ function processIf (el) {
   let val = getAndRemoveAttr(el, config[mode].directive.if).val
   if (val) {
     if (mode === 'swan') val = wrapMustache(val)
-    const parsed = parseMustacheWithContext(val)
+    const parsed = parseMustache(val)
     el.if = {
       raw: parsed.val,
       exp: parsed.result
     }
   } else if (val = getAndRemoveAttr(el, config[mode].directive.elseif).val) {
     if (mode === 'swan') val = wrapMustache(val)
-    const parsed = parseMustacheWithContext(val)
+    const parsed = parseMustache(val)
     el.elseif = {
       raw: parsed.val,
       exp: parsed.result
@@ -1318,7 +1296,7 @@ function processFor (el) {
       }
     } else {
       if (mode === 'swan') val = wrapMustache(val)
-      const parsed = parseMustacheWithContext(val)
+      const parsed = parseMustache(val)
       el.for = {
         raw: parsed.val,
         exp: parsed.result
@@ -1430,14 +1408,14 @@ function processAttrs (el, options) {
     const isTemplateData = el.tag === 'template' && attr.name === 'data'
     const needWrap = isTemplateData && mode !== 'swan'
     const value = needWrap ? `{${attr.value}}` : attr.value
-    const parsed = parseMustacheWithContext(value)
+    const parsed = parseMustache(value)
     if (parsed.hasBinding) {
       // 该属性判断用于提供给运行时对于计算属性作为props传递时提出警告
       const isProps = isComponentNode(el, options) && !(attr.name === 'class' || attr.name === 'style')
       addExp(el, parsed.result, isProps)
-      if (parsed.replaced) {
-        modifyAttr(el, attr.name, needWrap ? parsed.val.slice(1, -1) : parsed.val)
-      }
+    }
+    if (parsed.replaced) {
+      modifyAttr(el, attr.name, needWrap ? parsed.val.slice(1, -1) : parsed.val)
     }
   })
 }
@@ -1569,7 +1547,7 @@ function processText (el) {
   if (el.type !== 3 || el.isComment) {
     return
   }
-  const parsed = parseMustacheWithContext(el.text)
+  const parsed = parseMustache(el.text)
   if (parsed.hasBinding) {
     addExp(el, parsed.result)
   }
@@ -1614,8 +1592,8 @@ function processClass (el, meta) {
   let staticClass = getAndRemoveAttr(el, type).val || ''
   staticClass = staticClass.replace(/\s+/g, ' ')
   if (dynamicClass) {
-    const staticClassExp = parseMustacheWithContext(staticClass).result
-    const dynamicClassExp = transDynamicClassExpr(parseMustacheWithContext(dynamicClass).result, {
+    const staticClassExp = parseMustache(staticClass).result
+    const dynamicClassExp = transDynamicClassExpr(parseMustache(dynamicClass).result, {
       error: error$1
     })
     addAttrs(el, [{
@@ -1650,8 +1628,8 @@ function processStyle (el, meta) {
   let staticStyle = getAndRemoveAttr(el, type).val || ''
   staticStyle = staticStyle.replace(/\s+/g, ' ')
   if (dynamicStyle) {
-    const staticStyleExp = parseMustacheWithContext(staticStyle).result
-    const dynamicStyleExp = parseMustacheWithContext(dynamicStyle).result
+    const staticStyleExp = parseMustache(staticStyle).result
+    const dynamicStyleExp = parseMustache(dynamicStyle).result
     addAttrs(el, [{
       name: targetType,
       value: `{{${stringifyModuleName}.stringifyStyle(${staticStyleExp}, ${dynamicStyleExp})}}`
@@ -1892,7 +1870,7 @@ function processShow (el, options, root) {
   if (options.hasVirtualHost) {
     if (options.isComponent && el.parent === root && isRealNode(el)) {
       if (show !== undefined) {
-        show = `{{${parseMustacheWithContext(show).result}&&mpxShow}}`
+        show = `{{${parseMustache(show).result}&&mpxShow}}`
       } else {
         show = '{{mpxShow}}'
       }
@@ -1914,7 +1892,7 @@ function processShow (el, options, root) {
 
   function processShowStyle () {
     if (show !== undefined) {
-      const showExp = parseMustacheWithContext(show).result
+      const showExp = parseMustache(show).result
       let oldStyle = getAndRemoveAttr(el, 'style').val
       oldStyle = oldStyle ? oldStyle + ';' : ''
       addAttrs(el, [{
@@ -2398,7 +2376,6 @@ module.exports = {
   makeAttrsMap,
   stringifyAttr,
   parseMustache,
-  parseMustacheWithContext,
   stringifyWithResolveComputed,
   addAttrs
 }

package/lib/utils/fix-swan-relative.js

@@ -0,0 +1,6 @@
+module.exports = function (path) {
+  if (/^\.\./.test(path)) {
+    return './' + path
+  }
+  return path
+}

package/lib/wxss/loader.js

@@ -223,18 +223,18 @@ module.exports = async function loader (content, map, meta) {
     imports.unshift({
       type: 'api_import',
       importName: '___CSS_LOADER_API_IMPORT___',
-      url: stringifyRequest(this, require.resolve('./runtime/api'))
+      url: stringifyRequest(this, '!!' + require.resolve('./runtime/api'))
     })
 
     if (options.sourceMap) {
       imports.unshift({
         importName: '___CSS_LOADER_API_SOURCEMAP_IMPORT___',
-        url: stringifyRequest(this, require.resolve('./runtime/sourceMaps'))
+        url: stringifyRequest(this, '!!' + require.resolve('./runtime/sourceMaps'))
       })
     } else {
       imports.unshift({
         importName: '___CSS_LOADER_API_NO_SOURCEMAP_IMPORT___',
-        url: stringifyRequest(this, require.resolve('./runtime/noSourceMaps'))
+        url: stringifyRequest(this, '!!' + require.resolve('./runtime/noSourceMaps'))
       })
     }
   }

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.8.28-beta.1",
+  "version": "2.8.28",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
   ],
   "author": "donghongping",
-  "license": "Apache-2.0",
+  "license": "Apache",
   "main": "lib/index.js",
   "directories": {
     "lib": "lib"
@@ -20,13 +20,13 @@
     "@babel/parser": "^7.16.2",
     "@babel/traverse": "^7.16.0",
     "@babel/types": "^7.16.0",
-    "@better-scroll/core": "^2.2.1",
-    "@better-scroll/movable": "^2.2.1",
-    "@better-scroll/observe-dom": "^2.2.1",
-    "@better-scroll/pull-down": "^2.2.1",
-    "@better-scroll/slide": "^2.2.1",
-    "@better-scroll/wheel": "^2.2.1",
-    "@better-scroll/zoom": "^2.2.1",
+    "@better-scroll/core": "^2.5.1",
+    "@better-scroll/movable": "^2.5.1",
+    "@better-scroll/observe-dom": "^2.5.1",
+    "@better-scroll/pull-down": "^2.5.1",
+    "@better-scroll/slide": "^2.5.1",
+    "@better-scroll/wheel": "^2.5.1",
+    "@better-scroll/zoom": "^2.5.1",
     "acorn-walk": "^7.2.0",
     "async": "^2.6.0",
     "consolidate": "^0.15.1",
@@ -82,5 +82,5 @@
   "engines": {
     "node": ">=14.14.0"
   },
-  "gitHead": "07476d16af98cf988302ecb118fc4fb787a8873f"
+  "gitHead": "4dc994fc42216ce85f58801578134184a2c279c8"
 }