tsconfig inheritance, consolidating docker related files, patreon ima…

…ge assets

.github/workflows/deploy.yaml

@@ -21,7 +21,7 @@ jobs:
       - name: Build Server Image
         if: steps.cache.outputs.cache-hit != 'true'
         run: >-
-          DOCKER_BUILDKIT=1 docker build -f server/server.Dockerfile .
+          DOCKER_BUILDKIT=1 docker build -f infra/docker/server.Dockerfile .
           -t jimmypaolini/lexico-server:${{steps.package-version.outputs.current-version}}
           -t jimmypaolini/lexico-server:latest
       - name: Push Server Image
@@ -77,7 +77,7 @@ jobs:
       - name: Build Web Image
         if: steps.cache.outputs.cache-hit != 'true'
         run: >-
-          DOCKER_BUILDKIT=1 docker build -f web/web.Dockerfile .
+          DOCKER_BUILDKIT=1 docker build -f infra/docker/web.Dockerfile .
           -t jimmypaolini/lexico-web:${{steps.package-version.outputs.current-version}}
           -t jimmypaolini/lexico-web:latest
       - name: Push Web Image

.github/workflows/server.yaml

@@ -21,7 +21,7 @@ jobs:
       - name: Build Server Image
         if: steps.cache.outputs.cache-hit != 'true'
         run: >-
-          DOCKER_BUILDKIT=1 docker build -f server/server.Dockerfile .
+          DOCKER_BUILDKIT=1 docker build -f infra/docker/server.Dockerfile .
           -t jimmypaolini/lexico-server:${{steps.package-version.outputs.current-version}}
           -t jimmypaolini/lexico-server:latest
       - name: Push Server Image

.github/workflows/web.yaml

@@ -21,7 +21,7 @@ jobs:
       - name: Build Web Image
         if: steps.cache.outputs.cache-hit != 'true'
         run: >-
-          DOCKER_BUILDKIT=1 docker build -f web/web.Dockerfile .
+          DOCKER_BUILDKIT=1 docker build -f infra/docker/web.Dockerfile .
           -t jimmypaolini/lexico-web:${{steps.package-version.outputs.current-version}}
           -t jimmypaolini/lexico-web:latest
       - name: Push Web Image

README.md

@@ -33,7 +33,7 @@
 <a href="https://www.cloudflare.com/"><img width="64" height="64" alt="cloudflare" src="web/public/icon/tool/cloudflare.png"></a>
 <a href="https://www.figma.com/"><img width="64" height="64" alt="figma" src="web/public/icon/tool/figma.png"></a>
 <a href="https://code.visualstudio.com/"><img width="64" height="64" alt="vscode" src="web/public/icon/tool/vscode.png"></a>
-<a href="https://www.patreon.com/"><img width="64" height="64" alt="patreon" src="web/public/icon/tool/patreon.png"></a>
+<a href="https://www.patreon.com/lexico"><img width="64" height="64" alt="patreon" src="web/public/icon/tool/patreon.png"></a>
 <a href="https://lexico-group.slack.com/archives/C01SN2QN2BF"><img width="64" height="64" alt="slack" src="web/public/icon/tool/slack.png"></a>
 <a href="https://www.wiktionary.org/"><img width="64" height="64" alt="wikipedia" src="web/public/icon/tool/wikipedia.png"></a>
 <a href="https://github.com/JimmyPaolini/Lexico"><img width="64" height="64" alt="github" src="web/public/icon/tool/github.png"></a>

docker-compose.services.yml → infra/docker/docker-compose.services.yml

@@ -5,9 +5,9 @@ services:
     container_name: database
     ports:
       - 5432:5432
-    env_file: .env
+    env_file: ../../.env
     volumes:
-      - ./data/database_volume:/var/lib/postgresql/data
+      - ../../data/database_volume:/var/lib/postgresql/data
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER}"]
 
@@ -36,7 +36,7 @@ services:
     ports:
       - 9200:9200
     volumes:
-      - ./data/elasticsearch_volume:/usr/share/elasticsearch/data
+      - ../../data/elasticsearch_volume:/usr/share/elasticsearch/data
     environment:
       - discovery.type=single-node
       - bootstrap.memory_lock=true

docker-compose.yml → infra/docker/docker-compose.yml

@@ -4,9 +4,9 @@ services:
     image: jimmypaolini/lexico-web
     build:
       context: .
-      dockerfile: ./web/web.Dockerfile
+      dockerfile: ./web.Dockerfile
     container_name: web
-    env_file: .env
+    env_file: ../../.env
     ports:
       - 3000:3000
     depends_on:
@@ -16,11 +16,11 @@ services:
     image: jimmypaolini/lexico-server
     build:
       context: .
-      dockerfile: ./server/server.Dockerfile
+      dockerfile: ./server.Dockerfile
     container_name: server
     ports:
       - 3001:3001
-    env_file: .env
+    env_file: ../../.env
     depends_on:
       - database
       - elasticsearch

ingestion/package.json

@@ -6,6 +6,7 @@
     "restore": "tsc && node dist/ingestion/src/restore.js",
     "rewrite": "node dist/ingestion/src/rewrite.js",
     "script": "node dist/ingestion/src/script.js",
+    "tsw": "tsc -w",
     "tsc": "tsc"
   },
   "dependencies": {

ingestion/tsconfig.json

@@ -1,35 +1,11 @@
 {
   "compileOnSave": true,
+  "extends": "../tsconfig.json",
   "compilerOptions": {
-    "target": "es6",
-    "module": "commonjs",
-    "lib": ["dom", "es6", "es2020", "esnext.asynciterable"],
-    "sourceMap": true,
-    "outDir": "./dist",
-    "moduleResolution": "node",
-    "removeComments": true,
-    "noImplicitAny": true,
-    "strictNullChecks": true,
-    "strictFunctionTypes": true,
-    "noImplicitThis": true,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "noImplicitReturns": true,
-    "noFallthroughCasesInSwitch": true,
-    "allowSyntheticDefaultImports": true,
-    "esModuleInterop": true,
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "resolveJsonModule": true,
+    "target": "ES6",
+    "module": "COMMONJS",
+    "outDir": "dist",
     "baseUrl": "."
   },
-  "exclude": [
-    "../server",
-    "../web",
-    "**/node_modules",
-    "**/dist",
-    "**/database_data",
-    "**/elasticsearch_data"
-  ],
-  "include": ["../**/*.ts", "../**/*.tsx"]
+  "exclude": ["../data", "../server", "../web", "dist"]
 }