chore: Add cjs check (#79)

SAP · Aug 22, 2024 · 350e836 · 350e836
1 parent 44c24df
commit 350e836
Show file tree

Hide file tree

Showing 13 changed files with 34 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -44,6 +44,7 @@ jobs:
       - run: pnpm i --frozen-lockfile
       # - run: pnpm build # might be needed in the future
       - run: pnpm lint
+      - run: pnpm compile:cjs
 
   build:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/e2e-test.yaml b/.github/workflows/e2e-test.yaml
@@ -40,7 +40,7 @@ jobs:
       - name: "Check Sample App Starts Up"
         working-directory: ./sample-code
         run: |
-          pnpm run local &
+          pnpm local &
           timeout=15
           while ! nc -z localhost 8080; do
             sleep 1

diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 dist
+dist-cjs
 node_modules
 coverage
 

diff --git a/package.json b/package.json
@@ -9,7 +9,8 @@
   "type": "module",
   "scripts": {
     "postinstall": "pnpm compile",
-    "compile": "pnpm -r -w=false run compile",
+    "compile": "pnpm -r compile",
+    "compile:cjs": "pnpm -r -F=./packages/** compile:cjs",
     "test:unit": "pnpm -r -F=./packages/** test",
     "test:type": "pnpm -F=@sap-ai-sdk/type-tests test",
     "test:e2e": "pnpm -F=@sap-ai-sdk/e2e-tests test",

diff --git a/packages/ai-core/package.json b/packages/ai-core/package.json
@@ -18,6 +18,7 @@
   ],
   "scripts": {
     "compile": "tsc",
+    "compile:cjs": "tsc -p tsconfig.cjs.json",
     "test": "NODE_OPTIONS=--experimental-vm-modules jest",
     "lint": "eslint . && prettier . --config ../../.prettierrc --ignore-path ../../.prettierignore -c",
     "lint:fix": "eslint . --fix && prettier . --config ../../.prettierrc --ignore-path ../../.prettierignore -w --log-level error",

diff --git a/packages/ai-core/tsconfig.cjs.json b/packages/ai-core/tsconfig.cjs.json
@@ -0,0 +1,7 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "module": "CommonJS",
+    "outDir": "./dist-cjs"
+  }
+}
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -18,6 +18,7 @@
   ],
   "scripts": {
     "compile": "tsc",
+    "compile:cjs": "tsc -p tsconfig.cjs.json",
     "test": "NODE_OPTIONS=--experimental-vm-modules jest",
     "lint": "eslint . && prettier . --config ../../.prettierrc --ignore-path ../../.prettierignore -c",
     "lint:fix": "eslint . --fix && prettier . --config ../../.prettierrc --ignore-path ../../.prettierignore -w --log-level error"

diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
@@ -2,7 +2,8 @@ export {
   executeRequest,
   BaseLlmParametersWithDeploymentId,
   BaseLlmParameters,
-  CustomRequestConfig
+  CustomRequestConfig,
+  EndpointOptions
 } from './http-client.js';
 export { getAiCoreDestination } from './context.js';
 export { OpenApiRequestBuilder } from './openapi-request-builder.js';
diff --git a/packages/core/tsconfig.cjs.json b/packages/core/tsconfig.cjs.json
@@ -0,0 +1,7 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "module": "CommonJS",
+    "outDir": "./dist-cjs"
+  }
+}
diff --git a/packages/gen-ai-hub/package.json b/packages/gen-ai-hub/package.json
@@ -20,6 +20,7 @@
   ],
   "scripts": {
     "compile": "tsc",
+    "compile:cjs": "tsc -p tsconfig.cjs.json",
     "test": "NODE_OPTIONS=--experimental-vm-modules jest",
     "lint": "eslint . && prettier . --config ../../.prettierrc --ignore-path ../../.prettierignore -c",
     "lint:fix": "eslint . --fix && prettier . --config ../../.prettierrc --ignore-path ../../.prettierignore -w --log-level error",

diff --git a/packages/gen-ai-hub/tsconfig.cjs.json b/packages/gen-ai-hub/tsconfig.cjs.json
@@ -0,0 +1,7 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "module": "CommonJS",
+    "outDir": "./dist-cjs"
+  }
+}
diff --git a/sample-code/README.md b/sample-code/README.md
@@ -13,7 +13,7 @@ Build the project with:
 2. Download a service key for your AI Core service instance
 3. Create a `.env` file in the sample-code directory
 4. Add an entry `AICORE_SERVICE_KEY='<content-of-service-key>'`
-5. `pnpm run local`
+5. `pnpm local`
 
 Call the test endpoints:
 

diff --git a/test-util/mock-http.ts b/test-util/mock-http.ts
@@ -5,9 +5,8 @@ import { DestinationAuthToken, HttpDestination, ServiceCredentials } from '@sap-
 import nock from 'nock';
 import {
   BaseLlmParameters,
-  CustomRequestConfig
-} from '@sap-ai-sdk/core';
-import { EndpointOptions } from '@sap-ai-sdk/core/src/http-client.js';
+  CustomRequestConfig,
+  EndpointOptions } from '@sap-ai-sdk/core';
 import { dummyToken } from './mock-jwt.js';
 
 // Get the directory of this file