@mpxjs/webpack-plugin 2.8.16 → 2.8.18

package/lib/loader.js

@@ -18,15 +18,17 @@ const AppEntryDependency = require('./dependencies/AppEntryDependency')
 const RecordResourceMapDependency = require('./dependencies/RecordResourceMapDependency')
 const RecordVueContentDependency = require('./dependencies/RecordVueContentDependency')
 const CommonJsVariableDependency = require('./dependencies/CommonJsVariableDependency')
+const tsWatchRunLoaderFilter = require('./utils/ts-loader-watch-run-loader-filter')
 const { MPX_APP_MODULE_ID } = require('./utils/const')
 const path = require('path')
 
 module.exports = function (content) {
   this.cacheable()
 
-  // 兼容处理处理ts-loader中watch-run/updateFile逻辑，直接跳过当前loader及后续的vue-loader返回内容
-  if (path.extname(this.resourcePath) === '.ts') {
-    this.loaderIndex -= 2
+  // 兼容处理处理ts-loader中watch-run/updateFile逻辑，直接跳过当前loader及后续的loader返回内容
+  const pathExtname = path.extname(this.resourcePath)
+  if (!['.vue', '.mpx'].includes(pathExtname)) {
+    this.loaderIndex = tsWatchRunLoaderFilter(this.loaders, this.loaderIndex)
     return content
   }
 

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

@@ -1,6 +1,10 @@
 const runRules = require('../../run-rules')
 const normalizeTest = require('../normalize-test')
 const changeKey = require('../change-key')
+const normalize = require('../../../utils/normalize')
+
+const mpxViewPath = normalize.lib('runtime/components/ali/mpx-view.mpx')
+const mpxTextPath = normalize.lib('runtime/components/ali/mpx-text.mpx')
 
 module.exports = function getSpec ({ warn, error }) {
   function print (mode, path, isError) {
@@ -38,6 +42,30 @@ module.exports = function getSpec ({ warn, error }) {
     return input
   }
 
+  // 处理支付宝 componentPlaceholder 不支持 view、text 原生标签
+  function aliComponentPlaceholderFallback (input) {
+    const componentPlaceholder = input.componentPlaceholder
+    const usingComponents = input.usingComponents || (input.usingComponents = {})
+    for (const cph in componentPlaceholder) {
+      const cur = componentPlaceholder[cph]
+      const placeholderCompMatched = cur.match(/^(?:view|text)$/g)
+      if (!Array.isArray(placeholderCompMatched)) continue
+      let compName, compPath
+      switch (placeholderCompMatched[0]) {
+        case 'view':
+          compName = 'mpx-view'
+          compPath = mpxViewPath
+          break
+        case 'text':
+          compName = 'mpx-text'
+          compPath = mpxTextPath
+      }
+      usingComponents[compName] = compPath
+      componentPlaceholder[cph] = compName
+    }
+    return input
+  }
+
   const spec = {
     supportedModes: ['ali', 'swan', 'qq', 'tt', 'jd', 'qa', 'dd'],
     normalizeTest,
@@ -99,6 +127,10 @@ module.exports = function getSpec ({ warn, error }) {
         tt: deletePath(),
         jd: deletePath()
       },
+      {
+        test: 'componentPlaceholder',
+        ali: aliComponentPlaceholderFallback
+      },
       {
         ali: addGlobalComponents,
         swan: addGlobalComponents,
@@ -112,6 +144,10 @@ module.exports = function getSpec ({ warn, error }) {
         test: 'componentGenerics',
         ali: deletePath(true)
       },
+      {
+        test: 'componentPlaceholder',
+        ali: aliComponentPlaceholderFallback
+      },
       {
         ali: addGlobalComponents,
         swan: addGlobalComponents,

package/lib/runtime/components/ali/mpx-text.mpx

@@ -0,0 +1,3 @@
+<template>
+  <text><slot></slot></text>
+</template>

package/lib/runtime/components/ali/mpx-view.mpx

@@ -0,0 +1,3 @@
+<template>
+  <view><slot></slot></view>
+</template>

package/lib/selector.js

@@ -1,9 +1,16 @@
+const path = require('path')
 const parseComponent = require('./parser')
 const parseRequest = require('./utils/parse-request')
+const tsWatchRunLoaderFilter = require('./utils/ts-loader-watch-run-loader-filter')
 
 module.exports = function (content) {
   this.cacheable()
-
+  // 兼容处理处理ts-loader中watch-run/updateFile逻辑，直接跳过当前loader及后续的loader返回内容
+  const pathExtname = path.extname(this.resourcePath)
+  if (!['.vue', '.mpx'].includes(pathExtname)) {
+    this.loaderIndex = tsWatchRunLoaderFilter(this.loaders, this.loaderIndex)
+    return content
+  }
   // 移除mpx访问依赖，支持 thread-loader
   const { mode, env } = this.getOptions() || {}
   if (!mode && !env) {

package/lib/utils/get-entry-name.js

@@ -4,7 +4,7 @@ module.exports = function (loaderContext) {
   let entryName = ''
   for (const [name, { dependencies }] of loaderContext._compilation.entries) {
     const entryModule = moduleGraph.getModule(dependencies[0])
-    if (entryModule.resource === loaderContext.resource) {
+    if (entryModule && entryModule.resource === loaderContext.resource) {
       entryName = name
       break
     }

package/lib/utils/ts-loader-watch-run-loader-filter.js

@@ -0,0 +1,23 @@
+const normalize = require('./normalize')
+const selectorPath = normalize.lib('selector.js')
+const scriptSetupPath = normalize.lib('script-setup-compiler/index.js')
+const mpxLoaderPath = normalize.lib('loader.js')
+const { has } = require('./set')
+
+const tsLoaderWatchRunFilterLoaders = new Set([
+  selectorPath,
+  scriptSetupPath,
+  mpxLoaderPath,
+  'node_modules/vue-loader/lib/index.js'
+])
+
+module.exports = (loaders, loaderIndex) => {
+  for (let len = loaders.length; len > 0; --len) {
+    const currentLoader = loaders[len - 1]
+    if (!has(tsLoaderWatchRunFilterLoaders, filterLoaderPath => currentLoader.path.endsWith(filterLoaderPath))) {
+      break
+    }
+    loaderIndex--
+  }
+  return loaderIndex
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.8.16",
+  "version": "2.8.18",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -82,5 +82,5 @@
   "engines": {
     "node": ">=14.14.0"
   },
-  "gitHead": "79e2edd884ef6b27593952950f72343b98849bd7"
+  "gitHead": "fd022afc8f403756de44c9eaab105a5a689e9b07"
 }