From 8f7712011faada8dfcbdb45170e3e8d2f92dc137 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Wed, 26 Apr 2023 16:31:14 +0200 Subject: [PATCH 1/3] chore: Bump nextcloud-vue-collections MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- package-lock.json | 130 +++++++++++++++++++++------------------------- package.json | 2 +- 2 files changed, 60 insertions(+), 72 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1959e0262..8c614c16c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30,7 +30,7 @@ "markdown-it-link-attributes": "^4.0.1", "markdown-it-task-checkbox": "^1.0.6", "moment": "^2.29.4", - "nextcloud-vue-collections": "^0.11.0", + "nextcloud-vue-collections": "^0.11.1", "p-queue": "^7.3.4", "url-search-params-polyfill": "^8.1.1", "vue": "^2.7.14", @@ -2954,19 +2954,6 @@ "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", - "integrity": "sha512-x6xvQKmuaO/Z/S6uK6qxGAJSaPOAM7DUhe+sJ1QEQAgUx9WIhaJOU+zYw2vdn8hiQ9R4gxfp/bgb6B0I+QBZvw==", - "engines": { - "node": ">=16.0.0", - "npm": ">=8.0.0" - }, - "peerDependencies": { - "ical.js": "^1.5.0", - "uuid": "^8.3.2" - } - }, "node_modules/@nextcloud/capabilities": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/@nextcloud/capabilities/-/capabilities-1.0.4.tgz", @@ -3442,15 +3429,15 @@ } }, "node_modules/@nextcloud/vue": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@nextcloud/vue/-/vue-7.8.4.tgz", - "integrity": "sha512-rUdLwB/9aPtBNgo6H0dDVCEaFctbePp6NwH/uPJ10h67pzra+KcUqVvVEvaXxTwFTVf36K/WrGQAGY+0fV+bdg==", + "version": "7.10.0", + "resolved": "https://registry.npmjs.org/@nextcloud/vue/-/vue-7.10.0.tgz", + "integrity": "sha512-RYh3luZgyXftewE97fVhI779l7FFWqKSa8OCa7xdNnKtOoS9o6AxFG6yOI9IWkifA3F9WYalRBJle6lffaMi/g==", "dependencies": { "@floating-ui/dom": "^1.1.0", "@nextcloud/auth": "^2.0.0", "@nextcloud/axios": "^2.0.0", "@nextcloud/browser-storage": "^0.2.0", - "@nextcloud/calendar-js": "^5.0.3", + "@nextcloud/calendar-js": "^6.0.0", "@nextcloud/capabilities": "^1.0.4", "@nextcloud/dialogs": "^4.0.0", "@nextcloud/event-bus": "^3.0.0", @@ -3545,6 +3532,19 @@ "npm": "^7.0.0 || ^8.0.0" } }, + "node_modules/@nextcloud/vue/node_modules/@nextcloud/calendar-js": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/@nextcloud/calendar-js/-/calendar-js-6.0.0.tgz", + "integrity": "sha512-kZBRFIG8J3TNU6K92iEpNzBa3r9JbpCr1MZFJHqVy/5+xTtQG9FqsHhqUWptPwLEBhUNMwN+oCCa7QJAnBKKyg==", + "engines": { + "node": ">=16.0.0", + "npm": ">=8.0.0" + }, + "peerDependencies": { + "ical.js": "^1.5.0", + "uuid": "^9.0.0" + } + }, "node_modules/@nextcloud/vue/node_modules/ansi-regex": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", @@ -3629,6 +3629,15 @@ "url": "https://github.com/chalk/strip-ansi?sponsor=1" } }, + "node_modules/@nextcloud/vue/node_modules/uuid": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz", + "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==", + "peer": true, + "bin": { + "uuid": "dist/bin/uuid" + } + }, "node_modules/@nextcloud/webpack-vue-config": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/@nextcloud/webpack-vue-config/-/webpack-vue-config-5.5.0.tgz", @@ -13005,21 +13014,6 @@ "node": ">=6.11.5" } }, - "node_modules/loader-utils": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", - "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", - "dev": true, - "peer": true, - "dependencies": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - }, - "engines": { - "node": ">=8.9.0" - } - }, "node_modules/locate-path": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", @@ -14397,22 +14391,21 @@ "peer": true }, "node_modules/nextcloud-vue-collections": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/nextcloud-vue-collections/-/nextcloud-vue-collections-0.11.0.tgz", - "integrity": "sha512-sVeJzwVF7z/71n6TVk3RY+OewvF7gRRexYQ9ZRURbRUK9NIwByFNM7Y2S+U2LJFBsjM58twUhxwll9yWxYqdeA==", + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/nextcloud-vue-collections/-/nextcloud-vue-collections-0.11.1.tgz", + "integrity": "sha512-2t4a4mWvjTq+5Kly80pUzq7qpEZz6GHv3bI/yIxhC2K7Y0Rx5XqMSkhxeDuHPsR8KlmIeaPNOyYLMGfO7mgHQA==", "dependencies": { "@nextcloud/axios": "^2.3.0", - "@nextcloud/router": "^2.0.1", - "@nextcloud/vue": "^7.5.0", - "lodash-es": "^4.17.21", - "vue": "^2.7.14" + "@nextcloud/router": "^2.1.1", + "@nextcloud/vue": "^7.10.0", + "lodash-es": "^4.17.21" }, "engines": { "node": "^16.0.0", "npm": "^8.0.0" }, "peerDependencies": { - "@nextcloud/vue": "^7.5.0" + "vue": "^2.7.14" } }, "node_modules/node-fetch": { @@ -17938,6 +17931,7 @@ "version": "8.3.2", "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", + "dev": true, "bin": { "uuid": "dist/bin/uuid" } @@ -21146,12 +21140,6 @@ "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", - "integrity": "sha512-x6xvQKmuaO/Z/S6uK6qxGAJSaPOAM7DUhe+sJ1QEQAgUx9WIhaJOU+zYw2vdn8hiQ9R4gxfp/bgb6B0I+QBZvw==", - "requires": {} - }, "@nextcloud/capabilities": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/@nextcloud/capabilities/-/capabilities-1.0.4.tgz", @@ -21509,15 +21497,15 @@ } }, "@nextcloud/vue": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@nextcloud/vue/-/vue-7.8.4.tgz", - "integrity": "sha512-rUdLwB/9aPtBNgo6H0dDVCEaFctbePp6NwH/uPJ10h67pzra+KcUqVvVEvaXxTwFTVf36K/WrGQAGY+0fV+bdg==", + "version": "7.10.0", + "resolved": "https://registry.npmjs.org/@nextcloud/vue/-/vue-7.10.0.tgz", + "integrity": "sha512-RYh3luZgyXftewE97fVhI779l7FFWqKSa8OCa7xdNnKtOoS9o6AxFG6yOI9IWkifA3F9WYalRBJle6lffaMi/g==", "requires": { "@floating-ui/dom": "^1.1.0", "@nextcloud/auth": "^2.0.0", "@nextcloud/axios": "^2.0.0", "@nextcloud/browser-storage": "^0.2.0", - "@nextcloud/calendar-js": "^5.0.3", + "@nextcloud/calendar-js": "^6.0.0", "@nextcloud/capabilities": "^1.0.4", "@nextcloud/dialogs": "^4.0.0", "@nextcloud/event-bus": "^3.0.0", @@ -21578,6 +21566,12 @@ "core-js": "3.25.5" } }, + "@nextcloud/calendar-js": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/@nextcloud/calendar-js/-/calendar-js-6.0.0.tgz", + "integrity": "sha512-kZBRFIG8J3TNU6K92iEpNzBa3r9JbpCr1MZFJHqVy/5+xTtQG9FqsHhqUWptPwLEBhUNMwN+oCCa7QJAnBKKyg==", + "requires": {} + }, "ansi-regex": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", @@ -21630,6 +21624,12 @@ "requires": { "ansi-regex": "^6.0.1" } + }, + "uuid": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz", + "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==", + "peer": true } } }, @@ -28588,18 +28588,6 @@ "version": "4.2.0", "peer": true }, - "loader-utils": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", - "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", - "dev": true, - "peer": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - } - }, "locate-path": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", @@ -29513,15 +29501,14 @@ "peer": true }, "nextcloud-vue-collections": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/nextcloud-vue-collections/-/nextcloud-vue-collections-0.11.0.tgz", - "integrity": "sha512-sVeJzwVF7z/71n6TVk3RY+OewvF7gRRexYQ9ZRURbRUK9NIwByFNM7Y2S+U2LJFBsjM58twUhxwll9yWxYqdeA==", + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/nextcloud-vue-collections/-/nextcloud-vue-collections-0.11.1.tgz", + "integrity": "sha512-2t4a4mWvjTq+5Kly80pUzq7qpEZz6GHv3bI/yIxhC2K7Y0Rx5XqMSkhxeDuHPsR8KlmIeaPNOyYLMGfO7mgHQA==", "requires": { "@nextcloud/axios": "^2.3.0", - "@nextcloud/router": "^2.0.1", - "@nextcloud/vue": "^7.5.0", - "lodash-es": "^4.17.21", - "vue": "^2.7.14" + "@nextcloud/router": "^2.1.1", + "@nextcloud/vue": "^7.10.0", + "lodash-es": "^4.17.21" } }, "node-fetch": { @@ -32092,7 +32079,8 @@ "uuid": { "version": "8.3.2", "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", - "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==" + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", + "dev": true }, "uvu": { "version": "0.5.6", diff --git a/package.json b/package.json index b44f02c9a..c81eccc4f 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "markdown-it-link-attributes": "^4.0.1", "markdown-it-task-checkbox": "^1.0.6", "moment": "^2.29.4", - "nextcloud-vue-collections": "^0.11.0", + "nextcloud-vue-collections": "^0.11.1", "p-queue": "^7.3.4", "url-search-params-polyfill": "^8.1.1", "vue": "^2.7.14", From df0db786be9b58b22369c3e2fc8316c10f8ac7aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Wed, 26 Apr 2023 16:41:05 +0200 Subject: [PATCH 2/3] chore: Bump @nextcloud/vue @nextcloud/webpack-vue-config and remove @nextcloud/vue-richtext MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- package-lock.json | 46 ++++--------------- package.json | 5 +- src/components/ActivityEntry.vue | 7 ++- src/components/card/CommentItem.vue | 9 ++-- src/components/search/GlobalSearchResults.vue | 7 ++- src/init-reference.js | 2 +- src/views/CardReferenceWidget.vue | 6 +-- src/views/CommentReferenceWidget.vue | 8 ++-- 8 files changed, 28 insertions(+), 62 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8c614c16c..d81c83dac 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,8 +21,7 @@ "@nextcloud/moment": "^1.2.1", "@nextcloud/notify_push": "^1.1.3", "@nextcloud/router": "^2.1.1", - "@nextcloud/vue": "^7.8.4", - "@nextcloud/vue-richtext": "^2.0.4", + "@nextcloud/vue": "^7.10.0", "blueimp-md5": "^2.19.0", "dompurify": "^3.0.2", "lodash": "^4.17.21", @@ -50,7 +49,7 @@ "@nextcloud/cypress": "^1.0.0-beta.2", "@nextcloud/eslint-config": "^8.2.1", "@nextcloud/stylelint-config": "^2.3.0", - "@nextcloud/webpack-vue-config": "^5.5.0", + "@nextcloud/webpack-vue-config": "^5.5.1", "@relative-ci/agent": "^4.1.4", "@vue/test-utils": "^1.3.5", "@vue/vue2-jest": "^29.2.3", @@ -3481,24 +3480,6 @@ "npm": "^7.0.0 || ^8.0.0" } }, - "node_modules/@nextcloud/vue-richtext": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@nextcloud/vue-richtext/-/vue-richtext-2.0.4.tgz", - "integrity": "sha512-+873AF/G8OPVz2lwajpGVRfJ1v492CeiBTrguOkOwSGReNukGyHryCucF6rZGiMFenVIpp8BjNkqjHwkh6Cs4A==", - "dependencies": { - "@nextcloud/axios": "^2.0.0", - "@nextcloud/router": "^2.0.0", - "clone": "^2.1.2", - "vue": "^2.7.8" - }, - "engines": { - "node": ">=14.0.0", - "npm": ">=7.0.0" - }, - "peerDependencies": { - "vue": "^2.7.8" - } - }, "node_modules/@nextcloud/vue-select": { "version": "3.22.2", "resolved": "https://registry.npmjs.org/@nextcloud/vue-select/-/vue-select-3.22.2.tgz", @@ -3639,9 +3620,9 @@ } }, "node_modules/@nextcloud/webpack-vue-config": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/@nextcloud/webpack-vue-config/-/webpack-vue-config-5.5.0.tgz", - "integrity": "sha512-bKlGYEqblSiSHNmpaGM9fz/f9v6JNwHp63V63yaI26gE0Zs+DpZSzJWC6HWWbJ1BgmoKT7wLN1GJc4W/NxvnxQ==", + "version": "5.5.1", + "resolved": "https://registry.npmjs.org/@nextcloud/webpack-vue-config/-/webpack-vue-config-5.5.1.tgz", + "integrity": "sha512-2Q3kPnsvkKeENG3rruTjAE1oz/9w0u5QMKO8oh9arL2TIO2aswkDKBtkmu6q7Po3tE+3B2f+ggHq1PNkhtwu6w==", "dev": true, "engines": { "node": "^16.0.0", @@ -21633,17 +21614,6 @@ } } }, - "@nextcloud/vue-richtext": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@nextcloud/vue-richtext/-/vue-richtext-2.0.4.tgz", - "integrity": "sha512-+873AF/G8OPVz2lwajpGVRfJ1v492CeiBTrguOkOwSGReNukGyHryCucF6rZGiMFenVIpp8BjNkqjHwkh6Cs4A==", - "requires": { - "@nextcloud/axios": "^2.0.0", - "@nextcloud/router": "^2.0.0", - "clone": "^2.1.2", - "vue": "^2.7.8" - } - }, "@nextcloud/vue-select": { "version": "3.22.2", "resolved": "https://registry.npmjs.org/@nextcloud/vue-select/-/vue-select-3.22.2.tgz", @@ -21651,9 +21621,9 @@ "requires": {} }, "@nextcloud/webpack-vue-config": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/@nextcloud/webpack-vue-config/-/webpack-vue-config-5.5.0.tgz", - "integrity": "sha512-bKlGYEqblSiSHNmpaGM9fz/f9v6JNwHp63V63yaI26gE0Zs+DpZSzJWC6HWWbJ1BgmoKT7wLN1GJc4W/NxvnxQ==", + "version": "5.5.1", + "resolved": "https://registry.npmjs.org/@nextcloud/webpack-vue-config/-/webpack-vue-config-5.5.1.tgz", + "integrity": "sha512-2Q3kPnsvkKeENG3rruTjAE1oz/9w0u5QMKO8oh9arL2TIO2aswkDKBtkmu6q7Po3tE+3B2f+ggHq1PNkhtwu6w==", "dev": true, "requires": {} }, diff --git a/package.json b/package.json index c81eccc4f..36ca5a278 100644 --- a/package.json +++ b/package.json @@ -41,8 +41,7 @@ "@nextcloud/moment": "^1.2.1", "@nextcloud/notify_push": "^1.1.3", "@nextcloud/router": "^2.1.1", - "@nextcloud/vue": "^7.8.4", - "@nextcloud/vue-richtext": "^2.0.4", + "@nextcloud/vue": "^7.10.0", "blueimp-md5": "^2.19.0", "dompurify": "^3.0.2", "lodash": "^4.17.21", @@ -77,7 +76,7 @@ "@nextcloud/cypress": "^1.0.0-beta.2", "@nextcloud/eslint-config": "^8.2.1", "@nextcloud/stylelint-config": "^2.3.0", - "@nextcloud/webpack-vue-config": "^5.5.0", + "@nextcloud/webpack-vue-config": "^5.5.1", "@relative-ci/agent": "^4.1.4", "@vue/test-utils": "^1.3.5", "@vue/vue2-jest": "^29.2.3", diff --git a/src/components/ActivityEntry.vue b/src/components/ActivityEntry.vue index 0b65d2de4..211ffb208 100644 --- a/src/components/ActivityEntry.vue +++ b/src/components/ActivityEntry.vue @@ -24,7 +24,7 @@
- +
{{ relativeDate(activity.datetime) }}
@@ -35,8 +35,7 @@