vitrify 0.17.2 → 0.17.4

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/core/elevation.unocss.js

@@ -17,7 +17,7 @@ const shadows = (mode) => [
         return acc;
     }, []),
     [
-        /^.inset-shadow$/,
+        /^inset-shadow$/,
         function* ([, color], { symbols, theme }) {
             yield {
                 [symbols.parent]: mode === 'dark' ? 'body.body--dark' : undefined,
@@ -26,7 +26,7 @@ const shadows = (mode) => [
         }
     ],
     [
-        /^.inset-shadow-down$/,
+        /^inset-shadow-down$/,
         function* ([, color], { symbols, theme }) {
             yield {
                 [symbols.parent]: mode === 'dark' ? 'body.body--dark' : undefined,
@@ -37,7 +37,7 @@ const shadows = (mode) => [
 ];
 const rules = [
     [
-        /^.shadow-transition$/,
+        /^shadow-transition$/,
         function* ([, color], { theme }) {
             yield {
                 transition: `${theme['shadowTransition']} !important`

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

@@ -11,23 +11,23 @@ import { shortcuts as QAvatarShortcuts } from './components/QAvatar.unocss.js';
 import { shortcuts as QBadgeShortcuts } from './components/QBadge.unocss.js';
 import { shortcuts as QBannerShortcuts } from './components/QBanner.unocss.js';
 import { shortcuts as QBarShortcuts } from './components/QBar.unocss.js';
-import { shortcuts as QBreadcrumbsShortcuts } from './components/QBreadcrumbs.unocss.js';
+import { preflights as QBreadcrumbsPreflights, shortcuts as QBreadcrumbsShortcuts } from './components/QBreadcrumbs.unocss.js';
 import { shortcuts as QBtnDropdownShortcuts } from './components/QBtnDropdown.unocss.js';
 import { shortcuts as QBtnGroupShortcuts } from './components/QBtnGroup.unocss.js';
 import { shortcuts as QBtnToggleShortcuts } from './components/QBtnToggle.unocss.js';
 import { shortcuts as QCardShortcuts } from './components/QCard.unocss.js';
 import { shortcuts as QCarouselShortcuts } from './components/QCarousel.unocss.js';
 import { shortcuts as QChatMessageShortcuts } from './components/QChatMessage.unocss.js';
-import { shortcuts as QCheckboxShortcuts } from './components/QCheckbox.unocss.js';
-import { shortcuts as QChipShortcuts } from './components/QChip.unocss.js';
-import { shortcuts as QCircularProgressShortcuts } from './components/QCircularProgress.unocss.js';
+import { preflights as QCheckboxPreflights, shortcuts as QCheckboxShortcuts } from './components/QCheckbox.unocss.js';
+import { preflights as QChipPreflights, shortcuts as QChipShortcuts } from './components/QChip.unocss.js';
+import { preflights as QCircularProgressPreflights, shortcuts as QCircularProgressShortcuts } from './components/QCircularProgress.unocss.js';
 import { shortcuts as QColorPickerShortcuts } from './components/QColorPicker.unocss.js';
 import { shortcuts as QDateShortcuts } from './components/QDate.unocss.js';
-import { shortcuts as QDialogShortcuts } from './components/QDialog.unocss.js';
+import { preflights as QDialogPreflights, shortcuts as QDialogShortcuts } from './components/QDialog.unocss.js';
 import { shortcuts as QEditorShortcuts } from './components/QEditor.unocss.js';
 import { shortcuts as QExpansionItemShortcuts } from './components/QExpansionItem.unocss.js';
 import { shortcuts as QFabShortcuts } from './components/QFab.unocss.js';
-import { shortcuts as QFieldShortcuts } from './components/QField.unocss.js';
+import { shortcuts as QFieldShortcuts, preflights as QFieldPreflights } from './components/QField.unocss.js';
 import { shortcuts as QFileShortcuts } from './components/QFile.unocss.js';
 import { shortcuts as QFormShortcuts } from './components/QForm.unocss.js';
 import { shortcuts as QImgShortcuts } from './components/QImg.unocss.js';
@@ -36,8 +36,8 @@ import { shortcuts as QInputShortcuts } from './components/QInput.unocss.js';
 import { shortcuts as QIntersectionShortcuts } from './components/QIntersection.unocss.js';
 import { shortcuts as QItemShortcuts } from './components/QItem.unocss.js';
 import { shortcuts as QKnobShortcuts } from './components/QKnob.unocss.js';
-import { shortcuts as QLayoutShortcuts } from './components/QLayout.unocss.js';
-import { shortcuts as QLinearProgressShortcuts } from './components/QLinearProgress.unocss.js';
+import { shortcuts as QLayoutShortcuts, preflights as QLayoutPreflights } from './components/QLayout.unocss.js';
+import { shortcuts as QLinearProgressShortcuts, preflights as QLinearProgressPreflights } from './components/QLinearProgress.unocss.js';
 import { shortcuts as QMenuShortcuts } from './components/QMenu.unocss.js';
 import { shortcuts as QOptionGroupShortcuts } from './components/QOptionGroup.unocss.js';
 import { shortcuts as QPageShortcuts } from './components/QPage.unocss.js';
@@ -46,28 +46,28 @@ import { shortcuts as QPaginationShortcuts } from './components/QPagination.unoc
 import { shortcuts as QParallaxShortcuts } from './components/QParallax.unocss.js';
 import { shortcuts as QPopupEditShortcuts } from './components/QPopupEdit.unocss.js';
 import { shortcuts as QPullToRefreshShortcuts } from './components/QPullToRefresh.unocss.js';
-import { shortcuts as QRadioShortcuts } from './components/QRadio.unocss.js';
+import { shortcuts as QRadioShortcuts, preflights as QRadioPreflights } from './components/QRadio.unocss.js';
 import { shortcuts as QRatingShortcuts } from './components/QRating.unocss.js';
 import { shortcuts as QResponsiveShortcuts } from './components/QResponsive.unocss.js';
 import { shortcuts as QScrollareaShortcuts } from './components/QScrollarea.unocss.js';
-import { shortcuts as QSelectShortcuts } from './components/QSelect.unocss.js';
+import { shortcuts as QSelectShortcuts, preflights as QSelectPreflights } from './components/QSelect.unocss.js';
 import { shortcuts as QSeparatorShortcuts } from './components/QSeparator.unocss.js';
-import { shortcuts as QSkeletonShortcuts } from './components/QSkeleton.unocss.js';
+import { shortcuts as QSkeletonShortcuts, preflights as QSkeletonPreflights } from './components/QSkeleton.unocss.js';
 import { shortcuts as QSlideItemShortcuts } from './components/QSlideItem.unocss.js';
 import { shortcuts as QSliderShortcuts } from './components/QSlider.unocss.js';
 import { shortcuts as QSpaceShortcuts } from './components/QSpace.unocss.js';
-import { shortcuts as QSpinnerShortcuts } from './components/QSpinner.unocss.js';
+import { shortcuts as QSpinnerShortcuts, preflights as QSpinnerPreflights } from './components/QSpinner.unocss.js';
 import { shortcuts as QSplitterShortcuts } from './components/QSplitter.unocss.js';
 import { shortcuts as QStepperShortcuts } from './components/QStepper.unocss.js';
 import { shortcuts as QTabPanelShortcuts } from './components/QTabPanel.unocss.js';
-import { shortcuts as QTableShortcuts } from './components/QTable.unocss.js';
+import { shortcuts as QTableShortcuts, preflights as QTablePreflights } from './components/QTable.unocss.js';
 import { shortcuts as QTabsShortcuts } from './components/QTabs.unocss.js';
 import { shortcuts as QTimeShortcuts } from './components/QTime.unocss.js';
 import { shortcuts as QTimelineShortcuts } from './components/QTimeline.unocss.js';
-import { shortcuts as QToggleShortcuts } from './components/QToggle.unocss.js';
+import { shortcuts as QToggleShortcuts, preflights as QTogglePreflights } from './components/QToggle.unocss.js';
 import { shortcuts as QToolbarShortcuts } from './components/QToolbar.unocss.js';
 import { shortcuts as QTooltipShortcuts } from './components/QTooltip.unocss.js';
-import { shortcuts as QTreeShortcuts } from './components/QTree.unocss.js';
+import { shortcuts as QTreeShortcuts, preflights as QTreePreflights } from './components/QTree.unocss.js';
 import { shortcuts as QUploaderShortcuts } from './components/QUploader.unocss.js';
 import { shortcuts as QVideoShortcuts } from './components/QVideo.unocss.js';
 import { shortcuts as QVirtualScrollShortcuts } from './components/QVirtualScroll.unocss.js';
@@ -77,18 +77,19 @@ import { shortcuts as QBottomSheetShortcuts } from './plugins/QBottomSheet.unocs
 import { shortcuts as QDialogPluginShortcuts } from './plugins/QDialogPlugin.unocss.js';
 import { shortcuts as QLoadingShortcuts } from './plugins/QLoading.unocss.js';
 import { shortcuts as QNotifyShortcuts } from './plugins/QNotify.unocss.js';
-import { shortcuts as DarkShortcuts } from './core/dark.unocss.js';
+import { preflights as ColorPreflights } from './core/colors.unocss.js';
+import { preflights as DarkPreflights, shortcuts as DarkShortcuts } from './core/dark.unocss.js';
 import { rules as ElevationRules } from './core/elevation.unocss.js';
 import { shortcuts as FlexShortcuts } from './core/flex.unocss.js';
-import { rules as HelperRules, shortcuts as HelperShortcuts } from './core/helpers.unocss.js';
-import { shortcuts as MouseShortcuts } from './core/mouse.unocss.js';
+import { rules as HelperRules, preflights as HelperPreflights, shortcuts as HelperShortcuts } from './core/helpers.unocss.js';
+import { preflights as MousePreflights, shortcuts as MouseShortcuts } from './core/mouse.unocss.js';
 import { shortcuts as OrientationShortcuts } from './core/orientation.unocss.js';
 import { shortcuts as PositionShortcuts } from './core/position.unocss.js';
 import { shortcuts as SizeShortcuts } from './core/size.unocss.js';
 import { shortcuts as TouchShortcuts } from './core/touch.unocss.js';
 import { shortcuts as TransitionsShortcuts } from './core/transitions.unocss.js';
-import { shortcuts as TypographyShortcuts } from './core/typography.unocss.js';
-import { rules as VisibilityRules, shortcuts as VisibilityShortcuts } from './core/visibility.unocss.js';
+import { preflights as TypographyPreflights, shortcuts as TypographyShortcuts } from './core/typography.unocss.js';
+import { rules as VisibilityRules, preflights as VisibilityPreflights, shortcuts as VisibilityShortcuts } from './core/visibility.unocss.js';
 import { shortcuts as QHeaderShortcuts } from './components/QHeader.unocss.js';
 import { shortcuts as QFooterShortcuts } from './components/QFooter.unocss.js';
 import { shortcuts as QDrawerShortcuts } from './components/QDrawer.unocss.js';
@@ -1469,8 +1470,7 @@ export default definePreset((options) => {
 }
 /* beasties:include end */`
             }
-        ]
-            .concat(),
+        ].concat(QBreadcrumbsPreflights, QCheckboxPreflights, QChipPreflights, QCircularProgressPreflights, QDialogPreflights, QFieldPreflights, QLayoutPreflights, QLinearProgressPreflights, QRadioPreflights, QSelectPreflights, QSpinnerPreflights, QSkeletonPreflights, QTablePreflights, QTogglePreflights, QTreePreflights, ColorPreflights, DarkPreflights, HelperPreflights, MousePreflights, TypographyPreflights, VisibilityPreflights),
         rules: [].concat(HelperRules, ElevationRules, VisibilityRules),
         shortcuts: [].concat(QIconShortcuts, QAjaxBarShortcuts, QAvatarShortcuts, QBadgeShortcuts, QBreadcrumbsShortcuts, QBannerShortcuts, QBarShortcuts, QBtnShortcuts, QBtnDropdownShortcuts, QBtnGroupShortcuts, QBtnToggleShortcuts, QCardShortcuts, QCarouselShortcuts, QChatMessageShortcuts, QCheckboxShortcuts, QChipShortcuts, QCircularProgressShortcuts, QColorPickerShortcuts, QDateShortcuts, QDialogShortcuts, QEditorShortcuts, QExpansionItemShortcuts, QFabShortcuts, QFieldShortcuts, QFileShortcuts, QFormShortcuts, QImgShortcuts, QInnerLoadingShortcuts, QInputShortcuts, QIntersectionShortcuts, QItemShortcuts, QKnobShortcuts, QLayoutShortcuts, QLinearProgressShortcuts, QMenuShortcuts, QOptionGroupShortcuts, QPageShortcuts, QPageStickyShortcuts, QPaginationShortcuts, QParallaxShortcuts, QPopupEditShortcuts, QPullToRefreshShortcuts, QRadioShortcuts, QRatingShortcuts, QResponsiveShortcuts, QScrollareaShortcuts, QSelectShortcuts, QSeparatorShortcuts, QSkeletonShortcuts, QSlideItemShortcuts, QSliderShortcuts, QSpaceShortcuts, QSpinnerShortcuts, QSplitterShortcuts, QStepperShortcuts, QTabPanelShortcuts, QTableShortcuts, QTabsShortcuts, QTimeShortcuts, QTimelineShortcuts, QToggleShortcuts, QToolbarShortcuts, QTooltipShortcuts, QTreeShortcuts, QUploaderShortcuts, QVideoShortcuts, QVirtualScrollShortcuts, PanelShortcuts, QMorphShortcuts, QRippleShortcuts, QBottomSheetShortcuts, QDialogPluginShortcuts, QLoadingShortcuts, QNotifyShortcuts, DarkShortcuts, FlexShortcuts, HelperShortcuts, MouseShortcuts, OrientationShortcuts, PositionShortcuts, SizeShortcuts, TouchShortcuts, TransitionsShortcuts, TypographyShortcuts, VisibilityShortcuts, QHeaderShortcuts, QFooterShortcuts, QDrawerShortcuts),
         theme: theme(options),

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/dist/types/plugins/quasar/unocss/core/helpers.unocss.d.ts

@@ -1,6 +1,6 @@
 import type { Preflight, Rule, UserShortcuts } from '@unocss/core';
 import type { QuasarTheme } from '../theme.js';
 declare const preflights: Preflight<QuasarTheme>[];
-declare const rules: Rule[];
+declare const rules: Rule<QuasarTheme>[];
 declare const shortcuts: UserShortcuts<QuasarTheme>;
 export { rules, preflights, shortcuts };

package/dist/types/plugins/quasar/unocss/core/visibility.unocss.d.ts

@@ -1,6 +1,6 @@
 import type { Preflight, Rule, UserShortcuts } from '@unocss/core';
 import type { QuasarTheme } from '../theme.js';
 declare const preflights: Preflight<QuasarTheme>[];
-declare const rules: Rule[];
+declare const rules: Rule<QuasarTheme>[];
 declare const shortcuts: UserShortcuts<QuasarTheme>;
 export { rules, preflights, shortcuts };

package/dist/types/plugins/quasar/unocss/index.d.ts

@@ -4,7 +4,7 @@ export interface QuasarPresetOptions {
         darkShadowColor?: string;
     };
 }
-declare const _default: import("unocss").PresetFactory<_unocss_preset_mini.Theme, QuasarPresetOptions>;
+declare const _default: import("unocss").Preset<object>;
 export default _default;
 export declare const defaultSplitRE: RegExp;
 export declare const splitWithVariantGroupRE: RegExp;

package/package.json

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

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/core/elevation.unocss.ts

@@ -13,7 +13,7 @@ type IntRange<F extends number, T extends number> = Exclude<
   Enumerate<F>
 >
 
-const shadows = (mode: 'light' | 'dark') => [
+const shadows = (mode: 'light' | 'dark'): Rule<QuasarTheme>[] => [
   ...Array.from({ length: 24 }, (_, i) => i + 1).reduce((acc, z) => {
     acc.push([
       new RegExp(`shadow-${z}`),
@@ -33,7 +33,7 @@ const shadows = (mode: 'light' | 'dark') => [
     return acc
   }, [] as Rule<QuasarTheme>[]),
   [
-    /^.inset-shadow$/,
+    /^inset-shadow$/,
     function* ([, color], { symbols, theme }) {
       yield {
         [symbols.parent]: mode === 'dark' ? 'body.body--dark' : undefined,
@@ -42,7 +42,7 @@ const shadows = (mode: 'light' | 'dark') => [
     }
   ] as Rule<QuasarTheme>,
   [
-    /^.inset-shadow-down$/,
+    /^inset-shadow-down$/,
     function* ([, color], { symbols, theme }) {
       yield {
         [symbols.parent]: mode === 'dark' ? 'body.body--dark' : undefined,
@@ -54,13 +54,13 @@ const shadows = (mode: 'light' | 'dark') => [
 
 const rules: Rule<QuasarTheme>[] = [
   [
-    /^.shadow-transition$/,
+    /^shadow-transition$/,
     function* ([, color], { theme }) {
       yield {
         transition: `${theme['shadowTransition']} !important`
       }
     }
-  ],
+  ] as Rule<QuasarTheme>,
   ...shadows('light'),
   ...shadows('dark'),
   ...['no-shadow', 'shadow-0'].map(

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

@@ -19,7 +19,7 @@ img.responsive {
   }
 ]
 
-const rules: Rule[] = [
+const rules: Rule<QuasarTheme>[] = [
   [
     /^content-empty$/,
     function* ([, color]) {

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

@@ -157,7 +157,7 @@ body.desktop .q-focusable:focus > .q-focus-helper, body.desktop .q-manual-focusa
   }
 ]
 
-const rules: Rule[] = [
+const rules: Rule<QuasarTheme>[] = [
   [
     /^invisible$/,
     function* ([, c], { symbols }) {

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

@@ -1,5 +1,11 @@
 // Import normalize and animate css
-import { definePreset, type Preflight, transformerVariantGroup } from 'unocss'
+import {
+  definePreset,
+  type Preflight,
+  type Rule,
+  transformerVariantGroup,
+  type UserShortcuts
+} from 'unocss'
 import presetWind from '@unocss/preset-wind'
 import theme, { type QuasarTheme } from './theme.js'
 import { animatedUno } from 'animated-unocss'
@@ -1551,32 +1557,35 @@ export default definePreset((options?: QuasarPresetOptions) => {
 /* beasties:include end */`
         }
       ] as Preflight<QuasarTheme>[]
-    )
-      .concat
-      // QBreadcrumbsPreflights,
-      // QCheckboxPreflights,
-      // QChipPreflights,
-      // QCircularProgressPreflights,
-      // QDialogPreflights,
-      // QFieldPreflights,
-      // QLayoutPreflights,
-      // QLinearProgressPreflights,
-      // QRadioPreflights,
-      // QSelectPreflights,
-      // QSpinnerPreflights,
-      // QSkeletonPreflights,
-      // QTablePreflights,
-      // QTogglePreflights,
-      // QTreePreflights,
-      // ColorPreflights,
-      // DarkPreflights,
-      // HelperPreflights,
-      // MousePreflights,
-      // TypographyPreflights,
-      // VisibilityPreflights
-      (),
-    rules: ([] as any[]).concat(HelperRules, ElevationRules, VisibilityRules),
-    shortcuts: ([] as any[]).concat(
+    ).concat(
+      QBreadcrumbsPreflights,
+      QCheckboxPreflights,
+      QChipPreflights,
+      QCircularProgressPreflights,
+      QDialogPreflights,
+      QFieldPreflights,
+      QLayoutPreflights,
+      QLinearProgressPreflights,
+      QRadioPreflights,
+      QSelectPreflights,
+      QSpinnerPreflights,
+      QSkeletonPreflights,
+      QTablePreflights,
+      QTogglePreflights,
+      QTreePreflights,
+      ColorPreflights,
+      DarkPreflights,
+      HelperPreflights,
+      MousePreflights,
+      TypographyPreflights,
+      VisibilityPreflights
+    ),
+    rules: ([] as Rule<QuasarTheme>[]).concat(
+      HelperRules,
+      ElevationRules,
+      VisibilityRules
+    ),
+    shortcuts: ([] as UserShortcuts<QuasarTheme>[]).concat(
       QIconShortcuts,
       QAjaxBarShortcuts,
       QAvatarShortcuts,

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[] = []