@mpxjs/webpack-plugin 2.7.59 → 2.7.62

package/lib/selector.js

@@ -1,7 +1,7 @@
 const parseComponent = require('./parser')
 const parseRequest = require('./utils/parse-request')
 const tsWatchRunLoaderFilter = require('./utils/ts-loader-watch-run-loader-filter')
-const path = require("path");
+const path = require('path')
 
 module.exports = function (content) {
   this.cacheable()

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/wxss/loader.js

@@ -234,18 +234,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/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.59",
+  "version": "2.7.62",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -80,5 +80,5 @@
   "engines": {
     "node": ">=14.14.0"
   },
-  "gitHead": "92ab578c176f5c4439f40d2eb045b01e95a98038"
+  "gitHead": "c90b20b6693ca07385fe131aea7f484c19ba3b8c"
 }