Skip to content

Fix types export for CJS and build config #359

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lukasIO merged 7 commits into from
Dec 16, 2024
Merged

Fix types export for CJS and build config #359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
37b910a
Fix types export for CJS and build config
lukasIO Dec 11, 2024
e90e1d1
remove comment
lukasIO Dec 11, 2024
f959602
Create stupid-monkeys-invent.md
lukasIO Dec 11, 2024
fdd1a16
fix also for node rtc
lukasIO Dec 13, 2024
09600f6
Merge branch 'lukas/fix-pub-spec' of github.com:livekit/node-sdks int…
lukasIO Dec 13, 2024
94511b7
Merge branch 'main' into lukas/fix-pub-spec
lukasIO Dec 16, 2024
b45ad31
Update stupid-monkeys-invent.md
lukasIO Dec 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/stupid-monkeys-invent.md
View file
Open in desktop
Comment thread
lukasIO marked this conversation as resolved.
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"livekit-server-sdk": patch
"@livekit/rtc-node": patch
---

Fix types export for CJS and build config
11 changes: 8 additions & 3 deletions packages/livekit-rtc/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,14 @@
"types": "dist/index.d.ts",
"exports": {
".": {
"types": "./dist/index.d.ts",
"import": "./dist/index.js",
"require": "./dist/index.cjs"
"import": {
"types": "./dist/index.d.ts",
"default": "./dist/index.js"
},
"require": {
"types": "./dist/index.d.cts",
"default": "./dist/index.cjs"
}
}
},
"type": "module",
Expand Down
2 changes: 1 addition & 1 deletion packages/livekit-rtc/rust-sdks
Open in desktop
Submodule rust-sdks updated 6 files
+4 −4 Cargo.lock
+2 −2 livekit-api/Cargo.toml
+3 −3 livekit-ffi/Cargo.toml
+2 −2 livekit-protocol/Cargo.toml
+1 −1 livekit-runtime/Cargo.toml
+4 −4 livekit/Cargo.toml
11 changes: 8 additions & 3 deletions packages/livekit-server-sdk/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,14 @@
"type": "module",
"exports": {
".": {
"types": "./dist/index.d.ts",
"import": "./dist/index.js",
"require": "./dist/index.cjs"
"import": {
"types": "./dist/index.d.ts",
"default": "./dist/index.js"
},
"require": {
"types": "./dist/index.d.cts",
"default": "./dist/index.cjs"
}
}
},
"files": [
Expand Down
12 changes: 6 additions & 6 deletions packages/livekit-server-sdk/src/AccessToken.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import {
} from '@livekit/protocol';
import * as jose from 'jose';
import { describe, expect, it } from 'vitest';
import { AccessToken, TokenVerifier } from './AccessToken';
import type { ClaimGrants } from './grants';
import { AccessToken, TokenVerifier } from './AccessToken.js';
import type { ClaimGrants } from './grants.js';

const testApiKey = 'abcdefg';
const testSecret = 'abababa';
Expand Down Expand Up @@ -143,10 +143,10 @@ describe('room configuration with agents and egress', () => {
expect(decoded.roomConfig?.name).toEqual('test-room');
expect(decoded.roomConfig?.maxParticipants).toEqual(10);
expect(decoded.roomConfig?.agents).toHaveLength(2);
expect(decoded.roomConfig?.agents?.[0].agentName).toEqual('agent1');
expect(decoded.roomConfig?.agents?.[0].metadata).toEqual('metadata-1');
expect(decoded.roomConfig?.agents?.[1].agentName).toEqual('agent2');
expect(decoded.roomConfig?.agents?.[1].metadata).toEqual('metadata-2');
expect(decoded.roomConfig?.agents?.[0]?.agentName).toEqual('agent1');
expect(decoded.roomConfig?.agents?.[0]?.metadata).toEqual('metadata-1');
expect(decoded.roomConfig?.agents?.[1]?.agentName).toEqual('agent2');
expect(decoded.roomConfig?.agents?.[1]?.metadata).toEqual('metadata-2');
expect(decoded.roomConfig?.egress?.room?.roomName).toEqual('test-room');
});
});
4 changes: 2 additions & 2 deletions packages/livekit-server-sdk/src/grants.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
// SPDX-License-Identifier: Apache-2.0
import { TrackSource } from '@livekit/protocol';
import { describe, expect, it } from 'vitest';
import type { ClaimGrants, VideoGrant } from './grants';
import { claimsToJwtPayload } from './grants';
import type { ClaimGrants, VideoGrant } from './grants.js';
import { claimsToJwtPayload } from './grants.js';

describe('ClaimGrants are parsed correctly', () => {
it('parses TrackSource correctly to strings', () => {
Expand Down
7 changes: 3 additions & 4 deletions tsup.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import { Options } from 'tsup';
import type { Options } from 'tsup';

const defaultOptions: Options = {
entry: ['src/**/*.ts'],
entry: ['src/**/*.ts', '!src/**/*.test.ts'],
format: ['cjs', 'esm'],
splitting: false,
sourcemap: true,
// for the type maps to work, we use tsc's declaration-only command
dts: false,
dts: true,
clean: true,
bundle: false,
target: 'node16',
Expand Down