Skip to content

Commit 309dbe1

Browse files
authored
Merge pull request #18 from pineapple-EPITA/fix/test-failures
fix: build process to include server.js in dist directory
2 parents b10d0db + 391d214 commit 309dbe1

File tree

3 files changed

+11
-18
lines changed

3 files changed

+11
-18
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"scripts": {
88
"start": "node dist/index.js",
99
"dev": "nodemon",
10-
"build": "mkdir -p dist && cp -r src/ dist/ && find dist -name '*.ts' -exec sh -c 'for f; do js=\"${f%.ts}.js\"; echo \"// Converted from TypeScript\n$(cat \"$f\")\" > \"$js\"; sed -i \"\" \"s/\\.ts'/\\.js'/g\" \"$js\"; sed -i \"\" \"s/\\.ts\\\"/\\.js\\\"/g\" \"$js\"; rm \"$f\"; done' _ {} \\;",
10+
"build": "tsc && cp src/server.js dist/",
1111
"build:ts": "tsc",
1212
"lint": "eslint --ext .js,.ts --ignore-pattern \"src/__tests__/**\" src/",
1313
"lint:all": "eslint --ext .js,.ts .",

src/server.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
// This file is a wrapper for setup.ts to ensure a server.js exists in the build
2+
import { startApp } from './boot/setup.js';
3+
4+
// Start the application
5+
startApp();

tsconfig.json

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
{
22
"compilerOptions": {
33
"target": "es2016",
4-
"lib": [
5-
"es2016",
6-
"es2017",
7-
"dom"
8-
],
4+
"lib": ["es2016", "es2017", "dom"],
95
"module": "commonjs",
106
"rootDir": ".",
117
"baseUrl": ".",
@@ -24,20 +20,12 @@
2420
"noUnusedParameters": false,
2521
"noFallthroughCasesInSwitch": true,
2622
"isolatedModules": true,
27-
"emitDeclarationOnly": true
23+
"emitDeclarationOnly": false
2824
},
2925
"ts-node": {
3026
"files": true
3127
},
32-
"exclude": [
33-
"node_modules",
34-
"dist",
35-
"src/__tests__/**/*"
36-
],
37-
"include": [
38-
"src/**/*.ts"
39-
],
40-
"files": [
41-
"src/types/express.d.ts"
42-
]
28+
"exclude": ["node_modules", "dist", "src/__tests__/**/*"],
29+
"include": ["src/**/*.ts"],
30+
"files": ["src/types/express.d.ts"]
4331
}

0 commit comments

Comments
 (0)