weapp-tailwindcss 4.10.2 → 4.11.0-alpha.0
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.
- package/dist/{chunk-3XVUGMTY.mjs → chunk-2LH6PZH3.mjs} +8 -4
- package/dist/{chunk-3WUHHFLF.mjs → chunk-35EI5JMK.mjs} +4 -2
- package/dist/{chunk-HJVZ4TO3.js → chunk-7XQXBJL6.js} +10 -9
- package/dist/{chunk-5U24PLVV.js → chunk-ACTJYB33.js} +4 -2
- package/dist/{chunk-ACNOEKQI.mjs → chunk-CLNUBO3Q.mjs} +6 -5
- package/dist/{chunk-HT76VHOV.mjs → chunk-DOH7FULQ.mjs} +1 -1
- package/dist/{chunk-BZCCVPSU.mjs → chunk-EOK3NZVC.mjs} +2 -2
- package/dist/{chunk-3R7FDZJL.js → chunk-FKUPQQYX.js} +377 -215
- package/dist/{chunk-MPVAZKRB.mjs → chunk-FMWKBZWX.mjs} +835 -317
- package/dist/{chunk-NPZ5QQC7.js → chunk-FV4ZRTAK.js} +57 -17
- package/dist/{chunk-IIDSY4XZ.js → chunk-G3G437UE.js} +2 -2
- package/dist/{chunk-I35XJD75.js → chunk-I4EOMKX2.js} +900 -382
- package/dist/{chunk-N6JOG5K3.mjs → chunk-OIDFSOER.mjs} +52 -12
- package/dist/{chunk-DBAAU4LK.js → chunk-OV7FX6XR.js} +1 -1
- package/dist/{chunk-SR4GC2F4.js → chunk-OYSABARD.js} +8 -4
- package/dist/{chunk-M2ATX5ZS.js → chunk-PXZUQ7RR.js} +5 -5
- package/dist/{chunk-WJU62RPV.mjs → chunk-QX2A7SBB.mjs} +352 -190
- package/dist/{chunk-5APD2MNV.js → chunk-RXNSOSCT.js} +13 -9
- package/dist/{chunk-LHBUALTK.mjs → chunk-W3JO6LBC.mjs} +30 -16
- package/dist/{chunk-6VKE7EWV.js → chunk-WGFNCK5B.js} +60 -46
- package/dist/{chunk-QOTLDKI4.mjs → chunk-XGUD52TA.mjs} +9 -5
- package/dist/cli.js +45 -42
- package/dist/cli.mjs +9 -6
- package/dist/core.d.mts +4 -3
- package/dist/core.d.ts +4 -3
- package/dist/core.js +124 -30
- package/dist/core.mjs +119 -25
- package/dist/css-macro/postcss.js +6 -5
- package/dist/css-macro/postcss.mjs +4 -3
- package/dist/css-macro.js +5 -5
- package/dist/css-macro.mjs +2 -2
- package/dist/defaults.js +3 -3
- package/dist/defaults.mjs +2 -2
- package/dist/escape.js +2 -1
- package/dist/escape.mjs +2 -1
- package/dist/gulp.d.mts +1 -1
- package/dist/gulp.d.ts +1 -1
- package/dist/gulp.js +8 -7
- package/dist/gulp.mjs +8 -7
- package/dist/index.js +11 -11
- package/dist/index.mjs +9 -9
- package/dist/postcss-html-transform.js +1 -1
- package/dist/postcss-html-transform.mjs +1 -1
- package/dist/presets.js +5 -5
- package/dist/presets.mjs +2 -2
- package/dist/reset.js +1 -1
- package/dist/reset.mjs +1 -1
- package/dist/types.js +1 -1
- package/dist/types.mjs +1 -1
- package/dist/vite.d.mts +1 -1
- package/dist/vite.d.ts +1 -1
- package/dist/vite.js +9 -8
- package/dist/vite.mjs +8 -7
- package/dist/webpack.d.mts +1 -1
- package/dist/webpack.d.ts +1 -1
- package/dist/webpack.js +10 -9
- package/dist/webpack.mjs +8 -7
- package/dist/webpack4.d.mts +1 -1
- package/dist/webpack4.d.ts +1 -1
- package/dist/webpack4.js +64 -49
- package/dist/webpack4.mjs +33 -18
- package/package.json +7 -7
|
@@ -6,13 +6,16 @@ function createMediaQuery(value) {
|
|
|
6
6
|
function createNegativeMediaQuery(value) {
|
|
7
7
|
return `@media not screen and (${queryKey}:"${value}"){&}`;
|
|
8
8
|
}
|
|
9
|
+
var UNESCAPED_UNDERSCORE_RE = /(?<!\\)_/g;
|
|
10
|
+
var WHITESPACE_RE = /\s+/g;
|
|
11
|
+
var LOGICAL_OPERATOR_RE = /\s*(\|\||&&)\s*/g;
|
|
9
12
|
function normalComment(text) {
|
|
10
13
|
if (typeof text === "string") {
|
|
11
|
-
const normalized = text.replaceAll(
|
|
14
|
+
const normalized = text.replaceAll(UNESCAPED_UNDERSCORE_RE, " ").replaceAll(WHITESPACE_RE, " ").trim();
|
|
12
15
|
if (normalized.includes("\\")) {
|
|
13
16
|
return normalized;
|
|
14
17
|
}
|
|
15
|
-
return normalized.replaceAll(
|
|
18
|
+
return normalized.replaceAll(LOGICAL_OPERATOR_RE, " $1 ").replaceAll(WHITESPACE_RE, " ").trim();
|
|
16
19
|
}
|
|
17
20
|
return text;
|
|
18
21
|
}
|
|
@@ -28,11 +31,12 @@ function ifndef(text) {
|
|
|
28
31
|
end: `#endif`
|
|
29
32
|
};
|
|
30
33
|
}
|
|
34
|
+
var QUERY_KEY_REGEX = new RegExp(`\\(\\s*${queryKey}\\s*:\\s*"([^)]*)"\\)`, "g");
|
|
31
35
|
function matchCustomPropertyFromValue(str, cb) {
|
|
32
36
|
let arr;
|
|
33
37
|
let index = 0;
|
|
34
|
-
|
|
35
|
-
while ((arr =
|
|
38
|
+
QUERY_KEY_REGEX.lastIndex = 0;
|
|
39
|
+
while ((arr = QUERY_KEY_REGEX.exec(str)) !== null) {
|
|
36
40
|
cb(arr, index);
|
|
37
41
|
index++;
|
|
38
42
|
}
|
|
@@ -7,10 +7,12 @@ import { isAllowedClassName, MappingChars2String } from "@weapp-core/escape";
|
|
|
7
7
|
var CSS_FILE_PATTERN = /.+\.(?:wx|ac|jx|tt|q|c|ty)ss$/;
|
|
8
8
|
var HTML_FILE_PATTERN = /.+\.(?:(?:wx|ax|jx|ks|tt|q|ty|xhs)ml|swan)$/;
|
|
9
9
|
var JS_FILE_PATTERN = /.+\.[cm]?js?$/;
|
|
10
|
+
var BACKSLASH_RE = /\\/g;
|
|
10
11
|
function normalizePath(p) {
|
|
11
|
-
return p.replace(
|
|
12
|
+
return p.replace(BACKSLASH_RE, "/");
|
|
12
13
|
}
|
|
13
14
|
var MPX_STYLES_DIR_PATTERN = /(?:^|\/)styles\/.*\.(?:wx|ac|jx|tt|q|c|ty)ss$/i;
|
|
15
|
+
var KBONE_MAIN_CSS_RE = /^(?:common\/)?miniprogram-app/;
|
|
14
16
|
var MAIN_CSS_CHUNK_MATCHERS = {
|
|
15
17
|
"uni-app": (file) => file.startsWith("common/main") || file.startsWith("app"),
|
|
16
18
|
"uni-app-vite": (file) => file.startsWith("app") || file.startsWith("common/main"),
|
|
@@ -25,7 +27,7 @@ var MAIN_CSS_CHUNK_MATCHERS = {
|
|
|
25
27
|
"remax": (file) => file.startsWith("app"),
|
|
26
28
|
"rax": (file) => file.startsWith("bundle"),
|
|
27
29
|
"native": (file) => file.startsWith("app"),
|
|
28
|
-
"kbone": (file) =>
|
|
30
|
+
"kbone": (file) => KBONE_MAIN_CSS_RE.test(file)
|
|
29
31
|
};
|
|
30
32
|
var alwaysFalse = () => false;
|
|
31
33
|
function createMainCssChunkMatcher() {
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
|
|
2
2
|
|
|
3
|
-
var
|
|
3
|
+
var _chunkG3G437UEjs = require('./chunk-G3G437UE.js');
|
|
4
4
|
|
|
5
5
|
|
|
6
|
-
var
|
|
6
|
+
var _chunkI4EOMKX2js = require('./chunk-I4EOMKX2.js');
|
|
7
7
|
|
|
8
8
|
// src/shared/mpx.ts
|
|
9
9
|
var _path = require('path'); var _path2 = _interopRequireDefault(_path);
|
|
@@ -90,6 +90,7 @@ function setupMpxTailwindcssRedirect(pkgDir, enabled) {
|
|
|
90
90
|
installTailwindcssCssRedirect(pkgDir);
|
|
91
91
|
}
|
|
92
92
|
}
|
|
93
|
+
var CSS_EXT_RE = /\.css$/i;
|
|
93
94
|
function injectMpxCssRewritePreRules(compiler, loader, loaderOptions) {
|
|
94
95
|
var _a;
|
|
95
96
|
if (!loader) {
|
|
@@ -110,14 +111,14 @@ function injectMpxCssRewritePreRules(compiler, loader, loaderOptions) {
|
|
|
110
111
|
moduleOptions.rules.unshift(
|
|
111
112
|
createRule({ resourceQuery: (query) => isMpxStyleResourceQuery(query) }),
|
|
112
113
|
createRule({
|
|
113
|
-
test:
|
|
114
|
+
test: CSS_EXT_RE,
|
|
114
115
|
resourceQuery: (query) => !isMpxStyleResourceQuery(query)
|
|
115
116
|
})
|
|
116
117
|
);
|
|
117
118
|
}
|
|
118
119
|
|
|
119
120
|
// src/bundlers/webpack/shared/css-imports.ts
|
|
120
|
-
var
|
|
121
|
+
var CSS_EXT_RE2 = /\.(?:css|scss|sass|less|styl|pcss)$/i;
|
|
121
122
|
function stripResourceQuery(file) {
|
|
122
123
|
let idx = file.indexOf("?");
|
|
123
124
|
if (idx === -1) {
|
|
@@ -141,10 +142,10 @@ function rewriteTailwindcssRequestForCss(data, pkgDir, appType) {
|
|
|
141
142
|
return;
|
|
142
143
|
}
|
|
143
144
|
const normalizedIssuer = stripResourceQuery(issuer);
|
|
144
|
-
if (!
|
|
145
|
+
if (!CSS_EXT_RE2.test(normalizedIssuer)) {
|
|
145
146
|
return;
|
|
146
147
|
}
|
|
147
|
-
const resolved =
|
|
148
|
+
const resolved = _chunkG3G437UEjs.resolveTailwindcssImport.call(void 0, request, pkgDir, { appType });
|
|
148
149
|
if (!resolved) {
|
|
149
150
|
return;
|
|
150
151
|
}
|
|
@@ -154,8 +155,8 @@ function applyTailwindcssCssImportRewrite(compiler, options) {
|
|
|
154
155
|
if (!options.enabled) {
|
|
155
156
|
return;
|
|
156
157
|
}
|
|
157
|
-
compiler.hooks.normalModuleFactory.tap(
|
|
158
|
-
factory.hooks.beforeResolve.tap(
|
|
158
|
+
compiler.hooks.normalModuleFactory.tap(_chunkI4EOMKX2js.pluginName, (factory) => {
|
|
159
|
+
factory.hooks.beforeResolve.tap(_chunkI4EOMKX2js.pluginName, (data) => {
|
|
159
160
|
rewriteTailwindcssRequestForCss(data, options.pkgDir, options.appType);
|
|
160
161
|
});
|
|
161
162
|
});
|
|
@@ -206,7 +207,7 @@ function toChunkFiles(files) {
|
|
|
206
207
|
if (Array.isArray(files)) {
|
|
207
208
|
return files;
|
|
208
209
|
}
|
|
209
|
-
return
|
|
210
|
+
return [...files];
|
|
210
211
|
}
|
|
211
212
|
function createAssetHashByChunkMap(chunks) {
|
|
212
213
|
const partsByFile = /* @__PURE__ */ new Map();
|
|
@@ -7,10 +7,12 @@ var _escape = require('@weapp-core/escape');
|
|
|
7
7
|
var CSS_FILE_PATTERN = /.+\.(?:wx|ac|jx|tt|q|c|ty)ss$/;
|
|
8
8
|
var HTML_FILE_PATTERN = /.+\.(?:(?:wx|ax|jx|ks|tt|q|ty|xhs)ml|swan)$/;
|
|
9
9
|
var JS_FILE_PATTERN = /.+\.[cm]?js?$/;
|
|
10
|
+
var BACKSLASH_RE = /\\/g;
|
|
10
11
|
function normalizePath(p) {
|
|
11
|
-
return p.replace(
|
|
12
|
+
return p.replace(BACKSLASH_RE, "/");
|
|
12
13
|
}
|
|
13
14
|
var MPX_STYLES_DIR_PATTERN = /(?:^|\/)styles\/.*\.(?:wx|ac|jx|tt|q|c|ty)ss$/i;
|
|
15
|
+
var KBONE_MAIN_CSS_RE = /^(?:common\/)?miniprogram-app/;
|
|
14
16
|
var MAIN_CSS_CHUNK_MATCHERS = {
|
|
15
17
|
"uni-app": (file) => file.startsWith("common/main") || file.startsWith("app"),
|
|
16
18
|
"uni-app-vite": (file) => file.startsWith("app") || file.startsWith("common/main"),
|
|
@@ -25,7 +27,7 @@ var MAIN_CSS_CHUNK_MATCHERS = {
|
|
|
25
27
|
"remax": (file) => file.startsWith("app"),
|
|
26
28
|
"rax": (file) => file.startsWith("bundle"),
|
|
27
29
|
"native": (file) => file.startsWith("app"),
|
|
28
|
-
"kbone": (file) =>
|
|
30
|
+
"kbone": (file) => KBONE_MAIN_CSS_RE.test(file)
|
|
29
31
|
};
|
|
30
32
|
var alwaysFalse = () => false;
|
|
31
33
|
function createMainCssChunkMatcher() {
|
|
@@ -3,7 +3,7 @@ import {
|
|
|
3
3
|
} from "./chunk-F2CKKG6Q.mjs";
|
|
4
4
|
import {
|
|
5
5
|
pluginName
|
|
6
|
-
} from "./chunk-
|
|
6
|
+
} from "./chunk-FMWKBZWX.mjs";
|
|
7
7
|
|
|
8
8
|
// src/shared/mpx.ts
|
|
9
9
|
import path2 from "path";
|
|
@@ -90,6 +90,7 @@ function setupMpxTailwindcssRedirect(pkgDir, enabled) {
|
|
|
90
90
|
installTailwindcssCssRedirect(pkgDir);
|
|
91
91
|
}
|
|
92
92
|
}
|
|
93
|
+
var CSS_EXT_RE = /\.css$/i;
|
|
93
94
|
function injectMpxCssRewritePreRules(compiler, loader, loaderOptions) {
|
|
94
95
|
var _a;
|
|
95
96
|
if (!loader) {
|
|
@@ -110,14 +111,14 @@ function injectMpxCssRewritePreRules(compiler, loader, loaderOptions) {
|
|
|
110
111
|
moduleOptions.rules.unshift(
|
|
111
112
|
createRule({ resourceQuery: (query) => isMpxStyleResourceQuery(query) }),
|
|
112
113
|
createRule({
|
|
113
|
-
test:
|
|
114
|
+
test: CSS_EXT_RE,
|
|
114
115
|
resourceQuery: (query) => !isMpxStyleResourceQuery(query)
|
|
115
116
|
})
|
|
116
117
|
);
|
|
117
118
|
}
|
|
118
119
|
|
|
119
120
|
// src/bundlers/webpack/shared/css-imports.ts
|
|
120
|
-
var
|
|
121
|
+
var CSS_EXT_RE2 = /\.(?:css|scss|sass|less|styl|pcss)$/i;
|
|
121
122
|
function stripResourceQuery(file) {
|
|
122
123
|
let idx = file.indexOf("?");
|
|
123
124
|
if (idx === -1) {
|
|
@@ -141,7 +142,7 @@ function rewriteTailwindcssRequestForCss(data, pkgDir, appType) {
|
|
|
141
142
|
return;
|
|
142
143
|
}
|
|
143
144
|
const normalizedIssuer = stripResourceQuery(issuer);
|
|
144
|
-
if (!
|
|
145
|
+
if (!CSS_EXT_RE2.test(normalizedIssuer)) {
|
|
145
146
|
return;
|
|
146
147
|
}
|
|
147
148
|
const resolved = resolveTailwindcssImport(request, pkgDir, { appType });
|
|
@@ -206,7 +207,7 @@ function toChunkFiles(files) {
|
|
|
206
207
|
if (Array.isArray(files)) {
|
|
207
208
|
return files;
|
|
208
209
|
}
|
|
209
|
-
return
|
|
210
|
+
return [...files];
|
|
210
211
|
}
|
|
211
212
|
function createAssetHashByChunkMap(chunks) {
|
|
212
213
|
const partsByFile = /* @__PURE__ */ new Map();
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// ../../node_modules/.pnpm/tsup@8.5.1_@microsoft+api-extractor@7.55.2_@types+node@24.
|
|
1
|
+
// ../../node_modules/.pnpm/tsup@8.5.1_@microsoft+api-extractor@7.55.2_@types+node@24.12.0__@swc+core@1.15.18_@swc+_6ff00797e53d4229106048f969f94f55/node_modules/tsup/assets/esm_shims.js
|
|
2
2
|
import path from "path";
|
|
3
3
|
import { fileURLToPath } from "url";
|
|
4
4
|
var getFilename = () => fileURLToPath(import.meta.url);
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import {
|
|
2
2
|
createPatchTargetRecorder,
|
|
3
3
|
createTailwindPatchPromise
|
|
4
|
-
} from "./chunk-
|
|
4
|
+
} from "./chunk-FMWKBZWX.mjs";
|
|
5
5
|
import {
|
|
6
6
|
logger
|
|
7
|
-
} from "./chunk-
|
|
7
|
+
} from "./chunk-XGUD52TA.mjs";
|
|
8
8
|
|
|
9
9
|
// src/tailwindcss/recorder.ts
|
|
10
10
|
function setupPatchRecorder(patcher, baseDir, options) {
|