merge: #3080

3080: updating vue/vite deps r=theoephraim a=theoephraim encountering a vite issue lately that requires clearing the cache to unstick your local env... No idea if this will fix it as we dont have clear reproduction steps, but this should hopefully help. Co-authored-by: Theo Ephraim <[email protected]>
systeminit · Dec 19, 2023 · 665bf61 · 665bf61
2 parents c06ab47 + c51ade1
commit 665bf61
Show file tree

Hide file tree

Showing 12 changed files with 485 additions and 866 deletions.
diff --git a/app/auth-portal/package.json b/app/auth-portal/package.json
@@ -26,25 +26,25 @@
     "less": "^4.1.3",
     "local-storage-fallback": "^4.1.2",
     "lodash-es": "^4.17.21",
-    "pinia": "^2.1.3",
+    "pinia": "^2.1.7",
     "posthog-js": "^1.76.0",
-    "vite-ssg": "^0.22.1",
-    "vue": "^3.3.4",
-    "vue-router": "^4.1.6"
+    "vite-ssg": "^0.23.5",
+    "vue": "^3.3.12",
+    "vue-router": "^4.2.5"
   },
   "devDependencies": {
     "@si/eslint-config": "workspace:*",
     "@si/tsconfig": "workspace:*",
     "@types/lodash-es": "^4.17.12",
     "@types/node": "^18.15.11",
-    "@vitejs/plugin-vue": "^4.0.0",
+    "@vitejs/plugin-vue": "^4.5.2",
     "eslint": "^8.36.0",
     "netlify-cli": "^13.2.2",
-    "rollup-plugin-visualizer": "^5.9.0",
+    "rollup-plugin-visualizer": "^5.11.0",
     "typescript": "^4.9.5",
     "unplugin-icons": "^0.17.1",
-    "vite": "^4.1.4",
-    "vite-plugin-checker": "^0.5.6",
+    "vite": "^5.0.10",
+    "vite-plugin-checker": "^0.6.2",
     "vite-plugin-markdown": "^2.2.0-2",
     "vite-svg-loader": "^3.4.0",
     "vue-tsc": "^1.1.7"

diff --git a/app/auth-portal/src/App.vue b/app/auth-portal/src/App.vue
@@ -103,7 +103,7 @@
               variant="transparent"
               tone="shade"
               @mousedown.prevent
-              @click.prevent="profileMenuRef?.open"
+              @click.prevent="profileMenuRef?.open || _.noop"
             >
               <div class="mr-xs">Hi {{ authStore.bestUserLabel }}!</div>
               <template #iconRight>
@@ -203,6 +203,7 @@
 </template>
 
 <script setup lang="ts">
+import * as _ from "lodash-es";
 import { tw } from "@si/vue-lib";
 import {
   Icon,

diff --git a/app/auth-portal/src/lib/posthog.ts b/app/auth-portal/src/lib/posthog.ts
@@ -6,7 +6,7 @@ if (!import.meta.env.SSR && import.meta.env.VITE_POSTHOG_PUBLIC_KEY) {
   });
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  if (window) (window as any).posthog = posthog;
+  if (typeof window !== "undefined") (window as any).posthog = posthog;
 }
 
 // small wrapper makes it easier to swap things later,

diff --git a/app/auth-portal/src/store/api.ts b/app/auth-portal/src/store/api.ts
@@ -19,7 +19,7 @@ const api = Axios.create({
 });
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-if (window) (window as any).api = api;
+if (typeof window !== "undefined") (window as any).api = api;
 
 // // add axios interceptors to add auth headers, handle logout errors, etc...
 // api.interceptors.request.use((config) => {

diff --git a/app/auth-portal/vite.config.ts b/app/auth-portal/vite.config.ts
@@ -45,6 +45,9 @@ export default defineConfig({
         },
       }),
 
+    // https://github.com/btd/rollup-plugin-visualizer/issues/176
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
     !!process.env.RUN_BUILD_ANALYZER &&
       VisualizerPlugin({
         open: true,

diff --git a/app/web/package.json b/app/web/package.json
@@ -66,17 +66,17 @@
     "local-storage-fallback": "^4.1.2",
     "lodash-es": "^4.17.21",
     "mitt": "^3.0.1",
-    "pinia": "^2.1.3",
+    "pinia": "^2.1.7",
     "plur": "^5.1.0",
     "posthog-js": "^1.76.0",
     "reconnecting-websocket": "^4.4.0",
     "tinycolor2": "^1.4.2",
     "typescript": "^4.9.5",
     "validator": "^13.7.0",
     "vanilla-picker": "^2.12.1",
-    "vue": "^3.3.4",
+    "vue": "^3.3.12",
     "vue-konva": "^3.0.1",
-    "vue-router": "^4.1.6",
+    "vue-router": "^4.2.5",
     "vue-safe-teleport": "^0.1.2",
     "vue-toastification": "2.0.0-rc.5",
     "yjs-codemirror-plugin": "workspace:*",
@@ -97,13 +97,13 @@
     "@types/node": "^18.15.11",
     "@types/tinycolor2": "^1.4.3",
     "@types/validator": "^13.7.2",
-    "@vitejs/plugin-vue": "^4.0.0",
+    "@vitejs/plugin-vue": "^4.5.2",
     "cypress": "^9.6.0",
     "eslint": "^8.36.0",
     "faker": "^6.6.6",
     "unplugin-icons": "^0.17.1",
-    "vite": "^4.4.9",
-    "vite-plugin-checker": "^0.6.1",
+    "vite": "^5.0.10",
+    "vite-plugin-checker": "^0.6.2",
     "vite-svg-loader": "^3.4.0",
     "vue-tsc": "^1.8.8"
   },

diff --git a/app/web/src/store/apis.ts b/app/web/src/store/apis.ts
@@ -57,7 +57,7 @@ async function handleProxyTimeouts(response: AxiosResponse) {
     trackEvent("api_404_timeout");
     // redirect to oops page after short timeout so we give tracker a chance to send event
     setTimeout(() => {
-      if (window) window.location.href = "/oops";
+      if (typeof window !== "undefined") window.location.href = "/oops";
     }, 500);
   }
   return response;

diff --git a/app/web/src/utils/posthog.ts b/app/web/src/utils/posthog.ts
@@ -5,7 +5,7 @@ if (import.meta.env.VITE_POSTHOG_PUBLIC_KEY) {
     api_host: import.meta.env.VITE_POSTHOG_API_HOST,
   });
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  if (window) (window as any).posthog = posthog;
+  if (typeof window !== "undefined") (window as any).posthog = posthog;
 }
 
 export { posthog };
diff --git a/lib/eslint-config/package.json b/lib/eslint-config/package.json
@@ -19,7 +19,7 @@
     "eslint-config-airbnb-typescript": "^17.0.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-import-resolver-exports": "1.0.0-beta.5",
-    "eslint-import-resolver-typescript": "^3.5.3",
+    "eslint-import-resolver-typescript": "^3.6.1",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-jest": "^27.4.3",
     "eslint-plugin-no-autofix": "^1.2.3",
@@ -29,4 +29,4 @@
     "prettier": "~2.8.4",
     "typescript": "^4.9.5"
   }
-}
+}
diff --git a/lib/vue-lib/package.json b/lib/vue-lib/package.json
@@ -55,11 +55,11 @@
     "local-storage-fallback": "^4.1.2",
     "lodash-es": "^4.17.21",
     "mitt": "^3.0.1",
-    "pinia": "^2.1.3",
+    "pinia": "^2.1.7",
     "posthog-js": "^1.51.4",
     "tailwindcss-capsize": "^3.0.3",
-    "vue": "^3.3.4",
-    "vue-router": "^4.1.6",
+    "vue": "^3.3.12",
+    "vue-router": "^4.2.5",
     "vue-safe-teleport": "^0.1.2"
   },
   "devDependencies": {
@@ -75,7 +75,7 @@
     "tailwindcss": "^3.2.2",
     "typescript": "^4.9.5",
     "unplugin-icons": "^0.17.1",
-    "vite": "^4.1.4",
+    "vite": "^5.0.10",
     "vite-svg-loader": "^3.4.0",
     "vue-tsc": "^1.1.7"
   }

diff --git a/lib/vue-lib/src/pinia/pinia_hooks_plugin.ts b/lib/vue-lib/src/pinia/pinia_hooks_plugin.ts
@@ -51,6 +51,9 @@ export const piniaHooksPlugin: PiniaPlugin = ({
   store._trackedStoreUsersCount = computed(
     () => Object.keys(store._trackedStoreUsers).length,
   );
+
+  // TODO: handle reset logic - see https://pinia.vuejs.org/core-concepts/plugins.html#Resetting-state-added-in-plugins
+
   // expose this info to devtools
   // TODO: determine the best way to safely check in both vite and webpack setups
   if (import.meta.env.DEV /* || process.env.NODE_ENV === "development" */) {