From a8294a41802a32926ea478e468b6aad29bf90470 Mon Sep 17 00:00:00 2001 From: Mayank Kumar Chaudhari Date: Tue, 27 Feb 2024 20:57:02 +0530 Subject: [PATCH 1/3] tkb --- .tkb | 29 +++++++++++++++++++++++++++++ .vscode/settings.json | 3 ++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 .tkb diff --git a/.tkb b/.tkb new file mode 100644 index 00000000..15ff7bec --- /dev/null +++ b/.tkb @@ -0,0 +1,29 @@ +{ + "scope": "Workspace", + "tasks": { + "task-oQKhoVOKYhYaRYGvlDMj5": { + "id": "task-oQKhoVOKYhYaRYGvlDMj5", + "description": "Add support for persist and sync", + "columnId": "column-todo" + } + }, + "columns": [ + { + "id": "column-todo", + "title": "To do", + "tasksIds": [ + "task-oQKhoVOKYhYaRYGvlDMj5" + ] + }, + { + "id": "column-doing", + "title": "Doing", + "tasksIds": [] + }, + { + "id": "column-done", + "title": "Done", + "tasksIds": [] + } + ] +} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index 3f05f7e7..20d656cd 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -27,5 +27,6 @@ "editor.wordWrap": "on", "editor.formatOnSave": true, "editor.formatOnPaste": true, - "editor.formatOnSaveMode": "file" + "editor.formatOnSaveMode": "file", + "mayank1513.trello-kanban.Workspace.filePath": ".tkb" } From ede6fff61f177bb938717222807b3cf948e2251d Mon Sep 17 00:00:00 2001 From: Mayank Kumar Chaudhari Date: Wed, 28 Feb 2024 08:31:25 +0530 Subject: [PATCH 2/3] Update examples to use nthul-lite with full tree shaking --- examples/nextjs/app/layout.tsx | 4 ++-- examples/nextjs/package.json | 2 +- examples/remix/package.json | 2 +- examples/vite/package.json | 2 +- lib/r18gs/README.md | 2 -- packages/shared-ui/package.json | 4 ++-- packages/shared-ui/src/root-layout.tsx | 4 ++-- packages/shared-ui/src/root/description.tsx | 2 +- 8 files changed, 10 insertions(+), 12 deletions(-) diff --git a/examples/nextjs/app/layout.tsx b/examples/nextjs/app/layout.tsx index 25f15f47..5e45229a 100644 --- a/examples/nextjs/app/layout.tsx +++ b/examples/nextjs/app/layout.tsx @@ -1,4 +1,4 @@ -import { NextJsSSGThemeSwitcher } from "nextjs-themes/server/nextjs"; +import { ServerTarget } from "nthul-lite/server"; import { Inter } from "next/font/google"; import { SharedRootLayout } from "shared-ui"; @@ -8,7 +8,7 @@ export default function RootLayout({ children }: { children: React.ReactNode }): return ( - + {children} diff --git a/examples/nextjs/package.json b/examples/nextjs/package.json index 248c3e9a..12c86918 100644 --- a/examples/nextjs/package.json +++ b/examples/nextjs/package.json @@ -12,7 +12,7 @@ "dependencies": { "@mayank1513/fork-me": "^2.0.1", "next": "^14.1.0", - "nextjs-themes": "^2.1.2", + "nthul-lite": "^0.1.0", "r18gs": "workspace:*", "react": "^18.2.0", "react-dom": "^18.2.0", diff --git a/examples/remix/package.json b/examples/remix/package.json index d35f21db..d92acea5 100644 --- a/examples/remix/package.json +++ b/examples/remix/package.json @@ -17,7 +17,7 @@ "@remix-run/react": "^2.7.2", "@remix-run/serve": "^2.7.2", "isbot": "5.1.0", - "nextjs-themes": "^2.1.2", + "nthul-lite": "^0.1.0", "r18gs": "workspace:*", "react": "^18.2.0", "react-dom": "^18.2.0", diff --git a/examples/vite/package.json b/examples/vite/package.json index abeb4be9..7ba861de 100644 --- a/examples/vite/package.json +++ b/examples/vite/package.json @@ -11,7 +11,7 @@ }, "dependencies": { "@mayank1513/fork-me": "^2.0.1", - "nextjs-themes": "^2.1.2", + "nthul-lite": "^0.1.0", "r18gs": "workspace:*", "react": "^18.2.0", "react-dom": "^18.2.0", diff --git a/lib/r18gs/README.md b/lib/r18gs/README.md index e3eb8d5f..718ce322 100644 --- a/lib/r18gs/README.md +++ b/lib/r18gs/README.md @@ -8,8 +8,6 @@ I have built wonderful libraries utilizing React18 features using Zustand. They Thus, I decided to create a bare minimum, ultra-light store that creates shared state even while importing components from separate files for better treeshaking. -> Will be using this library soon to fix issues with `nextjs-themes`. - ## Features ✅ Full TypeScript Support diff --git a/packages/shared-ui/package.json b/packages/shared-ui/package.json index 03cf366f..dece8a4b 100644 --- a/packages/shared-ui/package.json +++ b/packages/shared-ui/package.json @@ -16,13 +16,13 @@ "@types/react-dom": "^18.2.19", "eslint-config-custom": "workspace:*", "next": "^14.1.0", - "nextjs-themes": "^2.1.2", "r18gs": "workspace:*", "react": "^18.2.0", "tsconfig": "workspace:*", "typescript": "5.3.3" }, "dependencies": { - "eslint": "^8.57.0" + "eslint": "^8.57.0", + "nthul-lite": "^0.1.0" } } diff --git a/packages/shared-ui/src/root-layout.tsx b/packages/shared-ui/src/root-layout.tsx index 4ce42ac0..650b82d8 100644 --- a/packages/shared-ui/src/root-layout.tsx +++ b/packages/shared-ui/src/root-layout.tsx @@ -1,6 +1,6 @@ import "./globals.css"; -import "nextjs-themes/styles.css"; -import { ThemeSwitcher } from "nextjs-themes"; +import "nthul-lite/styles.css"; +import { ThemeSwitcher } from "nthul-lite/client/theme-switcher"; import { ForkMe } from "@mayank1513/fork-me/server"; // todo: import directory not supported in remix import type { HTMLProps } from "react"; import styles from "./root-layout.module.css"; diff --git a/packages/shared-ui/src/root/description.tsx b/packages/shared-ui/src/root/description.tsx index 23467fbe..2209c8a4 100644 --- a/packages/shared-ui/src/root/description.tsx +++ b/packages/shared-ui/src/root/description.tsx @@ -1,4 +1,4 @@ -import { ColorSwitch } from "nextjs-themes"; +import { ColorSwitch } from "nthul-lite/client/color-switch"; import { Logo } from "../common/logo"; import styles from "../root-layout.module.css"; From 9f0feba18df7aee60cb36778fe4741538f942aad Mon Sep 17 00:00:00 2001 From: Mayank Kumar Chaudhari Date: Wed, 28 Feb 2024 08:32:40 +0530 Subject: [PATCH 3/3] update dependencies [skip ci] --- examples/nextjs/package.json | 4 ++-- examples/remix/package.json | 4 ++-- examples/vite/package.json | 6 +++--- lib/r18gs/package.json | 6 +++--- packages/shared-ui/package.json | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/examples/nextjs/package.json b/examples/nextjs/package.json index 12c86918..5f4b9def 100644 --- a/examples/nextjs/package.json +++ b/examples/nextjs/package.json @@ -20,8 +20,8 @@ }, "devDependencies": { "@next/eslint-plugin-next": "^14.1.0", - "@types/node": "^20.11.20", - "@types/react": "^18.2.58", + "@types/node": "^20.11.21", + "@types/react": "^18.2.60", "@types/react-dom": "^18.2.19", "eslint-config-custom": "workspace:*", "tsconfig": "workspace:*", diff --git a/examples/remix/package.json b/examples/remix/package.json index d92acea5..72afddf5 100644 --- a/examples/remix/package.json +++ b/examples/remix/package.json @@ -16,7 +16,7 @@ "@remix-run/node": "^2.7.2", "@remix-run/react": "^2.7.2", "@remix-run/serve": "^2.7.2", - "isbot": "5.1.0", + "isbot": "5.1.1", "nthul-lite": "^0.1.0", "r18gs": "workspace:*", "react": "^18.2.0", @@ -26,7 +26,7 @@ "devDependencies": { "@remix-run/dev": "^2.7.2", "@remix-run/eslint-config": "^2.7.2", - "@types/react": "^18.2.58", + "@types/react": "^18.2.60", "@types/react-dom": "^18.2.19", "eslint": "^8.57.0", "typescript": "^5.3.3" diff --git a/examples/vite/package.json b/examples/vite/package.json index 7ba861de..9d0609c9 100644 --- a/examples/vite/package.json +++ b/examples/vite/package.json @@ -18,10 +18,10 @@ "shared-ui": "workspace:*" }, "devDependencies": { - "@types/react": "^18.2.58", + "@types/react": "^18.2.60", "@types/react-dom": "^18.2.19", - "@typescript-eslint/eslint-plugin": "^7.0.2", - "@typescript-eslint/parser": "^7.0.2", + "@typescript-eslint/eslint-plugin": "^7.1.0", + "@typescript-eslint/parser": "^7.1.0", "@vitejs/plugin-react-swc": "^3.6.0", "eslint": "^8.57.0", "eslint-plugin-react-hooks": "^4.6.0", diff --git a/lib/r18gs/package.json b/lib/r18gs/package.json index cc10b9a6..f3050f91 100644 --- a/lib/r18gs/package.json +++ b/lib/r18gs/package.json @@ -26,8 +26,8 @@ "devDependencies": { "@testing-library/react": "^14.2.1", "@turbo/gen": "^1.12.4", - "@types/node": "^20.11.20", - "@types/react": "^18.2.58", + "@types/node": "^20.11.21", + "@types/react": "^18.2.60", "@types/react-dom": "^18.2.19", "@vitejs/plugin-react": "^4.2.1", "@vitest/coverage-v8": "^1.3.1", @@ -37,7 +37,7 @@ "react": "^18.2.0", "tsconfig": "workspace:*", "tsup": "^8.0.2", - "typedoc": "^0.25.8", + "typedoc": "^0.25.9", "typescript": "^5.3.3", "vite-tsconfig-paths": "^4.3.1", "vitest": "^1.3.1" diff --git a/packages/shared-ui/package.json b/packages/shared-ui/package.json index dece8a4b..0d47b7ab 100644 --- a/packages/shared-ui/package.json +++ b/packages/shared-ui/package.json @@ -11,8 +11,8 @@ }, "devDependencies": { "@mayank1513/fork-me": "^2.0.1", - "@types/node": "^20.11.20", - "@types/react": "^18.2.58", + "@types/node": "^20.11.21", + "@types/react": "^18.2.60", "@types/react-dom": "^18.2.19", "eslint-config-custom": "workspace:*", "next": "^14.1.0",