go back to pnpm

we've come full circle
astudentinearth · Feb 8, 2025 · 897ce8a · 897ce8a
1 parent a41d3e1
commit 897ce8a
Show file tree

Hide file tree

Showing 8 changed files with 19,197 additions and 9,262 deletions.
diff --git a/.npmrc b/.npmrc
@@ -0,0 +1 @@
+node-linker=hosited
diff --git a/package.json b/package.json
@@ -27,7 +27,6 @@
     "katex": "^0.16.21",
     "vitest": "^3.0.5"
   },
-  "packageManager": "yarn@4.6.0",
   "private": true,
   "scripts": {
     "test": "bun run --filter '*' test",
@@ -40,5 +39,6 @@
   },
   "workspaces": [
     "packages/*"
-  ]
+  ],
+  "packageManager": "pnpm@9.12.3+sha512.cce0f9de9c5a7c95bef944169cc5dfe8741abfb145078c0d508b868056848a87c81e626246cb60967cbd7fd29a6c062ef73ff840d96b3c86c40ac92cf4a813ee"
 }
diff --git a/packages/app-desktop/.npmrc b/packages/app-desktop/.npmrc
@@ -1 +1 @@
-shamefully-hoist=true
+node-linker=hoisted
diff --git a/packages/app-desktop/THIRDPARTY.txt b/packages/app-desktop/THIRDPARTY.txt
diff --git a/packages/app-desktop/package.json b/packages/app-desktop/package.json
@@ -37,8 +37,8 @@
     "typecheck": "tsc --noEmit --project tsconfig.json"
   },
   "dependencies": {
-    "@darkwrite/common": "*",
-    "@darkwrite/ui": "*",
+    "@darkwrite/common": "workspace:*",
+    "@darkwrite/ui": "workspace:*",
     "@electron-toolkit/preload": "^3.0.1",
     "@electron-toolkit/utils": "^3.0.0",
     "@emoji-mart/data": "^1.2.1",
@@ -60,20 +60,20 @@
     "@tanstack/react-query": "^5.59.19",
     "@tanstack/react-query-devtools": "^5.59.19",
     "@tiptap/core": "^2.6.6",
+    "@tiptap/extension-code-block": "^2.11.5",
     "@tiptap/extension-horizontal-rule": "^2.6.6",
     "@tiptap/extension-placeholder": "^2.6.6",
     "@tiptap/html": "^2.7.2",
     "@tiptap/react": "^2.6.6",
     "@tiptap/starter-kit": "^2.6.6",
-    "@types/color-convert": "^2.0.4",
     "@types/es6-shim": "^0.31.45",
     "@types/fs-extra": "^11.0.4",
     "@types/lodash": "^4.17.7",
     "better-sqlite3": "^11.2.1",
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.1.1",
     "cmdk": "1.0.4",
-    "color-convert": "^3.0.1",
+    "color-convert": "^2.0.1",
     "dotenv": "^16.4.5",
     "electron-log": "^5.1.5",
     "emoji-mart": "^5.6.0",
@@ -125,6 +125,7 @@
     "@testing-library/jest-dom": "^6.4.6",
     "@testing-library/react": "^16.0.0",
     "@testing-library/user-event": "^14.5.2",
+    "@types/color-convert": "^2.0.4",
     "@types/node": "^20",
     "@types/react": "^19",
     "@types/react-dom": "^19",

diff --git a/packages/ui/tsconfig.lib.tsbuildinfo b/packages/ui/tsconfig.lib.tsbuildinfo
@@ -1 +1 @@
-{"root":["./lib/index.ts","./lib/components/ui/button.tsx","./lib/lib/utils.ts"],"version":"5.7.2"}
+{"root":["./lib/index.ts","./lib/components/ui/button.tsx","./lib/components/ui/dropdown-menu.tsx","./lib/components/ui/popover.tsx","./lib/lib/utils.ts"],"version":"5.7.3"}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"root":["./lib/index.ts","./lib/components/ui/button.tsx","./lib/lib/utils.ts"],"version":"5.7.2"}
		{"root":["./lib/index.ts","./lib/components/ui/button.tsx","./lib/components/ui/dropdown-menu.tsx","./lib/components/ui/popover.tsx","./lib/lib/utils.ts"],"version":"5.7.3"}