weapp-tailwindcss 5.0.0-next.25 → 5.0.0-next.27

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 (68) hide show
  1. package/dist/{auto-B11j1XiD.js → auto-DP-qtQzE.js} +5 -7
  2. package/dist/{auto-AduSz49t.mjs → auto-XyKTOP7B.mjs} +4 -6
  3. package/dist/{bundle-state-CBouNDzi.mjs → bundle-state-7DRnJcJp.mjs} +1 -2
  4. package/dist/{bundle-state-BY7PWHAc.js → bundle-state-Nn90UQDa.js} +3 -4
  5. package/dist/bundlers/vite/index.d.ts +5 -2
  6. package/dist/bundlers/vite/serve-css-generation.d.ts +11 -0
  7. package/dist/bundlers/vite/source-candidates.d.ts +3 -0
  8. package/dist/bundlers/webpack/BaseUnifiedPlugin/v5.d.ts +1 -1
  9. package/dist/cli.js +9 -11
  10. package/dist/cli.mjs +9 -11
  11. package/dist/core.js +1 -2
  12. package/dist/core.mjs +1 -1
  13. package/dist/css-macro/postcss.js +1 -1
  14. package/dist/css-macro/postcss.mjs +1 -1
  15. package/dist/css-macro.js +4 -4
  16. package/dist/css-macro.mjs +3 -3
  17. package/dist/{defaults-B-1EEhdL.mjs → defaults-8xrgzxFY.mjs} +1 -1
  18. package/dist/{defaults-C10hYUch.js → defaults-C5w9OOrj.js} +1 -2
  19. package/dist/defaults.js +1 -1
  20. package/dist/defaults.mjs +1 -1
  21. package/dist/{generator-CtqzN9L-.mjs → generator-CbpjNxJh.mjs} +1 -1
  22. package/dist/{generator-DTPePQZ9.js → generator-DRNbzjx5.js} +2 -2
  23. package/dist/generator.js +2 -3
  24. package/dist/generator.mjs +2 -2
  25. package/dist/gulp.js +6 -6
  26. package/dist/gulp.mjs +5 -5
  27. package/dist/{incremental-runtime-class-set-CERcE0fP.js → incremental-runtime-class-set-BQPhkSov.js} +48 -14
  28. package/dist/{incremental-runtime-class-set-BlJ86j-A.mjs → incremental-runtime-class-set-C4JgSgRY.mjs} +48 -14
  29. package/dist/index.d.ts +1 -1
  30. package/dist/index.js +4 -6
  31. package/dist/index.mjs +5 -5
  32. package/dist/{postcss-BAO9tGi5.js → postcss-Br1eOaFd.js} +3 -3
  33. package/dist/{postcss-DYktK8_T.mjs → postcss-C7BMYpEF.mjs} +4 -4
  34. package/dist/{postcss-DXkxsPNg.js → postcss-CiYLsqZn.js} +4 -4
  35. package/dist/{postcss-CYPHxj7a.mjs → postcss-YetooK6S.mjs} +2 -2
  36. package/dist/postcss-html-transform.js +1 -1
  37. package/dist/postcss.js +1 -1
  38. package/dist/postcss.mjs +1 -1
  39. package/dist/{precheck-ezN3ovAq.js → precheck-B6xigu7s.js} +2005 -13
  40. package/dist/{precheck-B4CpMt_w.mjs → precheck-uG16Cqaj.mjs} +1998 -12
  41. package/dist/presets/index.d.ts +1 -0
  42. package/dist/presets.js +19 -6
  43. package/dist/presets.mjs +17 -6
  44. package/dist/reset.js +1 -1
  45. package/dist/{source-candidates-DoyOltpZ.mjs → source-candidates-CX2ozpKM.mjs} +49 -7
  46. package/dist/{source-candidates-0jPRIPmC.js → source-candidates-DeK5b9i9.js} +50 -8
  47. package/dist/{tailwindcss-ujlr9Iad.mjs → tailwindcss-C7dJHZ0G.mjs} +2 -2
  48. package/dist/{tailwindcss-nQetCaPp.js → tailwindcss-DEEtJf4u.js} +3 -3
  49. package/dist/{utils-CSA174-I.js → utils-nta4tfFs.js} +1 -1
  50. package/dist/{v3-engine-Bbsrez2w.js → v3-engine-B_33V3Lu.js} +12 -4
  51. package/dist/{v3-engine-COw08vWd.mjs → v3-engine-DcvCCHfs.mjs} +11 -3
  52. package/dist/{vite-DE8Vfzal.js → vite-Bg18XZZc.js} +169 -22
  53. package/dist/{vite-hZsQAY1a.mjs → vite-DOmiMftw.mjs} +168 -21
  54. package/dist/vite.js +1 -1
  55. package/dist/vite.mjs +1 -1
  56. package/dist/weapp-tw-css-import-rewrite-loader.js +53 -22
  57. package/dist/weapp-tw-runtime-classset-loader.js +1 -1
  58. package/dist/{webpack-c2WJnCJI.mjs → webpack-BdrjJf41.mjs} +17 -13
  59. package/dist/{webpack-CTJcw_sX.js → webpack-BzPDhzSz.js} +18 -14
  60. package/dist/webpack.d.ts +1 -3
  61. package/dist/webpack.js +3 -4
  62. package/dist/webpack.mjs +2 -2
  63. package/package.json +9 -7
  64. /package/dist/{chunk-8l464Juk.js → chunk-D6vf50IK.js} +0 -0
  65. /package/dist/{logger-Dr7IvyH2.mjs → logger-BNzxZbZj.mjs} +0 -0
  66. /package/dist/{logger-Cdzl3p8j.js → logger-TlKT3xmR.js} +0 -0
  67. /package/dist/{runtime-registry-CdCV3Opt.js → runtime-registry-DpcR3IHI.js} +0 -0
  68. /package/dist/{utils-B2SJgA1L.mjs → utils-DsaS975I.mjs} +0 -0
@@ -1,5 +1,5 @@
1
- const require_chunk = require("./chunk-8l464Juk.js");
2
- const require_postcss = require("./postcss-DXkxsPNg.js");
1
+ const require_chunk = require("./chunk-D6vf50IK.js");
2
+ const require_postcss = require("./postcss-CiYLsqZn.js");
3
3
  let postcss = require("postcss");
4
4
  postcss = require_chunk.__toESM(postcss);
5
5
  //#region src/css-macro/auto.ts
@@ -53,11 +53,9 @@ function withCssMacroPostcssPlugins(plugins) {
53
53
  if (!plugins) return [macroPlugin];
54
54
  if (Array.isArray(plugins)) return plugins.some(isCssMacroPostcssPlugin) ? plugins : [...plugins, macroPlugin];
55
55
  if (typeof plugins === "object") {
56
- if (Object.values(plugins).some(isCssMacroPostcssPlugin)) return plugins;
57
- return {
58
- ...plugins,
59
- [require_postcss.CSS_MACRO_POSTCSS_PLUGIN_NAME]: macroPlugin
60
- };
56
+ const values = Object.values(plugins).filter(Boolean);
57
+ if (values.some(isCssMacroPostcssPlugin)) return values;
58
+ return [...values, macroPlugin];
61
59
  }
62
60
  return [macroPlugin];
63
61
  }
@@ -1,4 +1,4 @@
1
- import { n as creator, t as CSS_MACRO_POSTCSS_PLUGIN_NAME } from "./postcss-DYktK8_T.mjs";
1
+ import { n as creator } from "./postcss-C7BMYpEF.mjs";
2
2
  import postcss from "postcss";
3
3
  //#region src/css-macro/auto.ts
4
4
  const CSS_MACRO_PLUGIN_MARKER = "__weappTailwindcssCssMacro";
@@ -51,11 +51,9 @@ function withCssMacroPostcssPlugins(plugins) {
51
51
  if (!plugins) return [macroPlugin];
52
52
  if (Array.isArray(plugins)) return plugins.some(isCssMacroPostcssPlugin) ? plugins : [...plugins, macroPlugin];
53
53
  if (typeof plugins === "object") {
54
- if (Object.values(plugins).some(isCssMacroPostcssPlugin)) return plugins;
55
- return {
56
- ...plugins,
57
- [CSS_MACRO_POSTCSS_PLUGIN_NAME]: macroPlugin
58
- };
54
+ const values = Object.values(plugins).filter(Boolean);
55
+ if (values.some(isCssMacroPostcssPlugin)) return values;
56
+ return [...values, macroPlugin];
59
57
  }
60
58
  return [macroPlugin];
61
59
  }
@@ -1,10 +1,9 @@
1
- import { m as traverse, p as babelParse } from "./precheck-B4CpMt_w.mjs";
1
+ import { h as traverse, m as babelParse, o as Parser } from "./precheck-uG16Cqaj.mjs";
2
2
  import { createRequire } from "node:module";
3
3
  import path from "node:path";
4
4
  import process from "node:process";
5
5
  import { cleanUrl, ensurePosix } from "@weapp-tailwindcss/shared";
6
6
  import { Buffer } from "node:buffer";
7
- import { Parser } from "htmlparser2";
8
7
  //#region src/bundlers/shared/module-graph.ts
9
8
  const QUERY_HASH_RE = /[?#].*$/u;
10
9
  const PROTOCOL_RE = /^[a-z][a-z+.-]*:/iu;
@@ -1,5 +1,5 @@
1
- const require_chunk = require("./chunk-8l464Juk.js");
2
- const require_precheck = require("./precheck-ezN3ovAq.js");
1
+ const require_chunk = require("./chunk-D6vf50IK.js");
2
+ const require_precheck = require("./precheck-B6xigu7s.js");
3
3
  let node_module = require("node:module");
4
4
  let node_path = require("node:path");
5
5
  node_path = require_chunk.__toESM(node_path);
@@ -7,7 +7,6 @@ let node_process = require("node:process");
7
7
  node_process = require_chunk.__toESM(node_process);
8
8
  let _weapp_tailwindcss_shared = require("@weapp-tailwindcss/shared");
9
9
  let node_buffer = require("node:buffer");
10
- let htmlparser2 = require("htmlparser2");
11
10
  //#region src/bundlers/shared/module-graph.ts
12
11
  const QUERY_HASH_RE = /[?#].*$/u;
13
12
  const PROTOCOL_RE = /^[a-z][a-z+.-]*:/iu;
@@ -220,7 +219,7 @@ const CSS_WHITESPACE_RE = /\s+/g;
220
219
  function createHtmlRuntimeAffectingSignature(source) {
221
220
  try {
222
221
  const parts = [];
223
- const parser = new htmlparser2.Parser({
222
+ const parser = new require_precheck.Parser({
224
223
  onattribute(name, value) {
225
224
  parts.push(`a:${name}=${value}`);
226
225
  },
@@ -1,3 +1,6 @@
1
- import type { Plugin } from 'vite';
2
1
  import type { UserDefinedOptions } from '../../types';
3
- export declare function WeappTailwindcss(options?: UserDefinedOptions): Plugin[] | undefined;
2
+ export interface WeappTailwindcssVitePlugin {
3
+ name: string;
4
+ [hook: string]: any;
5
+ }
6
+ export declare function WeappTailwindcss(options?: UserDefinedOptions): WeappTailwindcssVitePlugin[] | undefined;
@@ -0,0 +1,11 @@
1
+ import type { Plugin } from 'vite';
2
+ interface ViteServeCssGenerationOptions {
3
+ generateCss: (id: string, code: string, hookContext?: {
4
+ addWatchFile?: (id: string) => void;
5
+ }) => Promise<string | undefined> | string | undefined;
6
+ getCommand: () => string | undefined;
7
+ onTailwindRootCss?: ((id: string, code: string) => Promise<void> | void) | undefined;
8
+ shouldGenerate: () => boolean;
9
+ }
10
+ export declare function createViteServeCssGenerationPlugins(options: ViteServeCssGenerationOptions): Plugin[];
11
+ export {};
@@ -1,6 +1,7 @@
1
1
  import type { TailwindInlineSourceCandidates, TailwindSourceEntry } from '../../tailwindcss/source-scan';
2
2
  export interface SourceCandidateCollector {
3
3
  sync: (id: string, source: string) => Promise<void>;
4
+ syncCss: (id: string, source: string) => Promise<void>;
4
5
  merge: (id: string, source: string) => Promise<void>;
5
6
  syncFile: (id: string) => Promise<void>;
6
7
  syncCurrentFile: (id: string) => Promise<void>;
@@ -15,6 +16,7 @@ export interface SourceCandidateCollector {
15
16
  }
16
17
  export interface SourceCandidateCollectorSnapshot {
17
18
  candidatesById: Array<[string, string[]]>;
19
+ cssCandidatesById?: Array<[string, string[]]> | undefined;
18
20
  scanCandidatesById?: Array<[string, string[]]> | undefined;
19
21
  transformCandidatesById?: Array<[string, string[]]> | undefined;
20
22
  inlineExcludedCandidates: string[];
@@ -24,6 +26,7 @@ interface ScanSourceCandidateRootOptions {
24
26
  root: string;
25
27
  outDir?: string | undefined;
26
28
  entries?: TailwindSourceEntry[] | undefined;
29
+ explicit?: boolean | undefined;
27
30
  }
28
31
  export declare function isSourceCandidateRequest(id: string): boolean;
29
32
  export declare function createSourceCandidateCollector(): SourceCandidateCollector;
@@ -1,7 +1,7 @@
1
1
  import type { Compiler } from 'webpack';
2
2
  import type { AppType, IBaseWebpackPlugin, InternalUserDefinedOptions, UserDefinedOptions } from '../../../types';
3
3
  export declare const weappTailwindcssPackageDir: string;
4
- export declare class UnifiedWebpackPluginV5 implements IBaseWebpackPlugin {
4
+ export declare class WeappTailwindcss implements IBaseWebpackPlugin {
5
5
  options: InternalUserDefinedOptions;
6
6
  appType?: AppType;
7
7
  private hasInitialTailwindCssRoots;
package/dist/cli.js CHANGED
@@ -51,7 +51,6 @@ magic_string = __toESM(magic_string);
51
51
  let _ast_core_escape = require("@ast-core/escape");
52
52
  let _weapp_tailwindcss_shared_extractors = require("@weapp-tailwindcss/shared/extractors");
53
53
  require("@babel/types");
54
- require("htmlparser2");
55
54
  //#region src/js/babel/cache-options.ts
56
55
  const DEFAULT_PARSE_CACHE_MAX_SOURCE_LENGTH = 5e4;
57
56
  const HARD_PARSE_CACHE_MAX_ENTRIES = 1024;
@@ -147,10 +146,10 @@ const creator = () => {
147
146
  ];
148
147
  atRule.replaceWith(nextNodes);
149
148
  startComment.raws.before = hasPreviousNode ? "\n" : "";
150
- startComment.raws.after = "\n";
149
+ startComment.raws["after"] = "\n";
151
150
  if (clonedNodes[0]) clonedNodes[0].raws.before = "\n";
152
151
  endComment.raws.before = "\n";
153
- endComment.raws.after = "\n";
152
+ endComment.raws["after"] = "\n";
154
153
  const nextNode = endComment?.next();
155
154
  if (nextNode) nextNode.raws.before = "\n";
156
155
  }
@@ -185,10 +184,10 @@ const creator = () => {
185
184
  if ((parentRule.nodes?.length ?? 0) === 0) parentRule.replaceWith(nextNodes);
186
185
  else parentRule.after(nextNodes);
187
186
  startComment.raws.before = hasPreviousNode ? "\n" : "";
188
- startComment.raws.after = "\n";
187
+ startComment.raws["after"] = "\n";
189
188
  conditionalRule.raws.before = "\n";
190
189
  endComment.raws.before = "\n";
191
- endComment.raws.after = "\n";
190
+ endComment.raws["after"] = "\n";
192
191
  const nextNode = endComment.next();
193
192
  if (nextNode) nextNode.raws.before = "\n";
194
193
  return true;
@@ -1350,7 +1349,7 @@ function walkEvalExpression(path, options, updater, handler) {
1350
1349
  }
1351
1350
  }
1352
1351
  //#endregion
1353
- //#region \0@oxc-project+runtime@0.129.0/helpers/typeof.js
1352
+ //#region \0@oxc-project+runtime@0.133.0/helpers/esm/typeof.js
1354
1353
  function _typeof(o) {
1355
1354
  "@babel/helpers - typeof";
1356
1355
  return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -1360,7 +1359,7 @@ function _typeof(o) {
1360
1359
  }, _typeof(o);
1361
1360
  }
1362
1361
  //#endregion
1363
- //#region \0@oxc-project+runtime@0.129.0/helpers/toPrimitive.js
1362
+ //#region \0@oxc-project+runtime@0.133.0/helpers/esm/toPrimitive.js
1364
1363
  function toPrimitive(t, r) {
1365
1364
  if ("object" != _typeof(t) || !t) return t;
1366
1365
  var e = t[Symbol.toPrimitive];
@@ -1372,13 +1371,13 @@ function toPrimitive(t, r) {
1372
1371
  return ("string" === r ? String : Number)(t);
1373
1372
  }
1374
1373
  //#endregion
1375
- //#region \0@oxc-project+runtime@0.129.0/helpers/toPropertyKey.js
1374
+ //#region \0@oxc-project+runtime@0.133.0/helpers/esm/toPropertyKey.js
1376
1375
  function toPropertyKey(t) {
1377
1376
  var i = toPrimitive(t, "string");
1378
1377
  return "symbol" == _typeof(i) ? i : i + "";
1379
1378
  }
1380
1379
  //#endregion
1381
- //#region \0@oxc-project+runtime@0.129.0/helpers/defineProperty.js
1380
+ //#region \0@oxc-project+runtime@0.133.0/helpers/esm/defineProperty.js
1382
1381
  function _defineProperty(e, r, t) {
1383
1382
  return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
1384
1383
  value: t,
@@ -2097,9 +2096,8 @@ function jsHandler(rawSource, options) {
2097
2096
  if (shouldWrapExpression) {
2098
2097
  const start = 0;
2099
2098
  const end = source.length;
2100
- const prefixLength = 2;
2101
2099
  const suffixLength = 2;
2102
- ms.remove(start, start + prefixLength);
2100
+ ms.remove(start, 2);
2103
2101
  ms.remove(end - suffixLength, end);
2104
2102
  }
2105
2103
  const result = { code: ms.toString() };
package/dist/cli.mjs CHANGED
@@ -22,7 +22,6 @@ import MagicString from "magic-string";
22
22
  import { jsStringEscape } from "@ast-core/escape";
23
23
  import { splitCode } from "@weapp-tailwindcss/shared/extractors";
24
24
  import "@babel/types";
25
- import "htmlparser2";
26
25
  //#region src/js/babel/cache-options.ts
27
26
  const DEFAULT_PARSE_CACHE_MAX_SOURCE_LENGTH = 5e4;
28
27
  const HARD_PARSE_CACHE_MAX_ENTRIES = 1024;
@@ -118,10 +117,10 @@ const creator = () => {
118
117
  ];
119
118
  atRule.replaceWith(nextNodes);
120
119
  startComment.raws.before = hasPreviousNode ? "\n" : "";
121
- startComment.raws.after = "\n";
120
+ startComment.raws["after"] = "\n";
122
121
  if (clonedNodes[0]) clonedNodes[0].raws.before = "\n";
123
122
  endComment.raws.before = "\n";
124
- endComment.raws.after = "\n";
123
+ endComment.raws["after"] = "\n";
125
124
  const nextNode = endComment?.next();
126
125
  if (nextNode) nextNode.raws.before = "\n";
127
126
  }
@@ -156,10 +155,10 @@ const creator = () => {
156
155
  if ((parentRule.nodes?.length ?? 0) === 0) parentRule.replaceWith(nextNodes);
157
156
  else parentRule.after(nextNodes);
158
157
  startComment.raws.before = hasPreviousNode ? "\n" : "";
159
- startComment.raws.after = "\n";
158
+ startComment.raws["after"] = "\n";
160
159
  conditionalRule.raws.before = "\n";
161
160
  endComment.raws.before = "\n";
162
- endComment.raws.after = "\n";
161
+ endComment.raws["after"] = "\n";
163
162
  const nextNode = endComment.next();
164
163
  if (nextNode) nextNode.raws.before = "\n";
165
164
  return true;
@@ -1321,7 +1320,7 @@ function walkEvalExpression(path, options, updater, handler) {
1321
1320
  }
1322
1321
  }
1323
1322
  //#endregion
1324
- //#region \0@oxc-project+runtime@0.129.0/helpers/typeof.js
1323
+ //#region \0@oxc-project+runtime@0.133.0/helpers/esm/typeof.js
1325
1324
  function _typeof(o) {
1326
1325
  "@babel/helpers - typeof";
1327
1326
  return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -1331,7 +1330,7 @@ function _typeof(o) {
1331
1330
  }, _typeof(o);
1332
1331
  }
1333
1332
  //#endregion
1334
- //#region \0@oxc-project+runtime@0.129.0/helpers/toPrimitive.js
1333
+ //#region \0@oxc-project+runtime@0.133.0/helpers/esm/toPrimitive.js
1335
1334
  function toPrimitive(t, r) {
1336
1335
  if ("object" != _typeof(t) || !t) return t;
1337
1336
  var e = t[Symbol.toPrimitive];
@@ -1343,13 +1342,13 @@ function toPrimitive(t, r) {
1343
1342
  return ("string" === r ? String : Number)(t);
1344
1343
  }
1345
1344
  //#endregion
1346
- //#region \0@oxc-project+runtime@0.129.0/helpers/toPropertyKey.js
1345
+ //#region \0@oxc-project+runtime@0.133.0/helpers/esm/toPropertyKey.js
1347
1346
  function toPropertyKey(t) {
1348
1347
  var i = toPrimitive(t, "string");
1349
1348
  return "symbol" == _typeof(i) ? i : i + "";
1350
1349
  }
1351
1350
  //#endregion
1352
- //#region \0@oxc-project+runtime@0.129.0/helpers/defineProperty.js
1351
+ //#region \0@oxc-project+runtime@0.133.0/helpers/esm/defineProperty.js
1353
1352
  function _defineProperty(e, r, t) {
1354
1353
  return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
1355
1354
  value: t,
@@ -2068,9 +2067,8 @@ function jsHandler(rawSource, options) {
2068
2067
  if (shouldWrapExpression) {
2069
2068
  const start = 0;
2070
2069
  const end = source.length;
2071
- const prefixLength = 2;
2072
2070
  const suffixLength = 2;
2073
- ms.remove(start, start + prefixLength);
2071
+ ms.remove(start, 2);
2074
2072
  ms.remove(end - suffixLength, end);
2075
2073
  }
2076
2074
  const result = { code: ms.toString() };
package/dist/core.js CHANGED
@@ -1,6 +1,5 @@
1
1
  Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
2
- require("./chunk-8l464Juk.js");
3
- const require_precheck = require("./precheck-ezN3ovAq.js");
2
+ const require_precheck = require("./precheck-B6xigu7s.js");
4
3
  let _weapp_tailwindcss_shared = require("@weapp-tailwindcss/shared");
5
4
  //#region src/core.ts
6
5
  const DEFAULT_MAIN_CHUNK_STYLE_OPTIONS = Object.freeze({ isMainChunk: true });
package/dist/core.mjs CHANGED
@@ -1,4 +1,4 @@
1
- import { _ as createTailwindRuntimeReadyPromise, n as getCompilerContext, t as shouldSkipJsTransform, v as ensureRuntimeClassSet } from "./precheck-B4CpMt_w.mjs";
1
+ import { n as getCompilerContext, t as shouldSkipJsTransform, v as createTailwindRuntimeReadyPromise, y as ensureRuntimeClassSet } from "./precheck-uG16Cqaj.mjs";
2
2
  import { defuOverrideArray } from "@weapp-tailwindcss/shared";
3
3
  //#region src/core.ts
4
4
  const DEFAULT_MAIN_CHUNK_STYLE_OPTIONS = Object.freeze({ isMainChunk: true });
@@ -2,6 +2,6 @@ Object.defineProperties(exports, {
2
2
  __esModule: { value: true },
3
3
  [Symbol.toStringTag]: { value: "Module" }
4
4
  });
5
- const require_postcss = require("../postcss-DXkxsPNg.js");
5
+ const require_postcss = require("../postcss-CiYLsqZn.js");
6
6
  exports.CSS_MACRO_POSTCSS_PLUGIN_NAME = require_postcss.CSS_MACRO_POSTCSS_PLUGIN_NAME;
7
7
  exports.default = require_postcss.creator;
@@ -1,2 +1,2 @@
1
- import { n as creator, t as CSS_MACRO_POSTCSS_PLUGIN_NAME } from "../postcss-DYktK8_T.mjs";
1
+ import { n as creator, t as CSS_MACRO_POSTCSS_PLUGIN_NAME } from "../postcss-C7BMYpEF.mjs";
2
2
  export { CSS_MACRO_POSTCSS_PLUGIN_NAME, creator as default };
package/dist/css-macro.js CHANGED
@@ -1,7 +1,7 @@
1
- const require_chunk = require("./chunk-8l464Juk.js");
2
- const require_postcss = require("./postcss-DXkxsPNg.js");
3
- const require_auto = require("./auto-B11j1XiD.js");
4
- require("./utils-CSA174-I.js");
1
+ const require_chunk = require("./chunk-D6vf50IK.js");
2
+ const require_postcss = require("./postcss-CiYLsqZn.js");
3
+ const require_auto = require("./auto-DP-qtQzE.js");
4
+ require("./utils-nta4tfFs.js");
5
5
  let tailwindcss_plugin = require("tailwindcss/plugin");
6
6
  tailwindcss_plugin = require_chunk.__toESM(tailwindcss_plugin);
7
7
  let _weapp_tailwindcss_shared = require("@weapp-tailwindcss/shared");
@@ -1,6 +1,6 @@
1
- import { i as createNegativeConditionalAtRule, r as createConditionalAtRule } from "./postcss-DYktK8_T.mjs";
2
- import { i as markCssMacroPlugin } from "./auto-AduSz49t.mjs";
3
- import { t as defu } from "./utils-B2SJgA1L.mjs";
1
+ import { i as createNegativeConditionalAtRule, r as createConditionalAtRule } from "./postcss-C7BMYpEF.mjs";
2
+ import { i as markCssMacroPlugin } from "./auto-XyKTOP7B.mjs";
3
+ import { t as defu } from "./utils-DsaS975I.mjs";
4
4
  import plugin from "tailwindcss/plugin";
5
5
  //#region src/css-macro/index.ts
6
6
  const defaultOptions = {
@@ -1,4 +1,4 @@
1
- import { a as noop } from "./utils-B2SJgA1L.mjs";
1
+ import { a as noop } from "./utils-DsaS975I.mjs";
2
2
  import { MappingChars2String, isAllowedClassName } from "@weapp-core/escape";
3
3
  //#region src/js/babel/cache-options.ts
4
4
  const DEFAULT_PARSE_CACHE_MAX_SOURCE_LENGTH = 5e4;
@@ -1,5 +1,4 @@
1
- require("./chunk-8l464Juk.js");
2
- require("./utils-CSA174-I.js");
1
+ require("./utils-nta4tfFs.js");
3
2
  let _weapp_core_escape = require("@weapp-core/escape");
4
3
  let _weapp_tailwindcss_shared = require("@weapp-tailwindcss/shared");
5
4
  //#region src/js/babel/cache-options.ts
package/dist/defaults.js CHANGED
@@ -1,5 +1,5 @@
1
1
  Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
2
- const require_defaults = require("./defaults-C10hYUch.js");
2
+ const require_defaults = require("./defaults-C5w9OOrj.js");
3
3
  exports.TAILWIND_V3_CSS_PREFLIGHT = require_defaults.TAILWIND_V3_CSS_PREFLIGHT;
4
4
  exports.TAILWIND_V4_CSS_PREFLIGHT = require_defaults.TAILWIND_V4_CSS_PREFLIGHT;
5
5
  exports.getDefaultCssPreflight = require_defaults.getDefaultCssPreflight;
package/dist/defaults.mjs CHANGED
@@ -1,2 +1,2 @@
1
- import { a as resolveDefaultCssPreflight, i as getDefaultOptions, n as TAILWIND_V4_CSS_PREFLIGHT, r as getDefaultCssPreflight, t as TAILWIND_V3_CSS_PREFLIGHT } from "./defaults-B-1EEhdL.mjs";
1
+ import { a as resolveDefaultCssPreflight, i as getDefaultOptions, n as TAILWIND_V4_CSS_PREFLIGHT, r as getDefaultCssPreflight, t as TAILWIND_V3_CSS_PREFLIGHT } from "./defaults-8xrgzxFY.mjs";
2
2
  export { TAILWIND_V3_CSS_PREFLIGHT, TAILWIND_V4_CSS_PREFLIGHT, getDefaultCssPreflight, getDefaultOptions, resolveDefaultCssPreflight };
@@ -1,4 +1,4 @@
1
- import { C as createTailwindV4Engine, i as createTailwindV3Engine, n as resolveTailwindV3SourceFromPatcher, x as resolveTailwindV4SourceFromPatcher } from "./v3-engine-COw08vWd.mjs";
1
+ import { C as createTailwindV4Engine, i as createTailwindV3Engine, n as resolveTailwindV3SourceFromPatcher, x as resolveTailwindV4SourceFromPatcher } from "./v3-engine-DcvCCHfs.mjs";
2
2
  import process from "node:process";
3
3
  //#region src/generator/options.ts
4
4
  const explicitGeneratorTargetEnvKeys = ["WEAPP_TW_TARGET", "WEAPP_TAILWINDCSS_TARGET"];
@@ -1,5 +1,5 @@
1
- const require_chunk = require("./chunk-8l464Juk.js");
2
- const require_v3_engine = require("./v3-engine-Bbsrez2w.js");
1
+ const require_chunk = require("./chunk-D6vf50IK.js");
2
+ const require_v3_engine = require("./v3-engine-B_33V3Lu.js");
3
3
  let node_process = require("node:process");
4
4
  node_process = require_chunk.__toESM(node_process);
5
5
  //#region src/generator/options.ts
package/dist/generator.js CHANGED
@@ -1,7 +1,6 @@
1
1
  Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
2
- require("./chunk-8l464Juk.js");
3
- const require_v3_engine = require("./v3-engine-Bbsrez2w.js");
4
- const require_generator = require("./generator-DTPePQZ9.js");
2
+ const require_v3_engine = require("./v3-engine-B_33V3Lu.js");
3
+ const require_generator = require("./generator-DRNbzjx5.js");
5
4
  let tailwindcss_patch = require("tailwindcss-patch");
6
5
  exports.createWeappTailwindcssGenerator = require_generator.createWeappTailwindcssGenerator;
7
6
  exports.createWeappTailwindcssGeneratorFromPatcher = require_generator.createWeappTailwindcssGeneratorFromPatcher;
@@ -1,3 +1,3 @@
1
- import { S as resolveTailwindV4SourceOptionsFromPatcher, T as transformTailwindV4CssToWeapp, a as transformTailwindV3CssByTarget, b as resolveTailwindV4SourceFromPatchOptions, n as resolveTailwindV3SourceFromPatcher, o as transformTailwindV3CssToWeapp, r as resolveTailwindV3SourceOptionsFromPatcher, t as resolveTailwindV3Source, w as transformTailwindV4CssByTarget, x as resolveTailwindV4SourceFromPatcher, y as resolveTailwindV4Source } from "./v3-engine-COw08vWd.mjs";
2
- import { i as normalizeWeappTailwindcssGeneratorOptions, n as createWeappTailwindcssGeneratorFromPatcher, r as resolveTailwindSourceFromPatcher, t as createWeappTailwindcssGenerator } from "./generator-CtqzN9L-.mjs";
1
+ import { S as resolveTailwindV4SourceOptionsFromPatcher, T as transformTailwindV4CssToWeapp, a as transformTailwindV3CssByTarget, b as resolveTailwindV4SourceFromPatchOptions, n as resolveTailwindV3SourceFromPatcher, o as transformTailwindV3CssToWeapp, r as resolveTailwindV3SourceOptionsFromPatcher, t as resolveTailwindV3Source, w as transformTailwindV4CssByTarget, x as resolveTailwindV4SourceFromPatcher, y as resolveTailwindV4Source } from "./v3-engine-DcvCCHfs.mjs";
2
+ import { i as normalizeWeappTailwindcssGeneratorOptions, n as createWeappTailwindcssGeneratorFromPatcher, r as resolveTailwindSourceFromPatcher, t as createWeappTailwindcssGenerator } from "./generator-CbpjNxJh.mjs";
3
3
  export { createWeappTailwindcssGenerator, createWeappTailwindcssGeneratorFromPatcher, normalizeWeappTailwindcssGeneratorOptions, resolveTailwindSourceFromPatcher, resolveTailwindV3Source, resolveTailwindV3SourceFromPatcher, resolveTailwindV3SourceOptionsFromPatcher, resolveTailwindV4Source, resolveTailwindV4SourceFromPatchOptions, resolveTailwindV4SourceFromPatcher, resolveTailwindV4SourceOptionsFromPatcher, transformTailwindV3CssByTarget, transformTailwindV3CssToWeapp, transformTailwindV4CssByTarget, transformTailwindV4CssToWeapp };
package/dist/gulp.js CHANGED
@@ -1,10 +1,10 @@
1
1
  Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
2
- const require_chunk = require("./chunk-8l464Juk.js");
3
- const require_v3_engine = require("./v3-engine-Bbsrez2w.js");
4
- const require_incremental_runtime_class_set = require("./incremental-runtime-class-set-CERcE0fP.js");
5
- const require_precheck = require("./precheck-ezN3ovAq.js");
6
- const require_tailwindcss = require("./tailwindcss-nQetCaPp.js");
7
- const require_source_candidates = require("./source-candidates-0jPRIPmC.js");
2
+ const require_chunk = require("./chunk-D6vf50IK.js");
3
+ const require_v3_engine = require("./v3-engine-B_33V3Lu.js");
4
+ const require_incremental_runtime_class_set = require("./incremental-runtime-class-set-BQPhkSov.js");
5
+ const require_precheck = require("./precheck-B6xigu7s.js");
6
+ const require_tailwindcss = require("./tailwindcss-DEEtJf4u.js");
7
+ const require_source_candidates = require("./source-candidates-DeK5b9i9.js");
8
8
  let node_fs = require("node:fs");
9
9
  node_fs = require_chunk.__toESM(node_fs);
10
10
  let node_path = require("node:path");
package/dist/gulp.mjs CHANGED
@@ -1,8 +1,8 @@
1
- import { B as createDebug, _ as resolveViteSourceScanEntries, l as getRuntimeClassSetSignature } from "./v3-engine-COw08vWd.mjs";
2
- import { i as generateCssByGenerator, l as normalizeTailwindSourceForGenerator, o as processCachedTask, r as emitHmrTiming, s as hasTailwindRootDirectives, t as createBundleRuntimeClassSetManager } from "./incremental-runtime-class-set-BlJ86j-A.mjs";
3
- import { _ as createTailwindRuntimeReadyPromise, n as getCompilerContext, t as shouldSkipJsTransform, v as ensureRuntimeClassSet } from "./precheck-B4CpMt_w.mjs";
4
- import { c as upsertTailwindV4CssSource, s as hasConfiguredTailwindV4CssRoots } from "./tailwindcss-ujlr9Iad.mjs";
5
- import { t as createSourceCandidateCollector } from "./source-candidates-DoyOltpZ.mjs";
1
+ import { B as createDebug, _ as resolveViteSourceScanEntries, l as getRuntimeClassSetSignature } from "./v3-engine-DcvCCHfs.mjs";
2
+ import { i as generateCssByGenerator, l as normalizeTailwindSourceForGenerator, o as processCachedTask, r as emitHmrTiming, s as hasTailwindRootDirectives, t as createBundleRuntimeClassSetManager } from "./incremental-runtime-class-set-C4JgSgRY.mjs";
3
+ import { n as getCompilerContext, t as shouldSkipJsTransform, v as createTailwindRuntimeReadyPromise, y as ensureRuntimeClassSet } from "./precheck-uG16Cqaj.mjs";
4
+ import { c as upsertTailwindV4CssSource, s as hasConfiguredTailwindV4CssRoots } from "./tailwindcss-C7dJHZ0G.mjs";
5
+ import { t as createSourceCandidateCollector } from "./source-candidates-CX2ozpKM.mjs";
6
6
  import fs from "node:fs";
7
7
  import path from "node:path";
8
8
  import process from "node:process";
@@ -1,7 +1,7 @@
1
- const require_chunk = require("./chunk-8l464Juk.js");
2
- const require_v3_engine = require("./v3-engine-Bbsrez2w.js");
3
- const require_generator = require("./generator-DTPePQZ9.js");
4
- const require_precheck = require("./precheck-ezN3ovAq.js");
1
+ const require_chunk = require("./chunk-D6vf50IK.js");
2
+ const require_v3_engine = require("./v3-engine-B_33V3Lu.js");
3
+ const require_generator = require("./generator-DRNbzjx5.js");
4
+ const require_precheck = require("./precheck-B6xigu7s.js");
5
5
  let node_fs = require("node:fs");
6
6
  let postcss = require("postcss");
7
7
  postcss = require_chunk.__toESM(postcss);
@@ -1312,6 +1312,16 @@ function mergeScopedRuntimeWithCurrentRuntime(scopedRuntime, runtime, options) {
1312
1312
  function shouldIsolateMatchedCssSource(source, sourceEntries) {
1313
1313
  return Boolean(source.__weappTailwindcssMeta?.matchedCssSourceFile && sourceEntries !== void 0);
1314
1314
  }
1315
+ function shouldScanTailwindV4Sources(majorVersion, target, generatorRuntime, isolateCssSource) {
1316
+ if (majorVersion !== 4 || isolateCssSource) return false;
1317
+ return target === "web" || generatorRuntime.size === 0;
1318
+ }
1319
+ function shouldAppendWebBundleCssFallback(target, options) {
1320
+ return target === "web" && !options.hasMatchedCssSourceFile && !options.hasSourceDirectives;
1321
+ }
1322
+ function isEmptyCssSourceOrderParts(parts) {
1323
+ return parts.before.trim().length === 0 && parts.after.trim().length === 0;
1324
+ }
1315
1325
  function resolveGeneratorStyleOptions(opts, cssHandlerOptions, generatorStyleOptions) {
1316
1326
  const preflightStyleOptions = {
1317
1327
  cssPreflight: opts.cssPreflight,
@@ -1451,9 +1461,11 @@ async function generateCssByGenerator(options) {
1451
1461
  if (!SUPPORTED_GENERATOR_MAJOR_VERSIONS.has(majorVersion ?? 0) || !shouldGenerateCurrentCss || majorVersion === 3 && !hasSourceDirectives && !hasGeneratedCss && !hasGeneratedMarkers) return;
1452
1462
  try {
1453
1463
  await runtimeState.readyPromise;
1464
+ const currentCssCandidates = majorVersion === 4 ? await (0, tailwindcss_patch.extractSourceCandidates)(effectiveRawSource, "css") : [];
1465
+ const runtimeWithCurrentCss = currentCssCandidates.length > 0 ? new Set([...runtime, ...currentCssCandidates]) : runtime;
1454
1466
  const sources = await resolveGeneratorSources(majorVersion, runtimeState, effectiveRawSource, file, cssHandlerOptions, generatorOptions, {
1455
1467
  getSourceCandidatesForEntries,
1456
- runtime
1468
+ runtime: runtimeWithCurrentCss
1457
1469
  });
1458
1470
  const generatorStyleOptions = resolveGeneratorStyleOptions(opts, cssHandlerOptions, generatorOptions.styleOptions);
1459
1471
  const configuredContainerCompat = hasConfiguredContainerCompatSources(sources);
@@ -1462,15 +1474,15 @@ async function generateCssByGenerator(options) {
1462
1474
  const sourceEntries = getSourceCandidatesForEntries && majorVersion === 4 ? await resolveGeneratorSourceEntries(source, runtimeState) : void 0;
1463
1475
  const scopedRuntime = sourceEntries ? getSourceCandidatesForEntries?.(sourceEntries) : void 0;
1464
1476
  const isolateCssSource = shouldIsolateMatchedCssSource(source, sourceEntries);
1465
- const sourceRuntime = scopedRuntime && (scopedRuntime.size > 0 || isolateCssSource) ? mergeScopedRuntimeWithCurrentRuntime(scopedRuntime, runtime, {
1477
+ const sourceRuntime = scopedRuntime && (scopedRuntime.size > 0 || isolateCssSource) ? mergeScopedRuntimeWithCurrentRuntime(scopedRuntime, runtimeWithCurrentCss, {
1466
1478
  cssHandlerOptions,
1467
1479
  isolateCssSource
1468
- }) : runtime;
1480
+ }) : runtimeWithCurrentCss;
1469
1481
  const generatorRuntime = majorVersion === 4 && generatorOptions.target === "weapp" ? require_v3_engine.filterUnsupportedMiniProgramTailwindV4Candidates(sourceRuntime) : sourceRuntime;
1470
1482
  return generator.generate({
1471
1483
  candidates: generatorRuntime,
1472
1484
  incrementalCache: majorVersion === 3 || majorVersion === 4,
1473
- scanSources: majorVersion === 4 && generatorRuntime.size === 0 && !isolateCssSource,
1485
+ scanSources: shouldScanTailwindV4Sources(majorVersion, generatorOptions.target, generatorRuntime, isolateCssSource),
1474
1486
  styleOptions: generatorStyleOptions,
1475
1487
  tailwindcssV3Compatibility: generatorOptions.tailwindcssV3Compatibility,
1476
1488
  target: generatorOptions.target
@@ -1516,6 +1528,13 @@ async function generateCssByGenerator(options) {
1516
1528
  const beforeUserCss = await transformGeneratorUserCss(orderedExtraCss.before, userCssOptions);
1517
1529
  const afterUserCss = await transformGeneratorUserCss(orderedExtraCss.after, userCssOptions);
1518
1530
  css = createCssSourceOrderAppend(createCssSourceOrderAppend(beforeUserCss, css), afterUserCss);
1531
+ if (isEmptyCssSourceOrderParts(orderedExtraCss) && shouldAppendWebBundleCssFallback(generated.target, {
1532
+ hasSourceDirectives,
1533
+ hasMatchedCssSourceFile
1534
+ })) {
1535
+ const userCss = await transformGeneratorUserCss(effectiveRawSource, userCssOptions);
1536
+ css = createCssSourceOrderAppend(css, userCss);
1537
+ }
1519
1538
  if (generated.target === "weapp") {
1520
1539
  css = await appendLegacyCompatCss(css, effectiveRawSource, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
1521
1540
  css = await appendLegacyContainerCompatCss(css, effectiveRawSource, file, runtime, configuredContainerCompat, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
@@ -1530,12 +1549,27 @@ async function generateCssByGenerator(options) {
1530
1549
  debug("tailwind direct css generation prefix mismatch, append transformed bundle css %s", file);
1531
1550
  let css = stripTailwindBanner(generated.css);
1532
1551
  if (generated.target === "weapp") css = inheritLegacyUnitConvertedDeclarations(css, effectiveRawSource);
1533
- if (hasMatchedCssSourceFile || generated.target === "web") return {
1534
- css: finalizeMiniProgramGeneratorCss(css, generated.target, majorVersion, opts.cssPreflight),
1535
- target: generated.target,
1536
- source: "generator",
1537
- dependencies: generated.dependencies
1538
- };
1552
+ if (hasMatchedCssSourceFile || generated.target === "web") {
1553
+ if (shouldAppendWebBundleCssFallback(generated.target, {
1554
+ hasSourceDirectives,
1555
+ hasMatchedCssSourceFile
1556
+ })) {
1557
+ const userCss = await transformGeneratorUserCss(effectiveRawSource, {
1558
+ generatorTarget: generated.target,
1559
+ generatorStyleOptions,
1560
+ cssUserHandlerOptions,
1561
+ styleHandler,
1562
+ importFallback: generatorOptions.importFallback
1563
+ });
1564
+ css = createCssSourceOrderAppend(css, userCss);
1565
+ }
1566
+ return {
1567
+ css: finalizeMiniProgramGeneratorCss(css, generated.target, majorVersion, opts.cssPreflight),
1568
+ target: generated.target,
1569
+ source: "generator",
1570
+ dependencies: generated.dependencies
1571
+ };
1572
+ }
1539
1573
  css = await appendLegacyCompatCss(css, effectiveRawSource, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
1540
1574
  css = await appendLegacyContainerCompatCss(css, effectiveRawSource, file, runtime, configuredContainerCompat, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
1541
1575
  return {