From cd5d5770054d5a95259c51e17152007f6ecd5b19 Mon Sep 17 00:00:00 2001 From: Mark <16909269+Archmonger@users.noreply.github.com> Date: Thu, 23 Feb 2023 23:50:02 -0800 Subject: [PATCH] 3.0.0a4 (#129) --- CHANGELOG.md | 6 +++--- docs/python/settings.py | 2 +- requirements/pkg-deps.txt | 2 +- src/django_idom/__init__.py | 2 +- src/django_idom/config.py | 10 ++++++---- src/js/package-lock.json | 14 +++++++------- src/js/package.json | 2 +- 7 files changed, 20 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 92d870d2..114dcafb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -36,7 +36,7 @@ Using the following categories, list your changes in this order: - Nothing (yet) -## [3.0.0a3] - 2023-02-21 +## [3.0.0a4] - 2023-02-21 ???+ note @@ -248,8 +248,8 @@ Using the following categories, list your changes in this order: - Support for IDOM within the Django -[unreleased]: https://github.com/idom-team/django-idom/compare/3.0.0a3...HEAD -[3.0.0a3]: https://github.com/idom-team/django-idom/compare/2.2.1...3.0.0a3 +[unreleased]: https://github.com/idom-team/django-idom/compare/3.0.0a4...HEAD +[3.0.0a4]: https://github.com/idom-team/django-idom/compare/2.2.1...3.0.0a4 [2.2.1]: https://github.com/idom-team/django-idom/compare/2.2.0...2.2.1 [2.2.0]: https://github.com/idom-team/django-idom/compare/2.1.0...2.2.0 [2.1.0]: https://github.com/idom-team/django-idom/compare/2.0.1...2.1.0 diff --git a/docs/python/settings.py b/docs/python/settings.py index c8559b4a..1c3c809c 100644 --- a/docs/python/settings.py +++ b/docs/python/settings.py @@ -12,4 +12,4 @@ IDOM_WEBSOCKET_URL = "idom/" # Dotted path to the default `django_idom.hooks.use_query` postprocessor function, or `None` -IDOM_DEFAULT_QUERY_POSTPROCESSOR = "example_project.utils.my_postprocessor" +IDOM_DEFAULT_QUERY_POSTPROCESSOR = "django_idom.utils.django_query_postprocessor" diff --git a/requirements/pkg-deps.txt b/requirements/pkg-deps.txt index c17d5d71..4c093f31 100644 --- a/requirements/pkg-deps.txt +++ b/requirements/pkg-deps.txt @@ -1,5 +1,5 @@ channels >=4.0.0 -idom >=1.0.0a5, <1.1.0 +idom >=1.0.0a6, <1.1.0 aiofile >=3.0 dill >=0.3.5 typing_extensions diff --git a/src/django_idom/__init__.py b/src/django_idom/__init__.py index 7cfa23a9..c4d2122d 100644 --- a/src/django_idom/__init__.py +++ b/src/django_idom/__init__.py @@ -2,7 +2,7 @@ from django_idom.websocket.paths import IDOM_WEBSOCKET_PATH -__version__ = "3.0.0a3" +__version__ = "3.0.0a4" __all__ = [ "IDOM_WEBSOCKET_PATH", "hooks", diff --git a/src/django_idom/config.py b/src/django_idom/config.py index b276b006..99d99c71 100644 --- a/src/django_idom/config.py +++ b/src/django_idom/config.py @@ -1,7 +1,5 @@ from __future__ import annotations -from typing import Dict - from django.conf import settings from django.core.cache import DEFAULT_CACHE_ALIAS from django.db import DEFAULT_DB_ALIAS @@ -12,9 +10,13 @@ from django_idom.utils import import_dotted_path +# Not user configurable settings IDOM_DEBUG_MODE.set_current(getattr(settings, "DEBUG")) -IDOM_REGISTERED_COMPONENTS: Dict[str, ComponentConstructor] = {} -IDOM_VIEW_COMPONENT_IFRAMES: Dict[str, ViewComponentIframe] = {} +IDOM_REGISTERED_COMPONENTS: dict[str, ComponentConstructor] = {} +IDOM_VIEW_COMPONENT_IFRAMES: dict[str, ViewComponentIframe] = {} + + +# Configurable through Django settings.py IDOM_WEBSOCKET_URL = getattr( settings, "IDOM_WEBSOCKET_URL", diff --git a/src/js/package-lock.json b/src/js/package-lock.json index d58618b9..005e3679 100644 --- a/src/js/package-lock.json +++ b/src/js/package-lock.json @@ -5,7 +5,7 @@ "packages": { "": { "dependencies": { - "idom-client-react": "^1.0.0-a5" + "idom-client-react": "^1.0.0-a6" }, "devDependencies": { "@rollup/plugin-commonjs": "^24.0.1", @@ -242,9 +242,9 @@ "integrity": "sha512-L0s3Sid5r6YwrEvkig14SK3Emmc+kIjlfLhEGn2Vy3bk21JyDEes4MoDsbJk6luaPp8bugErnxPz86ZuAw6e5Q==" }, "node_modules/idom-client-react": { - "version": "1.0.0-a5", - "resolved": "https://registry.npmjs.org/idom-client-react/-/idom-client-react-1.0.0-a5.tgz", - "integrity": "sha512-uzkg0qqtEY7xGcc3Yyc3IUzve6aGs0zvxQjf1xFrCxl8XMitdjPYQHdGpOxj+QHvmxgjETkH+5mcR/BO3OlZCQ==", + "version": "1.0.0-a6", + "resolved": "https://registry.npmjs.org/idom-client-react/-/idom-client-react-1.0.0-a6.tgz", + "integrity": "sha512-WExneiovIJ1XGNHUUzR3XUPmFgzleIW0BPiDEtNPhOeqBGgMhW9krCPwKrrbj4FzKWyqDXo0lPiNFB4U4seS2Q==", "dependencies": { "htm": "^3.0.3", "json-pointer": "^0.6.2" @@ -661,9 +661,9 @@ "integrity": "sha512-L0s3Sid5r6YwrEvkig14SK3Emmc+kIjlfLhEGn2Vy3bk21JyDEes4MoDsbJk6luaPp8bugErnxPz86ZuAw6e5Q==" }, "idom-client-react": { - "version": "1.0.0-a5", - "resolved": "https://registry.npmjs.org/idom-client-react/-/idom-client-react-1.0.0-a5.tgz", - "integrity": "sha512-uzkg0qqtEY7xGcc3Yyc3IUzve6aGs0zvxQjf1xFrCxl8XMitdjPYQHdGpOxj+QHvmxgjETkH+5mcR/BO3OlZCQ==", + "version": "1.0.0-a6", + "resolved": "https://registry.npmjs.org/idom-client-react/-/idom-client-react-1.0.0-a6.tgz", + "integrity": "sha512-WExneiovIJ1XGNHUUzR3XUPmFgzleIW0BPiDEtNPhOeqBGgMhW9krCPwKrrbj4FzKWyqDXo0lPiNFB4U4seS2Q==", "requires": { "htm": "^3.0.3", "json-pointer": "^0.6.2" diff --git a/src/js/package.json b/src/js/package.json index 03ad2b57..b36c2d59 100644 --- a/src/js/package.json +++ b/src/js/package.json @@ -17,6 +17,6 @@ "@rollup/plugin-replace": "^5.0.2" }, "dependencies": { - "idom-client-react": "^1.0.0-a5" + "idom-client-react": "^1.0.0-a6" } }