Merge branch 'master' into guillaume/chore/downgrade-axios

charts/nittei/templates/deployment.yaml

@@ -9,8 +9,13 @@
   {{- $envMap = merge $envMap (dict .name .) }}
 {{- end }}
 
+# Merge defaultEnv and extraEnv, accounting for both value and valueFrom
 {{- range $extraEnv }}
-  {{- $envMap = merge $envMap (dict .name .) }}
+  {{- if hasKey . "valueFrom" }}
+    {{- $envMap = merge $envMap (dict .name (dict "valueFrom" .valueFrom)) }}
+  {{- else }}
+    {{- $envMap = merge $envMap (dict .name (dict "value" .value)) }}
+  {{- end }}
 {{- end }}
 # End of the environment variable merge
 
@@ -77,7 +82,11 @@ spec:
           env:
             {{- range $key, $value := $envMap }}
             - name: {{ $key }}
+              {{- if hasKey $value "value" }}
               value: {{ $value.value }}
+              {{- else if hasKey $value "valueFrom" }}
+              valueFrom: {{ $value.valueFrom }}
+              {{- end }}
             {{- end }}
       {{- with .Values.volumes }}
       volumes:

clients/javascript/package.json

@@ -2,10 +2,19 @@
   "name": "@meetsmore/nittei-client",
   "version": "0.0.1",
   "description": "The Nittei Javascript library provides convenient access to the Nittei API from server-side JavaScript applications or web applications",
-  "main": "dist/index.js",
+  "main": "./dist/index.js",
+  "module": "./dist/index.mjs",
+  "types": "./dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "require": "./dist/index.js",
+      "import": "./dist/index.mjs"
+    }
+  },
   "packageManager": "[email protected]",
   "scripts": {
-    "build": "tsc --p ./tsconfig.release.json",
+    "build": "tsup",
     "deploy": "pnpm run build && pnpm publish --no-git-checks",
     "format": "biome format --write ./lib ./tests",
     "lint": "biome lint --write ./lib ./tests",
@@ -41,6 +50,7 @@
     "jest": "29.7.0",
     "jsonwebtoken": "9.0.2",
     "ts-jest": "29.2.5",
+    "tsup": "8.3.0",
     "typescript": "5.6.3",
     "uuid": "10.0.0"
   }

clients/javascript/tsup.config.ts

@@ -0,0 +1,17 @@
+import type { Options } from 'tsup'
+
+export const tsup: Options = {
+  splitting: true,
+  clean: true, // clean up the dist folder
+  dts: true, // generate dts files
+  format: ['cjs', 'esm'], // generate cjs and esm files
+  minify: true,
+  bundle: true,
+  sourcemap: true,
+  skipNodeModulesBundle: true,
+  entryPoints: ['lib/index.ts'],
+  target: 'es2020',
+  outDir: 'dist',
+  entry: ['lib/**/*.ts'], //include all files under lib
+  tsconfig: 'tsconfig.release.json',
+}