Skip to content

Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.

Extend tsconfig from package in remix apps (#1920)

Bogdan Chadkindb31e37751e2
diff --git a/apps/builder/tsconfig.json b/apps/builder/tsconfig.json
index e1758ca218..b91e6736a3 100644
--- a/apps/builder/tsconfig.json
+++ b/apps/builder/tsconfig.json
@@ -1,6 +1,7 @@
{
- "extends": "../../packages/tsconfig/remix.json",
+ "extends": "@webstudio-is/tsconfig/base.json",
"include": [
+ "app",
"remix.env.d.ts",
"**/*.ts",
"**/*.tsx",
diff --git a/packages/sdk-size-test/package.json b/packages/sdk-size-test/package.json
index 0855b14489..aad36c71ae 100644
--- a/packages/sdk-size-test/package.json
+++ b/packages/sdk-size-test/package.json
@@ -36,6 +36,7 @@
"@size-limit/file": "^8.2.4",
"@types/react": "^18.0.35",
"@types/react-dom": "^18.0.11",
+ "@webstudio-is/tsconfig": "workspace:^",
"size-limit": "^8.2.4",
"typescript": "5.1.3"
}
diff --git a/packages/sdk-size-test/tsconfig.json b/packages/sdk-size-test/tsconfig.json
index 7c7e5c91d8..c6eca1e599 100644
--- a/packages/sdk-size-test/tsconfig.json
+++ b/packages/sdk-size-test/tsconfig.json
@@ -1,6 +1,7 @@
{
- "extends": "../../packages/tsconfig/remix.json",
+ "extends": "@webstudio-is/tsconfig/base.json",
"include": [
+ "app",
"remix.env.d.ts",
"**/*.ts",
"**/*.tsx",
diff --git a/packages/tsconfig/remix.json b/packages/tsconfig/remix.json
deleted file mode 100644
index 08b32c9123..0000000000
--- a/packages/tsconfig/remix.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "$schema": "https://json.schemastore.org/tsconfig",
- "display": "Remix",
- "extends": "./base.json",
- "compilerOptions": {
- "jsx": "react-jsx",
- "target": "ES2021",
- "module": "ES2020",
- "lib": ["DOM", "DOM.Iterable", "ES2021"]
- },
- "include": ["app", "remix.env.d.ts"],
- "exclude": ["node_modules"]
-}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 59f057205d..3e5bfb2f42 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1438,6 +1438,9 @@ importers:
'@types/react-dom':
specifier: ^18.0.11
version: 18.0.11
+ '@webstudio-is/tsconfig':
+ specifier: workspace:^
+ version: link:../tsconfig
size-limit:
specifier: ^8.2.4
version: 8.2.4