tailwind-merge 2.2.2 → 2.3.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.
Files changed (13) hide show
  1. package/README.md +12 -12
  2. package/dist/bundle-cjs.js +2 -2
  3. package/dist/bundle-cjs.js.map +1 -1
  4. package/dist/bundle-mjs.mjs +2 -2
  5. package/dist/bundle-mjs.mjs.map +1 -1
  6. package/dist/es5/bundle-cjs.js +2 -2
  7. package/dist/es5/bundle-cjs.js.map +1 -1
  8. package/dist/es5/bundle-mjs.mjs +2 -2
  9. package/dist/es5/bundle-mjs.mjs.map +1 -1
  10. package/dist/types.d.ts +3 -3
  11. package/package.json +11 -11
  12. package/src/lib/default-config.ts +1 -2
  13. package/src/lib/tw-join.ts +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "tailwind-merge",
3
- "version": "2.2.2",
3
+ "version": "2.3.0",
4
4
  "description": "Merge Tailwind CSS classes without style conflicts",
5
5
  "keywords": [
6
6
  "tailwindcss",
@@ -61,32 +61,32 @@
61
61
  "postversion": "if [ -n \"$DANYS_MACHINE\" ]; then git push --follow-tags && open https://github.com/dcastil/tailwind-merge/releases; fi"
62
62
  },
63
63
  "dependencies": {
64
- "@babel/runtime": "^7.24.0"
64
+ "@babel/runtime": "^7.24.1"
65
65
  },
66
66
  "devDependencies": {
67
- "@babel/plugin-transform-runtime": "^7.24.0",
68
- "@babel/preset-env": "^7.24.0",
67
+ "@babel/plugin-transform-runtime": "^7.24.3",
68
+ "@babel/preset-env": "^7.24.3",
69
69
  "@rollup/plugin-babel": "^6.0.4",
70
70
  "@rollup/plugin-node-resolve": "^15.2.3",
71
71
  "@rollup/plugin-typescript": "^11.1.6",
72
- "@size-limit/preset-small-lib": "^11.0.2",
72
+ "@size-limit/preset-small-lib": "^11.1.2",
73
73
  "@types/jest": "^29.5.12",
74
- "@typescript-eslint/eslint-plugin": "^7.1.0",
75
- "@typescript-eslint/parser": "^7.1.0",
74
+ "@typescript-eslint/eslint-plugin": "^7.5.0",
75
+ "@typescript-eslint/parser": "^7.5.0",
76
76
  "babel-plugin-annotate-pure-calls": "^0.4.0",
77
- "babel-plugin-polyfill-regenerator": "^0.5.5",
77
+ "babel-plugin-polyfill-regenerator": "^0.6.1",
78
78
  "eslint": "^8.57.0",
79
79
  "eslint-plugin-import": "^2.29.1",
80
80
  "eslint-plugin-jest": "^27.9.0",
81
81
  "globby": "^11.1.0",
82
82
  "jest": "^29.7.0",
83
83
  "prettier": "^3.2.5",
84
- "rollup": "^4.12.0",
84
+ "rollup": "^4.13.2",
85
85
  "rollup-plugin-delete": "^2.0.0",
86
86
  "rollup-plugin-dts": "^6.1.0",
87
- "size-limit": "^11.0.2",
87
+ "size-limit": "^11.1.2",
88
88
  "ts-jest": "^29.1.2",
89
- "typescript": "^5.3.3",
89
+ "typescript": "^5.4.3",
90
90
  "zx": "^7.2.3"
91
91
  },
92
92
  "publishConfig": {
package/src/lib/default-config.ts CHANGED
@@ -80,7 +80,6 @@ export function getDefaultConfig() {
80
80
  'saturation',
81
81
  'color',
82
82
  'luminosity',
83
- 'plus-lighter',
84
83
  ] as const
85
84
  const getAlign = () =>
86
85
  ['start', 'end', 'center', 'between', 'around', 'evenly', 'stretch'] as const
@@ -1255,7 +1254,7 @@ export function getDefaultConfig() {
1255
1254
  * Mix Blend Mode
1256
1255
  * @see https://tailwindcss.com/docs/mix-blend-mode
1257
1256
  */
1258
- 'mix-blend': [{ 'mix-blend': getBlendModes() }],
1257
+ 'mix-blend': [{ 'mix-blend': [...getBlendModes(), 'plus-lighter', 'plus-darker'] }],
1259
1258
  /**
1260
1259
  * Background Blend Mode
1261
1260
  * @see https://tailwindcss.com/docs/background-blend-mode
package/src/lib/tw-join.ts CHANGED
@@ -8,7 +8,7 @@
8
8
  * Original code has MIT license: Copyright (c) Luke Edwards <luke.edwards05@gmail.com> (lukeed.com)
9
9
  */
10
10
 
11
- export type ClassNameValue = ClassNameArray | string | null | undefined | 0 | false
11
+ export type ClassNameValue = ClassNameArray | string | null | undefined | 0 | 0n | false
12
12
  type ClassNameArray = ClassNameValue[]
13
13
 
14
14
  export function twJoin(...classLists: ClassNameValue[]): string