fix: react & webpack errors

Pixel-Conqueror · Aug 30, 2023 · 1c594ed · 1c594ed
1 parent db3859c
commit 1c594ed
Show file tree

Hide file tree

Showing 40 changed files with 1,370 additions and 131 deletions.
diff --git a/.babelrc b/.babelrc
diff --git a/.env.example b/.env.example
@@ -16,4 +16,4 @@ REDIS_HOST=127.0.0.1
 REDIS_PORT=6379
 REDIS_PASSWORD=
 CACHE_VIEWS=false
-SESSION_DRIVER=cookie
+SESSION_DRIVER=cookie
diff --git a/Dockerfile b/Dockerfile
@@ -15,6 +15,9 @@ COPY --chown=node:node . .
 FROM dependencies AS build
 RUN node ace build --production
 
+RUN node ace ssr:build
+RUN node ace migration:run
+
 FROM base AS production
 ENV NODE_ENV=production
 ENV PORT=$PORT

diff --git a/config/app.ts b/config/app.ts
@@ -5,12 +5,12 @@
  * file.
  */
 
-import proxyAddr from 'proxy-addr';
 import Env from '@ioc:Adonis/Core/Env';
-import type { ServerConfig } from '@ioc:Adonis/Core/Server';
 import type { LoggerConfig } from '@ioc:Adonis/Core/Logger';
 import type { ProfilerConfig } from '@ioc:Adonis/Core/Profiler';
+import type { ServerConfig } from '@ioc:Adonis/Core/Server';
 import type { ValidatorConfig } from '@ioc:Adonis/Core/Validator';
+import proxyAddr from 'proxy-addr';
 
 /*
 |--------------------------------------------------------------------------

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -5,7 +5,9 @@ services:
     container_name: postgres
     image: postgres:13
     environment:
-      POSTGRES_PASSWORD: ${PG_PASSWORD}
+      - POSTGRES_DB=${PG_DB_NAME}
+      - POSTGRES_USER=${PG_USER}
+      - POSTGRES_PASSWORD=${PG_PASSWORD}
     volumes:
       - postgres_volume:/var/lib/postgresql/data
       - ./dockerConfig/postgres-dev-init.sql:/docker-entrypoint-initdb.d/init.sql