internal: screw downloading packages in dockerfile

hellos3b · Sep 23, 2022 · 48d85c1 · 48d85c1
1 parent 579ec1c
commit 48d85c1
Show file tree

Hide file tree

Showing 51 changed files with 230 additions and 226 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,8 +7,12 @@
 ### 🐛 Bug Fix
    * define: disabled the old `!define` command from the legacy bot
    * meetup: Reinitialize #meetups-directory messages if ids in db become corrupt
-   * internal: Require kick permissions for `/mod` commands
+   * mod: Require kick permissions for `/mod` commands
 
+### 🏠 Internal
+   * Removed any module alias imports using `@sjbha` and switched to relative directory
+   * Switch to esbuild for building and use the bundle for docker file
+
 # 2.2.8
 
 ### 🐛 Bug Fix

diff --git a/bot/Dockerfile b/bot/Dockerfile
@@ -2,18 +2,7 @@
 FROM node:16 as builder
 
 WORKDIR /app/bot
-RUN npm install --global pnpm@6
-COPY package.json pnpm-lock.yaml ./
-RUN pnpm install
+COPY ./dist/bot.js ./dist/bot.js
+COPY package.json .
 
-
-FROM builder as development
-COPY tsconfig.json bsconfig.json ./
-ENTRYPOINT pnpm rescript & pnpm dev
-
-
-FROM builder as production
-COPY tsconfig.json bsconfig.json ./
-COPY src/ ./src/
-RUN pnpm build
-ENTRYPOINT pnpm start
+ENTRYPOINT npm start
diff --git a/bot/app.js b/bot/app.js
@@ -0,0 +1,9 @@
+"use strict";
+
+// demo/some-js.bs.js
+function hello() {
+  console.log("greetings");
+}
+
+// demo/some-intro.ts
+console.log(hello());
diff --git a/bot/package.json b/bot/package.json
@@ -6,12 +6,13 @@
     "node": ">= 16"
   },
   "scripts": {
-    "start": "tsx src/Main.ts",
+    "start": "node dist/bot.js",
     "dev:re": "rescript build -w",
     "dev:ts": "ts-node-dev --transpile-only ./src/Main.ts",
     "dev": "npm-run-all --parallel dev:re dev:ts",
-    "build": "rescript build",
-    "rescript": "rescript build -w",
+    "build": "npm run rescript & npm run bundle",
+    "bundle": "npx esbuild ./src/Main.ts --bundle --outfile=dist/bot.js --platform=node",
+    "rescript": "rescript build",
     "test": "jest",
     "test:watch": "jest --watch"
   },
@@ -65,6 +66,7 @@
     "@typescript-eslint/eslint-plugin": "^4.25.0",
     "@typescript-eslint/parser": "^4.25.0",
     "concurrently": "^7.3.0",
+    "esbuild": "^0.15.9",
     "eslint": "^7.27.0",
     "jest": "^27.3.1",
     "mongodb-memory-server": "^8.0.2",