From b2148c17a46962782075b3330d509c12c7d84ab2 Mon Sep 17 00:00:00 2001 From: Christian Wolf Date: Sat, 14 Jan 2023 15:36:47 +0100 Subject: [PATCH 1/4] Make Vue app compile again Signed-off-by: Christian Wolf --- appinfo/info.xml | 2 +- package-lock.json | 17 +++++++++++++++++ package.json | 1 + 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/appinfo/info.xml b/appinfo/info.xml index 73093fe6e..c55368d0a 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -20,7 +20,7 @@ https://raw.githubusercontent.com/nextcloud/cookbook/stable/img/screenshot2.png - + diff --git a/package-lock.json b/package-lock.json index cfb4ff39e..e94add4c1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -29,6 +29,7 @@ "vuex": "^3.1.3" }, "devDependencies": { + "@nextcloud/browserslist-config": "^2.3.0", "@nextcloud/stylelint-config": "^2.1.2", "@nextcloud/webpack-vue-config": "^5.3.0", "check-peer-dependencies": "^4.1.0", @@ -640,6 +641,16 @@ "url": "https://opencollective.com/core-js" } }, + "node_modules/@nextcloud/browserslist-config": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@nextcloud/browserslist-config/-/browserslist-config-2.3.0.tgz", + "integrity": "sha512-1Tpkof2e9Q0UicHWahQnXXrubJoqyiaqsH9G52v3cjGeVeH3BCfa1FOa41eBwBSFe2/Jxj/wCH2YVLgIXpWbBg==", + "dev": true, + "engines": { + "node": "^16.0.0", + "npm": "^7.0.0 || ^8.0.0" + } + }, "node_modules/@nextcloud/calendar-js": { "version": "5.0.3", "resolved": "https://registry.npmjs.org/@nextcloud/calendar-js/-/calendar-js-5.0.3.tgz", @@ -10786,6 +10797,12 @@ } } }, + "@nextcloud/browserslist-config": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@nextcloud/browserslist-config/-/browserslist-config-2.3.0.tgz", + "integrity": "sha512-1Tpkof2e9Q0UicHWahQnXXrubJoqyiaqsH9G52v3cjGeVeH3BCfa1FOa41eBwBSFe2/Jxj/wCH2YVLgIXpWbBg==", + "dev": true + }, "@nextcloud/calendar-js": { "version": "5.0.3", "resolved": "https://registry.npmjs.org/@nextcloud/calendar-js/-/calendar-js-5.0.3.tgz", diff --git a/package.json b/package.json index 146b17ccb..0508d0749 100644 --- a/package.json +++ b/package.json @@ -49,6 +49,7 @@ "vuex": "^3.1.3" }, "devDependencies": { + "@nextcloud/browserslist-config": "^2.3.0", "@nextcloud/stylelint-config": "^2.1.2", "@nextcloud/webpack-vue-config": "^5.3.0", "check-peer-dependencies": "^4.1.0", From 51225df9285a99f03147e40f46edb1432f50b348 Mon Sep 17 00:00:00 2001 From: Christian Wolf Date: Sat, 14 Jan 2023 16:05:23 +0100 Subject: [PATCH 2/4] Remove native event handling and use Vue events for input text Signed-off-by: Christian Wolf --- src/components/AppNavi.vue | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/components/AppNavi.vue b/src/components/AppNavi.vue index 37c09cce4..f73697b16 100644 --- a/src/components/AppNavi.vue +++ b/src/components/AppNavi.vue @@ -16,6 +16,7 @@ :disabled="downloading ? 'disabled' : null" :icon="downloading ? 'icon-loading-small' : 'icon-download'" @submit="downloadRecipe" + @update:value="updateUrl" > {{ t("cookbook", "Download recipe from URL") }} @@ -121,6 +122,7 @@ export default { isCategoryUpdating: [], loading: { categories: true }, uncatRecipes: 0, + importUrl: "", } }, computed: { @@ -232,14 +234,17 @@ export default { } }, + updateUrl(e) { + this.importUrl = e + }, /** * Download and import the recipe at given URL */ - async downloadRecipe(e) { + async downloadRecipe() { this.downloading = true const $this = this try { - const response = await api.recipes.import(e.target[1].value) + const response = await api.recipes.import(this.importUrl) const recipe = response.data $this.downloading = false helpers.goTo(`/recipe/${recipe.id}`) From c1b55a55fe83ba9545130ec571c8c42fa113ef83 Mon Sep 17 00:00:00 2001 From: Christian Wolf Date: Sat, 14 Jan 2023 16:13:51 +0100 Subject: [PATCH 3/4] Update changelog Signed-off-by: Christian Wolf --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7930e7f91..52b49ca66 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,12 +3,16 @@ ### Fixed - Make "None" category string translatable [#1323](https://github.com/nextcloud/cookbook/pull/1344) @seyfeb +- Import was no longer possible as the handling of native events caused a glitch + [#1442](https://github.com/nextcloud/cookbook/pull/1442) @christianlupus ### Maintenance - Update dependency for GitHub pages builder - Fix package.json sort order - Migrate the dev environment to [docker-dev by Julius Haertl](https://github.com/juliushaertl/nextcloud-docker-dev) [#1440](https://github.com/nextcloud/cookbook/pull/1440) @christianlupus +- Fix the build environment after regression + [#1442](https://github.com/nextcloud/cookbook/pull/1442) @christianlupus ## Documentation - Fixed some issues in the API description From 771f6f69fd1c2e5cfbfbce8c4dfa0337513011a5 Mon Sep 17 00:00:00 2001 From: Christian Wolf Date: Sat, 14 Jan 2023 16:15:01 +0100 Subject: [PATCH 4/4] Fix appinfo dist file Signed-off-by: Christian Wolf --- .github/actions/deploy/appinfo/info.xml.dist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/deploy/appinfo/info.xml.dist b/.github/actions/deploy/appinfo/info.xml.dist index 17ddf5ded..f6a4c23c7 100755 --- a/.github/actions/deploy/appinfo/info.xml.dist +++ b/.github/actions/deploy/appinfo/info.xml.dist @@ -20,7 +20,7 @@ https://raw.githubusercontent.com/nextcloud/cookbook/stable/img/screenshot2.png - +