From 588b015e621719b22f1803c4adb5052be534d49c Mon Sep 17 00:00:00 2001 From: JC Brand Date: Thu, 15 Nov 2018 13:23:54 +0100 Subject: [PATCH] Release v4.0.5 --- CHANGES.md | 2 +- COPYRIGHT | 2 +- Makefile | 4 +++- RELEASE.md | 10 +++++----- docs/source/conf.py | 4 ++-- docs/source/quickstart.rst | 8 ++++---- package-lock.json | 2 +- package.json | 2 +- src/headless/package.json | 2 +- 9 files changed, 19 insertions(+), 17 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index b0b8108da..7e106c469 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,6 @@ # Changelog -## 4.0.5 (Unreleased) +## 4.0.5 (2018-11-15) - Error `FATAL: TypeError: Cannot read property 'extend' of undefined` when using `embedded` view mode. - Default paths in converse-notifications.js are now relative diff --git a/COPYRIGHT b/COPYRIGHT index 68b69ba97..deba904d4 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -2,7 +2,7 @@ * * An XMPP chat client that runs in the browser. * - * Version: 4.0.4 + * Version: 4.0.5 * * Copyright: JC Brand 2013-2018 * Except for 3rd party dependencies. diff --git a/Makefile b/Makefile index 45699afce..875476c7a 100644 --- a/Makefile +++ b/Makefile @@ -65,7 +65,7 @@ serve_bg: dev ######################################################################## ## Translation machinery -GETTEXT = xgettext --language="JavaScript" --keyword=__ --keyword=___ --from-code=UTF-8 --output=locale/converse.pot dist/converse-no-dependencies.js --package-name=Converse.js --copyright-holder="Jan-Carel Brand" --package-version=4.0.4 -c +GETTEXT = xgettext --language="JavaScript" --keyword=__ --keyword=___ --from-code=UTF-8 --output=locale/converse.pot dist/converse-no-dependencies.js --package-name=Converse.js --copyright-holder="Jan-Carel Brand" --package-version=4.0.5 -c .PHONY: pot pot: dist/converse-no-dependencies-es2015.js @@ -84,6 +84,8 @@ po2json: .PHONY: release release: + + $(SED) -ri s/_converse.VERSION_NAME = "v[0-9]\+\.[0-9]\+\.[0-9]\+";/ _converse.VERSION_NAME = "$(VERSION)";/ src/headless/converse-core.js $(SED) -ri s/Version:\ [0-9]\+\.[0-9]\+\.[0-9]\+/Version:\ $(VERSION)/ COPYRIGHT $(SED) -ri s/Project-Id-Version:\ Converse\.js\ [0-9]\+\.[0-9]\+\.[0-9]\+/Project-Id-Version:\ Converse.js\ $(VERSION)/ locale/converse.pot $(SED) -ri s/\"version\":\ \"[0-9]\+\.[0-9]\+\.[0-9]\+\"/\"version\":\ \"$(VERSION)\"/ package.json diff --git a/RELEASE.md b/RELEASE.md index 22aadabc0..78261cb48 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,15 +1,15 @@ # Release checklist 1. Run `make check` to check that all tests pass. -2. Decide on a version number, e.g. 4.0.2 -3. Run `make release VERSION=4.0.2` +2. Decide on a version number, e.g. 4.0.6 +3. Run `make release VERSION=4.0.6` 4. Do a `git diff` to check if things look sane. 5. Do a quick manual test with the `dist` files (via `index.html`) -6. `git commit -am "New release 4.0.2"` -7. `git tag -s v4.0.2 +6. `git commit -am "New release 4.0.6"` +7. `git tag -s v4.0.6 8. Run `git push && git push --tags` 9. Update http://conversejs.org -10. Create `4.0.2` directory for the CDN. +10. Create `4.0.6` directory for the CDN. * Create a new version for the CDN by copying * Check out the correct tag * Update `index.html` to point to that version of the CDN diff --git a/docs/source/conf.py b/docs/source/conf.py index 47e2cdd8c..5a9f2128e 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -48,9 +48,9 @@ copyright = u'2018, JC Brand' # built documents. # # The short X.Y version. -version = '4.0.4' +version = '4.0.5' # The full version, including alpha/beta/rc tags. -release = '4.0.4' +release = '4.0.5' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/docs/source/quickstart.rst b/docs/source/quickstart.rst index 4ba118474..c91c232c9 100644 --- a/docs/source/quickstart.rst +++ b/docs/source/quickstart.rst @@ -26,16 +26,16 @@ might break when a new backwards-incompatible version of Converse is released. To load a specific version of Converse you can put the version in the URL: -* https://cdn.conversejs.org/4.0.4/dist/converse.min.js -* https://cdn.conversejs.org/4.0.4/css/converse.min.css +* https://cdn.conversejs.org/4.0.5/dist/converse.min.js +* https://cdn.conversejs.org/4.0.5/css/converse.min.css You can include these two URLs inside the ** element of your website via the *script* and *link* tags: .. code-block:: html - - + + Option 2: Building the files yourself diff --git a/package-lock.json b/package-lock.json index 82c43a591..2e32f7e21 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "converse.js", - "version": "4.0.4", + "version": "4.0.5", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 80011e06d..e2602d585 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "converse.js", - "version": "4.0.4", + "version": "4.0.5", "description": "Browser based XMPP chat client", "main": "dist/converse.js", "directories": { diff --git a/src/headless/package.json b/src/headless/package.json index a759111ae..2919e9897 100644 --- a/src/headless/package.json +++ b/src/headless/package.json @@ -1,6 +1,6 @@ { "name": "@converse/headless", - "version": "4.0.4", + "version": "4.0.5", "description": "Converse.js Headless build", "author": "cmrd Senya ", "homepage": "https://github.com/conversejs/converse.js",