Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
funkwhale
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
poeppe
funkwhale
Commits
af78df56
Commit
af78df56
authored
3 years ago
by
Marcos Peña
Browse files
Options
Downloads
Patches
Plain Diff
Fix compatibility between dev setups
parent
4bf8778d
No related branches found
No related tags found
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
CONTRIBUTING.rst
+2
-2
2 additions, 2 deletions
CONTRIBUTING.rst
dev.yml
+1
-1
1 addition, 1 deletion
dev.yml
front/package.json
+1
-1
1 addition, 1 deletion
front/package.json
front/vite.config.js
+4
-4
4 additions, 4 deletions
front/vite.config.js
with
8 additions
and
8 deletions
CONTRIBUTING.rst
+
2
−
2
View file @
af78df56
...
...
@@ -47,8 +47,8 @@ Setup front-end only development environment
5. Launch the development server::
# this will serve the front-end on http://localhost:80
8
0
yarn dev
# this will serve the front-end on http://localhost:80
0
0
VUE_PORT=8000
yarn dev
6. Make the front-end talk with an existing server (like https://demo.funkwhale.audio or https://open.audio),
by clicking on the corresponding link in the footer
...
...
This diff is collapsed.
Click to expand it.
dev.yml
+
1
−
1
View file @
af78df56
...
...
@@ -17,7 +17,7 @@ services:
-
"
./po:/po"
networks
:
-
internal
command
:
"
yarn
dev
--base
/front/"
command
:
"
yarn
dev
--host
--base
/front/"
postgres
:
env_file
:
...
...
This diff is collapsed.
Click to expand it.
front/package.json
+
1
−
1
View file @
af78df56
...
...
@@ -5,7 +5,7 @@
"description"
:
"Funkwhale front-end"
,
"author"
:
"Funkwhale Collective <contact@funkwhale.audio>"
,
"scripts"
:
{
"dev"
:
"vite
--host
"
,
"dev"
:
"vite"
,
"build"
:
"vite build"
,
"build:deployment"
:
"vite build --base /front/"
,
"serve"
:
"vite preview"
,
...
...
This diff is collapsed.
Click to expand it.
front/vite.config.js
+
4
−
4
View file @
af78df56
...
...
@@ -29,8 +29,8 @@ export default defineConfig({
server
:
{
port
:
process
.
env
.
VUE_PORT
||
'
8080
'
,
hmr
:
{
port
:
'
8000
'
,
protocol
:
'
ws
'
,
port
:
process
.
env
.
FUNKWHALE_PROTOCOL
===
'
https
'
?
443
:
8000
,
protocol
:
process
.
env
.
FUNKWHALE_PROTOCOL
===
'
https
'
?
'
wss
'
:
'
ws
'
,
}
},
resolve
:
{
...
...
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