Skip to content

Commit fdee339

Browse files
authored
chore: Migrate to tsgo (#5578)
1 parent 3ec29b9 commit fdee339

File tree

54 files changed

+173
-51
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+173
-51
lines changed

.vscode/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"typescript.tsdk": "node_modules/typescript/lib",
2+
"typescript.experimental.useTsgo": true,
33
// Disable formatting for SQL files
44
"[sql]": {
55
"editor.formatOnSave": false,

apps/builder/app/services/csrf-session.server.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,10 @@ const csrfSessionStorage = createCookieSessionStorage({
3838
},
3939
});
4040

41-
const toBase64Url = (buffer: ArrayBuffer) => {
42-
return Buffer.from(buffer).toString("base64url");
41+
const toBase64Url = (buffer: ArrayBuffer | ArrayBufferView) => {
42+
return Buffer.from(
43+
buffer instanceof ArrayBuffer ? buffer : buffer.buffer
44+
).toString("base64url");
4345
};
4446

4547
export const getRequestAuthHash = async (request: Request) => {

apps/builder/app/shared/nano-states/misc.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import type { TokenPermissions } from "@webstudio-is/authorization-token";
1515
import type { AssetType } from "@webstudio-is/asset-uploader";
1616
import type { DragStartPayload } from "~/canvas/shared/use-drag-drop";
1717
import { type InstanceSelector } from "../tree-utils";
18-
import type { ChildrenOrientation } from "node_modules/@webstudio-is/design-system/src/components/primitives/dnd/geometry-utils";
18+
import type { ChildrenOrientation } from "@webstudio-is/design-system";
1919
import { $awareness, $selectedInstance } from "../awareness";
2020
import type { UserPlanFeatures } from "../db/user-plan-features.server";
2121
import {

apps/builder/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"build:http-client": "pnpm --filter=@webstudio-is/http-client build",
1515
"dev": "pnpm build:http-client && remix vite:dev",
1616
"dev:auth": "pnpm build:http-client && DEBUG=OAuth2Strategy,ws:* remix vite:dev",
17-
"typecheck": "tsc --noEmit --emitDeclarationOnly false",
17+
"typecheck": "tsgo --noEmit --emitDeclarationOnly false",
1818
"test": "vitest run"
1919
},
2020
"dependencies": {

apps/builder/tsconfig.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@
1313
],
1414

1515
"paths": {
16-
"~/*": ["app/*"]
16+
"~/*": ["./app/*"]
1717
},
18-
"baseUrl": ".",
1918
"declaration": false,
2019
"emitDeclarationOnly": false,
2120
"declarationDir": null,

fixtures/react-router-cloudflare/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "webstudio-react-router-cloudflare",
33
"scripts": {
4-
"typecheck": "wrangler types && tsc",
4+
"typecheck": "wrangler types && tsgo",
55
"cli": "NODE_OPTIONS='--conditions=webstudio --import=tsx' webstudio",
66
"fixtures:link": "pnpm cli link --link https://p-d845c167-ea07-4875-b08d-83e97c09dcce-dot-${BUILDER_HOST:-main.development.webstudio.is}'?authToken=e9d1343f-9298-4fd3-a66e-f89a5af2dd93'",
77
"fixtures:sync": "pnpm cli sync --buildId f565d527-32e7-4731-bc71-aca9e9574587 && pnpm prettier --write ./.webstudio/",

fixtures/react-router-docker/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"build": "react-router build",
44
"dev": "react-router dev",
55
"start": "react-router-serve ./build/server/index.js",
6-
"typecheck": "tsc",
6+
"typecheck": "tsgo --noEmit",
77
"cli": "NODE_OPTIONS='--conditions=webstudio --import=tsx' webstudio",
88
"fixtures:link": "pnpm cli link --link https://p-d845c167-ea07-4875-b08d-83e97c09dcce-dot-${BUILDER_HOST:-main.development.webstudio.is}'?authToken=e9d1343f-9298-4fd3-a66e-f89a5af2dd93'",
99
"fixtures:sync": "pnpm cli sync --buildId f565d527-32e7-4731-bc71-aca9e9574587 && pnpm prettier --write ./.webstudio/",

fixtures/react-router-netlify/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "webstudio-react-router-netlify",
33
"scripts": {
4-
"typecheck": "tsc",
4+
"typecheck": "tsgo --noEmit",
55
"cli": "NODE_OPTIONS='--conditions=webstudio --import=tsx' webstudio",
66
"fixtures:link": "pnpm cli link --link https://p-d845c167-ea07-4875-b08d-83e97c09dcce-dot-${BUILDER_HOST:-main.development.webstudio.is}'?authToken=e9d1343f-9298-4fd3-a66e-f89a5af2dd93'",
77
"fixtures:sync": "pnpm cli sync --buildId f565d527-32e7-4731-bc71-aca9e9574587 && pnpm prettier --write ./.webstudio/",

fixtures/react-router-vercel/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "webstudio-react-router-vercel",
33
"scripts": {
4-
"typecheck": "tsc",
4+
"typecheck": "tsgo --noEmit",
55
"cli": "NODE_OPTIONS='--conditions=webstudio --import=tsx' webstudio",
66
"fixtures:link": "pnpm cli link --link https://p-d845c167-ea07-4875-b08d-83e97c09dcce-dot-${BUILDER_HOST:-main.development.webstudio.is}'?authToken=e9d1343f-9298-4fd3-a66e-f89a5af2dd93'",
77
"fixtures:sync": "pnpm cli sync --buildId f565d527-32e7-4731-bc71-aca9e9574587 && pnpm prettier --write ./.webstudio/",

fixtures/ssg-netlify-by-project-id/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"build": "vite build",
77
"postbuild": "prettier --write \"dist/**/*.html\" || true",
88
"dev": "vite dev",
9-
"typecheck": "tsc",
9+
"typecheck": "tsgo --noEmit",
1010
"cli": "NODE_OPTIONS='--conditions=webstudio --import=tsx' webstudio",
1111
"fixtures:link": "pnpm cli link --link https://p-8a7358b1-7de3-459d-b7b1-56dddfb6ce1e-dot-${BUILDER_HOST:-main.development.webstudio.is}'?authToken=f55154e6-36b9-4920-bc81-3095cc88f8ff'",
1212
"fixtures:sync": "pnpm cli sync && pnpm prettier --write ./.webstudio/",

0 commit comments

Comments
 (0)