weapp-tailwindcss 5.2.11 → 5.2.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (63) hide show
  1. package/dist/bundlers/shared/generator-css/user-css/source-fragments.d.ts +6 -0
  2. package/dist/bundlers/shared/generator-css/user-css.d.ts +1 -1
  3. package/dist/cli.cjs +372 -293
  4. package/dist/cli.js +20 -11
  5. package/dist/{context-DbL0d-zB.js → context-DW4ukjx4.js} +19 -8
  6. package/dist/{context-C3TryIjF.cjs → context-zWINV_E2.cjs} +17 -11
  7. package/dist/core.cjs +1 -1
  8. package/dist/core.js +1 -1
  9. package/dist/{css-imports-DfNC3e6a.cjs → css-imports-BFMU7Hpd.cjs} +1 -1
  10. package/dist/css-macro/postcss.cjs +1 -1
  11. package/dist/css-macro.cjs +1 -1
  12. package/dist/defaults.cjs +2 -0
  13. package/dist/defaults.js +2 -0
  14. package/dist/framework.cjs +1 -1
  15. package/dist/{generator-BLpOsd5O.js → generator-C2UFjlZ1.js} +36 -11
  16. package/dist/{generator-B0dCFlP1.cjs → generator-CwMI20jy.cjs} +37 -12
  17. package/dist/generator.cjs +1 -1
  18. package/dist/generator.js +1 -1
  19. package/dist/{gulp-DSrcDQsA.cjs → gulp-CWFxs2lE.cjs} +16 -13
  20. package/dist/{gulp-BLaGc0MJ.js → gulp-CltYkglj.js} +12 -9
  21. package/dist/gulp.cjs +1 -1
  22. package/dist/gulp.js +1 -1
  23. package/dist/{hmr-timing-BnGBBJ6S.cjs → hmr-timing-BjOxhci8.cjs} +5 -5
  24. package/dist/{hmr-timing-DXyGw6jp.js → hmr-timing-D6JKLBCD.js} +25 -15
  25. package/dist/index.cjs +4 -4
  26. package/dist/index.js +4 -4
  27. package/dist/{object-Bvy6-w9r.js → object-B-8IHefx.js} +4 -4
  28. package/dist/{object-C_Vr6_S5.cjs → object-DbHtAXRk.cjs} +4 -4
  29. package/dist/{options-zpZez7qe.cjs → options-CSqLm6U2.cjs} +2 -2
  30. package/dist/{pipeline-helpers-B5CzvTUJ.cjs → pipeline-helpers-Cj9ZzHaY.cjs} +25 -10
  31. package/dist/postcss-html-transform.cjs +1 -1
  32. package/dist/postcss.cjs +1 -1
  33. package/dist/postcss.js +1 -1
  34. package/dist/presets.cjs +6 -5
  35. package/dist/presets.js +4 -3
  36. package/dist/reset.cjs +1 -1
  37. package/dist/{rolldown-runtime-CVvi-lCc.cjs → rolldown-runtime-Ctb5zv51.cjs} +1 -1
  38. package/dist/rspack.cjs +2 -2
  39. package/dist/rspack.js +1 -1
  40. package/dist/{source-candidate-scan-signature-xgmxO8_F.js → source-candidate-scan-signature-DQZ_DkgW.js} +5 -4
  41. package/dist/{source-candidate-scan-signature-GjsLzP8Z.cjs → source-candidate-scan-signature-uRHl5Ne9.cjs} +6 -5
  42. package/dist/{style-options-COpQc8fr.cjs → style-options-D0NukP02.cjs} +9 -4
  43. package/dist/{tailwindcss-LtnGCxF0.cjs → tailwindcss-B3lqgbln.cjs} +17 -13
  44. package/dist/{tailwindcss-2zdmASlM.js → tailwindcss-vbApajUH.js} +13 -10
  45. package/dist/{transform-BlsDWgjt.js → transform-52FLRu-0.js} +2 -2
  46. package/dist/{transform-9wbmvHcC.cjs → transform-BiHG42Rp.cjs} +2 -2
  47. package/dist/types/user-defined-options/general.d.ts +2 -0
  48. package/dist/{v4-generation-core-D4zQcQqW.cjs → v4-generation-core-2AuNMweK.cjs} +26 -16
  49. package/dist/{vite-DTDbD-95.cjs → vite-BLB7vjKQ.cjs} +99 -46
  50. package/dist/{vite-BWmBFzgf.js → vite-q3ilYV7x.js} +94 -41
  51. package/dist/vite.cjs +1 -1
  52. package/dist/vite.js +1 -1
  53. package/dist/{watch-dependencies-BZGubvuJ.cjs → watch-dependencies-DLZDrWdH.cjs} +1 -1
  54. package/dist/weapp-tw-css-generation-loader.cjs +1 -1
  55. package/dist/weapp-tw-css-import-rewrite-loader.cjs +10 -9
  56. package/dist/weapp-tw-runtime-classset-loader.cjs +4 -3
  57. package/dist/{webpack-CtUyQNqC.js → webpack-DExB8tzB.js} +36 -18
  58. package/dist/{webpack-Bpovb6YE.cjs → webpack-Jn4FJT6y.cjs} +40 -31
  59. package/dist/webpack.cjs +1 -1
  60. package/dist/webpack.js +1 -1
  61. package/dist/{wxml-CWJc0yY-.js → wxml-B7OAVpXJ.js} +10 -6
  62. package/dist/{wxml-DUIdXCVa.cjs → wxml-CQmBCjOR.cjs} +386 -311
  63. package/package.json +6 -6
@@ -1,12 +1,12 @@
1
- const require_rolldown_runtime = require("./rolldown-runtime-CVvi-lCc.cjs");
2
- const require_generator = require("./generator-B0dCFlP1.cjs");
3
- const require_options = require("./options-zpZez7qe.cjs");
4
- const require_v4_generation_core = require("./v4-generation-core-D4zQcQqW.cjs");
5
- const require_wxml = require("./wxml-DUIdXCVa.cjs");
6
- const require_hmr_timing = require("./hmr-timing-BnGBBJ6S.cjs");
7
- const require_context = require("./context-C3TryIjF.cjs");
8
- const require_tailwindcss = require("./tailwindcss-LtnGCxF0.cjs");
9
- const require_style_options = require("./style-options-COpQc8fr.cjs");
1
+ const require_rolldown_runtime = require("./rolldown-runtime-Ctb5zv51.cjs");
2
+ const require_generator = require("./generator-CwMI20jy.cjs");
3
+ const require_options = require("./options-CSqLm6U2.cjs");
4
+ const require_v4_generation_core = require("./v4-generation-core-2AuNMweK.cjs");
5
+ const require_wxml = require("./wxml-CQmBCjOR.cjs");
6
+ const require_hmr_timing = require("./hmr-timing-BjOxhci8.cjs");
7
+ const require_context = require("./context-zWINV_E2.cjs");
8
+ const require_tailwindcss = require("./tailwindcss-B3lqgbln.cjs");
9
+ const require_style_options = require("./style-options-D0NukP02.cjs");
10
10
  let node_fs = require("node:fs");
11
11
  node_fs = require_rolldown_runtime.__toESM(node_fs, 1);
12
12
  let node_path = require("node:path");
@@ -70,12 +70,13 @@ function createGulpModuleGraphOptions(opts) {
70
70
  //#endregion
71
71
  //#region src/bundlers/gulp/runtime-snapshot.ts
72
72
  function createGulpRuntimeSnapshot(runtimeSourcesByFile, state, computeHash, options = {}) {
73
- return require_hmr_timing.buildRuntimeCompilationSnapshot([...runtimeSourcesByFile.entries()].map(([file, entry]) => ({
73
+ const entries = [...runtimeSourcesByFile.entries()].map(([file, entry]) => ({
74
74
  file,
75
75
  runtimeCandidate: true,
76
76
  source: entry.source,
77
77
  type: entry.type
78
- })), state, {
78
+ }));
79
+ return require_hmr_timing.buildRuntimeCompilationSnapshot(entries, state, {
79
80
  computeHash,
80
81
  createRuntimeAffectingSignature: require_v4_generation_core.createRuntimeAffectingSourceSignature,
81
82
  removedFiles: options.removedFiles
@@ -279,11 +280,13 @@ function createGulpFileTransforms(context) {
279
280
  const cssHandlerOptions = resolveWxssFileHandlerOptions(file, source, options);
280
281
  const handled = await styleHandler(source, cssHandlerOptions);
281
282
  const preflightMode = generatedCssPreflightModeByFile.get(file.path);
282
- writeGulpFileAsset(file, require_v4_generation_core.finalizeMiniProgramCssStructure((0, _weapp_tailwindcss_postcss.rewriteLocalCssImportRequestsForOutput)(generatedCss ? require_v4_generation_core.finalizeMiniProgramGeneratorCss(handled.css, "weapp", runtimeState.tailwindRuntime.majorVersion, opts.cssPreflight, {
283
+ const finalized = generatedCss ? require_v4_generation_core.finalizeMiniProgramGeneratorCss(handled.css, "weapp", runtimeState.tailwindRuntime.majorVersion, opts.cssPreflight, {
283
284
  injectPreflight: preflightMode?.inject ?? cssHandlerOptions.isMainChunk,
284
285
  preservePreflight: preflightMode?.preserve ?? cssHandlerOptions.isMainChunk,
285
286
  styleOptions: cssHandlerOptions
286
- }) : handled.css, { styleOutputExtension })));
287
+ }) : handled.css;
288
+ const outputCss = (0, _weapp_tailwindcss_postcss.rewriteLocalCssImportRequestsForOutput)(finalized, { styleOutputExtension });
289
+ writeGulpFileAsset(file, require_v4_generation_core.finalizeMiniProgramCssStructure(outputCss));
287
290
  debug("css adapt: %s", file.path);
288
291
  }, () => resolveGulpTransformTimingDetails("css:adapt"));
289
292
  const transformJs = (options = {}) => createVinylTransform("js", async (file) => {
@@ -1,8 +1,8 @@
1
- import { Pt as getTailwindV4IncrementalGenerateCacheStats, Q as hasTailwindRootDirectives, _ as upsertTailwindV4CssSource, et as normalizeTailwindConfigDirectives, g as removeTailwindV4CssSource, h as hasConfiguredTailwindV4CssRoots, nt as normalizeTailwindSourceForGenerator, vt as prependConfigDirective } from "./generator-BLpOsd5O.js";
2
- import { l as getRuntimeClassSetSignature, p as resolveSourceScanEntries } from "./tailwindcss-2zdmASlM.js";
3
- import { $ as getCompilationScopeDependencyRevision, A as annotateCssSourceTrace, B as splitLocalCssImports, D as stripBundlerGeneratedCssMarkers, F as createRuntimeClassSetManager, G as removeRuntimeCompilationBuildStateFiles, H as buildRuntimeCompilationSnapshot, J as createRuntimeAffectingSourceSignature, M as createCssTokenSourceMap, O as finalizeMiniProgramCssStructure, P as processCachedTask, Q as AssetEmissionPlan, T as hasBundlerGeneratedCssMarker, V as finalizeCompilerShadowRun, W as createRuntimeCompilationBuildState, X as beginCompilerShadowRun, Y as disposeCompilerOwner, Z as getCompilerShadowRunSnapshot, b as finalizeMiniProgramGeneratorCss, et as invalidateCompilationScope, j as createCssSourceTraceCacheSignature, n as emitHmrTiming, nt as createCompilationDependencyChanges, q as updateRuntimeCompilationBuildState, r as generateTailwindV4Css, rt as createSourceCandidateCollector, tt as recordCompilationDependencyChanges, w as createBundlerGeneratedCssMarker, z as rewriteLocalCssImportRequestsForOutput } from "./hmr-timing-DXyGw6jp.js";
4
- import { m as createDebug } from "./wxml-CWJc0yY-.js";
5
- import { l as createTailwindRuntimeReadyPromise, n as normalizeStyleHandlerMajorVersion, o as shouldSkipJsTransform, t as getCompilerContext, u as ensureRuntimeClassSet } from "./context-DbL0d-zB.js";
1
+ import { Pt as getTailwindV4IncrementalGenerateCacheStats, Q as hasTailwindRootDirectives, _ as upsertTailwindV4CssSource, et as normalizeTailwindConfigDirectives, g as removeTailwindV4CssSource, h as hasConfiguredTailwindV4CssRoots, nt as normalizeTailwindSourceForGenerator, vt as prependConfigDirective } from "./generator-C2UFjlZ1.js";
2
+ import { l as getRuntimeClassSetSignature, p as resolveSourceScanEntries } from "./tailwindcss-vbApajUH.js";
3
+ import { $ as getCompilationScopeDependencyRevision, A as annotateCssSourceTrace, B as splitLocalCssImports, D as stripBundlerGeneratedCssMarkers, F as createRuntimeClassSetManager, G as removeRuntimeCompilationBuildStateFiles, H as buildRuntimeCompilationSnapshot, J as createRuntimeAffectingSourceSignature, M as createCssTokenSourceMap, O as finalizeMiniProgramCssStructure, P as processCachedTask, Q as AssetEmissionPlan, T as hasBundlerGeneratedCssMarker, V as finalizeCompilerShadowRun, W as createRuntimeCompilationBuildState, X as beginCompilerShadowRun, Y as disposeCompilerOwner, Z as getCompilerShadowRunSnapshot, b as finalizeMiniProgramGeneratorCss, et as invalidateCompilationScope, j as createCssSourceTraceCacheSignature, n as emitHmrTiming, nt as createCompilationDependencyChanges, q as updateRuntimeCompilationBuildState, r as generateTailwindV4Css, rt as createSourceCandidateCollector, tt as recordCompilationDependencyChanges, w as createBundlerGeneratedCssMarker, z as rewriteLocalCssImportRequestsForOutput } from "./hmr-timing-D6JKLBCD.js";
4
+ import { m as createDebug } from "./wxml-B7OAVpXJ.js";
5
+ import { l as createTailwindRuntimeReadyPromise, n as normalizeStyleHandlerMajorVersion, o as shouldSkipJsTransform, t as getCompilerContext, u as ensureRuntimeClassSet } from "./context-DW4ukjx4.js";
6
6
  import fs from "node:fs";
7
7
  import path from "node:path";
8
8
  import process from "node:process";
@@ -61,12 +61,13 @@ function createGulpModuleGraphOptions(opts) {
61
61
  //#endregion
62
62
  //#region src/bundlers/gulp/runtime-snapshot.ts
63
63
  function createGulpRuntimeSnapshot(runtimeSourcesByFile, state, computeHash, options = {}) {
64
- return buildRuntimeCompilationSnapshot([...runtimeSourcesByFile.entries()].map(([file, entry]) => ({
64
+ const entries = [...runtimeSourcesByFile.entries()].map(([file, entry]) => ({
65
65
  file,
66
66
  runtimeCandidate: true,
67
67
  source: entry.source,
68
68
  type: entry.type
69
- })), state, {
69
+ }));
70
+ return buildRuntimeCompilationSnapshot(entries, state, {
70
71
  computeHash,
71
72
  createRuntimeAffectingSignature: createRuntimeAffectingSourceSignature,
72
73
  removedFiles: options.removedFiles
@@ -270,11 +271,13 @@ function createGulpFileTransforms(context) {
270
271
  const cssHandlerOptions = resolveWxssFileHandlerOptions(file, source, options);
271
272
  const handled = await styleHandler(source, cssHandlerOptions);
272
273
  const preflightMode = generatedCssPreflightModeByFile.get(file.path);
273
- writeGulpFileAsset(file, finalizeMiniProgramCssStructure(rewriteLocalCssImportRequestsForOutput(generatedCss ? finalizeMiniProgramGeneratorCss(handled.css, "weapp", runtimeState.tailwindRuntime.majorVersion, opts.cssPreflight, {
274
+ const finalized = generatedCss ? finalizeMiniProgramGeneratorCss(handled.css, "weapp", runtimeState.tailwindRuntime.majorVersion, opts.cssPreflight, {
274
275
  injectPreflight: preflightMode?.inject ?? cssHandlerOptions.isMainChunk,
275
276
  preservePreflight: preflightMode?.preserve ?? cssHandlerOptions.isMainChunk,
276
277
  styleOptions: cssHandlerOptions
277
- }) : handled.css, { styleOutputExtension })));
278
+ }) : handled.css;
279
+ const outputCss = rewriteLocalCssImportRequestsForOutput(finalized, { styleOutputExtension });
280
+ writeGulpFileAsset(file, finalizeMiniProgramCssStructure(outputCss));
278
281
  debug("css adapt: %s", file.path);
279
282
  }, () => resolveGulpTransformTimingDetails("css:adapt"));
280
283
  const transformJs = (options = {}) => createVinylTransform("js", async (file) => {
package/dist/gulp.cjs CHANGED
@@ -1,5 +1,5 @@
1
1
  Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
2
- const require_gulp = require("./gulp-DSrcDQsA.cjs");
2
+ const require_gulp = require("./gulp-CWFxs2lE.cjs");
3
3
  exports.WeappTailwindcss = require_gulp.createPlugins;
4
4
  exports.createPlugins = require_gulp.createPlugins;
5
5
  exports.weappTailwindcss = require_gulp.createPlugins;
package/dist/gulp.js CHANGED
@@ -1,2 +1,2 @@
1
- import { t as createPlugins } from "./gulp-BLaGc0MJ.js";
1
+ import { t as createPlugins } from "./gulp-CltYkglj.js";
2
2
  export { createPlugins as WeappTailwindcss, createPlugins, createPlugins as weappTailwindcss };
@@ -1,8 +1,8 @@
1
- const require_rolldown_runtime = require("./rolldown-runtime-CVvi-lCc.cjs");
2
- const require_generator = require("./generator-B0dCFlP1.cjs");
3
- const require_v4_generation_core = require("./v4-generation-core-D4zQcQqW.cjs");
4
- const require_wxml = require("./wxml-DUIdXCVa.cjs");
5
- const require_tailwindcss = require("./tailwindcss-LtnGCxF0.cjs");
1
+ const require_rolldown_runtime = require("./rolldown-runtime-Ctb5zv51.cjs");
2
+ const require_generator = require("./generator-CwMI20jy.cjs");
3
+ const require_v4_generation_core = require("./v4-generation-core-2AuNMweK.cjs");
4
+ const require_wxml = require("./wxml-CQmBCjOR.cjs");
5
+ const require_tailwindcss = require("./tailwindcss-B3lqgbln.cjs");
6
6
  let node_process = require("node:process");
7
7
  node_process = require_rolldown_runtime.__toESM(node_process, 1);
8
8
  let _tailwindcss_mangle_engine = require("@tailwindcss-mangle/engine");
@@ -1,9 +1,9 @@
1
- import { $ as hasTailwindSourceDirectives, A as transformGeneratorUserCss, At as toPosixPath, F as stripUnmatchedTailwindSourceMediaCloseFragments, Ft as filterUnsupportedMiniProgramTailwindV4Candidates, G as extractGeneratedCssForUserLayerSelectors, H as filterApplyOnlyGeneratedCss, I as finalizeMiniProgramCss, J as preferScopedGeneratedCssRules, K as hasUserCssLayerBlocks, Lt as loadTailwindV4DesignSystem, N as removeTailwindV4GeneratorAtRules, Ot as resolveSourceScanPath, P as stripTailwindSourceMediaFragments, Q as hasTailwindRootDirectives, U as normalizeEmptyTailwindCustomVariants, V as removeTailwindV4GeneratedUserCssArtifacts, W as shouldFilterApplyOnlyGeneratedCss, X as hasTailwindApplyDirective, _t as normalizeConfigDirective, a as resolveGeneratorRuntimeBranch, at as resolveCssEntrySource, bt as FULL_SOURCE_SCAN_EXTENSION_RE, ct as createCssAppend, d as resolveTailwindV4SourceFromRuntime, dt as splitGeneratorPlaceholderCssBySourceOrder, ft as splitTailwindGeneratedCssByBanner, gt as stripTailwindBanners, ht as stripTailwindBanner, i as normalizeWeappTailwindcssGeneratorOptions, it as removeTailwindSourceDirectives, j as isCommentOnlyCss, kt as resolveTailwindV4CssSourceBase, lt as hasTailwindGeneratedCss, mt as stripGeneratorPlaceholderMarkers, ot as GENERATOR_PLACEHOLDER_MARKER_RE, p as resolveTailwindV4SourceOptionsFromRuntime, pt as splitTailwindV4GeneratedCssBySourceOrder, q as splitUserCssLayerBlocks, rt as parseImportRequest, s as shouldUseMiniProgramCssBranch, st as VITE_MARKER_RE, t as createWeappTailwindcssGenerator, tt as normalizeTailwindSourceDirectives, u as resolveTailwindV4Source$1, ut as hasTailwindGeneratedCssMarkers, vt as prependConfigDirective, wt as isFileMatchedByTailwindSourceEntries, z as removeUnsupportedMiniProgramAtRules } from "./generator-BLpOsd5O.js";
1
+ import { $ as hasTailwindSourceDirectives, A as transformGeneratorUserCss, At as toPosixPath, F as stripUnmatchedTailwindSourceMediaCloseFragments, Ft as filterUnsupportedMiniProgramTailwindV4Candidates, G as extractGeneratedCssForUserLayerSelectors, H as filterApplyOnlyGeneratedCss, I as finalizeMiniProgramCss, J as preferScopedGeneratedCssRules, K as hasUserCssLayerBlocks, Lt as loadTailwindV4DesignSystem, N as removeTailwindV4GeneratorAtRules, Ot as resolveSourceScanPath, P as stripTailwindSourceMediaFragments, Q as hasTailwindRootDirectives, U as normalizeEmptyTailwindCustomVariants, V as removeTailwindV4GeneratedUserCssArtifacts, W as shouldFilterApplyOnlyGeneratedCss, X as hasTailwindApplyDirective, _t as normalizeConfigDirective, a as resolveGeneratorRuntimeBranch, at as resolveCssEntrySource, bt as FULL_SOURCE_SCAN_EXTENSION_RE, ct as createCssAppend, d as resolveTailwindV4SourceFromRuntime, dt as splitGeneratorPlaceholderCssBySourceOrder, ft as splitTailwindGeneratedCssByBanner, gt as stripTailwindBanners, ht as stripTailwindBanner, i as normalizeWeappTailwindcssGeneratorOptions, it as removeTailwindSourceDirectives, j as isCommentOnlyCss, kt as resolveTailwindV4CssSourceBase, lt as hasTailwindGeneratedCss, mt as stripGeneratorPlaceholderMarkers, ot as GENERATOR_PLACEHOLDER_MARKER_RE, p as resolveTailwindV4SourceOptionsFromRuntime, pt as splitTailwindV4GeneratedCssBySourceOrder, q as splitUserCssLayerBlocks, rt as parseImportRequest, s as shouldUseMiniProgramCssBranch, st as VITE_MARKER_RE, t as createWeappTailwindcssGenerator, tt as normalizeTailwindSourceDirectives, u as resolveTailwindV4Source$1, ut as hasTailwindGeneratedCssMarkers, vt as prependConfigDirective, wt as isFileMatchedByTailwindSourceEntries, z as removeUnsupportedMiniProgramAtRules } from "./generator-C2UFjlZ1.js";
2
2
  import { o as transformCssMacroCss, r as hasCssMacroTailwindV4InternalAtRules, t as hasCssMacroStyleOptions } from "./auto-2dg_uhEJ.js";
3
- import { n as _defineProperty, t as omitUndefined } from "./object-Bvy6-w9r.js";
4
- import { g as resolveTailwindV4EntriesFromCss, l as getRuntimeClassSetSignature, r as isUniAppXEnabled, v as includesTailwindV4PreflightDirective, y as collectCssInlineSourceCandidates } from "./tailwindcss-2zdmASlM.js";
5
- import { _ as md5Hash, g as traverse, h as babelParse, m as createDebug, p as replaceWxml, r as createAttributeMatcher } from "./wxml-CWJc0yY-.js";
6
- import { r as resolveStyleOptionsFromContext } from "./context-DbL0d-zB.js";
3
+ import { n as _defineProperty, t as omitUndefined } from "./object-B-8IHefx.js";
4
+ import { g as resolveTailwindV4EntriesFromCss, l as getRuntimeClassSetSignature, r as isUniAppXEnabled, v as includesTailwindV4PreflightDirective, y as collectCssInlineSourceCandidates } from "./tailwindcss-vbApajUH.js";
5
+ import { _ as md5Hash, g as traverse, h as babelParse, m as createDebug, p as replaceWxml, r as createAttributeMatcher } from "./wxml-B7OAVpXJ.js";
6
+ import { r as resolveStyleOptionsFromContext } from "./context-DW4ukjx4.js";
7
7
  import { existsSync, readFileSync } from "node:fs";
8
8
  import path from "node:path";
9
9
  import process from "node:process";
@@ -198,12 +198,13 @@ async function extractScriptStringCandidates(source, extension, options) {
198
198
  if (!SCRIPT_SOURCE_CANDIDATE_EXTENSIONS.has(extension)) return [];
199
199
  const values = /* @__PURE__ */ new Set();
200
200
  try {
201
- traverse(babelParse(source, {
201
+ const ast = babelParse(source, {
202
202
  cache: true,
203
203
  cacheKey: `source-candidates:${extension}`,
204
204
  plugins: ["jsx", "typescript"],
205
205
  sourceType: "unambiguous"
206
- }), {
206
+ });
207
+ traverse(ast, {
207
208
  noScope: true,
208
209
  StringLiteral(path) {
209
210
  values.add(path.node.value);
@@ -3910,7 +3911,8 @@ function isSameTailwindV4CssSource(a, b) {
3910
3911
  //#endregion
3911
3912
  //#region src/bundlers/shared/generator-css/source-resolver/single-source.ts
3912
3913
  async function resolveSingleTailwindV4CssSource(cssSource, sourceOptions, options = {}) {
3913
- const sourceBase = resolveTailwindV4CssSourceBase(cssSource, sourceOptions.base ?? sourceOptions.projectRoot ?? process.cwd());
3914
+ const sourceBaseFallback = sourceOptions.base ?? sourceOptions.projectRoot ?? process.cwd();
3915
+ const sourceBase = resolveTailwindV4CssSourceBase(cssSource, sourceBaseFallback);
3914
3916
  const normalizedCssSource = normalizeTailwindV4CssSourceConfig(cssSource, sourceBase);
3915
3917
  const source = await resolveTailwindV4Source$1(createSingleTailwindV4SourceOptions(sourceOptions, {
3916
3918
  base: sourceBase,
@@ -3928,7 +3930,8 @@ async function resolveSingleTailwindV4CssSource(cssSource, sourceOptions, option
3928
3930
  }
3929
3931
  async function resolveTailwindV4CssSourceEntries(cssSource, sourceOptions) {
3930
3932
  if (typeof cssSource.css !== "string" || cssSource.css.length === 0) return;
3931
- const sourceBase = resolveTailwindV4CssSourceBase(cssSource, sourceOptions.base ?? sourceOptions.projectRoot ?? process.cwd());
3933
+ const sourceBaseFallback = sourceOptions.base ?? sourceOptions.projectRoot ?? process.cwd();
3934
+ const sourceBase = resolveTailwindV4CssSourceBase(cssSource, sourceBaseFallback);
3932
3935
  return resolveTailwindV4EntriesFromCss(cssSource.css, sourceBase);
3933
3936
  }
3934
3937
  function countRuntimeCandidateHits(candidates, runtime) {
@@ -4174,7 +4177,8 @@ async function resolveGeneratorSource(_majorVersion, runtimeState, rawSource, fi
4174
4177
  //#endregion
4175
4178
  //#region src/bundlers/shared/generator-css/source-resolver/resolve-sources.ts
4176
4179
  async function resolveGeneratorResolvedSources(majorVersion, runtimeState, rawSource, file, cssHandlerOptions, generatorOptions, selectionOptions) {
4177
- const cssEntrySource = resolveCssEntrySource(rawSource, resolveCssSourceBase(file, cssHandlerOptions), {
4180
+ const base = resolveCssSourceBase(file, cssHandlerOptions);
4181
+ const cssEntrySource = resolveCssEntrySource(rawSource, base, {
4178
4182
  importFallback: generatorOptions?.importFallback ?? false,
4179
4183
  removeConfig: false
4180
4184
  });
@@ -4391,7 +4395,9 @@ function removeTailwindApplyRules(rawSource) {
4391
4395
  function resolveLegacyCompatCssSource(rawSource) {
4392
4396
  const cached = legacyCompatSourceCache.get(rawSource);
4393
4397
  if (cached !== void 0) return cached;
4394
- const resolved = closeTrailingUnclosedBlocks(removeTailwindV4GeneratedUserCssArtifacts(removeUnsupportedMiniProgramAtRules(removeTailwindApplyRules(removeTailwindSourceDirectives(closeTrailingUnclosedBlocks(stripTailwindBanners(rawSource)))))));
4398
+ const parseableSource = closeTrailingUnclosedBlocks(stripTailwindBanners(rawSource));
4399
+ const source = removeTailwindSourceDirectives(parseableSource);
4400
+ const resolved = closeTrailingUnclosedBlocks(removeTailwindV4GeneratedUserCssArtifacts(removeUnsupportedMiniProgramAtRules(removeTailwindApplyRules(source))));
4395
4401
  setLimitedCacheValue(legacyCompatSourceCache, rawSource, resolved);
4396
4402
  return resolved;
4397
4403
  }
@@ -4421,7 +4427,8 @@ function hasContainerConfigToken(rawSource) {
4421
4427
  }
4422
4428
  function hasConfiguredContainerCompat(rawSource, file, cssHandlerOptions) {
4423
4429
  if (hasContainerConfigToken(rawSource)) return true;
4424
- const cssEntrySource = resolveCssEntrySource(rawSource, resolveCssSourceBase(file, cssHandlerOptions));
4430
+ const base = resolveCssSourceBase(file, cssHandlerOptions);
4431
+ const cssEntrySource = resolveCssEntrySource(rawSource, base);
4425
4432
  if (!cssEntrySource?.config) return false;
4426
4433
  try {
4427
4434
  return /\bcontainer\b/.test(readFileSync(cssEntrySource.config, "utf8"));
@@ -4909,13 +4916,15 @@ async function finalizeDeferredGeneratorCss(context) {
4909
4916
  const cssWithBeforeUserCss = createCssSourceOrderAppend(filterExistingCssRules(css, beforeUserCss), css);
4910
4917
  return reorderMarkedUserLayerComponentsCss(createCssSourceOrderAppend(cssWithBeforeUserCss, filterExistingCssRules(cssWithBeforeUserCss, afterUserCss)));
4911
4918
  }
4912
- return reorderMarkedUserLayerComponentsCss(createCssSourceOrderAppend(css, filterExistingCssRules(css, await transformDeferredUserCss(generatedUserCssRawSource))));
4919
+ const userCss = await transformDeferredUserCss(generatedUserCssRawSource);
4920
+ return reorderMarkedUserLayerComponentsCss(createCssSourceOrderAppend(css, filterExistingCssRules(css, userCss)));
4913
4921
  };
4914
4922
  const canAppendIncrementalCss = generated.target !== "weapp" || !hasUserCssLayerBlocks(generatorRawSource);
4915
4923
  const incrementalRawCss = generated.incrementalRawCss ?? generated.incrementalCss;
4916
4924
  const shouldAppendIncrementalCss = canAppendIncrementalCss && typeof options.previousCss === "string" && typeof incrementalRawCss === "string";
4917
4925
  const normalizedCss = shouldAppendIncrementalCss ? incrementalRawCss.trim().length > 0 ? createCssAppend(options.previousCss, await normalizeDeferredGeneratedCss(incrementalRawCss)) : options.previousCss : await normalizeDeferredGeneratedCss(generated.rawCss ?? generated.css);
4918
- const css = restoreLocalCssImports(shouldAppendIncrementalCss ? normalizedCss : await restoreDeferredUserCss(normalizedCss), localImports, { outputFile: file });
4926
+ const intermediateCss = shouldAppendIncrementalCss ? normalizedCss : await restoreDeferredUserCss(normalizedCss);
4927
+ const css = restoreLocalCssImports(intermediateCss, localImports, { outputFile: file });
4919
4928
  return {
4920
4929
  css,
4921
4930
  classSet: resolveGeneratedCssClassSet(generated.target, generated.classSet, runtimeWithCurrentCss, css, opts.escapeMap, options.previousClassSet),
@@ -5000,7 +5009,8 @@ async function finalizeFallbackGeneratorCss(context) {
5000
5009
  css = createCssSourceOrderAppend(css, missingUserCss);
5001
5010
  } else if (hasMatchedCssSourceFile && generated.target === "weapp" && hasGeneratedMarkers && !hasGeneratedCss) {
5002
5011
  const cleanedUserCssRawSource = removeTailwindV4GeneratedUserCssArtifacts(userCssRawSource);
5003
- const userCss = await transformGeneratorUserCss(restoredDistinctUserLayerCss && hasUserCssLayerBlocks(cleanedUserCssRawSource) ? splitUserCssLayerBlocks(cleanedUserCssRawSource).rest : cleanedUserCssRawSource, {
5012
+ const cleanedUserCssRestSource = restoredDistinctUserLayerCss && hasUserCssLayerBlocks(cleanedUserCssRawSource) ? splitUserCssLayerBlocks(cleanedUserCssRawSource).rest : cleanedUserCssRawSource;
5013
+ const userCss = await transformGeneratorUserCss(cleanedUserCssRestSource, {
5004
5014
  generatorTarget: generated.target,
5005
5015
  generatorStyleOptions,
5006
5016
  cssUserHandlerOptions,
package/dist/index.cjs CHANGED
@@ -1,10 +1,10 @@
1
1
  Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
2
2
  const require_framework = require("./framework.cjs");
3
- const require_generator = require("./generator-B0dCFlP1.cjs");
4
- const require_gulp = require("./gulp-DSrcDQsA.cjs");
3
+ const require_generator = require("./generator-CwMI20jy.cjs");
4
+ const require_gulp = require("./gulp-CWFxs2lE.cjs");
5
5
  const require_postcss = require("./postcss.cjs");
6
- const require_vite = require("./vite-DTDbD-95.cjs");
7
- const require_webpack = require("./webpack-Bpovb6YE.cjs");
6
+ const require_vite = require("./vite-BLB7vjKQ.cjs");
7
+ const require_webpack = require("./webpack-Jn4FJT6y.cjs");
8
8
  require("./webpack.cjs");
9
9
  let _weapp_tailwindcss_postcss = require("@weapp-tailwindcss/postcss");
10
10
  exports.WeappTailwindcss = require_vite.WeappTailwindcss;
package/dist/index.js CHANGED
@@ -1,9 +1,9 @@
1
1
  import { detectAppType, detectAppTypeFromEnv, detectAppTypeFromPackageJson, isMpxPackage, isRunningInHBuilderX, isTaroPackage, isUniAppPackage, isUniAppVitePackage, isUniAppXManifest, isUniAppXPackage, isWeappVitePackage, resolveImplicitAppTypeFromViteRoot, resolveMpxPlatform, resolvePlatform, resolveTaroPlatform, resolveUniAppXPlatform, resolveUniPlatform, resolveUniPlatformsFromEnv, resolveUniUtsPlatform } from "./framework.js";
2
- import { t as createWeappTailwindcssGenerator } from "./generator-BLpOsd5O.js";
3
- import { t as createPlugins } from "./gulp-BLaGc0MJ.js";
2
+ import { t as createWeappTailwindcssGenerator } from "./generator-C2UFjlZ1.js";
3
+ import { t as createPlugins } from "./gulp-CltYkglj.js";
4
4
  import weappTailwindcssPostcssPlugin from "./postcss.js";
5
- import { t as WeappTailwindcss } from "./vite-BWmBFzgf.js";
6
- import { n as weappTailwindcssPackageDir } from "./webpack-CtUyQNqC.js";
5
+ import { t as WeappTailwindcss } from "./vite-q3ilYV7x.js";
6
+ import { n as weappTailwindcssPackageDir } from "./webpack-DExB8tzB.js";
7
7
  import "./webpack.js";
8
8
  import { unitConversionComposeRules, unitConversionPresets } from "@weapp-tailwindcss/postcss";
9
9
  export { WeappTailwindcss, createPlugins, createWeappTailwindcssGenerator, detectAppType, detectAppTypeFromEnv, detectAppTypeFromPackageJson, isMpxPackage, isRunningInHBuilderX, isTaroPackage, isUniAppPackage, isUniAppVitePackage, isUniAppXManifest, isUniAppXPackage, isWeappVitePackage, resolveImplicitAppTypeFromViteRoot, resolveMpxPlatform, resolvePlatform, resolveTaroPlatform, resolveUniAppXPlatform, resolveUniPlatform, resolveUniPlatformsFromEnv, resolveUniUtsPlatform, unitConversionComposeRules, unitConversionPresets, weappTailwindcssPackageDir, weappTailwindcssPostcssPlugin };
@@ -1,4 +1,4 @@
1
- //#region \0@oxc-project+runtime@0.140.0/helpers/esm/typeof.js
1
+ //#region \0@oxc-project+runtime@0.143.0/helpers/esm/typeof.js
2
2
  function _typeof(o) {
3
3
  "@babel/helpers - typeof";
4
4
  return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -8,7 +8,7 @@ function _typeof(o) {
8
8
  }, _typeof(o);
9
9
  }
10
10
  //#endregion
11
- //#region \0@oxc-project+runtime@0.140.0/helpers/esm/toPrimitive.js
11
+ //#region \0@oxc-project+runtime@0.143.0/helpers/esm/toPrimitive.js
12
12
  function toPrimitive(t, r) {
13
13
  if ("object" != _typeof(t) || !t) return t;
14
14
  var e = t[Symbol.toPrimitive];
@@ -20,13 +20,13 @@ function toPrimitive(t, r) {
20
20
  return ("string" === r ? String : Number)(t);
21
21
  }
22
22
  //#endregion
23
- //#region \0@oxc-project+runtime@0.140.0/helpers/esm/toPropertyKey.js
23
+ //#region \0@oxc-project+runtime@0.143.0/helpers/esm/toPropertyKey.js
24
24
  function toPropertyKey(t) {
25
25
  var i = toPrimitive(t, "string");
26
26
  return "symbol" == _typeof(i) ? i : i + "";
27
27
  }
28
28
  //#endregion
29
- //#region \0@oxc-project+runtime@0.140.0/helpers/esm/defineProperty.js
29
+ //#region \0@oxc-project+runtime@0.143.0/helpers/esm/defineProperty.js
30
30
  function _defineProperty(e, r, t) {
31
31
  return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
32
32
  value: t,
@@ -1,4 +1,4 @@
1
- //#region \0@oxc-project+runtime@0.140.0/helpers/esm/typeof.js
1
+ //#region \0@oxc-project+runtime@0.143.0/helpers/esm/typeof.js
2
2
  function _typeof(o) {
3
3
  "@babel/helpers - typeof";
4
4
  return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -8,7 +8,7 @@ function _typeof(o) {
8
8
  }, _typeof(o);
9
9
  }
10
10
  //#endregion
11
- //#region \0@oxc-project+runtime@0.140.0/helpers/esm/toPrimitive.js
11
+ //#region \0@oxc-project+runtime@0.143.0/helpers/esm/toPrimitive.js
12
12
  function toPrimitive(t, r) {
13
13
  if ("object" != _typeof(t) || !t) return t;
14
14
  var e = t[Symbol.toPrimitive];
@@ -20,13 +20,13 @@ function toPrimitive(t, r) {
20
20
  return ("string" === r ? String : Number)(t);
21
21
  }
22
22
  //#endregion
23
- //#region \0@oxc-project+runtime@0.140.0/helpers/esm/toPropertyKey.js
23
+ //#region \0@oxc-project+runtime@0.143.0/helpers/esm/toPropertyKey.js
24
24
  function toPropertyKey(t) {
25
25
  var i = toPrimitive(t, "string");
26
26
  return "symbol" == _typeof(i) ? i : i + "";
27
27
  }
28
28
  //#endregion
29
- //#region \0@oxc-project+runtime@0.140.0/helpers/esm/defineProperty.js
29
+ //#region \0@oxc-project+runtime@0.143.0/helpers/esm/defineProperty.js
30
30
  function _defineProperty(e, r, t) {
31
31
  return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
32
32
  value: t,
@@ -1,5 +1,5 @@
1
- const require_rolldown_runtime = require("./rolldown-runtime-CVvi-lCc.cjs");
2
- const require_generator = require("./generator-B0dCFlP1.cjs");
1
+ const require_rolldown_runtime = require("./rolldown-runtime-Ctb5zv51.cjs");
2
+ const require_generator = require("./generator-CwMI20jy.cjs");
3
3
  let node_fs = require("node:fs");
4
4
  let node_path = require("node:path");
5
5
  node_path = require_rolldown_runtime.__toESM(node_path, 1);
@@ -1,8 +1,8 @@
1
- const require_rolldown_runtime = require("./rolldown-runtime-CVvi-lCc.cjs");
2
- const require_generator = require("./generator-B0dCFlP1.cjs");
3
- const require_v4_generation_core = require("./v4-generation-core-D4zQcQqW.cjs");
1
+ const require_rolldown_runtime = require("./rolldown-runtime-Ctb5zv51.cjs");
2
+ const require_generator = require("./generator-CwMI20jy.cjs");
3
+ const require_v4_generation_core = require("./v4-generation-core-2AuNMweK.cjs");
4
4
  const require_defaults = require("./defaults.cjs");
5
- const require_style_options = require("./style-options-COpQc8fr.cjs");
5
+ const require_style_options = require("./style-options-D0NukP02.cjs");
6
6
  let node_path = require("node:path");
7
7
  node_path = require_rolldown_runtime.__toESM(node_path, 1);
8
8
  let node_process = require("node:process");
@@ -465,11 +465,15 @@ function includesTailwindPreflightImport(source) {
465
465
  function finalizeMiniProgramUserCssAssetSource(source, compilerOptions, isWebGeneratorTarget, options = {}) {
466
466
  const styleOptions = require_style_options.resolveStyleOptionsFromContext(compilerOptions);
467
467
  if (isWebGeneratorTarget) return source;
468
- return (0, _weapp_tailwindcss_postcss.stripMiniProgramCssSpecificityPlaceholders)(removeTailwindV4StandaloneHostPreflightRule((0, _weapp_tailwindcss_postcss.finalizeMiniProgramCss)(require_generator.removeMiniProgramHoverSelectors(source, styleOptions.cssRemoveHoverPseudoClass), {
468
+ const output = removeTailwindV4StandaloneHostPreflightRule((0, _weapp_tailwindcss_postcss.finalizeMiniProgramCss)(require_generator.removeMiniProgramInteractiveSelectors(source, {
469
+ active: styleOptions.cssRemoveActivePseudoClass ?? true,
470
+ hover: styleOptions.cssRemoveHoverPseudoClass ?? true
471
+ }), {
469
472
  cssPreflight: options.cssPreflight === false ? false : !require_v4_generation_core.hasMiniProgramTailwindV4PreflightReset(source) ? resolveConfiguredWebpackCssPreflight(compilerOptions, styleOptions) : void 0,
470
473
  isTailwindcssV4: true,
471
474
  tailwindcssV4GradientFallback: styleOptions.tailwindcssV4GradientFallback
472
- })));
475
+ }));
476
+ return (0, _weapp_tailwindcss_postcss.stripMiniProgramCssSpecificityPlaceholders)(output);
473
477
  }
474
478
  function shouldFallbackToWebpackUserCssOnGeneratorError(options) {
475
479
  return !require_generator.hasTailwindRootDirectives(options.generatorRawSource, { importFallback: true }) && !require_generator.hasTailwindSourceDirectives(options.generatorRawSource, { importFallback: true }) && !require_generator.hasTailwindApplyDirective(options.generatorRawSource) && !options.hasExplicitTailwindV4SourceCss && options.configuredMainCssEntryFilesLength === 0;
@@ -486,7 +490,8 @@ function finalizeWebpackCssAssetSource(source, compilerOptions, isWebGeneratorTa
486
490
  const styleOptions = require_style_options.resolveStyleOptionsFromContext(compilerOptions);
487
491
  if (isWebGeneratorTarget) {
488
492
  if (options.generatedCss === true) return stripTrailingLineWhitespace(require_generator.stripUnmatchedTailwindSourceMediaCloseFragments(require_generator.stripTailwindSourceMediaFragments(require_v4_generation_core.stripBundlerGeneratedCssMarkers(source))));
489
- return stripTrailingLineWhitespace(require_generator.stripUnmatchedTailwindSourceMediaCloseFragments(require_generator.stripTailwindSourceMediaFragments(require_generator.removeTailwindV4GeneratorAtRules(require_generator.removeTailwindSourceDirectives(require_v4_generation_core.stripBundlerGeneratedCssMarkers(source), { importFallback: true })))));
493
+ const finalized = require_generator.removeTailwindSourceDirectives(require_v4_generation_core.stripBundlerGeneratedCssMarkers(source), { importFallback: true });
494
+ return stripTrailingLineWhitespace(require_generator.stripUnmatchedTailwindSourceMediaCloseFragments(require_generator.stripTailwindSourceMediaFragments(require_generator.removeTailwindV4GeneratorAtRules(finalized))));
490
495
  }
491
496
  let finalized = require_generator.removeTailwindSourceDirectives(require_v4_generation_core.stripBundlerGeneratedCssMarkers(source), { importFallback: true });
492
497
  if (options.generatedCss !== true) {
@@ -496,7 +501,10 @@ function finalizeWebpackCssAssetSource(source, compilerOptions, isWebGeneratorTa
496
501
  tailwindcssV4GradientFallback: styleOptions.tailwindcssV4GradientFallback
497
502
  });
498
503
  finalized = dedupeMiniProgramPreflightSelectorRules(finalized);
499
- return (0, _weapp_tailwindcss_postcss.stripMiniProgramCssSpecificityPlaceholders)(require_generator.removeMiniProgramHoverSelectors(finalized, styleOptions.cssRemoveHoverPseudoClass));
504
+ return (0, _weapp_tailwindcss_postcss.stripMiniProgramCssSpecificityPlaceholders)(require_generator.removeMiniProgramInteractiveSelectors(finalized, {
505
+ active: styleOptions.cssRemoveActivePseudoClass ?? true,
506
+ hover: styleOptions.cssRemoveHoverPseudoClass ?? true
507
+ }));
500
508
  }
501
509
  try {
502
510
  finalized = (0, _weapp_tailwindcss_postcss.pruneMiniProgramGeneratedCss)(finalized, { preservePreflight: options.cssPreflight !== false });
@@ -512,12 +520,19 @@ function finalizeWebpackCssAssetSource(source, compilerOptions, isWebGeneratorTa
512
520
  finalized = ensureWebpackMiniProgramTwContentInit(finalized);
513
521
  if (shouldRemoveExistingPreflight) finalized = removeMiniProgramPreflightSelectorRule(finalized);
514
522
  else finalized = dedupeMiniProgramPreflightSelectorRules(finalized);
515
- return (0, _weapp_tailwindcss_postcss.stripMiniProgramCssSpecificityPlaceholders)(require_generator.removeMiniProgramHoverSelectors(finalized, styleOptions.cssRemoveHoverPseudoClass));
523
+ return (0, _weapp_tailwindcss_postcss.stripMiniProgramCssSpecificityPlaceholders)(require_generator.removeMiniProgramInteractiveSelectors(finalized, {
524
+ active: styleOptions.cssRemoveActivePseudoClass ?? true,
525
+ hover: styleOptions.cssRemoveHoverPseudoClass ?? true
526
+ }));
516
527
  }
517
528
  function finalizeWebpackCssAssetOutputSource(source, compilerOptions, isWebGeneratorTarget) {
518
529
  if (isWebGeneratorTarget) return source;
519
530
  const styleOptions = require_style_options.resolveStyleOptionsFromContext(compilerOptions);
520
- return require_v4_generation_core.finalizeMiniProgramCssStructure((0, _weapp_tailwindcss_postcss.stripMiniProgramCssSpecificityPlaceholders)(require_generator.removeMiniProgramHoverSelectors((0, _weapp_tailwindcss_postcss.dedupeCoveredCssRules)(dedupeMiniProgramPreflightSelectorRules(source)), styleOptions.cssRemoveHoverPseudoClass)));
531
+ const finalized = (0, _weapp_tailwindcss_postcss.stripMiniProgramCssSpecificityPlaceholders)(require_generator.removeMiniProgramInteractiveSelectors((0, _weapp_tailwindcss_postcss.dedupeCoveredCssRules)(dedupeMiniProgramPreflightSelectorRules(source)), {
532
+ active: styleOptions.cssRemoveActivePseudoClass ?? true,
533
+ hover: styleOptions.cssRemoveHoverPseudoClass ?? true
534
+ }));
535
+ return require_v4_generation_core.finalizeMiniProgramCssStructure(finalized);
521
536
  }
522
537
  function collectWebpackJsRuntimeCandidatesFromAssets(options) {
523
538
  if (options.isWebGeneratorTarget) return;
@@ -1,4 +1,4 @@
1
- const require_rolldown_runtime = require("./rolldown-runtime-CVvi-lCc.cjs");
1
+ const require_rolldown_runtime = require("./rolldown-runtime-Ctb5zv51.cjs");
2
2
  let _weapp_tailwindcss_postcss_html_transform = require("@weapp-tailwindcss/postcss/html-transform");
3
3
  _weapp_tailwindcss_postcss_html_transform = require_rolldown_runtime.__toESM(_weapp_tailwindcss_postcss_html_transform, 1);
4
4
  //#region src/postcss-html-transform.ts
package/dist/postcss.cjs CHANGED
@@ -2,7 +2,7 @@ Object.defineProperties(exports, {
2
2
  __esModule: { value: true },
3
3
  [Symbol.toStringTag]: { value: "Module" }
4
4
  });
5
- const require_generator = require("./generator-B0dCFlP1.cjs");
5
+ const require_generator = require("./generator-CwMI20jy.cjs");
6
6
  const weappTailwindcssPostcssPlugin = (0, require("@weapp-tailwindcss/postcss").createWeappTailwindcssPostcssPlugin)({
7
7
  createGenerator: (source) => {
8
8
  return require_generator.createWeappTailwindcssGenerator(source);
package/dist/postcss.js CHANGED
@@ -1,4 +1,4 @@
1
- import { i as normalizeWeappTailwindcssGeneratorOptions, t as createWeappTailwindcssGenerator, u as resolveTailwindV4Source } from "./generator-BLpOsd5O.js";
1
+ import { i as normalizeWeappTailwindcssGeneratorOptions, t as createWeappTailwindcssGenerator, u as resolveTailwindV4Source } from "./generator-C2UFjlZ1.js";
2
2
  import { createWeappTailwindcssPostcssPlugin } from "@weapp-tailwindcss/postcss";
3
3
  const weappTailwindcssPostcssPlugin = createWeappTailwindcssPostcssPlugin({
4
4
  createGenerator: (source) => {
package/dist/presets.cjs CHANGED
@@ -1,10 +1,10 @@
1
1
  Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
2
- const require_rolldown_runtime = require("./rolldown-runtime-CVvi-lCc.cjs");
2
+ const require_rolldown_runtime = require("./rolldown-runtime-Ctb5zv51.cjs");
3
3
  const require_framework = require("./framework.cjs");
4
- const require_object = require("./object-C_Vr6_S5.cjs");
5
- const require_options = require("./options-zpZez7qe.cjs");
4
+ const require_object = require("./object-DbHtAXRk.cjs");
5
+ const require_options = require("./options-CSqLm6U2.cjs");
6
6
  require("./utils-CuKLf1Zv.cjs");
7
- const require_tailwindcss = require("./tailwindcss-LtnGCxF0.cjs");
7
+ const require_tailwindcss = require("./tailwindcss-B3lqgbln.cjs");
8
8
  require("./logger-TlKT3xmR.cjs");
9
9
  let node_path = require("node:path");
10
10
  node_path = require_rolldown_runtime.__toESM(node_path, 1);
@@ -54,7 +54,8 @@ function createBasePreset(options = {}) {
54
54
  } : tailwindConfig
55
55
  }
56
56
  };
57
- return (0, _weapp_tailwindcss_shared.defuOverrideArray)((0, _weapp_tailwindcss_shared.defuOverrideArray)(userOptions, rawOptions ?? {}), preset);
57
+ const mergedUserOptions = (0, _weapp_tailwindcss_shared.defuOverrideArray)(userOptions, rawOptions ?? {});
58
+ return (0, _weapp_tailwindcss_shared.defuOverrideArray)(mergedUserOptions, preset);
58
59
  }
59
60
  //#endregion
60
61
  //#region src/presets/hbuilderx.ts
package/dist/presets.js CHANGED
@@ -1,6 +1,6 @@
1
1
  import { resolveTaroPlatform, resolveUniPlatformsFromEnv } from "./framework.js";
2
- import { t as omitUndefined } from "./object-Bvy6-w9r.js";
3
- import { i as resolveUniAppXOptions, n as resolveTailwindcssBasedir } from "./tailwindcss-2zdmASlM.js";
2
+ import { t as omitUndefined } from "./object-B-8IHefx.js";
3
+ import { i as resolveUniAppXOptions, n as resolveTailwindcssBasedir } from "./tailwindcss-vbApajUH.js";
4
4
  import { n as defuOverrideArray } from "./utils-MVwpU07P.js";
5
5
  import { t as logger } from "./logger-BNzxZbZj.js";
6
6
  import path from "node:path";
@@ -47,7 +47,8 @@ function createBasePreset(options = {}) {
47
47
  } : tailwindConfig
48
48
  }
49
49
  };
50
- return defuOverrideArray(defuOverrideArray(userOptions, rawOptions ?? {}), preset);
50
+ const mergedUserOptions = defuOverrideArray(userOptions, rawOptions ?? {});
51
+ return defuOverrideArray(mergedUserOptions, preset);
51
52
  }
52
53
  //#endregion
53
54
  //#region src/presets/hbuilderx.ts
package/dist/reset.cjs CHANGED
@@ -2,7 +2,7 @@ Object.defineProperties(exports, {
2
2
  __esModule: { value: true },
3
3
  [Symbol.toStringTag]: { value: "Module" }
4
4
  });
5
- const require_rolldown_runtime = require("./rolldown-runtime-CVvi-lCc.cjs");
5
+ const require_rolldown_runtime = require("./rolldown-runtime-Ctb5zv51.cjs");
6
6
  let _weapp_tailwindcss_reset = require("@weapp-tailwindcss/reset");
7
7
  _weapp_tailwindcss_reset = require_rolldown_runtime.__toESM(_weapp_tailwindcss_reset, 1);
8
8
  Object.defineProperty(exports, "default", {
@@ -25,7 +25,7 @@ var __copyProps = (to, from, except, desc) => {
25
25
  }
26
26
  return to;
27
27
  };
28
- var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
28
+ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule || !__hasOwnProp.call(mod, "default") ? __defProp(target, "default", {
29
29
  value: mod,
30
30
  enumerable: true
31
31
  }) : target, mod));
package/dist/rspack.cjs CHANGED
@@ -1,6 +1,6 @@
1
1
  Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
2
- const require_rolldown_runtime = require("./rolldown-runtime-CVvi-lCc.cjs");
3
- const require_webpack = require("./webpack-Bpovb6YE.cjs");
2
+ const require_rolldown_runtime = require("./rolldown-runtime-Ctb5zv51.cjs");
3
+ const require_webpack = require("./webpack-Jn4FJT6y.cjs");
4
4
  let node_path = require("node:path");
5
5
  node_path = require_rolldown_runtime.__toESM(node_path, 1);
6
6
  //#region src/bundlers/rspack/index.ts
package/dist/rspack.js CHANGED
@@ -1,4 +1,4 @@
1
- import { n as weappTailwindcssPackageDir, r as __dirname, t as WeappTailwindcss } from "./webpack-CtUyQNqC.js";
1
+ import { n as weappTailwindcssPackageDir, r as __dirname, t as WeappTailwindcss } from "./webpack-DExB8tzB.js";
2
2
  import path from "node:path";
3
3
  //#region src/bundlers/rspack/index.ts
4
4
  const CSS_IMPORT_REWRITE_LOADER_NAME = "weapp-tw-css-import-rewrite-loader";
@@ -1,8 +1,8 @@
1
1
  import { detectAppType } from "./framework.js";
2
- import { At as toPosixPath } from "./generator-BLpOsd5O.js";
2
+ import { At as toPosixPath } from "./generator-C2UFjlZ1.js";
3
3
  import { n as hasCssMacroTailwindV4CustomVariantConditionalComments } from "./auto-2dg_uhEJ.js";
4
- import { _ as resolveTailwindV4EntriesFromCssCached, i as resolveUniAppXOptions } from "./tailwindcss-2zdmASlM.js";
5
- import { S as isSourceStyleRequest } from "./hmr-timing-DXyGw6jp.js";
4
+ import { _ as resolveTailwindV4EntriesFromCssCached, i as resolveUniAppXOptions } from "./tailwindcss-vbApajUH.js";
5
+ import { S as isSourceStyleRequest } from "./hmr-timing-D6JKLBCD.js";
6
6
  import { createRequire } from "node:module";
7
7
  import path from "node:path";
8
8
  import { weappStyleInjector } from "weapp-style-injector/vite";
@@ -357,7 +357,8 @@ function resolveScopedSourceEntries(rawSource, sourceFile, resolvedEntries) {
357
357
  return { entries: createLocalSourceEntries(sourceFile) };
358
358
  }
359
359
  async function resolveScopedGeneratorSourceEntries(rawSource, sourceFile) {
360
- return resolveScopedSourceEntries(rawSource, sourceFile, (await resolveTailwindV4EntriesFromCssCached(rawSource, path.dirname(path.resolve(sourceFile.replace(/[?#].*$/, "")))))?.entries);
360
+ const sourceBase = path.dirname(path.resolve(sourceFile.replace(/[?#].*$/, "")));
361
+ return resolveScopedSourceEntries(rawSource, sourceFile, (await resolveTailwindV4EntriesFromCssCached(rawSource, sourceBase))?.entries);
361
362
  }
362
363
  async function createScopedGeneratorCandidateSignature(rawSource, sourceFile, fallbackSignature, getSourceCandidatesForEntries, options = {}) {
363
364
  if (!getSourceCandidatesForEntries || !hasOwnSourceDirectives(rawSource)) return fallbackSignature;
@@ -1,9 +1,9 @@
1
- const require_rolldown_runtime = require("./rolldown-runtime-CVvi-lCc.cjs");
1
+ const require_rolldown_runtime = require("./rolldown-runtime-Ctb5zv51.cjs");
2
2
  const require_framework = require("./framework.cjs");
3
- const require_generator = require("./generator-B0dCFlP1.cjs");
3
+ const require_generator = require("./generator-CwMI20jy.cjs");
4
4
  require("./auto-DtU6f3X6.cjs");
5
- const require_options = require("./options-zpZez7qe.cjs");
6
- const require_v4_generation_core = require("./v4-generation-core-D4zQcQqW.cjs");
5
+ const require_options = require("./options-CSqLm6U2.cjs");
6
+ const require_v4_generation_core = require("./v4-generation-core-2AuNMweK.cjs");
7
7
  let node_path = require("node:path");
8
8
  node_path = require_rolldown_runtime.__toESM(node_path, 1);
9
9
  let node_module = require("node:module");
@@ -360,7 +360,8 @@ function resolveScopedSourceEntries(rawSource, sourceFile, resolvedEntries) {
360
360
  return { entries: createLocalSourceEntries(sourceFile) };
361
361
  }
362
362
  async function resolveScopedGeneratorSourceEntries(rawSource, sourceFile) {
363
- return resolveScopedSourceEntries(rawSource, sourceFile, (await require_options.resolveTailwindV4EntriesFromCssCached(rawSource, node_path.default.dirname(node_path.default.resolve(sourceFile.replace(/[?#].*$/, "")))))?.entries);
363
+ const sourceBase = node_path.default.dirname(node_path.default.resolve(sourceFile.replace(/[?#].*$/, "")));
364
+ return resolveScopedSourceEntries(rawSource, sourceFile, (await require_options.resolveTailwindV4EntriesFromCssCached(rawSource, sourceBase))?.entries);
364
365
  }
365
366
  async function createScopedGeneratorCandidateSignature(rawSource, sourceFile, fallbackSignature, getSourceCandidatesForEntries, options = {}) {
366
367
  if (!getSourceCandidatesForEntries || !hasOwnSourceDirectives(rawSource)) return fallbackSignature;