From bb7105060543af9468e322c92183ad48720c46a1 Mon Sep 17 00:00:00 2001 From: Vincent Massol Date: Thu, 4 Jan 2024 13:35:19 +0100 Subject: [PATCH 01/11] XWIKI-21753: NPE when exporting to HTML and the attachment cannot be found * Better fix (no exception should be logged in the console) --- .../java/com/xpn/xwiki/web/ExportURLFactory.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/web/ExportURLFactory.java b/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/web/ExportURLFactory.java index cc49daced4aa..b1c462359d7e 100644 --- a/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/web/ExportURLFactory.java +++ b/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/web/ExportURLFactory.java @@ -530,16 +530,18 @@ private URL createAttachmentURL(String filename, String spaces, String name, Str if (!file.exists()) { XWikiDocument doc = context.getWiki().getDocument(documentReference, context); XWikiAttachment attachment = doc.getAttachment(filename); + // If the attachment doesn't exist, then don't perform any action. It usually means that the + // createAttachmentURL() was called to get a URL, independently of whether it exists or not. + // This is the case for example in the Color Theme Sheet which uses: + // $xwiki.getAttachmentURL($doc.fullName, '__tochange__') + // This clearly doesn't point to an existing attachment. + // In addition, it's possible that there's a link to a non-existing attachment and in this case we simply + // don't need to do anything (it'll lead to a broken link which is the correct outcome). if (attachment != null) { file.getParentFile().mkdirs(); try (InputStream stream = attachment.getContentInputStream(context)) { FileUtils.copyInputStreamToFile(stream, file); } - } else { - Object[] args = {filename, documentReference}; - throw new XWikiException(XWikiException.MODULE_XWIKI_APP, - XWikiException.ERROR_XWIKI_APP_ATTACHMENT_NOT_FOUND, - "Attachment [{0}] not found for document [{1}]", null, args); } } From c0d5c0038e457e1054cf568376d5f8e3675502b6 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 4 Jan 2024 12:14:04 +0000 Subject: [PATCH 02/11] XWIKI-21755: Upgrade to dompurify 3.0.7 --- .../src/main/config/package-lock.json | 8 ++++---- .../src/main/config/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package-lock.json b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package-lock.json index 16df48a3a958..dce91a84d662 100644 --- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package-lock.json +++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package-lock.json @@ -8,7 +8,7 @@ "name": "xwiki-livedata-vue", "version": "1.0.0", "dependencies": { - "dompurify": "3.0.6", + "dompurify": "3.0.7", "lz-string": "1.5.0", "u-node": "0.0.2", "vue": "2.7.15", @@ -8635,9 +8635,9 @@ } }, "node_modules/dompurify": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.0.6.tgz", - "integrity": "sha512-ilkD8YEnnGh1zJ240uJsW7AzE+2qpbOUYjacomn3AvJ6J4JhKGSZ2nh4wUIXPZrEPppaCLx5jFe8T89Rk8tQ7w==" + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.0.7.tgz", + "integrity": "sha512-BViYTZoqP3ak/ULKOc101y+CtHDUvBsVgSxIF1ku0HmK6BRf+C03MC+tArMvOPtVtZp83DDh5puywKDu4sbVjQ==" }, "node_modules/domutils": { "version": "2.8.0", diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package.json b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package.json index 643e6bafb747..31497fb04b3f 100644 --- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package.json +++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package.json @@ -20,7 +20,7 @@ "vuedraggable": "2.24.3", "vue-tippy": "4.16.0", "vue2-touch-events": "3.2.3", - "dompurify": "3.0.6" + "dompurify": "3.0.7" }, "devDependencies": { "@vue/cli-plugin-babel": "5.0.8", From c161d2af6ad2326f175258cf6ddd53213dc4968b Mon Sep 17 00:00:00 2001 From: Manuel Leduc Date: Thu, 4 Jan 2024 13:27:35 +0100 Subject: [PATCH 03/11] [Misc] Upgrade transitive dependencies for livedata-webjar --- .../src/main/config/package-lock.json | 443 +++++++++--------- 1 file changed, 214 insertions(+), 229 deletions(-) diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package-lock.json b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package-lock.json index dce91a84d662..b1b935dbb3ca 100644 --- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package-lock.json +++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package-lock.json @@ -105,21 +105,21 @@ } }, "node_modules/@babel/core": { - "version": "7.23.5", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.5.tgz", - "integrity": "sha512-Cwc2XjUrG4ilcfOw4wBAK+enbdgwAcAJCfGUItPBKR7Mjw4aEfAFYrLxeRp4jWgtNIKn3n2AlBOfwwafl+42/g==", + "version": "7.23.7", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.7.tgz", + "integrity": "sha512-+UpDgowcmqe36d4NwqvKsyPMlOLNGMsfMmQ5WGCu+siCe3t3dfe9njrzGfdN4qq+bcNUt0+Vw6haRxBOycs4dw==", "dev": true, "dependencies": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.23.5", - "@babel/generator": "^7.23.5", - "@babel/helper-compilation-targets": "^7.22.15", + "@babel/generator": "^7.23.6", + "@babel/helper-compilation-targets": "^7.23.6", "@babel/helper-module-transforms": "^7.23.3", - "@babel/helpers": "^7.23.5", - "@babel/parser": "^7.23.5", + "@babel/helpers": "^7.23.7", + "@babel/parser": "^7.23.6", "@babel/template": "^7.22.15", - "@babel/traverse": "^7.23.5", - "@babel/types": "^7.23.5", + "@babel/traverse": "^7.23.7", + "@babel/types": "^7.23.6", "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -153,12 +153,12 @@ } }, "node_modules/@babel/generator": { - "version": "7.23.5", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.5.tgz", - "integrity": "sha512-BPssCHrBD+0YrxviOa3QzpqwhNIXKEtOa2jQrm4FlmkC2apYgRnQcmPWiGZDlGxiNtltnUFolMe8497Esry+jA==", + "version": "7.23.6", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.6.tgz", + "integrity": "sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==", "dev": true, "dependencies": { - "@babel/types": "^7.23.5", + "@babel/types": "^7.23.6", "@jridgewell/gen-mapping": "^0.3.2", "@jridgewell/trace-mapping": "^0.3.17", "jsesc": "^2.5.1" @@ -192,14 +192,14 @@ } }, "node_modules/@babel/helper-compilation-targets": { - "version": "7.22.15", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz", - "integrity": "sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==", + "version": "7.23.6", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz", + "integrity": "sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==", "dev": true, "dependencies": { - "@babel/compat-data": "^7.22.9", - "@babel/helper-validator-option": "^7.22.15", - "browserslist": "^4.21.9", + "@babel/compat-data": "^7.23.5", + "@babel/helper-validator-option": "^7.23.5", + "browserslist": "^4.22.2", "lru-cache": "^5.1.1", "semver": "^6.3.1" }, @@ -208,9 +208,9 @@ } }, "node_modules/@babel/helper-create-class-features-plugin": { - "version": "7.23.5", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.23.5.tgz", - "integrity": "sha512-QELlRWxSpgdwdJzSJn4WAhKC+hvw/AtHbbrIoncKHkhKKR/luAlKkgBDcri1EzWAo8f8VvYVryEHN4tax/V67A==", + "version": "7.23.7", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.23.7.tgz", + "integrity": "sha512-xCoqR/8+BoNnXOY7RVSgv6X+o7pmT5q1d+gGcRlXYkI+9B31glE4jeejhKVpA04O1AtzOt7OSQ6VYKP5FcRl9g==", "dev": true, "dependencies": { "@babel/helper-annotate-as-pure": "^7.22.5", @@ -248,9 +248,9 @@ } }, "node_modules/@babel/helper-define-polyfill-provider": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.3.tgz", - "integrity": "sha512-WBrLmuPP47n7PNwsZ57pqam6G/RGo1vw/87b0Blc53tZNGZ4x7YvZ6HgQe2vo1W/FR20OgjeZuGXzudPiXHFug==", + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.4.tgz", + "integrity": "sha512-QcJMILQCu2jm5TFPGA3lCpJJTeEP+mqeXooG/NZbg/h5FTFi6V0+99ahlRsW8/kRLyb24LZVCCiclDedhLKcBA==", "dev": true, "dependencies": { "@babel/helper-compilation-targets": "^7.22.6", @@ -473,14 +473,14 @@ } }, "node_modules/@babel/helpers": { - "version": "7.23.5", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.5.tgz", - "integrity": "sha512-oO7us8FzTEsG3U6ag9MfdF1iA/7Z6dz+MtFhifZk8C8o453rGJFFWUP1t+ULM9TUIAzC9uxXEiXjOiVMyd7QPg==", + "version": "7.23.7", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.7.tgz", + "integrity": "sha512-6AMnjCoC8wjqBzDHkuqpa7jAKwvMo4dC+lr/TFBz+ucfulO1XMpDnwWPGBNwClOKZ8h6xn5N81W/R5OrcKtCbQ==", "dev": true, "dependencies": { "@babel/template": "^7.22.15", - "@babel/traverse": "^7.23.5", - "@babel/types": "^7.23.5" + "@babel/traverse": "^7.23.7", + "@babel/types": "^7.23.6" }, "engines": { "node": ">=6.9.0" @@ -501,9 +501,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.23.5", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.5.tgz", - "integrity": "sha512-hOOqoiNXrmGdFbhgCzu6GiURxUgM27Xwd/aPuu8RfHEZPBzL1Z54okAHAQjXfcQNwvrlkAmAp4SlRTZ45vlthQ==", + "version": "7.23.6", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.6.tgz", + "integrity": "sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ==", "bin": { "parser": "bin/babel-parser.js" }, @@ -544,9 +544,9 @@ } }, "node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.23.3.tgz", - "integrity": "sha512-XaJak1qcityzrX0/IU5nKHb34VaibwP3saKqG6a/tppelgllOH13LUann4ZCIBcVOeE6H18K4Vx9QKkVww3z/w==", + "version": "7.23.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.23.7.tgz", + "integrity": "sha512-LlRT7HgaifEpQA1ZgLVOIJZZFVPWN5iReq/7/JixwBtwcoeVGDBD53ZV28rrsLYOZs1Y/EHhA8N/Z6aazHR8cw==", "dev": true, "dependencies": { "@babel/helper-environment-visitor": "^7.22.20", @@ -577,15 +577,13 @@ } }, "node_modules/@babel/plugin-proposal-decorators": { - "version": "7.23.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.23.5.tgz", - "integrity": "sha512-6IsY8jOeWibsengGlWIezp7cuZEFzNlAghFpzh9wiZwhQ42/hRcPnY/QV9HJoKTlujupinSlnQPiEy/u2C1ZfQ==", + "version": "7.23.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.23.7.tgz", + "integrity": "sha512-b1s5JyeMvqj7d9m9KhJNHKc18gEJiSyVzVX3bwbiPalQBQpuvfPh6lA9F7Kk/dWH0TIiXRpB9yicwijY6buPng==", "dev": true, "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.23.5", + "@babel/helper-create-class-features-plugin": "^7.23.7", "@babel/helper-plugin-utils": "^7.22.5", - "@babel/helper-replace-supers": "^7.22.20", - "@babel/helper-split-export-declaration": "^7.22.6", "@babel/plugin-syntax-decorators": "^7.23.3" }, "engines": { @@ -915,9 +913,9 @@ } }, "node_modules/@babel/plugin-transform-async-generator-functions": { - "version": "7.23.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.4.tgz", - "integrity": "sha512-efdkfPhHYTtn0G6n2ddrESE91fgXxjlqLsnUtPWnJs4a4mZIbUaK7ffqKIIUKXSHwcDvaCVX6GXkaJJFqtX7jw==", + "version": "7.23.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.7.tgz", + "integrity": "sha512-PdxEpL71bJp1byMG0va5gwQcXHxuEYC/BgI/e88mGTtohbZN28O5Yit0Plkkm/dBzCF/BxmbNcses1RH1T+urA==", "dev": true, "dependencies": { "@babel/helper-environment-visitor": "^7.22.20", @@ -1146,12 +1144,13 @@ } }, "node_modules/@babel/plugin-transform-for-of": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.23.3.tgz", - "integrity": "sha512-X8jSm8X1CMwxmK878qsUGJRmbysKNbdpTv/O1/v0LuY/ZkZrng5WYiekYSdg9m09OTmDDUWeEDsTE+17WYbAZw==", + "version": "7.23.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.23.6.tgz", + "integrity": "sha512-aYH4ytZ0qSuBbpfhuofbg/e96oQ7U2w1Aw/UQmKT+1l39uEhUPoFS3fHevDc1G0OvewyDudfMKY1OulczHzWIw==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5" + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -1533,16 +1532,16 @@ } }, "node_modules/@babel/plugin-transform-runtime": { - "version": "7.23.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.23.4.tgz", - "integrity": "sha512-ITwqpb6V4btwUG0YJR82o2QvmWrLgDnx/p2A3CTPYGaRgULkDiC0DRA2C4jlRB9uXGUEfaSS/IGHfVW+ohzYDw==", + "version": "7.23.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.23.7.tgz", + "integrity": "sha512-fa0hnfmiXc9fq/weK34MUV0drz2pOL/vfKWvN7Qw127hiUPabFCUMgAbYWcchRzMJit4o5ARsK/s+5h0249pLw==", "dev": true, "dependencies": { "@babel/helper-module-imports": "^7.22.15", "@babel/helper-plugin-utils": "^7.22.5", - "babel-plugin-polyfill-corejs2": "^0.4.6", - "babel-plugin-polyfill-corejs3": "^0.8.5", - "babel-plugin-polyfill-regenerator": "^0.5.3", + "babel-plugin-polyfill-corejs2": "^0.4.7", + "babel-plugin-polyfill-corejs3": "^0.8.7", + "babel-plugin-polyfill-regenerator": "^0.5.4", "semver": "^6.3.1" }, "engines": { @@ -1692,18 +1691,18 @@ } }, "node_modules/@babel/preset-env": { - "version": "7.23.5", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.23.5.tgz", - "integrity": "sha512-0d/uxVD6tFGWXGDSfyMD1p2otoaKmu6+GD+NfAx0tMaH+dxORnp7T9TaVQ6mKyya7iBtCIVxHjWT7MuzzM9z+A==", + "version": "7.23.7", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.23.7.tgz", + "integrity": "sha512-SY27X/GtTz/L4UryMNJ6p4fH4nsgWbz84y9FE0bQeWJP6O5BhgVCt53CotQKHCOeXJel8VyhlhujhlltKms/CA==", "dev": true, "dependencies": { "@babel/compat-data": "^7.23.5", - "@babel/helper-compilation-targets": "^7.22.15", + "@babel/helper-compilation-targets": "^7.23.6", "@babel/helper-plugin-utils": "^7.22.5", "@babel/helper-validator-option": "^7.23.5", "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.23.3", "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.23.3", - "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.23.3", + "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.23.7", "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2", "@babel/plugin-syntax-async-generators": "^7.8.4", "@babel/plugin-syntax-class-properties": "^7.12.13", @@ -1724,7 +1723,7 @@ "@babel/plugin-syntax-top-level-await": "^7.14.5", "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6", "@babel/plugin-transform-arrow-functions": "^7.23.3", - "@babel/plugin-transform-async-generator-functions": "^7.23.4", + "@babel/plugin-transform-async-generator-functions": "^7.23.7", "@babel/plugin-transform-async-to-generator": "^7.23.3", "@babel/plugin-transform-block-scoped-functions": "^7.23.3", "@babel/plugin-transform-block-scoping": "^7.23.4", @@ -1738,7 +1737,7 @@ "@babel/plugin-transform-dynamic-import": "^7.23.4", "@babel/plugin-transform-exponentiation-operator": "^7.23.3", "@babel/plugin-transform-export-namespace-from": "^7.23.4", - "@babel/plugin-transform-for-of": "^7.23.3", + "@babel/plugin-transform-for-of": "^7.23.6", "@babel/plugin-transform-function-name": "^7.23.3", "@babel/plugin-transform-json-strings": "^7.23.4", "@babel/plugin-transform-literals": "^7.23.3", @@ -1772,9 +1771,9 @@ "@babel/plugin-transform-unicode-regex": "^7.23.3", "@babel/plugin-transform-unicode-sets-regex": "^7.23.3", "@babel/preset-modules": "0.1.6-no-external-plugins", - "babel-plugin-polyfill-corejs2": "^0.4.6", - "babel-plugin-polyfill-corejs3": "^0.8.5", - "babel-plugin-polyfill-regenerator": "^0.5.3", + "babel-plugin-polyfill-corejs2": "^0.4.7", + "babel-plugin-polyfill-corejs3": "^0.8.7", + "babel-plugin-polyfill-regenerator": "^0.5.4", "core-js-compat": "^3.31.0", "semver": "^6.3.1" }, @@ -1806,9 +1805,9 @@ "dev": true }, "node_modules/@babel/runtime": { - "version": "7.23.5", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.5.tgz", - "integrity": "sha512-NdUTHcPe4C99WxPub+K9l9tK5/lV4UXIoaHSYgzco9BCyjKAAwzdBI+wWtYqHt7LJdbo74ZjRPJgzVweq1sz0w==", + "version": "7.23.7", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.7.tgz", + "integrity": "sha512-w06OXVOFso7LcbzMiDGt+3X7Rh7Ho8MmgPoWU3rarH+8upf+wSU/grlGbWzQyr3DkdN6ZeuMFjpdwW0Q+HxobA==", "dev": true, "dependencies": { "regenerator-runtime": "^0.14.0" @@ -1832,20 +1831,20 @@ } }, "node_modules/@babel/traverse": { - "version": "7.23.5", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.5.tgz", - "integrity": "sha512-czx7Xy5a6sapWWRx61m1Ke1Ra4vczu1mCTtJam5zRTBOonfdJ+S/B6HYmGYu3fJtr8GGET3si6IhgWVBhJ/m8w==", + "version": "7.23.7", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.7.tgz", + "integrity": "sha512-tY3mM8rH9jM0YHFGyfC0/xf+SB5eKUu7HPj7/k3fpi9dAlsMc5YbQvDi0Sh2QTPXqMhyaAtzAr807TIyfQrmyg==", "dev": true, "dependencies": { "@babel/code-frame": "^7.23.5", - "@babel/generator": "^7.23.5", + "@babel/generator": "^7.23.6", "@babel/helper-environment-visitor": "^7.22.20", "@babel/helper-function-name": "^7.23.0", "@babel/helper-hoist-variables": "^7.22.5", "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/parser": "^7.23.5", - "@babel/types": "^7.23.5", - "debug": "^4.1.0", + "@babel/parser": "^7.23.6", + "@babel/types": "^7.23.6", + "debug": "^4.3.1", "globals": "^11.1.0" }, "engines": { @@ -1853,9 +1852,9 @@ } }, "node_modules/@babel/types": { - "version": "7.23.5", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.5.tgz", - "integrity": "sha512-ON5kSOJwVO6xXVRTvOI0eOnWe7VdUcIpsovGo9U/Br4Ie4UVFQTboO2cYnDhAGU6Fp+UxSiT+pMft0SMHfuq6w==", + "version": "7.23.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.6.tgz", + "integrity": "sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==", "dev": true, "dependencies": { "@babel/helper-string-parser": "^7.23.4", @@ -1947,9 +1946,9 @@ "dev": true }, "node_modules/@eslint/eslintrc/node_modules/globals": { - "version": "13.23.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz", - "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==", + "version": "13.24.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", + "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", "dev": true, "dependencies": { "type-fest": "^0.20.2" @@ -3057,9 +3056,9 @@ } }, "node_modules/@polka/url": { - "version": "1.0.0-next.23", - "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.23.tgz", - "integrity": "sha512-C16M+IYz0rgRhWZdCmK+h58JMv8vijAA61gmz2rspCSwKwzBebpdcsiUmwrtJRdphuY30i6BSLEOP8ppbNLyLg==", + "version": "1.0.0-next.24", + "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.24.tgz", + "integrity": "sha512-2LuNTFBIO0m7kKIQvvPHN6UE63VjpmL9rnEEaOOaiSPbZK+zUOYIzBAWcED+3XYzhYsd/0mD57VdxAEqqV52CQ==", "dev": true }, "node_modules/@sideway/address": { @@ -3321,9 +3320,9 @@ } }, "node_modules/@types/babel__generator": { - "version": "7.6.7", - "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.7.tgz", - "integrity": "sha512-6Sfsq+EaaLrw4RmdFWE9Onp63TOUue71AWb4Gpa6JxzgTYtimbM086WnYTy2U67AofR++QKCo08ZP6pwx8YFHQ==", + "version": "7.6.8", + "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz", + "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==", "dev": true, "dependencies": { "@babel/types": "^7.0.0" @@ -3340,9 +3339,9 @@ } }, "node_modules/@types/babel__traverse": { - "version": "7.20.4", - "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.4.tgz", - "integrity": "sha512-mSM/iKUk5fDDrEV/e83qY+Cr3I1+Q3qqTuEn++HAWYjEa1+NxZr6CNrcJGf2ZTnq4HoFGC3zaTPZTobCzCFukA==", + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.5.tgz", + "integrity": "sha512-WXCyOcRtH37HAUkpXhUduaxdm82b4GSlyTqajXviN4EfiuPgNYR109xMCKvpl6zPIpua0DGlMEDCq+g8EdoheQ==", "dev": true, "dependencies": { "@babel/types": "^7.20.7" @@ -3387,9 +3386,9 @@ } }, "node_modules/@types/eslint": { - "version": "8.44.8", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.8.tgz", - "integrity": "sha512-4K8GavROwhrYl2QXDXm0Rv9epkA8GBFu0EI+XrrnnuCl7u8CWBRusX7fXJfanhZTDWSAL24gDI/UqXyUM0Injw==", + "version": "8.56.1", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.1.tgz", + "integrity": "sha512-18PLWRzhy9glDQp3+wOgfLYRWlhgX0azxgJ63rdpoUHyrC9z0f5CkFburjQx4uD7ZCruw85ZtMt6K+L+R8fLJQ==", "dev": true, "dependencies": { "@types/estree": "*", @@ -3491,9 +3490,9 @@ } }, "node_modules/@types/jest": { - "version": "29.5.10", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.10.tgz", - "integrity": "sha512-tE4yxKEphEyxj9s4inideLHktW/x6DwesIwWZ9NN1FKf9zbJYsnhBoA9vrHA/IuIOKwPa5PcFBNV4lpMIOEzyQ==", + "version": "29.5.11", + "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.11.tgz", + "integrity": "sha512-S2mHmYIVe13vrm6q4kN6fLYYAka15ALQki/vgDC3mIukEOx8WJlv0kQPM+d4w8Gp6u0uSdKND04IlTXBv0rwnQ==", "dev": true, "dependencies": { "expect": "^29.0.0", @@ -3519,18 +3518,18 @@ "dev": true }, "node_modules/@types/node": { - "version": "20.10.1", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.1.tgz", - "integrity": "sha512-T2qwhjWwGH81vUEx4EXmBKsTJRXFXNZTL4v0gi01+zyBmCwzE6TyHszqX01m+QHTEq+EZNo13NeJIdEqf+Myrg==", + "version": "20.10.6", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.6.tgz", + "integrity": "sha512-Vac8H+NlRNNlAmDfGUP7b5h/KA+AtWIzuXy0E6OyP8f1tCLYAtPvKRRDJjAPqhpCb0t6U2j7/xqAuLEebW2kiw==", "dev": true, "dependencies": { "undici-types": "~5.26.4" } }, "node_modules/@types/node-forge": { - "version": "1.3.10", - "resolved": "https://registry.npmjs.org/@types/node-forge/-/node-forge-1.3.10.tgz", - "integrity": "sha512-y6PJDYN4xYBxwd22l+OVH35N+1fCYWiuC3aiP2SlXVE6Lo7SS+rSx9r89hLxrP4pn6n1lBGhHJ12pj3F3Mpttw==", + "version": "1.3.11", + "resolved": "https://registry.npmjs.org/@types/node-forge/-/node-forge-1.3.11.tgz", + "integrity": "sha512-FQx220y22OKNTqaByeBGqHWYz4cl94tpcxeFdvBo3wjG6XPBuZ0BNgNZRV5J5TFmmcsJ4IzsLkmGRiQbnYsBEQ==", "dev": true, "dependencies": { "@types/node": "*" @@ -3555,9 +3554,9 @@ "dev": true }, "node_modules/@types/qs": { - "version": "6.9.10", - "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.10.tgz", - "integrity": "sha512-3Gnx08Ns1sEoCrWssEgTSJs/rsT2vhGP+Ja9cnnk9k4ALxinORlQneLXFeFKOTJMOeZUFD1s7w+w2AphTpvzZw==", + "version": "6.9.11", + "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.11.tgz", + "integrity": "sha512-oGk0gmhnEJK4Yyk+oI7EfXsLayXatCWPHary1MtcmbAifkobT9cM9yutG/hZKIseOU0MqbIwQ/u2nn/Gb+ltuQ==", "dev": true }, "node_modules/@types/range-parser": { @@ -6213,9 +6212,9 @@ } }, "node_modules/acorn": { - "version": "8.11.2", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz", - "integrity": "sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==", + "version": "8.11.3", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz", + "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==", "dev": true, "bin": { "acorn": "bin/acorn" @@ -6274,9 +6273,9 @@ } }, "node_modules/acorn-walk": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.0.tgz", - "integrity": "sha512-FS7hV565M5l1R08MXqo8odwMTB02C2UqzB17RVgu9EyuYFBqJZ3/ZY97sQD5FewVu1UyDFc1yztUDrAwT0EypA==", + "version": "8.3.1", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.1.tgz", + "integrity": "sha512-TgUZgYvqZprrl7YldZNoa9OciCAyZR+Ejm9eXzKCmjsF5IKp/wgQ7Z/ZpjpGTIUPwrHQIcYeI8qDh4PsEwxMbw==", "dev": true, "engines": { "node": ">=0.4.0" @@ -6473,9 +6472,9 @@ } }, "node_modules/array-flatten": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz", - "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", + "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==", "dev": true }, "node_modules/array-union": { @@ -6721,13 +6720,13 @@ } }, "node_modules/babel-plugin-polyfill-corejs2": { - "version": "0.4.6", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.6.tgz", - "integrity": "sha512-jhHiWVZIlnPbEUKSSNb9YoWcQGdlTLq7z1GHL4AjFxaoOUMuuEVJ+Y4pAaQUGOGk93YsVCKPbqbfw3m0SM6H8Q==", + "version": "0.4.7", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.7.tgz", + "integrity": "sha512-LidDk/tEGDfuHW2DWh/Hgo4rmnw3cduK6ZkOI1NPFceSK3n/yAGeOsNT7FLnSGHkXj3RHGSEVkN3FsCTY6w2CQ==", "dev": true, "dependencies": { "@babel/compat-data": "^7.22.6", - "@babel/helper-define-polyfill-provider": "^0.4.3", + "@babel/helper-define-polyfill-provider": "^0.4.4", "semver": "^6.3.1" }, "peerDependencies": { @@ -6735,12 +6734,12 @@ } }, "node_modules/babel-plugin-polyfill-corejs3": { - "version": "0.8.6", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.6.tgz", - "integrity": "sha512-leDIc4l4tUgU7str5BWLS2h8q2N4Nf6lGZP6UrNDxdtfF2g69eJ5L0H7S8A5Ln/arfFAfHor5InAdZuIOwZdgQ==", + "version": "0.8.7", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.7.tgz", + "integrity": "sha512-KyDvZYxAzkC0Aj2dAPyDzi2Ym15e5JKZSK+maI7NAwSqofvuFglbSsxE7wUOvTg9oFVnHMzVzBKcqEb4PJgtOA==", "dev": true, "dependencies": { - "@babel/helper-define-polyfill-provider": "^0.4.3", + "@babel/helper-define-polyfill-provider": "^0.4.4", "core-js-compat": "^3.33.1" }, "peerDependencies": { @@ -6748,12 +6747,12 @@ } }, "node_modules/babel-plugin-polyfill-regenerator": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.3.tgz", - "integrity": "sha512-8sHeDOmXC8csczMrYEOf0UTNa4yE2SxV5JGeT/LP1n0OYVDUUFPxG9vdk2AlDlIit4t+Kf0xCtpgXPBwnn/9pw==", + "version": "0.5.4", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.4.tgz", + "integrity": "sha512-S/x2iOCvDaCASLYsOOgWOq4bCfKYVqvO/uxjkaYyZ3rVsVE3CeAI/c84NpyuBBymEgNvHgjEot3a9/Z/kXvqsg==", "dev": true, "dependencies": { - "@babel/helper-define-polyfill-provider": "^0.4.3" + "@babel/helper-define-polyfill-provider": "^0.4.4" }, "peerDependencies": { "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" @@ -6927,13 +6926,11 @@ "dev": true }, "node_modules/bonjour-service": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.1.1.tgz", - "integrity": "sha512-Z/5lQRMOG9k7W+FkeGTNjh7htqn/2LMnfOvBZ8pynNZCM9MwkQkI3zeI4oz09uWdcgmgHugVvBqxGg4VQJ5PCg==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.2.0.tgz", + "integrity": "sha512-xdzMA6JGckxyJzZByjEWRcfKmDxXaGXZWVftah3FkCqdlePNS9DjHSUN5zkP4oEfz/t0EXXlro88EIhzwMB4zA==", "dev": true, "dependencies": { - "array-flatten": "^2.1.2", - "dns-equal": "^1.0.0", "fast-deep-equal": "^3.1.3", "multicast-dns": "^7.2.5" } @@ -6973,9 +6970,9 @@ "dev": true }, "node_modules/browserslist": { - "version": "4.22.1", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.1.tgz", - "integrity": "sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==", + "version": "4.22.2", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.2.tgz", + "integrity": "sha512-0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A==", "dev": true, "funding": [ { @@ -6992,9 +6989,9 @@ } ], "dependencies": { - "caniuse-lite": "^1.0.30001541", - "electron-to-chromium": "^1.4.535", - "node-releases": "^2.0.13", + "caniuse-lite": "^1.0.30001565", + "electron-to-chromium": "^1.4.601", + "node-releases": "^2.0.14", "update-browserslist-db": "^1.0.13" }, "bin": { @@ -7110,9 +7107,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001565", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001565.tgz", - "integrity": "sha512-xrE//a3O7TP0vaJ8ikzkD2c2NgcVUvsEe2IvFTntV4Yd1Z9FVzh+gW+enX96L0psrbaFMcVcH2l90xNuGDWc8w==", + "version": "1.0.30001574", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001574.tgz", + "integrity": "sha512-BtYEK4r/iHt/txm81KBudCUcTy7t+s9emrIaHqjYurQ10x71zJ5VQ9x1dYPcz/b+pKSp4y/v1xSI67A+LzpNyg==", "dev": true, "funding": [ { @@ -7696,9 +7693,9 @@ } }, "node_modules/core-js": { - "version": "3.33.3", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.33.3.tgz", - "integrity": "sha512-lo0kOocUlLKmm6kv/FswQL8zbkH7mVsLJ/FULClOhv8WRVmKLVcs6XPNQAzstfeJTCHMyButEwG+z1kHxHoDZw==", + "version": "3.35.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.35.0.tgz", + "integrity": "sha512-ntakECeqg81KqMueeGJ79Q5ZgQNR+6eaE8sxGCx62zMbAIj65q+uYvatToew3m6eAGdU4gNZwpZ34NMe4GYswg==", "dev": true, "hasInstallScript": true, "funding": { @@ -7707,12 +7704,12 @@ } }, "node_modules/core-js-compat": { - "version": "3.33.3", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.33.3.tgz", - "integrity": "sha512-cNzGqFsh3Ot+529GIXacjTJ7kegdt5fPXxCBVS1G0iaZpuo/tBz399ymceLJveQhFFZ8qThHiP3fzuoQjKN2ow==", + "version": "3.35.0", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.35.0.tgz", + "integrity": "sha512-5blwFAddknKeNgsjBzilkdQ0+YK8L1PfqPYq40NOYMYFSS38qj+hpTcLLWwpIwA2A5bje/x5jmVn2tzUMg9IVw==", "dev": true, "dependencies": { - "browserslist": "^4.22.1" + "browserslist": "^4.22.2" }, "funding": { "type": "opencollective", @@ -8206,9 +8203,9 @@ "dev": true }, "node_modules/csstype": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz", - "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==" + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz", + "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==" }, "node_modules/data-urls": { "version": "2.0.0", @@ -8520,12 +8517,6 @@ "node": ">=8" } }, - "node_modules/dns-equal": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz", - "integrity": "sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg==", - "dev": true - }, "node_modules/dns-packet": { "version": "5.6.1", "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.1.tgz", @@ -8790,9 +8781,9 @@ "dev": true }, "node_modules/electron-to-chromium": { - "version": "1.4.600", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.600.tgz", - "integrity": "sha512-KD6CWjf1BnQG+NsXuyiTDDT1eV13sKuYsOUioXkQweYTQIbgHkXPry9K7M+7cKtYHnSUPitVaLrXYB1jTkkYrw==", + "version": "1.4.620", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.620.tgz", + "integrity": "sha512-a2fcSHOHrqBJsPNXtf6ZCEZpXrFCcbK1FBxfX3txoqWzNgtEDG1f3M59M98iwxhRW4iMKESnSjbJ310/rkrp0g==", "dev": true }, "node_modules/emittery": { @@ -9722,12 +9713,6 @@ "node": ">= 0.10.0" } }, - "node_modules/express/node_modules/array-flatten": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", - "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==", - "dev": true - }, "node_modules/express/node_modules/debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", @@ -9802,9 +9787,9 @@ "dev": true }, "node_modules/fastq": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz", - "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==", + "version": "1.16.0", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.16.0.tgz", + "integrity": "sha512-ifCoaXsDrsdkWTtiNJX5uzHDsrck5TzfKKDcuFFTIrrc/BS076qgEIfoIy1VeZqViznfKiysPYTh/QeHtnIsYA==", "dev": true, "dependencies": { "reusify": "^1.0.4" @@ -9966,9 +9951,9 @@ "dev": true }, "node_modules/follow-redirects": { - "version": "1.15.3", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz", - "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==", + "version": "1.15.4", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz", + "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==", "dev": true, "funding": [ { @@ -10471,9 +10456,9 @@ } }, "node_modules/html-webpack-plugin": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.5.3.tgz", - "integrity": "sha512-6YrDKTuqaP/TquFH7h4srYWsZx+x6k6+FbsTm0ziCwGHDP78Unr1r9F/H4+sGmMbX08GQcJ+K64x55b+7VM/jg==", + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.6.0.tgz", + "integrity": "sha512-iwaY4wzbe48AfKLZ/Cc8k0L+FKG6oSNRaZ8x5A/T/IVDGyXcbHncM9TdDa93wn0FsSm82FhTKW7f3vS61thXAw==", "dev": true, "dependencies": { "@types/html-minifier-terser": "^6.0.0", @@ -10490,7 +10475,16 @@ "url": "https://opencollective.com/html-webpack-plugin" }, "peerDependencies": { + "@rspack/core": "0.x || 1.x", "webpack": "^5.20.0" + }, + "peerDependenciesMeta": { + "@rspack/core": { + "optional": true + }, + "webpack": { + "optional": true + } } }, "node_modules/htmlparser2": { @@ -15036,9 +15030,9 @@ "dev": true }, "node_modules/mrmime": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-1.0.1.tgz", - "integrity": "sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-2.0.0.tgz", + "integrity": "sha512-eu38+hdgojoyq63s+yTpN4XMBdt5l8HhMhc4VKLO9KM5caLIBvUm4thi7fFaxyTmCKeNnXZ5pAlBwCUnhA09uw==", "dev": true, "engines": { "node": ">=10" @@ -15098,13 +15092,12 @@ "dev": true }, "node_modules/needle": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/needle/-/needle-3.2.0.tgz", - "integrity": "sha512-oUvzXnyLiVyVGoianLijF9O/RecZUf7TkBfimjGrLM4eQhXyeJwM6GeAWccwfQ9aa4gMCZKqhAOuLaMIcQxajQ==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/needle/-/needle-3.3.1.tgz", + "integrity": "sha512-6k0YULvhpw+RoLNiQCRKOl09Rv1dPLr8hHnVjHqdolKwDrdNyk+Hmrthi4lIGPPz3r39dLx0hsF5s40sZ3Us4Q==", "dev": true, "optional": true, "dependencies": { - "debug": "^3.2.6", "iconv-lite": "^0.6.3", "sax": "^1.2.4" }, @@ -15115,16 +15108,6 @@ "node": ">= 4.4.x" } }, - "node_modules/needle/node_modules/debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "dev": true, - "optional": true, - "dependencies": { - "ms": "^2.1.1" - } - }, "node_modules/negotiator": { "version": "0.6.3", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", @@ -15860,9 +15843,9 @@ } }, "node_modules/postcss": { - "version": "8.4.31", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", - "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==", + "version": "8.4.32", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.32.tgz", + "integrity": "sha512-D/kj5JNu6oo2EIy+XL/26JEDTlIbB8hw85G8StOE6L74RQAVVP5rej6wxCNqyMbR4RkPfqvezVbPw81Ngd6Kcw==", "funding": [ { "type": "opencollective", @@ -15878,7 +15861,7 @@ } ], "dependencies": { - "nanoid": "^3.3.6", + "nanoid": "^3.3.7", "picocolors": "^1.0.0", "source-map-js": "^1.0.2" }, @@ -16164,9 +16147,9 @@ } }, "node_modules/postcss-modules-scope": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz", - "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.1.0.tgz", + "integrity": "sha512-SaIbK8XW+MZbd0xHPf7kdfA/3eOt7vxJ72IRecn3EzuZVLr1r0orzf0MX/pN8m+NMDoo6X/SQd8oeKqGZd8PXg==", "dev": true, "dependencies": { "postcss-selector-parser": "^6.0.4" @@ -16375,9 +16358,9 @@ } }, "node_modules/postcss-selector-parser": { - "version": "6.0.13", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz", - "integrity": "sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==", + "version": "6.0.15", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.15.tgz", + "integrity": "sha512-rEYkQOMUCEMhsKbK66tbEU9QVIxbhN18YiniAwA7XQYTVBqrBy+P2p5JcdqsHgKM2zWylp8d7J6eszocfds5Sw==", "dev": true, "dependencies": { "cssesc": "^3.0.0", @@ -16827,9 +16810,9 @@ } }, "node_modules/regenerator-runtime": { - "version": "0.14.0", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz", - "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==", + "version": "0.14.1", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz", + "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==", "dev": true }, "node_modules/regenerator-transform": { @@ -17374,13 +17357,13 @@ "dev": true }, "node_modules/sirv": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/sirv/-/sirv-2.0.3.tgz", - "integrity": "sha512-O9jm9BsID1P+0HOi81VpXPoDxYP374pkOLzACAoyUQ/3OUVndNpsz6wMnY2z+yOxzbllCKZrM+9QrWsv4THnyA==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/sirv/-/sirv-2.0.4.tgz", + "integrity": "sha512-94Bdh3cC2PKrbgSOUqTiGPWVZeSiXfKOVZNJniWoqrWrRkB1CJzBU3NEbiTsPcYy1lDsANA/THzS+9WBiy5nfQ==", "dev": true, "dependencies": { - "@polka/url": "^1.0.0-next.20", - "mrmime": "^1.0.0", + "@polka/url": "^1.0.0-next.24", + "mrmime": "^2.0.0", "totalist": "^3.0.0" }, "engines": { @@ -17855,9 +17838,9 @@ } }, "node_modules/terser": { - "version": "5.24.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.24.0.tgz", - "integrity": "sha512-ZpGR4Hy3+wBEzVEnHvstMvqpD/nABNelQn/z2r0fjVWGQsN3bpOLzQlqDxmb4CDZnXq5lpjnQ+mHQLAOpfM5iw==", + "version": "5.26.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.26.0.tgz", + "integrity": "sha512-dytTGoE2oHgbNV9nTzgBEPaqAWvcJNl66VZ0BkJqlvp71IjO8CxdBx/ykCNb47cLnCmCvRZ6ZR0tLkqvZCdVBQ==", "dev": true, "dependencies": { "@jridgewell/source-map": "^0.3.3", @@ -17873,16 +17856,16 @@ } }, "node_modules/terser-webpack-plugin": { - "version": "5.3.9", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz", - "integrity": "sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==", + "version": "5.3.10", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz", + "integrity": "sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==", "dev": true, "dependencies": { - "@jridgewell/trace-mapping": "^0.3.17", + "@jridgewell/trace-mapping": "^0.3.20", "jest-worker": "^27.4.5", "schema-utils": "^3.1.1", "serialize-javascript": "^6.0.1", - "terser": "^5.16.8" + "terser": "^5.26.0" }, "engines": { "node": ">= 10.13.0" @@ -18244,9 +18227,9 @@ } }, "node_modules/typescript": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.2.tgz", - "integrity": "sha512-6l+RyNy7oAHDfxC4FzSJcz9vnjTKxrLpDG5M2Vu4SHRVNg6xzqZp6LYSR9zjqQTu8DU/f5xwxUdADOkbrIX2gQ==", + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz", + "integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==", "dev": true, "peer": true, "bin": { @@ -18451,6 +18434,7 @@ "version": "2.7.15", "resolved": "https://registry.npmjs.org/vue/-/vue-2.7.15.tgz", "integrity": "sha512-a29fsXd2G0KMRqIFTpRgpSbWaNBK3lpCTOLuGLEDnlHWdjB8fwl6zyYZ8xCrqkJdatwZb4mGHiEfJjnw0Q6AwQ==", + "deprecated": "Vue 2 has reached EOL and is no longer actively maintained. See https://v2.vuejs.org/eol/ for more details.", "dependencies": { "@vue/compiler-sfc": "2.7.15", "csstype": "^3.1.0" @@ -18562,9 +18546,9 @@ "integrity": "sha512-C5GZjs1tYlAqjwymaaCPDjCyGo10ajUphiwA922jKt9n7KPpqR7oM1PCwYzhB/E7+nT3wfdG3oRre5raIT1rKA==" }, "node_modules/vue-loader": { - "version": "17.3.1", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-17.3.1.tgz", - "integrity": "sha512-nmVu7KU8geOyzsStyyaxID/uBGDMS8BkPXb6Lu2SNkMawriIbb+hYrNtgftHMKxOSkjjjTF5OSSwPo3KP59egg==", + "version": "17.4.2", + "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-17.4.2.tgz", + "integrity": "sha512-yTKOA4R/VN4jqjw4y5HrynFL8AK0Z3/Jt7eOJXEitsm0GMRHDBjCfCiuTiLP7OESvsZYo2pATCWhDqxC5ZrM6w==", "dev": true, "dependencies": { "chalk": "^4.1.0", @@ -18883,6 +18867,7 @@ "version": "6.5.1", "resolved": "https://registry.npmjs.org/webpack-chain/-/webpack-chain-6.5.1.tgz", "integrity": "sha512-7doO/SRtLu8q5WM0s7vPKPWX580qhi0/yBHkOxNkv50f6qB76Zy9o2wRTrrPULqYTvQlVHuvbA8v+G5ayuUDsA==", + "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.", "dev": true, "dependencies": { "deepmerge": "^1.5.2", @@ -19090,9 +19075,9 @@ } }, "node_modules/webpack-dev-server/node_modules/ws": { - "version": "8.14.2", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.14.2.tgz", - "integrity": "sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==", + "version": "8.16.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz", + "integrity": "sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==", "dev": true, "engines": { "node": ">=10.0.0" @@ -19202,9 +19187,9 @@ } }, "node_modules/whatwg-fetch": { - "version": "3.6.19", - "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.19.tgz", - "integrity": "sha512-d67JP4dHSbm2TrpFj8AbO8DnL1JXL5J9u0Kq2xW6d0TFDbCA3Muhdt8orXC22utleTVj7Prqt82baN6RBvnEgw==", + "version": "3.6.20", + "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.20.tgz", + "integrity": "sha512-EqhiFU6daOA8kpjOWTL0olhVOF3i7OrFzSYiGsEMB8GcXS+RrzauAERX65xMeNWVqxA6HXH2m69Z9LaKKdisfg==", "dev": true }, "node_modules/whatwg-mimetype": { From c8daf8038e13f6115771709c83c3e62356c83932 Mon Sep 17 00:00:00 2001 From: Vincent Massol Date: Thu, 4 Jan 2024 17:47:49 +0100 Subject: [PATCH 04/11] XWIKI-21758: NPE for LiveTableViewSheet when exporting to HTML --- .../src/main/resources/AppWithinMinutes/LiveTableViewSheet.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-ui/src/main/resources/AppWithinMinutes/LiveTableViewSheet.xml b/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-ui/src/main/resources/AppWithinMinutes/LiveTableViewSheet.xml index c1724a692cb1..b0fb78ea7f43 100644 --- a/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-ui/src/main/resources/AppWithinMinutes/LiveTableViewSheet.xml +++ b/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-ui/src/main/resources/AppWithinMinutes/LiveTableViewSheet.xml @@ -401,7 +401,8 @@ return XWiki; * Rename Application */ require(['jquery', 'bootstrap', 'xwiki-form-validation-async'], function($) { - #set ($currentDocReference = $xwiki.getDocument($request.currentApp).getDocumentReference()) + ## Note: if not currentApp request param is not passed, we default to the wiki home page reference to avoid a NPE + #set ($currentDocReference = $xwiki.getDocument("$!request.currentApp").getDocumentReference()) // if we cannot find any extension related to this page app, it's not part of an extension. var isNotAnExtension = $services.extension.xar.getInstalledExtensions($currentDocReference).isEmpty(); From 42830c97640508cd00a67ea69ec8f65dd56284b3 Mon Sep 17 00:00:00 2001 From: hongsikum Date: Thu, 4 Jan 2024 09:40:57 +0000 Subject: [PATCH 05/11] Translated using Weblate (Korean) Currently translated at 100.0% (4484 of 4484 strings) Translation: XWiki Platform/XWiki Core Resources Translate-URL: https://l10n.xwiki.org/projects/xwiki-platform/xwiki-core-resources/ko/ --- .../ApplicationResources_ko.properties | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/main/resources/ApplicationResources_ko.properties b/xwiki-platform-core/xwiki-platform-oldcore/src/main/resources/ApplicationResources_ko.properties index bd80b807be48..bc0ba14ab8d3 100644 --- a/xwiki-platform-core/xwiki-platform-oldcore/src/main/resources/ApplicationResources_ko.properties +++ b/xwiki-platform-core/xwiki-platform-oldcore/src/main/resources/ApplicationResources_ko.properties @@ -2226,7 +2226,7 @@ admin.main.title=\uAD00\uB9AC admin.switchContext=\uAC00\uB2E4 ### categories -admin.lf=\uB8E9\uC564\uD544 +admin.lf=\uB808\uC774\uC544\uC6C3 admin.lf.description=\uC704\uD0A4\uC758 \uCE21\uBA74\uACFC \uB808\uC774\uC544\uC6C3\uC744 \uBCC0\uACBD\uD558\uC138\uC694. admin.usersgroups=\uC0AC\uC6A9\uC790 \uBC0F \uAD8C\uB9AC admin.usersgroups.description=\uC0AC\uC6A9\uC790, \uADF8\uB8F9 \uBC0F \uD574\uB2F9 \uC561\uC138\uC2A4 \uAD8C\uD55C\uC744 \uAD00\uB9AC\uD569\uB2C8\uB2E4. @@ -2705,7 +2705,7 @@ xe.panels.edit=(\uC774 \uD328\uB110 \uD3B8\uC9D1) xe.panels.quicklinks=\uBE60\uB978 \uB9C1\uD06C xe.panels.quicklinks.dashboard=\uACC4\uAE30\uBC18 xe.panels.quicklinks.index=\uD398\uC774\uC9C0 \uC0C9\uC778 -xe.panels.quicklinks.sandbox=\uBAA8\uB798 \uC0C1\uC790 +xe.panels.quicklinks.sandbox=\uC0CC\uB4DC\uBC15\uC2A4 xe.panels.quicklinks.userdirectory=\uC0AC\uC6A9\uC790 \uBAA9\uB85D xe.panels.rights.welcome=\uAD8C\uB9AC \uD3B8\uC9D1\uC790\uC5D0 \uC624\uC2E0 \uAC83\uC744 \uD658\uC601\uD569\uB2C8\uB2E4. xe.panels.rights.explanation=\uD398\uC774\uC9C0\uC5D0 \uC801\uC6A9\uB41C \uAD8C\uD55C\uC740 \uACF5\uAC04\uC5D0 \uC801\uC6A9\uB41C \uAD8C\uD55C\uACFC \uC804\uCCB4 Wiki\uC5D0 \uC801\uC6A9\uB41C \uAD8C\uD55C\uC744 \uB300\uCCB4\uD569\uB2C8\uB2E4. @@ -3442,22 +3442,22 @@ dashboard.actions.columns.add.tooltip=\uC774 \uB300\uC2DC\uBCF4\uB4DC \uC758 \uB ### Search application resources admin.searchsuggest=\uAC80\uC0C9 \uC81C\uC548 admin.searchsuggest.description=\uAC80\uC0C9 \uC81C\uC548 \uC635\uC158\uC744 \uAD6C\uC131\uD569\uB2C8\uB2E4 . -admin.search=\uCC3E\uB2E4 +admin.search=\uAC80\uC0C9 admin.search.description=\uAE30\uBCF8 \uAC80\uC0C9 \uC5D4\uC9C4\uC744 \uC120\uD0DD\uD558\uAC70\uB098 \uAC80\uC0C9 \uC0C9\uC778\uC744 \uAD6C\uC131\uD558\uC138\uC694 . -search.admin.title=\uCC3E\uB2E4 +search.admin.title=\uAC80\uC0C9 search.admin.configuration.seexwikicfg=\uCD94\uAC00 \uAD6C\uC131 \uC635\uC158\uC740 xwiki .cfg \uD30C\uC77C\uC744 \uCC38\uC870\uD558\uC138\uC694 . search.admin.configuration.button=\uC800\uC7A5 search.extension.title.database=\uB370\uC774\uD130 \uBCA0\uC774\uC2A4 search.extension.title.solr=\uC194\uB974 XWiki.SearchConfigClass_engine=\uAE30\uBCF8 \uAC80\uC0C9 \uC5D4\uC9C4 search.page.title.query=\uAC80\uC0C9 : {0} -search.page.title.noquery=\uCC3E\uB2E4 +search.page.title.noquery=\uAC80\uC0C9 search.page.bar.spaces.title=\uC704\uCE58 search.page.bar.wikis.all=\uBAA8\uB4E0 \uC704\uD0A4 -search.page.bar.query.tip=\uCC3E\uB2E4 ... +search.page.bar.query.tip=\uAC80\uC0C9 ... search.page.bar.query.title=\uAC80\uC0C9\uC5B4 \uB97C \uC785\uB825\uD558\uC138\uC694 search.page.bar.querytip=\uC608: xwiki * AND " \uAC80\uC0C9\uC5B4 " -search.page.bar.submit=\uCC3E\uB2E4 +search.page.bar.submit=\uAC80\uC0C9 search.page.bar.submit.title=\uAC80\uC0C9\uC5B4 _ search.page.database.title.query=\uB370\uC774\uD130\uBCA0\uC774\uC2A4 \uAC80\uC0C9 : {0} search.page.database.title.noquery=\uB370\uC774\uD130\uBCA0\uC774\uC2A4 \uAC80\uC0C9 @@ -3692,7 +3692,7 @@ extensions.search.noResults=''{0}''\uACFC(\uC640) \uC77C\uCE58\uD558\uB294 \uD65 extensions.advancedSearch.title=\uACE0\uAE09 \uAC80\uC0C9 extensions.advancedSearch.id.label=\uD655\uC7A5 ID extensions.advancedSearch.version.label=\uBC84\uC804 -extensions.advancedSearch.actions.submit=\uCC3E\uB2E4 +extensions.advancedSearch.actions.submit=\uAC80\uC0C9 extensions.advancedSearch.actions.cancel=\uCDE8\uC18C extensions.advancedSearch.noResults=ID\uAC00 ''{0}''\uC774\uACE0 \uBC84\uC804\uC774 ''{1}''\uC778 \uD655\uC7A5 \uD504\uB85C\uADF8\uB7A8\uC744 \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. \uC62C\uBC14\uB978 \uD655\uC7A5 \uC800\uC7A5\uC18C\uAC00 \uAD6C\uC131\uB418\uC5B4 \uC788\uB294\uC9C0 \uD655\uC778\uD558\uC2ED\uC2DC\uC624. extensions.info.authors=\uC5D0 \uC758\uD574: @@ -3861,11 +3861,11 @@ platform.extension.distributionWizard.extension.cleanStep.uninstall.finish.warni platform.extension.distributionWizard.extension.cleanStep.uninstall.finish.success=\uBD84\uB9AC\uB41C \uD655\uC7A5 \uD504\uB85C\uADF8\uB7A8\uC774 \uC131\uACF5\uC801\uC73C\uB85C \uC81C\uAC70\uB418\uC5C8\uC2B5\uB2C8\uB2E4 ### Logging Application Resources -admin.logging=\uBC8C\uCC44 \uBC18\uCD9C +admin.logging=\uB85C\uAE45 admin.logging.description=\uB4F1\uB85D\uB41C \uB85C\uAC70\uC640 \uAD00\uB828\uB41C \uB85C\uADF8 \uC218\uC900\uC744 \uAC80\uD1A0\uD558\uACE0 \uC218\uC815\uD569\uB2C8\uB2E4. logging.admin.intro=\uC5EC\uAE30\uC5D0\uC11C \uB4F1\uB85D\uB41C \uB85C\uAC70\uC640 \uAD00\uB828\uB41C \uB85C\uADF8 \uC218\uC900\uC744 \uAC80\uD1A0\uD558\uACE0 \uC218\uC815\uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4. \uB610\uB294 \uBE48 \uB85C\uADF8 \uC218\uC900\uC740 \uB85C\uAC70\uAC00 \uD328\uD0A4\uC9C0\uC778 \uACBD\uC6B0 \uD328\uD0A4\uC9C0 \uC811\uB450\uC0AC\uC778 \uC0C1\uC704 \uB85C\uAC70\uC5D0\uC11C \uC0C1\uC18D\uD558\uACE0, \uC0C1\uC704\uAC00 \uC5C6\uB294 \uACBD\uC6B0 \uB85C\uAC70 \uAD6C\uD604 \uAD6C\uC131\uC758 \uAE30\uBCF8 \uC218\uC900\uC744 \uC0C1\uC18D\uD55C\uB2E4\uB294 \uC758\uBBF8\uC785\uB2C8\uB2E4. logging.admin.livetable.actions.set=\uC138\uD2B8 -logging.admin.livetable.logger=\uB098\uBB34\uAFBC +logging.admin.livetable.logger=\uB85C\uAC70 logging.admin.livetable.level=\uC218\uC900 logging.admin.livetable.actions=\uD589\uC704 @@ -3987,10 +3987,10 @@ xe.search.rebuild.failed=\uC778\uB371\uC2A4 \uC7AC\uAD6C\uCD95\uC5D0 \uC2E4\uD32 xe.search.index.rebuild=\uB8E8\uC13C \uC778\uB371\uC2A4 \uC7AC\uAD6C\uC131 xe.search.default.engine=\uAE30\uBCF8 \uAC80\uC0C9 \uC5D4\uC9C4 xe.search.lucene.experimental=\uC774\uAC83\uC740 \uC0C8\uB85C\uC6B4 \uC2E4\uD5D8\uC801\uC778 Lucene \uAC80\uC0C9 \uC5D4\uC9C4\uC785\uB2C8\uB2E4. XWiki {0}\uB97C \uACC4\uC18D \uC0AC\uC6A9\uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4 . -panels.search.title=\uCC3E\uB2E4 +panels.search.title=\uAC80\uC0C9 panels.search.query=\uAC80\uC0C9\uC5B4 _ panels.search.inputLabel=\uCC3E\uB2E4 -panels.search.inputText=\uCC3E\uB2E4 ... +panels.search.inputText=\uAC80\uC0C9 ... ### Missing: panels.search.submit=Go panels.search.advanced=\uACE0\uAE09 \uAC80\uC0C9 ### Search @@ -4004,20 +4004,20 @@ xe.search.page.previous=\uC774\uC804 \uD398\uC774\uC9C0 ### Missing: xe.search.page.next=next page xe.search.plugin.notfound=Lucene \uD50C\uB7EC\uADF8\uC778\uC744 \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. xwiki .cfg \uD30C\uC77C \uC5D0 \uC815\uC758\uB418\uC5B4 \uC788\uB294\uC9C0 \uD655\uC778\uD558\uC138\uC694 . xe.search.plugin.notenabled=Lucene \uD50C\uB7EC\uADF8\uC778 \uC774 \uD65C\uC131\uD654\uB418\uC5B4 \uC788\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. XWiki {0}\uB97C \uC0AC\uC6A9\uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4 . -xe.search.go=\uCC3E\uB2E4 -xe.search.web=\uCC3E\uB2E4 +xe.search.go=\uAC80\uC0C9 +xe.search.web=\uAC80\uC0C9 xe.search.web.results=\uAC80\uC0C9 : {0} xe.search.lucene=\uB8E8\uC52C \uAC80\uC0C9 xe.search.lucene.results=\uB8E8\uC52C \uAC80\uC0C9 : {0} xe.search.rss={0} \uAC80\uC0C9\uC744 \uC704\uD55C RSS \uD53C\uB4DC -xe.search.title=\uCC3E\uB2E4 -xe.search.bar.query.tip=\uCC3E\uB2E4 ... +xe.search.title=\uAC80\uC0C9 +xe.search.bar.query.tip=\uAC80\uC0C9 ... xe.search.bar.query.title=\uAC80\uC0C9 \uCFFC\uB9AC \uC785\uB825 xe.search.bar.wikis.all=\uBAA8\uB4E0 \uC704\uD0A4 xe.search.bar.wikis.title=\uC704\uD0A4 \uC120\uD0DD xe.search.bar.spaces.title=\uACF5\uAC04 \uC120\uD0DD xe.search.bar.spaces.all=\uBAA8\uB4E0 \uACF5\uAC04 -xe.search.bar.submit=\uCC3E\uB2E4 +xe.search.bar.submit=\uAC80\uC0C9 xe.search.bar.submit.title=\uAC80\uC0C9\uC5B4 _ xe.search.bar.queryTip=\uC608: xwiki * AND " \uAC80\uC0C9\uC5B4 " xe.search.bar.advanced=\uACE0\uAE09 From 57d7d5c8d5296166e0d2a8d6ad4279f1622590d3 Mon Sep 17 00:00:00 2001 From: hongsikum Date: Thu, 4 Jan 2024 09:41:59 +0000 Subject: [PATCH 06/11] Translated using Weblate (Korean) Currently translated at 100.0% (116 of 116 strings) Translation: XWiki Platform/XWiki.AdminTranslations.xml Translate-URL: https://l10n.xwiki.org/projects/xwiki-platform/xwiki-admintranslations-xml/ko/ --- .../src/main/resources/XWiki/AdminTranslations.ko.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/src/main/resources/XWiki/AdminTranslations.ko.xml b/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/src/main/resources/XWiki/AdminTranslations.ko.xml index 55a3e563477d..fe1f264106c4 100644 --- a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/src/main/resources/XWiki/AdminTranslations.ko.xml +++ b/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/src/main/resources/XWiki/AdminTranslations.ko.xml @@ -147,7 +147,7 @@ administration.section.analytics.status=상태 administration.section.analytics.status.hint=Google Analytics™의 추적이 활성화되어 있는지 확인 # Social category -admin.social=사회의 +admin.social=소셜 admin.social.description=소셜 기능에 대한 구성입니다. # Configurable Class From 79ea7fae364da57db88e7b33cd6f7aa7f1b0c8e6 Mon Sep 17 00:00:00 2001 From: hongsikum Date: Thu, 4 Jan 2024 09:42:58 +0000 Subject: [PATCH 07/11] Translated using Weblate (Korean) Currently translated at 100.0% (180 of 180 strings) Translation: XWiki Platform/XWiki.Notifications.Code.Translations Translate-URL: https://l10n.xwiki.org/projects/xwiki-platform/xwiki-notifications-code-translations/ko/ --- .../main/resources/XWiki/Notifications/Code/Translations.ko.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/Translations.ko.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/Translations.ko.xml index a6c9e70fa406..253d5b6aa8cd 100644 --- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/Translations.ko.xml +++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/Translations.ko.xml @@ -76,7 +76,7 @@ notifications.filters.preferences.scopeNotificationFilter.wiki=일주일 notifications.toggle.disabled.hint=이 위치를 보려면 설정에서 알림을 활성화해야 합니다 ## Notifications formats -notifications.format.alert=알리다 +notifications.format.alert=알림 notifications.format.email=이메일 ## Filter preferences settings From ef0bbccb0eaa8f93921b41f9509d167292c79499 Mon Sep 17 00:00:00 2001 From: hongsikum Date: Thu, 4 Jan 2024 09:40:49 +0000 Subject: [PATCH 08/11] Translated using Weblate (Korean) Currently translated at 100.0% (4 of 4 strings) Translation: XWiki Platform/XWiki Platform - Attachment - Picker - UI Translate-URL: https://l10n.xwiki.org/projects/xwiki-platform/xwiki-platform-attachment-picker-ui/ko/ --- .../main/resources/Attachment/Picker/Code/Translations.ko.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-ui/src/main/resources/Attachment/Picker/Code/Translations.ko.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-ui/src/main/resources/Attachment/Picker/Code/Translations.ko.xml index d8eed017f508..bb43e4d47427 100644 --- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-ui/src/main/resources/Attachment/Picker/Code/Translations.ko.xml +++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-ui/src/main/resources/Attachment/Picker/Code/Translations.ko.xml @@ -37,7 +37,7 @@ plain/1.0 true attachment.picker.ckeditor.pluginsImageSelector.title=갤러리 -attachment.picker.searchField.placeholder=찾다 ... +attachment.picker.searchField.placeholder=찾기 ... attachment.picker.searchField.scope.currentPage=현재 페이지 attachment.picker.searchField.scope.allPages=모든 페이지 From a63550104395f02c4cf17abebd78dff681797c07 Mon Sep 17 00:00:00 2001 From: hongsikum Date: Thu, 4 Jan 2024 09:37:04 +0000 Subject: [PATCH 09/11] Translated using Weblate (Korean) Currently translated at 100.0% (161 of 161 strings) Translation: XWiki Platform/xwiki-platform-help-ui-code Translate-URL: https://l10n.xwiki.org/projects/xwiki-platform/xwiki-platform-help-code/ko/ --- .../src/main/resources/Help/Code/Translations.ko.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/Help/Code/Translations.ko.xml b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/Help/Code/Translations.ko.xml index 2a8e3b3470c6..5cdcd478ff80 100644 --- a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/Help/Code/Translations.ko.xml +++ b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/Help/Code/Translations.ko.xml @@ -165,7 +165,7 @@ help.templates.title=템플릿 help.templates.useTemplates.description=템플릿은 새 페이지를 만들 때 복사할 수 있는 미리 정의된 페이지입니다. help.templates.useTemplates.tip=템플릿을 기반으로 {0}페이지를 생성{1}하면 사전 정의된 콘텐츠를 필요에 맞게 더 빠르게 조정할 수 있습니다. help.templates.useTemplates.title=템플릿 사용 -help.title=돕다 +help.title=도움말 help.title1=XWiki를 사용하는 방법 ? help.title2=주요 XWiki 기능 help.try.label=시도 해봐! From 7882a630702bfc7794a8853910fb4434bf7e24b0 Mon Sep 17 00:00:00 2001 From: Manuel Leduc Date: Fri, 5 Jan 2024 08:51:41 +0100 Subject: [PATCH 10/11] XWIKI-21742: Upgrade to vue 2.7.16 --- .../xwiki-platform-livedata-webjar/pom.xml | 2 +- .../src/main/config/package-lock.json | 30 ++++++++++--------- .../src/main/config/package.json | 4 +-- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/pom.xml b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/pom.xml index e12c7b69dfee..5233996ef1fd 100644 --- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/pom.xml +++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/pom.xml @@ -51,7 +51,7 @@ org.webjars.npm vue - 2.7.15 + 2.7.16 diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package-lock.json b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package-lock.json index b1b935dbb3ca..a77327a6e150 100644 --- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package-lock.json +++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package-lock.json @@ -11,7 +11,7 @@ "dompurify": "3.0.7", "lz-string": "1.5.0", "u-node": "0.0.2", - "vue": "2.7.15", + "vue": "2.7.16", "vue-i18n": "8.28.2", "vue-tippy": "4.16.0", "vue2-touch-events": "3.2.3", @@ -33,7 +33,7 @@ "jquery": "3.7.1", "less": "4.2.0", "less-loader": "11.1.4", - "vue-template-compiler": "2.7.15" + "vue-template-compiler": "2.7.16" }, "engines": { "node": "20.10.0", @@ -5856,13 +5856,16 @@ "dev": true }, "node_modules/@vue/compiler-sfc": { - "version": "2.7.15", - "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.15.tgz", - "integrity": "sha512-FCvIEevPmgCgqFBH7wD+3B97y7u7oj/Wr69zADBf403Tui377bThTjBvekaZvlRr4IwUAu3M6hYZeULZFJbdYg==", + "version": "2.7.16", + "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.16.tgz", + "integrity": "sha512-KWhJ9k5nXuNtygPU7+t1rX6baZeqOYLEforUPjgNDBnLicfHCoi48H87Q8XyLZOrNNsmhuwKqtpDQWjEFe6Ekg==", "dependencies": { - "@babel/parser": "^7.18.4", + "@babel/parser": "^7.23.5", "postcss": "^8.4.14", "source-map": "^0.6.1" + }, + "optionalDependencies": { + "prettier": "^1.18.2 || ^2.0.0" } }, "node_modules/@vue/component-compiler-utils": { @@ -16420,7 +16423,6 @@ "version": "2.8.8", "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz", "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==", - "dev": true, "optional": true, "bin": { "prettier": "bin-prettier.js" @@ -18431,12 +18433,12 @@ } }, "node_modules/vue": { - "version": "2.7.15", - "resolved": "https://registry.npmjs.org/vue/-/vue-2.7.15.tgz", - "integrity": "sha512-a29fsXd2G0KMRqIFTpRgpSbWaNBK3lpCTOLuGLEDnlHWdjB8fwl6zyYZ8xCrqkJdatwZb4mGHiEfJjnw0Q6AwQ==", + "version": "2.7.16", + "resolved": "https://registry.npmjs.org/vue/-/vue-2.7.16.tgz", + "integrity": "sha512-4gCtFXaAA3zYZdTp5s4Hl2sozuySsgz4jy1EnpBHNfpMa9dK1ZCG7viqBPCwXtmgc8nHqUsAu3G4gtmXkkY3Sw==", "deprecated": "Vue 2 has reached EOL and is no longer actively maintained. See https://v2.vuejs.org/eol/ for more details.", "dependencies": { - "@vue/compiler-sfc": "2.7.15", + "@vue/compiler-sfc": "2.7.16", "csstype": "^3.1.0" } }, @@ -18654,9 +18656,9 @@ "dev": true }, "node_modules/vue-template-compiler": { - "version": "2.7.15", - "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.15.tgz", - "integrity": "sha512-yQxjxMptBL7UAog00O8sANud99C6wJF+7kgbcwqkvA38vCGF7HWE66w0ZFnS/kX5gSoJr/PQ4/oS3Ne2pW37Og==", + "version": "2.7.16", + "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.16.tgz", + "integrity": "sha512-AYbUWAJHLGGQM7+cNTELw+KsOG9nl2CnSv467WobS5Cv9uk3wFcnr1Etsz2sEIHEZvw1U+o9mRlEO6QbZvUPGQ==", "dev": true, "dependencies": { "de-indent": "^1.0.2", diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package.json b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package.json index 31497fb04b3f..a44f52185fbb 100644 --- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package.json +++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package.json @@ -13,7 +13,7 @@ "node": "20.10.0" }, "dependencies": { - "vue": "2.7.15", + "vue": "2.7.16", "vue-i18n": "8.28.2", "lz-string": "1.5.0", "u-node": "0.0.2", @@ -32,7 +32,7 @@ "eslint-plugin-vue": "9.19.2", "less": "4.2.0", "less-loader": "11.1.4", - "vue-template-compiler": "2.7.15", + "vue-template-compiler": "2.7.16", "@vue/test-utils": "1.3.6", "jquery": "3.7.1", "@testing-library/jest-dom": "5.17.0", From 0853d6bf9c0dd953db61d0f45a975ec7961448a7 Mon Sep 17 00:00:00 2001 From: Thomas Mortagne Date: Mon, 8 Jan 2024 11:42:47 +0100 Subject: [PATCH 11/11] [misc] Ged rid of foxwiki --- .../chrome.manifest | 4 - .../xwiki-platform-tool-foxwiki/install.rdf | 22 -- .../xwiki-platform-tool-foxwiki/pom.xml | 40 ---- .../xwiki-platform-tool-foxwiki/readme.txt | 4 - .../xwiki-platform-tool-foxwiki-core/pom.xml | 36 ---- .../src/main/resources/content/browser.js | 188 ------------------ .../src/main/resources/content/browser.xul | 41 ---- .../main/resources/content/images/foxwiki.png | Bin 1348 -> 0 bytes .../main/resources/content/images/general.png | Bin 2129 -> 0 bytes .../main/resources/content/images/webdav.png | Bin 1424 -> 0 bytes .../src/main/resources/content/preferences.js | 136 ------------- .../main/resources/content/preferences.xul | 59 ------ .../main/resources/locale/en-UK/foxwiki.dtd | 8 - .../pom.xml | 105 ---------- .../src/assemble/distribution.xml | 56 ------ .../src/main/resources/chrome.manifest | 4 - .../resources/defaults/preferences/foxwiki.js | 1 - .../src/main/resources/install.rdf | 22 -- .../{afa707e0-05b7-473f-a0f7-d29271ab8cbf} | 1 - 19 files changed, 727 deletions(-) delete mode 100644 xwiki-platform-tools/xwiki-platform-tool-foxwiki/chrome.manifest delete mode 100644 xwiki-platform-tools/xwiki-platform-tool-foxwiki/install.rdf delete mode 100644 xwiki-platform-tools/xwiki-platform-tool-foxwiki/pom.xml delete mode 100644 xwiki-platform-tools/xwiki-platform-tool-foxwiki/readme.txt delete mode 100644 xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-core/pom.xml delete mode 100644 xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-core/src/main/resources/content/browser.js delete mode 100644 xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-core/src/main/resources/content/browser.xul delete mode 100644 xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-core/src/main/resources/content/images/foxwiki.png delete mode 100644 xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-core/src/main/resources/content/images/general.png delete mode 100644 xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-core/src/main/resources/content/images/webdav.png delete mode 100644 xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-core/src/main/resources/content/preferences.js delete mode 100644 xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-core/src/main/resources/content/preferences.xul delete mode 100644 xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-core/src/main/resources/locale/en-UK/foxwiki.dtd delete mode 100644 xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-distribution/pom.xml delete mode 100644 xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-distribution/src/assemble/distribution.xml delete mode 100644 xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-distribution/src/main/resources/chrome.manifest delete mode 100644 xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-distribution/src/main/resources/defaults/preferences/foxwiki.js delete mode 100644 xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-distribution/src/main/resources/install.rdf delete mode 100644 xwiki-platform-tools/xwiki-platform-tool-foxwiki/{afa707e0-05b7-473f-a0f7-d29271ab8cbf} diff --git a/xwiki-platform-tools/xwiki-platform-tool-foxwiki/chrome.manifest b/xwiki-platform-tools/xwiki-platform-tool-foxwiki/chrome.manifest deleted file mode 100644 index 3d5c5dbf3243..000000000000 --- a/xwiki-platform-tools/xwiki-platform-tool-foxwiki/chrome.manifest +++ /dev/null @@ -1,4 +0,0 @@ -content foxwiki core/src/main/resources/content/ -overlay chrome://browser/content/browser.xul chrome://foxwiki/content/browser.xul - -locale foxwiki en-UK core/src/main/resources/locale/en-UK/ diff --git a/xwiki-platform-tools/xwiki-platform-tool-foxwiki/install.rdf b/xwiki-platform-tools/xwiki-platform-tool-foxwiki/install.rdf deleted file mode 100644 index f48c22bb24d6..000000000000 --- a/xwiki-platform-tools/xwiki-platform-tool-foxwiki/install.rdf +++ /dev/null @@ -1,22 +0,0 @@ - - - - - Nickolay Ponomarev - Asiri Rathnayake - - - diff --git a/xwiki-platform-tools/xwiki-platform-tool-foxwiki/pom.xml b/xwiki-platform-tools/xwiki-platform-tool-foxwiki/pom.xml deleted file mode 100644 index 7b788fbe4e7c..000000000000 --- a/xwiki-platform-tools/xwiki-platform-tool-foxwiki/pom.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - 4.0.0 - - org.xwiki.platform - xwiki-platform-tools - 3.1-SNAPSHOT - - xwiki-platform-tool-foxwiki - pom - XWiki Platform - Tools - FoXWiki - Parent POM - FoXWiki, a Firefox extension for XWiki. - - xwiki-platform-tool-foxwiki-core - xwiki-platform-tool-foxwiki-distribution - - diff --git a/xwiki-platform-tools/xwiki-platform-tool-foxwiki/readme.txt b/xwiki-platform-tools/xwiki-platform-tool-foxwiki/readme.txt deleted file mode 100644 index ca9318a03e92..000000000000 --- a/xwiki-platform-tools/xwiki-platform-tool-foxwiki/readme.txt +++ /dev/null @@ -1,4 +0,0 @@ -* To build, execute 'mvn clean install' inside this directory (you need to have maven installed). -* Once built, copy distribution/target/foxwiki-distribution-version.xpi into ~/.mozilla/firefox//extensions/ and restart firefox. -* For development, modify {afa707e0-05b7-473f-a0f7-d29271ab8cbf} file to point into your development (source) directory and copy it into ~/.mozilla/firefox//extensions/. -* Refer to http://kb.mozillazine.org/Getting_started_with_extension_development for information on firefox extensions development. diff --git a/xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-core/pom.xml b/xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-core/pom.xml deleted file mode 100644 index bcae3d8b002e..000000000000 --- a/xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-core/pom.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - 4.0.0 - - org.xwiki.platform - xwiki-platform-tool-foxwiki - 3.1-SNAPSHOT - - xwiki-platform-tool-foxwiki-core - jar - XWiki Platform - Tools - FoXWiki - Core - The actual "code" files of the extension - diff --git a/xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-core/src/main/resources/content/browser.js b/xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-core/src/main/resources/content/browser.js deleted file mode 100644 index f07b4c0530cd..000000000000 --- a/xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-core/src/main/resources/content/browser.js +++ /dev/null @@ -1,188 +0,0 @@ -/* - ----( FoXWiki by Robin Fernandes )--- -More info: http://soal.xwiki.com/xwiki/bin/view/Code/FoXWiki - -This work is licensed under the Creative Commons Attribution 2.5 License. -This means you are free to use any of this code for any purpose as long as -you give credit to Robin Fernandes. View a copy of the license here: -http://creativecommons.org/licenses/by/2.5/ - -*/ - -FoXWiki = new FoXWikiClass(); - -window.addEventListener("load", function(e) { FoXWiki.onLoad(e); }, false); - -document.addEventListener("FoXWikiDomEvent", function(e) { FoXWiki.onFoXWikiDomEvent(e); }, false, true); - -function FoXWikiClass() { - // Interface - this.onLoad = onLoad; - this.contextPopupShowing = contextPopupShowing; - this.onXWikiAction = onXWikiAction; - this.onFoXWikiDomEvent = onFoXWikiDomEvent; - - //URL transforms - this.EditContent= new XWikiActionSetterClass("edit"); - this.EditForm = new XWikiActionSetterClass("inline"); - this.ViewPage = new XWikiActionSetterClass("view"); - this.DeletePage = new XWikiActionSetterClass("delete"); - this.EditObjects= new XWikiTemplateSetterClass("editobject"); - this.EditRights = new XWikiTemplateSetterClass("editrights"); - this.ViewCode = new XWikiTemplateSetterClass("code"); - - // Implementation: - var XWikiBase = "xwiki/bin"; // TODO: make this customisable - var XWikiView = XWikiBase + "/view"; //if the URL contains this string, show menu. - - //Initialisation - function onLoad(event) { - var menu = document.getElementById("contentAreaContextMenu"); - menu.addEventListener("popupshowing", this.contextPopupShowing, false); - this.initialized = true; - } - - //Called when context-menu is about to be shown, thanks to listener added - //in onLoad. Allows us to manipulate content of menu before it is displayed. - function contextPopupShowing(event) { - // Hide entire foxwiki menu if not inside an xwiki site. - var isXWikiLink = gContextMenu.linkURL.indexOf(XWikiBase) > -1; - gContextMenu.showItem("foxwiki-context-menu", isXWikiLink); - gContextMenu.showItem("foxwiki-main-menuseparator", isXWikiLink); - // Action links. - var isXWikiViewLink = gContextMenu.linkURL.indexOf(XWikiView) > -1; - gContextMenu.showItem("separator-01", isXWikiViewLink); - gContextMenu.showItem("edit-content-item", isXWikiViewLink); - gContextMenu.showItem("edit-form-item", isXWikiViewLink); - gContextMenu.showItem("edit-objects-item", isXWikiViewLink); - gContextMenu.showItem("edit-rights-item", isXWikiViewLink); - gContextMenu.showItem("separator-02", isXWikiViewLink); - gContextMenu.showItem("view-code-item", isXWikiViewLink); - gContextMenu.showItem("view-page-item", isXWikiViewLink); - gContextMenu.showItem("separator-03", isXWikiViewLink); - gContextMenu.showItem("delete-page-item", isXWikiViewLink); - // WebDAV Links. - var isXWikiWebDAVLink = false; - if( getDavUrl(gContextMenu.linkURL) != "" ) { - isXWikiWebDAVLink = true; - } - gContextMenu.showItem("edit-webdav-item", isXWikiWebDAVLink); - } - - //Called from menu, takes a URL transform as an argument - function onXWikiAction(e, urlTransform) { - window._content.location = urlTransform.morphUrl(gContextMenu.linkURL); - } - - // URL transform types - function XWikiActionSetterClass(inAction) { - //public - this.morphUrl=morphUrl; - //private - var action = inAction; - function morphUrl(inUrl) { - //TODO: use XWikiBase and XWikiID variables. - return inUrl.replace(/xwiki\/bin\/view/g, "xwiki/bin/"+action); - } - } - - function XWikiTemplateSetterClass(inTemplate) { - //public - this.morphUrl=morphUrl; - //private - var template = inTemplate; - function morphUrl(inUrl) { - return inUrl + "?xpage=" + template; - } - } - - function onFoXWikiDomEvent(evnt) { - var davURL = evnt.target.getAttribute("davURL"); - launchLocalEditor(davURL); - evnt.target.setAttribute("foxwiki", "true"); - } - -}; - -/** - * Preference manager. - */ -prefManager = Components.classes["@mozilla.org/preferences-service;1"] - .getService(Components.interfaces.nsIPrefBranch); - -/** - * Called whe the user clicks the 'Edit WebDAV' menuitem - */ -function editWebdav() { - launchLocalEditor(getDavUrl(gContextMenu.linkURL)); -} - -/* - * Launches the application associated with 'ext' with the given url as it's first argument. - */ -function launchLocalEditor(webdavUrl) { - var dot = webdavUrl.lastIndexOf("."); - var ext = webdavUrl.substr(dot + 1); - var associations = prefManager.getCharPref("extensions.foxwiki.associations").split(","); - var launchAppPath = ""; - for( var i = 0; i < associations.length; i++ ) { - var parts = associations[i].split("="); - if( parts[0] == ext ) { - launchAppPath = parts[1]; - break; - } - } - if( launchAppPath != "" ) { - // Launch the local application (with dummy args for the moment) - // create an nsILocalFile for the executable - var file = Components.classes["@mozilla.org/file/local;1"] - .createInstance(Components.interfaces.nsILocalFile); - try { - file.initWithPath(launchAppPath); - } catch (err) { - alert("Unable to initialize the executable with path [" + launchAppPath + "]"); - return; - } - // create an nsIProcess - var process = Components.classes["@mozilla.org/process/util;1"] - .createInstance(Components.interfaces.nsIProcess); - try { - process.init(file); - } catch (err) { - alert("Error while initializing the nsIProcess : " + err); - return; - } - // Run the process. - // If first param is true, calling thread will be blocked until - // called process terminates. - // Second and third params are used to pass command-line arguments - // to the process. - var args = (webdavUrl == "") ? [] : [webdavUrl]; - try { - process.run(false, args, args.length); - } catch (err) { - alert("Error while executing the nsIProcess : " + err); - return; - } - return; - } - alert("No application is associated for extension [" + ext + "], please adjust your foxwiki preferences."); -} - -/* - * We might be able to avoid using this function if we can invoke a function on the page to do the conversion. - */ -function getDavUrl(httpUrl) { - var xwiki_attachment_signature = "/xwiki/bin/download/"; - var xwiki_webdav_signature = "/xwiki/webdav/spaces/"; - var davUrl = ""; - if( -1 != httpUrl.indexOf(xwiki_attachment_signature) ) { - var parts = httpUrl.split(xwiki_attachment_signature); - var elements = parts[1].split("/"); - if( elements.length == 3 ) { - davUrl = parts[0] + xwiki_webdav_signature + elements[0] + "/" + elements[0] + "." + elements[1] + "/" + elements[2]; - } - } - return davUrl; -} diff --git a/xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-core/src/main/resources/content/browser.xul b/xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-core/src/main/resources/content/browser.xul deleted file mode 100644 index eedcc87a060e..000000000000 --- a/xwiki-platform-tools/xwiki-platform-tool-foxwiki/xwiki-platform-tool-foxwiki-core/src/main/resources/content/browser.xul +++ /dev/null @@ -1,41 +0,0 @@ - - - -