@mpxjs/webpack-plugin 2.8.18 → 2.8.20

package/lib/script-setup-compiler/index.js

@@ -95,13 +95,19 @@ function compileScriptSetup (
     node,
     end
   ) {
-    throw new Error(
-      `[@mpxjs/webpack-plugin script-setup-compiler] ${msg}\n\n${filePath}\n${formatCodeFrame(
-        content,
-        node.start + startOffset,
-        end
-      )}`
-    )
+    if (node) {
+      throw new Error(
+        `[@mpxjs/webpack-plugin script-setup-compiler] ${msg}\n\n${filePath}\n${formatCodeFrame(
+          content,
+          node.start + startOffset,
+          end
+        )}`
+      )
+    } else {
+      throw new Error(
+        `[@mpxjs/webpack-plugin script-setup-compiler] ${msg}\n\n${filePath}\n`
+      )
+    }
   }
 
   function registerUserImport (
@@ -600,6 +606,11 @@ function compileScriptSetup (
     }
   }
 
+  // 添加defineExpose强制配置校验
+  if (!hasDefineExposeCall) {
+    error('Mpx script setup must define the variables for return using defineExpose, see details: https://mpxjs.cn/guide/composition-api/composition-api.html#defineexpose')
+  }
+
   // import {createComponent} from '@mpxjs/core' 添加是否已有import判断
   const ctor = getCtor(ctorType)
   _s.prependLeft(

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/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
@@ -404,13 +406,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.8.18",
+  "version": "2.8.20",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -82,5 +82,5 @@
   "engines": {
     "node": ">=14.14.0"
   },
-  "gitHead": "fd022afc8f403756de44c9eaab105a5a689e9b07"
+  "gitHead": "c330d3938cc0c37843761df8b1f2deb9b6c618fc"
 }