fix: npm-app deploy

Author: brandonkachen

backend/tsconfig.json

@@ -15,7 +15,7 @@
     "baseUrl": ".",
     "paths": {
       "@/env": ["../env.ts"],
-      "common/*": ["../common/src/*"],
+      "common/*": ["./src/common/*", "../common/src/*"],
       "@/*": ["./src/*"],
       "@codebuff/billing": ["../packages/billing/src"],
       "@codebuff/bigquery": ["../packages/bigquery/src"],

common/tsconfig.json

@@ -11,17 +11,25 @@
     "module": "CommonJS",
     "moduleResolution": "node",
     "target": "esnext",
-    "typeRoots": ["./node_modules/@types", "../node_modules/@types", "./src/types"],
+    "incremental": true,
+    "isolatedModules": true,
+    "skipLibCheck": true,
+    "types": ["node"],
+    "typeRoots": [
+      "./node_modules/@types",
+      "../node_modules/@types",
+      "./src/types"
+    ],
     "baseUrl": ".",
     "outDir": "./dist",
-    "skipLibCheck": true,
-    "types": [],
+    "rootDir": "./src",
     "paths": {
       "@/env": ["../env.ts"]
     }
   },
   "include": ["src/**/*"],
   "references": [{ "path": "../tsconfig.env.json" }],
+
   "ts-node": {
     "require": ["tsconfig-paths/register"]
   }

npm-app/clean-package.js

@@ -1,9 +1,6 @@
 const fs = require('fs')
 const path = require('path')
 
-// Set production environment for the build
-process.env.NEXT_PUBLIC_CB_ENVIRONMENT = 'prod'
-
 const packageJsonPath = path.join(__dirname, 'package.json')
 const tempPackageJsonPath = path.join(__dirname, 'temp.package.json')
 const indexJsPath = path.join(__dirname, 'dist', 'index.js')
@@ -22,12 +19,8 @@ for (const depType of ['dependencies', 'optionalDependencies']) {
       if (typeof version === 'string' && version.startsWith('workspace:')) {
         if (pkgName === 'common') {
           delete packageJson[depType][pkgName]
-          console.log(
-            `Removed dependency on ${pkgName} because it's now bundled.`
-          )
         } else {
           packageJson[depType][pkgName] = '1.0.0'
-          console.warn(`No version found for ${pkgName}, defaulting to 1.0.0`)
         }
       }
     }
@@ -44,11 +37,25 @@ fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2))
 if (fs.existsSync(indexJsPath)) {
   let indexJsContent = fs.readFileSync(indexJsPath, 'utf8')
 
+  // Dynamically get client-side environment variables from env.ts
+  const envTsContent = fs.readFileSync(
+    path.join(__dirname, '..', 'env.ts'),
+    'utf8'
+  )
+  const clientKeysMatch = envTsContent.match(/client: {([^]*?)}/s)
+  let clientKeys = []
+  if (clientKeysMatch) {
+    clientKeys =
+      clientKeysMatch[1]
+        .split('\n')
+        .map((line) => line.match(/^\s*(\w+):/))
+        .filter(Boolean)
+        .map((match) => match[1]) ?? []
+  }
+
   // Get all environment variables that start with NEXT_PUBLIC_ or are needed for the npm package
   const envVarsToInject = Object.entries(process.env)
-    .filter(
-      ([key, value]) => key.startsWith('NEXT_PUBLIC_') && value !== undefined
-    )
+    .filter(([key, value]) => clientKeys.includes(key) && value !== undefined)
     .map(([key, value]) => `process.env.${key} = '${value}';`)
 
   const lines = indexJsContent.split('\n')
@@ -57,12 +64,9 @@ if (fs.existsSync(indexJsPath)) {
   indexJsContent = lines.join('\n')
   fs.writeFileSync(indexJsPath, indexJsContent)
   console.log(
-    `Injected ${envVarsToInject.length} environment variables into index.js`
+    `Injected ${envVarsToInject.length} environment variables into index.js:`
   )
+  envVarsToInject.forEach((envVar) => console.log(`- ${envVar}`))
 } else {
   console.error('index.js not found in the dist directory')
 }
-
-console.log(
-  'package.json has been cleaned for publishing and index.js has been updated.'
-)

npm-app/package.json

@@ -9,7 +9,7 @@
     "codebuff": "dist/index.js"
   },
   "scripts": {
-    "prepublishOnly": "nx build npm-app && bun run clean-package.js",
+    "prepublishOnly": "nx clean npm-app && nx build npm-app && infisical run --env=prod --log-level=warn -- bun run clean-package.js",
     "postpublish": "echo \"const fs=require('fs');fs.copyFileSync('temp.package.json','package.json');fs.unlinkSync('temp.package.json');\" | bun run -",
     "format": "prettier --write \"**/*.{ts,tsx,json,md}\"",
     "test": "jest",
@@ -81,10 +81,5 @@
   "trustedDependencies": [
     "@homebridge/node-pty-prebuilt-multiarch",
     "@vscode/ripgrep"
-  ],
-  "devDependencies": {
-    "eslint-config-prettier": "^10.1.2",
-    "globals": "^16.0.0",
-    "typescript-eslint": "^8.32.0"
-  }
+  ]
 }

package.json

@@ -33,7 +33,7 @@
     "start-nushell": "bun --cwd npm-app start-nushell",
     "format": "prettier --write \"**/*.{ts,tsx,json,md}\"",
     "bump": "bun run scripts/bump-version.ts",
-    "deploy:npm-app": "infisical run --env=prod --log-level=warn -- bun run bump && cd npm-app && npm publish",
+    "deploy:npm-app": "bun run bump && cd npm-app && npm publish",
     "test:patch": "bun test test/__src__/patch.test.ts",
     "clean": "nx run-many --target=clean --all",
     "build": "nx reset && nx run-many --target=build --all",

tsconfig.json

@@ -2,6 +2,7 @@
   "files": [],
   "references": [
     { "path": "./tsconfig.env.json" },
+    { "path": "common" },
     { "path": "backend" },
     { "path": "common" },
     { "path": "npm-app" },