From 1a894b3faf4bf3f2f9b9b9adc30a6cb7ee652901 Mon Sep 17 00:00:00 2001 From: w3bdesign <45217974+w3bdesign@users.noreply.github.com> Date: Sat, 10 Jun 2023 00:16:12 +0200 Subject: [PATCH 1/4] Remove vue 3 overrides --- package.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package.json b/package.json index c4e15b5a..46dba283 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,11 @@ "tailwindcss": "^3.3.2" }, "overrides": { +<<<<<<< Updated upstream "vue": "^3.3.4" +======= + "tslib": "2.5.1" +>>>>>>> Stashed changes }, "dependencies": { "@formkit/nuxt": "^1.0.0-220222.4d97af0", From 830c0094bb515b38bc416067566bd33ebba4fe82 Mon Sep 17 00:00:00 2001 From: w3bdesign <45217974+w3bdesign@users.noreply.github.com> Date: Sat, 10 Jun 2023 00:16:50 +0200 Subject: [PATCH 2/4] Remove vue 3 overrides --- package.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/package.json b/package.json index cc251726..f96a5820 100644 --- a/package.json +++ b/package.json @@ -21,9 +21,7 @@ "tailwindcss": "^3.3.2" }, "overrides": { - "vue": "^3.3.4", "tslib": "2.5.1" - }, "dependencies": { "@formkit/nuxt": "^1.0.0-220222.4d97af0", From 60453031ece4044773fbd1df300c7c00a94a1109 Mon Sep 17 00:00:00 2001 From: w3bdesign <45217974+w3bdesign@users.noreply.github.com> Date: Sat, 10 Jun 2023 00:20:01 +0200 Subject: [PATCH 3/4] Npm i --- package-lock.json | 102 +++++++++++++++++++++++----------------------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/package-lock.json b/package-lock.json index 174934fb..b86ee24f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1914,6 +1914,54 @@ "node": "^14.18.0 || >=16.10.0" } }, + "node_modules/@nuxtjs/apollo/node_modules/@vue/apollo-composable": { + "version": "4.0.0-beta.4", + "resolved": "https://registry.npmjs.org/@vue/apollo-composable/-/apollo-composable-4.0.0-beta.4.tgz", + "integrity": "sha512-lErWL+9LGfWfdfrSYY3DQB/A8Asqs46MiKwmgKeKSj7fe01tx0UpH43aiwMGj+VgEzBZ9AfqEa/Bxf0Nff/NNw==", + "dev": true, + "dependencies": { + "throttle-debounce": "^3.0.1", + "ts-essentials": "^9.1.2", + "vue-demi": "^0.13.1" + }, + "peerDependencies": { + "@apollo/client": "^3.4.13", + "@vue/composition-api": "^1.0.0", + "graphql": ">=15", + "vue": "^2.6.0 || ^3.1.0" + }, + "peerDependenciesMeta": { + "@vue/composition-api": { + "optional": true + } + } + }, + "node_modules/@nuxtjs/apollo/node_modules/vue-demi": { + "version": "0.13.11", + "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.13.11.tgz", + "integrity": "sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==", + "dev": true, + "hasInstallScript": true, + "bin": { + "vue-demi-fix": "bin/vue-demi-fix.js", + "vue-demi-switch": "bin/vue-demi-switch.js" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/antfu" + }, + "peerDependencies": { + "@vue/composition-api": "^1.0.0-rc.1", + "vue": "^3.0.0-0 || ^2.6.0" + }, + "peerDependenciesMeta": { + "@vue/composition-api": { + "optional": true + } + } + }, "node_modules/@pinia-plugin-persistedstate/nuxt": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/@pinia-plugin-persistedstate/nuxt/-/nuxt-1.1.1.tgz", @@ -2598,28 +2646,6 @@ } } }, - "node_modules/@vue/apollo-composable": { - "version": "4.0.0-beta.4", - "resolved": "https://registry.npmjs.org/@vue/apollo-composable/-/apollo-composable-4.0.0-beta.4.tgz", - "integrity": "sha512-lErWL+9LGfWfdfrSYY3DQB/A8Asqs46MiKwmgKeKSj7fe01tx0UpH43aiwMGj+VgEzBZ9AfqEa/Bxf0Nff/NNw==", - "dev": true, - "dependencies": { - "throttle-debounce": "^3.0.1", - "ts-essentials": "^9.1.2", - "vue-demi": "^0.13.1" - }, - "peerDependencies": { - "@apollo/client": "^3.4.13", - "@vue/composition-api": "^1.0.0", - "graphql": ">=15", - "vue": "^2.6.0 || ^3.1.0" - }, - "peerDependenciesMeta": { - "@vue/composition-api": { - "optional": true - } - } - }, "node_modules/@vue/babel-helper-vue-transform-on": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/@vue/babel-helper-vue-transform-on/-/babel-helper-vue-transform-on-1.0.2.tgz", @@ -4311,9 +4337,9 @@ "dev": true }, "node_modules/electron-to-chromium": { - "version": "1.4.426", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.426.tgz", - "integrity": "sha512-dWuNH+XUT9hdFHASfMpcZGW5kUyJvllumJkXaXiswuCkoaFIFI89aykBPuHEi1YUWQGRCqvIO0BUdmeFJ4W4Ww==" + "version": "1.4.427", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.427.tgz", + "integrity": "sha512-HK3r9l+Jm8dYAm1ctXEWIC+hV60zfcjS9UA5BDlYvnI5S7PU/yytjpvSrTNrSSRRkuu3tDyZhdkwIczh+0DWaw==" }, "node_modules/emoji-regex": { "version": "8.0.0", @@ -9874,32 +9900,6 @@ "ufo": "^1.1.1" } }, - "node_modules/vue-demi": { - "version": "0.13.11", - "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.13.11.tgz", - "integrity": "sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==", - "dev": true, - "hasInstallScript": true, - "bin": { - "vue-demi-fix": "bin/vue-demi-fix.js", - "vue-demi-switch": "bin/vue-demi-switch.js" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/antfu" - }, - "peerDependencies": { - "@vue/composition-api": "^1.0.0-rc.1", - "vue": "^3.0.0-0 || ^2.6.0" - }, - "peerDependenciesMeta": { - "@vue/composition-api": { - "optional": true - } - } - }, "node_modules/vue-devtools-stub": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/vue-devtools-stub/-/vue-devtools-stub-0.1.0.tgz", From 48d316140475e20b9a2fa2d2e30673dace83f7a1 Mon Sep 17 00:00:00 2001 From: w3bdesign <45217974+w3bdesign@users.noreply.github.com> Date: Sat, 10 Jun 2023 00:25:42 +0200 Subject: [PATCH 4/4] Npm i --- package-lock.json | 96 +++++++++++++++++++++++------------------------ package.json | 2 + 2 files changed, 50 insertions(+), 48 deletions(-) diff --git a/package-lock.json b/package-lock.json index b86ee24f..c0185ec0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1914,54 +1914,6 @@ "node": "^14.18.0 || >=16.10.0" } }, - "node_modules/@nuxtjs/apollo/node_modules/@vue/apollo-composable": { - "version": "4.0.0-beta.4", - "resolved": "https://registry.npmjs.org/@vue/apollo-composable/-/apollo-composable-4.0.0-beta.4.tgz", - "integrity": "sha512-lErWL+9LGfWfdfrSYY3DQB/A8Asqs46MiKwmgKeKSj7fe01tx0UpH43aiwMGj+VgEzBZ9AfqEa/Bxf0Nff/NNw==", - "dev": true, - "dependencies": { - "throttle-debounce": "^3.0.1", - "ts-essentials": "^9.1.2", - "vue-demi": "^0.13.1" - }, - "peerDependencies": { - "@apollo/client": "^3.4.13", - "@vue/composition-api": "^1.0.0", - "graphql": ">=15", - "vue": "^2.6.0 || ^3.1.0" - }, - "peerDependenciesMeta": { - "@vue/composition-api": { - "optional": true - } - } - }, - "node_modules/@nuxtjs/apollo/node_modules/vue-demi": { - "version": "0.13.11", - "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.13.11.tgz", - "integrity": "sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==", - "dev": true, - "hasInstallScript": true, - "bin": { - "vue-demi-fix": "bin/vue-demi-fix.js", - "vue-demi-switch": "bin/vue-demi-switch.js" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/antfu" - }, - "peerDependencies": { - "@vue/composition-api": "^1.0.0-rc.1", - "vue": "^3.0.0-0 || ^2.6.0" - }, - "peerDependenciesMeta": { - "@vue/composition-api": { - "optional": true - } - } - }, "node_modules/@pinia-plugin-persistedstate/nuxt": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/@pinia-plugin-persistedstate/nuxt/-/nuxt-1.1.1.tgz", @@ -2646,6 +2598,28 @@ } } }, + "node_modules/@vue/apollo-composable": { + "version": "4.0.0-beta.4", + "resolved": "https://registry.npmjs.org/@vue/apollo-composable/-/apollo-composable-4.0.0-beta.4.tgz", + "integrity": "sha512-lErWL+9LGfWfdfrSYY3DQB/A8Asqs46MiKwmgKeKSj7fe01tx0UpH43aiwMGj+VgEzBZ9AfqEa/Bxf0Nff/NNw==", + "dev": true, + "dependencies": { + "throttle-debounce": "^3.0.1", + "ts-essentials": "^9.1.2", + "vue-demi": "^0.13.1" + }, + "peerDependencies": { + "@apollo/client": "^3.4.13", + "@vue/composition-api": "^1.0.0", + "graphql": ">=15", + "vue": "^2.6.0 || ^3.1.0" + }, + "peerDependenciesMeta": { + "@vue/composition-api": { + "optional": true + } + } + }, "node_modules/@vue/babel-helper-vue-transform-on": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/@vue/babel-helper-vue-transform-on/-/babel-helper-vue-transform-on-1.0.2.tgz", @@ -9900,6 +9874,32 @@ "ufo": "^1.1.1" } }, + "node_modules/vue-demi": { + "version": "0.13.11", + "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.13.11.tgz", + "integrity": "sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==", + "dev": true, + "hasInstallScript": true, + "bin": { + "vue-demi-fix": "bin/vue-demi-fix.js", + "vue-demi-switch": "bin/vue-demi-switch.js" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/antfu" + }, + "peerDependencies": { + "@vue/composition-api": "^1.0.0-rc.1", + "vue": "^3.0.0-0 || ^2.6.0" + }, + "peerDependenciesMeta": { + "@vue/composition-api": { + "optional": true + } + } + }, "node_modules/vue-devtools-stub": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/vue-devtools-stub/-/vue-devtools-stub-0.1.0.tgz", diff --git a/package.json b/package.json index f96a5820..cc251726 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,9 @@ "tailwindcss": "^3.3.2" }, "overrides": { + "vue": "^3.3.4", "tslib": "2.5.1" + }, "dependencies": { "@formkit/nuxt": "^1.0.0-220222.4d97af0",