Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 0 additions & 3 deletions packages/bridge/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
},
{
"path": "./tsconfig.test.json"
},
{
"path": "./tsconfig.eslint.json"
}
]
}
3 changes: 0 additions & 3 deletions packages/sdk-react/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@
"references": [
{
"path": "./tsconfig.node.json"
},
{
"path": "./tsconfig.eslint.json"
}
]
}
4 changes: 0 additions & 4 deletions packages/sdk-solid/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"$schema": "https://json.schemastore.org/tsconfig",
"extends": "tsconfig/esnext-dom.json",
"compilerOptions": {
"allowSyntheticDefaultImports": true,
Expand All @@ -12,9 +11,6 @@
"references": [
{
"path": "./tsconfig.node.json"
},
{
"path": "./tsconfig.eslint.json"
}
]
}
4 changes: 0 additions & 4 deletions packages/sdk-svelte/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"$schema": "https://json.schemastore.org/tsconfig",
"extends": "tsconfig/esnext-dom.json",
"compilerOptions": {
"allowSyntheticDefaultImports": true,
Expand All @@ -10,9 +9,6 @@
"references": [
{
"path": "./tsconfig.node.json"
},
{
"path": "./tsconfig.eslint.json"
}
]
}
2 changes: 1 addition & 1 deletion packages/sdk-vue/tsconfig.eslint.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"extends": "tsconfig/esnext-dom.json",
"compilerOptions": {
"allowSyntheticDefaultImports": true,
"allowSyntheticDefaultImports": true
},
"include": [
"src"
Expand Down
3 changes: 0 additions & 3 deletions packages/sdk-vue/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@
"references": [
{
"path": "./tsconfig.node.json"
},
{
"path": "./tsconfig.eslint.json"
}
]
}
15 changes: 11 additions & 4 deletions packages/sdk/src/features/Viewport/Viewport.ts
Original file line number Diff line number Diff line change
Expand Up @@ -236,11 +236,18 @@ export class Viewport<EViewportStable, EFullscreen> {
['fullscreen_changed', 'fullscreen_failed'],
options,
),
TE.chain(data => {
if ('error' in data && data.error !== 'ALREADY_FULLSCREEN') {
return TE.left(new FullscreenFailedError(data.error));
TE.chain(response => {
if (
response.event === 'fullscreen_failed'
&& response.payload.error !== 'ALREADY_FULLSCREEN'
) {
return TE.left(new FullscreenFailedError(response.payload.error));
}
stateful.setState({ isFullscreen: 'is_fullscreen' in data ? data.is_fullscreen : true });
stateful.setState({
isFullscreen: 'is_fullscreen' in response.payload
? response.payload.is_fullscreen
: true,
});
return TE.right(undefined);
}),
);
Expand Down
10 changes: 5 additions & 5 deletions packages/sdk/src/features/emoji-status/setEmojiStatus.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ function create({ request, ...rest }: CreateOptions) {
},
...options,
}),
TE.chainW(response => {
return response && 'error' in response
? TE.left(new SetEmojiStatusError(response.error))
: TE.right(undefined);
}),
TE.chainW(response => (
response.event === 'emoji_status_failed'
? TE.left(new SetEmojiStatusError(response.payload.error))
: TE.right(undefined)
)),
);
}, {
...rest,
Expand Down
11 changes: 5 additions & 6 deletions packages/sdk/src/features/uncategorized/shareMessage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,11 @@ function create({ request, ...rest }: CreateOptions) {
params: { id: messageId },
},
),
TE.chain(response => {
if (response && 'error' in response) {
return TE.left(new ShareMessageError(response.error));
}
return TE.right(undefined);
}),
TE.chain(response => (
response.event === 'prepared_message_failed'
? TE.left(new ShareMessageError(response.payload.error))
: TE.right(undefined)
)),
);
}, { ...rest, requires: 'web_app_send_prepared_message', returns: 'task' });
}
Expand Down
6 changes: 3 additions & 3 deletions packages/sdk/test-utils/predefined/testIsSupportedGlobal.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { beforeEach } from 'vitest';
import { testIsSupportedPure } from '@test-utils/predefined/testIsSupportedPure.js';
import { setVersion } from '@test-utils/utils.js';
import { testIsSupportedPure } from '~/test-utils/predefined/testIsSupportedPure.js';
import { setVersion } from '~/test-utils/utils.js';

import { resetGlobals } from '@/globals/resetGlobals.js';

Expand All @@ -20,4 +20,4 @@ export function testIsSupportedGlobal(
},
minVersion,
);
}
}
2 changes: 1 addition & 1 deletion packages/sdk/test-utils/predefined/testIsSupportedPure.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { it, expect } from 'vitest';
import { getPrevVersion } from '@test-utils/utils.js';
import { getPrevVersion } from '~/test-utils/utils.js';

/**
* Tests if the isSupported property works correctly.
Expand Down
2 changes: 1 addition & 1 deletion packages/sdk/test-utils/predefined/testSafetyGlobal.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { FunctionUnavailableError } from '@/errors.js';

import { getPrevVersion, mockMiniAppsEnv, setVersion } from '../utils.js';

import { testIsSupportedGlobal } from '@test-utils/predefined/testIsSupportedGlobal.js';
import { testIsSupportedGlobal } from '~/test-utils/predefined/testIsSupportedGlobal.js';
import { resetGlobals } from '@/globals/resetGlobals.js';

interface BaseOptions<C> {
Expand Down
4 changes: 2 additions & 2 deletions packages/sdk/tools/getConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export function getConfig({
],
resolve: {
alias: {
'@test-utils': resolve(dirname(fileURLToPath(import.meta.url)), '../test-utils'),
'~/test-utils': resolve(dirname(fileURLToPath(import.meta.url)), '../test-utils'),
'@': resolve(dirname(fileURLToPath(import.meta.url)), '../src'),
},
},
Expand Down Expand Up @@ -63,4 +63,4 @@ export function getConfig({
},
};
});
}
}
3 changes: 0 additions & 3 deletions packages/sdk/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
},
{
"path": "./tsconfig.test.json"
},
{
"path": "./tsconfig.eslint.json"
}
]
}
3 changes: 0 additions & 3 deletions packages/signals/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
},
{
"path": "./tsconfig.test.json"
},
{
"path": "./tsconfig.eslint.json"
}
]
}
3 changes: 0 additions & 3 deletions packages/toolkit/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
},
{
"path": "./tsconfig.test.json"
},
{
"path": "./tsconfig.eslint.json"
}
]
}
3 changes: 0 additions & 3 deletions packages/transformers/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
},
{
"path": "./tsconfig.test.json"
},
{
"path": "./tsconfig.eslint.json"
}
]
}
3 changes: 0 additions & 3 deletions packages/types/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
},
{
"path": "./tsconfig.test.json"
},
{
"path": "./tsconfig.eslint.json"
}
]
}