mirror/checktheroads-hyperglass
1
0
Fork 0
mirror of https://github.com/checktheroads/hyperglass synced 2024-05-11 05:55:08 +00:00
Code Releases Activity

remove deprecated next export from UI build

Browse Source
This commit is contained in:
thatmattlove
2024-04-02 16:27:07 -04:00
parent 8be5562ba7
commit 9d1c6a5e4a
2 changed files with 33 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
hyperglass/frontend/__init__.py
View File

@ -11,7 +11,7 @@ from pathlib import Path
# Project
from hyperglass.log import log
from hyperglass.util import copyfiles, check_path, dotenv_to_dict
from hyperglass.util import copyfiles, check_path, dotenv_to_dict, move_files
if t.TYPE_CHECKING:
# Project
@ -108,36 +108,38 @@ async def build_ui(app_path: Path):
ui_dir = Path(__file__).parent.parent / "ui"
build_dir = app_path / "static" / "ui"
out_dir = ui_dir / "out"
build_command = "node_modules/.bin/next build"
export_command = "node_modules/.bin/next export -o {f}".format(f=build_dir)
build_command = "node_modules/.bin/next build --no-lint"
all_messages = []
for command in (build_command, export_command):
try:
proc = await asyncio.create_subprocess_shell(
cmd=command,
stdout=asyncio.subprocess.PIPE,
stderr=asyncio.subprocess.PIPE,
cwd=ui_dir,
)
try:
proc = await asyncio.create_subprocess_shell(
cmd=build_command,
stdout=asyncio.subprocess.PIPE,
stderr=asyncio.subprocess.PIPE,
cwd=ui_dir,
)
stdout, stderr = await asyncio.wait_for(proc.communicate(), timeout=timeout)
messages = stdout.decode("utf-8").strip()
errors = stderr.decode("utf-8").strip()
stdout, stderr = await asyncio.wait_for(proc.communicate(), timeout=timeout)
messages = stdout.decode("utf-8").strip()
errors = stderr.decode("utf-8").strip()
if proc.returncode != 0:
raise RuntimeError(f"\nMessages:\n{messages}\nErrors:\n{errors}")
if proc.returncode != 0:
raise RuntimeError(f"\nMessages:\n{messages}\nErrors:\n{errors}")
await proc.wait()
all_messages.append(messages)
await proc.wait()
all_messages.append(messages)
except asyncio.TimeoutError as err:
raise RuntimeError(f"{timeout} second timeout exceeded while building UI") from err
except asyncio.TimeoutError as err:
raise RuntimeError(f"{timeout} second timeout exceeded while building UI") from err
except Exception as err:
log.error(err)
raise RuntimeError(str(err)) from err
except Exception as err:
log.error(err)
raise RuntimeError(str(err)) from err
shutil.copytree(out_dir, build_dir)
log.bind(src=out_dir, dst=build_dir).debug("Migrated Next.JS build output")
return "\n".join(all_messages)

19
hyperglass/ui/next.config.js
View File

@ -1,13 +1,3 @@
const rewrites = async () => {
if (process.env.NODE_ENV === 'production') {
return [];
}
return [
{ source: '/api/query', destination: `${process.env.HYPERGLASS_URL}api/query` },
{ source: '/images/:image*', destination: `${process.env.HYPERGLASS_URL}images/:image*` },
];
};
/**
* @type {import('next').NextConfig}
*/
@ -19,7 +9,14 @@ const nextConfig = {
},
swcMinify: true,
productionBrowserSourceMaps: true,
rewrites,
output: 'export',
};
if (process.env.NODE_ENV === 'development') {
nextConfig.rewrites = [
{ source: '/api/query', destination: `${process.env.HYPERGLASS_URL}api/query` },
{ source: '/images/:image*', destination: `${process.env.HYPERGLASS_URL}images/:image*` },
];
}
module.exports = nextConfig;