Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-Core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AlekSIS®
Official
AlekSIS-Core
Commits
e22a7229
Commit
e22a7229
authored
1 year ago
by
Nik | Klampfradler
Committed by
magicfelix
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix return code of vite build management command
parent
3da607a6
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CHANGELOG.rst
+9
-0
9 additions, 0 deletions
CHANGELOG.rst
aleksis/core/management/commands/vite.py
+4
-1
4 additions, 1 deletion
aleksis/core/management/commands/vite.py
aleksis/core/util/frontend_helpers.py
+2
-2
2 additions, 2 deletions
aleksis/core/util/frontend_helpers.py
with
15 additions
and
3 deletions
CHANGELOG.rst
+
9
−
0
View file @
e22a7229
...
...
@@ -6,6 +6,15 @@ All notable changes to this project will be documented in this file.
The format is based on `Keep a Changelog`_,
and this project adheres to `Semantic Versioning`_.
Unreleased
----------
Fixed
~~~~~
* [Docker] The build could silently continue even if frontend bundling failed, resulting
in an incomplete AlekSIS frontend app.
`3.1.2`_ - 2023-07-05
---------------------
...
...
This diff is collapsed.
Click to expand it.
aleksis/core/management/commands/vite.py
+
4
−
1
View file @
e22a7229
import
os
from
django.conf
import
settings
from
django.core.management.base
import
CommandError
from
django_yarnpkg.management.base
import
BaseYarnCommand
from
django_yarnpkg.yarn
import
yarn_adapter
...
...
@@ -26,4 +27,6 @@ class Command(BaseYarnCommand):
yarn_adapter
.
install
(
settings
.
YARN_INSTALLED_APPS
)
# Run Vite build
run_vite
([
options
[
"
command
"
]])
ret
=
run_vite
([
options
[
"
command
"
]])
if
ret
!=
0
:
raise
CommandError
(
"
yarn command failed
"
,
returncode
=
ret
)
This diff is collapsed.
Click to expand it.
aleksis/core/util/frontend_helpers.py
+
2
−
2
View file @
e22a7229
...
...
@@ -49,7 +49,7 @@ def write_vite_values(out_path: str) -> dict[str, Any]:
json
.
dump
(
vite_values
,
out
)
def
run_vite
(
args
:
Optional
[
Sequence
[
str
]]
=
None
)
->
None
:
def
run_vite
(
args
:
Optional
[
Sequence
[
str
]]
=
None
)
->
int
:
args
=
list
(
args
)
if
args
else
[]
config_path
=
os
.
path
.
join
(
settings
.
BASE_DIR
,
"
aleksis
"
,
"
core
"
,
"
vite.config.js
"
)
...
...
@@ -64,7 +64,7 @@ def run_vite(args: Optional[Sequence[str]] = None) -> None:
log_level
=
{
"
INFO
"
:
"
info
"
,
"
WARNING
"
:
"
warn
"
,
"
ERROR
"
:
"
error
"
}.
get
(
log_level
,
"
silent
"
)
args
+=
[
"
-l
"
,
log_level
]
yarn_adapter
.
call_yarn
([
"
run
"
,
"
vite
"
]
+
args
)
return
yarn_adapter
.
call_yarn
([
"
run
"
,
"
vite
"
]
+
args
)
def
get_language_cookie
(
code
:
str
)
->
str
:
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment