@maizzle/framework 6.1.5 → 6.1.6

package/dist/components/Button.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { computed, useAttrs, createStaticVNode } from 'vue'
 import type { PropType } from 'vue'
-import { twMerge } from 'tailwind-merge'
+import { twMerge } from '../utils/twMerge'
 import { outlookFallbackProp } from './utils.ts'
 import { useOutlookFallback } from '../composables/useOutlookFallback'
 

package/dist/components/CodeBlock.vue

@@ -1,6 +1,6 @@
 <script lang="ts">
 import { createStaticVNode, type PropType } from 'vue'
-import { twMerge } from 'tailwind-merge'
+import { twMerge } from '../utils/twMerge'
 import { codeToHtml, getSingletonHighlighter, type BundledLanguage, type BundledTheme } from 'shiki'
 import { buildCodeBlock, codeBlockPreClass } from './utils'
 

package/dist/components/CodeInline.vue

@@ -1,6 +1,6 @@
 <script lang="ts">
 import { createStaticVNode, type PropType } from 'vue'
-import { twMerge } from 'tailwind-merge'
+import { twMerge } from '../utils/twMerge'
 import { codeToHtml, getSingletonHighlighter, type BundledLanguage, type BundledTheme } from 'shiki'
 
 export default {

package/dist/components/Column.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { computed, createStaticVNode, inject, useAttrs } from 'vue'
 import type { ComputedRef } from 'vue'
-import { twMerge } from 'tailwind-merge'
+import { twMerge } from '../utils/twMerge'
 import { nextId, normalizeToPixels, outlookFallbackProp } from './utils.ts'
 import { useOutlookFallback } from '../composables/useOutlookFallback'
 

package/dist/components/Container.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { computed, provide, createStaticVNode, useAttrs } from 'vue'
-import { twMerge } from 'tailwind-merge'
+import { twMerge } from '../utils/twMerge'
 import { hasWidthUtility, nextId, normalizeToPixels, outlookFallbackProp } from './utils.ts'
 import { useOutlookFallback } from '../composables/useOutlookFallback'
 

package/dist/components/Heading.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { computed, useAttrs } from 'vue'
-import { twMerge } from 'tailwind-merge'
+import { twMerge } from '../utils/twMerge'
 
 defineOptions({ inheritAttrs: false })
 

package/dist/components/Hr.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { computed, useAttrs } from 'vue'
-import { twMerge } from 'tailwind-merge'
+import { twMerge } from '../utils/twMerge'
 
 defineOptions({ inheritAttrs: false })
 

package/dist/components/Img.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { computed, createStaticVNode, useAttrs, type PropType } from 'vue'
-import { twMerge } from 'tailwind-merge'
+import { twMerge } from '../utils/twMerge'
 import { outlookFallbackProp } from './utils.ts'
 import { useOutlookFallback } from '../composables/useOutlookFallback'
 

package/dist/components/Layout.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { computed, useAttrs, createStaticVNode, type PropType } from 'vue'
-import { twMerge } from 'tailwind-merge'
+import { twMerge } from '../utils/twMerge'
 import { outlookFallbackProp } from './utils.ts'
 import { useOutlookFallback } from '../composables/useOutlookFallback'
 

package/dist/components/Link.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { computed, useAttrs } from 'vue'
-import { twMerge } from 'tailwind-merge'
+import { twMerge } from '../utils/twMerge'
 
 defineOptions({ inheritAttrs: false })
 

package/dist/components/QrCode.vue

@@ -1,6 +1,6 @@
 <script lang="ts">
 import { createStaticVNode, type PropType } from 'vue'
-import { twMerge } from 'tailwind-merge'
+import { twMerge } from '../utils/twMerge'
 import { encode } from 'uqr'
 
 type Ecc = 'L' | 'M' | 'Q' | 'H'

package/dist/components/Row.vue

@@ -5,7 +5,7 @@ const warnedLocations = new Set<string>()
 <script setup lang="ts">
 import { Comment, Text, computed, createStaticVNode, provide, useAttrs, useSlots, Fragment } from 'vue'
 import type { VNode } from 'vue'
-import { twMerge } from 'tailwind-merge'
+import { twMerge } from '../utils/twMerge'
 import Column from './Column.vue'
 import { hasWidthInStyle, hasWidthUtility, normalizeToPixels, outlookFallbackProp } from './utils.ts'
 import { useOutlookFallback } from '../composables/useOutlookFallback'

package/dist/components/Section.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { computed, createStaticVNode, useAttrs } from 'vue'
-import { twMerge } from 'tailwind-merge'
+import { twMerge } from '../utils/twMerge'
 import { hasWidthInStyle, hasWidthUtility, nextId, normalizeToPixels, outlookFallbackProp } from './utils.ts'
 import { useOutlookFallback } from '../composables/useOutlookFallback'
 

package/dist/components/Text.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { type PropType, computed, useAttrs } from 'vue'
-import { twMerge } from 'tailwind-merge'
+import { twMerge } from '../utils/twMerge'
 
 defineOptions({ inheritAttrs: false })
 

package/dist/index.d.ts

@@ -22,6 +22,7 @@ import { RenderResult, render } from "./render/index.js";
 import { serve } from "./serve.js";
 import { PrepareOptions, prepare } from "./prepare.js";
 import { createPlaintext } from "./plaintext.js";
+import { twMerge } from "./utils/twMerge.js";
 import { inlineLink } from "./transformers/inlineLink.js";
 import { urlQuery } from "./transformers/urlQuery.js";
 import { BaseUrlOptions, base } from "./transformers/base.js";
@@ -39,4 +40,4 @@ import { replaceStrings } from "./transformers/replaceStrings.js";
 import { FormatConfig, format } from "./transformers/format.js";
 import { MinifyOptions, minify } from "./transformers/minify.js";
 import { useHead } from "@unhead/vue";
-export { type AttributesConfig, type BaseUrlOptions, type ComponentSource, type CreateRendererOptions, type CssConfig, type EntitiesConfig, type FilterFunction, type FiltersConfig, type FormatConfig, type HtmlConfig, type InlineCssOptions, type MaizzleConfig, type MinifyOptions, type NormalizedComponentSource, type PlaintextConfig, type PrepareOptions, type PurgeCssOptions, type RemoveAttributeOption, type RemoveAttributeRule, type RenderResult, type RenderedTemplate, type Renderer, type ShorthandCssOptions, type UrlConfig, type UrlQuery, type UrlQueryOptions, addAttributes, attributeToStyle, base, build, createPlaintext, createRenderer, defineConfig, entities, filters, format, inlineCss, inlineLink, maizzle, minify, normalizeComponentSources, prepare, purgeCss, removeAttributes, render, replaceStrings, resolveConfig, safeSelectors, serve, shorthandCss, sixHex, urlQuery, useBaseUrl, useConfig, useCurrentTemplate, useDoctype, useEvent, useFont, useHead, useOutlookFallback, useOutputPath, usePlaintext, usePreheader, useTransformers, useUrlQuery };
+export { type AttributesConfig, type BaseUrlOptions, type ComponentSource, type CreateRendererOptions, type CssConfig, type EntitiesConfig, type FilterFunction, type FiltersConfig, type FormatConfig, type HtmlConfig, type InlineCssOptions, type MaizzleConfig, type MinifyOptions, type NormalizedComponentSource, type PlaintextConfig, type PrepareOptions, type PurgeCssOptions, type RemoveAttributeOption, type RemoveAttributeRule, type RenderResult, type RenderedTemplate, type Renderer, type ShorthandCssOptions, type UrlConfig, type UrlQuery, type UrlQueryOptions, addAttributes, attributeToStyle, base, build, createPlaintext, createRenderer, defineConfig, entities, filters, format, inlineCss, inlineLink, maizzle, minify, normalizeComponentSources, prepare, purgeCss, removeAttributes, render, replaceStrings, resolveConfig, safeSelectors, serve, shorthandCss, sixHex, twMerge, urlQuery, useBaseUrl, useConfig, useCurrentTemplate, useDoctype, useEvent, useFont, useHead, useOutlookFallback, useOutputPath, usePlaintext, usePreheader, useTransformers, useUrlQuery };

package/dist/index.js

@@ -36,5 +36,6 @@ import { usePreheader } from "./composables/usePreheader.js";
 import { useTransformers } from "./composables/useTransformers.js";
 import { useBaseUrl } from "./composables/useBaseUrl.js";
 import { useUrlQuery } from "./composables/useUrlQuery.js";
+import { twMerge } from "./utils/twMerge.js";
 import { useHead } from "@unhead/vue";
-export { addAttributes, attributeToStyle, base, build, createPlaintext, createRenderer, defineConfig, entities, filters, format, inlineCss, inlineLink, maizzle, minify, normalizeComponentSources, prepare, purgeCss, removeAttributes, render, replaceStrings, resolveConfig, safeSelectors, serve, shorthandCss, sixHex, urlQuery, useBaseUrl, useConfig, useCurrentTemplate, useDoctype, useEvent, useFont, useHead, useOutlookFallback, useOutputPath, usePlaintext, usePreheader, useTransformers, useUrlQuery };
+export { addAttributes, attributeToStyle, base, build, createPlaintext, createRenderer, defineConfig, entities, filters, format, inlineCss, inlineLink, maizzle, minify, normalizeComponentSources, prepare, purgeCss, removeAttributes, render, replaceStrings, resolveConfig, safeSelectors, serve, shorthandCss, sixHex, twMerge, urlQuery, useBaseUrl, useConfig, useCurrentTemplate, useDoctype, useEvent, useFont, useHead, useOutlookFallback, useOutputPath, usePlaintext, usePreheader, useTransformers, useUrlQuery };

package/dist/server/ui/.vite/deps/_metadata.json

@@ -1,67 +1,67 @@
 {
-  "hash": "965652de",
+  "hash": "14cd69aa",
   "configHash": "87cfe796",
-  "lockfileHash": "81aa1f93",
-  "browserHash": "4f65870f",
+  "lockfileHash": "a40373a2",
+  "browserHash": "0d27af42",
   "optimized": {
     "@lucide/vue": {
       "src": "../../../../../node_modules/@lucide/vue/dist/esm/lucide-vue.mjs",
       "file": "@lucide_vue.js",
-      "fileHash": "1b712d83",
+      "fileHash": "a1d212ec",
       "needsInterop": false
     },
     "@vueuse/core": {
       "src": "../../../../../node_modules/@vueuse/core/dist/index.js",
       "file": "@vueuse_core.js",
-      "fileHash": "942c9bb3",
+      "fileHash": "8f993a4a",
       "needsInterop": false
     },
     "@vueuse/shared": {
       "src": "../../../../../node_modules/@vueuse/shared/dist/index.js",
       "file": "@vueuse_shared.js",
-      "fileHash": "cdb3285a",
+      "fileHash": "b1493280",
       "needsInterop": false
     },
     "class-variance-authority": {
       "src": "../../../../../node_modules/class-variance-authority/dist/index.mjs",
       "file": "class-variance-authority.js",
-      "fileHash": "c474488c",
+      "fileHash": "ad4ffcef",
       "needsInterop": false
     },
     "clsx": {
       "src": "../../../../../node_modules/clsx/dist/clsx.mjs",
       "file": "clsx.js",
-      "fileHash": "988f32de",
+      "fileHash": "fcfda44d",
       "needsInterop": false
     },
     "culori": {
       "src": "../../../../../node_modules/culori/src/index.js",
       "file": "culori.js",
-      "fileHash": "5c153508",
+      "fileHash": "5a7e933a",
       "needsInterop": false
     },
     "reka-ui": {
       "src": "../../../../../node_modules/reka-ui/dist/index.js",
       "file": "reka-ui.js",
-      "fileHash": "3a774b28",
+      "fileHash": "bd184957",
       "needsInterop": false
     },
     "tailwind-merge": {
       "src": "../../../../../node_modules/tailwind-merge/dist/bundle-cjs.js",
       "file": "tailwind-merge.js",
-      "fileHash": "76f3aa35",
+      "fileHash": "0f437fb7",
       "needsInterop": true
     },
     "vue-router": {
       "src": "../../../../../node_modules/vue-router/dist/vue-router.js",
       "file": "vue-router.js",
-      "fileHash": "328815cb",
+      "fileHash": "965db101",
       "needsInterop": false
     },
     "vue": {
       "src": "../../../../../node_modules/vue/dist/vue.runtime.esm-bundler.js",
       "file": "vue.js",
-      "fileHash": "25c9700e",
+      "fileHash": "ba3e8b42",
       "needsInterop": false
     }
   },

package/dist/server/ui/pages/Preview.vue

@@ -888,8 +888,8 @@ const stripeBg = {
             <div class="w-1 h-12 rounded-full bg-gray-300 dark:bg-gray-600 group-hover:bg-gray-400 group-active:bg-gray-500 dark:group-hover:bg-gray-500 dark:group-active:bg-gray-400 transition-colors" />
           </div>
           <!-- Iframe -->
-          <div ref="wrapperEl" class="absolute inset-0 min-[430px]:inset-5 border border-gray-200 dark:border-gray-800">
-            <ScrollArea class="h-full w-full bg-white dark:bg-gray-950">
+          <div ref="wrapperEl" class="absolute inset-0 min-[430px]:inset-5 ring-1 ring-gray-200 dark:ring-gray-800">
+            <ScrollArea class="h-full w-full bg-white dark:bg-gray-950 [&_[data-slot=scroll-area-thumb]]:bg-black/40 [&_[data-slot=scroll-area-thumb]]:shadow-[0_0_0_1px_rgba(255,255,255,0.5)]">
               <iframe
                 ref="iframeEl"
                 :srcdoc="srcdoc"

package/dist/utils/twMerge.d.ts

@@ -0,0 +1,4 @@
+//#region src/utils/twMerge.d.ts
+export declare const twMerge: (...classLists: import("tailwind-merge").ClassNameValue[]) => string;
+//#endregion
+//# sourceMappingURL=twMerge.d.ts.map

package/dist/utils/twMerge.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"twMerge.d.ts","names":[],"sources":["../../src/utils/twMerge.ts"],"mappings":";qBAoFa,aAAO,qCAAA"}

package/dist/utils/twMerge.js

@@ -0,0 +1,109 @@
+import { extendTailwindMerge } from "tailwind-merge";
+//#region src/utils/twMerge.ts
+/**
+* Custom utilities from `@maizzle/tailwindcss` that tailwind-merge does
+* not know about. Each becomes its own class group, so two classes from
+* the same utility (e.g. `mso-hide-all mso-hide-none`) resolve to the
+* last one, and `text-underline-*` stops being mistaken for a text
+* color and cancelling `text-{color}` (or vice versa).
+*/
+const utilities = [
+	"text-underline",
+	"text-underline-style",
+	"text-underline-color",
+	"mso-ansi-font-size",
+	"mso-bidi-font-size",
+	"mso-ansi-font-style",
+	"mso-bidi-font-style",
+	"mso-ansi-font-weight",
+	"mso-bidi-font-weight",
+	"mso-ascii-font-family",
+	"mso-bidi-font-family",
+	"mso-arabic-font-family",
+	"mso-bidi-flag",
+	"mso-highlight",
+	"mso-generic-font-family",
+	"mso-font-alt",
+	"mso-element-frame-width",
+	"mso-element-frame-height",
+	"mso-element",
+	"mso-element-wrap",
+	"mso-element-left",
+	"mso-element-top",
+	"mso-hide",
+	"mso-color-alt",
+	"mso-line-height-rule",
+	"mso-line-height-alt",
+	"mso-text-raise",
+	"mso-padding-alt",
+	"mso-padding-top-alt",
+	"mso-padding-right-alt",
+	"mso-padding-bottom-alt",
+	"mso-padding-left-alt",
+	"mso-margin-alt",
+	"mso-margin-top-alt",
+	"mso-margin-right-alt",
+	"mso-margin-bottom-alt",
+	"mso-margin-left-alt",
+	"mso-para-margin",
+	"mso-para-margin-top",
+	"mso-para-margin-right",
+	"mso-para-margin-bottom",
+	"mso-para-margin-left",
+	"mso-text-indent-alt",
+	"mso-table-tspace",
+	"mso-table-rspace",
+	"mso-table-bspace",
+	"mso-table-lspace",
+	"mso-font-width",
+	"mso-shading",
+	"mso-shadow-color",
+	"mso-element-frame-vspace",
+	"mso-element-frame-hspace",
+	"mso-border-alt",
+	"mso-border-between",
+	"mso-border-bottom-alt",
+	"mso-border-left-alt",
+	"mso-border-right-alt",
+	"mso-border-top-alt",
+	"mso-border-between-width",
+	"mso-border-width-alt",
+	"mso-border-bottom-width-alt",
+	"mso-border-left-width-alt",
+	"mso-border-right-width-alt",
+	"mso-border-top-width-alt",
+	"mso-border-bottom-source",
+	"mso-border-left-source",
+	"mso-border-right-source",
+	"mso-border-top-source",
+	"mso-border-shadow",
+	"mso-border-effect"
+];
+const sides = [
+	"top",
+	"right",
+	"bottom",
+	"left"
+];
+const twMerge = extendTailwindMerge({ extend: {
+	classGroups: {
+		...Object.fromEntries(utilities.map((name) => [name, [{ [name]: [() => true] }]])),
+		"prose-size": [{ prose: [
+			"sm",
+			"base",
+			"lg",
+			"xl"
+		] }]
+	},
+	conflictingClassGroups: {
+		"mso-padding-alt": sides.map((s) => `mso-padding-${s}-alt`),
+		"mso-margin-alt": sides.map((s) => `mso-margin-${s}-alt`),
+		"mso-para-margin": sides.map((s) => `mso-para-margin-${s}`),
+		"mso-border-alt": sides.map((s) => `mso-border-${s}-alt`),
+		"mso-border-width-alt": sides.map((s) => `mso-border-${s}-width-alt`)
+	}
+} });
+//#endregion
+export { twMerge };
+
+//# sourceMappingURL=twMerge.js.map

package/dist/utils/twMerge.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"twMerge.js","names":[],"sources":["../../src/utils/twMerge.ts"],"sourcesContent":["import { extendTailwindMerge } from 'tailwind-merge'\n\n/**\n * Custom utilities from `@maizzle/tailwindcss` that tailwind-merge does\n * not know about. Each becomes its own class group, so two classes from\n * the same utility (e.g. `mso-hide-all mso-hide-none`) resolve to the\n * last one, and `text-underline-*` stops being mistaken for a text\n * color and cancelling `text-{color}` (or vice versa).\n */\nconst utilities = [\n  'text-underline',\n  'text-underline-style',\n  'text-underline-color',\n  'mso-ansi-font-size',\n  'mso-bidi-font-size',\n  'mso-ansi-font-style',\n  'mso-bidi-font-style',\n  'mso-ansi-font-weight',\n  'mso-bidi-font-weight',\n  'mso-ascii-font-family',\n  'mso-bidi-font-family',\n  'mso-arabic-font-family',\n  'mso-bidi-flag',\n  'mso-highlight',\n  'mso-generic-font-family',\n  'mso-font-alt',\n  'mso-element-frame-width',\n  'mso-element-frame-height',\n  'mso-element',\n  'mso-element-wrap',\n  'mso-element-left',\n  'mso-element-top',\n  'mso-hide',\n  'mso-color-alt',\n  'mso-line-height-rule',\n  'mso-line-height-alt',\n  'mso-text-raise',\n  'mso-padding-alt',\n  'mso-padding-top-alt',\n  'mso-padding-right-alt',\n  'mso-padding-bottom-alt',\n  'mso-padding-left-alt',\n  'mso-margin-alt',\n  'mso-margin-top-alt',\n  'mso-margin-right-alt',\n  'mso-margin-bottom-alt',\n  'mso-margin-left-alt',\n  'mso-para-margin',\n  'mso-para-margin-top',\n  'mso-para-margin-right',\n  'mso-para-margin-bottom',\n  'mso-para-margin-left',\n  'mso-text-indent-alt',\n  'mso-table-tspace',\n  'mso-table-rspace',\n  'mso-table-bspace',\n  'mso-table-lspace',\n  'mso-font-width',\n  'mso-shading',\n  'mso-shadow-color',\n  'mso-element-frame-vspace',\n  'mso-element-frame-hspace',\n  'mso-border-alt',\n  'mso-border-between',\n  'mso-border-bottom-alt',\n  'mso-border-left-alt',\n  'mso-border-right-alt',\n  'mso-border-top-alt',\n  'mso-border-between-width',\n  'mso-border-width-alt',\n  'mso-border-bottom-width-alt',\n  'mso-border-left-width-alt',\n  'mso-border-right-width-alt',\n  'mso-border-top-width-alt',\n  'mso-border-bottom-source',\n  'mso-border-left-source',\n  'mso-border-right-source',\n  'mso-border-top-source',\n  'mso-border-shadow',\n  'mso-border-effect',\n] as const\n\nconst sides = ['top', 'right', 'bottom', 'left'] as const\n\nexport const twMerge = extendTailwindMerge({\n  extend: {\n    classGroups: {\n      ...Object.fromEntries(utilities.map((name) => [name, [{ [name]: [() => true] }]])),\n      'prose-size': [{ prose: ['sm', 'base', 'lg', 'xl'] }],\n    },\n    conflictingClassGroups: {\n      'mso-padding-alt': sides.map((s) => `mso-padding-${s}-alt`),\n      'mso-margin-alt': sides.map((s) => `mso-margin-${s}-alt`),\n      'mso-para-margin': sides.map((s) => `mso-para-margin-${s}`),\n      'mso-border-alt': sides.map((s) => `mso-border-${s}-alt`),\n      'mso-border-width-alt': sides.map((s) => `mso-border-${s}-width-alt`),\n    },\n  },\n})\n"],"mappings":";;;;;;;;;AASA,MAAM,YAAY;CAChB;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;AACF;AAEA,MAAM,QAAQ;CAAC;CAAO;CAAS;CAAU;AAAM;AAE/C,MAAa,UAAU,oBAAoB,EACzC,QAAQ;CACN,aAAa;EACX,GAAG,OAAO,YAAY,UAAU,KAAK,SAAS,CAAC,MAAM,CAAC,GAAG,OAAO,OAAO,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;EACjF,cAAc,CAAC,EAAE,OAAO;GAAC;GAAM;GAAQ;GAAM;EAAI,EAAE,CAAC;CACtD;CACA,wBAAwB;EACtB,mBAAmB,MAAM,KAAK,MAAM,eAAe,EAAE,KAAK;EAC1D,kBAAkB,MAAM,KAAK,MAAM,cAAc,EAAE,KAAK;EACxD,mBAAmB,MAAM,KAAK,MAAM,mBAAmB,GAAG;EAC1D,kBAAkB,MAAM,KAAK,MAAM,cAAc,EAAE,KAAK;EACxD,wBAAwB,MAAM,KAAK,MAAM,cAAc,EAAE,WAAW;CACtE;AACF,EACF,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maizzle/framework",
-  "version": "6.1.5",
+  "version": "6.1.6",
   "description": "Maizzle is a framework that helps you quickly build HTML emails with Tailwind CSS.",
   "license": "MIT",
   "type": "module",