@mpxjs/webpack-plugin 2.7.57 → 2.7.59

package/lib/index.js

@@ -58,6 +58,7 @@ const stringifyLoadersAndResource = require('./utils/stringify-loaders-resource'
 const emitFile = require('./utils/emit-file')
 const { MPX_PROCESSED_FLAG, MPX_DISABLE_EXTRACTOR_CACHE } = require('./utils/const')
 const isEmptyObject = require('./utils/is-empty-object')
+require('./utils/check-core-version-match')
 
 const isProductionLikeMode = options => {
   return options.mode === 'production' || !options.mode

package/lib/json-compiler/index.js

@@ -119,7 +119,8 @@ module.exports = function (content) {
     if (err) return nativeCallback(err)
     let output = `var json = ${JSON.stringify(json, null, 2)};\n`
     if (processOutput) output = processOutput(output)
-    output += `module.exports = JSON.stringify(json, null, 2);\n`
+    const jsonSpace = this.minimize ? 0 : 2
+    output += `module.exports = JSON.stringify(json, null, ${jsonSpace});\n`
     nativeCallback(null, output)
   }
 

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/utils/check-core-version-match.js

@@ -0,0 +1,18 @@
+// @mpxjs/webpack-plugin 2.7.x -> @mpxjs/core 2.7.x
+// @mpxjs/webpack-plugin 2.8.x -> @mpxjs/core 2.8.x
+const coreVersion = require('@mpxjs/core/package.json').version
+const packageName = require('../../package.json').name
+const packageVersion = require('../../package.json').version
+
+if (packageVersion.slice(0, 3) !== coreVersion.slice(0, 3)) {
+  const corePath = require.resolve('@mpxjs/core')
+  const packagePath = require.resolve('../../package.json')
+  throw new Error(
+    `@mpxjs/core packages version mismatch:
+    -@mpxjs/core@${coreVersion}(${corePath})
+    -${packageName}@${packageVersion}(${packagePath})
+    This may cause things to work incorrectly, Make sure to use the same minor version for both.
+    For example: @mpxjs/core@2.7.x with @mpxjs/webpack-plugin@2.7.x
+    `
+  )
+}

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

@@ -144,6 +144,20 @@ module.exports = async function loader (content, map, meta) {
     )
   }
 
+  if (this.minimize) {
+    const cssnano = require('cssnano')
+    const minimizeOptions = rawOptions.minimize || {}
+    let cssnanoConfig = {
+      preset: ['cssnano-preset-default', minimizeOptions.optimisation || {}]
+    }
+    if (minimizeOptions.advanced) {
+      cssnanoConfig = {
+        preset: ['cssnano-preset-advanced', minimizeOptions.optimisation || {}]
+      }
+    }
+    plugins.push(cssnano(cssnanoConfig))
+  }
+
   // Reuse CSS AST (PostCSS AST e.g 'postcss-loader') to avoid reparsing
   if (meta) {
     const { ast } = meta

package/lib/wxss/options.json

@@ -203,6 +203,11 @@
       "description": "Allows exporting styles as array with modules, string or constructable stylesheet (i.e. `CSSStyleSheet`).",
       "link": "https://github.com/webpack-contrib/css-loader#exporttype",
       "enum": ["array", "string", "css-style-sheet"]
+    },
+    "minimize": {
+      "description": "css minimization config.",
+      "link": "https://www.cssnano.cn/docs/what-are-optimisations/",
+      "type": "object"
     }
   },
   "type": "object"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.7.57",
+  "version": "2.7.59",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -80,5 +80,5 @@
   "engines": {
     "node": ">=14.14.0"
   },
-  "gitHead": "d880e6a7cbce97d3b8cce3468619683d7c062837"
+  "gitHead": "92ab578c176f5c4439f40d2eb045b01e95a98038"
 }