@weapp-tailwindcss/merge 1.0.3 → 1.0.5
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-YWRMBDAW.js → chunk-BNLHSQB7.js} +44 -1
- package/dist/chunk-DFAJWCXT.cjs +31 -0
- package/dist/chunk-DGEFFMGT.js +31 -0
- package/dist/{chunk-NDXSFOW3.cjs → chunk-SQBQEUQE.cjs} +45 -2
- package/dist/cva.cjs +16 -7
- package/dist/cva.d.cts +7 -3
- package/dist/cva.d.ts +7 -3
- package/dist/cva.js +14 -5
- package/dist/index.cjs +5 -3
- package/dist/index.d.cts +2 -1
- package/dist/index.d.ts +2 -1
- package/dist/index.js +4 -2
- package/dist/types-CXrD0bcD.d.cts +5 -0
- package/dist/types-CXrD0bcD.d.ts +5 -0
- package/dist/v3.cjs +11 -21
- package/dist/v3.d.cts +14 -7
- package/dist/v3.d.ts +14 -7
- package/dist/v3.js +11 -21
- package/dist/v4.cjs +5 -3
- package/dist/v4.d.cts +14 -7
- package/dist/v4.d.ts +14 -7
- package/dist/v4.js +4 -2
- package/package.json +10 -7
- package/dist/chunk-SHRVGHJ4.js +0 -41
- package/dist/chunk-XUZIFJCO.cjs +0 -41
|
@@ -195,7 +195,50 @@ function replaceWxml(original, options = {
|
|
|
195
195
|
// ../weapp-tailwindcss/dist/escape.mjs
|
|
196
196
|
var weappTwIgnore = String.raw;
|
|
197
197
|
|
|
198
|
+
// src/utils.ts
|
|
199
|
+
import { clsx } from "clsx";
|
|
200
|
+
function noop(x) {
|
|
201
|
+
return x;
|
|
202
|
+
}
|
|
203
|
+
function createFactory(opts) {
|
|
204
|
+
const {
|
|
205
|
+
twMerge: _twMerge,
|
|
206
|
+
twJoin: _twJoin,
|
|
207
|
+
createTailwindMerge: _createTailwindMerge,
|
|
208
|
+
extendTailwindMerge: _extendTailwindMerge
|
|
209
|
+
} = opts;
|
|
210
|
+
return function create(options) {
|
|
211
|
+
const e = options?.disableEscape ? noop : replaceWxml;
|
|
212
|
+
function twMerge(...inputs) {
|
|
213
|
+
return e(_twMerge(clsx(inputs)));
|
|
214
|
+
}
|
|
215
|
+
function twJoin(...inputs) {
|
|
216
|
+
return e(_twJoin(clsx(inputs)));
|
|
217
|
+
}
|
|
218
|
+
const extendTailwindMerge = (...args) => {
|
|
219
|
+
const customTwMerge = _extendTailwindMerge(...args);
|
|
220
|
+
return function cn(...inputs) {
|
|
221
|
+
return e(customTwMerge(clsx(inputs)));
|
|
222
|
+
};
|
|
223
|
+
};
|
|
224
|
+
const createTailwindMerge = (...args) => {
|
|
225
|
+
const customTwMerge = _createTailwindMerge(...args);
|
|
226
|
+
return function cn(...inputs) {
|
|
227
|
+
return e(customTwMerge(clsx(inputs)));
|
|
228
|
+
};
|
|
229
|
+
};
|
|
230
|
+
return {
|
|
231
|
+
twMerge,
|
|
232
|
+
twJoin,
|
|
233
|
+
extendTailwindMerge,
|
|
234
|
+
createTailwindMerge
|
|
235
|
+
};
|
|
236
|
+
};
|
|
237
|
+
}
|
|
238
|
+
|
|
198
239
|
export {
|
|
199
240
|
replaceWxml,
|
|
200
|
-
weappTwIgnore
|
|
241
|
+
weappTwIgnore,
|
|
242
|
+
noop,
|
|
243
|
+
createFactory
|
|
201
244
|
};
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
"use strict";Object.defineProperty(exports, "__esModule", {value: true});
|
|
2
|
+
|
|
3
|
+
var _chunkSQBQEUQEcjs = require('./chunk-SQBQEUQE.cjs');
|
|
4
|
+
|
|
5
|
+
// src/v4.ts
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
var _tailwindmerge = require('tailwind-merge');
|
|
14
|
+
var create = _chunkSQBQEUQEcjs.createFactory.call(void 0, {
|
|
15
|
+
createTailwindMerge: _tailwindmerge.createTailwindMerge,
|
|
16
|
+
extendTailwindMerge: _tailwindmerge.extendTailwindMerge,
|
|
17
|
+
twJoin: _tailwindmerge.twJoin,
|
|
18
|
+
twMerge: _tailwindmerge.twMerge,
|
|
19
|
+
version: 3
|
|
20
|
+
});
|
|
21
|
+
var { twMerge, twJoin, extendTailwindMerge, createTailwindMerge } = create();
|
|
22
|
+
|
|
23
|
+
|
|
24
|
+
|
|
25
|
+
|
|
26
|
+
|
|
27
|
+
|
|
28
|
+
|
|
29
|
+
|
|
30
|
+
|
|
31
|
+
exports.getDefaultConfig = _tailwindmerge.getDefaultConfig; exports.mergeConfigs = _tailwindmerge.mergeConfigs; exports.create = create; exports.twMerge = twMerge; exports.twJoin = twJoin; exports.extendTailwindMerge = extendTailwindMerge; exports.createTailwindMerge = createTailwindMerge;
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
import {
|
|
2
|
+
createFactory
|
|
3
|
+
} from "./chunk-BNLHSQB7.js";
|
|
4
|
+
|
|
5
|
+
// src/v4.ts
|
|
6
|
+
import {
|
|
7
|
+
createTailwindMerge as _createTailwindMerge,
|
|
8
|
+
extendTailwindMerge as _extendTailwindMerge,
|
|
9
|
+
twJoin as _twJoin,
|
|
10
|
+
twMerge as _twMerge,
|
|
11
|
+
getDefaultConfig,
|
|
12
|
+
mergeConfigs
|
|
13
|
+
} from "tailwind-merge";
|
|
14
|
+
var create = createFactory({
|
|
15
|
+
createTailwindMerge: _createTailwindMerge,
|
|
16
|
+
extendTailwindMerge: _extendTailwindMerge,
|
|
17
|
+
twJoin: _twJoin,
|
|
18
|
+
twMerge: _twMerge,
|
|
19
|
+
version: 3
|
|
20
|
+
});
|
|
21
|
+
var { twMerge, twJoin, extendTailwindMerge, createTailwindMerge } = create();
|
|
22
|
+
|
|
23
|
+
export {
|
|
24
|
+
getDefaultConfig,
|
|
25
|
+
mergeConfigs,
|
|
26
|
+
create,
|
|
27
|
+
twMerge,
|
|
28
|
+
twJoin,
|
|
29
|
+
extendTailwindMerge,
|
|
30
|
+
createTailwindMerge
|
|
31
|
+
};
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
"use strict";Object.defineProperty(exports, "__esModule", {value: true})
|
|
1
|
+
"use strict";Object.defineProperty(exports, "__esModule", {value: true}); 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; }// ../../node_modules/.pnpm/@weapp-core+escape@4.0.1/node_modules/@weapp-core/escape/dist/index.mjs
|
|
2
2
|
var ComplexMappingChars2String = {
|
|
3
3
|
"[": "_bl_",
|
|
4
4
|
"]": "_br_",
|
|
@@ -195,7 +195,50 @@ function replaceWxml(original, options = {
|
|
|
195
195
|
// ../weapp-tailwindcss/dist/escape.mjs
|
|
196
196
|
var weappTwIgnore = String.raw;
|
|
197
197
|
|
|
198
|
+
// src/utils.ts
|
|
199
|
+
var _clsx = require('clsx');
|
|
200
|
+
function noop(x) {
|
|
201
|
+
return x;
|
|
202
|
+
}
|
|
203
|
+
function createFactory(opts) {
|
|
204
|
+
const {
|
|
205
|
+
twMerge: _twMerge,
|
|
206
|
+
twJoin: _twJoin,
|
|
207
|
+
createTailwindMerge: _createTailwindMerge,
|
|
208
|
+
extendTailwindMerge: _extendTailwindMerge
|
|
209
|
+
} = opts;
|
|
210
|
+
return function create(options) {
|
|
211
|
+
const e = _optionalChain([options, 'optionalAccess', _ => _.disableEscape]) ? noop : replaceWxml;
|
|
212
|
+
function twMerge(...inputs) {
|
|
213
|
+
return e(_twMerge(_clsx.clsx.call(void 0, inputs)));
|
|
214
|
+
}
|
|
215
|
+
function twJoin(...inputs) {
|
|
216
|
+
return e(_twJoin(_clsx.clsx.call(void 0, inputs)));
|
|
217
|
+
}
|
|
218
|
+
const extendTailwindMerge = (...args) => {
|
|
219
|
+
const customTwMerge = _extendTailwindMerge(...args);
|
|
220
|
+
return function cn(...inputs) {
|
|
221
|
+
return e(customTwMerge(_clsx.clsx.call(void 0, inputs)));
|
|
222
|
+
};
|
|
223
|
+
};
|
|
224
|
+
const createTailwindMerge = (...args) => {
|
|
225
|
+
const customTwMerge = _createTailwindMerge(...args);
|
|
226
|
+
return function cn(...inputs) {
|
|
227
|
+
return e(customTwMerge(_clsx.clsx.call(void 0, inputs)));
|
|
228
|
+
};
|
|
229
|
+
};
|
|
230
|
+
return {
|
|
231
|
+
twMerge,
|
|
232
|
+
twJoin,
|
|
233
|
+
extendTailwindMerge,
|
|
234
|
+
createTailwindMerge
|
|
235
|
+
};
|
|
236
|
+
};
|
|
237
|
+
}
|
|
238
|
+
|
|
239
|
+
|
|
240
|
+
|
|
198
241
|
|
|
199
242
|
|
|
200
243
|
|
|
201
|
-
exports.replaceWxml = replaceWxml; exports.weappTwIgnore = weappTwIgnore;
|
|
244
|
+
exports.replaceWxml = replaceWxml; exports.weappTwIgnore = weappTwIgnore; exports.noop = noop; exports.createFactory = createFactory;
|
package/dist/cva.cjs
CHANGED
|
@@ -1,15 +1,24 @@
|
|
|
1
|
-
"use strict";Object.defineProperty(exports, "__esModule", {value: true});
|
|
1
|
+
"use strict";Object.defineProperty(exports, "__esModule", {value: true}); 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
|
-
|
|
3
|
+
|
|
4
|
+
var _chunkSQBQEUQEcjs = require('./chunk-SQBQEUQE.cjs');
|
|
4
5
|
|
|
5
6
|
// src/cva.ts
|
|
6
7
|
var _classvarianceauthority = require('class-variance-authority');
|
|
7
|
-
function
|
|
8
|
-
const
|
|
9
|
-
|
|
10
|
-
|
|
8
|
+
function create(options) {
|
|
9
|
+
const e = _optionalChain([options, 'optionalAccess', _ => _.disableEscape]) ? _chunkSQBQEUQEcjs.noop : _chunkSQBQEUQEcjs.replaceWxml;
|
|
10
|
+
function cva2(...inputs) {
|
|
11
|
+
const fn = _classvarianceauthority.cva.call(void 0, ...inputs);
|
|
12
|
+
return (...props) => {
|
|
13
|
+
return e(fn(...props));
|
|
14
|
+
};
|
|
15
|
+
}
|
|
16
|
+
return {
|
|
17
|
+
cva: cva2
|
|
11
18
|
};
|
|
12
19
|
}
|
|
20
|
+
var { cva } = create();
|
|
21
|
+
|
|
13
22
|
|
|
14
23
|
|
|
15
|
-
exports.cva = cva;
|
|
24
|
+
exports.create = create; exports.cva = cva;
|
package/dist/cva.d.cts
CHANGED
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
import * as class_variance_authority_types from 'class-variance-authority/types';
|
|
2
|
-
import
|
|
2
|
+
import * as clsx from 'clsx';
|
|
3
|
+
import { C as CreateOptions } from './types-CXrD0bcD.cjs';
|
|
3
4
|
|
|
4
|
-
declare function
|
|
5
|
+
declare function create(options?: CreateOptions): {
|
|
6
|
+
cva: (base?: clsx.ClassValue, config?: undefined) => (...props: Parameters<(props?: class_variance_authority_types.ClassProp | undefined) => string>) => string;
|
|
7
|
+
};
|
|
8
|
+
declare const cva: (base?: clsx.ClassValue, config?: undefined) => (...props: Parameters<(props?: class_variance_authority_types.ClassProp | undefined) => string>) => string;
|
|
5
9
|
|
|
6
|
-
export { cva };
|
|
10
|
+
export { create, cva };
|
package/dist/cva.d.ts
CHANGED
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
import * as class_variance_authority_types from 'class-variance-authority/types';
|
|
2
|
-
import
|
|
2
|
+
import * as clsx from 'clsx';
|
|
3
|
+
import { C as CreateOptions } from './types-CXrD0bcD.js';
|
|
3
4
|
|
|
4
|
-
declare function
|
|
5
|
+
declare function create(options?: CreateOptions): {
|
|
6
|
+
cva: (base?: clsx.ClassValue, config?: undefined) => (...props: Parameters<(props?: class_variance_authority_types.ClassProp | undefined) => string>) => string;
|
|
7
|
+
};
|
|
8
|
+
declare const cva: (base?: clsx.ClassValue, config?: undefined) => (...props: Parameters<(props?: class_variance_authority_types.ClassProp | undefined) => string>) => string;
|
|
5
9
|
|
|
6
|
-
export { cva };
|
|
10
|
+
export { create, cva };
|
package/dist/cva.js
CHANGED
|
@@ -1,15 +1,24 @@
|
|
|
1
1
|
import {
|
|
2
|
+
noop,
|
|
2
3
|
replaceWxml
|
|
3
|
-
} from "./chunk-
|
|
4
|
+
} from "./chunk-BNLHSQB7.js";
|
|
4
5
|
|
|
5
6
|
// src/cva.ts
|
|
6
7
|
import { cva as _cva } from "class-variance-authority";
|
|
7
|
-
function
|
|
8
|
-
const
|
|
9
|
-
|
|
10
|
-
|
|
8
|
+
function create(options) {
|
|
9
|
+
const e = options?.disableEscape ? noop : replaceWxml;
|
|
10
|
+
function cva2(...inputs) {
|
|
11
|
+
const fn = _cva(...inputs);
|
|
12
|
+
return (...props) => {
|
|
13
|
+
return e(fn(...props));
|
|
14
|
+
};
|
|
15
|
+
}
|
|
16
|
+
return {
|
|
17
|
+
cva: cva2
|
|
11
18
|
};
|
|
12
19
|
}
|
|
20
|
+
var { cva } = create();
|
|
13
21
|
export {
|
|
22
|
+
create,
|
|
14
23
|
cva
|
|
15
24
|
};
|
package/dist/index.cjs
CHANGED
|
@@ -5,11 +5,11 @@
|
|
|
5
5
|
|
|
6
6
|
|
|
7
7
|
|
|
8
|
-
var _chunkXUZIFJCOcjs = require('./chunk-XUZIFJCO.cjs');
|
|
9
8
|
|
|
9
|
+
var _chunkDFAJWCXTcjs = require('./chunk-DFAJWCXT.cjs');
|
|
10
10
|
|
|
11
|
-
var _chunkNDXSFOW3cjs = require('./chunk-NDXSFOW3.cjs');
|
|
12
11
|
|
|
12
|
+
var _chunkSQBQEUQEcjs = require('./chunk-SQBQEUQE.cjs');
|
|
13
13
|
|
|
14
14
|
|
|
15
15
|
|
|
@@ -17,4 +17,6 @@ var _chunkNDXSFOW3cjs = require('./chunk-NDXSFOW3.cjs');
|
|
|
17
17
|
|
|
18
18
|
|
|
19
19
|
|
|
20
|
-
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+
exports.create = _chunkDFAJWCXTcjs.create; exports.createTailwindMerge = _chunkDFAJWCXTcjs.createTailwindMerge; exports.extendTailwindMerge = _chunkDFAJWCXTcjs.extendTailwindMerge; exports.getDefaultConfig = _chunkDFAJWCXTcjs.getDefaultConfig; exports.mergeConfigs = _chunkDFAJWCXTcjs.mergeConfigs; exports.twJoin = _chunkDFAJWCXTcjs.twJoin; exports.twMerge = _chunkDFAJWCXTcjs.twMerge; exports.weappTwIgnore = _chunkSQBQEUQEcjs.weappTwIgnore;
|
package/dist/index.d.cts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
export { createTailwindMerge, extendTailwindMerge, twJoin, twMerge } from './v4.cjs';
|
|
1
|
+
export { create, createTailwindMerge, extendTailwindMerge, twJoin, twMerge } from './v4.cjs';
|
|
2
2
|
export { getDefaultConfig, mergeConfigs } from 'tailwind-merge';
|
|
3
3
|
export { weappTwIgnore } from 'weapp-tailwindcss/escape';
|
|
4
4
|
export { ClassValue } from 'clsx';
|
|
5
|
+
import './types-CXrD0bcD.cjs';
|
package/dist/index.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
export { createTailwindMerge, extendTailwindMerge, twJoin, twMerge } from './v4.js';
|
|
1
|
+
export { create, createTailwindMerge, extendTailwindMerge, twJoin, twMerge } from './v4.js';
|
|
2
2
|
export { getDefaultConfig, mergeConfigs } from 'tailwind-merge';
|
|
3
3
|
export { weappTwIgnore } from 'weapp-tailwindcss/escape';
|
|
4
4
|
export { ClassValue } from 'clsx';
|
|
5
|
+
import './types-CXrD0bcD.js';
|
package/dist/index.js
CHANGED
|
@@ -1,15 +1,17 @@
|
|
|
1
1
|
import {
|
|
2
|
+
create,
|
|
2
3
|
createTailwindMerge,
|
|
3
4
|
extendTailwindMerge,
|
|
4
5
|
getDefaultConfig,
|
|
5
6
|
mergeConfigs,
|
|
6
7
|
twJoin,
|
|
7
8
|
twMerge
|
|
8
|
-
} from "./chunk-
|
|
9
|
+
} from "./chunk-DGEFFMGT.js";
|
|
9
10
|
import {
|
|
10
11
|
weappTwIgnore
|
|
11
|
-
} from "./chunk-
|
|
12
|
+
} from "./chunk-BNLHSQB7.js";
|
|
12
13
|
export {
|
|
14
|
+
create,
|
|
13
15
|
createTailwindMerge,
|
|
14
16
|
extendTailwindMerge,
|
|
15
17
|
getDefaultConfig,
|
package/dist/v3.cjs
CHANGED
|
@@ -1,10 +1,9 @@
|
|
|
1
1
|
"use strict";Object.defineProperty(exports, "__esModule", {value: true});
|
|
2
2
|
|
|
3
3
|
|
|
4
|
-
var
|
|
4
|
+
var _chunkSQBQEUQEcjs = require('./chunk-SQBQEUQE.cjs');
|
|
5
5
|
|
|
6
6
|
// src/v3.ts
|
|
7
|
-
var _clsx = require('clsx');
|
|
8
7
|
|
|
9
8
|
|
|
10
9
|
|
|
@@ -13,24 +12,14 @@ var _clsx = require('clsx');
|
|
|
13
12
|
|
|
14
13
|
|
|
15
14
|
var _tailwindmergev2 = require('tailwind-merge-v2');
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
return function cn(...inputs) {
|
|
25
|
-
return _chunkNDXSFOW3cjs.replaceWxml.call(void 0, customTwMerge(_clsx.clsx.call(void 0, inputs)));
|
|
26
|
-
};
|
|
27
|
-
};
|
|
28
|
-
var createTailwindMerge = (...args) => {
|
|
29
|
-
const customTwMerge = _tailwindmergev2.createTailwindMerge.call(void 0, ...args);
|
|
30
|
-
return function cn(...inputs) {
|
|
31
|
-
return _chunkNDXSFOW3cjs.replaceWxml.call(void 0, customTwMerge(_clsx.clsx.call(void 0, inputs)));
|
|
32
|
-
};
|
|
33
|
-
};
|
|
15
|
+
var create = _chunkSQBQEUQEcjs.createFactory.call(void 0, {
|
|
16
|
+
createTailwindMerge: _tailwindmergev2.createTailwindMerge,
|
|
17
|
+
extendTailwindMerge: _tailwindmergev2.extendTailwindMerge,
|
|
18
|
+
twJoin: _tailwindmergev2.twJoin,
|
|
19
|
+
twMerge: _tailwindmergev2.twMerge,
|
|
20
|
+
version: 2
|
|
21
|
+
});
|
|
22
|
+
var { twMerge, twJoin, extendTailwindMerge, createTailwindMerge } = create();
|
|
34
23
|
|
|
35
24
|
|
|
36
25
|
|
|
@@ -39,4 +28,5 @@ var createTailwindMerge = (...args) => {
|
|
|
39
28
|
|
|
40
29
|
|
|
41
30
|
|
|
42
|
-
|
|
31
|
+
|
|
32
|
+
exports.create = create; exports.createTailwindMerge = createTailwindMerge; exports.extendTailwindMerge = extendTailwindMerge; exports.getDefaultConfig = _tailwindmergev2.getDefaultConfig; exports.mergeConfigs = _tailwindmergev2.mergeConfigs; exports.twJoin = twJoin; exports.twMerge = twMerge; exports.weappTwIgnore = _chunkSQBQEUQEcjs.weappTwIgnore;
|
package/dist/v3.d.cts
CHANGED
|
@@ -1,12 +1,19 @@
|
|
|
1
|
+
import * as tailwind_merge_v2 from 'tailwind-merge-v2';
|
|
2
|
+
export { getDefaultConfig, mergeConfigs } from 'tailwind-merge-v2';
|
|
3
|
+
import { C as CreateOptions } from './types-CXrD0bcD.cjs';
|
|
1
4
|
import { ClassValue } from 'clsx';
|
|
2
5
|
export { ClassValue } from 'clsx';
|
|
3
|
-
import { extendTailwindMerge as extendTailwindMerge$1, createTailwindMerge as createTailwindMerge$1 } from 'tailwind-merge-v2';
|
|
4
|
-
export { getDefaultConfig, mergeConfigs } from 'tailwind-merge-v2';
|
|
5
6
|
export { weappTwIgnore } from 'weapp-tailwindcss/escape';
|
|
6
7
|
|
|
7
|
-
declare
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
8
|
+
declare const create: (options?: CreateOptions) => {
|
|
9
|
+
twMerge: (...inputs: ClassValue[]) => string;
|
|
10
|
+
twJoin: (...inputs: ClassValue[]) => string;
|
|
11
|
+
extendTailwindMerge: (configExtension: ((config: tailwind_merge_v2.Config<string, string>) => tailwind_merge_v2.Config<string, string>) | tailwind_merge_v2.ConfigExtension<string, string>, ...createConfig: ((config: tailwind_merge_v2.Config<string, string>) => tailwind_merge_v2.Config<string, string>)[]) => (...inputs: ClassValue[]) => string;
|
|
12
|
+
createTailwindMerge: (createConfigFirst: () => tailwind_merge_v2.Config<string, string>, ...createConfigRest: ((config: tailwind_merge_v2.Config<string, string>) => tailwind_merge_v2.Config<string, string>)[]) => (...inputs: ClassValue[]) => string;
|
|
13
|
+
};
|
|
14
|
+
declare const twMerge: (...inputs: ClassValue[]) => string;
|
|
15
|
+
declare const twJoin: (...inputs: ClassValue[]) => string;
|
|
16
|
+
declare const extendTailwindMerge: (configExtension: ((config: tailwind_merge_v2.Config<string, string>) => tailwind_merge_v2.Config<string, string>) | tailwind_merge_v2.ConfigExtension<string, string>, ...createConfig: ((config: tailwind_merge_v2.Config<string, string>) => tailwind_merge_v2.Config<string, string>)[]) => (...inputs: ClassValue[]) => string;
|
|
17
|
+
declare const createTailwindMerge: (createConfigFirst: () => tailwind_merge_v2.Config<string, string>, ...createConfigRest: ((config: tailwind_merge_v2.Config<string, string>) => tailwind_merge_v2.Config<string, string>)[]) => (...inputs: ClassValue[]) => string;
|
|
11
18
|
|
|
12
|
-
export { createTailwindMerge, extendTailwindMerge, twJoin, twMerge };
|
|
19
|
+
export { create, createTailwindMerge, extendTailwindMerge, twJoin, twMerge };
|
package/dist/v3.d.ts
CHANGED
|
@@ -1,12 +1,19 @@
|
|
|
1
|
+
import * as tailwind_merge_v2 from 'tailwind-merge-v2';
|
|
2
|
+
export { getDefaultConfig, mergeConfigs } from 'tailwind-merge-v2';
|
|
3
|
+
import { C as CreateOptions } from './types-CXrD0bcD.js';
|
|
1
4
|
import { ClassValue } from 'clsx';
|
|
2
5
|
export { ClassValue } from 'clsx';
|
|
3
|
-
import { extendTailwindMerge as extendTailwindMerge$1, createTailwindMerge as createTailwindMerge$1 } from 'tailwind-merge-v2';
|
|
4
|
-
export { getDefaultConfig, mergeConfigs } from 'tailwind-merge-v2';
|
|
5
6
|
export { weappTwIgnore } from 'weapp-tailwindcss/escape';
|
|
6
7
|
|
|
7
|
-
declare
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
8
|
+
declare const create: (options?: CreateOptions) => {
|
|
9
|
+
twMerge: (...inputs: ClassValue[]) => string;
|
|
10
|
+
twJoin: (...inputs: ClassValue[]) => string;
|
|
11
|
+
extendTailwindMerge: (configExtension: ((config: tailwind_merge_v2.Config<string, string>) => tailwind_merge_v2.Config<string, string>) | tailwind_merge_v2.ConfigExtension<string, string>, ...createConfig: ((config: tailwind_merge_v2.Config<string, string>) => tailwind_merge_v2.Config<string, string>)[]) => (...inputs: ClassValue[]) => string;
|
|
12
|
+
createTailwindMerge: (createConfigFirst: () => tailwind_merge_v2.Config<string, string>, ...createConfigRest: ((config: tailwind_merge_v2.Config<string, string>) => tailwind_merge_v2.Config<string, string>)[]) => (...inputs: ClassValue[]) => string;
|
|
13
|
+
};
|
|
14
|
+
declare const twMerge: (...inputs: ClassValue[]) => string;
|
|
15
|
+
declare const twJoin: (...inputs: ClassValue[]) => string;
|
|
16
|
+
declare const extendTailwindMerge: (configExtension: ((config: tailwind_merge_v2.Config<string, string>) => tailwind_merge_v2.Config<string, string>) | tailwind_merge_v2.ConfigExtension<string, string>, ...createConfig: ((config: tailwind_merge_v2.Config<string, string>) => tailwind_merge_v2.Config<string, string>)[]) => (...inputs: ClassValue[]) => string;
|
|
17
|
+
declare const createTailwindMerge: (createConfigFirst: () => tailwind_merge_v2.Config<string, string>, ...createConfigRest: ((config: tailwind_merge_v2.Config<string, string>) => tailwind_merge_v2.Config<string, string>)[]) => (...inputs: ClassValue[]) => string;
|
|
11
18
|
|
|
12
|
-
export { createTailwindMerge, extendTailwindMerge, twJoin, twMerge };
|
|
19
|
+
export { create, createTailwindMerge, extendTailwindMerge, twJoin, twMerge };
|
package/dist/v3.js
CHANGED
|
@@ -1,10 +1,9 @@
|
|
|
1
1
|
import {
|
|
2
|
-
|
|
2
|
+
createFactory,
|
|
3
3
|
weappTwIgnore
|
|
4
|
-
} from "./chunk-
|
|
4
|
+
} from "./chunk-BNLHSQB7.js";
|
|
5
5
|
|
|
6
6
|
// src/v3.ts
|
|
7
|
-
import { clsx } from "clsx";
|
|
8
7
|
import {
|
|
9
8
|
createTailwindMerge as _createTailwindMerge,
|
|
10
9
|
extendTailwindMerge as _extendTailwindMerge,
|
|
@@ -13,25 +12,16 @@ import {
|
|
|
13
12
|
getDefaultConfig,
|
|
14
13
|
mergeConfigs
|
|
15
14
|
} from "tailwind-merge-v2";
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
return function cn(...inputs) {
|
|
25
|
-
return replaceWxml(customTwMerge(clsx(inputs)));
|
|
26
|
-
};
|
|
27
|
-
};
|
|
28
|
-
var createTailwindMerge = (...args) => {
|
|
29
|
-
const customTwMerge = _createTailwindMerge(...args);
|
|
30
|
-
return function cn(...inputs) {
|
|
31
|
-
return replaceWxml(customTwMerge(clsx(inputs)));
|
|
32
|
-
};
|
|
33
|
-
};
|
|
15
|
+
var create = createFactory({
|
|
16
|
+
createTailwindMerge: _createTailwindMerge,
|
|
17
|
+
extendTailwindMerge: _extendTailwindMerge,
|
|
18
|
+
twJoin: _twJoin,
|
|
19
|
+
twMerge: _twMerge,
|
|
20
|
+
version: 2
|
|
21
|
+
});
|
|
22
|
+
var { twMerge, twJoin, extendTailwindMerge, createTailwindMerge } = create();
|
|
34
23
|
export {
|
|
24
|
+
create,
|
|
35
25
|
createTailwindMerge,
|
|
36
26
|
extendTailwindMerge,
|
|
37
27
|
getDefaultConfig,
|
package/dist/v4.cjs
CHANGED
|
@@ -5,11 +5,11 @@
|
|
|
5
5
|
|
|
6
6
|
|
|
7
7
|
|
|
8
|
-
var _chunkXUZIFJCOcjs = require('./chunk-XUZIFJCO.cjs');
|
|
9
8
|
|
|
9
|
+
var _chunkDFAJWCXTcjs = require('./chunk-DFAJWCXT.cjs');
|
|
10
10
|
|
|
11
|
-
var _chunkNDXSFOW3cjs = require('./chunk-NDXSFOW3.cjs');
|
|
12
11
|
|
|
12
|
+
var _chunkSQBQEUQEcjs = require('./chunk-SQBQEUQE.cjs');
|
|
13
13
|
|
|
14
14
|
|
|
15
15
|
|
|
@@ -17,4 +17,6 @@ var _chunkNDXSFOW3cjs = require('./chunk-NDXSFOW3.cjs');
|
|
|
17
17
|
|
|
18
18
|
|
|
19
19
|
|
|
20
|
-
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+
exports.create = _chunkDFAJWCXTcjs.create; exports.createTailwindMerge = _chunkDFAJWCXTcjs.createTailwindMerge; exports.extendTailwindMerge = _chunkDFAJWCXTcjs.extendTailwindMerge; exports.getDefaultConfig = _chunkDFAJWCXTcjs.getDefaultConfig; exports.mergeConfigs = _chunkDFAJWCXTcjs.mergeConfigs; exports.twJoin = _chunkDFAJWCXTcjs.twJoin; exports.twMerge = _chunkDFAJWCXTcjs.twMerge; exports.weappTwIgnore = _chunkSQBQEUQEcjs.weappTwIgnore;
|
package/dist/v4.d.cts
CHANGED
|
@@ -1,12 +1,19 @@
|
|
|
1
|
+
import * as tailwind_merge from 'tailwind-merge';
|
|
2
|
+
export { getDefaultConfig, mergeConfigs } from 'tailwind-merge';
|
|
3
|
+
import { C as CreateOptions } from './types-CXrD0bcD.cjs';
|
|
1
4
|
import { ClassValue } from 'clsx';
|
|
2
5
|
export { ClassValue } from 'clsx';
|
|
3
|
-
import { extendTailwindMerge as extendTailwindMerge$1, createTailwindMerge as createTailwindMerge$1 } from 'tailwind-merge';
|
|
4
|
-
export { getDefaultConfig, mergeConfigs } from 'tailwind-merge';
|
|
5
6
|
export { weappTwIgnore } from 'weapp-tailwindcss/escape';
|
|
6
7
|
|
|
7
|
-
declare
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
8
|
+
declare const create: (options?: CreateOptions) => {
|
|
9
|
+
twMerge: (...inputs: ClassValue[]) => string;
|
|
10
|
+
twJoin: (...inputs: ClassValue[]) => string;
|
|
11
|
+
extendTailwindMerge: (configExtension: ((config: tailwind_merge.Config<string, string>) => tailwind_merge.Config<string, string>) | tailwind_merge.ConfigExtension<string, string>, ...createConfig: ((config: tailwind_merge.Config<string, string>) => tailwind_merge.Config<string, string>)[]) => (...inputs: ClassValue[]) => string;
|
|
12
|
+
createTailwindMerge: (createConfigFirst: () => tailwind_merge.Config<string, string>, ...createConfigRest: ((config: tailwind_merge.Config<string, string>) => tailwind_merge.Config<string, string>)[]) => (...inputs: ClassValue[]) => string;
|
|
13
|
+
};
|
|
14
|
+
declare const twMerge: (...inputs: ClassValue[]) => string;
|
|
15
|
+
declare const twJoin: (...inputs: ClassValue[]) => string;
|
|
16
|
+
declare const extendTailwindMerge: (configExtension: ((config: tailwind_merge.Config<string, string>) => tailwind_merge.Config<string, string>) | tailwind_merge.ConfigExtension<string, string>, ...createConfig: ((config: tailwind_merge.Config<string, string>) => tailwind_merge.Config<string, string>)[]) => (...inputs: ClassValue[]) => string;
|
|
17
|
+
declare const createTailwindMerge: (createConfigFirst: () => tailwind_merge.Config<string, string>, ...createConfigRest: ((config: tailwind_merge.Config<string, string>) => tailwind_merge.Config<string, string>)[]) => (...inputs: ClassValue[]) => string;
|
|
11
18
|
|
|
12
|
-
export { createTailwindMerge, extendTailwindMerge, twJoin, twMerge };
|
|
19
|
+
export { create, createTailwindMerge, extendTailwindMerge, twJoin, twMerge };
|
package/dist/v4.d.ts
CHANGED
|
@@ -1,12 +1,19 @@
|
|
|
1
|
+
import * as tailwind_merge from 'tailwind-merge';
|
|
2
|
+
export { getDefaultConfig, mergeConfigs } from 'tailwind-merge';
|
|
3
|
+
import { C as CreateOptions } from './types-CXrD0bcD.js';
|
|
1
4
|
import { ClassValue } from 'clsx';
|
|
2
5
|
export { ClassValue } from 'clsx';
|
|
3
|
-
import { extendTailwindMerge as extendTailwindMerge$1, createTailwindMerge as createTailwindMerge$1 } from 'tailwind-merge';
|
|
4
|
-
export { getDefaultConfig, mergeConfigs } from 'tailwind-merge';
|
|
5
6
|
export { weappTwIgnore } from 'weapp-tailwindcss/escape';
|
|
6
7
|
|
|
7
|
-
declare
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
8
|
+
declare const create: (options?: CreateOptions) => {
|
|
9
|
+
twMerge: (...inputs: ClassValue[]) => string;
|
|
10
|
+
twJoin: (...inputs: ClassValue[]) => string;
|
|
11
|
+
extendTailwindMerge: (configExtension: ((config: tailwind_merge.Config<string, string>) => tailwind_merge.Config<string, string>) | tailwind_merge.ConfigExtension<string, string>, ...createConfig: ((config: tailwind_merge.Config<string, string>) => tailwind_merge.Config<string, string>)[]) => (...inputs: ClassValue[]) => string;
|
|
12
|
+
createTailwindMerge: (createConfigFirst: () => tailwind_merge.Config<string, string>, ...createConfigRest: ((config: tailwind_merge.Config<string, string>) => tailwind_merge.Config<string, string>)[]) => (...inputs: ClassValue[]) => string;
|
|
13
|
+
};
|
|
14
|
+
declare const twMerge: (...inputs: ClassValue[]) => string;
|
|
15
|
+
declare const twJoin: (...inputs: ClassValue[]) => string;
|
|
16
|
+
declare const extendTailwindMerge: (configExtension: ((config: tailwind_merge.Config<string, string>) => tailwind_merge.Config<string, string>) | tailwind_merge.ConfigExtension<string, string>, ...createConfig: ((config: tailwind_merge.Config<string, string>) => tailwind_merge.Config<string, string>)[]) => (...inputs: ClassValue[]) => string;
|
|
17
|
+
declare const createTailwindMerge: (createConfigFirst: () => tailwind_merge.Config<string, string>, ...createConfigRest: ((config: tailwind_merge.Config<string, string>) => tailwind_merge.Config<string, string>)[]) => (...inputs: ClassValue[]) => string;
|
|
11
18
|
|
|
12
|
-
export { createTailwindMerge, extendTailwindMerge, twJoin, twMerge };
|
|
19
|
+
export { create, createTailwindMerge, extendTailwindMerge, twJoin, twMerge };
|
package/dist/v4.js
CHANGED
|
@@ -1,15 +1,17 @@
|
|
|
1
1
|
import {
|
|
2
|
+
create,
|
|
2
3
|
createTailwindMerge,
|
|
3
4
|
extendTailwindMerge,
|
|
4
5
|
getDefaultConfig,
|
|
5
6
|
mergeConfigs,
|
|
6
7
|
twJoin,
|
|
7
8
|
twMerge
|
|
8
|
-
} from "./chunk-
|
|
9
|
+
} from "./chunk-DGEFFMGT.js";
|
|
9
10
|
import {
|
|
10
11
|
weappTwIgnore
|
|
11
|
-
} from "./chunk-
|
|
12
|
+
} from "./chunk-BNLHSQB7.js";
|
|
12
13
|
export {
|
|
14
|
+
create,
|
|
13
15
|
createTailwindMerge,
|
|
14
16
|
extendTailwindMerge,
|
|
15
17
|
getDefaultConfig,
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@weapp-tailwindcss/merge",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "1.0.
|
|
4
|
+
"version": "1.0.5",
|
|
5
5
|
"description": "weapp-tailwindcss",
|
|
6
6
|
"author": "ice breaker <1324318532@qq.com>",
|
|
7
7
|
"license": "MIT",
|
|
@@ -15,6 +15,9 @@
|
|
|
15
15
|
},
|
|
16
16
|
"keywords": [],
|
|
17
17
|
"sideEffects": false,
|
|
18
|
+
"_exports": {
|
|
19
|
+
".": "./src/index.ts"
|
|
20
|
+
},
|
|
18
21
|
"exports": {
|
|
19
22
|
".": {
|
|
20
23
|
"types": "./dist/index.d.ts",
|
|
@@ -37,6 +40,9 @@
|
|
|
37
40
|
"require": "./dist/v4.cjs"
|
|
38
41
|
}
|
|
39
42
|
},
|
|
43
|
+
"main": "./dist/index.cjs",
|
|
44
|
+
"module": "./dist/index.js",
|
|
45
|
+
"types": "./dist/index.d.ts",
|
|
40
46
|
"files": [
|
|
41
47
|
"dist",
|
|
42
48
|
"scripts"
|
|
@@ -44,13 +50,13 @@
|
|
|
44
50
|
"dependencies": {
|
|
45
51
|
"class-variance-authority": "^0.7.1",
|
|
46
52
|
"clsx": "^2.1.1",
|
|
47
|
-
"local-pkg": "^1.
|
|
53
|
+
"local-pkg": "^1.1.1",
|
|
48
54
|
"semver": "^7.7.1",
|
|
49
55
|
"tailwind-merge": "^3.0.2",
|
|
50
56
|
"tailwind-merge-v2": "npm:tailwind-merge@^2.6.0"
|
|
51
57
|
},
|
|
52
58
|
"devDependencies": {
|
|
53
|
-
"weapp-tailwindcss": "4.0.
|
|
59
|
+
"weapp-tailwindcss": "4.0.10"
|
|
54
60
|
},
|
|
55
61
|
"scripts": {
|
|
56
62
|
"dev": "tsup --watch --sourcemap",
|
|
@@ -61,8 +67,5 @@
|
|
|
61
67
|
"lint": "eslint .",
|
|
62
68
|
"lint:fix": "eslint . --fix",
|
|
63
69
|
"postinstall": "node scripts/postinstall.js"
|
|
64
|
-
}
|
|
65
|
-
"main": "./dist/index.cjs",
|
|
66
|
-
"module": "./dist/index.js",
|
|
67
|
-
"types": "./dist/index.d.ts"
|
|
70
|
+
}
|
|
68
71
|
}
|
package/dist/chunk-SHRVGHJ4.js
DELETED
|
@@ -1,41 +0,0 @@
|
|
|
1
|
-
import {
|
|
2
|
-
replaceWxml
|
|
3
|
-
} from "./chunk-YWRMBDAW.js";
|
|
4
|
-
|
|
5
|
-
// src/v4.ts
|
|
6
|
-
import { clsx } from "clsx";
|
|
7
|
-
import {
|
|
8
|
-
createTailwindMerge as _createTailwindMerge,
|
|
9
|
-
extendTailwindMerge as _extendTailwindMerge,
|
|
10
|
-
twJoin as _twJoin,
|
|
11
|
-
twMerge as _twMerge,
|
|
12
|
-
getDefaultConfig,
|
|
13
|
-
mergeConfigs
|
|
14
|
-
} from "tailwind-merge";
|
|
15
|
-
function twMerge(...inputs) {
|
|
16
|
-
return replaceWxml(_twMerge(clsx(inputs)));
|
|
17
|
-
}
|
|
18
|
-
function twJoin(...inputs) {
|
|
19
|
-
return replaceWxml(_twJoin(clsx(inputs)));
|
|
20
|
-
}
|
|
21
|
-
var extendTailwindMerge = (...args) => {
|
|
22
|
-
const customTwMerge = _extendTailwindMerge(...args);
|
|
23
|
-
return function cn(...inputs) {
|
|
24
|
-
return replaceWxml(customTwMerge(clsx(inputs)));
|
|
25
|
-
};
|
|
26
|
-
};
|
|
27
|
-
var createTailwindMerge = (...args) => {
|
|
28
|
-
const customTwMerge = _createTailwindMerge(...args);
|
|
29
|
-
return function cn(...inputs) {
|
|
30
|
-
return replaceWxml(customTwMerge(clsx(inputs)));
|
|
31
|
-
};
|
|
32
|
-
};
|
|
33
|
-
|
|
34
|
-
export {
|
|
35
|
-
getDefaultConfig,
|
|
36
|
-
mergeConfigs,
|
|
37
|
-
twMerge,
|
|
38
|
-
twJoin,
|
|
39
|
-
extendTailwindMerge,
|
|
40
|
-
createTailwindMerge
|
|
41
|
-
};
|
package/dist/chunk-XUZIFJCO.cjs
DELETED
|
@@ -1,41 +0,0 @@
|
|
|
1
|
-
"use strict";Object.defineProperty(exports, "__esModule", {value: true});
|
|
2
|
-
|
|
3
|
-
var _chunkNDXSFOW3cjs = require('./chunk-NDXSFOW3.cjs');
|
|
4
|
-
|
|
5
|
-
// src/v4.ts
|
|
6
|
-
var _clsx = require('clsx');
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
var _tailwindmerge = require('tailwind-merge');
|
|
15
|
-
function twMerge(...inputs) {
|
|
16
|
-
return _chunkNDXSFOW3cjs.replaceWxml.call(void 0, _tailwindmerge.twMerge.call(void 0, _clsx.clsx.call(void 0, inputs)));
|
|
17
|
-
}
|
|
18
|
-
function twJoin(...inputs) {
|
|
19
|
-
return _chunkNDXSFOW3cjs.replaceWxml.call(void 0, _tailwindmerge.twJoin.call(void 0, _clsx.clsx.call(void 0, inputs)));
|
|
20
|
-
}
|
|
21
|
-
var extendTailwindMerge = (...args) => {
|
|
22
|
-
const customTwMerge = _tailwindmerge.extendTailwindMerge.call(void 0, ...args);
|
|
23
|
-
return function cn(...inputs) {
|
|
24
|
-
return _chunkNDXSFOW3cjs.replaceWxml.call(void 0, customTwMerge(_clsx.clsx.call(void 0, inputs)));
|
|
25
|
-
};
|
|
26
|
-
};
|
|
27
|
-
var createTailwindMerge = (...args) => {
|
|
28
|
-
const customTwMerge = _tailwindmerge.createTailwindMerge.call(void 0, ...args);
|
|
29
|
-
return function cn(...inputs) {
|
|
30
|
-
return _chunkNDXSFOW3cjs.replaceWxml.call(void 0, customTwMerge(_clsx.clsx.call(void 0, inputs)));
|
|
31
|
-
};
|
|
32
|
-
};
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
exports.getDefaultConfig = _tailwindmerge.getDefaultConfig; exports.mergeConfigs = _tailwindmerge.mergeConfigs; exports.twMerge = twMerge; exports.twJoin = twJoin; exports.extendTailwindMerge = extendTailwindMerge; exports.createTailwindMerge = createTailwindMerge;
|