Skip to content

Commit 42f671a

Browse files
author
Denis Gursky
authored
Merge pull request #29 from RelationalAI/dg-cjs-fix
CommonJS bundle fix
2 parents 40375fb + 4b758c4 commit 42f671a

File tree

7 files changed

+46
-57
lines changed

7 files changed

+46
-57
lines changed

.eslintignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
dist
1+
dist
2+
dist-test

.github/workflows/sdk.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,6 @@ jobs:
2929

3030
- name: Build
3131
run: npm run build
32+
33+
- name: Bundle Test
34+
run: npm run test:bundle

dist-test/cjs-test.cjs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
// this is supposed to fail if there's something wrong with the CJS bundle
2+
const { Client } = require('@relationalai/rai-sdk-javascript');
3+
4+
console.log('SDK Client', Client);

dist-test/esm-test.mjs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
// this is supposed to fail if there's something wrong with the ESM bundle
2+
import { Client } from '@relationalai/rai-sdk-javascript';
3+
4+
console.log('SDK Client', Client);

package-lock.json

Lines changed: 22 additions & 52 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@relationalai/rai-sdk-javascript",
33
"description": "RelationalAI SDK for JavaScript",
4-
"version": "0.5.9",
4+
"version": "0.5.10",
55
"author": {
66
"name": "RelationalAI",
77
"url": "https://relational.ai"
@@ -62,7 +62,7 @@
6262
"build": "rm -rf ./dist && $npm_execpath run build:web && $npm_execpath run build:node && $npm_execpath run build:node:cjs",
6363
"build:web": "microbundle -i ./index.web.ts -o ./dist/web --target web --alias node-fetch=./fetch.ts --external none --define __RAI_SDK_VERSION__=$npm_package_version",
6464
"build:node": "microbundle -i ./index.node.ts -o ./dist/node --target node --define __RAI_SDK_VERSION__=$npm_package_version",
65-
"build:node:cjs": "$npm_execpath run build:node -- --format cjs --alias lodash-es=lodash --generateTypes false",
65+
"build:node:cjs": "$npm_execpath run build:node -- --format cjs --alias lodash-es=lodash,node-fetch=node-fetch-commonjs --generateTypes false",
6666
"dev:web": "$npm_execpath run build:web -- -w",
6767
"dev:node": "$npm_execpath run build:node -- -w",
6868
"format": "prettier --write ./src --loglevel warn",
@@ -71,6 +71,7 @@
7171
"fix": "eslint --cache --fix . --ext js --ext ts --ext tsx",
7272
"test": "jest",
7373
"test:debug": "npx --node-arg=--inspect jest --runInBand --testTimeout=60000 --verbose --watch",
74+
"test:bundle": "node ./dist-test/esm-test.mjs && node ./dist-test/cjs-test.cjs",
7475
"example": "node --es-module-specifier-resolution=node --loader ts-node/esm"
7576
},
7677
"devDependencies": {
@@ -99,10 +100,10 @@
99100
"dependencies": {
100101
"apache-arrow": "8.0.0",
101102
"config-ini-parser": "1.5.9",
102-
"cross-fetch": "3.1.5",
103103
"lodash": "4.17.21",
104104
"lodash-es": "4.17.21",
105-
"node-fetch": "3.2.4",
105+
"node-fetch": "3.1.1",
106+
"node-fetch-commonjs": "3.1.1",
106107
"query-string": "7.1.0"
107108
}
108109
}

src/rest.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,12 @@ export async function request<T>(url: string, options: RequestOptions = {}) {
6363
body: JSON.stringify(options.body),
6464
headers: addDefaultHeaders(options.headers, url),
6565
};
66+
67+
if (typeof window === 'undefined') {
68+
// See: https://github.com/node-fetch/node-fetch#custom-highwatermark
69+
(opts as any).highWaterMark = 1024 * 1024;
70+
}
71+
6672
const fullUrl =
6773
options.query && Object.keys(options.query).length > 0
6874
? `${url}?${stringify(options.query, { arrayFormat: 'none' })}`

0 commit comments

Comments
 (0)