From 261155fe7d87309fcfbff276d07248b8256b74f4 Mon Sep 17 00:00:00 2001 From: Ashish Baravaliya Date: Sun, 31 Mar 2024 22:01:52 -0400 Subject: [PATCH] fix: v2 build added to public dir --- .gitignore | 1 + Dockerfile | 2 +- package.json | 2 +- v2/vite.config.ts | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d632893b38..a95cdf745a 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ node_modules/ bundles/ PIG/bundles/ Parse-Dashboard/public/bundles/ +Parse-Dashboard/public/v2/ Parse-Dashboard/v2/ Parse-Dashboard/parse-dashboard-config.json npm-debug.log diff --git a/Dockerfile b/Dockerfile index 443457d511..afadd85ee4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -53,7 +53,7 @@ COPY --from=build /src/package*.json /src/ # Copy compiled src dirs COPY --from=build /src/Parse-Dashboard/ /src/Parse-Dashboard/ -COPY --from=v2-build /Parse-Dashboard/v2 /src/Parse-Dashboard/v2 +COPY --from=v2-build /Parse-Dashboard/public/v2 /src/Parse-Dashboard/public/v2 USER node diff --git a/package.json b/package.json index 2a39ebb931..8d593ff0a3 100644 --- a/package.json +++ b/package.json @@ -125,7 +125,7 @@ "dev": "node ./Parse-Dashboard/index.js --dev & webpack --config webpack/build.config.js --devtool eval-source-map --progress --watch", "dashboard": "node ./Parse-Dashboard/index.js & webpack --config webpack/build.config.js --progress --watch", "pig": "http-server ./PIG -p 4041 -s & webpack --config webpack/PIG.config.js --progress --watch", - "build": "webpack --node-env=production --config webpack/production.config.js && webpack --config webpack/PIG.config.js", + "build": "webpack --node-env=production --config webpack/production.config.js && webpack --config webpack/PIG.config.js && npm run build --workspace=v2", "test": "jest", "lint": "eslint --ignore-path .gitignore --cache ./", "lint:fix": "DEBUG=eslint:cli-engine eslint --ignore-path .gitignore --fix --cache ./", diff --git a/v2/vite.config.ts b/v2/vite.config.ts index 01042a499e..efd00689db 100644 --- a/v2/vite.config.ts +++ b/v2/vite.config.ts @@ -5,7 +5,7 @@ import react from '@vitejs/plugin-react-swc'; export default defineConfig({ plugins: [react()], build: { - outDir: '../Parse-Dashboard/v2', + outDir: '../Parse-Dashboard/public/v2', emptyOutDir: true, rollupOptions: { output: {