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.

refactor: replace env.d.ts with tsconfig types (#3121)

Bogdan Chadkinbf0f4ae776d9
diff --git a/apps/builder/env.d.ts b/apps/builder/env.d.ts
deleted file mode 100644
index 8d2f95181b..0000000000
--- a/apps/builder/env.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-/// <reference types="vite/client" />
-/// <reference types="@remix-run/node" />
diff --git a/apps/builder/tsconfig.json b/apps/builder/tsconfig.json
index 79a8ad6da9..bea7d5128c 100644
--- a/apps/builder/tsconfig.json
+++ b/apps/builder/tsconfig.json
@@ -1,7 +1,6 @@
{
"extends": "@webstudio-is/tsconfig/base.json",
"include": [
- "env.d.ts",
"app",
"**/*.ts",
"**/*.tsx",
@@ -10,6 +9,7 @@
],
"compilerOptions": {
+ "types": ["@remix-run/node", "vite/client"],
"paths": {
"~/*": ["app/*"]
},
diff --git a/fixtures/webstudio-custom-template/env.d.ts b/fixtures/webstudio-custom-template/env.d.ts
deleted file mode 100644
index 8d2f95181b..0000000000
--- a/fixtures/webstudio-custom-template/env.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-/// <reference types="vite/client" />
-/// <reference types="@remix-run/node" />
diff --git a/fixtures/webstudio-custom-template/tsconfig.json b/fixtures/webstudio-custom-template/tsconfig.json
index 478b345da7..afa0b94a32 100644
--- a/fixtures/webstudio-custom-template/tsconfig.json
+++ b/fixtures/webstudio-custom-template/tsconfig.json
@@ -1,7 +1,8 @@
{
- "include": ["env.d.ts", "**/*.ts", "**/*.tsx", "**/*.mjs"],
+ "include": ["**/*.ts", "**/*.tsx", "**/*.mjs"],
"compilerOptions": {
"lib": ["DOM", "DOM.Iterable", "ES2022"],
+ "types": ["@remix-run/node", "vite/client"],
"isolatedModules": true,
"esModuleInterop": true,
"jsx": "react-jsx",
diff --git a/fixtures/webstudio-remix-netlify-edge-functions/env.d.ts b/fixtures/webstudio-remix-netlify-edge-functions/env.d.ts
deleted file mode 100644
index 8d2f95181b..0000000000
--- a/fixtures/webstudio-remix-netlify-edge-functions/env.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-/// <reference types="vite/client" />
-/// <reference types="@remix-run/node" />
diff --git a/fixtures/webstudio-remix-netlify-edge-functions/tsconfig.json b/fixtures/webstudio-remix-netlify-edge-functions/tsconfig.json
index 478b345da7..afa0b94a32 100644
--- a/fixtures/webstudio-remix-netlify-edge-functions/tsconfig.json
+++ b/fixtures/webstudio-remix-netlify-edge-functions/tsconfig.json
@@ -1,7 +1,8 @@
{
- "include": ["env.d.ts", "**/*.ts", "**/*.tsx", "**/*.mjs"],
+ "include": ["**/*.ts", "**/*.tsx", "**/*.mjs"],
"compilerOptions": {
"lib": ["DOM", "DOM.Iterable", "ES2022"],
+ "types": ["@remix-run/node", "vite/client"],
"isolatedModules": true,
"esModuleInterop": true,
"jsx": "react-jsx",
diff --git a/fixtures/webstudio-remix-netlify-functions/env.d.ts b/fixtures/webstudio-remix-netlify-functions/env.d.ts
deleted file mode 100644
index 8d2f95181b..0000000000
--- a/fixtures/webstudio-remix-netlify-functions/env.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-/// <reference types="vite/client" />
-/// <reference types="@remix-run/node" />
diff --git a/fixtures/webstudio-remix-netlify-functions/tsconfig.json b/fixtures/webstudio-remix-netlify-functions/tsconfig.json
index 478b345da7..afa0b94a32 100644
--- a/fixtures/webstudio-remix-netlify-functions/tsconfig.json
+++ b/fixtures/webstudio-remix-netlify-functions/tsconfig.json
@@ -1,7 +1,8 @@
{
- "include": ["env.d.ts", "**/*.ts", "**/*.tsx", "**/*.mjs"],
+ "include": ["**/*.ts", "**/*.tsx", "**/*.mjs"],
"compilerOptions": {
"lib": ["DOM", "DOM.Iterable", "ES2022"],
+ "types": ["@remix-run/node", "vite/client"],
"isolatedModules": true,
"esModuleInterop": true,
"jsx": "react-jsx",
diff --git a/fixtures/webstudio-remix-vercel/env.d.ts b/fixtures/webstudio-remix-vercel/env.d.ts
deleted file mode 100644
index 8d2f95181b..0000000000
--- a/fixtures/webstudio-remix-vercel/env.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-/// <reference types="vite/client" />
-/// <reference types="@remix-run/node" />
diff --git a/fixtures/webstudio-remix-vercel/tsconfig.json b/fixtures/webstudio-remix-vercel/tsconfig.json
index 478b345da7..afa0b94a32 100644
--- a/fixtures/webstudio-remix-vercel/tsconfig.json
+++ b/fixtures/webstudio-remix-vercel/tsconfig.json
@@ -1,7 +1,8 @@
{
- "include": ["env.d.ts", "**/*.ts", "**/*.tsx", "**/*.mjs"],
+ "include": ["**/*.ts", "**/*.tsx", "**/*.mjs"],
"compilerOptions": {
"lib": ["DOM", "DOM.Iterable", "ES2022"],
+ "types": ["@remix-run/node", "vite/client"],
"isolatedModules": true,
"esModuleInterop": true,
"jsx": "react-jsx",
diff --git a/packages/cli/templates/defaults/env.d.ts b/packages/cli/templates/defaults/env.d.ts
deleted file mode 100644
index 8d2f95181b..0000000000
--- a/packages/cli/templates/defaults/env.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-/// <reference types="vite/client" />
-/// <reference types="@remix-run/node" />
diff --git a/packages/cli/templates/defaults/tsconfig.json b/packages/cli/templates/defaults/tsconfig.json
index 478b345da7..afa0b94a32 100644
--- a/packages/cli/templates/defaults/tsconfig.json
+++ b/packages/cli/templates/defaults/tsconfig.json
@@ -1,7 +1,8 @@
{
- "include": ["env.d.ts", "**/*.ts", "**/*.tsx", "**/*.mjs"],
+ "include": ["**/*.ts", "**/*.tsx", "**/*.mjs"],
"compilerOptions": {
"lib": ["DOM", "DOM.Iterable", "ES2022"],
+ "types": ["@remix-run/node", "vite/client"],
"isolatedModules": true,
"esModuleInterop": true,
"jsx": "react-jsx",
diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json
index 1ae963e7ff..9bdee8cb8d 100644
--- a/packages/cli/tsconfig.json
+++ b/packages/cli/tsconfig.json
@@ -2,6 +2,7 @@
"extends": "@webstudio-is/tsconfig/base.json",
"include": ["**/*.ts", "**/*.tsx", "**/*.mjs"],
"compilerOptions": {
+ "types": ["vite/client"],
"module": "esnext",
"allowJs": true,
"checkJs": true,