Fixup tsconfig paths for docker runtime

Change-type: patch Signed-off-by: Kyle Harding <kyle@balena.io>
product-os · Dec 5, 2024 · f0d71c9 · f0d71c9
1 parent 29ef261
commit f0d71c9
Show file tree

Hide file tree

Showing 17 changed files with 66 additions and 54 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -11,4 +11,6 @@
 **/.editorconfig
 **/dist
 **/*.pem
+**/lib
+**/.github
 Dockerfile
diff --git a/.lintstagedrc b/.lintstagedrc
@@ -1,5 +1,5 @@
 {
-	"*.ts": [
+	"*/**/*.ts": [
 		"balena-lint --fix"
 	],
 	"*/**/*.js": [

diff --git a/Dockerfile b/Dockerfile
@@ -3,10 +3,13 @@ FROM node:22-slim
 WORKDIR /usr/src/app
 
 COPY package.json package-lock.json ./
-RUN HUSKY=0 npm ci --unsafe-perm --production && npm cache clean --force
 
-COPY . /usr/src/app
+RUN HUSKY=0 npm ci --omit=dev && npm cache clean --force
 
-RUN npx tsc --noEmit --project ./tsconfig.build.json
+COPY . ./
+
+ENV NODE_ENV="production"
+
+RUN npm run build
 
 CMD [ "npm", "start" ]
diff --git a/README.md b/README.md
@@ -76,7 +76,7 @@ npm start
 docker build -t deploynaut .
 
 # 2. Start container
-docker run -e APP_ID=<app-id> -e PRIVATE_KEY=<pem-value> deploynaut
+docker run --env-file .env deploynaut
 ```
 
 ## Environment Variables

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -12,11 +12,12 @@
     "probot-app"
   ],
   "scripts": {
-    "build": "tsc",
-    "start": "probot run ./lib/src/index.js",
+    "clean": "rimraf lib",
+    "build": "tsc --project tsconfig.release.json",
+    "start": "probot run ./lib/index.js",
     "test": "npm run lint && vitest --coverage",
-    "lint": "balena-lint src/ test/ && tsc --noEmit --project .",
-    "lint-fix": "balena-lint --fix src/ test/",
+    "lint": "balena-lint src tests && tsc --noEmit --project .",
+    "lint-fix": "balena-lint --fix src tests",
     "prepare": "node -e \"try { (await import('husky')).default() } catch (e) { if (e.code !== 'ERR_MODULE_NOT_FOUND') throw e }\" --input-type module"
   },
   "dependencies": {
@@ -30,6 +31,7 @@
     "husky": "^9.1.7",
     "lint-staged": "^15.2.10",
     "nock": "^14.0.0-beta.5",
+    "rimraf": "^6.0.1",
     "smee-client": "^2.0.0",
     "vitest": "^2.1.5"
   },

diff --git a/...deployment_protection_rule.requested.json → ...deployment_protection_rule.requested.json b/...deployment_protection_rule.requested.json → ...deployment_protection_rule.requested.json
diff --git a/test/fixtures/issue_comment.created.json → tests/fixtures/issue_comment.created.json b/test/fixtures/issue_comment.created.json → tests/fixtures/issue_comment.created.json
diff --git a/test/fixtures/mock-cert.pem → tests/fixtures/mock-cert.pem b/test/fixtures/mock-cert.pem → tests/fixtures/mock-cert.pem
diff --git a/...xtures/pull_request_review.submitted.json → ...xtures/pull_request_review.submitted.json b/...xtures/pull_request_review.submitted.json → ...xtures/pull_request_review.submitted.json
diff --git a/...ndlers/deployment-protection-rule.test.ts → ...ndlers/deployment-protection-rule.test.ts b/...ndlers/deployment-protection-rule.test.ts → ...ndlers/deployment-protection-rule.test.ts
diff --git a/test/handlers/pull-request-review.test.ts → tests/handlers/pull-request-review.test.ts b/test/handlers/pull-request-review.test.ts → tests/handlers/pull-request-review.test.ts
diff --git a/test/index.test.ts → tests/index.test.ts b/test/index.test.ts → tests/index.test.ts
diff --git a/tsconfig.build.json b/tsconfig.build.json
diff --git a/tsconfig.json b/tsconfig.json
@@ -1,14 +1,27 @@
 {
-	"extends": "./tsconfig.build",
 	"compilerOptions": {
-		"rootDir": "./",
-		"allowJs": true,
-		"checkJs": true
+		"module": "NodeNext",
+		"target": "es2022",
+		"declaration": true,
+		"outDir": "lib/",
+		"strict": true,
+		"strictPropertyInitialization": false,
+		"strictFunctionTypes": false,
+		"useUnknownInCatchVariables": false,
+		"noImplicitThis": false,
+		"noUnusedParameters": true,
+		"noUnusedLocals": true,
+		"preserveConstEnums": true,
+		"sourceMap": true,
+		"skipLibCheck": true,
+		"resolveJsonModule": true,
+		"esModuleInterop": true
 	},
-	"include": [
-		"src/**/*.ts",
-		"*.js",
-		"*.ts",
-		"test/**/*.ts"
-	]
+	"include": ["src/**/*.ts", "tests/**/*.ts"],
+	"ts-node": {
+		"esm": true,
+		"experimentalResolver": true,
+		"experimentalTsImportSpecifiers": true,
+		"transpileOnly": true
+	}
 }
diff --git a/tsconfig.release.json b/tsconfig.release.json
@@ -0,0 +1,5 @@
+{
+	"extends": "./tsconfig.json",
+	"include": ["src/**/*.ts"],
+	"exclude": ["src/**/*.spec.ts"]
+}
diff --git a/vitest.config.ts b/vitest.config.ts
@@ -2,7 +2,7 @@ import { defineConfig } from "vitest/config";
 
 export default defineConfig({
   test: {
-    include: ["test/**/*.test.ts"],
+    include: ["tests/**/*.test.ts"],
     coverage: {
       provider: "v8",
     },