diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index ac0f1687b497471f24a810702dc0194bfe7d690e..bad83dacb4d8bd4e5b6faab320a915cf0467dc6d 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -47,8 +47,8 @@ Setup front-end only development environment 5. Launch the development server:: - # this will serve the front-end on http://localhost:8080 - yarn dev + # this will serve the front-end on http://localhost:8000 + 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 diff --git a/dev.yml b/dev.yml index 885982050443d9fadab75f496feca25ae3c2e4a9..df855d9b37c734ea5ec497da11873b493e10bbcf 100644 --- a/dev.yml +++ b/dev.yml @@ -17,7 +17,7 @@ services: - "./po:/po" networks: - internal - command: "yarn dev --base /front/" + command: "yarn dev --host --base /front/" postgres: env_file: diff --git a/front/package.json b/front/package.json index 4ccf1331400c68b1592c7e02781a4cfc1e27bcc9..a6f1e2b60a41fc39cfe5bd0e439dd58680443381 100644 --- a/front/package.json +++ b/front/package.json @@ -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", diff --git a/front/vite.config.js b/front/vite.config.js index 0e23f8ba4f0850aaf13a2a886dfad63645e981c2..82e3ba06e72479307c1f90963c9686f7fae620db 100644 --- a/front/vite.config.js +++ b/front/vite.config.js @@ -29,13 +29,13 @@ 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: { alias: { "@": path.resolve(__dirname, "./src"), }, - }, + }, })