Skip to content

Commit bd42696

Browse files
committed
refactor: ♻️ restructure toolkit packages exports to support live types, while pnpm handles the real js files in the publish config
- Updates package.json files in `toolkit`, `toolkit-react`, `toolkit-type-helpers`, and `toolkit-core` to point directly to source files (`.ts`) instead of the `dist` folder for development. The `publishConfig` section is updated to include the correct `exports`, `main`, `module`, and `types` configurations for publishing. - Updates the `pnpm-workspace.yaml` to use `apps/*` instead of `app/*` for package pathing. - Updates the dev app to import `useScrollObserver` from `@zayne-labs/toolkit/react` instead of `@zayne-labs/toolkit-react`. - Updates `@zayne-labs/tsconfig` dependency to version `0.2.1` in all packages. - Updates `@eslint-react/eslint-plugin` to version `1.29.0` and `@types/node` to version `22.13.8` in the root `package.json`. - Removes `package.json` from `.prettierignore`.
1 parent e1ea64d commit bd42696

14 files changed

+334
-586
lines changed

.prettierignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dist
22
pnpm-lock.yaml
3-
package.json
3+
# package.json
44
*.md
55
*.tsbuildinfo
66
.next

.prettierrc.js

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import { baseConfig } from "@zayne-labs/eslint-config/prettier";
2+
3+
const config = {
4+
...baseConfig,
5+
};
6+
7+
export default config;

.prettierrc.json

-7
This file was deleted.

apps/dev/package.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
},
1212
"dependencies": {
1313
"@zayne-labs/toolkit": "workspace:*",
14-
"@zayne-labs/toolkit-react": "workspace:*",
1514
"react": "19.0.0",
1615
"react-dom": "19.0.0"
1716
},
@@ -20,7 +19,7 @@
2019
"@types/react": "19.0.10",
2120
"@types/react-dom": "19.0.4",
2221
"@vitejs/plugin-react-swc": "^3.8.0",
23-
"@zayne-labs/tsconfig": "catalog:",
22+
"@zayne-labs/tsconfig": "0.2.1",
2423
"tsx": "^4.19.3",
2524
"typescript": "5.8.2",
2625
"vite": "^6.2.0"

apps/dev/src/client/AnotherApp.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { useScrollObserver } from "@zayne-labs/toolkit-react";
1+
import { useScrollObserver } from "@zayne-labs/toolkit/react";
22

33
function AnotherApp() {
44
const { isScrolled, observedElementRef } = useScrollObserver();

bump.config.ts

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { defineConfig } from "bumpp";
2-
// import { globSync } from "tinyglobby";
32

43
export default defineConfig({
54
all: true,

package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
},
2828
"devDependencies": {
2929
"@changesets/cli": "^2.28.1",
30-
"@eslint-react/eslint-plugin": "^1.28.0",
31-
"@types/node": "^22.13.6",
32-
"@zayne-labs/eslint-config": "^0.6.0",
33-
"@zayne-labs/tsconfig": "^0.2.1",
30+
"@eslint-react/eslint-plugin": "^1.29.0",
31+
"@types/node": "^22.13.8",
32+
"@zayne-labs/eslint-config": "^0.6.1",
33+
"@zayne-labs/tsconfig": "0.2.1",
3434
"bumpp": "^10.0.3",
3535
"eslint": "^9.21.0",
3636
"eslint-plugin-react-hooks": "^5.2.0",

packages/toolkit-core/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"@size-limit/preset-small-lib": "^11.2.0",
5555
"@total-typescript/ts-reset": "^0.6.1",
5656
"@types/node": "^22.13.6",
57-
"@zayne-labs/tsconfig": "catalog:",
57+
"@zayne-labs/tsconfig": "0.2.1",
5858
"clsx": "^2.1.1",
5959
"concurrently": "^9.1.2",
6060
"cross-env": "^7.0.3",

packages/toolkit-react/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
"@types/node": "^22.13.6",
7676
"@types/react": "^19.0.10",
7777
"@types/react-dom": "^19.0.4",
78-
"@zayne-labs/tsconfig": "catalog:",
78+
"@zayne-labs/tsconfig": "0.2.1",
7979
"concurrently": "^9.1.2",
8080
"cross-env": "^7.0.3",
8181
"publint": "^0.3.7",

packages/toolkit-type-helpers/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"@size-limit/preset-small-lib": "^11.2.0",
5454
"@total-typescript/ts-reset": "^0.6.1",
5555
"@types/node": "^22.13.6",
56-
"@zayne-labs/tsconfig": "catalog:",
56+
"@zayne-labs/tsconfig": "0.2.1",
5757
"clsx": "^2.1.1",
5858
"concurrently": "^9.1.2",
5959
"cross-env": "^7.0.3",

packages/toolkit/.prettierrc.json

-8
This file was deleted.

packages/toolkit/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
"@types/node": "^22.13.6",
7777
"@types/react": "^19.0.10",
7878
"@types/react-dom": "^19.0.4",
79-
"@zayne-labs/tsconfig": "catalog:",
79+
"@zayne-labs/tsconfig": "0.2.1",
8080
"concurrently": "^9.1.2",
8181
"cross-env": "^7.0.3",
8282
"publint": "^0.3.7",

0 commit comments

Comments
 (0)