From cda6e0b0e8368e939c2fb9160b7f43292f510e75 Mon Sep 17 00:00:00 2001 From: Sebastien DUMETZ Date: Wed, 10 Jan 2024 08:48:36 +0100 Subject: [PATCH] fix build scripts to properly skip voyager standalone build --- .github/workflows/build.yml | 2 -- Dockerfile | 4 ---- source/ui/webpack.config.js | 2 +- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d9112ff7..5687faab 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,8 +20,6 @@ jobs: run: (cd source/voyager && npm ci --legacy-peer-deps) - name: install ui dependencies run: npm ci && (cd source/ui && npm ci) - - name: build voyager - run: npm run build-voyager - name: build UI run: npm run build-ui build-server: diff --git a/Dockerfile b/Dockerfile index 69871be6..a3537942 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,10 +20,6 @@ COPY source/server /app/source/server RUN npm run build-server # outputs files in /app/source/server/dist -COPY source/voyager /app/source/voyager -RUN npm run build-voyager -# files are automatically picked up by build-ui - COPY source/ui /app/source/ui RUN npm run build-ui # outputs files in /app/dist diff --git a/source/ui/webpack.config.js b/source/ui/webpack.config.js index 6194f5b5..ebdbe517 100644 --- a/source/ui/webpack.config.js +++ b/source/ui/webpack.config.js @@ -98,7 +98,7 @@ module.exports = function createAppConfig(env, argv={}) }, { from: "{js,js/draco,css,language,images}/*.{js,json,wasm,css,jpg,png,svg}", - context: path.join(project, "source/voyager/dist/"), + context: path.join(project, "source/voyager/assets/"), force: false, priority: 1, },