From 0bc1fc859eeab0fb3ca2876133531a96ca10813f Mon Sep 17 00:00:00 2001 From: Niicck Date: Thu, 11 Jul 2024 20:45:32 -0500 Subject: [PATCH 1/4] Convert already_processed to a set() We basically removed the recursive functionality of already_processed in this PR: https://github.com/MrBin99/django-vite/pull/109/files We did that because the list concatenation was getting so large for some users. But we can keep the benefits of saving the recursive tags we've already_processed (and do so without excessive bloat) by turning already_processed into a set(). --- django_vite/core/asset_loader.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/django_vite/core/asset_loader.py b/django_vite/core/asset_loader.py index 0871104..606b20f 100644 --- a/django_vite/core/asset_loader.py +++ b/django_vite/core/asset_loader.py @@ -1,6 +1,6 @@ import json from pathlib import Path -from typing import Dict, List, Callable, NamedTuple, Optional, Union +from typing import Dict, List, Callable, NamedTuple, Optional, Union, Set from urllib.parse import urljoin import warnings @@ -427,13 +427,13 @@ def _load_css_files_of_asset( class GeneratedCssFilesOutput(NamedTuple): # list of generated CSS tags tags: List[Tag] - # list of already processed CSS tags - already_processed: List[str] + # set of already processed CSS tags + already_processed: Set[str] def _generate_css_files_of_asset( self, path: str, - already_processed: Optional[List[str]] = None, + already_processed: Optional[Set[str]] = None, tag_generator: Callable[[str], Tag] = TagGenerator.stylesheet, ) -> GeneratedCssFilesOutput: """ @@ -449,21 +449,22 @@ def _generate_css_files_of_asset( already_processed -- List of already processed css paths """ if already_processed is None: - already_processed = [] + already_processed = set() tags: List[Tag] = [] manifest_entry = self.manifest.get(path) for import_path in manifest_entry.imports: - new_tags, _ = self._generate_css_files_of_asset( + new_tags, new_already_processed = self._generate_css_files_of_asset( import_path, already_processed, tag_generator ) + already_processed.update(new_already_processed) tags.extend(new_tags) for css_path in manifest_entry.css: if css_path not in already_processed: url = self._get_production_server_url(css_path) tags.append(tag_generator(url)) - already_processed.append(css_path) + already_processed.add(css_path) return self.GeneratedCssFilesOutput(tags, already_processed) From 00acae0f30a8501b9a6768051b64d90ca3a5e564 Mon Sep 17 00:00:00 2001 From: Niicck Date: Thu, 11 Jul 2024 20:50:37 -0500 Subject: [PATCH 2/4] add test for recursive imports --- tests/data/staticfiles/recursion.json | 636 ++++++++++++++++++++ tests/tests/templatetags/test_vite_asset.py | 28 + 2 files changed, 664 insertions(+) create mode 100644 tests/data/staticfiles/recursion.json diff --git a/tests/data/staticfiles/recursion.json b/tests/data/staticfiles/recursion.json new file mode 100644 index 0000000..7cb070e --- /dev/null +++ b/tests/data/staticfiles/recursion.json @@ -0,0 +1,636 @@ +{ + "_amplitude-BqIUHVjC.js": { + "file": "assets/amplitude-BqIUHVjC.js", + "name": "amplitude", + "imports": [ + "_style-Dxcc6stL.js" + ] + }, + "_color_picker-CKZ2E54K.js": { + "file": "assets/color_picker-CKZ2E54K.js", + "name": "color_picker", + "imports": [ + "_vendor-B9930neC.js", + "_style-Dxcc6stL.js" + ] + }, + "_constants-D5WhxMRS.js": { + "file": "assets/constants-D5WhxMRS.js", + "name": "constants", + "imports": [ + "_style-Dxcc6stL.js" + ] + }, + "_crisp.esm-!~{00j}~.js": { + "file": "assets/crisp-DtfsVk0E.css", + "src": "_crisp.esm-!~{00j}~.js" + }, + "_crisp.esm-DXbjCVc2.js": { + "file": "assets/crisp.esm-DXbjCVc2.js", + "name": "crisp.esm", + "imports": [ + "_style-Dxcc6stL.js" + ], + "css": [ + "assets/crisp-DtfsVk0E.css" + ] + }, + "_error_boundary-g4F10Q2g.js": { + "file": "assets/error_boundary-g4F10Q2g.js", + "name": "error_boundary", + "imports": [ + "_vendor-B9930neC.js", + "_style-Dxcc6stL.js" + ], + "dynamicImports": [ + "src/components/ui/modals/upgrade_modal.jsx" + ] + }, + "_features-Dk84NdjC.js": { + "file": "assets/features-Dk84NdjC.js", + "name": "features", + "imports": [ + "_error_boundary-g4F10Q2g.js", + "_style-Dxcc6stL.js" + ] + }, + "_import_by_url-CLa_9B8T.js": { + "file": "assets/import_by_url-CLa_9B8T.js", + "name": "import_by_url", + "imports": [ + "_vendor-B9930neC.js", + "_error_boundary-g4F10Q2g.js", + "_style-Dxcc6stL.js", + "_useDispatch-B66FMRzs.js" + ] + }, + "_index-6tKqtWJS.js": { + "file": "assets/index-6tKqtWJS.js", + "name": "index", + "imports": [ + "_style-Dxcc6stL.js", + "_vendor-B9930neC.js" + ] + }, + "_index-7rWCZO-9.js": { + "file": "assets/index-7rWCZO-9.js", + "name": "index", + "imports": [ + "_vendor-B9930neC.js", + "_error_boundary-g4F10Q2g.js", + "_modifiers.esm-CNJerG6i.js", + "_constants-D5WhxMRS.js", + "_useHover-0Rvzd9gn.js", + "_style-Dxcc6stL.js", + "_useDispatch-B66FMRzs.js" + ] + }, + "_leave_page-CuUDUBGG.js": { + "file": "assets/leave_page-CuUDUBGG.js", + "name": "leave_page", + "imports": [ + "_vendor-B9930neC.js", + "_style-Dxcc6stL.js" + ] + }, + "_loader-DNet07S3.js": { + "file": "assets/loader-DNet07S3.js", + "name": "loader", + "imports": [ + "_vendor-B9930neC.js", + "_style-Dxcc6stL.js" + ] + }, + "_modifiers.esm-CNJerG6i.js": { + "file": "assets/modifiers.esm-CNJerG6i.js", + "name": "modifiers.esm", + "imports": [ + "_vendor-B9930neC.js" + ] + }, + "_plans_list_shopify-CvjxbzSR.js": { + "file": "assets/plans_list_shopify-CvjxbzSR.js", + "name": "plans_list_shopify", + "imports": [ + "_vendor-B9930neC.js", + "_style-Dxcc6stL.js", + "_constants-D5WhxMRS.js" + ] + }, + "_premium_button-CFl_-ady.js": { + "file": "assets/premium_button-CFl_-ady.js", + "name": "premium_button", + "imports": [ + "_vendor-B9930neC.js", + "_features-Dk84NdjC.js", + "_error_boundary-g4F10Q2g.js", + "_style-Dxcc6stL.js", + "_useDispatch-B66FMRzs.js" + ] + }, + "_style-!~{004}~.js": { + "file": "assets/style-wjhWB3DI.css", + "src": "_style-!~{004}~.js" + }, + "_style-Dxcc6stL.js": { + "file": "assets/style-Dxcc6stL.js", + "name": "style", + "imports": [ + "_vendor-B9930neC.js" + ], + "css": [ + "assets/style-wjhWB3DI.css" + ] + }, + "_upload_modal-DHhiNB01.js": { + "file": "assets/upload_modal-DHhiNB01.js", + "name": "upload_modal", + "imports": [ + "_error_boundary-g4F10Q2g.js", + "_vendor-B9930neC.js", + "_style-Dxcc6stL.js" + ], + "dynamicImports": [ + "src/components/library/index.jsx" + ] + }, + "_useDispatch-B66FMRzs.js": { + "file": "assets/useDispatch-B66FMRzs.js", + "name": "useDispatch", + "imports": [ + "_error_boundary-g4F10Q2g.js" + ] + }, + "_useHover-0Rvzd9gn.js": { + "file": "assets/useHover-0Rvzd9gn.js", + "name": "useHover", + "imports": [ + "_vendor-B9930neC.js", + "_style-Dxcc6stL.js" + ] + }, + "_vendor-!~{005}~.js": { + "file": "assets/vendor-GH1NkoEL.css", + "src": "_vendor-!~{005}~.js" + }, + "_vendor-B9930neC.js": { + "file": "assets/vendor-B9930neC.js", + "name": "vendor", + "imports": [ + "_style-Dxcc6stL.js" + ], + "css": [ + "assets/vendor-GH1NkoEL.css" + ] + }, + "_widget_layouts-CNC9fPvz.js": { + "file": "assets/widget_layouts-CNC9fPvz.js", + "name": "widget_layouts", + "imports": [ + "_vendor-B9930neC.js", + "_style-Dxcc6stL.js" + ] + }, + "src/components/changelog/index.jsx": { + "file": "assets/index-0Ozt0g1o.js", + "name": "index", + "src": "src/components/changelog/index.jsx", + "isDynamicEntry": true, + "imports": [ + "_vendor-B9930neC.js", + "_style-Dxcc6stL.js" + ] + }, + "src/components/library/index.jsx": { + "file": "assets/index-xW6-jMZp.js", + "name": "index", + "src": "src/components/library/index.jsx", + "isDynamicEntry": true, + "imports": [ + "_vendor-B9930neC.js", + "_error_boundary-g4F10Q2g.js", + "_constants-D5WhxMRS.js", + "_import_by_url-CLa_9B8T.js", + "_style-Dxcc6stL.js", + "_useDispatch-B66FMRzs.js" + ] + }, + "src/components/library_new_widget/index.jsx": { + "file": "assets/index-DqhaZr8N.js", + "name": "index", + "src": "src/components/library_new_widget/index.jsx", + "isDynamicEntry": true, + "imports": [ + "_vendor-B9930neC.js", + "_error_boundary-g4F10Q2g.js", + "_constants-D5WhxMRS.js", + "_features-Dk84NdjC.js", + "_style-Dxcc6stL.js", + "_useDispatch-B66FMRzs.js" + ] + }, + "src/components/not_found.jsx": { + "file": "assets/not_found-Z6wedmsh.js", + "name": "not_found", + "src": "src/components/not_found.jsx", + "isDynamicEntry": true, + "imports": [ + "_vendor-B9930neC.js", + "_style-Dxcc6stL.js" + ] + }, + "src/components/onboarding/cards/install.card.jsx": { + "file": "assets/install.card-B42lC2_x.js", + "name": "install.card", + "src": "src/components/onboarding/cards/install.card.jsx", + "isDynamicEntry": true, + "imports": [ + "_vendor-B9930neC.js", + "_index-6tKqtWJS.js", + "_error_boundary-g4F10Q2g.js", + "_style-Dxcc6stL.js" + ] + }, + "src/components/onboarding/cards/load.card.jsx": { + "file": "assets/load.card-piWWh6_P.js", + "name": "load.card", + "src": "src/components/onboarding/cards/load.card.jsx", + "isDynamicEntry": true, + "imports": [ + "_vendor-B9930neC.js", + "_style-Dxcc6stL.js" + ] + }, + "src/components/onboarding/cards/widget.card.jsx": { + "file": "assets/widget.card-DkiwxwUI.js", + "name": "widget.card", + "src": "src/components/onboarding/cards/widget.card.jsx", + "isDynamicEntry": true, + "imports": [ + "_vendor-B9930neC.js", + "_amplitude-BqIUHVjC.js", + "_error_boundary-g4F10Q2g.js", + "_style-Dxcc6stL.js", + "_useDispatch-B66FMRzs.js" + ] + }, + "src/components/onboarding/onboarding.jsx": { + "file": "assets/onboarding-bPHITnKr.js", + "name": "onboarding", + "src": "src/components/onboarding/onboarding.jsx", + "isDynamicEntry": true, + "imports": [ + "_error_boundary-g4F10Q2g.js", + "_vendor-B9930neC.js", + "_style-Dxcc6stL.js" + ], + "dynamicImports": [ + "src/components/onboarding/shopify_strict/index.jsx" + ] + }, + "src/components/onboarding/shopify_strict/index.jsx": { + "file": "assets/index-rWGLto7R.js", + "name": "index", + "src": "src/components/onboarding/shopify_strict/index.jsx", + "isDynamicEntry": true, + "imports": [ + "_error_boundary-g4F10Q2g.js", + "_vendor-B9930neC.js", + "_amplitude-BqIUHVjC.js", + "_constants-D5WhxMRS.js", + "_style-Dxcc6stL.js", + "_useDispatch-B66FMRzs.js" + ], + "dynamicImports": [ + "src/components/onboarding/cards/widget.card.jsx", + "src/components/onboarding/cards/load.card.jsx", + "src/components/onboarding/cards/install.card.jsx" + ] + }, + "src/components/post/index.jsx": { + "file": "assets/index-Bm2xnsiX.js", + "name": "index", + "src": "src/components/post/index.jsx", + "isDynamicEntry": true, + "imports": [ + "_vendor-B9930neC.js", + "_error_boundary-g4F10Q2g.js", + "_constants-D5WhxMRS.js", + "_premium_button-CFl_-ady.js", + "_leave_page-CuUDUBGG.js", + "_style-Dxcc6stL.js", + "_useDispatch-B66FMRzs.js", + "_features-Dk84NdjC.js" + ] + }, + "src/components/settings/settings.jsx": { + "file": "assets/settings-COPeu3_X.js", + "name": "settings", + "src": "src/components/settings/settings.jsx", + "isDynamicEntry": true, + "imports": [ + "_vendor-B9930neC.js", + "_error_boundary-g4F10Q2g.js", + "_constants-D5WhxMRS.js", + "_amplitude-BqIUHVjC.js", + "_style-Dxcc6stL.js", + "_useDispatch-B66FMRzs.js" + ] + }, + "src/components/subscription/subscription.jsx": { + "file": "assets/subscription-C_QhHRQi.js", + "name": "subscription", + "src": "src/components/subscription/subscription.jsx", + "isDynamicEntry": true, + "imports": [ + "_vendor-B9930neC.js", + "_plans_list_shopify-CvjxbzSR.js", + "_amplitude-BqIUHVjC.js", + "_style-Dxcc6stL.js", + "_constants-D5WhxMRS.js" + ] + }, + "src/components/subscription/subscription_change.jsx": { + "file": "assets/subscription_change-CYt2jfVg.js", + "name": "subscription_change", + "src": "src/components/subscription/subscription_change.jsx", + "isDynamicEntry": true, + "imports": [ + "_vendor-B9930neC.js", + "_error_boundary-g4F10Q2g.js", + "_plans_list_shopify-CvjxbzSR.js", + "_amplitude-BqIUHVjC.js", + "_style-Dxcc6stL.js", + "_useDispatch-B66FMRzs.js", + "_constants-D5WhxMRS.js" + ] + }, + "src/components/ui/modals/upgrade_modal.jsx": { + "file": "assets/upgrade_modal-Cw2r8TzW.js", + "name": "upgrade_modal", + "src": "src/components/ui/modals/upgrade_modal.jsx", + "isDynamicEntry": true, + "imports": [ + "_vendor-B9930neC.js", + "_error_boundary-g4F10Q2g.js", + "_style-Dxcc6stL.js", + "_useDispatch-B66FMRzs.js" + ] + }, + "src/components/widget/index.jsx": { + "file": "assets/index-I1k9tRzA.js", + "name": "index", + "src": "src/components/widget/index.jsx", + "isDynamicEntry": true, + "imports": [ + "_error_boundary-g4F10Q2g.js", + "_vendor-B9930neC.js", + "_premium_button-CFl_-ady.js", + "_useHover-0Rvzd9gn.js", + "_style-Dxcc6stL.js", + "_useDispatch-B66FMRzs.js", + "_upload_modal-DHhiNB01.js", + "_features-Dk84NdjC.js", + "_import_by_url-CLa_9B8T.js", + "_leave_page-CuUDUBGG.js" + ], + "dynamicImports": [ + "src/components/widget_types/highlights/feeds.jsx", + "src/components/widget_types/carousel/index.jsx", + "src/components/widget_types/posts/index.jsx" + ] + }, + "src/components/widget/style.jsx": { + "file": "assets/style-DmpGk7Lc.js", + "name": "style", + "src": "src/components/widget/style.jsx", + "isDynamicEntry": true, + "imports": [ + "_error_boundary-g4F10Q2g.js", + "_vendor-B9930neC.js", + "_leave_page-CuUDUBGG.js", + "_style-Dxcc6stL.js", + "_useDispatch-B66FMRzs.js" + ], + "dynamicImports": [ + "src/components/widget_types/posts/style/index.jsx", + "src/components/widget_types/carousel/style/index.jsx", + "src/components/widget_types/highlights/feed_style.jsx" + ] + }, + "src/components/widget_embed/index.jsx": { + "file": "assets/index-Cyn-9K-H.js", + "name": "index", + "src": "src/components/widget_embed/index.jsx", + "isDynamicEntry": true, + "imports": [ + "_vendor-B9930neC.js", + "_index-6tKqtWJS.js", + "_useHover-0Rvzd9gn.js", + "_error_boundary-g4F10Q2g.js", + "_style-Dxcc6stL.js" + ] + }, + "src/components/widget_new/index.jsx": { + "file": "assets/index-0OVpdqKN.js", + "name": "index", + "src": "src/components/widget_new/index.jsx", + "isDynamicEntry": true, + "imports": [ + "_vendor-B9930neC.js", + "_constants-D5WhxMRS.js", + "_error_boundary-g4F10Q2g.js", + "_style-Dxcc6stL.js", + "_useDispatch-B66FMRzs.js" + ] + }, + "src/components/widget_types/carousel/index.jsx": { + "file": "assets/index-DHMp9mDW.js", + "name": "index", + "src": "src/components/widget_types/carousel/index.jsx", + "isDynamicEntry": true, + "imports": [ + "_vendor-B9930neC.js", + "_index-7rWCZO-9.js", + "_style-Dxcc6stL.js", + "_error_boundary-g4F10Q2g.js", + "_modifiers.esm-CNJerG6i.js", + "_constants-D5WhxMRS.js", + "_useHover-0Rvzd9gn.js", + "_useDispatch-B66FMRzs.js" + ] + }, + "src/components/widget_types/carousel/style/index.jsx": { + "file": "assets/index-CSIbAbbk.js", + "name": "index", + "src": "src/components/widget_types/carousel/style/index.jsx", + "isDynamicEntry": true, + "imports": [ + "_vendor-B9930neC.js", + "_style-Dxcc6stL.js", + "_constants-D5WhxMRS.js", + "_color_picker-CKZ2E54K.js", + "_features-Dk84NdjC.js", + "_error_boundary-g4F10Q2g.js", + "_widget_layouts-CNC9fPvz.js", + "_useDispatch-B66FMRzs.js" + ] + }, + "src/components/widget_types/highlight/index.jsx": { + "file": "assets/index-DxWN0SH_.js", + "name": "index", + "src": "src/components/widget_types/highlight/index.jsx", + "isDynamicEntry": true, + "imports": [ + "_vendor-B9930neC.js", + "_index-7rWCZO-9.js", + "_error_boundary-g4F10Q2g.js", + "_upload_modal-DHhiNB01.js", + "_style-Dxcc6stL.js", + "_useDispatch-B66FMRzs.js", + "_modifiers.esm-CNJerG6i.js", + "_constants-D5WhxMRS.js", + "_useHover-0Rvzd9gn.js" + ] + }, + "src/components/widget_types/highlights/feed_style.jsx": { + "file": "assets/feed_style-BKJF8wMH.js", + "name": "feed_style", + "src": "src/components/widget_types/highlights/feed_style.jsx", + "isDynamicEntry": true, + "imports": [ + "_vendor-B9930neC.js", + "_style-Dxcc6stL.js", + "_color_picker-CKZ2E54K.js" + ] + }, + "src/components/widget_types/highlights/feeds.jsx": { + "file": "assets/feeds-B-o0GwWd.js", + "name": "feeds", + "src": "src/components/widget_types/highlights/feeds.jsx", + "isDynamicEntry": true, + "imports": [ + "_vendor-B9930neC.js", + "_error_boundary-g4F10Q2g.js", + "_modifiers.esm-CNJerG6i.js", + "_style-Dxcc6stL.js", + "_useDispatch-B66FMRzs.js" + ] + }, + "src/components/widget_types/posts/index.jsx": { + "file": "assets/index-DXjhURK2.js", + "name": "index", + "src": "src/components/widget_types/posts/index.jsx", + "isDynamicEntry": true, + "imports": [ + "_vendor-B9930neC.js", + "_index-7rWCZO-9.js", + "_style-Dxcc6stL.js", + "_error_boundary-g4F10Q2g.js", + "_modifiers.esm-CNJerG6i.js", + "_constants-D5WhxMRS.js", + "_useHover-0Rvzd9gn.js", + "_useDispatch-B66FMRzs.js" + ] + }, + "src/components/widget_types/posts/style/index.jsx": { + "file": "assets/index-D3J1CN8I.js", + "name": "index", + "src": "src/components/widget_types/posts/style/index.jsx", + "isDynamicEntry": true, + "imports": [ + "_vendor-B9930neC.js", + "_widget_layouts-CNC9fPvz.js", + "_style-Dxcc6stL.js", + "_color_picker-CKZ2E54K.js", + "_useHover-0Rvzd9gn.js", + "_constants-D5WhxMRS.js" + ] + }, + "src/components/widgets/index.jsx": { + "file": "assets/index-DBS34U37.js", + "name": "index", + "src": "src/components/widgets/index.jsx", + "isDynamicEntry": true, + "imports": [ + "_vendor-B9930neC.js", + "_error_boundary-g4F10Q2g.js", + "_constants-D5WhxMRS.js", + "_style-Dxcc6stL.js", + "_useDispatch-B66FMRzs.js" + ] + }, + "src/index.jsx": { + "file": "assets/app-DkktLGZS.js", + "name": "app", + "src": "src/index.jsx", + "isEntry": true, + "imports": [ + "_vendor-B9930neC.js", + "_crisp.esm-DXbjCVc2.js", + "_error_boundary-g4F10Q2g.js", + "_constants-D5WhxMRS.js", + "_style-Dxcc6stL.js" + ], + "dynamicImports": [ + "src/components/widget_types/highlight/index.jsx", + "src/components/settings/settings.jsx", + "src/components/not_found.jsx", + "src/components/library/index.jsx", + "src/components/subscription/subscription.jsx", + "src/components/subscription/subscription_change.jsx", + "src/components/onboarding/onboarding.jsx", + "src/components/widgets/index.jsx", + "src/components/widget/index.jsx", + "src/components/widget/style.jsx", + "src/components/widget_new/index.jsx", + "src/components/widget_embed/index.jsx", + "src/components/post/index.jsx" + ] + }, + "src/index.shopify.jsx": { + "file": "assets/shopify_app-8mfHMByc.js", + "name": "shopify_app", + "src": "src/index.shopify.jsx", + "isEntry": true, + "imports": [ + "_vendor-B9930neC.js", + "_crisp.esm-DXbjCVc2.js", + "_error_boundary-g4F10Q2g.js", + "_style-Dxcc6stL.js", + "_loader-DNet07S3.js" + ], + "dynamicImports": [ + "src/components/widget_types/highlight/index.jsx", + "src/components/settings/settings.jsx", + "src/components/not_found.jsx", + "src/components/library/index.jsx", + "src/components/library_new_widget/index.jsx", + "src/components/subscription/subscription_change.jsx", + "src/components/onboarding/shopify_strict/index.jsx", + "src/components/widgets/index.jsx", + "src/components/widget/index.jsx", + "src/components/widget/style.jsx", + "src/components/widget_new/index.jsx", + "src/components/widget_embed/index.jsx", + "src/components/post/index.jsx", + "src/components/changelog/index.jsx" + ] + }, + "src/index.shopify.subscription.jsx": { + "file": "assets/shopify_subscription-BvB-sist.js", + "name": "shopify_subscription", + "src": "src/index.shopify.subscription.jsx", + "isEntry": true, + "imports": [ + "_vendor-B9930neC.js", + "_crisp.esm-DXbjCVc2.js", + "_loader-DNet07S3.js", + "src/components/subscription/subscription.jsx", + "_style-Dxcc6stL.js", + "_plans_list_shopify-CvjxbzSR.js", + "_constants-D5WhxMRS.js", + "_amplitude-BqIUHVjC.js" + ] + } + } diff --git a/tests/tests/templatetags/test_vite_asset.py b/tests/tests/templatetags/test_vite_asset.py index 683a8d3..34d7ab1 100644 --- a/tests/tests/templatetags/test_vite_asset.py +++ b/tests/tests/templatetags/test_vite_asset.py @@ -1,5 +1,7 @@ import pytest from bs4 import BeautifulSoup +from pathlib import Path +from django.conf import settings from django.template import Context, Template, TemplateSyntaxError from django_vite.core.exceptions import ( DjangoViteAssetNotFoundError, @@ -299,3 +301,29 @@ def test_vite_asset_external_app_production(external_vue_app): soup = BeautifulSoup(html, "html.parser") script_tag = soup.find("script") assert script_tag["src"] == "custom/prefix/assets/entry-5c085aac.js" + + +@pytest.mark.parametrize( + "patch_settings", + [ + { + "DJANGO_VITE": { + "default": { + "dev_mode": False, + "manifest_path": Path(settings.STATIC_ROOT) / "recursion.json", + } + } + }, + ], + indirect=True, +) +def test_recursion(patch_settings): + template = Template( + """ + {% load django_vite %} + {% vite_asset 'src/index.jsx' %} + """ + ) + html = template.render(Context({})) + soup = BeautifulSoup(html, "html.parser") + assert True From 872403d32947438a805cd6073e094c065f89973e Mon Sep 17 00:00:00 2001 From: Niicck Date: Thu, 11 Jul 2024 21:09:09 -0500 Subject: [PATCH 3/4] fix circular js import recursion --- django_vite/core/asset_loader.py | 42 +++++++++++++------ .../{recursion.json => circular-imports.json} | 0 tests/tests/templatetags/test_vite_asset.py | 11 +++-- 3 files changed, 36 insertions(+), 17 deletions(-) rename tests/data/staticfiles/{recursion.json => circular-imports.json} (100%) diff --git a/django_vite/core/asset_loader.py b/django_vite/core/asset_loader.py index 606b20f..b83ac6a 100644 --- a/django_vite/core/asset_loader.py +++ b/django_vite/core/asset_loader.py @@ -427,13 +427,16 @@ def _load_css_files_of_asset( class GeneratedCssFilesOutput(NamedTuple): # list of generated CSS tags tags: List[Tag] + # set of already processed js imports + already_processed_js: Set[str] # set of already processed CSS tags - already_processed: Set[str] + already_processed_css: Set[str] def _generate_css_files_of_asset( self, path: str, - already_processed: Optional[Set[str]] = None, + already_processed_js: Optional[Set[str]] = None, + already_processed_css: Optional[Set[str]] = None, tag_generator: Callable[[str], Tag] = TagGenerator.stylesheet, ) -> GeneratedCssFilesOutput: """ @@ -448,25 +451,38 @@ def _generate_css_files_of_asset( tags -- List of CSS tags. already_processed -- List of already processed css paths """ - if already_processed is None: - already_processed = set() + if already_processed_css is None: + already_processed_css = set() + if already_processed_js is None: + already_processed_js = set() tags: List[Tag] = [] manifest_entry = self.manifest.get(path) for import_path in manifest_entry.imports: - new_tags, new_already_processed = self._generate_css_files_of_asset( - import_path, already_processed, tag_generator + if import_path in already_processed_js: + continue + already_processed_js.add(import_path) + ( + new_tags, + new_already_processed_js, + new_already_processed_css, + ) = self._generate_css_files_of_asset( + import_path, already_processed_js, already_processed_css, tag_generator ) - already_processed.update(new_already_processed) + already_processed_js.update(new_already_processed_js) + already_processed_css.update(new_already_processed_css) tags.extend(new_tags) for css_path in manifest_entry.css: - if css_path not in already_processed: - url = self._get_production_server_url(css_path) - tags.append(tag_generator(url)) - already_processed.add(css_path) - - return self.GeneratedCssFilesOutput(tags, already_processed) + if css_path in already_processed_css: + continue + url = self._get_production_server_url(css_path) + tags.append(tag_generator(url)) + already_processed_css.add(css_path) + + return self.GeneratedCssFilesOutput( + tags, already_processed_js, already_processed_css + ) def generate_vite_asset_url(self, path: str) -> str: """ diff --git a/tests/data/staticfiles/recursion.json b/tests/data/staticfiles/circular-imports.json similarity index 100% rename from tests/data/staticfiles/recursion.json rename to tests/data/staticfiles/circular-imports.json diff --git a/tests/tests/templatetags/test_vite_asset.py b/tests/tests/templatetags/test_vite_asset.py index 34d7ab1..3d489f3 100644 --- a/tests/tests/templatetags/test_vite_asset.py +++ b/tests/tests/templatetags/test_vite_asset.py @@ -310,14 +310,18 @@ def test_vite_asset_external_app_production(external_vue_app): "DJANGO_VITE": { "default": { "dev_mode": False, - "manifest_path": Path(settings.STATIC_ROOT) / "recursion.json", + "manifest_path": Path(settings.STATIC_ROOT) + / "circular-imports.json", } } }, ], indirect=True, ) -def test_recursion(patch_settings): +def test_circular_js_imports(patch_settings): + """ + Circular JS imports in a manifest should not cause an infinite recursion error. + """ template = Template( """ {% load django_vite %} @@ -325,5 +329,4 @@ def test_recursion(patch_settings): """ ) html = template.render(Context({})) - soup = BeautifulSoup(html, "html.parser") - assert True + assert html From a12b5b6dae037dceffe2b6721ed2d45eee72f526 Mon Sep 17 00:00:00 2001 From: Niicck Date: Thu, 11 Jul 2024 21:16:25 -0500 Subject: [PATCH 4/4] fix test_load_dynamic_import_manifest --- tests/tests/test_asset_loader.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/tests/test_asset_loader.py b/tests/tests/test_asset_loader.py index ca9c06d..fc4dbee 100644 --- a/tests/tests/test_asset_loader.py +++ b/tests/tests/test_asset_loader.py @@ -1,5 +1,7 @@ import pytest +from pathlib import Path +from django.conf import settings from django_vite.core.asset_loader import DjangoViteConfig, ManifestClient from django_vite.templatetags.django_vite import DjangoViteAssetLoader from django_vite.apps import check_loader_instance @@ -133,17 +135,20 @@ def test_parse_manifest_during_dev_mode(dev_mode_true): [ { "DJANGO_VITE_DEV_MODE": False, - "DJANGO_VITE_MANIFEST_PATH": "dynamic-entry-manifest.json", + "DJANGO_VITE_MANIFEST_PATH": Path(settings.STATIC_ROOT) + / "dynamic-entry-manifest.json", }, { "DJANGO_VITE": { "default": { "dev_mode": False, - "manifest_path": "dynamic-entry-manifest.json", + "manifest_path": Path(settings.STATIC_ROOT) + / "dynamic-entry-manifest.json", } } }, ], + indirect=True, ) def test_load_dynamic_import_manifest(patch_settings): warnings = check_loader_instance()