fix(fe2): revert vue 3.3 cause of game breaking bugs (#1775)

* fix(fe2): revert vue 3.3 cause of game breaking bugs

* reverting ui-components as well

* attempt 2

* good now?
This commit is contained in:
Kristaps Fabians Geikins
2023-08-28 11:43:33 +03:00
committed by GitHub
parent d9a06a01d1
commit c41dd17d01
8 changed files with 2079 additions and 355 deletions
@@ -31,18 +31,25 @@ graphql(`
const emit = defineEmits<{
(e: 'deleted'): void
(e: 'update:open', v: boolean): void
}>()
const props = defineProps<{
projectId: string
model: ProjectPageModelsCardDeleteDialogFragment
open: boolean
}>()
const isOpen = defineModel<boolean>('open', { required: true })
// const isOpen = defineModel<boolean>('open', { required: true })
const deleteModel = useDeleteModel()
const loading = ref(false)
const isOpen = computed({
get: () => props.open,
set: (newVal) => emit('update:open', newVal)
})
const mp = useMixpanel()
const onDelete = async () => {
@@ -102,7 +102,7 @@
:manual-expand-level="manualExpandLevel"
:debug="debug"
:parent="treeItem"
@expanded="(e) => $emit('expanded', e)"
@expanded="(e: number) => $emit('expanded', e)"
/>
</div>
</div>
@@ -118,7 +118,7 @@
:manual-expand-level="manualExpandLevel"
:debug="debug"
:parent="treeItem"
@expanded="(e) => $emit('expanded', e)"
@expanded="(e: number) => $emit('expanded', e)"
/>
</div>
<div v-if="itemCount <= singleCollectionItems.length" class="mb-2">
+3 -1
View File
@@ -1,9 +1,11 @@
import { NuxtApp } from '#app'
import { Optional } from '@speckle/shared'
import { buildFakePinoLogger } from '~~/lib/core/helpers/observability'
import type pino from 'pino'
export const useLogger = () => {
return useNuxtApp().$logger
// TODO: We shouldn't need to force cast here, but somethings broken currently
return useNuxtApp().$logger as pino.Logger
}
/**
@@ -21,6 +21,7 @@ import { useNavigateToLogin, loginRoute } from '~~/lib/common/helpers/route'
import { useAppErrorState } from '~~/lib/core/composables/appErrorState'
import { isInvalidAuth } from '~~/lib/common/helpers/graphql'
import { omit } from 'lodash-es'
import type pino from 'pino'
const appName = 'frontend-2'
@@ -271,7 +272,7 @@ function createLink(params: {
const { registerError, isErrorState } = useAppErrorState()
const errorLink = onError((res) => {
const logger = nuxtApp.$logger
const logger = nuxtApp.$logger as pino.Logger
const isSubTokenMissingError = (res.networkError?.message || '').includes(
'need a token to subscribe'
)
@@ -369,10 +370,14 @@ const defaultConfigResolver: ApolloConfigResolver = async () => {
: undefined
const link = createLink({ httpEndpoint, wsClient, authToken, nuxtApp })
// If we don't markRaw the cache, sometimes we get cryptic internal Apollo Client errors that essentially
// result from parts of its internals being made reactive, even tho they shouldn't be
const cache = markRaw(createCache())
// markRaw(cache.data)
// markRaw(cache.data.data)
return {
// If we don't markRaw the cache, sometimes we get cryptic internal Apollo Client errors that essentially
// result from parts of its internals being made reactive, even tho they shouldn't be
cache: markRaw(createCache()),
cache,
link,
name: appName,
version: speckleServerVersion
+1 -1
View File
@@ -55,7 +55,7 @@ export default defineNuxtConfig({
vite: {
vue: {
script: {
defineModel: true
// defineModel: true
}
},
+3 -2
View File
@@ -114,7 +114,7 @@
"eslint-plugin-vue": "^9.5.1",
"eslint-plugin-vuejs-accessibility": "^1.2.0",
"jest": "27",
"nuxt": "^3.6.5",
"nuxt": "3.3.1",
"pino-pretty": "^10.0.1",
"postcss": "^8.4.18",
"postcss-custom-properties": "^12.1.9",
@@ -132,7 +132,8 @@
"tailwindcss": "^3.3.2",
"type-fest": "^3.5.1",
"typescript": "^4.8.3",
"vue-tsc": "1.8.8",
"vue": "3.2.47",
"vue-tsc": "1.3.4",
"wait-on": "^6.0.1"
},
"engines": {
+3 -3
View File
@@ -35,7 +35,7 @@
}
},
"peerDependencies": {
"vue": "^3.3.0"
"vue": "^3.0.0"
},
"dependencies": {
"@headlessui/vue": "^1.7.13",
@@ -90,8 +90,8 @@
"unplugin-vue-macros": "^2.1.4",
"vite": "^4.3.9",
"vite-plugin-dts": "^3.5.2",
"vue": "^3.3.0",
"vue-tsc": "^1.4.2",
"vue": "3.2.47",
"vue-tsc": "1.3.4",
"wait-on": "^6.0.1"
},
"installConfig": {
+2050 -341
View File
File diff suppressed because it is too large Load Diff