tailwind-styled-components
Advanced tools
Comparing version 2.1.4 to 2.1.5
@@ -9,3 +9,3 @@ "use strict"; | ||
const domElements_1 = __importDefault(require("./domElements")); | ||
const tailwindcss_classnames_1 = require("tailwindcss-classnames"); | ||
const tailwind_merge_1 = require("tailwind-merge"); | ||
const isTwElement = Symbol("isTwElement?"); | ||
@@ -25,6 +25,5 @@ const mergeArrays = (template, templateElements) => { | ||
const inheritedClassesArray = inheritedClasses ? inheritedClasses.split(" ") : []; | ||
return (0, tailwindcss_classnames_1.classnames)(...newClasses | ||
return (0, tailwind_merge_1.twMerge)(...newClasses | ||
.concat(inheritedClassesArray) | ||
.filter((c) => c !== " ") | ||
.filter((v, i, arr) => arr.indexOf(v) === i)); | ||
.filter((c) => c !== " ")); | ||
}; | ||
@@ -31,0 +30,0 @@ exports.cleanTemplate = cleanTemplate; |
{ | ||
"name": "tailwind-styled-components", | ||
"version": "2.1.4", | ||
"version": "2.1.5", | ||
"keywords": [ | ||
@@ -26,2 +26,3 @@ "react", | ||
"clean": "rimraf dist", | ||
"pretest": "jest --clearCache", | ||
"test": "jest", | ||
@@ -49,3 +50,3 @@ "test:types": "tsc -p ./src/typing-tests/tsconfig.json", | ||
"eslint-plugin-prettier": "^4.0.0", | ||
"jest": "^27.4.7", | ||
"jest": "^27.5.1", | ||
"prettier": "^2.5.1", | ||
@@ -55,3 +56,3 @@ "react": "^17.0.2", | ||
"rimraf": "^3.0.2", | ||
"ts-jest": "^27.1.2", | ||
"ts-jest": "^27.1.4", | ||
"typescript": "^4.5.4" | ||
@@ -64,4 +65,4 @@ }, | ||
"dependencies": { | ||
"tailwindcss-classnames": "^3.0.1" | ||
"tailwind-merge": "^1.2.0" | ||
} | ||
} |
@@ -208,4 +208,2 @@ # Tailwind-Styled-Component | ||
*Careful it does not overrides parent classes* | ||
### Extends Styled Component | ||
@@ -212,0 +210,0 @@ |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
41595
244
288
+ Addedtailwind-merge@^1.2.0
+ Addedtailwind-merge@1.14.0(transitive)
- Removedtailwindcss-classnames@^3.0.1
- Removed@colors/colors@1.6.0(transitive)
- Removedansi-escapes@4.3.2(transitive)
- Removedansi-regex@5.0.1(transitive)
- Removedansi-styles@4.3.0(transitive)
- Removedbase64-js@1.5.1(transitive)
- Removedbl@4.1.0(transitive)
- Removedbuffer@5.7.1(transitive)
- Removedchalk@4.1.2(transitive)
- Removedchardet@0.7.0(transitive)
- Removedcli-cursor@3.1.0(transitive)
- Removedcli-spinners@2.9.2(transitive)
- Removedcli-width@3.0.0(transitive)
- Removedclone@1.0.4(transitive)
- Removedclsx@1.2.1(transitive)
- Removedcolor-convert@2.0.1(transitive)
- Removedcolor-name@1.1.4(transitive)
- Removedcommander@7.2.0(transitive)
- Removeddefaults@1.0.4(transitive)
- Removedemoji-regex@8.0.0(transitive)
- Removedescape-string-regexp@1.0.5(transitive)
- Removedexternal-editor@3.1.0(transitive)
- Removedfigures@3.2.0(transitive)
- Removedhas-flag@4.0.0(transitive)
- Removediconv-lite@0.4.24(transitive)
- Removedieee754@1.2.1(transitive)
- Removedinherits@2.0.4(transitive)
- Removedinquirer@8.2.6(transitive)
- Removedis-fullwidth-code-point@3.0.0(transitive)
- Removedis-interactive@1.0.0(transitive)
- Removedis-unicode-supported@0.1.0(transitive)
- Removedlodash@4.17.21(transitive)
- Removedlog-symbols@4.1.0(transitive)
- Removedmimic-fn@2.1.0(transitive)
- Removedmute-stream@0.0.8(transitive)
- Removedonetime@5.1.2(transitive)
- Removedora@5.4.1(transitive)
- Removedos-tmpdir@1.0.2(transitive)
- Removedreadable-stream@3.6.2(transitive)
- Removedrestore-cursor@3.1.0(transitive)
- Removedrun-async@2.4.1(transitive)
- Removedrxjs@7.8.1(transitive)
- Removedsafe-buffer@5.2.1(transitive)
- Removedsafer-buffer@2.1.2(transitive)
- Removedsignal-exit@3.0.7(transitive)
- Removedstring-width@4.2.3(transitive)
- Removedstring_decoder@1.3.0(transitive)
- Removedstrip-ansi@6.0.1(transitive)
- Removedsupports-color@7.2.0(transitive)
- Removedtailwindcss-classnames@3.1.0(transitive)
- Removedthrough@2.3.8(transitive)
- Removedtmp@0.0.33(transitive)
- Removedtslib@2.8.1(transitive)
- Removedtype-fest@0.21.3(transitive)
- Removedutil-deprecate@1.0.2(transitive)
- Removedwcwidth@1.0.1(transitive)
- Removedwrap-ansi@6.2.0(transitive)