tailwind-merge 1.12.0 → 1.13.0

package/README.md

@@ -1,9 +1,9 @@
+<!-- This file is autogenerated. If you want to change this content, please do the changes in `./docs/README.md` instead. -->
+
 <div align="center">
     <br />
     <a href="https://github.com/dcastil/tailwind-merge">
-        <!-- AUTOGENERATED VERSION START -->
-        <img src="https://github.com/dcastil/tailwind-merge/raw/v1.12.0/assets/logo.svg" alt="tailwind-merge" height="150px" />
-        <!-- AUTOGENERATED END -->
+        <img src="https://github.com/dcastil/tailwind-merge/raw/v1.13.0/assets/logo.svg" alt="tailwind-merge" height="150px" />
     </a>
 </div>
 
@@ -25,16 +25,13 @@ twMerge('px-2 py-1 bg-red hover:bg-dark-red', 'p-3 bg-[#B91C1C]')
 
 ## Get started
 
-<!-- AUTOGENERATED VERSION START -->
-
--   [What is it for](https://github.com/dcastil/tailwind-merge/tree/v1.12.0/docs/what-is-it-for.md)
--   [Features](https://github.com/dcastil/tailwind-merge/tree/v1.12.0/docs/features.md)
--   [Configuration](https://github.com/dcastil/tailwind-merge/tree/v1.12.0/docs/configuration.md)
--   [Recipes](https://github.com/dcastil/tailwind-merge/tree/v1.12.0/docs/recipes.md)
--   [API reference](https://github.com/dcastil/tailwind-merge/tree/v1.12.0/docs/api-reference.md)
--   [Writing plugins](https://github.com/dcastil/tailwind-merge/tree/v1.12.0/docs/writing-plugins.md)
--   [Versioning](https://github.com/dcastil/tailwind-merge/tree/v1.12.0/docs/versioning.md)
--   [Contributing](https://github.com/dcastil/tailwind-merge/tree/v1.12.0/.github/CONTRIBUTING.md)
--   [Similar packages](https://github.com/dcastil/tailwind-merge/tree/v1.12.0/docs/similar-packages.md)
-
-<!-- AUTOGENERATED END -->
+-   [What is it for](https://github.com/dcastil/tailwind-merge/tree/v1.13.0/docs/what-is-it-for.md)
+-   [When and how to use it](https://github.com/dcastil/tailwind-merge/tree/v1.13.0/docs/when-and-how-to-use-it.md)
+-   [Features](https://github.com/dcastil/tailwind-merge/tree/v1.13.0/docs/features.md)
+-   [Configuration](https://github.com/dcastil/tailwind-merge/tree/v1.13.0/docs/configuration.md)
+-   [Recipes](https://github.com/dcastil/tailwind-merge/tree/v1.13.0/docs/recipes.md)
+-   [API reference](https://github.com/dcastil/tailwind-merge/tree/v1.13.0/docs/api-reference.md)
+-   [Writing plugins](https://github.com/dcastil/tailwind-merge/tree/v1.13.0/docs/writing-plugins.md)
+-   [Versioning](https://github.com/dcastil/tailwind-merge/tree/v1.13.0/docs/versioning.md)
+-   [Contributing](https://github.com/dcastil/tailwind-merge/tree/v1.13.0/docs/contributing.md)
+-   [Similar packages](https://github.com/dcastil/tailwind-merge/tree/v1.13.0/docs/similar-packages.md)

package/dist/index.d.ts

@@ -1,14 +1,14 @@
-import { twJoin } from './lib/tw-join';
-export { twMerge } from './lib/tw-merge';
-export { twJoin } from './lib/tw-join';
-export { getDefaultConfig } from './lib/default-config';
-export { extendTailwindMerge } from './lib/extend-tailwind-merge';
-export { createTailwindMerge } from './lib/create-tailwind-merge';
-export type { Config } from './lib/types';
-export * as validators from './lib/validators';
-export { mergeConfigs } from './lib/merge-configs';
-export { fromTheme } from './lib/from-theme';
-/**
- * @deprecated Will be removed in next major version. Use `twJoin` instead.
- */
-export declare const join: typeof twJoin;
+import { twJoin } from './lib/tw-join';
+export { twMerge } from './lib/tw-merge';
+export { twJoin } from './lib/tw-join';
+export { getDefaultConfig } from './lib/default-config';
+export { extendTailwindMerge } from './lib/extend-tailwind-merge';
+export { createTailwindMerge } from './lib/create-tailwind-merge';
+export type { Config } from './lib/types';
+export * as validators from './lib/validators';
+export { mergeConfigs } from './lib/merge-configs';
+export { fromTheme } from './lib/from-theme';
+/**
+ * @deprecated Will be removed in next major version. Use `twJoin` instead.
+ */
+export declare const join: typeof twJoin;

package/dist/lib/class-utils.d.ts

@@ -1,19 +1,19 @@
-import { ClassGroupId, ClassValidator, Config } from './types';
-export interface ClassPartObject {
-    nextPart: Map<string, ClassPartObject>;
-    validators: ClassValidatorObject[];
-    classGroupId?: ClassGroupId;
-}
-interface ClassValidatorObject {
-    classGroupId: ClassGroupId;
-    validator: ClassValidator;
-}
-export declare function createClassUtils(config: Config): {
-    getClassGroupId: (className: string) => string | undefined;
-    getConflictingClassGroupIds: (classGroupId: ClassGroupId, hasPostfixModifier: boolean) => readonly string[];
-};
-/**
- * Exported for testing only
- */
-export declare function createClassMap(config: Config): ClassPartObject;
-export {};
+import { ClassGroupId, ClassValidator, Config } from './types';
+export interface ClassPartObject {
+    nextPart: Map<string, ClassPartObject>;
+    validators: ClassValidatorObject[];
+    classGroupId?: ClassGroupId;
+}
+interface ClassValidatorObject {
+    classGroupId: ClassGroupId;
+    validator: ClassValidator;
+}
+export declare function createClassUtils(config: Config): {
+    getClassGroupId: (className: string) => string | undefined;
+    getConflictingClassGroupIds: (classGroupId: ClassGroupId, hasPostfixModifier: boolean) => readonly string[];
+};
+/**
+ * Exported for testing only
+ */
+export declare function createClassMap(config: Config): ClassPartObject;
+export {};

package/dist/lib/class-utils.mjs

@@ -54,8 +54,8 @@ function getGroupIdForArbitraryProperty(className) {
     }
   }
 }
-/**
- * Exported for testing only
+/**
+ * Exported for testing only
  */
 function createClassMap(config) {
   var theme = config.theme,

package/dist/lib/config-utils.d.ts

@@ -1,12 +1,13 @@
-import { Config } from './types';
-export type ConfigUtils = ReturnType<typeof createConfigUtils>;
-export declare function createConfigUtils(config: Config): {
-    getClassGroupId: (className: string) => string | undefined;
-    getConflictingClassGroupIds: (classGroupId: string) => readonly string[];
-    cache: import("./lru-cache").LruCache<string, string>;
-    splitModifiers: (className: string) => {
-        modifiers: string[];
-        hasImportantModifier: boolean;
-        baseClassName: string;
-    };
-};
+import { Config } from './types';
+export type ConfigUtils = ReturnType<typeof createConfigUtils>;
+export declare function createConfigUtils(config: Config): {
+    getClassGroupId: (className: string) => string | undefined;
+    getConflictingClassGroupIds: (classGroupId: string, hasPostfixModifier: boolean) => readonly string[];
+    cache: import("./lru-cache").LruCache<string, string>;
+    splitModifiers: (className: string) => {
+        modifiers: string[];
+        hasImportantModifier: boolean;
+        baseClassName: string;
+        maybePostfixModifierPosition: number | undefined;
+    };
+};

package/dist/lib/create-tailwind-merge.d.ts

@@ -1,7 +1,7 @@
-import { ClassNameValue } from './tw-join';
-import { Config } from './types';
-type CreateConfigFirst = () => Config;
-type CreateConfigSubsequent = (config: Config) => Config;
-type TailwindMerge = (...classLists: ClassNameValue[]) => string;
-export declare function createTailwindMerge(...createConfig: [CreateConfigFirst, ...CreateConfigSubsequent[]]): TailwindMerge;
-export {};
+import { ClassNameValue } from './tw-join';
+import { Config } from './types';
+type CreateConfigFirst = () => Config;
+type CreateConfigSubsequent = (config: Config) => Config;
+type TailwindMerge = (...classLists: ClassNameValue[]) => string;
+export declare function createTailwindMerge(...createConfig: [CreateConfigFirst, ...CreateConfigSubsequent[]]): TailwindMerge;
+export {};