REsolve conflicts
This commit is contained in:
commit
2d372127d2
|
@ -24,7 +24,7 @@
|
|||
"pinia": "^2.1.7",
|
||||
"prismjs": "^1.24.1",
|
||||
"qrcode": "^1.5.1",
|
||||
"query-builder-vue-3": "^1.0.0",
|
||||
"query-builder-vue-3": "^1.0.1",
|
||||
"tinymotion": "^0.2.0",
|
||||
"vform": "^2.1.1",
|
||||
"vue": "^3.2.13",
|
||||
|
@ -10658,9 +10658,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/query-builder-vue-3": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/query-builder-vue-3/-/query-builder-vue-3-1.0.0.tgz",
|
||||
"integrity": "sha512-0Zzffeqp7tqUx1Ii4j2T/Ir/hAFv2LEpAXwvYA5bjF1QeWKxsKdXb3mE8Bd8p5M73zEU1HRal5mQmN+6oxrQMA==",
|
||||
"version": "1.0.1",
|
||||
"resolved": "https://registry.npmjs.org/query-builder-vue-3/-/query-builder-vue-3-1.0.1.tgz",
|
||||
"integrity": "sha512-fhEWsluNz8vRtrB8w2gjWeSmRkzn1KcOTv9ay6m6w3kX8yTdEUw0ZUv+0P04uhECoXQ+IZRfR4iUD1ffh3M/IQ==",
|
||||
"dependencies": {
|
||||
"mitt": "^3.0.0",
|
||||
"sortablejs": "^1.14.0",
|
||||
|
|
|
@ -2,7 +2,8 @@
|
|||
"private": true,
|
||||
"scripts": {
|
||||
"dev": "vite",
|
||||
"build": "vite build"
|
||||
"build": "vite build",
|
||||
"preview": "vite preview"
|
||||
},
|
||||
"dependencies": {
|
||||
"@hcaptcha/vue3-hcaptcha": "^1.3.0",
|
||||
|
@ -24,7 +25,7 @@
|
|||
"pinia": "^2.1.7",
|
||||
"prismjs": "^1.24.1",
|
||||
"qrcode": "^1.5.1",
|
||||
"query-builder-vue-3": "^1.0.0",
|
||||
"query-builder-vue-3": "^1.0.1",
|
||||
"tinymotion": "^0.2.0",
|
||||
"vform": "^2.1.1",
|
||||
"vue": "^3.2.13",
|
||||
|
|
|
@ -28,7 +28,9 @@ configureCompat({
|
|||
INSTANCE_SET: false,
|
||||
INSTANCE_DELETE: false,
|
||||
ATTR_FALSE_VALUE: false,
|
||||
WATCH_ARRAY: false
|
||||
WATCH_ARRAY: false,
|
||||
RENDER_FUNCTION: false,
|
||||
INSTANCE_ATTRS_CLASS_STYLE: false,
|
||||
})
|
||||
|
||||
router.app = app
|
||||
|
|
Loading…
Reference in New Issue