fix build scripts to properly skip voyager standalone build

Holusion · Jan 10, 2024 · cda6e0b · cda6e0b
1 parent 1810011
commit cda6e0b
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 7 deletions.
diff --git 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
@@ -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
@@ -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,
                     },