Merge pull request #132 from CPCTF2022/fix/module

🐛 fix module
CPCTF · Apr 29, 2022 · 97c4edc · 97c4edc
2 parents f8e70be + af37739
commit 97c4edc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/server/Dockerfile b/server/Dockerfile
@@ -6,11 +6,11 @@ COPY . /app/client/
 
 WORKDIR /app/client/server
 
-RUN apk add git
+RUN apk update && apk add git
 
 RUN npm ci
 RUN npm run build
 
 FROM busybox:1
 
-COPY --from=build /app/client/server/build /server
+COPY --from=build /app/client/server /server
diff --git a/server/ServerMain.ts b/server/ServerMain.ts
@@ -1,7 +1,7 @@
 const fetch = (...args: unknown[]) =>
   // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   // @ts-ignore
-  import('node-fetch').then(({ default: fetch }) => fetch(...args))
+  import('node-fetch-commonjs').then(({ default: fetch }) => fetch(...args))
 import * as fs from 'fs'
 import { CircuitBuilder } from './CircuitBuilder'
 

diff --git a/server/package.json b/server/package.json
@@ -5,7 +5,7 @@
   "main": "index.js",
   "output_path": "../public/dummy",
   "scripts": {
-    "build": "tsc ServerMain.ts --outdir ./build",
+    "build": "tsc ServerMain.ts --module commonjs --outdir ./build",
     "start": "EXPORT_DIR=\"../public\" ts-node ServerMain.ts"
   },
   "author": "",