weapp-tailwindcss 4.10.0 → 4.10.2

package/dist/webpack4.js

@@ -10,7 +10,7 @@
 
 
 
-var _chunkPDP4OIKNjs = require('./chunk-PDP4OIKN.js');
+var _chunkHJVZ4TO3js = require('./chunk-HJVZ4TO3.js');
 
 
 
@@ -23,14 +23,14 @@ var _chunkIIDSY4XZjs = require('./chunk-IIDSY4XZ.js');
 var _chunkLTJQUORKjs = require('./chunk-LTJQUORK.js');
 
 
-var _chunkHFXMZGPWjs = require('./chunk-HFXMZGPW.js');
+var _chunkM2ATX5ZSjs = require('./chunk-M2ATX5ZS.js');
 
 
 
 
 
 
-var _chunkVTIOEDOKjs = require('./chunk-VTIOEDOK.js');
+var _chunkI35XJD75js = require('./chunk-I35XJD75.js');
 require('./chunk-5APD2MNV.js');
 require('./chunk-5U24PLVV.js');
 
@@ -59,7 +59,7 @@ function setupWebpackV4EmitHook(options) {
     runtimeState,
     debug: debug2
   } = options;
-  compiler.hooks.emit.tapPromise(_chunkVTIOEDOKjs.pluginName, async (compilation) => {
+  compiler.hooks.emit.tapPromise(_chunkI35XJD75js.pluginName, async (compilation) => {
     await runtimeState.patchPromise;
     compilerOptions.onStart();
     debug2("start");
@@ -68,7 +68,7 @@ function setupWebpackV4EmitHook(options) {
         compilerOptions.cache.calcHashValueChanged(chunk.id, chunk.hash);
       }
     }
-    const assetHashByChunk = _chunkPDP4OIKNjs.createAssetHashByChunkMap.call(void 0, compilation.chunks);
+    const assetHashByChunk = _chunkHJVZ4TO3js.createAssetHashByChunkMap.call(void 0, compilation.chunks);
     const assets = compilation.assets;
     const entries = Object.entries(assets);
     const outputDir = _optionalChain([compiler, 'access', _ => _.options, 'optionalAccess', _2 => _2.output, 'optionalAccess', _3 => _3.path]) ? _path2.default.resolve(compiler.options.output.path) : _process2.default.cwd();
@@ -125,7 +125,7 @@ function setupWebpackV4EmitHook(options) {
     };
     const groupedEntries = _chunkDYLQ6UOIjs.getGroupedEntries.call(void 0, entries, compilerOptions);
     const staleClassNameFallback = resolveWebpackStaleClassNameFallback(compilerOptions.staleClassNameFallback, compiler);
-    const runtimeSet = await _chunkVTIOEDOKjs.ensureRuntimeClassSet.call(void 0, runtimeState, {
+    const runtimeSet = await _chunkI35XJD75js.ensureRuntimeClassSet.call(void 0, runtimeState, {
       // webpack 的 script-only 热更新可能不会触发 runtime classset loader，
       // 这里强制收集可避免沿用上轮 class set，保证 JS 仅按最新集合精确命中。
       forceCollect: true,
@@ -170,7 +170,7 @@ function setupWebpackV4EmitHook(options) {
     const jsTaskFactories = [];
     if (Array.isArray(groupedEntries.js)) {
       for (const [file] of groupedEntries.js) {
-        const cacheKey = _chunkPDP4OIKNjs.getCacheKey.call(void 0, file);
+        const cacheKey = _chunkHJVZ4TO3js.getCacheKey.call(void 0, file);
         const assetSource = compilation.assets[file];
         if (!assetSource) {
           continue;
@@ -198,6 +198,7 @@ function setupWebpackV4EmitHook(options) {
               const currentSource = typeof currentValue === "string" ? currentValue : _nullishCoalesce(_optionalChain([currentValue, 'optionalAccess', _6 => _6.toString, 'call', _7 => _7()]), () => ( ""));
               const { code, linked } = await compilerOptions.jsHandler(currentSource, runtimeSet, {
                 staleClassNameFallback,
+                tailwindcssMajorVersion: runtimeState.twPatcher.majorVersion,
                 filename: absoluteFile,
                 moduleGraph: moduleGraphOptions,
                 babelParserOptions: {
@@ -280,9 +281,9 @@ function setupWebpackV4Loaders(options) {
     getClassSetInLoader,
     debug: debug2
   } = options;
-  const isMpxApp = _chunkPDP4OIKNjs.isMpx.call(void 0, appType);
+  const isMpxApp = _chunkHJVZ4TO3js.isMpx.call(void 0, appType);
   if (shouldRewriteCssImports && isMpxApp) {
-    _chunkPDP4OIKNjs.ensureMpxTailwindcssAliases.call(void 0, compiler, weappTailwindcssPackageDir2);
+    _chunkHJVZ4TO3js.ensureMpxTailwindcssAliases.call(void 0, compiler, weappTailwindcssPackageDir2);
   }
   const runtimeClassSetLoader = _nullishCoalesce(runtimeLoaderPath, () => ( _path2.default.resolve(__dirname, "./weapp-tw-runtime-classset-loader.js")));
   const runtimeCssImportRewriteLoader = shouldRewriteCssImports ? _nullishCoalesce(runtimeCssImportRewriteLoaderPath, () => ( _path2.default.resolve(__dirname, "./weapp-tw-css-import-rewrite-loader.js"))) : void 0;
@@ -295,12 +296,12 @@ function setupWebpackV4Loaders(options) {
   const classSetLoaderOptions = {
     getClassSet: getClassSetInLoader
   };
-  const { findRewriteAnchor, findClassSetAnchor } = _chunkPDP4OIKNjs.createLoaderAnchorFinders.call(void 0, appType);
+  const { findRewriteAnchor, findClassSetAnchor } = _chunkHJVZ4TO3js.createLoaderAnchorFinders.call(void 0, appType);
   const cssImportRewriteLoaderOptions = runtimeLoaderRewriteOptions ? {
     rewriteCssImports: runtimeLoaderRewriteOptions
   } : void 0;
   if (runtimeCssImportRewriteLoader && shouldRewriteCssImports && cssImportRewriteLoaderOptions && isMpxApp) {
-    _chunkPDP4OIKNjs.injectMpxCssRewritePreRules.call(void 0, compiler, runtimeCssImportRewriteLoader, cssImportRewriteLoaderOptions);
+    _chunkHJVZ4TO3js.injectMpxCssRewritePreRules.call(void 0, compiler, runtimeCssImportRewriteLoader, cssImportRewriteLoaderOptions);
   }
   const createRuntimeClassSetLoaderEntry = () => ({
     loader: runtimeClassSetLoader,
@@ -319,19 +320,19 @@ function setupWebpackV4Loaders(options) {
       type: null
     };
   };
-  compiler.hooks.compilation.tap(_chunkVTIOEDOKjs.pluginName, (compilation) => {
-    compilation.hooks.normalModuleLoader.tap(_chunkVTIOEDOKjs.pluginName, (_loaderContext, module) => {
+  compiler.hooks.compilation.tap(_chunkI35XJD75js.pluginName, (compilation) => {
+    compilation.hooks.normalModuleLoader.tap(_chunkI35XJD75js.pluginName, (_loaderContext, module) => {
       const hasRuntimeLoader = runtimeClassSetLoaderExists || runtimeCssImportRewriteLoaderExists;
       if (!hasRuntimeLoader) {
         return;
       }
-      if (shouldRewriteCssImports && _chunkPDP4OIKNjs.isMpx.call(void 0, appType) && typeof _loaderContext.resolve === "function") {
-        _chunkPDP4OIKNjs.patchMpxLoaderResolve.call(void 0, _loaderContext, weappTailwindcssPackageDir2, true);
+      if (shouldRewriteCssImports && _chunkHJVZ4TO3js.isMpx.call(void 0, appType) && typeof _loaderContext.resolve === "function") {
+        _chunkHJVZ4TO3js.patchMpxLoaderResolve.call(void 0, _loaderContext, weappTailwindcssPackageDir2, true);
       }
       const loaderEntries = module.loaders || [];
       let rewriteAnchorIdx = findRewriteAnchor(loaderEntries);
       const classSetAnchorIdx = findClassSetAnchor(loaderEntries);
-      const isCssModule = _chunkPDP4OIKNjs.isCssLikeModuleResource.call(void 0, module.resource, compilerOptions.cssMatcher, appType);
+      const isCssModule = _chunkHJVZ4TO3js.isCssLikeModuleResource.call(void 0, module.resource, compilerOptions.cssMatcher, appType);
       if (_process2.default.env.WEAPP_TW_LOADER_DEBUG && isCssModule) {
         debug2("loader hook css module: %s loaders=%o anchors=%o", module.resource, loaderEntries.map((x) => x.loader), { rewriteAnchorIdx, classSetAnchorIdx });
       }
@@ -365,7 +366,7 @@ function setupWebpackV4Loaders(options) {
           rewriteAnchorIdx = findRewriteAnchor(loaderEntries);
         }
       }
-      if (runtimeClassSetLoaderExists && !_chunkPDP4OIKNjs.hasLoaderEntry.call(void 0, loaderEntries, runtimeClassSetLoader)) {
+      if (runtimeClassSetLoaderExists && !_chunkHJVZ4TO3js.hasLoaderEntry.call(void 0, loaderEntries, runtimeClassSetLoader)) {
         const anchorIndex = findClassSetAnchor(loaderEntries);
         if (anchorIndex === -1) {
           anchorlessInsert(createRuntimeClassSetLoaderEntry(), "before");
@@ -379,11 +380,11 @@ function setupWebpackV4Loaders(options) {
 }
 
 // src/bundlers/webpack/BaseUnifiedPlugin/v4.ts
-var debug = _chunkVTIOEDOKjs.createDebug.call(void 0, );
+var debug = _chunkI35XJD75js.createDebug.call(void 0, );
 var weappTailwindcssPackageDir = _chunkIIDSY4XZjs.resolvePackageDir.call(void 0, "weapp-tailwindcss");
 var UnifiedWebpackPluginV4 = class {
   constructor(options = {}) {
-    this.options = _chunkVTIOEDOKjs.getCompilerContext.call(void 0, options);
+    this.options = _chunkI35XJD75js.getCompilerContext.call(void 0, options);
     this.appType = this.options.appType;
   }
   apply(compiler) {
@@ -399,19 +400,19 @@ var UnifiedWebpackPluginV4 = class {
     const disabledOptions = _chunkIIDSY4XZjs.resolveDisabledOptions.call(void 0, disabled);
     const isTailwindcssV4 = (_nullishCoalesce(initialTwPatcher.majorVersion, () => ( 0))) >= 4;
     const shouldRewriteCssImports = isTailwindcssV4 && this.options.rewriteCssImports !== false && !disabledOptions.rewriteCssImports;
-    const isMpxApp = _chunkPDP4OIKNjs.isMpx.call(void 0, this.appType);
+    const isMpxApp = _chunkHJVZ4TO3js.isMpx.call(void 0, this.appType);
     if (shouldRewriteCssImports) {
-      _chunkPDP4OIKNjs.applyTailwindcssCssImportRewrite.call(void 0, compiler, {
+      _chunkHJVZ4TO3js.applyTailwindcssCssImportRewrite.call(void 0, compiler, {
         pkgDir: weappTailwindcssPackageDir,
         enabled: true,
         appType: this.appType
       });
-      _chunkPDP4OIKNjs.setupMpxTailwindcssRedirect.call(void 0, weappTailwindcssPackageDir, isMpxApp);
+      _chunkHJVZ4TO3js.setupMpxTailwindcssRedirect.call(void 0, weappTailwindcssPackageDir, isMpxApp);
     }
     if (disabledOptions.plugin) {
       return;
     }
-    const patchRecorderState = _chunkHFXMZGPWjs.setupPatchRecorder.call(void 0, initialTwPatcher, this.options.tailwindcssBasedir, {
+    const patchRecorderState = _chunkM2ATX5ZSjs.setupPatchRecorder.call(void 0, initialTwPatcher, this.options.tailwindcssBasedir, {
       source: "runtime",
       cwd: _nullishCoalesce(this.options.tailwindcssBasedir, () => ( _process2.default.cwd()))
     });
@@ -423,17 +424,17 @@ var UnifiedWebpackPluginV4 = class {
     };
     let runtimeSetPrepared = false;
     let runtimeSetSignature;
-    compiler.hooks.compilation.tap(_chunkVTIOEDOKjs.pluginName, () => {
+    compiler.hooks.compilation.tap(_chunkI35XJD75js.pluginName, () => {
       runtimeSetPrepared = false;
     });
     async function getClassSetInLoader() {
       if (runtimeSetPrepared) {
         return;
       }
-      const signature = _chunkVTIOEDOKjs.getRuntimeClassSetSignature.call(void 0, runtimeState.twPatcher);
+      const signature = _chunkI35XJD75js.getRuntimeClassSetSignature.call(void 0, runtimeState.twPatcher);
       const forceRefresh = signature !== runtimeSetSignature;
       runtimeSetPrepared = true;
-      await _chunkVTIOEDOKjs.ensureRuntimeClassSet.call(void 0, runtimeState, {
+      await _chunkI35XJD75js.ensureRuntimeClassSet.call(void 0, runtimeState, {
         forceRefresh,
         forceCollect: true,
         clearCache: forceRefresh,

package/dist/webpack4.mjs

@@ -10,7 +10,7 @@ import {
   isMpx,
   patchMpxLoaderResolve,
   setupMpxTailwindcssRedirect
-} from "./chunk-6QU7CMAG.mjs";
+} from "./chunk-ACNOEKQI.mjs";
 import {
   pushConcurrentTaskFactories,
   resolveDisabledOptions,
@@ -23,14 +23,14 @@ import {
 } from "./chunk-RRHPTTCP.mjs";
 import {
   setupPatchRecorder
-} from "./chunk-F6VHIO5B.mjs";
+} from "./chunk-BZCCVPSU.mjs";
 import {
   createDebug,
   ensureRuntimeClassSet,
   getCompilerContext,
   getRuntimeClassSetSignature,
   pluginName
-} from "./chunk-Q5IGGG5W.mjs";
+} from "./chunk-MPVAZKRB.mjs";
 import "./chunk-QOTLDKI4.mjs";
 import "./chunk-3WUHHFLF.mjs";
 import {
@@ -200,6 +200,7 @@ function setupWebpackV4EmitHook(options) {
               const currentSource = typeof currentValue === "string" ? currentValue : currentValue?.toString() ?? "";
               const { code, linked } = await compilerOptions.jsHandler(currentSource, runtimeSet, {
                 staleClassNameFallback,
+                tailwindcssMajorVersion: runtimeState.twPatcher.majorVersion,
                 filename: absoluteFile,
                 moduleGraph: moduleGraphOptions,
                 babelParserOptions: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weapp-tailwindcss",
-  "version": "4.10.0",
+  "version": "4.10.2",
   "description": "把 tailwindcss 原子化样式思想，带给小程序开发者们! bring tailwindcss to miniprogram developers!",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -181,12 +181,12 @@
     "lru-cache": "10.4.3",
     "magic-string": "0.30.21",
     "semver": "~7.7.4",
-    "tailwindcss-patch": "^8.7.0",
+    "tailwindcss-patch": "^8.7.1",
     "webpack-sources": "3.3.4",
     "yaml": "^2.8.2",
+    "@weapp-tailwindcss/postcss": "2.1.5",
     "@weapp-tailwindcss/logger": "1.1.0",
-    "@weapp-tailwindcss/shared": "1.1.2",
-    "@weapp-tailwindcss/postcss": "2.1.5"
+    "@weapp-tailwindcss/shared": "1.1.2"
   },
   "scripts": {
     "dev": "tsup --watch --sourcemap",