From dc4ce79f8287372f41e8e3295dbf3115b40e3632 Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Tue, 15 Aug 2023 16:00:02 +0200 Subject: [PATCH 1/2] fix(stable4): Revert nextcloud-vue to version 7.12 to support Nextcloud 27 Signed-off-by: Ferdinand Thiessen --- l10n/messages.pot | 18 +++ lib/components/FilePicker/FileListRow.vue | 7 +- lib/components/FilePicker/NcDatetime.vue | 172 ++++++++++++++++++++++ package-lock.json | 42 ++++-- package.json | 2 +- 5 files changed, 226 insertions(+), 15 deletions(-) create mode 100644 lib/components/FilePicker/NcDatetime.vue diff --git a/l10n/messages.pot b/l10n/messages.pot index 0f139d75..c054a121 100644 --- a/l10n/messages.pot +++ b/l10n/messages.pot @@ -14,6 +14,10 @@ msgstr "" msgid "\"/\" is not allowed inside a file name." msgstr "" +#: lib/components/FilePicker/NcDatetime.vue:34 +msgid "a few seconds ago" +msgstr "" + #: lib/components/FilePicker/FilePickerNavigation.vue:57 msgid "All files" msgstr "" @@ -56,6 +60,16 @@ msgstr "" msgid "Recent" msgstr "" +#. FOR TRANSLATORS: If possible in your language an even shorter version of 'a few seconds ago' +#: lib/components/FilePicker/NcDatetime.vue:36 +msgid "sec. ago" +msgstr "" + +#. FOR TRANSLATORS: Shorter version of 'a few seconds ago' +#: lib/components/FilePicker/NcDatetime.vue:35 +msgid "seconds ago" +msgstr "" + #: lib/components/FilePicker/FileList.vue:8 msgid "Select entry" msgstr "" @@ -67,3 +81,7 @@ msgstr "" #: lib/toast.ts:228 msgid "Undo" msgstr "" + +#: lib/components/FilePicker/FileListRow.vue:22 +msgid "Unset" +msgstr "" diff --git a/lib/components/FilePicker/FileListRow.vue b/lib/components/FilePicker/FileListRow.vue index 6757bf1d..1613c2e2 100644 --- a/lib/components/FilePicker/FileListRow.vue +++ b/lib/components/FilePicker/FileListRow.vue @@ -18,16 +18,19 @@ {{ formatFileSize(node.size || 0) }} - + + {{ t('Unset') }} diff --git a/package-lock.json b/package-lock.json index dacee112..9841e9c1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "@nextcloud/l10n": "^2.2.0", "@nextcloud/router": "^2.1.2", "@nextcloud/typings": "^1.7.0", - "@nextcloud/vue": "^8.0.0-beta.2", + "@nextcloud/vue": "^7.12.2", "@types/toastify-js": "^1.12.0", "@vueuse/core": "^10.3.0", "toastify-js": "^1.12.0", @@ -3130,9 +3130,9 @@ } }, "node_modules/@nextcloud/vue": { - "version": "8.0.0-beta.2", - "resolved": "https://registry.npmjs.org/@nextcloud/vue/-/vue-8.0.0-beta.2.tgz", - "integrity": "sha512-6nIQiX1Om2Lpx4Q7S0NuADZdmMG9D2O0KBoWoOUaa0RKT4KOoFLYgM1wuLNprwWyayLkBUHY7yszxeShMxREgw==", + "version": "7.12.2", + "resolved": "https://registry.npmjs.org/@nextcloud/vue/-/vue-7.12.2.tgz", + "integrity": "sha512-AjXm/I4b1W4vtSVtZpVu4VD047IpVTgPnMP7kSKQF42XvFvP1l0pyFgd/ewPKYtm+dA/rTHsh5fg3I9xsxg79A==", "dependencies": { "@floating-ui/dom": "^1.1.0", "@nextcloud/auth": "^2.0.0", @@ -3146,16 +3146,16 @@ "@nextcloud/l10n": "^2.0.1", "@nextcloud/logger": "^2.2.1", "@nextcloud/router": "^2.0.0", - "@nextcloud/vue-select": "^3.23.0", + "@nextcloud/vue-select": "^3.21.2", "@skjnldsv/sanitize-svg": "^1.0.2", "@vueuse/components": "^10.0.2", - "@vueuse/core": "^10.1.2", "clone": "^2.1.2", "debounce": "1.2.1", - "emoji-mart-vue-fast": "^15.0.0", + "emoji-mart-vue-fast": "^12.0.1", "escape-html": "^1.0.3", "floating-vue": "^1.0.0-beta.19", "focus-trap": "^7.4.3", + "hammerjs": "^2.0.8", "linkify-string": "^4.0.0", "md5": "^2.3.0", "node-polyfill-webpack-plugin": "^2.0.1", @@ -3174,11 +3174,12 @@ "vue": "^2.7.14", "vue-color": "^2.8.1", "vue-material-design-icons": "^5.1.2", + "vue-multiselect": "^2.1.6", "vue2-datepicker": "^3.11.0" }, "engines": { - "node": "^20.0.0", - "npm": "^9.0.0" + "node": "^16.0.0", + "npm": "^7.0.0 || ^8.0.0" } }, "node_modules/@nextcloud/vue-select": { @@ -6197,9 +6198,9 @@ } }, "node_modules/emoji-mart-vue-fast": { - "version": "15.0.0", - "resolved": "https://registry.npmjs.org/emoji-mart-vue-fast/-/emoji-mart-vue-fast-15.0.0.tgz", - "integrity": "sha512-3BzkDrs60JyT00dLHMAxWKbpFhbyaW9C+q1AjtqGovSxTu8TC2mYAGsvTmXNYKm39IRRAS56v92TihOcB98IsQ==", + "version": "12.0.5", + "resolved": "https://registry.npmjs.org/emoji-mart-vue-fast/-/emoji-mart-vue-fast-12.0.5.tgz", + "integrity": "sha512-XFNwIk+ConSAjC4tmk//s6btlo3oQco7TBgP914Qytg/15jLa/0VrWNg271W2MTv+8N8BxYl2dDn3cZJxcreqw==", "dependencies": { "@babel/runtime": "^7.18.6", "core-js": "^3.23.5" @@ -7873,6 +7874,14 @@ "dev": true, "peer": true }, + "node_modules/hammerjs": { + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz", + "integrity": "sha512-tSQXBXS/MWQOn/RKckawJ61vvsDpCom87JgxiYdGwHdOa0ht0vzUWDlfioofFCRU0L+6NGDt6XzbgoJvZkMeRQ==", + "engines": { + "node": ">=0.8.0" + } + }, "node_modules/has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", @@ -14286,6 +14295,15 @@ "resolved": "https://registry.npmjs.org/vue-material-design-icons/-/vue-material-design-icons-5.2.0.tgz", "integrity": "sha512-fcdcJHQ9fQw2CAytuLAzWSELcxH138sCdMItVhvmO7Lu9afIgojB/UCWv7XHt/lURsnq/n6O+muM4AQgw8yfig==" }, + "node_modules/vue-multiselect": { + "version": "2.1.7", + "resolved": "https://registry.npmjs.org/vue-multiselect/-/vue-multiselect-2.1.7.tgz", + "integrity": "sha512-KIegcN+Ntwg3cbkY/jhw2s/+XJUM0Lpi/LcKFYCS8PrZHcWBl2iKCVze7ZCnRj3w8H7/lUJ9v7rj9KQiNxApBw==", + "engines": { + "node": ">= 4.0.0", + "npm": ">= 3.0.0" + } + }, "node_modules/vue-resize": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/vue-resize/-/vue-resize-1.0.1.tgz", diff --git a/package.json b/package.json index 8bf9b42f..07daf7a9 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "@nextcloud/l10n": "^2.2.0", "@nextcloud/router": "^2.1.2", "@nextcloud/typings": "^1.7.0", - "@nextcloud/vue": "^8.0.0-beta.2", + "@nextcloud/vue": "^7.12.2", "@types/toastify-js": "^1.12.0", "@vueuse/core": "^10.3.0", "toastify-js": "^1.12.0", From 3bacd72da1d6261f1f1b33869cd20bfa3be51600 Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Tue, 15 Aug 2023 16:14:07 +0200 Subject: [PATCH 2/2] docs(README): Add version compatibility section Signed-off-by: Ferdinand Thiessen --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index f000f181..e25fddad 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,11 @@ Nextcloud dialog helpers npm i -S @nextcloud/dialogs ``` +### Version compatibility +Since version 4.2 this package provides a Vue.js based file picker, so this package depends on `@nextcloud/vue`. So to not introduce style collisions version 4 of this library is only compatible with `@nextcloud/vue` version 7 (used by Nextcloud version 25, 26 and 27). + +For `nextcloud/vue` version 8 (Nextcloud 28+) see version 5 of this package. + ## Usage ### Toasts