Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
PROJECT_NAME= mock-api-framework
PROJECT_NAME=mock-api-framework
SERVER_PORT=8000
USE_API_URL_PREFIX=api
6 changes: 3 additions & 3 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: '20'
node-version: '22'
cache: 'npm'
- run: npm ci
- run: npm run lint
Expand All @@ -26,7 +26,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: '20'
node-version: '22'
cache: 'npm'
- run: npm ci
- run: npm run pretty
Expand All @@ -37,7 +37,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: '20'
node-version: '22'
cache: 'npm'
- run: npm ci
- run: npm audit --omit=dev
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v20.15.0
v22.12.0
1 change: 1 addition & 0 deletions docker-compose.debug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ services:
dockerfile: ./Dockerfile
environment:
NODE_ENV: development
PROJECT_NAME: ${PROJECT_NAME}
ports:
- ${SERVER_PORT}:${SERVER_PORT}
- 9229:9229
Expand Down
1 change: 1 addition & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ services:
dockerfile: ./Dockerfile
environment:
NODE_ENV: development
PROJECT_NAME: ${PROJECT_NAME}
HUSKY: 0
SERVER_PORT: ${SERVER_PORT}
USE_API_URL_PREFIX: ${USE_API_URL_PREFIX}
Expand Down
2,273 changes: 1,488 additions & 785 deletions package-lock.json

Large diffs are not rendered by default.

32 changes: 16 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,32 +18,32 @@
"validate-branch-name": "bash validate-branch-name.sh"
},
"dependencies": {
"@faker-js/faker": "^9.3.0",
"@faker-js/faker": "^9.4.0",
"@mswjs/data": "^0.16.2",
"@mswjs/http-middleware": "^0.10.2",
"@mswjs/http-middleware": "^0.10.3",
"@types/chai-json-schema": "^1.4.10",
"@types/express": "^5.0.0",
"@types/markdown-it": "^14.1.2",
"chai-json-schema": "^1.5.1",
"dotenv": "^16.4.6",
"highlight.js": "^11.10.0",
"dotenv": "^16.4.7",
"highlight.js": "^11.11.1",
"markdown-it": "^14.1.0",
"msw": "^2.6.6",
"msw": "^2.7.0",
"tsx": "^4.19.2",
"typescript": "^5.7.2",
"zod": "^3.23.8"
"typescript": "^5.7.3",
"zod": "^3.24.1"
},
"devDependencies": {
"@commitlint/cli": "^19.6.0",
"@commitlint/config-conventional": "^19.6.0",
"@types/aws-lambda": "^8.10.146",
"@types/node": "^22.10.1",
"cypress": "^13.16.0",
"@commitlint/cli": "^19.7.1",
"@commitlint/config-conventional": "^19.7.1",
"@types/aws-lambda": "^8.10.147",
"@types/node": "^22.13.1",
"cypress": "^14.0.2",
"husky": "^9.1.7",
"lint-staged": "^15.2.10",
"prettier": "3.4.1",
"start-server-and-test": "^2.0.8",
"xo": "^0.59.3"
"lint-staged": "^15.4.3",
"prettier": "3.5.0",
"start-server-and-test": "^2.0.10",
"xo": "^0.60.0"
},
"lint-staged": {
"src/**/*.{js,jsx,ts,tsx}": "npm run lint",
Expand Down
2 changes: 1 addition & 1 deletion src/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { env } from './utilities/env.js';

const { apiHandlers, apiPaths } = await getApiPaths();

const httpServer = createServer({}, ...apiHandlers, ...serverPage(apiPaths));
const httpServer = createServer(...apiHandlers, ...serverPage(apiPaths));

httpServer.listen(env.SERVER_PORT);

Expand Down