From 7153472ddfedbe53090b51ffdeb5068b7e376aaa Mon Sep 17 00:00:00 2001 From: Matt DiMeglio Date: Wed, 11 Jun 2025 16:49:54 -0400 Subject: [PATCH] Change dev/prod ones --- package.json | 4 ++-- web/Dockerfile.prod | 15 +++++++++++++ web/package.json | 6 ++++-- web/vite.config.js | 51 ++++++++++++++++++++++++++++++--------------- 4 files changed, 55 insertions(+), 21 deletions(-) create mode 100644 web/Dockerfile.prod diff --git a/package.json b/package.json index 69ef0b7..99c9cbc 100644 --- a/package.json +++ b/package.json @@ -1,11 +1,11 @@ { "name": "shiftsync-website", "private": true, - "version": "1.0.1", + "version": "0.0.0", "main": "index.js", "scripts": { "api": "npm run dev --prefix api", - "web": "npm run dev --prefix web", + "web": "npm run local --prefix web", "dev": "concurrently \"npm run api\" \"npm run web\"", "test": "echo \"Error: no test specified\" && exit 1" }, diff --git a/web/Dockerfile.prod b/web/Dockerfile.prod new file mode 100644 index 0000000..b1c64d4 --- /dev/null +++ b/web/Dockerfile.prod @@ -0,0 +1,15 @@ +FROM node:20-alpine + +WORKDIR /app + +COPY ./package*.json ./ + +RUN npm ci + +COPY . ./ + +EXPOSE 5173 +EXPOSE 5171 + + +CMD ["npm", "run", "prod"] diff --git a/web/package.json b/web/package.json index ba586dd..1653901 100644 --- a/web/package.json +++ b/web/package.json @@ -1,10 +1,12 @@ { "name": "shiftsync-website-web", "private": true, - "version": "1.0.0", + "version": "1.0.1", "type": "module", "scripts": { - "dev": "vite --host", + "local": "vite", + "dev": "vite --host --mode dev", + "prod": "vite --host --mode prod", "build": "vite build", "lint": "eslint .", "preview": "vite preview" diff --git a/web/vite.config.js b/web/vite.config.js index 9362fe4..ffaabbd 100644 --- a/web/vite.config.js +++ b/web/vite.config.js @@ -3,22 +3,39 @@ import react from '@vitejs/plugin-react'; import path from 'path'; // https://vite.dev/config/ -export default defineConfig({ - plugins: [react()], - server:{ - host: true, - allowedHosts: ['.code-catalyst.com'], - cors: true, - hmr: { - protocol: 'wss', - host: ['*.code-catalyst.com'], - clientPort: 443, - } - }, - resolve: { - alias: { - '@src': path.resolve(__dirname, 'src'), - '@components': path.resolve(__dirname, 'components') +export default defineConfig(({ mode = 'local' }) => { + const isDev = mode === 'dev'; + const isProd = mode === 'prod'; + + return { + plugins: [react()], + server:{ + host: true, + allowedHosts: ['.code-catalyst.com'], + cors: true, + hmr: isDev + ? { + protocol: 'wss', + host: 'shift-dev.code-catalyst.com', + clientPort: 443, + } + : isProd ? + { + protocol: 'wss', + host: 'shift.code-catalyst.com', + clientPort: 443, + } + : { + protocol: 'wss', + host: 'localhost', + clientPort: 443, + }, }, - }, + resolve: { + alias: { + '@src': path.resolve(__dirname, 'src'), + '@components': path.resolve(__dirname, 'components') + }, + }, + } });