Skip to content

Commit

Permalink
build: use the default output directory dist
Browse files Browse the repository at this point in the history
  • Loading branch information
SimonGolms committed Nov 11, 2022
1 parent 7eb99be commit a2e84ff
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.js
Expand Up @@ -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'],
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -15,6 +15,7 @@
/build
/dist
/docker/build
/docker/dist

# misc
.DS_Store
Expand Down
3 changes: 1 addition & 2 deletions .prettierignore
@@ -1,7 +1,6 @@
.history/
build/
internals/generators/
internals/scripts/
dist/
node_modules/
openshift/ods-deployments.json
package-lock.json
Expand Down
4 changes: 2 additions & 2 deletions Jenkinsfile
Expand Up @@ -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/',
)
}
}
Expand Down
2 changes: 1 addition & 1 deletion capacitor.config.ts
Expand Up @@ -4,7 +4,7 @@ const config: CapacitorConfig = {
appId: 'com.company.PROJECTID.COMPONENTID',
appName: 'COMPONENTID',
bundledWebRuntime: false,
webDir: 'build',
webDir: 'dist',
};

export default config;
2 changes: 1 addition & 1 deletion docker/Dockerfile
Expand Up @@ -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

Expand Down
3 changes: 0 additions & 3 deletions vite.config.ts
Expand Up @@ -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),
Expand Down

0 comments on commit a2e84ff

Please sign in to comment.