Fix compatibility between dev setups

This commit is contained in:
Marcos Peña 2022-04-02 19:38:14 +02:00
parent 4bf8778d83
commit af78df5663
4 changed files with 8 additions and 8 deletions

View File

@ -47,8 +47,8 @@ Setup front-end only development environment
5. Launch the development server:: 5. Launch the development server::
# this will serve the front-end on http://localhost:8080 # this will serve the front-end on http://localhost:8000
yarn dev VUE_PORT=8000 yarn dev
6. Make the front-end talk with an existing server (like https://demo.funkwhale.audio or https://open.audio), 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 by clicking on the corresponding link in the footer

View File

@ -17,7 +17,7 @@ services:
- "./po:/po" - "./po:/po"
networks: networks:
- internal - internal
command: "yarn dev --base /front/" command: "yarn dev --host --base /front/"
postgres: postgres:
env_file: env_file:

View File

@ -5,7 +5,7 @@
"description": "Funkwhale front-end", "description": "Funkwhale front-end",
"author": "Funkwhale Collective <contact@funkwhale.audio>", "author": "Funkwhale Collective <contact@funkwhale.audio>",
"scripts": { "scripts": {
"dev": "vite --host", "dev": "vite",
"build": "vite build", "build": "vite build",
"build:deployment": "vite build --base /front/", "build:deployment": "vite build --base /front/",
"serve": "vite preview", "serve": "vite preview",

View File

@ -29,13 +29,13 @@ export default defineConfig({
server: { server: {
port: process.env.VUE_PORT || '8080', port: process.env.VUE_PORT || '8080',
hmr: { hmr: {
port: '8000', port: process.env.FUNKWHALE_PROTOCOL === 'https' ? 443 : 8000,
protocol: 'ws', protocol: process.env.FUNKWHALE_PROTOCOL === 'https' ? 'wss' : 'ws',
} }
}, },
resolve: { resolve: {
alias: { alias: {
"@": path.resolve(__dirname, "./src"), "@": path.resolve(__dirname, "./src"),
}, },
}, },
}) })