Skip to content

Commit e7d3028

Browse files
committed
chore: use pseudo package for json import
1 parent 0af241b commit e7d3028

7 files changed

+19
-46
lines changed

.dockerignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
*
22
!src
33
!package*.json
4-
!tsconfig.server.json
4+
!tsconfig*.json

.pkg.config.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"name": "@supabase/postgres-meta",
33
"bin": {
4-
"postgres-meta": "bin/src/server/app.js"
4+
"postgres-meta": "dist/server/app.js"
55
},
66
"pkg": {
7-
"assets": ["bin/**/*.sql"],
7+
"assets": ["dist/**/*.sql"],
88
"scripts": ["node_modules/pg-format/lib/reserved.js"]
99
}
1010
}

Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ WORKDIR /usr/src/app
55
COPY package.json package-lock.json ./
66
RUN npm clean-install
77
COPY . .
8-
RUN npm run build:server
8+
RUN npm run build
99

1010
FROM node:16-slim
1111
WORKDIR /usr/src/app
1212
COPY --from=build /usr/src/app/node_modules node_modules
13-
COPY --from=build /usr/src/app/bin bin
13+
COPY --from=build /usr/src/app/dist dist
1414
COPY package.json ./
1515
ENV PG_META_PORT=8080
1616
CMD ["npm", "run", "start"]

package.json

+9-10
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,21 @@
1010
"dist"
1111
],
1212
"type": "module",
13-
"main": "dist/main/index.js",
14-
"module": "dist/module/index.js",
13+
"main": "dist/server/app.js",
14+
"imports": {
15+
"#package.json": "./package.json"
16+
},
1517
"repository": "supabase/postgres-meta",
1618
"scripts": {
17-
"check": "tsc --project tsconfig.server.json --noEmit",
18-
"clean": "rimraf bin dist",
19+
"check": "tsc -p tsconfig.json --noEmit",
20+
"clean": "rimraf dist tsconfig.tsbuildinfo",
1921
"format": "prettier --write \"{src,test}/**/*.ts\"",
20-
"build": "run-s clean build:*",
21-
"build:main": "tsc -p tsconfig.json && cpy 'src/lib/sql/*.sql' dist/main/sql",
22-
"build:module": "tsc -p tsconfig.module.json && cpy 'src/lib/sql/*.sql' dist/module/sql",
23-
"build:server": "tsc -p tsconfig.server.json && cpy 'src/lib/sql/*.sql' bin/src/lib/sql",
22+
"build": "tsc -p tsconfig.json && cpy 'src/lib/sql/*.sql' dist/lib/sql",
2423
"docs:export": "ts-node-dev --quiet src/server/app.ts docs export > openapi.json",
2524
"gen:types:typescript": "ts-node-dev --quiet src/server/app.ts gen types typescript",
26-
"start": "NODE_ENV=production node bin/src/server/app.js",
25+
"start": "NODE_ENV=production node dist/server/app.js",
2726
"dev": "trap 'npm run db:clean' INT && run-s db:clean db:run && NODE_ENV=development ts-node-dev src/server/app.ts | pino-pretty --colorize",
28-
"pkg": "run-s clean build:server && pkg --out-path bin .pkg.config.json",
27+
"pkg": "run-s clean build:server && pkg --out-path dist .pkg.config.json",
2928
"test": "run-s db:clean db:run test:run db:clean",
3029
"db:clean": "cd test/db && docker-compose down",
3130
"db:run": "cd test/db && docker-compose up --detach && sleep 5",

tsconfig.json

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
{
2-
"include": ["src/lib"],
2+
"include": ["src"],
33
"compilerOptions": {
4+
"incremental": true,
45
"declaration": true,
56
"declarationMap": true,
67
"module": "esnext",
7-
"outDir": "dist/main",
8-
"rootDir": "src/lib",
8+
"outDir": "dist",
9+
"rootDir": "src",
910
"sourceMap": true,
1011
"target": "esnext",
1112

1213
"strict": true,
1314

1415
"esModuleInterop": true,
15-
"moduleResolution": "Node",
16+
"moduleResolution": "NodeNext",
1617
"resolveJsonModule": true,
1718

1819
"forceConsistentCasingInFileNames": true,

tsconfig.module.json

-7
This file was deleted.

tsconfig.server.json

-20
This file was deleted.

0 commit comments

Comments
 (0)