From 14e5e3b3a6375a549838e79f58323212012c2891 Mon Sep 17 00:00:00 2001 From: JC Brand Date: Thu, 15 Jul 2021 12:47:19 +0200 Subject: [PATCH] Bump more deps and update changelog to mention required Node version --- CHANGES.md | 38 +++++++++++++++--------- Makefile | 13 +++++++- package-lock.json | 76 ++++++++++++++++++++++++++++++----------------- package.json | 6 ++-- 4 files changed, 87 insertions(+), 46 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 68789186c..0f83c8223 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -2,35 +2,45 @@ ## 8.0.0 (Unreleased) +- Requires Node 12 or above + +### Issues and features + - #1083: Add support for XEP-0393 Message Styling - #1182: Add support for XEP-0454 OMEMO Media sharing +- #1823: New config options [mam_request_all_pages](https://conversejs.org/docs/html/configuration.html#mam-request-all-pages) - #2275: Allow punctuation to immediately precede a mention - #2348: `auto_join_room` not showing the room in `fullscreen` `view_mode`. - #2400: Fixes infinite loop bug when appending .png to allowed image urls - #2409: Integrate App Badging API for unread messages - #2464: New configuration setting [allow-url-history-change](https://conversejs.org/docs/html/configuration.html#allow-url-history-change) - #2497: Bugfix /nick command is not working +- Add a Description Of A Project (DOAP) file +- Add ability to deregister nickname when closing a MUC by setting `auto_register_muc_nickname` to `'unregister'`. - Add support for XEP-0437 Room Activity Indicators see [muc-subscribe-to-rai](https://conversejs.org/docs/html/configuration.html#muc-subscribe-to-rai) -- Bugfix: Use real JID in XEP-0372 references only when the MUC is non-anonymous +- Add support for rendering unfurls via [mod_ogp](https://modules.prosody.im/mod_ogp.html) - Bugfix: Connection protocol not updated based on XEP-0156 connection methods +- Bugfix: Use real JID in XEP-0372 references only when the MUC is non-anonymous - Bugfix: `null` inserted by emoji picker and can't switch between skintones +- File structure reordering: All plugins are now in `./plugins` folders. +- Show a gap placeholder when there are gaps in the chat history. The user can click these to fill the gaps. +- Use the MUC stanza id when sending XEP-0333 markers + +### New configuration setings + +- [show_tab_notifications](https://conversejs.org/docs/html/configuration.html#show-tab-notifications) +- [muc_clear_messages_on_leave](https://conversejs.org/docs/html/configuration.html#muc-clear-messages-on-leave) +- [send_chat_markers](https://conversejs.org/docs/html/configuration.html#send-chat-markers) +- [muc_show_ogp_unfurls](https://conversejs.org/docs/html/configuration.html#muc-show-ogp-unfurls) +- [prune-messages-above](https://conversejs.org/docs/html/configuration.html#prune-messages-above) +- [pruning_behavior](https://conversejs.org/docs/html/configuration.html#pruning-behavior) + +### New hooks and events + - New hook: [getMessageActionButtons](https://conversejs.org/docs/html/api/-_converse.html#event:getMessageActionButtons) - New hook: [shouldNotifyOfGroupMessage](https://conversejs.org/docs/html/api/-_converse.html#event:shouldNotifyOfGroupMessage) - New hook: [presenceConstructed](https://conversejs.org/docs/html/api/-_converse.html#event:presenceConstructed) - New event: [historyPruned](https://conversejs.org/docs/html/api/-_converse.html#event:historyPruned) -- File structure reordering: All plugins are now in `./plugins` folders. -- New configuration setting: [show_tab_notifications](https://conversejs.org/docs/html/configuration.html#show-tab-notifications) -- New configuration setting: [muc_clear_messages_on_leave](https://conversejs.org/docs/html/configuration.html#muc-clear-messages-on-leave) -- New configuration setting: [send_chat_markers](https://conversejs.org/docs/html/configuration.html#send-chat-markers) -- New configuration setting: [muc_show_ogp_unfurls](https://conversejs.org/docs/html/configuration.html#muc-show-ogp-unfurls) -- New configuration setting: [prune-messages-above](https://conversejs.org/docs/html/configuration.html#prune-messages-above) -- New configuration setting: [pruning_behavior](https://conversejs.org/docs/html/configuration.html#pruning-behavior) -- #1823: New config options [mam_request_all_pages](https://conversejs.org/docs/html/configuration.html#mam-request-all-pages) -- Use the MUC stanza id when sending XEP-0333 markers -- Add support for rendering unfurls via [mod_ogp](https://modules.prosody.im/mod_ogp.html) -- Add a Description Of A Project (DOAP) file -- Add ability to deregister nickname when closing a MUC by setting `auto_register_muc_nickname` to `'unregister'`. -- Show a gap placeholder when there are gaps in the chat history. The user can click these to fill the gaps. ### Breaking Changes diff --git a/Makefile b/Makefile index 07cccc194..102821c1b 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ BOOTSTRAP = ./node_modules/ BUILDDIR = ./docs KARMA ?= ./node_modules/.bin/karma CHROMIUM ?= ./node_modules/.bin/run-headless-chromium -CLEANCSS ?= ./node_modules/clean-css-cli/bin/cleancss --skip-rebase +CLEANCSS ?= ./node_modules/clean-css-cli/bin/cleancss ESLINT ?= ./node_modules/.bin/eslint HTTPSERVE ?= ./node_modules/.bin/http-server HTTPSERVE_PORT ?= 8000 @@ -115,6 +115,17 @@ postrelease: $(LERNA): npm install lerna +${NVM_DIR}/nvm.sh: + wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.38.0/install.sh | bash + source ~/.bashrc + +.PHONY: nvm +nvm: ${NVM_DIR}/nvm.sh + +.PHONY: node +node: .nvmrc + . $(HOME)/.nvm/nvm.sh && nvm install + package-lock.json: package.json npm install diff --git a/package-lock.json b/package-lock.json index 7e4daea09..e3213ebf5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -27,7 +27,7 @@ "sprintf-js": "^1.1.2", "strophe.js": "1.4.2", "urijs": "^1.19.6", - "xss": "^1.0.8" + "xss": "^1.0.9" }, "devDependencies": { "@babel/cli": "^7.14.5", @@ -47,7 +47,7 @@ "file-loader": "^6.2.0", "html-webpack-plugin": "^5.3.2", "http-server": "^0.12.3", - "imports-loader": "^0.8.0", + "imports-loader": "^3.0.0", "install": "^0.13.0", "jsdoc": "^3.6.7", "karma": "^6.3.4", @@ -59,7 +59,7 @@ "lerna": "^4.0.0", "mini-css-extract-plugin": "^1.6.2", "minimist": "^1.2.3", - "npm": "^7.19.0", + "npm": "^7.19.1", "po-loader": "^0.5.0", "po2json": "^1.0.0-beta", "postcss-clean": "^1.2.2", @@ -11076,16 +11076,23 @@ } }, "node_modules/imports-loader": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/imports-loader/-/imports-loader-0.8.0.tgz", - "integrity": "sha512-kXWL7Scp8KQ4552ZcdVTeaQCZSLW+e6nJfp3cwUMB673T7Hr98Xjx5JK+ql7ADlJUvj1JS5O01RLbKoutN5QDQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/imports-loader/-/imports-loader-3.0.0.tgz", + "integrity": "sha512-PhDB+rxpc95/1cM8ehxWAcuDIDi3eXhqHhax09iyUeAYBJ2bT6QbBp7aDj8IfU9Ns+2l1K226GhoWVAU823CTA==", "dev": true, "dependencies": { - "loader-utils": "^1.0.2", - "source-map": "^0.6.1" + "source-map": "^0.6.1", + "strip-comments": "^2.0.1" }, "engines": { - "node": ">= 4" + "node": ">= 12.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "^5.0.0" } }, "node_modules/imports-loader/node_modules/source-map": { @@ -14189,9 +14196,9 @@ } }, "node_modules/npm": { - "version": "7.19.0", - "resolved": "https://registry.npmjs.org/npm/-/npm-7.19.0.tgz", - "integrity": "sha512-bak/ZycWS8kalVFJ2m1JEo2pgvSwEDA9FMGthGnufAKciu4X4kpJMDZKe8VZKNaA/cXehd9XI7QdSZXmZauR8Q==", + "version": "7.19.1", + "resolved": "https://registry.npmjs.org/npm/-/npm-7.19.1.tgz", + "integrity": "sha512-aN3hZzGkPzKOyhjXtOhnQTGumorFhgpOU6xfuQsF1nJKh4DhsgfOMG4s/SNx56r4xHPvM5m/sk914wzDgKba3A==", "bundleDependencies": [ "@npmcli/arborist", "@npmcli/ci-detect", @@ -21190,6 +21197,15 @@ "node": ">=8" } }, + "node_modules/strip-comments": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/strip-comments/-/strip-comments-2.0.1.tgz", + "integrity": "sha512-ZprKx+bBLXv067WTCALv8SSz5l2+XhpYCsVtSqlMnkAXMWDq+/ekVbl1ghqP9rUHTzv6sm/DwCOiYutU/yp1fw==", + "dev": true, + "engines": { + "node": ">=10" + } + }, "node_modules/strip-final-newline": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", @@ -23208,7 +23224,6 @@ "version": "7.4.5", "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.5.tgz", "integrity": "sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g==", - "devOptional": true, "engines": { "node": ">=8.3.0" }, @@ -23241,9 +23256,9 @@ } }, "node_modules/xss": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/xss/-/xss-1.0.8.tgz", - "integrity": "sha512-3MgPdaXV8rfQ/pNn16Eio6VXYPTkqwa0vc7GkiymmY/DqR1SE/7VPAAVZz1GJsJFrllMYO3RHfEaiUGjab6TNw==", + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/xss/-/xss-1.0.9.tgz", + "integrity": "sha512-2t7FahYnGJys6DpHLhajusId7R0Pm2yTmuL0GV9+mV0ZlaLSnb2toBmppATfg5sWIhZQGlsTLoecSzya+l4EAQ==", "dependencies": { "commander": "^2.20.3", "cssfilter": "0.0.10" @@ -32014,13 +32029,13 @@ } }, "imports-loader": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/imports-loader/-/imports-loader-0.8.0.tgz", - "integrity": "sha512-kXWL7Scp8KQ4552ZcdVTeaQCZSLW+e6nJfp3cwUMB673T7Hr98Xjx5JK+ql7ADlJUvj1JS5O01RLbKoutN5QDQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/imports-loader/-/imports-loader-3.0.0.tgz", + "integrity": "sha512-PhDB+rxpc95/1cM8ehxWAcuDIDi3eXhqHhax09iyUeAYBJ2bT6QbBp7aDj8IfU9Ns+2l1K226GhoWVAU823CTA==", "dev": true, "requires": { - "loader-utils": "^1.0.2", - "source-map": "^0.6.1" + "source-map": "^0.6.1", + "strip-comments": "^2.0.1" }, "dependencies": { "source-map": { @@ -34454,9 +34469,9 @@ "dev": true }, "npm": { - "version": "7.19.0", - "resolved": "https://registry.npmjs.org/npm/-/npm-7.19.0.tgz", - "integrity": "sha512-bak/ZycWS8kalVFJ2m1JEo2pgvSwEDA9FMGthGnufAKciu4X4kpJMDZKe8VZKNaA/cXehd9XI7QdSZXmZauR8Q==", + "version": "7.19.1", + "resolved": "https://registry.npmjs.org/npm/-/npm-7.19.1.tgz", + "integrity": "sha512-aN3hZzGkPzKOyhjXtOhnQTGumorFhgpOU6xfuQsF1nJKh4DhsgfOMG4s/SNx56r4xHPvM5m/sk914wzDgKba3A==", "dev": true, "requires": { "@npmcli/arborist": "^2.6.4", @@ -39770,6 +39785,12 @@ "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==", "dev": true }, + "strip-comments": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/strip-comments/-/strip-comments-2.0.1.tgz", + "integrity": "sha512-ZprKx+bBLXv067WTCALv8SSz5l2+XhpYCsVtSqlMnkAXMWDq+/ekVbl1ghqP9rUHTzv6sm/DwCOiYutU/yp1fw==", + "dev": true + }, "strip-final-newline": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", @@ -41296,7 +41317,6 @@ "version": "7.4.5", "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.5.tgz", "integrity": "sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g==", - "devOptional": true, "requires": {} }, "xmlcreate": { @@ -41312,9 +41332,9 @@ "optional": true }, "xss": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/xss/-/xss-1.0.8.tgz", - "integrity": "sha512-3MgPdaXV8rfQ/pNn16Eio6VXYPTkqwa0vc7GkiymmY/DqR1SE/7VPAAVZz1GJsJFrllMYO3RHfEaiUGjab6TNw==", + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/xss/-/xss-1.0.9.tgz", + "integrity": "sha512-2t7FahYnGJys6DpHLhajusId7R0Pm2yTmuL0GV9+mV0ZlaLSnb2toBmppATfg5sWIhZQGlsTLoecSzya+l4EAQ==", "requires": { "commander": "^2.20.3", "cssfilter": "0.0.10" diff --git a/package.json b/package.json index 633d754af..e9529a2b2 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,7 @@ "file-loader": "^6.2.0", "html-webpack-plugin": "^5.3.2", "http-server": "^0.12.3", - "imports-loader": "^0.8.0", + "imports-loader": "^3.0.0", "install": "^0.13.0", "jsdoc": "^3.6.7", "karma": "^6.3.4", @@ -92,7 +92,7 @@ "lerna": "^4.0.0", "mini-css-extract-plugin": "^1.6.2", "minimist": "^1.2.3", - "npm": "^7.19.0", + "npm": "^7.19.1", "po-loader": "^0.5.0", "po2json": "^1.0.0-beta", "postcss-clean": "^1.2.2", @@ -114,6 +114,6 @@ "favico.js-slevomat": "^0.3.11", "jed": "1.1.1", "lit": "^2.0.0-rc.2", - "xss": "^1.0.8" + "xss": "^1.0.9" } }