village-hall
/
opnform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

REsolve conflicts

This commit is contained in:
Julien Nahum 2023-12-02 11:29:44 +01:00
parent 49abf435a6 dcd4b03cd6
commit 2d372127d2
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
package-lock.json generated
View File

@ -24,7 +24,7 @@
"pinia": "^2.1.7", "pinia": "^2.1.7",
"prismjs": "^1.24.1", "prismjs": "^1.24.1",
"qrcode": "^1.5.1", "qrcode": "^1.5.1",
"query-builder-vue-3": "^1.0.0", "query-builder-vue-3": "^1.0.1",
"tinymotion": "^0.2.0", "tinymotion": "^0.2.0",
"vform": "^2.1.1", "vform": "^2.1.1",
"vue": "^3.2.13", "vue": "^3.2.13",
@ -10658,9 +10658,9 @@
} }
}, },
"node_modules/query-builder-vue-3": { "node_modules/query-builder-vue-3": {
"version": "1.0.0", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/query-builder-vue-3/-/query-builder-vue-3-1.0.0.tgz", "resolved": "https://registry.npmjs.org/query-builder-vue-3/-/query-builder-vue-3-1.0.1.tgz",
"integrity": "sha512-0Zzffeqp7tqUx1Ii4j2T/Ir/hAFv2LEpAXwvYA5bjF1QeWKxsKdXb3mE8Bd8p5M73zEU1HRal5mQmN+6oxrQMA==", "integrity": "sha512-fhEWsluNz8vRtrB8w2gjWeSmRkzn1KcOTv9ay6m6w3kX8yTdEUw0ZUv+0P04uhECoXQ+IZRfR4iUD1ffh3M/IQ==",
"dependencies": { "dependencies": {
"mitt": "^3.0.0", "mitt": "^3.0.0",
"sortablejs": "^1.14.0", "sortablejs": "^1.14.0",

5
package.json
View File

@ -2,7 +2,8 @@
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "vite", "dev": "vite",
"build": "vite build" "build": "vite build",
"preview": "vite preview"
}, },
"dependencies": { "dependencies": {
"@hcaptcha/vue3-hcaptcha": "^1.3.0", "@hcaptcha/vue3-hcaptcha": "^1.3.0",
@ -24,7 +25,7 @@
"pinia": "^2.1.7", "pinia": "^2.1.7",
"prismjs": "^1.24.1", "prismjs": "^1.24.1",
"qrcode": "^1.5.1", "qrcode": "^1.5.1",
"query-builder-vue-3": "^1.0.0", "query-builder-vue-3": "^1.0.1",
"tinymotion": "^0.2.0", "tinymotion": "^0.2.0",
"vform": "^2.1.1", "vform": "^2.1.1",
"vue": "^3.2.13", "vue": "^3.2.13",

4
resources/js/app.js vendored
View File

@ -28,7 +28,9 @@ configureCompat({
INSTANCE_SET: false, INSTANCE_SET: false,
INSTANCE_DELETE: false, INSTANCE_DELETE: false,
ATTR_FALSE_VALUE: false, ATTR_FALSE_VALUE: false,
WATCH_ARRAY: false WATCH_ARRAY: false,
RENDER_FUNCTION: false,
INSTANCE_ATTRS_CLASS_STYLE: false,
}) })
router.app = app router.app = app