weapp-tailwindcss 5.2.12 → 5.2.14

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 (52) hide show
  1. package/dist/bundlers/shared/hmr-timing.d.ts +1 -0
  2. package/dist/bundlers/shared/source-candidates/scan-root.d.ts +2 -0
  3. package/dist/bundlers/shared/source-candidates/types-and-cache.d.ts +2 -0
  4. package/dist/bundlers/vite/css-finalizer/generic-web-fast-path.d.ts +16 -0
  5. package/dist/bundlers/vite/css-finalizer/options.d.ts +5 -0
  6. package/dist/bundlers/vite/generate-bundle/types.d.ts +1 -0
  7. package/dist/bundlers/vite/shared/framework-source-scan-session.d.ts +2 -2
  8. package/dist/bundlers/vite/shared/generic-web-production-fast-path.d.ts +28 -0
  9. package/dist/bundlers/webpack/loaders/runtime-registry.d.ts +1 -0
  10. package/dist/{context-DW4ukjx4.js → context-CKQKq4Mv.js} +2 -2
  11. package/dist/{context-zWINV_E2.cjs → context-vWlNv-Cf.cjs} +5 -5
  12. package/dist/core.cjs +1 -1
  13. package/dist/core.js +1 -1
  14. package/dist/{generator-C2UFjlZ1.js → generator-BP4WmgIo.js} +1 -5
  15. package/dist/{generator-CwMI20jy.cjs → generator-BXrWA7Sj.cjs} +6 -10
  16. package/dist/generator.cjs +1 -1
  17. package/dist/generator.js +1 -1
  18. package/dist/{gulp-CltYkglj.js → gulp-DG6cWPF4.js} +4 -4
  19. package/dist/{gulp-CWFxs2lE.cjs → gulp-DzIR7eO3.cjs} +7 -7
  20. package/dist/gulp.cjs +1 -1
  21. package/dist/gulp.js +1 -1
  22. package/dist/{hmr-timing-BjOxhci8.cjs → hmr-timing-BIPr9t9m.cjs} +3 -3
  23. package/dist/{hmr-timing-D6JKLBCD.js → hmr-timing-CoyM6Dg2.js} +35 -8
  24. package/dist/index.cjs +4 -4
  25. package/dist/index.js +4 -4
  26. package/dist/{options-CSqLm6U2.cjs → options-DbYws6lr.cjs} +7 -16
  27. package/dist/{pipeline-helpers-Cj9ZzHaY.cjs → pipeline-helpers-Bp343-ik.cjs} +3 -3
  28. package/dist/postcss.cjs +1 -1
  29. package/dist/postcss.js +1 -1
  30. package/dist/presets.cjs +2 -2
  31. package/dist/presets.js +1 -1
  32. package/dist/rspack.cjs +1 -1
  33. package/dist/rspack.js +1 -1
  34. package/dist/{runtime-registry-Y7NrD2WH.cjs → runtime-registry-BlIjpImP.cjs} +10 -0
  35. package/dist/{source-candidate-scan-signature-DQZ_DkgW.js → source-candidate-scan-signature-BLXoEZN5.js} +3 -3
  36. package/dist/{source-candidate-scan-signature-uRHl5Ne9.cjs → source-candidate-scan-signature-J9EW91KX.cjs} +3 -3
  37. package/dist/{style-options-D0NukP02.cjs → style-options-Cta1OP3i.cjs} +2 -2
  38. package/dist/{tailwindcss-vbApajUH.js → tailwindcss-C2K-vjJv.js} +8 -11
  39. package/dist/{tailwindcss-B3lqgbln.cjs → tailwindcss-D1M2xj5O.cjs} +2 -2
  40. package/dist/{v4-generation-core-2AuNMweK.cjs → v4-generation-core-CCnEsAgV.cjs} +40 -7
  41. package/dist/{vite-q3ilYV7x.js → vite-DNTQV3gN.js} +280 -60
  42. package/dist/{vite-BLB7vjKQ.cjs → vite-RJpkDte7.cjs} +283 -63
  43. package/dist/vite.cjs +1 -1
  44. package/dist/vite.js +1 -1
  45. package/dist/weapp-tw-css-generation-loader.cjs +1 -1
  46. package/dist/weapp-tw-css-import-rewrite-loader.cjs +9 -8
  47. package/dist/weapp-tw-runtime-classset-loader.cjs +1 -1
  48. package/dist/{webpack-Jn4FJT6y.cjs → webpack-BY5y7f0X.cjs} +15 -14
  49. package/dist/{webpack-DExB8tzB.js → webpack-DYoIysDo.js} +11 -10
  50. package/dist/webpack.cjs +1 -1
  51. package/dist/webpack.js +1 -1
  52. package/package.json +2 -2
package/dist/rspack.cjs CHANGED
@@ -1,6 +1,6 @@
1
1
  Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
2
2
  const require_rolldown_runtime = require("./rolldown-runtime-Ctb5zv51.cjs");
3
- const require_webpack = require("./webpack-Jn4FJT6y.cjs");
3
+ const require_webpack = require("./webpack-BY5y7f0X.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-DExB8tzB.js";
1
+ import { n as weappTailwindcssPackageDir, r as __dirname, t as WeappTailwindcss } from "./webpack-DYoIysDo.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";
@@ -10,6 +10,10 @@ function deleteWebpackLoaderRuntime(key) {
10
10
  function getWebpackLoaderRuntime(key) {
11
11
  return key ? runtimeRegistry.get(key) : void 0;
12
12
  }
13
+ /** 获取当前编译器注册的最新运行时,供 Rspeedy 静态 CSS 规则使用。 */
14
+ function getLatestWebpackLoaderRuntime() {
15
+ return [...runtimeRegistry.values()].at(-1);
16
+ }
13
17
  //#endregion
14
18
  Object.defineProperty(exports, "deleteWebpackLoaderRuntime", {
15
19
  enumerable: true,
@@ -17,6 +21,12 @@ Object.defineProperty(exports, "deleteWebpackLoaderRuntime", {
17
21
  return deleteWebpackLoaderRuntime;
18
22
  }
19
23
  });
24
+ Object.defineProperty(exports, "getLatestWebpackLoaderRuntime", {
25
+ enumerable: true,
26
+ get: function() {
27
+ return getLatestWebpackLoaderRuntime;
28
+ }
29
+ });
20
30
  Object.defineProperty(exports, "getWebpackLoaderRuntime", {
21
31
  enumerable: true,
22
32
  get: function() {
@@ -1,8 +1,8 @@
1
1
  import { detectAppType } from "./framework.js";
2
- import { At as toPosixPath } from "./generator-C2UFjlZ1.js";
2
+ import { At as toPosixPath } from "./generator-BP4WmgIo.js";
3
3
  import { n as hasCssMacroTailwindV4CustomVariantConditionalComments } from "./auto-2dg_uhEJ.js";
4
- import { _ as resolveTailwindV4EntriesFromCssCached, i as resolveUniAppXOptions } from "./tailwindcss-vbApajUH.js";
5
- import { S as isSourceStyleRequest } from "./hmr-timing-D6JKLBCD.js";
4
+ import { g as resolveTailwindV4EntriesFromCssCached, i as resolveUniAppXOptions } from "./tailwindcss-C2K-vjJv.js";
5
+ import { S as isSourceStyleRequest } from "./hmr-timing-CoyM6Dg2.js";
6
6
  import { createRequire } from "node:module";
7
7
  import path from "node:path";
8
8
  import { weappStyleInjector } from "weapp-style-injector/vite";
@@ -1,9 +1,9 @@
1
1
  const require_rolldown_runtime = require("./rolldown-runtime-Ctb5zv51.cjs");
2
2
  const require_framework = require("./framework.cjs");
3
- const require_generator = require("./generator-CwMI20jy.cjs");
3
+ const require_generator = require("./generator-BXrWA7Sj.cjs");
4
4
  require("./auto-DtU6f3X6.cjs");
5
- const require_options = require("./options-CSqLm6U2.cjs");
6
- const require_v4_generation_core = require("./v4-generation-core-2AuNMweK.cjs");
5
+ const require_options = require("./options-DbYws6lr.cjs");
6
+ const require_v4_generation_core = require("./v4-generation-core-CCnEsAgV.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");
@@ -1,5 +1,5 @@
1
- const require_generator = require("./generator-CwMI20jy.cjs");
2
- const require_options = require("./options-CSqLm6U2.cjs");
1
+ const require_generator = require("./generator-BXrWA7Sj.cjs");
2
+ const require_options = require("./options-DbYws6lr.cjs");
3
3
  //#region src/context/style-options.ts
4
4
  function normalizeStyleHandlerMajorVersion(majorVersion) {
5
5
  return majorVersion === 4 ? 4 : void 0;
@@ -1,4 +1,4 @@
1
- import { C as findWorkspacePackageDir, Ct as expandTailwindSourceEntries, D as resolveTailwindcssOptions, Dt as resolveCssSourceEntries, E as normalizeTailwindcssRuntimeOptions, Et as parseConfigParam, Lt as loadTailwindV4DesignSystem, Nt as resolveCssMacroTailwindV4Source, O as normalizeStringListOption, S as findNearestPackageRoot, St as createTailwindSourceEntryMatcher, T as normalizeExtendLengthUnits, Tt as normalizeLegacyContentEntries, b as isTailwindV4CssEntry, d as resolveTailwindV4SourceFromRuntime, h as hasConfiguredTailwindV4CssRoots, i as normalizeWeappTailwindcssGeneratorOptions, kt as resolveTailwindV4CssSourceBase, m as filterTailwindV4CssSourceRoots, p as resolveTailwindV4SourceOptionsFromRuntime, v as groupCssEntriesByBase, w as findWorkspaceRoot, x as normalizeCssEntries, xt as FULL_SOURCE_SCAN_PATTERN, y as guessBasedirFromEntries } from "./generator-C2UFjlZ1.js";
1
+ import { C as findWorkspacePackageDir, D as resolveTailwindcssOptions, Dt as resolveCssSourceEntries, E as normalizeTailwindcssRuntimeOptions, Et as parseConfigParam, Lt as loadTailwindV4DesignSystem, Nt as resolveCssMacroTailwindV4Source, O as normalizeStringListOption, S as findNearestPackageRoot, St as expandTailwindSourceEntries, T as normalizeExtendLengthUnits, Tt as normalizeLegacyContentEntries, b as isTailwindV4CssEntry, d as resolveTailwindV4SourceFromRuntime, h as hasConfiguredTailwindV4CssRoots, i as normalizeWeappTailwindcssGeneratorOptions, kt as resolveTailwindV4CssSourceBase, m as filterTailwindV4CssSourceRoots, p as resolveTailwindV4SourceOptionsFromRuntime, v as groupCssEntriesByBase, w as findWorkspaceRoot, x as normalizeCssEntries, xt as FULL_SOURCE_SCAN_PATTERN, y as guessBasedirFromEntries } from "./generator-BP4WmgIo.js";
2
2
  import { t as omitUndefined } from "./object-B-8IHefx.js";
3
3
  import { n as defuOverrideArray$1 } from "./utils-MVwpU07P.js";
4
4
  import { createRequire } from "node:module";
@@ -602,6 +602,7 @@ function createResolvedV4CssScanInput(entries, inlineCandidates, explicit) {
602
602
  }
603
603
  async function resolveSourceScanEntries(options, runtime, scanOptions = {}) {
604
604
  const sourceOptions = resolveTailwindV4SourceOptionsFromRuntime(runtime);
605
+ const configuredSourceEntries = sourceOptions.sources ?? [];
605
606
  const cssEntries = collectExistingCssEntries(options);
606
607
  if (cssEntries.length === 0 && !sourceOptions.css && !sourceOptions.cssSources?.length) {
607
608
  const scanRoot = scanOptions.root;
@@ -614,7 +615,7 @@ async function resolveSourceScanEntries(options, runtime, scanOptions = {}) {
614
615
  const entries = [];
615
616
  const cssInlineCandidates = [];
616
617
  const dependencies = /* @__PURE__ */ new Set();
617
- let explicit = false;
618
+ let explicit = configuredSourceEntries.length > 0;
618
619
  let readableCssEntryCount = 0;
619
620
  for (const cssEntry of cssEntries) {
620
621
  addSourceScanDependency(dependencies, cssEntry);
@@ -636,13 +637,13 @@ async function resolveSourceScanEntries(options, runtime, scanOptions = {}) {
636
637
  const inlineCandidates = mergeTailwindInlineSourceCandidates(cssInlineCandidates);
637
638
  const scanEntries = createMergedCssEntrySourceScanEntries(entries, { sourceCount: readableCssEntryCount });
638
639
  if (scanEntries.length > 0 || inlineCandidates || explicit || readableCssEntryCount > 0) return createResolvedSourceScan({
639
- entries: resolveExplicitSourceScanEntries(scanEntries, explicit),
640
+ entries: resolveExplicitSourceScanEntries([...configuredSourceEntries, ...scanEntries], explicit),
640
641
  explicit,
641
642
  inlineCandidates
642
643
  }, dependencies);
643
644
  if (typeof sourceOptions.css === "string" && sourceOptions.css.length > 0) {
644
645
  const resolved = await resolveTailwindV4EntriesFromCssCached(sourceOptions.css, sourceOptions.base ?? sourceOptions.projectRoot ?? process.cwd());
645
- return resolved ? createResolvedSourceScan(createResolvedV4CssScanInput(resolved.entries, resolved.inlineCandidates, resolved.explicit), new Set(resolved.dependencies)) : void 0;
646
+ return resolved ? createResolvedSourceScan(createResolvedV4CssScanInput([...configuredSourceEntries, ...resolved.entries], resolved.inlineCandidates, explicit || resolved.explicit), new Set(resolved.dependencies)) : void 0;
646
647
  }
647
648
  const sourceOptionBase = sourceOptions.base ?? sourceOptions.projectRoot ?? process.cwd();
648
649
  const configuredCssSources = collectConfiguredCssSources(options);
@@ -662,7 +663,7 @@ async function resolveSourceScanEntries(options, runtime, scanOptions = {}) {
662
663
  const cssSourceCount = (sourceOptions.cssSources?.length ?? 0) + configuredCssSources.length;
663
664
  const cssSourceScanEntries = createMergedCssEntrySourceScanEntries(entries, { sourceCount: cssSourceCount });
664
665
  if (cssSourceScanEntries.length > 0 || cssSourceInlineCandidates || explicit) return createResolvedSourceScan({
665
- entries: resolveExplicitSourceScanEntries(cssSourceScanEntries, explicit),
666
+ entries: resolveExplicitSourceScanEntries([...configuredSourceEntries, ...cssSourceScanEntries], explicit),
666
667
  explicit,
667
668
  inlineCandidates: cssSourceInlineCandidates
668
669
  }, dependencies);
@@ -671,11 +672,7 @@ async function resolveSourceScanEntries(options, runtime, scanOptions = {}) {
671
672
  addSourceScanDependency(dependencies, source.file);
672
673
  addSourceScanDependencies(dependencies, source.dependencies);
673
674
  const resolved = await resolveTailwindV4EntriesFromCssCached(source.css, source.base);
674
- return resolved ? createResolvedSourceScan(createResolvedV4CssScanInput(resolved.entries.length > 0 ? resolved.entries : [], resolved.inlineCandidates, resolved.entries.length > 0 ? resolved.explicit : false), /* @__PURE__ */ new Set([...dependencies, ...resolved.dependencies])) : void 0;
675
- }
676
- function createSourceScanMatcher(entries) {
677
- if (entries?.length === 0) return () => false;
678
- return createTailwindSourceEntryMatcher(entries);
675
+ return resolved ? createResolvedSourceScan(createResolvedV4CssScanInput(resolved.entries.length > 0 ? [...configuredSourceEntries, ...resolved.entries] : configuredSourceEntries, resolved.inlineCandidates, explicit || (resolved.entries.length > 0 ? resolved.explicit : false)), /* @__PURE__ */ new Set([...dependencies, ...resolved.dependencies])) : void 0;
679
676
  }
680
677
  //#endregion
681
678
  //#region src/tailwindcss/runtime/cache.ts
@@ -1608,4 +1605,4 @@ function createTailwindcssRuntimeFromContext(ctx) {
1608
1605
  return createTailwindcssRuntimeForBase(resolvedTailwindcssBasedir, normalizedCssEntries ?? rawCssEntries, runtimeOptions);
1609
1606
  }
1610
1607
  //#endregion
1611
- export { resolveTailwindV4EntriesFromCssCached as _, findTailwindConfig as a, getRuntimeClassSetCacheEntry as c, invalidateRuntimeClassSet as d, createSourceScanMatcher as f, resolveTailwindV4EntriesFromCss as g, resolveTailwindV4CssDependencies as h, resolveUniAppXOptions as i, getRuntimeClassSetSignature as l, discoverTailwindV4CssEntries as m, resolveTailwindcssBasedir as n, applyV4CssCalcDefaults as o, resolveSourceScanEntries as p, isUniAppXEnabled as r, warnMissingCssEntries as s, createTailwindcssRuntimeFromContext as t, getRuntimeClassSetSignatureWithSources as u, includesTailwindV4PreflightDirective as v, collectCssInlineSourceCandidates as y };
1608
+ export { includesTailwindV4PreflightDirective as _, findTailwindConfig as a, getRuntimeClassSetCacheEntry as c, invalidateRuntimeClassSet as d, resolveSourceScanEntries as f, resolveTailwindV4EntriesFromCssCached as g, resolveTailwindV4EntriesFromCss as h, resolveUniAppXOptions as i, getRuntimeClassSetSignature as l, resolveTailwindV4CssDependencies as m, resolveTailwindcssBasedir as n, applyV4CssCalcDefaults as o, discoverTailwindV4CssEntries as p, isUniAppXEnabled as r, warnMissingCssEntries as s, createTailwindcssRuntimeFromContext as t, getRuntimeClassSetSignatureWithSources as u, collectCssInlineSourceCandidates as v };
@@ -1,7 +1,7 @@
1
1
  const require_rolldown_runtime = require("./rolldown-runtime-Ctb5zv51.cjs");
2
- const require_generator = require("./generator-CwMI20jy.cjs");
2
+ const require_generator = require("./generator-BXrWA7Sj.cjs");
3
3
  const require_object = require("./object-DbHtAXRk.cjs");
4
- const require_options = require("./options-CSqLm6U2.cjs");
4
+ const require_options = require("./options-DbYws6lr.cjs");
5
5
  require("./utils-CuKLf1Zv.cjs");
6
6
  let node_fs = require("node:fs");
7
7
  let node_path = require("node:path");
@@ -1,10 +1,10 @@
1
1
  const require_rolldown_runtime = require("./rolldown-runtime-Ctb5zv51.cjs");
2
- const require_generator = require("./generator-CwMI20jy.cjs");
2
+ const require_generator = require("./generator-BXrWA7Sj.cjs");
3
3
  require("./auto-DtU6f3X6.cjs");
4
4
  const require_object = require("./object-DbHtAXRk.cjs");
5
- const require_options = require("./options-CSqLm6U2.cjs");
5
+ const require_options = require("./options-DbYws6lr.cjs");
6
6
  const require_wxml = require("./wxml-CQmBCjOR.cjs");
7
- const require_style_options = require("./style-options-D0NukP02.cjs");
7
+ const require_style_options = require("./style-options-Cta1OP3i.cjs");
8
8
  let node_fs = require("node:fs");
9
9
  let node_path = require("node:path");
10
10
  node_path = require_rolldown_runtime.__toESM(node_path, 1);
@@ -110,6 +110,28 @@ function createDefaultIgnoredSources(root, outDirIgnore, entries, explicit) {
110
110
  negated: true
111
111
  }] : []];
112
112
  }
113
+ /** 创建与文件系统 root scan 一致的增量源码资格判断器。 */
114
+ function createSourceCandidateEligibilityMatcher(roots, eligibleFiles) {
115
+ const eligibleFileSet = eligibleFiles === void 0 ? void 0 : new Set([...eligibleFiles].map(require_generator.resolveSourceScanPath));
116
+ const matchers = roots.map((options) => {
117
+ const root = require_generator.resolveSourceScanPath(options.root);
118
+ const outDirIgnore = resolveOutDirIgnorePattern(root, options.outDir);
119
+ const entries = options.entries;
120
+ const explicit = options.explicit === true;
121
+ const hasPositiveEntry = entries?.some((entry) => !entry.negated) === true;
122
+ const ignoredSources = createDefaultIgnoredSources(root, outDirIgnore, entries, explicit);
123
+ return (resolvedFile) => {
124
+ if (explicit) return hasPositiveEntry && require_generator.isFileMatchedByTailwindSourceEntries(resolvedFile, entries);
125
+ const relative = node_path.default.relative(root, resolvedFile);
126
+ if (!relative || relative.startsWith("..") || node_path.default.isAbsolute(relative)) return false;
127
+ return require_generator.isFileMatchedByTailwindSourceEntries(resolvedFile, entries) && !require_generator.isFileExcludedByTailwindSourceEntries(resolvedFile, ignoredSources) && (eligibleFileSet?.has(resolvedFile) ?? true);
128
+ };
129
+ });
130
+ return (file) => {
131
+ const resolvedFile = require_generator.resolveSourceScanPath(file);
132
+ return matchers.some((matches) => matches(resolvedFile));
133
+ };
134
+ }
113
135
  function resolveSourceCandidateScanFiles(options) {
114
136
  const resolvedRoot = node_path.default.resolve(options.root);
115
137
  if (options.explicit && options.entries?.length && options.entries.every((entry) => entry.negated)) return Promise.resolve([]);
@@ -366,15 +388,19 @@ function createSourceCandidateStore(options = {}) {
366
388
  throw error;
367
389
  }
368
390
  }
369
- async function scanRoot({ entries, explicit, root, outDir }) {
370
- const files = await resolveSourceCandidateScanFiles({
391
+ async function resolveScanFiles({ entries, explicit, root, outDir }) {
392
+ return (await resolveSourceCandidateScanFiles({
371
393
  entries,
372
394
  explicit,
373
395
  filter: isSourceCandidateRequest,
374
396
  outDir,
375
397
  root
376
- });
377
- await Promise.all(files.map((file) => syncFile(require_generator.resolveSourceScanPath(file))));
398
+ })).map(require_generator.resolveSourceScanPath);
399
+ }
400
+ async function scanRoot(options) {
401
+ const resolvedFiles = await resolveScanFiles(options);
402
+ options.onFilesResolved?.(resolvedFiles);
403
+ await Promise.all(resolvedFiles.map(syncFile));
378
404
  }
379
405
  function replaceFinal(id, nextCandidates) {
380
406
  const normalizedId = cleanUrl(id);
@@ -560,6 +586,7 @@ function createSourceCandidateStore(options = {}) {
560
586
  syncFile,
561
587
  syncCurrentSource,
562
588
  syncCurrentFile,
589
+ resolveScanFiles,
563
590
  scanRoot,
564
591
  syncInline,
565
592
  remove,
@@ -5434,6 +5461,12 @@ Object.defineProperty(exports, "createSourceCandidateCollector", {
5434
5461
  return createSourceCandidateCollector;
5435
5462
  }
5436
5463
  });
5464
+ Object.defineProperty(exports, "createSourceCandidateEligibilityMatcher", {
5465
+ enumerable: true,
5466
+ get: function() {
5467
+ return createSourceCandidateEligibilityMatcher;
5468
+ }
5469
+ });
5437
5470
  Object.defineProperty(exports, "createSourceCandidateStore", {
5438
5471
  enumerable: true,
5439
5472
  get: function() {