diff --git a/.eslintrc.js b/.eslintrc.js index bf50177..5f9afe3 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -20,7 +20,7 @@ module.exports = { // HINT: prettier must be the last extension to work 'plugin:prettier/recommended', ], - ignorePatterns: ['build', 'docker', 'node_modules', 'openshift', 'public'], + ignorePatterns: ['build', 'dist', 'docker', 'node_modules', 'openshift', 'public'], overrides: [ { files: ['*.ts', '*.tsx'], diff --git a/.gitignore b/.gitignore index 23beaab..bf95b9d 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,7 @@ /build /dist /docker/build +/docker/dist # misc .DS_Store diff --git a/.prettierignore b/.prettierignore index e5fb5f8..3355d45 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,7 +1,6 @@ .history/ build/ -internals/generators/ -internals/scripts/ +dist/ node_modules/ openshift/ods-deployments.json package-lock.json diff --git a/Jenkinsfile b/Jenkinsfile index 7ff9a23..600d4f0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -281,8 +281,8 @@ def stageBuild(def context) { def stageDeploy(def context) { stage('Deploy') { sh( - label: 'Move build folder into docker directory', - script: 'mv build docker/', + label: 'Move dist folder into docker directory', + script: 'mv dist docker/', ) } } diff --git a/capacitor.config.ts b/capacitor.config.ts index 8f0d402..399c4d9 100644 --- a/capacitor.config.ts +++ b/capacitor.config.ts @@ -4,7 +4,7 @@ const config: CapacitorConfig = { appId: 'com.company.PROJECTID.COMPONENTID', appName: 'COMPONENTID', bundledWebRuntime: false, - webDir: 'build', + webDir: 'dist', }; export default config; diff --git a/docker/Dockerfile b/docker/Dockerfile index 576f00b..d7c3f59 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -6,7 +6,7 @@ FROM public.ecr.aws/nginx/nginx:alpine RUN apk update && apk upgrade COPY nginx.conf /etc/nginx/conf.d/default.conf.template -COPY build/ /usr/share/nginx/html +COPY dist/ /usr/share/nginx/html COPY nginx-inject-env.sh /docker-entrypoint.d diff --git a/vite.config.ts b/vite.config.ts index bdd4a21..c1f4ce6 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -7,9 +7,6 @@ export default defineConfig(({ mode }) => { process.env = { ...process.env, ...loadEnv(mode, process.cwd(), '') }; return { - build: { - outDir: 'build', - }, plugins: [react()], server: { open: Boolean(process.env.BROWSER),