Revert "Maintenance: Update Vite packages"

zammad · Feb 12, 2024 · 4826908 · 4826908
1 parent 119ba63
commit 4826908
Show file tree

Hide file tree

Showing 7 changed files with 101 additions and 92 deletions.
diff --git a/app/frontend/apps/desktop/initializer/initializeDesktopIcons.ts b/app/frontend/apps/desktop/initializer/initializeDesktopIcons.ts
@@ -7,7 +7,7 @@ import iconsAliases from './desktopIconsAliasesMap.ts'
 const iconsSymbolsList = Object.entries(
   import.meta.glob<{ default: string }>('./assets/*.svg', {
     eager: true,
-    query: '?symbol',
+    as: 'symbol',
   }),
 )
 

diff --git a/app/frontend/apps/desktop/styles/main.css b/app/frontend/apps/desktop/styles/main.css
@@ -1,7 +1,5 @@
+@import '#shared/styles/main.css';
 @config './tailwind.desktop.js';
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
 
 @layer base {
   /* Override autofill styles in Firefox. */
@@ -53,8 +51,8 @@
     @apply text-stone-200 dark:text-neutral-500;
   }
 
-  .required::after {
-    @apply inline-block font-extrabold content-['•'] ltr:ml-1 rtl:mr-1 text-yellow-600;
+  .required-indicator {
+    @apply text-yellow-600;
   }
 
   /* Compatibility layer for object attributes and form columns. */

diff --git a/app/frontend/apps/mobile/initializer/initializeMobileIcons.ts b/app/frontend/apps/mobile/initializer/initializeMobileIcons.ts
@@ -7,7 +7,7 @@ import iconsAliases from './mobileIconsAliasesMap.ts'
 const iconsSymbolsList = Object.entries(
   import.meta.glob<{ default: string }>('./assets/*.svg', {
     eager: true,
-    query: '?symbol',
+    as: 'symbol',
   }),
 )
 

diff --git a/app/frontend/apps/mobile/styles/main.css b/app/frontend/apps/mobile/styles/main.css
@@ -1,7 +1,68 @@
+@import '#shared/styles/main.css';
 @config './tailwind.mobile.js';
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
+
+.Content,
+.ProseMirror {
+  [style*='color'] {
+    color: inherit !important;
+  }
+
+  div[data-signature-marker] {
+    display: none;
+  }
+
+  &:focus-visible {
+    outline: none;
+  }
+
+  blockquote {
+    @apply border-l-4 border-l-gray-200 px-3 py-2;
+  }
+
+  ol {
+    list-style: decimal;
+  }
+
+  ul {
+    list-style: disc;
+  }
+
+  ol,
+  ul {
+    @apply pb-2;
+
+    padding-inline-start: theme('spacing.2');
+    list-style-position: inside;
+
+    p {
+      display: inline;
+    }
+  }
+
+  h1 {
+    @apply mb-1 mt-2 text-2xl font-bold;
+  }
+
+  h2 {
+    @apply mb-1 mt-2 text-xl font-bold;
+  }
+
+  h3 {
+    @apply mb-1 mt-2 text-lg font-bold;
+  }
+
+  a {
+    @apply text-blue;
+  }
+
+  [dir='rtl'] {
+    text-align: right;
+  }
+
+  [dir='ltr'] {
+    text-align: left;
+  }
+}
 
 @layer base {
   html {
@@ -80,8 +141,8 @@
     @apply translate-y-0 text-xs opacity-75;
   }
 
-  .required::after {
-    @apply inline-block font-extrabold content-['•'] ltr:ml-1 rtl:mr-1 text-yellow;
+  .required-indicator {
+    @apply text-yellow;
   }
 
   .form-group {
@@ -109,69 +170,6 @@
       }
     }
   }
-
-  .Content,
-  .ProseMirror {
-    [style*='color'] {
-      color: inherit !important;
-    }
-
-    div[data-signature-marker] {
-      display: none;
-    }
-
-    &:focus-visible {
-      outline: none;
-    }
-
-    blockquote {
-      @apply border-l-4 border-l-gray-200 px-3 py-2;
-    }
-
-    ol {
-      list-style: decimal;
-    }
-
-    ul {
-      list-style: disc;
-    }
-
-    ol,
-    ul {
-      @apply pb-2;
-
-      padding-inline-start: theme('spacing.2');
-      list-style-position: inside;
-
-      p {
-        display: inline;
-      }
-    }
-
-    h1 {
-      @apply mb-1 mt-2 text-2xl font-bold;
-    }
-
-    h2 {
-      @apply mb-1 mt-2 text-xl font-bold;
-    }
-
-    h3 {
-      @apply mb-1 mt-2 text-lg font-bold;
-    }
-
-    a {
-      @apply text-blue;
-    }
-
-    [dir='rtl'] {
-      text-align: right;
-    }
-
-    [dir='ltr'] {
-      text-align: left;
-    }
-  }
 }
 
 @layer utilities {

diff --git a/app/frontend/shared/styles/main.css b/app/frontend/shared/styles/main.css
@@ -0,0 +1,13 @@
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
+
+@layer components {
+  .required-indicator {
+    /* no default color */
+  }
+
+  .required::after {
+    @apply inline-block font-extrabold content-['•'] ltr:ml-1 rtl:mr-1 required-indicator;
+  }
+}
diff --git a/package.json b/package.json
@@ -39,7 +39,7 @@
     "@types/uuid": "^9.0.8",
     "@typescript-eslint/eslint-plugin": "^6.21.0",
     "@typescript-eslint/parser": "^6.21.0",
-    "@vitejs/plugin-vue": "^5.0.4",
+    "@vitejs/plugin-vue": "^5.0.3",
     "@vue/eslint-config-prettier": "^9.0.0",
     "@vue/eslint-config-typescript": "^12.0.0",
     "@vue/test-utils": "^2.4.4",
@@ -79,8 +79,8 @@
     "timezone-mock": "^1.3.6",
     "type-fest": "^4.10.2",
     "typescript": "^5.3.3",
-    "vite": "^5.1.1",
-    "vite-plugin-pwa": "^0.18.1",
+    "vite": "^5.0.12",
+    "vite-plugin-pwa": "^0.17.5",
     "vite-plugin-ruby": "^5.0.0",
     "vitest": "^1.2.2",
     "vitest-axe": "^0.1.0",

diff --git a/yarn.lock b/yarn.lock
@@ -2905,10 +2905,10 @@
   resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"
   integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==
 
-"@vitejs/plugin-vue@^5.0.4":
-  version "5.0.4"
-  resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-5.0.4.tgz#508d6a0f2440f86945835d903fcc0d95d1bb8a37"
-  integrity sha512-WS3hevEszI6CEVEx28F8RjTX97k3KsrcY6kvTg7+Whm5y3oYvcqzVeGCU3hxSAn4uY2CLCkeokkGKpoctccilQ==
+"@vitejs/plugin-vue@^5.0.3":
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-5.0.3.tgz#164b36653910d27c130cf6c945b4bd9bde5bcbee"
+  integrity sha512-b8S5dVS40rgHdDrw+DQi/xOM9ed+kSRZzfm1T74bMmBDCd8XO87NKlFYInzCtwvtWwXZvo1QxE2OSspTATWrbA==
 
 "@vitest/expect@1.2.2":
   version "1.2.2"
@@ -8026,7 +8026,7 @@ postcss-value-parser@^4.0.0, postcss-value-parser@^4.2.0:
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
   integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
 
-postcss@^5.2.17, postcss@^8.1.10, postcss@^8.4.0, postcss@^8.4.23, postcss@^8.4.32, postcss@^8.4.33, postcss@^8.4.35:
+postcss@^5.2.17, postcss@^8.1.10, postcss@^8.4.0, postcss@^8.4.23, postcss@^8.4.32, postcss@^8.4.33:
   version "8.4.33"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.33.tgz#1378e859c9f69bf6f638b990a0212f43e2aaa742"
   integrity sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg==
@@ -10034,10 +10034,10 @@ vite-node@1.2.2:
     picocolors "^1.0.0"
     vite "^5.0.0"
 
-vite-plugin-pwa@^0.18.1:
-  version "0.18.1"
-  resolved "https://registry.yarnpkg.com/vite-plugin-pwa/-/vite-plugin-pwa-0.18.1.tgz#040dfaa47cdf1aae10d47d6b931adb156cacf3e4"
-  integrity sha512-2A3BF52l9F8hCkdPy/VP2C+hA+fmBvzJGynCZc9XS6mHTcMvo9046FKc2NqlnkKwTOGtQEwXLEIduML/+eYtdw==
+vite-plugin-pwa@^0.17.5:
+  version "0.17.5"
+  resolved "https://registry.yarnpkg.com/vite-plugin-pwa/-/vite-plugin-pwa-0.17.5.tgz#e821c14ac776742e2921fea9833dd2664ad2969b"
+  integrity sha512-UxRNPiJBzh4tqU/vc8G2TxmrUTzT6BqvSzhszLk62uKsf+npXdvLxGDz9C675f4BJi6MbD2tPnJhi5txlMzxbQ==
   dependencies:
     debug "^4.3.4"
     fast-glob "^3.3.2"
@@ -10064,13 +10064,13 @@ vite@^5.0.0:
   optionalDependencies:
     fsevents "~2.3.3"
 
-vite@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-5.1.1.tgz#294e39b199d669981efc7e0261b14f78ec80819e"
-  integrity sha512-wclpAgY3F1tR7t9LL5CcHC41YPkQIpKUGeIuT8MdNwNZr6OqOTLs7JX5vIHAtzqLWXts0T+GDrh9pN2arneKqg==
+vite@^5.0.12:
+  version "5.0.12"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-5.0.12.tgz#8a2ffd4da36c132aec4adafe05d7adde38333c47"
+  integrity sha512-4hsnEkG3q0N4Tzf1+t6NdN9dg/L3BM+q8SWgbSPnJvrgH2kgdyzfVJwbR1ic69/4uMJJ/3dqDZZE5/WwqW8U1w==
   dependencies:
     esbuild "^0.19.3"
-    postcss "^8.4.35"
+    postcss "^8.4.32"
     rollup "^4.2.0"
   optionalDependencies:
     fsevents "~2.3.3"