@mpxjs/webpack-plugin 2.7.58 → 2.7.60

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/selector.js

@@ -1,9 +1,15 @@
 const parseComponent = require('./parser')
 const parseRequest = require('./utils/parse-request')
+const tsWatchRunLoaderFilter = require('./utils/ts-loader-watch-run-loader-filter')
+const path = require('path')
 
 module.exports = function (content) {
   this.cacheable()
-
+  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/url-loader.js

@@ -3,24 +3,15 @@ const mime = require('mime')
 const parseRequest = require('./utils/parse-request')
 const getOptions = loaderUtils.getOptions
 
-function isStyleRequest (request) {
-  const { loaderString, queryObj } = parseRequest(request)
-  if (queryObj.type === 'styles') return true
-  if (/(css-loader|wxss\/loader)/.test(loaderString)) return true
-  return false
-}
-
 module.exports = function (src) {
   let transBase64 = false
   const options = Object.assign({}, getOptions(this))
   const { resourcePath, queryObj } = parseRequest(this.resource)
   const mimetype = options.mimetype || mime.getType(resourcePath)
-  const moduleGraph = this._compilation.moduleGraph
-  const issuer = moduleGraph.getIssuer(this._module)
   const publicPathScope = options.publicPathScope === 'all' ? 'all' : 'styleOnly'
   const limit = options.limit
   const useLocal = !limit || src.length < limit || queryObj.useLocal
-  const isStyle = (issuer && issuer.request && isStyleRequest(issuer.request)) || queryObj.isStyle
+  const isStyle = queryObj.isStyle
 
   if (isStyle) {
     if (options.publicPath) {

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/lib/wxss/plugins/postcss-url-parser.js

@@ -8,6 +8,8 @@ const {
   WEBPACK_IGNORE_COMMENT_REGEXP
 } = require('../utils')
 
+const addQuery = require('../../utils/add-query')
+
 const isUrlFunc = /url/i
 const isImageSetFunc = /^(?:-webkit-)?image-set$/i
 const needParseDeclaration = /(?:url|(?:-webkit-)?image-set)\(/i
@@ -402,13 +404,13 @@ const plugin = (options = {}) => {
             if (!importName) {
               importName = `___CSS_LOADER_URL_IMPORT_${urlToNameMap.size}___`
               urlToNameMap.set(newUrl, importName)
-
+              const finalUrl = addQuery(newUrl, { isStyle: true })
               options.imports.push({
                 type: 'url',
                 importName,
                 url: options.resolver
-                  ? options.urlHandler(newUrl)
-                  : JSON.stringify(newUrl),
+                  ? options.urlHandler(finalUrl)
+                  : JSON.stringify(finalUrl),
                 index
               })
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.7.58",
+  "version": "2.7.60",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -80,5 +80,5 @@
   "engines": {
     "node": ">=14.14.0"
   },
-  "gitHead": "bb48b5989cd2c89ba464ac1ee53529431d56fb33"
+  "gitHead": "72ac7dda91b406492c0f58eb64034cb5d0bd0fe2"
 }