Skip to content

Commit 2d14573

Browse files
fix(bundle): upgrade axios and externalize previously bundled packages (#1627)
## Description of the changes, What, Why and How? Upgrade `axios` to `v1.12.2` and externalize packages that were previously bundled with the client.
1 parent 0460e85 commit 2d14573

File tree

3 files changed

+22
-35
lines changed

3 files changed

+22
-35
lines changed

package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,20 @@
1212
"url": "https://github.com/GetStream/stream-chat-js.git"
1313
},
1414
"types": "./dist/types/index.d.ts",
15-
"main": "./dist/esm/index.js",
15+
"main": "./dist/esm/index.mjs",
1616
"exports": {
1717
".": {
1818
"types": "./dist/types/index.d.ts",
1919
"browser": {
20-
"import": "./dist/esm/index.js",
21-
"require": "./dist/cjs/index.browser.cjs"
20+
"import": "./dist/esm/index.mjs",
21+
"require": "./dist/cjs/index.browser.js"
2222
},
2323
"react-native": {
24-
"import": "./dist/esm/index.js",
25-
"require": "./dist/cjs/index.browser.cjs"
24+
"import": "./dist/esm/index.mjs",
25+
"require": "./dist/cjs/index.browser.js"
2626
},
27-
"node": "./dist/cjs/index.node.cjs",
28-
"default": "./dist/esm/index.js"
27+
"node": "./dist/cjs/index.node.js",
28+
"default": "./dist/esm/index.mjs"
2929
}
3030
},
3131
"browser": {
@@ -51,7 +51,7 @@
5151
"dependencies": {
5252
"@types/jsonwebtoken": "^9.0.8",
5353
"@types/ws": "^8.5.14",
54-
"axios": "^1.6.0",
54+
"axios": "^1.12.2",
5555
"base64-js": "^1.5.1",
5656
"form-data": "^4.0.4",
5757
"isomorphic-ws": "^5.0.0",

scripts/bundle.mjs

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,19 @@ const __dirname = import.meta.dirname;
1010

1111
const watchModeEnabled = process.argv.includes('--watch') || process.argv.includes('-w');
1212

13-
// Those dependencies are distributed as ES modules, and cannot be externalized
14-
// in our CJS bundle. We convert them to CJS and bundle them instead.
15-
const bundledDeps = ['axios', 'form-data', 'isomorphic-ws', 'base64-js'];
16-
1713
const version = getPackageVersion();
1814

19-
const deps = Object.keys({
15+
const external = Object.keys({
2016
...packageJson.dependencies,
2117
...packageJson.peerDependencies,
2218
});
23-
const external = deps.filter((dep) => !bundledDeps.includes(dep));
2419

2520
/** @type esbuild.BuildOptions */
2621
const commonBuildOptions = {
2722
entryPoints: [resolve(__dirname, '../src/index.ts')],
2823
bundle: true,
2924
target: 'ES2020',
30-
sourcemap: 'linked',
25+
sourcemap: watchModeEnabled ? 'inline' : 'linked',
3126
define: {
3227
'process.env.PKG_VERSION': JSON.stringify(version),
3328
},
@@ -50,7 +45,6 @@ const bundles = [
5045
...commonBuildOptions,
5146
format: 'cjs',
5247
external,
53-
outExtension: { '.js': '.cjs' },
5448
entryNames: `[dir]/[name].${platform}`,
5549
outdir: resolve(__dirname, '../dist/cjs'),
5650
platform,
@@ -63,6 +57,8 @@ const bundles = [
6357
{
6458
...commonBuildOptions,
6559
format: 'esm',
60+
external,
61+
outExtension: { '.js': '.mjs' },
6662
outdir: resolve(__dirname, '../dist/esm'),
6763
entryNames: `[dir]/[name]`,
6864
platform: 'browser',

yarn.lock

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1562,13 +1562,13 @@ available-typed-arrays@^1.0.7:
15621562
dependencies:
15631563
possible-typed-array-names "^1.0.0"
15641564

1565-
axios@^1.6.0:
1566-
version "1.6.0"
1567-
resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.0.tgz#f1e5292f26b2fd5c2e66876adc5b06cdbd7d2102"
1568-
integrity sha512-EZ1DYihju9pwVB+jg67ogm+Tmqc6JmhamRN6I4Zt8DfZu5lbcQGw3ozH9lFejSJgs/ibaef3A9PMXPLeefFGJg==
1565+
axios@^1.12.2:
1566+
version "1.12.2"
1567+
resolved "https://registry.yarnpkg.com/axios/-/axios-1.12.2.tgz#6c307390136cf7a2278d09cec63b136dfc6e6da7"
1568+
integrity sha512-vMJzPewAlRyOgxV2dU0Cuz2O8zzzx9VYtbJOaBgXFeLc4IV/Eg50n4LowmehOOR61S8ZMpc2K5Sa7g6A4jfkUw==
15691569
dependencies:
1570-
follow-redirects "^1.15.0"
1571-
form-data "^4.0.0"
1570+
follow-redirects "^1.15.6"
1571+
form-data "^4.0.4"
15721572
proxy-from-env "^1.1.0"
15731573

15741574
balanced-match@^1.0.0:
@@ -2722,10 +2722,10 @@ flatted@^3.2.9:
27222722
resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.3.tgz#67c8fad95454a7c7abebf74bb78ee74a44023358"
27232723
integrity sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==
27242724

2725-
follow-redirects@^1.15.0:
2726-
version "1.15.3"
2727-
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.3.tgz#fe2f3ef2690afce7e82ed0b44db08165b207123a"
2728-
integrity sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==
2725+
follow-redirects@^1.15.6:
2726+
version "1.15.11"
2727+
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.11.tgz#777d73d72a92f8ec4d2e410eb47352a56b8e8340"
2728+
integrity sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==
27292729

27302730
for-each@^0.3.3:
27312731
version "0.3.5"
@@ -2742,15 +2742,6 @@ foreground-child@^3.1.0:
27422742
cross-spawn "^7.0.6"
27432743
signal-exit "^4.0.1"
27442744

2745-
form-data@^4.0.0:
2746-
version "4.0.0"
2747-
resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
2748-
integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
2749-
dependencies:
2750-
asynckit "^0.4.0"
2751-
combined-stream "^1.0.8"
2752-
mime-types "^2.1.12"
2753-
27542745
form-data@^4.0.4:
27552746
version "4.0.4"
27562747
resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.4.tgz#784cdcce0669a9d68e94d11ac4eea98088edd2c4"

0 commit comments

Comments
 (0)