Working on vite support

oarepo_ui/cli.py

@@ -1,12 +1,21 @@
 import json as json_lib
+import re
+import site
 import sys
+from oarepo_runtime.cli import oarepo
+
+from oarepo_ui.proxies import current_oarepo_ui
+
+
+import json
+import os
 from pathlib import Path
 
 import click
+from flask import current_app
 from flask.cli import with_appcontext
-from oarepo_runtime.cli import oarepo
-
-from oarepo_ui.proxies import current_oarepo_ui
+from importlib_metadata import entry_points
+import sys
 
 
 @oarepo.group("ui")
@@ -40,3 +49,215 @@ def renderers(verbose, json, output_file):
                 print(f"{macro:40s}: {Path(lib.filename).name}", file=of)
     if output_file:
         of.close()
+
+
+@oarepo.group()
+def assets():
+    "OARepo asset addons"
+
+
+@assets.command()
+@click.argument("output_file")
+@click.option("--repository-dir")
+@click.option("--assets-dir", default=".assets")
+@with_appcontext
+def collect(output_file, repository_dir, assets_dir):
+    asset_deps = []
+    aliases = {}
+    theme = (current_app.config["APP_THEME"] or ["semantic-ui"])[0]
+
+    for ep in entry_points(group="invenio_assets.webpack"):
+        webpack = ep.load()
+        if theme in webpack.themes:
+            asset_deps.append(webpack.themes[theme].path)
+            aliases.update(webpack.themes[theme].aliases)
+
+    app_and_blueprints = [current_app] + list(current_app.blueprints.values())
+
+    static_deps = []
+    instance_path = current_app.instance_path
+    if instance_path[-1] != "/":
+        instance_path += "/"
+
+    for bp in app_and_blueprints:
+        if (
+            bp.has_static_folder
+            and os.path.isdir(bp.static_folder)
+            and not bp.static_folder.startswith(instance_path)
+        ):
+            static_deps.append(bp.static_folder)
+
+    root_aliases = {}
+    asset_paths = [Path(x) for x in asset_deps]
+    for alias, path in aliases.items():
+        for pth in asset_paths:
+            possible_path = pth / path
+            if possible_path.exists():
+                try:
+                    relative_path = str(
+                        possible_path.relative_to(repository_dir or os.getcwd())
+                    )
+                    root_aliases[alias] = "./" + relative_path
+                except ValueError:
+                    root_aliases[alias] = str(Path(assets_dir) / path)
+
+    with open(output_file, "w") as f:
+        json.dump(
+            {
+                "assets": asset_deps,
+                "static": static_deps,
+                "@aliases": aliases,
+                "@root_aliases": root_aliases,
+            },
+            f,
+            indent=4,
+            ensure_ascii=False,
+        )
+
+
+@assets.command(name="less-components")
+@click.argument("output_file")
+@with_appcontext
+def less_components(output_file):
+    with open(output_file, "w") as f:
+        json.dump(
+            {"components": current_app.config.get("OAREPO_UI_LESS_COMPONENTS", [])}, f
+        )
+
+
+@assets.command(help="Create vite directory and configuration files")
+@click.argument("output_file")
+@with_appcontext
+def vite(output_file):
+    theme = (current_app.config["APP_THEME"] or ["semantic-ui"])[0]
+    assets_path = Path.cwd().resolve() / 'assets'
+    repo_path = assets_path.parent.parent.parent
+
+    site_packages_path = Path(site.getsitepackages()[0])
+    extra_paths = [Path(x) for x in sys.path if Path(x).is_dir()]
+
+    relative_bases = {
+        'python': site_packages_path,
+        'repo': repo_path,
+        **{
+            e.name: e for e in extra_paths
+        }
+    }
+
+    def classified_path(pth: str):
+        if isinstance(pth, Path):
+            pth = str(pth)
+
+        for rb in relative_bases:
+            if pth.startswith(f'{rb}:'):
+                return pth
+        if not pth.startswith('/'):
+            return f'relative:{pth}'
+        trailing_slash = '/' if pth.endswith('/') else ''
+
+        pth = Path(pth)
+        for k, v in relative_bases.items():
+            if pth.is_relative_to(v):
+                return f"{k}:{pth.relative_to(v)}{trailing_slash}"
+        raise Exception(f'Do not have relative path for {pth}')
+
+    aliases = {
+        "~semantic-ui-less/themes/../../less/site/globals": assets_path / "less/site/globals",
+        "~semantic-ui": "node_modules/semantic-ui",
+        "~": "node_modules/",
+        "../../fonts/Lato-(.*)": get_theme_dir('invenio_theme', theme) / "less/invenio_theme/fonts/Lato-$1",
+        "../../fonts/": assets_path / "less/site/globals",
+        "../../../themes/default/assets/fonts/":
+            "repo:node_modules/semantic-ui-css/themes/default/assets/fonts/",
+    }
+    entries = {}
+    dependencies = {
+        'query-string': '^8.1.0'
+    }
+
+    vite_prohibited_aliases = {"../../less/site", "../../less"}
+    vite_extra_aliases = {
+        "../../less/site/globals": "less/site/globals",
+        "../../less/site/": "less/site/",
+    }
+
+    for ep in entry_points(group="invenio_assets.webpack"):
+        webpack = ep.load()
+        if theme in webpack.themes:
+            t = webpack.themes[theme]
+            for alias_name, alias_value in webpack.themes[theme].aliases.items():
+                if alias_name in vite_prohibited_aliases:
+                    continue
+                generate_alias(aliases, alias_name, alias_value, t.path)
+            generate_less_alias(aliases, t.path)
+            for entry_name, entry_value in webpack.entry.items():
+                entries[entry_name] = Path(t.path).joinpath(entry_value).resolve()
+            for k, v in t.dependencies.items():
+                dependencies.setdefault(k, {}).update(v)
+
+    for alias_name, alias_value in vite_extra_aliases.items():
+        generate_alias(
+            aliases, alias_name, alias_value, Path().cwd().resolve()
+        )
+
+    entries = {
+        k: classified_path(v) for k, v in entries.items()
+    }
+    aliases = {
+        k: classified_path(v) for k, v in aliases.items()
+    }
+
+    with open(output_file, "w") as f:
+        json.dump(
+            {
+                "aliases": {str(k): str(v) for k, v in aliases.items()},
+                "entries": entries,
+                "dependencies": dependencies,
+                "base_paths": relative_bases
+            },
+            f,
+            indent=4,
+            ensure_ascii=False,
+            default=str
+        )
+
+    return
+
+
+def generate_alias(aliases, alias_name, alias_value, path):
+    alias_full_path = Path(path).joinpath(alias_value)
+    if not alias_full_path.exists():
+        # try to get site-wide path
+        site_path = Path.cwd().resolve() / "assets"
+        if site_path.joinpath(alias_value).exists():
+            alias_full_path = site_path.joinpath(alias_value)
+    assert (
+        alias_full_path.exists()
+    ), f"Path in alias does not exist: {alias_name=} {alias_value=} {path=}"
+    alias_full_path = str(alias_full_path)
+    if alias_value.endswith('/') and not alias_full_path.endswith('/'):
+        alias_full_path += '/'
+    aliases[alias_name] = alias_full_path
+
+
+def generate_less_alias(aliases, path):
+    already_generated = []
+    for pth in Path(path).glob("**/less"):
+        for apt in reversed(list(pth.glob("**"))):
+            if apt == pth:
+                continue
+            if not apt.is_dir():
+                continue
+            relative = apt.relative_to(pth)
+            already_generated.append(relative.parent)
+            if relative not in already_generated:
+                aliases[str(relative)] = apt.resolve()
+
+def get_theme_dir(pkg, theme):
+    for ep in entry_points(group="invenio_assets.webpack"):
+        if ep.name != pkg:
+            continue
+        webpack = ep.load()
+        if theme in webpack.themes:
+            t = webpack.themes[theme]
+            return Path(t.path)

oarepo_ui/config.py

@@ -4,7 +4,6 @@
 # this is set as environment variable when running nrp develop
 OAREPO_UI_DEVELOPMENT_MODE = False
 
-# We set this to avoid https://github.com/inveniosoftware/invenio-administration/issues/180
-THEME_HEADER_LOGIN_TEMPLATE = "oarepo_ui/header_login.html"
-
 OAREPO_UI_JINJAX_FILTERS = {}
+
+OAREPO_VITE_SERVER_URL = "https://127.0.0.1:5173/"

oarepo_ui/ext.py

@@ -156,6 +156,10 @@ def development_after_request(self, response: Response):
 
             return add_vite_tags(response)
 
+    @property
+    def vite_server_url(self):
+        return self.app.config["OAREPO_VITE_SERVER_URL"]
+
 
 class OARepoUIExtension:
     def __init__(self, app=None):
@@ -171,5 +175,5 @@ def init_config(self, app):
         from . import config
 
         for k in dir(config):
-            if k.startswith("OAREPO_UI_"):
+            if k.startswith("OAREPO_"):
                 app.config.setdefault(k, getattr(config, k))

oarepo_ui/theme/webpack.py

@@ -57,6 +57,7 @@
             aliases={
                 "@translations/oarepo_ui": "translations/oarepo_ui",
                 "../../theme.config$": "less/theme.config",
+                "../../theme.config$": "less/theme.config",
                 "../../less/site": "less/site",
                 "../../less": "less",
                 # search and edit

oarepo_ui/views.py

@@ -13,4 +13,13 @@ def add_jinja_filters(state):
     env.policies.setdefault("json.dumps_kwargs", {}).setdefault("default", str)
 
 
+def set_manifest_loader(state):
+    app = state.app
+    if app.config["OAREPO_UI_BUILD_FRAMEWORK"] == "vite":
+        from oarepo_ui.vite import ViteManifestLoader
+
+        app.config["WEBPACKEXT_MANIFEST_LOADER"] = ViteManifestLoader
+
+
 blueprint.record_once(add_jinja_filters)
+blueprint.record_once(set_manifest_loader)