vitrify 0.17.1 → 0.17.3

package/dist/frameworks/vue/prerender.js

@@ -12,8 +12,8 @@ export const prerender = async ({ outDir, templatePath, manifestPath, entryServe
         path: outDir,
         logLevel: 'info',
         external: true,
-        inlineFonts: true,
-        preloadFonts: true
+        fonts: true,
+        compress: false
     });
     for (const url of paths) {
         const directoryUrl = new URL(url.split('/').slice(0, -1).join('/'), `file://${outDir}`);

package/dist/index.js

@@ -186,12 +186,7 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
         console.log('No valid vitrify.config.(ts|js) file found.');
         throw e;
     }
-    const localPackages = [
-        'vue',
-        'vue-router',
-        '@vue/server-renderer',
-        '@unocss/reset'
-    ];
+    const localPackages = ['vue', 'vue-router', '@vue/server-renderer'];
     // const localPackages: string[] = []
     const cliPackages = [];
     const packageUrls = vitrifyConfig.vitrify?.urls?.packages || {};
@@ -494,10 +489,6 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
             find: new RegExp('^vue-router$'),
             replacement: fileURLToPath(new URL('./dist/vue-router.esm-bundler.js', packageUrls['vue-router']))
         },
-        {
-            find: new RegExp('@unocss/reset'),
-            replacement: fileURLToPath(new URL('./', packageUrls['@unocss/reset']))
-        },
         ...vuePkgAliases
     ];
     if (mode === 'development' && vitrifyConfig.vitrify?.dev?.alias)

package/dist/plugins/quasar/unocss/components/QCard.unocss.js

@@ -1,57 +1,33 @@
 const shortcuts = [
     [
         /^q-card$/,
-        ([, c], { theme }) => `shadow-black border-rd-4px v-top bg-white relative
-      [&>div:not(.q--avoid-card-border)]:(border-t-0 border-t-0 border-b-0 border-b-0)
-      [&>img:not(.q--avoid-card-border)]:(border-t-0 border-t-0 border-b-0 border-b-0)
-      [&>div:nth-child(1_of_:not(.q--avoid-card-border))]:(border-t-0 border-t-inherit border-t-inherit)
-      [&>img:nth-child(1_of_:not(.q--avoid-card-border))]:(border-t-0 border-t-inherit border-t-inherit)
-      [&>div:nth-last-child(1_of_:not(.q--avoid-card-border))]:(border-b-0 border-b-inherit border-b-inherit)
-      [&>img:nth-last-child(1_of_:not(.q--avoid-card-border))]:(border-b-0 border-b-inherit border-b-inherit)
-      [&>div:not(.q--avoid-card-border)]:(border-l-0 border-r-0 shadow-none)
-      [&>img]:(block w-full max-w-full border-none)
-    `
+        ([, c], { theme }) => `[box-shadow:0_1px_5px_rgba(0,_0,_0,_0.2),_0_2px_2px_rgba(0,_0,_0,_0.14),_0_3px_1px_-2px_rgba(0,_0,_0,_0.12)] rounded-[4px] align-top bg-[#fff] relative [&_>_div:not(.q--avoid-card-border)]:(rounded-tl-none rounded-tr-none rounded-bl-none rounded-br-none) [&_>_img:not(.q--avoid-card-border)]:(rounded-tl-none rounded-tr-none rounded-bl-none rounded-br-none) [&_>_div:nth-child(1_of_:not(.q--avoid-card-border))]:([border-top:0] [border-top-left-radius:inherit] [border-top-right-radius:inherit]) [&_>_img:nth-child(1_of_:not(.q--avoid-card-border))]:([border-top:0] [border-top-left-radius:inherit] [border-top-right-radius:inherit]) [&_>_div:nth-last-child(1_of_:not(.q--avoid-card-border))]:([border-bottom:0] [border-bottom-left-radius:inherit] [border-bottom-right-radius:inherit]) [&_>_img:nth-last-child(1_of_:not(.q--avoid-card-border))]:([border-bottom:0] [border-bottom-left-radius:inherit] [border-bottom-right-radius:inherit]) [&_>_div:not(.q--avoid-card-border)]:([border-left:0] [border-right:0] [box-shadow:none]) [&_>_img]:(block w-full max-w-full border-[0])`
     ],
     [
         /^q-card--bordered$/,
-        ([, c], { theme }) => `border-solid border-black border-op-120`
+        ([, c], { theme }) => `border-[1px] border-solid border-[rgba(0,0,0,0.12)]`
     ],
     [
         /^q-card--dark$/,
-        ([, c], { theme }) => `border-white border-op-280 shadow-black`
+        ([, c], { theme }) => `border-[rgba(255,_255,_255,_0.28)] [box-shadow:0_1px_5px_rgba(255,_255,_255,_0.2),_0_2px_2px_rgba(255,_255,_255,_0.14),_0_3px_1px_-2px_rgba(255,_255,_255,_0.12)]`
     ],
     [/^q-card__section$/, ([, c], { theme }) => `relative`],
-    [/^q-card__section--vert$/, ([, c], { theme }) => `p-16px`],
+    [/^q-card__section--vert$/, ([, c], { theme }) => `p-[16px]`],
     [
         /^q-card__section--horiz$/,
-        ([, c], { theme }) => `[&>div:not(.q--avoid-card-border)]:(border-t-0 border-b-0 border-t-0 border-b-0)
-    [&>img:not(.q--avoid-card-border)]:(border-t-0 border-b-0 border-t-0 border-b-0)
-    [&>div:nth-child(1_of_:not(.q--avoid-card-border))]:(border-t-inherit border-b-inherit)
-    [&>img:nth-child(1_of_:not(.q--avoid-card-border))]:(border-t-inherit border-b-inherit)
-    [&>div:nth-last-child(1_of_:not(.q--avoid-card-border))]:(border-t-inherit border-b-inherit)
-    [&>img:nth-last-child(1_of_:not(.q--avoid-card-border))]:(border-t-inherit border-b-inherit)
-    [&>div:not(.q--avoid-card-border)]:(border-t-0 border-b-0 shadow-none)
-    `
+        ([, c], { theme }) => `[&_>_div:not(.q--avoid-card-border)]:(rounded-tl-none rounded-bl-none rounded-tr-none rounded-br-none) [&_>_img:not(.q--avoid-card-border)]:(rounded-tl-none rounded-bl-none rounded-tr-none rounded-br-none) [&_>_div:nth-child(1_of_:not(.q--avoid-card-border))]:([border-top-left-radius:inherit] [border-bottom-left-radius:inherit]) [&_>_img:nth-child(1_of_:not(.q--avoid-card-border))]:([border-top-left-radius:inherit] [border-bottom-left-radius:inherit]) [&_>_div:nth-last-child(1_of_:not(.q--avoid-card-border))]:([border-top-right-radius:inherit] [border-bottom-right-radius:inherit]) [&_>_img:nth-last-child(1_of_:not(.q--avoid-card-border))]:([border-top-right-radius:inherit] [border-bottom-right-radius:inherit]) [&_>_div:not(.q--avoid-card-border)]:([border-top:0] [border-bottom:0] [box-shadow:none])`
     ],
     [
-        /^q--card__actions$/,
-        ([, c], { theme }) => `p-8px items-center
-    [&_.q-btn--rectangle]:(px-8px py-0)`
+        /^q-card__actions$/,
+        ([, c], { theme }) => `p-[8px] items-center [&_.q-btn--rectangle]:(px-[8px] py-[0])`
     ],
     [
-        /^q--card__actions--horiz$/,
-        ([, c], { theme }) => `[&>.q-btn-item+.q-btn-item]:(ml-8px)
-    [&>.q-btn-group+.q-btn-item]:(ml-8px)
-    [&>.q-btn-item+.q-btn-group]:(ml-8px)`
+        /^q-card__actions--horiz$/,
+        ([, c], { theme }) => `[&_>_.q-btn-item_+_.q-btn-item]:(ml-[8px]) [&_>_.q-btn-group_+_.q-btn-item]:(ml-[8px]) [&_>_.q-btn-item_+_.q-btn-group]:(ml-[8px])`
     ],
     [
-        /^q--card__actions--vert$/,
-        ([, c], { theme }) => `[&>.q-btn-item.q-btn--round]:(self-center)
-      [&>.q-btn-item+.q-btn-item]:(mt-4px)
-      [&>.q-btn-group+.q-btn-item]:(mt-4px)
-      [&>.q-btn-item+.q-btn-group]:(mt-4px)
-      [&>.q-btn-group>.q-btn-item]:(flex-grow)
-    `
+        /^q-card__actions--vert$/,
+        ([, c], { theme }) => `[&_>_.q-btn-item.q-btn--round]:(self-center) [&_>_.q-btn-item_+_.q-btn-item]:(mt-[4px]) [&_>_.q-btn-group_+_.q-btn-item]:(mt-[4px]) [&_>_.q-btn-item_+_.q-btn-group]:(mt-[4px]) [&_>_.q-btn-group_>_.q-btn-item]:(flex-grow)`
     ]
 ];
 export { shortcuts };

package/dist/plugins/quasar/unocss/core/flex.unocss.js

@@ -12,7 +12,7 @@ const sizes = ['sm', 'md', 'lg', 'xl'];
 const shortcuts = [
     [
         /^row$/,
-        ([, c], { theme }) => `flex flex-row flex-wrap
+        ([, c], { theme }) => `flex flex-row flex-wrap 
     [&_>_.col]:(grow)
     ${sizes
             .map((size) => `[&_>_.col-${size}]:(${size}:basis-auto ${size}:grow)`)

package/dist/plugins/quasar/unocss/core/mouse.unocss.js

@@ -16,9 +16,9 @@ const preflights = [
 ];
 const shortcuts = [
     [/^non-selectable$/, ([, c], { theme }) => `!select-none`],
-    [/^scroll$/, ([, c], { theme }) => `overflow-auto `],
-    [/^scroll-x$/, ([, c], { theme }) => ` overflow-x-auto`],
-    [/^scroll-y$/, ([, c], { theme }) => ` overflow-y-auto`],
+    [/^scroll$/, ([, c], { theme }) => `overflow-auto`],
+    [/^scroll-x$/, ([, c], { theme }) => `overflow-x-auto`],
+    [/^scroll-y$/, ([, c], { theme }) => `overflow-y-auto`],
     [/^no-scroll$/, ([, c], { theme }) => `!overflow-hidden`],
     [/^no-pointer-events$/, ([, c], { theme }) => `!pointer-events-none`],
     [

package/dist/plugins/quasar/unocss/index.js

@@ -1209,26 +1209,265 @@ export default definePreset((options) => {
         safelist,
         preflights: [
             {
-                getCSS: ({ theme }) => `#q-app {
-  width: 100%;
-  direction: ltr;
+                getCSS: ({ theme }) => `/* beasties:include start */
+/* Document
+ * ========================================================================== */
+
+/**
+ * 1. Correct the line height in all browsers.
+ * 2. Prevent adjustments of font size after orientation changes in iOS.
+ */
+
+:where(html) {
+  line-height: 1.15; /* 1 */
+  -webkit-text-size-adjust: 100%; /* 2 */
+  text-size-adjust: 100%; /* 2 */
 }
-body.platform-ios.within-iframe, body.platform-ios.within-iframe #q-app {
-  width: 100px;
-  min-width: 100%;
+
+/* Sections
+ * ========================================================================== */
+
+/**
+ * Correct the font size and margin on \`h1\` elements within \`section\` and
+ * \`article\` contexts in Chrome, Edge, Firefox, and Safari.
+ */
+
+:where(h1) {
+  font-size: 2em;
+  margin-block-end: 0.67em;
+  margin-block-start: 0.67em;
 }
-body {
-  min-width: 100px;
-  min-height: 100%;
-  font-family: 'Roboto', '-apple-system', 'Helvetica Neue', Helvetica, Arial, sans-serif;
-  -ms-text-size-adjust: 100%;
-  -webkit-text-size-adjust: 100%;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  font-smoothing: antialiased;
-  line-height: 1.5;
-  font-size: 14px;
-}`
+
+/* Grouping content
+ * ========================================================================== */
+
+/**
+ * Remove the margin on nested lists in Chrome, Edge, and Safari.
+ */
+
+:where(dl, ol, ul) :where(dl, ol, ul) {
+  margin-block-end: 0;
+  margin-block-start: 0;
+}
+
+/**
+ * 1. Add the correct box sizing in Firefox.
+ * 2. Correct the inheritance of border color in Firefox.
+ */
+
+:where(hr) {
+  box-sizing: content-box; /* 1 */
+  color: inherit; /* 2 */
+  height: 0; /* 1 */
+}
+
+/* Text-level semantics
+ * ========================================================================== */
+
+/**
+ * Add the correct text decoration in Safari.
+ */
+
+:where(abbr[title]) {
+  text-decoration: underline;
+  text-decoration: underline dotted;
+}
+
+/**
+ * Add the correct font weight in Chrome, Edge, and Safari.
+ */
+
+:where(b, strong) {
+  font-weight: bolder;
+}
+
+/**
+ * 1. Correct the inheritance and scaling of font size in all browsers.
+ * 2. Correct the odd \`em\` font sizing in all browsers.
+ */
+
+:where(code, kbd, pre, samp) {
+  font-family: monospace, monospace; /* 1 */
+  font-size: 1em; /* 2 */
+}
+
+/**
+ * Add the correct font size in all browsers.
+ */
+
+:where(small) {
+  font-size: 80%;
+}
+
+/* Tabular data
+ * ========================================================================== */
+
+/**
+ * 1. Correct table border color in Chrome, Edge, and Safari.
+ * 2. Remove text indentation from table contents in Chrome, Edge, and Safari.
+ */
+
+:where(table) {
+  border-color: currentColor; /* 1 */
+  text-indent: 0; /* 2 */
+}
+
+/* Forms
+ * ========================================================================== */
+
+/**
+ * Remove the margin on controls in Safari.
+ */
+
+:where(button, input, select) {
+  margin: 0;
+}
+
+/**
+ * Remove the inheritance of text transform in Firefox.
+ */
+
+:where(button) {
+  text-transform: none;
+}
+
+/**
+ * Correct the inability to style buttons in iOS and Safari.
+ */
+
+:where(button, input:is([type="button" i], [type="reset" i], [type="submit" i])) {
+  -webkit-appearance: button;
+}
+
+/**
+ * Add the correct vertical alignment in Chrome, Edge, and Firefox.
+ */
+
+:where(progress) {
+  vertical-align: baseline;
+}
+
+/**
+ * Remove the inheritance of text transform in Firefox.
+ */
+
+:where(select) {
+  text-transform: none;
+}
+
+/**
+ * Remove the margin in Firefox and Safari.
+ */
+
+:where(textarea) {
+  margin: 0;
+}
+
+/**
+ * 1. Correct the odd appearance in Chrome, Edge, and Safari.
+ * 2. Correct the outline style in Safari.
+ */
+
+:where(input[type="search" i]) {
+  -webkit-appearance: textfield; /* 1 */
+  outline-offset: -2px; /* 2 */
+}
+
+/**
+ * Correct the cursor style of increment and decrement buttons in Safari.
+ */
+
+::-webkit-inner-spin-button,
+::-webkit-outer-spin-button {
+  height: auto;
+}
+
+/**
+ * Correct the text style of placeholders in Chrome, Edge, and Safari.
+ */
+
+::-webkit-input-placeholder {
+  color: inherit;
+  opacity: 0.54;
+}
+
+/**
+ * Remove the inner padding in Chrome, Edge, and Safari on macOS.
+ */
+
+::-webkit-search-decoration {
+  -webkit-appearance: none;
+}
+
+/**
+ * 1. Correct the inability to style upload buttons in iOS and Safari.
+ * 2. Change font properties to \`inherit\` in Safari.
+ */
+
+::-webkit-file-upload-button {
+  -webkit-appearance: button; /* 1 */
+  font: inherit; /* 2 */
+}
+
+/**
+ * Remove the inner border and padding of focus outlines in Firefox.
+ */
+
+:where(button, input:is([type="button" i], [type="color" i], [type="reset" i], [type="submit" i]))::-moz-focus-inner {
+  border-style: none;
+  padding: 0;
+}
+
+/**
+ * Restore the focus outline styles unset by the previous rule in Firefox.
+ */
+
+:where(button, input:is([type="button" i], [type="color" i], [type="reset" i], [type="submit" i]))::-moz-focusring {
+  outline: 1px dotted ButtonText;
+}
+
+/**
+ * Remove the additional :invalid styles in Firefox.
+ */
+
+:where(:-moz-ui-invalid) {
+  box-shadow: none;
+}
+
+/* Interactive
+ * ========================================================================== */
+
+/*
+ * Add the correct styles in Safari.
+ */
+
+:where(dialog) {
+  background-color: white;
+  border: solid;
+  color: black;
+  height: -moz-fit-content;
+  height: fit-content;
+  left: 0;
+  margin: auto;
+  padding: 1em;
+  position: absolute;
+  right: 0;
+  width: -moz-fit-content;
+  width: fit-content;
+}
+
+:where(dialog:not([open])) {
+  display: none;
+}
+
+/*
+ * Add the correct display in all browsers.
+ */
+
+:where(summary) {
+  display: list-item;
+}
+/* beasties:include end */`
             }
         ]
             .concat(),

package/dist/plugins/quasar.js

@@ -48,7 +48,6 @@ export const QuasarPlugin = async ({ ssr = false, pwa = false }) => {
             config: async (config, env) => {
                 const { vitrify: { urls } = {}, quasar } = config;
                 const globalCss = quasar?.extras?.map((extra) => `@quasar/extras/${extra}/${extra}.css`);
-                // globalCss?.push('@unocss/reset/normalize.css')
                 const localPackages = ['@quasar/extras', 'quasar'];
                 // const localPackages: string[] = []
                 await (async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vitrify",
-  "version": "0.17.1",
+  "version": "0.17.3",
   "license": "MIT",
   "author": "Stefan van Herwijnen",
   "description": "Vite as your Full Stack development tool",

package/src/node/frameworks/vue/prerender.ts

@@ -28,8 +28,8 @@ export const prerender = async ({
     path: outDir,
     logLevel: 'info',
     external: true,
-    inlineFonts: true,
-    preloadFonts: true
+    fonts: true,
+    compress: false
   })
 
   for (const url of paths) {

package/src/node/index.ts

@@ -257,12 +257,7 @@ export const baseConfig = async ({
     throw e
   }
 
-  const localPackages = [
-    'vue',
-    'vue-router',
-    '@vue/server-renderer',
-    '@unocss/reset'
-  ]
+  const localPackages = ['vue', 'vue-router', '@vue/server-renderer']
   // const localPackages: string[] = []
   const cliPackages = []
   const packageUrls: Record<string, URL> =
@@ -605,10 +600,6 @@ export const baseConfig = async ({
         new URL('./dist/vue-router.esm-bundler.js', packageUrls['vue-router'])
       )
     },
-    {
-      find: new RegExp('@unocss/reset'),
-      replacement: fileURLToPath(new URL('./', packageUrls['@unocss/reset']))
-    },
     ...vuePkgAliases
   ]
   if (mode === 'development' && vitrifyConfig.vitrify?.dev?.alias)

package/src/node/plugins/quasar/unocss/components/QCard.unocss.ts

@@ -4,60 +4,47 @@ import type { QuasarTheme } from '../theme.js'
 const shortcuts: UserShortcuts<QuasarTheme> = [
   [
     /^q-card$/,
-    ([, c], { theme }) => `shadow-black border-rd-4px v-top bg-white relative
-      [&>div:not(.q--avoid-card-border)]:(border-t-0 border-t-0 border-b-0 border-b-0)
-      [&>img:not(.q--avoid-card-border)]:(border-t-0 border-t-0 border-b-0 border-b-0)
-      [&>div:nth-child(1_of_:not(.q--avoid-card-border))]:(border-t-0 border-t-inherit border-t-inherit)
-      [&>img:nth-child(1_of_:not(.q--avoid-card-border))]:(border-t-0 border-t-inherit border-t-inherit)
-      [&>div:nth-last-child(1_of_:not(.q--avoid-card-border))]:(border-b-0 border-b-inherit border-b-inherit)
-      [&>img:nth-last-child(1_of_:not(.q--avoid-card-border))]:(border-b-0 border-b-inherit border-b-inherit)
-      [&>div:not(.q--avoid-card-border)]:(border-l-0 border-r-0 shadow-none)
-      [&>img]:(block w-full max-w-full border-none)
-    `
+    ([, c], { theme }) =>
+      `[box-shadow:0_1px_5px_rgba(0,_0,_0,_0.2),_0_2px_2px_rgba(0,_0,_0,_0.14),_0_3px_1px_-2px_rgba(0,_0,_0,_0.12)] rounded-[4px] align-top bg-[#fff] relative [&_>_div:not(.q--avoid-card-border)]:(rounded-tl-none rounded-tr-none rounded-bl-none rounded-br-none) [&_>_img:not(.q--avoid-card-border)]:(rounded-tl-none rounded-tr-none rounded-bl-none rounded-br-none) [&_>_div:nth-child(1_of_:not(.q--avoid-card-border))]:([border-top:0] [border-top-left-radius:inherit] [border-top-right-radius:inherit]) [&_>_img:nth-child(1_of_:not(.q--avoid-card-border))]:([border-top:0] [border-top-left-radius:inherit] [border-top-right-radius:inherit]) [&_>_div:nth-last-child(1_of_:not(.q--avoid-card-border))]:([border-bottom:0] [border-bottom-left-radius:inherit] [border-bottom-right-radius:inherit]) [&_>_img:nth-last-child(1_of_:not(.q--avoid-card-border))]:([border-bottom:0] [border-bottom-left-radius:inherit] [border-bottom-right-radius:inherit]) [&_>_div:not(.q--avoid-card-border)]:([border-left:0] [border-right:0] [box-shadow:none]) [&_>_img]:(block w-full max-w-full border-[0])`
   ],
+
   [
     /^q-card--bordered$/,
-    ([, c], { theme }) => `border-solid border-black border-op-120`
+    ([, c], { theme }) => `border-[1px] border-solid border-[rgba(0,0,0,0.12)]`
   ],
+
   [
     /^q-card--dark$/,
-    ([, c], { theme }) => `border-white border-op-280 shadow-black`
+    ([, c], { theme }) =>
+      `border-[rgba(255,_255,_255,_0.28)] [box-shadow:0_1px_5px_rgba(255,_255,_255,_0.2),_0_2px_2px_rgba(255,_255,_255,_0.14),_0_3px_1px_-2px_rgba(255,_255,_255,_0.12)]`
   ],
+
   [/^q-card__section$/, ([, c], { theme }) => `relative`],
-  [/^q-card__section--vert$/, ([, c], { theme }) => `p-16px`],
+
+  [/^q-card__section--vert$/, ([, c], { theme }) => `p-[16px]`],
+
   [
     /^q-card__section--horiz$/,
-    (
-      [, c],
-      { theme }
-    ) => `[&>div:not(.q--avoid-card-border)]:(border-t-0 border-b-0 border-t-0 border-b-0)
-    [&>img:not(.q--avoid-card-border)]:(border-t-0 border-b-0 border-t-0 border-b-0)
-    [&>div:nth-child(1_of_:not(.q--avoid-card-border))]:(border-t-inherit border-b-inherit)
-    [&>img:nth-child(1_of_:not(.q--avoid-card-border))]:(border-t-inherit border-b-inherit)
-    [&>div:nth-last-child(1_of_:not(.q--avoid-card-border))]:(border-t-inherit border-b-inherit)
-    [&>img:nth-last-child(1_of_:not(.q--avoid-card-border))]:(border-t-inherit border-b-inherit)
-    [&>div:not(.q--avoid-card-border)]:(border-t-0 border-b-0 shadow-none)
-    `
+    ([, c], { theme }) =>
+      `[&_>_div:not(.q--avoid-card-border)]:(rounded-tl-none rounded-bl-none rounded-tr-none rounded-br-none) [&_>_img:not(.q--avoid-card-border)]:(rounded-tl-none rounded-bl-none rounded-tr-none rounded-br-none) [&_>_div:nth-child(1_of_:not(.q--avoid-card-border))]:([border-top-left-radius:inherit] [border-bottom-left-radius:inherit]) [&_>_img:nth-child(1_of_:not(.q--avoid-card-border))]:([border-top-left-radius:inherit] [border-bottom-left-radius:inherit]) [&_>_div:nth-last-child(1_of_:not(.q--avoid-card-border))]:([border-top-right-radius:inherit] [border-bottom-right-radius:inherit]) [&_>_img:nth-last-child(1_of_:not(.q--avoid-card-border))]:([border-top-right-radius:inherit] [border-bottom-right-radius:inherit]) [&_>_div:not(.q--avoid-card-border)]:([border-top:0] [border-bottom:0] [box-shadow:none])`
   ],
+
   [
-    /^q--card__actions$/,
-    ([, c], { theme }) => `p-8px items-center
-    [&_.q-btn--rectangle]:(px-8px py-0)`
+    /^q-card__actions$/,
+    ([, c], { theme }) =>
+      `p-[8px] items-center [&_.q-btn--rectangle]:(px-[8px] py-[0])`
   ],
+
   [
-    /^q--card__actions--horiz$/,
-    ([, c], { theme }) => `[&>.q-btn-item+.q-btn-item]:(ml-8px)
-    [&>.q-btn-group+.q-btn-item]:(ml-8px)
-    [&>.q-btn-item+.q-btn-group]:(ml-8px)`
+    /^q-card__actions--horiz$/,
+    ([, c], { theme }) =>
+      `[&_>_.q-btn-item_+_.q-btn-item]:(ml-[8px]) [&_>_.q-btn-group_+_.q-btn-item]:(ml-[8px]) [&_>_.q-btn-item_+_.q-btn-group]:(ml-[8px])`
   ],
+
   [
-    /^q--card__actions--vert$/,
-    ([, c], { theme }) => `[&>.q-btn-item.q-btn--round]:(self-center)
-      [&>.q-btn-item+.q-btn-item]:(mt-4px)
-      [&>.q-btn-group+.q-btn-item]:(mt-4px)
-      [&>.q-btn-item+.q-btn-group]:(mt-4px)
-      [&>.q-btn-group>.q-btn-item]:(flex-grow)
-    `
+    /^q-card__actions--vert$/,
+    ([, c], { theme }) =>
+      `[&_>_.q-btn-item.q-btn--round]:(self-center) [&_>_.q-btn-item_+_.q-btn-item]:(mt-[4px]) [&_>_.q-btn-group_+_.q-btn-item]:(mt-[4px]) [&_>_.q-btn-item_+_.q-btn-group]:(mt-[4px]) [&_>_.q-btn-group_>_.q-btn-item]:(flex-grow)`
   ]
 ]
 

package/src/node/plugins/quasar/unocss/core/flex.unocss.ts

@@ -18,7 +18,7 @@ const sizes = ['sm', 'md', 'lg', 'xl']
 const shortcuts: UserShortcuts<QuasarTheme> = [
   [
     /^row$/,
-    ([, c], { theme }) => `flex flex-row flex-wrap
+    ([, c], { theme }) => `flex flex-row flex-wrap 
     [&_>_.col]:(grow)
     ${sizes
       .map((size) => `[&_>_.col-${size}]:(${size}:basis-auto ${size}:grow)`)

package/src/node/plugins/quasar/unocss/core/mouse.unocss.ts

@@ -21,11 +21,11 @@ const preflights: Preflight<QuasarTheme>[] = [
 const shortcuts: UserShortcuts<QuasarTheme> = [
   [/^non-selectable$/, ([, c], { theme }) => `!select-none`],
 
-  [/^scroll$/, ([, c], { theme }) => `overflow-auto `],
+  [/^scroll$/, ([, c], { theme }) => `overflow-auto`],
 
-  [/^scroll-x$/, ([, c], { theme }) => ` overflow-x-auto`],
+  [/^scroll-x$/, ([, c], { theme }) => `overflow-x-auto`],
 
-  [/^scroll-y$/, ([, c], { theme }) => ` overflow-y-auto`],
+  [/^scroll-y$/, ([, c], { theme }) => `overflow-y-auto`],
 
   [/^no-scroll$/, ([, c], { theme }) => `!overflow-hidden`],
 

package/src/node/plugins/quasar/unocss/index.ts

@@ -1290,26 +1290,265 @@ export default definePreset((options?: QuasarPresetOptions) => {
     preflights: (
       [
         {
-          getCSS: ({ theme }) => `#q-app {
-  width: 100%;
-  direction: ltr;
+          getCSS: ({ theme }) => `/* beasties:include start */
+/* Document
+ * ========================================================================== */
+
+/**
+ * 1. Correct the line height in all browsers.
+ * 2. Prevent adjustments of font size after orientation changes in iOS.
+ */
+
+:where(html) {
+  line-height: 1.15; /* 1 */
+  -webkit-text-size-adjust: 100%; /* 2 */
+  text-size-adjust: 100%; /* 2 */
+}
+
+/* Sections
+ * ========================================================================== */
+
+/**
+ * Correct the font size and margin on \`h1\` elements within \`section\` and
+ * \`article\` contexts in Chrome, Edge, Firefox, and Safari.
+ */
+
+:where(h1) {
+  font-size: 2em;
+  margin-block-end: 0.67em;
+  margin-block-start: 0.67em;
 }
-body.platform-ios.within-iframe, body.platform-ios.within-iframe #q-app {
-  width: 100px;
-  min-width: 100%;
+
+/* Grouping content
+ * ========================================================================== */
+
+/**
+ * Remove the margin on nested lists in Chrome, Edge, and Safari.
+ */
+
+:where(dl, ol, ul) :where(dl, ol, ul) {
+  margin-block-end: 0;
+  margin-block-start: 0;
+}
+
+/**
+ * 1. Add the correct box sizing in Firefox.
+ * 2. Correct the inheritance of border color in Firefox.
+ */
+
+:where(hr) {
+  box-sizing: content-box; /* 1 */
+  color: inherit; /* 2 */
+  height: 0; /* 1 */
+}
+
+/* Text-level semantics
+ * ========================================================================== */
+
+/**
+ * Add the correct text decoration in Safari.
+ */
+
+:where(abbr[title]) {
+  text-decoration: underline;
+  text-decoration: underline dotted;
+}
+
+/**
+ * Add the correct font weight in Chrome, Edge, and Safari.
+ */
+
+:where(b, strong) {
+  font-weight: bolder;
+}
+
+/**
+ * 1. Correct the inheritance and scaling of font size in all browsers.
+ * 2. Correct the odd \`em\` font sizing in all browsers.
+ */
+
+:where(code, kbd, pre, samp) {
+  font-family: monospace, monospace; /* 1 */
+  font-size: 1em; /* 2 */
+}
+
+/**
+ * Add the correct font size in all browsers.
+ */
+
+:where(small) {
+  font-size: 80%;
+}
+
+/* Tabular data
+ * ========================================================================== */
+
+/**
+ * 1. Correct table border color in Chrome, Edge, and Safari.
+ * 2. Remove text indentation from table contents in Chrome, Edge, and Safari.
+ */
+
+:where(table) {
+  border-color: currentColor; /* 1 */
+  text-indent: 0; /* 2 */
+}
+
+/* Forms
+ * ========================================================================== */
+
+/**
+ * Remove the margin on controls in Safari.
+ */
+
+:where(button, input, select) {
+  margin: 0;
+}
+
+/**
+ * Remove the inheritance of text transform in Firefox.
+ */
+
+:where(button) {
+  text-transform: none;
+}
+
+/**
+ * Correct the inability to style buttons in iOS and Safari.
+ */
+
+:where(button, input:is([type="button" i], [type="reset" i], [type="submit" i])) {
+  -webkit-appearance: button;
+}
+
+/**
+ * Add the correct vertical alignment in Chrome, Edge, and Firefox.
+ */
+
+:where(progress) {
+  vertical-align: baseline;
+}
+
+/**
+ * Remove the inheritance of text transform in Firefox.
+ */
+
+:where(select) {
+  text-transform: none;
+}
+
+/**
+ * Remove the margin in Firefox and Safari.
+ */
+
+:where(textarea) {
+  margin: 0;
+}
+
+/**
+ * 1. Correct the odd appearance in Chrome, Edge, and Safari.
+ * 2. Correct the outline style in Safari.
+ */
+
+:where(input[type="search" i]) {
+  -webkit-appearance: textfield; /* 1 */
+  outline-offset: -2px; /* 2 */
+}
+
+/**
+ * Correct the cursor style of increment and decrement buttons in Safari.
+ */
+
+::-webkit-inner-spin-button,
+::-webkit-outer-spin-button {
+  height: auto;
+}
+
+/**
+ * Correct the text style of placeholders in Chrome, Edge, and Safari.
+ */
+
+::-webkit-input-placeholder {
+  color: inherit;
+  opacity: 0.54;
+}
+
+/**
+ * Remove the inner padding in Chrome, Edge, and Safari on macOS.
+ */
+
+::-webkit-search-decoration {
+  -webkit-appearance: none;
+}
+
+/**
+ * 1. Correct the inability to style upload buttons in iOS and Safari.
+ * 2. Change font properties to \`inherit\` in Safari.
+ */
+
+::-webkit-file-upload-button {
+  -webkit-appearance: button; /* 1 */
+  font: inherit; /* 2 */
+}
+
+/**
+ * Remove the inner border and padding of focus outlines in Firefox.
+ */
+
+:where(button, input:is([type="button" i], [type="color" i], [type="reset" i], [type="submit" i]))::-moz-focus-inner {
+  border-style: none;
+  padding: 0;
+}
+
+/**
+ * Restore the focus outline styles unset by the previous rule in Firefox.
+ */
+
+:where(button, input:is([type="button" i], [type="color" i], [type="reset" i], [type="submit" i]))::-moz-focusring {
+  outline: 1px dotted ButtonText;
+}
+
+/**
+ * Remove the additional :invalid styles in Firefox.
+ */
+
+:where(:-moz-ui-invalid) {
+  box-shadow: none;
+}
+
+/* Interactive
+ * ========================================================================== */
+
+/*
+ * Add the correct styles in Safari.
+ */
+
+:where(dialog) {
+  background-color: white;
+  border: solid;
+  color: black;
+  height: -moz-fit-content;
+  height: fit-content;
+  left: 0;
+  margin: auto;
+  padding: 1em;
+  position: absolute;
+  right: 0;
+  width: -moz-fit-content;
+  width: fit-content;
+}
+
+:where(dialog:not([open])) {
+  display: none;
+}
+
+/*
+ * Add the correct display in all browsers.
+ */
+
+:where(summary) {
+  display: list-item;
 }
-body {
-  min-width: 100px;
-  min-height: 100%;
-  font-family: 'Roboto', '-apple-system', 'Helvetica Neue', Helvetica, Arial, sans-serif;
-  -ms-text-size-adjust: 100%;
-  -webkit-text-size-adjust: 100%;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  font-smoothing: antialiased;
-  line-height: 1.5;
-  font-size: 14px;
-}`
+/* beasties:include end */`
         }
       ] as Preflight<QuasarTheme>[]
     )

package/src/node/plugins/quasar.ts

@@ -110,7 +110,6 @@ export const QuasarPlugin: VitrifyPlugin = async ({
         const globalCss = quasar?.extras?.map(
           (extra) => `@quasar/extras/${extra}/${extra}.css`
         )
-        // globalCss?.push('@unocss/reset/normalize.css')
 
         const localPackages = ['@quasar/extras', 'quasar']
         // const localPackages: string[] = []

package/src/vite/vue/main.ts

@@ -4,7 +4,6 @@ import { onBoot } from 'virtual:vitrify-hooks'
 import routes from 'src/router/routes'
 import * as staticImports from 'virtual:static-imports'
 import 'virtual:uno.css'
-import '@unocss/reset/normalize.css'
 
 import RootComponent from './RootComponent.vue'
 interface ssrContext {