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.

Generate declaration files before publishing packages (#1351)

Mateusz Burzyński678c9a273fb1
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index f48074a146..3f8b022dfa 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -19,7 +19,7 @@ jobs:
- uses: actions/checkout@v3
- uses: ./.github/actions/ci-setup
- - run: pnpm size-test build
+ - run: pnpm size-test build dts
- name: Creating .npmrc
run: |
diff --git a/apps/builder/app/builder/builder.tsx b/apps/builder/app/builder/builder.tsx
index 8d77166b36..1eb7f1bc80 100644
--- a/apps/builder/app/builder/builder.tsx
+++ b/apps/builder/app/builder/builder.tsx
@@ -3,7 +3,7 @@ import { type Publish, usePublish, useSubscribe } from "~/shared/pubsub";
import type { Build } from "@webstudio-is/project-build";
import type { Project } from "@webstudio-is/project";
import { theme, Box, type CSS, Flex, Grid } from "@webstudio-is/design-system";
-import type { AuthPermit } from "@webstudio-is/trpc-interface";
+import type { AuthPermit } from "@webstudio-is/trpc-interface/server";
import { registerContainers, useBuilderStore } from "~/shared/sync";
import { useSyncServer } from "./shared/sync/sync-server";
// eslint-disable-next-line import/no-internal-modules
diff --git a/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-thumbnail.tsx b/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-thumbnail.tsx
index 48ca5291e9..e686907e07 100644
--- a/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-thumbnail.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-thumbnail.tsx
@@ -4,7 +4,6 @@ import type { StyleInfo } from "../../shared/style-info";
import brokenImage from "~/shared/images/broken-image-placeholder.svg";
import env from "~/shared/env";
import { layeredBackgroundProps } from "./background-layers";
-import type { StyleProperty } from "@webstudio-is/css-data";
import { toValue } from "@webstudio-is/css-engine";
import { toPascalCase } from "../../shared/keyword-utils";
@@ -98,7 +97,9 @@ export const LayerThumbnail = (props: { layerStyle: StyleInfo }) => {
}
if (backgroundImageStyle?.type === "unparsed") {
- const cssStyle: { [property in StyleProperty]?: string } = {};
+ const cssStyle: {
+ [property in (typeof layeredBackgroundProps)[number]]?: string;
+ } = {};
for (const property of layeredBackgroundProps) {
cssStyle[property] = toValue(props.layerStyle[property]?.value);
diff --git a/apps/builder/app/builder/shared/sync/sync-server.ts b/apps/builder/app/builder/shared/sync/sync-server.ts
index 1d0e2c0ab4..761abad9c2 100644
--- a/apps/builder/app/builder/shared/sync/sync-server.ts
+++ b/apps/builder/app/builder/shared/sync/sync-server.ts
@@ -5,7 +5,7 @@ import { restPatchPath } from "~/shared/router-utils";
import { useEffect } from "react";
import { enqueue, dequeue, queueStatus } from "./queue";
import { useBeforeUnload } from "react-use";
-import type { AuthPermit } from "@webstudio-is/trpc-interface";
+import type { AuthPermit } from "@webstudio-is/trpc-interface/server";
// Periodic check for new entries to group them into one job/call in sync queue.
const NEW_ENTRIES_INTERVAL = 1000;
diff --git a/apps/builder/app/shared/nano-states/nano-states.ts b/apps/builder/app/shared/nano-states/nano-states.ts
index 0717ec8bf1..72f008f23e 100644
--- a/apps/builder/app/shared/nano-states/nano-states.ts
+++ b/apps/builder/app/shared/nano-states/nano-states.ts
@@ -2,7 +2,7 @@ import { useMemo } from "react";
import { atom, computed, type WritableAtom } from "nanostores";
import { useStore } from "@nanostores/react";
import { nanoid } from "nanoid";
-import type { AuthPermit } from "@webstudio-is/trpc-interface";
+import type { AuthPermit } from "@webstudio-is/trpc-interface/server";
import type { Asset, Assets } from "@webstudio-is/asset-uploader";
import type { ItemDropTarget, Placement } from "@webstudio-is/design-system";
import type {
diff --git a/apps/builder/package.json b/apps/builder/package.json
index d9e3317dcc..47bb3afad4 100644
--- a/apps/builder/package.json
+++ b/apps/builder/package.json
@@ -90,7 +90,7 @@
"shallow-equal": "^3.1.0",
"slugify": "^1.6.5",
"title-case": "^3.0.3",
- "use-debounce": "^9.0.2",
+ "use-debounce": "^9.0.4",
"uuid": "^9.0.0",
"warn-once": "^0.1.1",
"zod": "^3.19.1",
diff --git a/package.json b/package.json
index 3a44ed3324..0b94716afd 100644
--- a/package.json
+++ b/package.json
@@ -6,6 +6,7 @@
"scripts": {
"build": "turbo run build",
"build-packages": "turbo run build --filter=\"!@webstudio-is/builder\"",
+ "dts": "turbo run dts",
"size-test": "turbo run size-test",
"checks": "turbo run checks",
"dev": "pnpm run --parallel --recursive dev",
@@ -64,6 +65,9 @@
"react-dom": "17.0.2",
"@types/react": "17.0.47",
"babel-loader": "8.3.0"
+ },
+ "patchedDependencies": {
+ "@stitches/[email protected]": "patches/@[email protected]"
}
}
}
diff --git a/packages/asset-uploader/package.json b/packages/asset-uploader/package.json
index 7fd77daf0b..1ad8d01c19 100644
--- a/packages/asset-uploader/package.json
+++ b/packages/asset-uploader/package.json
@@ -11,6 +11,7 @@
"checks": "pnpm typecheck && pnpm lint && pnpm test",
"dev": "build-package --watch",
"build": "build-package",
+ "dts": "tsc --emitDeclarationOnly --declaration --declarationDir lib/types",
"lint": "eslint ./src --ext .ts,.tsx --max-warnings 0"
},
"dependencies": {
@@ -43,9 +44,12 @@
"import": "./lib/index.js",
"require": "./lib/cjs/index.js"
},
- "./server": "./server.js"
+ "./server": {
+ "source": "./src/index.server.ts",
+ "default": "./server.js"
+ }
},
- "types": "src/index.ts",
+ "types": "lib/types/index.d.ts",
"files": [
"lib/*",
"src/*",
diff --git a/packages/asset-uploader/server.d.ts b/packages/asset-uploader/server.d.ts
index ad6dde9958..e83d502945 100644
--- a/packages/asset-uploader/server.d.ts
+++ b/packages/asset-uploader/server.d.ts
@@ -1 +1 @@
-export * from "./src/index.server";
+export * from "./lib/types/index.server";
diff --git a/packages/authorization-token/package.json b/packages/authorization-token/package.json
index 6ade745172..f458bd19a5 100644
--- a/packages/authorization-token/package.json
+++ b/packages/authorization-token/package.json
@@ -11,6 +11,7 @@
"checks": "pnpm typecheck && pnpm lint",
"dev": "build-package --watch",
"build": "build-package",
+ "dts": "tsc --emitDeclarationOnly --declaration --declarationDir lib/types",
"lint": "eslint ./src --ext .ts,.tsx --max-warnings 0"
},
"dependencies": {
@@ -32,9 +33,12 @@
"import": "./lib/index.js",
"require": "./lib/cjs/index.js"
},
- "./server": "./server.js"
+ "./server": {
+ "source": "./src/index.server.ts",
+ "default": "./server.js"
+ }
},
- "types": "src/index.ts",
+ "types": "lib/types/index.d.ts",
"files": [
"lib/*",
"src/*",
diff --git a/packages/authorization-token/server.d.ts b/packages/authorization-token/server.d.ts
index ad6dde9958..e83d502945 100644
--- a/packages/authorization-token/server.d.ts
+++ b/packages/authorization-token/server.d.ts
@@ -1 +1 @@
-export * from "./src/index.server";
+export * from "./lib/types/index.server";
diff --git a/packages/authorization-token/tsconfig.json b/packages/authorization-token/tsconfig.json
index 8b148a5ede..74b8f3611b 100644
--- a/packages/authorization-token/tsconfig.json
+++ b/packages/authorization-token/tsconfig.json
@@ -1,5 +1,6 @@
{
"extends": "@webstudio-is/tsconfig/base.json",
+ "include": ["src"],
"compilerOptions": {
"module": "ES2020",
"target": "ES2020"
diff --git a/packages/css-data/package.json b/packages/css-data/package.json
index 5cc0f3fcfa..4ee573845f 100644
--- a/packages/css-data/package.json
+++ b/packages/css-data/package.json
@@ -11,6 +11,7 @@
"dev": "build-package --watch",
"build": "build-package",
"build:mdn-data": "tsx ./bin/mdn-data.ts ./src/__generated__ && prettier --write \"./src/__generated__/**/*.ts\"",
+ "dts": "tsc --emitDeclarationOnly --declaration --declarationDir lib/types",
"lint": "eslint ./src --ext .ts,.tsx --max-warnings 0"
},
"devDependencies": {
@@ -33,7 +34,7 @@
"import": "./lib/index.js",
"require": "./lib/cjs/index.js"
},
- "types": "src/index.ts",
+ "types": "lib/types/index.d.ts",
"files": [
"lib/*",
"src/*",
diff --git a/packages/css-engine/package.json b/packages/css-engine/package.json
index 5e8925f2c7..4ea9c106cb 100644
--- a/packages/css-engine/package.json
+++ b/packages/css-engine/package.json
@@ -10,6 +10,7 @@
"checks": "pnpm typecheck && pnpm lint && pnpm test",
"dev": "build-package --watch",
"build": "build-package",
+ "dts": "tsc --emitDeclarationOnly --declaration --declarationDir lib/types",
"test": "NODE_OPTIONS=--experimental-vm-modules jest",
"lint": "eslint ./src --ext .ts,.tsx --max-warnings 0",
"storybook:run": "start-storybook -p 6006",
@@ -39,7 +40,7 @@
"source": "./src/index.ts",
"import": "./lib/index.js"
},
- "types": "src/index.ts",
+ "types": "lib/types/index.d.ts",
"files": [
"lib/*",
"src/*",
diff --git a/packages/css-vars/package.json b/packages/css-vars/package.json
index 8b38958e23..207e04534b 100644
--- a/packages/css-vars/package.json
+++ b/packages/css-vars/package.json
@@ -10,6 +10,7 @@
"checks": "pnpm typecheck && pnpm lint",
"dev": "build-package --watch",
"build": "build-package",
+ "dts": "tsc --emitDeclarationOnly --declaration --declarationDir lib/types",
"lint": "eslint ./src --ext .ts,.tsx --max-warnings 0"
},
"devDependencies": {
@@ -23,7 +24,7 @@
"import": "./lib/index.js",
"require": "./lib/cjs/index.js"
},
- "types": "src/index.ts",
+ "types": "lib/types/index.d.ts",
"files": [
"lib/*",
"src/*",
diff --git a/packages/dashboard/package.json b/packages/dashboard/package.json
index 584b60b0c8..b0921c0880 100644
--- a/packages/dashboard/package.json
+++ b/packages/dashboard/package.json
@@ -33,9 +33,12 @@
"import": "./lib/index.js",
"require": "./lib/cjs/index.js"
},
- "./server": "./server.js"
+ "./server": {
+ "source": "./src/index.server.ts",
+ "default": "./server.js"
+ }
},
- "types": "src/index.ts",
+ "types": "lib/types/index.d.ts",
"files": [
"lib/*",
"src/*",
diff --git a/packages/dashboard/server.d.ts b/packages/dashboard/server.d.ts
index ad6dde9958..e83d502945 100644
--- a/packages/dashboard/server.d.ts
+++ b/packages/dashboard/server.d.ts
@@ -1 +1 @@
-export * from "./src/index.server";
+export * from "./lib/types/index.server";
diff --git a/packages/design-system/package.json b/packages/design-system/package.json
index 12ead87e9d..bdf7c90bf0 100644
--- a/packages/design-system/package.json
+++ b/packages/design-system/package.json
@@ -9,6 +9,7 @@
"dev": "build-package --watch",
"build": "build-package",
"build-figma-tokens": "tsx ./bin/transform-figma-tokens.ts",
+ "dts": "tsc --emitDeclarationOnly --declaration --declarationDir lib/types",
"typecheck": "tsc --noEmit",
"lint": "eslint ./src --ext .ts,.tsx --max-warnings 0",
"test": "NODE_OPTIONS=--experimental-vm-modules jest",
@@ -70,7 +71,7 @@
"@react-aria/focus": "^3.11.0",
"@react-aria/interactions": "^3.11.0",
"@react-aria/utils": "^3.13.3",
- "@stitches/react": "^1.2.8",
+ "@stitches/react": "1.3.1-1",
"@webstudio-is/css-vars": "workspace:^",
"@webstudio-is/icons": "workspace:^",
"camelcase": "^6.3.0",
@@ -80,13 +81,13 @@
"match-sorter": "^6.3.1",
"react-hot-toast": "^2.3.0",
"token-transformer": "^0.0.28",
- "use-debounce": "^9.0.2"
+ "use-debounce": "^9.0.4"
},
"exports": {
"source": "./src/index.ts",
"import": "./lib/index.js"
},
- "types": "src/index.ts",
+ "types": "lib/types/index.d.ts",
"files": [
"lib/*",
"src/*",
diff --git a/packages/feature-flags/package.json b/packages/feature-flags/package.json
index 6fd7346fd0..f83c715caa 100644
--- a/packages/feature-flags/package.json
+++ b/packages/feature-flags/package.json
@@ -10,6 +10,7 @@
"checks": "pnpm typecheck && pnpm lint",
"dev": "build-package --watch",
"build": "build-package",
+ "dts": "tsc --emitDeclarationOnly --declaration --declarationDir lib/types",
"lint": "eslint ./src --ext .ts,.tsx --max-warnings 0"
},
"dependencies": {},
@@ -21,7 +22,7 @@
"source": "./src/index.ts",
"import": "./lib/index.js"
},
- "types": "src/index.ts",
+ "types": "lib/types/index.d.ts",
"files": [
"lib/*",
"src/*",
diff --git a/packages/fonts/package.json b/packages/fonts/package.json
index df8b59ac8b..de1180a8e9 100644
--- a/packages/fonts/package.json
+++ b/packages/fonts/package.json
@@ -11,6 +11,7 @@
"checks": "pnpm typecheck && pnpm lint && pnpm test",
"dev": "build-package --watch",
"build": "build-package",
+ "dts": "tsc --emitDeclarationOnly --declaration --declarationDir lib/types",
"lint": "eslint ./src --ext .ts,.tsx --max-warnings 0"
},
"dependencies": {
@@ -37,9 +38,12 @@
"import": "./lib/index.js",
"require": "./lib/cjs/index.js"
},
- "./server": "./server.js"
+ "./server": {
+ "source": "./src/index.server.ts",
+ "default": "./server.js"
+ }
},
- "types": "src/index.ts",
+ "types": "lib/types/index.d.ts",
"files": [
"lib/*",
"src/*",
diff --git a/packages/fonts/server.d.ts b/packages/fonts/server.d.ts
index ad6dde9958..e83d502945 100644
--- a/packages/fonts/server.d.ts
+++ b/packages/fonts/server.d.ts
@@ -1 +1 @@
-export * from "./src/index.server";
+export * from "./lib/types/index.server";
diff --git a/packages/generate-arg-types/package.json b/packages/generate-arg-types/package.json
index e266a0a189..2d87dd79df 100644
--- a/packages/generate-arg-types/package.json
+++ b/packages/generate-arg-types/package.json
@@ -8,6 +8,7 @@
"scripts": {
"dev": "build-package --watch",
"build": "build-package",
+ "dts": "tsc --emitDeclarationOnly --declaration --declarationDir lib/types",
"typecheck": "tsc --noEmit",
"checks": "pnpm typecheck && pnpm lint",
"lint": "eslint ./src --ext .ts,.tsx --max-warnings 0"
@@ -38,7 +39,7 @@
"source": "./src/index.ts",
"import": "./lib/index.js"
},
- "types": "src/index.ts",
+ "types": "lib/types/index.d.ts",
"license": "MIT",
"private": false,
"sideEffects": false
diff --git a/packages/http-client/package.json b/packages/http-client/package.json
index 41cb0d973d..c04487394a 100644
--- a/packages/http-client/package.json
+++ b/packages/http-client/package.json
@@ -8,6 +8,7 @@
"scripts": {
"dev": "build-package --watch",
"build": "build-package",
+ "dts": "tsc --emitDeclarationOnly --declaration --declarationDir lib/types",
"test": "NODE_OPTIONS=--experimental-vm-modules jest",
"typecheck": "tsc --noEmit",
"lint": "eslint ./src --ext .ts,.tsx --max-warnings 0",
@@ -31,7 +32,7 @@
"source": "./src/index.ts",
"import": "./lib/index.js"
},
- "types": "src/index.ts",
+ "types": "lib/types/index.d.ts",
"files": [
"lib/*",
"src/*",
diff --git a/packages/icons/package.json b/packages/icons/package.json
index 908369551e..b8908badb9 100644
--- a/packages/icons/package.json
+++ b/packages/icons/package.json
@@ -8,6 +8,7 @@
"scripts": {
"dev": "build-package --watch",
"build": "build-package",
+ "dts": "tsc --emitDeclarationOnly --declaration --declarationDir lib/types",
"generate": "rm -fr src/__generated__ && NODE_OPTIONS='--loader=tsx' svgo-jsx svgo-jsx.config.ts",
"typecheck": "tsc --noEmit",
"lint": "eslint ./src --ext .ts,.tsx --max-warnings 0",
@@ -39,7 +40,7 @@
"import": "./lib/index.js",
"require": "./lib/cjs/index.js"
},
- "types": "src/index.ts",
+ "types": "lib/types/index.d.ts",
"files": [
"lib/*",
"src/*",
diff --git a/packages/image/package.json b/packages/image/package.json
index 454a9b3062..89b09498fe 100644
--- a/packages/image/package.json
+++ b/packages/image/package.json
@@ -12,6 +12,7 @@
"dev": "build-package --watch",
"build": "build-package",
"build:args": "generate-arg-types './src/*.tsx !./src/**/*.stories.tsx !./src/**/*.ws.tsx' && prettier --write \"**/*.props.ts\"",
+ "dts": "tsc --emitDeclarationOnly --declaration --declarationDir lib/types",
"lint": "eslint ./src --ext .ts,.tsx --max-warnings 0",
"storybook:run": "start-storybook -p 6006",
"storybook:build": "build-storybook",
@@ -43,7 +44,7 @@
"import": "./lib/index.js",
"require": "./lib/cjs/index.js"
},
- "types": "src/index.ts",
+ "types": "lib/types/index.d.ts",
"files": [
"lib/*",
"src/*",
diff --git a/packages/prisma-client/package.json b/packages/prisma-client/package.json
index 7508c58f62..20e73790d0 100644
--- a/packages/prisma-client/package.json
+++ b/packages/prisma-client/package.json
@@ -32,7 +32,7 @@
"import": "./lib/index.js",
"require": "./lib/cjs/index.js"
},
- "types": "src/index.ts",
+ "types": "lib/types/index.d.ts",
"license": "MIT",
"private": false,
"dependencies": {
diff --git a/packages/project-build/package.json b/packages/project-build/package.json
index 8245b4fdbb..5004d55a2a 100644
--- a/packages/project-build/package.json
+++ b/packages/project-build/package.json
@@ -12,9 +12,12 @@
"import": "./lib/index.js",
"require": "./lib/cjs/index.js"
},
- "./server": "./server.js"
+ "./server": {
+ "source": "./src/index.server.ts",
+ "default": "./server.js"
+ }
},
- "types": "src/index.ts",
+ "types": "lib/types/index.d.ts",
"files": [
"lib/*",
"src/*",
@@ -27,7 +30,8 @@
"lint": "eslint ./src --ext .ts,.tsx --max-warnings 0",
"checks": "pnpm typecheck && pnpm lint && pnpm test",
"dev": "build-package --watch",
- "build": "build-package"
+ "build": "build-package",
+ "dts": "tsc --emitDeclarationOnly --declaration --declarationDir lib/types"
},
"dependencies": {
"@webstudio-is/asset-uploader": "workspace:^",
diff --git a/packages/project-build/server.d.ts b/packages/project-build/server.d.ts
index ad6dde9958..e83d502945 100644
--- a/packages/project-build/server.d.ts
+++ b/packages/project-build/server.d.ts
@@ -1 +1 @@
-export * from "./src/index.server";
+export * from "./lib/types/index.server";
diff --git a/packages/project-build/src/db/build.ts b/packages/project-build/src/db/build.ts
index 08ade6410c..b59f257a29 100644
--- a/packages/project-build/src/db/build.ts
+++ b/packages/project-build/src/db/build.ts
@@ -5,7 +5,7 @@ import {
prisma,
Prisma,
} from "@webstudio-is/prisma-client";
-import type { AppContext } from "@webstudio-is/trpc-interface";
+import type { AppContext } from "@webstudio-is/trpc-interface/server";
import type { Build } from "../types";
import { Pages } from "../schema/pages";
import {
diff --git a/packages/project-build/tsconfig.json b/packages/project-build/tsconfig.json
index 8b148a5ede..74b8f3611b 100644
--- a/packages/project-build/tsconfig.json
+++ b/packages/project-build/tsconfig.json
@@ -1,5 +1,6 @@
{
"extends": "@webstudio-is/tsconfig/base.json",
+ "include": ["src"],
"compilerOptions": {
"module": "ES2020",
"target": "ES2020"
diff --git a/packages/project/package.json b/packages/project/package.json
index 34238db8e9..7ad84fccac 100644
--- a/packages/project/package.json
+++ b/packages/project/package.json
@@ -10,6 +10,7 @@
"checks": "pnpm typecheck && pnpm lint",
"dev": "build-package --watch",
"build": "build-package",
+ "dts": "tsc --emitDeclarationOnly --declaration --declarationDir lib/types",
"lint": "eslint ./src --ext .ts,.tsx --max-warnings 0"
},
"dependencies": {
@@ -35,9 +36,12 @@
"import": "./lib/index.js",
"require": "./lib/cjs/index.js"
},
- "./server": "./server.js"
+ "./server": {
+ "source": "./src/index.server.ts",
+ "default": "./server.js"
+ }
},
- "types": "src/index.ts",
+ "types": "lib/types/index.d.ts",
"files": [
"lib/*",
"src/*"
diff --git a/packages/project/server.d.ts b/packages/project/server.d.ts
index ad6dde9958..e83d502945 100644
--- a/packages/project/server.d.ts
+++ b/packages/project/server.d.ts
@@ -1 +1 @@
-export * from "./src/index.server";
+export * from "./lib/types/index.server";
diff --git a/packages/react-sdk/package.json b/packages/react-sdk/package.json
index 31f7a85580..46baa72be8 100644
--- a/packages/react-sdk/package.json
+++ b/packages/react-sdk/package.json
@@ -9,6 +9,7 @@
"dev": "build-package --watch",
"build": "build-package",
"build:args": "generate-arg-types './src/components/*.tsx !./src/**/*.stories.tsx !./src/**/*.ws.tsx' && prettier --write \"**/*.props.ts\"",
+ "dts": "tsc --emitDeclarationOnly --declaration --declarationDir lib/types",
"typecheck": "tsc --noEmit",
"test": "NODE_OPTIONS=--experimental-vm-modules jest --passWithNoTests",
"lint": "eslint ./src --ext .ts,.tsx --max-warnings 0",
@@ -67,7 +68,7 @@
"require": "./lib/cjs/index.js"
}
},
- "types": "src/index.ts",
+ "types": "lib/types/index.d.ts",
"files": [
"lib/*",
"src/*",
diff --git a/packages/scripts/package.json b/packages/scripts/package.json
index 0454370bea..b785cddbc3 100644
--- a/packages/scripts/package.json
+++ b/packages/scripts/package.json
@@ -15,7 +15,7 @@
},
"dependencies": {
"esbuild": "^0.17.14",
- "totalist": "^3.0.0"
+ "totalist": "^3.0.1"
},
"devDependencies": {
"@types/node": "^18.11.18",
diff --git a/packages/trpc-interface/package.json b/packages/trpc-interface/package.json
index e443dad576..bb54e589ef 100644
--- a/packages/trpc-interface/package.json
+++ b/packages/trpc-interface/package.json
@@ -11,6 +11,7 @@
"checks": "pnpm typecheck && pnpm lint",
"dev": "build-package --watch",
"build": "build-package",
+ "dts": "tsc --emitDeclarationOnly --declaration --declarationDir lib/types",
"lint": "eslint ./src --ext .ts,.tsx --max-warnings 0"
},
"dependencies": {
@@ -28,9 +29,11 @@
"typescript": "5.0.3"
},
"exports": {
- "./server": "./server.js"
+ "./server": {
+ "source": "./src/index.server.ts",
+ "default": "./server.js"
+ }
},
- "types": "src/index.server.ts",
"files": [
"lib/*",
"src/*",
diff --git a/packages/trpc-interface/server.d.ts b/packages/trpc-interface/server.d.ts
index ad6dde9958..e83d502945 100644
--- a/packages/trpc-interface/server.d.ts
+++ b/packages/trpc-interface/server.d.ts
@@ -1 +1 @@
-export * from "./src/index.server";
+export * from "./lib/types/index.server";
diff --git a/packages/tsconfig/base.json b/packages/tsconfig/base.json
index 73df0ff0fd..f255513ec2 100644
--- a/packages/tsconfig/base.json
+++ b/packages/tsconfig/base.json
@@ -6,7 +6,9 @@
"forceConsistentCasingInFileNames": true,
"inlineSources": false,
"isolatedModules": true,
- "moduleResolution": "node",
+ "moduleResolution": "bundler",
+ "allowImportingTsExtensions": true,
+ "customConditions": ["source"],
"noUnusedLocals": true,
"noUnusedParameters": false,
"preserveWatchOutput": true,
diff --git a/patches/@[email protected] b/patches/@[email protected]
new file mode 100644
index 0000000000..594e29f019
--- /dev/null
+++ b/patches/@[email protected]
@@ -0,0 +1,27 @@
+diff --git a/package.json b/package.json
+index e944f271cd7cb172abcac315866a3b69dc408f2a..522db63f5f83e2f51b550252eda30f4f34c29fe1 100644
+--- a/package.json
++++ b/package.json
+@@ -4,7 +4,6 @@
+ "description": "The modern CSS-in-JS library",
+ "type": "module",
+ "main": "dist/index.cjs",
+- "module": "dist/index.mjs",
+ "types": "types/index.d.ts",
+ "typesVersions": {
+ ">= 4.1": {
+@@ -15,14 +14,6 @@
+ },
+ "jsdelivr": "dist/index.global.js",
+ "unpkg": "dist/index.global.js",
+- "exports": {
+- ".": {
+- "require": "./dist/index.cjs",
+- "import": "./dist/index.mjs",
+- "types": "./types/index.d.ts"
+- },
+- "./global": "./dist/index.global.js"
+- },
+ "files": [
+ "dist/*.cjs",
+ "dist/*.js",
\ No newline at end of file
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b12e549602..a78a1a163a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -5,6 +5,11 @@ overrides:
'@types/react': 17.0.47
babel-loader: 8.3.0
+patchedDependencies:
+ '@stitches/[email protected]':
+ hash: knml42mpr6mlzseo3d6gjljiq4
+ path: patches/@[email protected]
+
importers:
.:
@@ -262,8 +267,8 @@ importers:
specifier: ^3.0.3
version: 3.0.3
use-debounce:
- specifier: ^9.0.2
- version: 9.0.2([email protected])
+ specifier: ^9.0.4
+ version: 9.0.4([email protected])
uuid:
specifier: ^9.0.0
version: 9.0.0
@@ -687,8 +692,8 @@ importers:
specifier: ^3.13.3
version: 3.13.3([email protected])
'@stitches/react':
- specifier: ^1.2.8
- version: 1.2.8([email protected])
+ specifier: 1.3.1-1
+ version: 1.3.1-1(patch_hash=knml42mpr6mlzseo3d6gjljiq4)([email protected])
'@webstudio-is/css-vars':
specifier: workspace:^
version: link:../css-vars
@@ -717,8 +722,8 @@ importers:
specifier: ^0.0.28
version: 0.0.28
use-debounce:
- specifier: ^9.0.2
- version: 9.0.2([email protected])
+ specifier: ^9.0.4
+ version: 9.0.4([email protected])
devDependencies:
'@jest/globals':
specifier: ^29.3.1
@@ -1252,8 +1257,8 @@ importers:
specifier: ^0.17.14
version: 0.17.14
totalist:
- specifier: ^3.0.0
- version: 3.0.0
+ specifier: ^3.0.1
+ version: 3.0.1
devDependencies:
'@types/node':
specifier: ^18.11.18
@@ -6758,13 +6763,14 @@ packages:
size-limit: 8.2.4
dev: true
- resolution: {integrity: sha512-9g9dWI4gsSVe8bNLlb+lMkBYsnIKCZTmvqvDG+Avnn69XfmHZKiaMrx7cgTaddq7aTPPmXiTsbFcUy0xgI4+wA==}
+ /@stitches/[email protected](patch_hash=knml42mpr6mlzseo3d6gjljiq4)([email protected]):
+ resolution: {integrity: sha512-ErptbQehV25Da6LtZuM/51kGNK/UvlRY2da9IhhfXQ9h4bmf2f+lYFiJQ9j43O1kwYr6iYJIBRM47FEbsUWffw==}
peerDependencies:
react: '>= 16.3.0'
dependencies:
react: 17.0.2
dev: false
+ patched: true
resolution: {integrity: sha512-aADjilFmuD6TNGz2CRPSupnyiA/IGkPJHDBTqMpsDXTUr8xnuD122xkIhg6UxmCM2y1c+ncwYXy3WPK2xXK57g==}
@@ -19012,8 +19018,8 @@ packages:
resolution: {integrity: sha512-y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w==}
dev: true
- resolution: {integrity: sha512-eM+pCBxXO/njtF7vdFsHuqb+ElbxqtI4r5EAvk6grfAFyJ6IvWlSkfZ5T9ozC6xWw3Fj1fGoSmrl0gUs46JVIw==}
+ resolution: {integrity: sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==}
engines: {node: '>=6'}
dev: false
@@ -19583,8 +19589,8 @@ packages:
tslib: 2.5.0
dev: false
- resolution: {integrity: sha512-QLyB0sxt9F5AisGDrUybCRJSLE60bTQR0yXc+IebNGUu1GCXwii1zsZl82mPGdWqDVQy7+1FKMLHQUixxf5Nbw==}
+ resolution: {integrity: sha512-6X8H/mikbrt0XE8e+JXRtZ8yYVvKkdYRfmIhWZYsP8rcNs9hk3APV8Ua2mFkKRLcJKVdnX2/Vwrmg2GWKUQEaQ==}
engines: {node: '>= 10.0.0'}
peerDependencies:
react: '>=16.8.0'
diff --git a/turbo.json b/turbo.json
index 9581ad99ec..9f1ceaf19b 100644
--- a/turbo.json
+++ b/turbo.json
@@ -6,6 +6,10 @@
"dependsOn": ["^build"],
"outputs": ["lib/**", "dist/**", "build/**", "api/**", "public/build/**"]
},
+ "dts": {
+ "dependsOn": ["^dts"],
+ "outputs": ["lib/types/**"]
+ },
"checks": {
"dependsOn": ["build", "^checks"]
},