diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a318ffe..72c2743 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -29,11 +29,7 @@ jobs: run: echo "RELEASE_VERSION=0.0.1" >> $GITHUB_ENV - name: Apply new version run: node worker/config/preparePublish.js - - name: Install dashboard modules - run: cd packages/dashboard && npm install - name: Build dashboard - run: cd packages/dashboard && npm run build - - name: Install worker modules - run: cd worker && npm install + run: make build-dashboard - name: Build worker run: cd worker && npm run build diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..0524ae0 --- /dev/null +++ b/Makefile @@ -0,0 +1,15 @@ +build-dashboard: + rm -rf packages/dashboard/dist/ + rm -rf packages/dashboard-v2/dist/ + rm -rf dist/ + + cd packages/dashboard/ && \ + npm install && \ + npm run build + + cd packages/dashboard-v2/ && \ + npm install && \ + npm run build + + cp -r packages/dashboard/dist/ dist/ + cp -r packages/dashboard-v2/dist/spa/ dist/v2.0/ diff --git a/packages/dashboard-v2/quasar.config.js b/packages/dashboard-v2/quasar.config.js index f1b414a..f4be390 100644 --- a/packages/dashboard-v2/quasar.config.js +++ b/packages/dashboard-v2/quasar.config.js @@ -69,7 +69,7 @@ module.exports = configure(function (/* ctx */) { // rebuildCache: true, // rebuilds Vite/linter/etc cache on startup - // publicPath: '/', + publicPath: '/v2.0/', // analyze: true, // env: {}, // rawDefine: {}