Skip to content

Commit 7e69e41

Browse files
authored
Merge pull request #25 from react18-tools/tailwind
Tailwind
2 parents 41e10d8 + 19db11b commit 7e69e41

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+431
-272
lines changed

.github/workflows/docs.yml

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
name: Update dependencies and Docs
2+
3+
on:
4+
push:
5+
branches: [main]
6+
schedule:
7+
- cron: "0 0 */2 * *"
8+
jobs:
9+
doc:
10+
if: github.event.repository.owner.login == 'react18-tools'
11+
runs-on: ubuntu-latest
12+
permissions:
13+
packages: write
14+
contents: write
15+
steps:
16+
- uses: actions/checkout@v3
17+
with:
18+
token: ${{ secrets.GITHUB_TOKEN }}
19+
20+
- uses: actions/setup-node@v3
21+
with:
22+
registry-url: https://registry.npmjs.org
23+
node-version: 20
24+
- run: npm i -g pnpm && pnpm i
25+
name: Install dependencies
26+
- name: Test
27+
run: npm test
28+
- run: git status && git clean -f -d && git status
29+
name: clean up working directory
30+
- run: npx @turbo/codemod update . && pnpm update --latest -w
31+
name: Update dependencies
32+
- run: pnpm build
33+
name: Build all apps to make sure it is not broken due to dependency upgrades
34+
- name: Run unit tests
35+
run: pnpm test
36+
- name: Generate/update docs
37+
run: pnpm doc
38+
- name: Setup Git
39+
run: |
40+
git config --global user.name "mayank1513"
41+
git config --global user.email "[email protected]"
42+
git fetch
43+
git checkout main
44+
- name: Save upgraded packages back to repo
45+
run: git add . && git commit -m "upgrade deps && docs" && git push origin main

.github/workflows/publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ name: Publish to NPM
44
on:
55
push:
66
branches: [main]
7-
paths: "packages/react18-themes/package.json"
7+
paths: "lib/react18-themes/package.json"
88

99
jobs:
1010
publish:
@@ -15,7 +15,7 @@ jobs:
1515

1616
defaults:
1717
run:
18-
working-directory: ./packages/react18-themes
18+
working-directory: ./lib/react18-themes
1919

2020
steps:
2121
- uses: actions/checkout@v3

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ jobs:
2424
- name: Upload coverage reports to Codecov
2525
uses: codecov/codecov-action@v3
2626
with:
27-
directory: ./packages/react18-themes
27+
directory: ./lib/react18-themes
2828
token: ${{ secrets.CODECOV_TOKEN }}
2929
flags: fork-me
3030
- uses: paambaati/[email protected]
3131
continue-on-error: true
3232
env:
3333
CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
3434
with:
35-
coverageLocations: ./packages/react18-themes/coverage/*.xml:clover
35+
coverageLocations: ./lib/react18-themes/coverage/*.xml:clover

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ This project is inspired by `next-themes`. `next-themes` is an awesome package,
2323
- ✅ Class or data attribute selector
2424
- ✅ Manipulate theme via `useTheme` hook
2525
- ✅ Doccumented with [Typedoc](https://react18-tools.github.io/react18-themes) ([Docs](https://react18-tools.github.io/react18-themes))
26+
- ✅ Use combinations of [data-th=""] and [data-color-scheme=""] for dark/light varients of themes
27+
- ✅ Use [data-csp=""] to style based on colorSchemePreference.
2628

2729
Check out the [live example](https://react18-themes.vercel.app/).
2830

examples/nextjs/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# nextjs-example
22

3+
## 0.0.12
4+
5+
### Patch Changes
6+
7+
- Updated dependencies
8+
9+
10+
311
## 0.0.11
412

513
### Patch Changes

examples/nextjs/app/layout.tsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@ import Link from "next/link";
66

77
const inter = Inter({ subsets: ["latin"] });
88
const forcedPages: ForcedPage[] = [
9-
[/forced-color-scheme\/dark/, { colorScheme: "dark" }],
10-
[/forced-color-scheme\/light/, { colorScheme: "light" }],
11-
...[...darkThemes, ...lightThemes].map(th => [new RegExp(`themed-page/${th}`), { theme: "light" }] as ForcedPage),
9+
{ pathMatcher: /forced-color-scheme\/dark/, props: { forcedColorScheme: "dark" } },
10+
{ pathMatcher: /forced-color-scheme\/light/, props: { forcedColorScheme: "light" } },
11+
...[...darkThemes, ...lightThemes].map(
12+
theme => ({ pathMatcher: new RegExp(`themed-page/${theme}`), props: { forcedTheme: theme } }) as ForcedPage,
13+
),
1214
];
1315

1416
export default function RootLayout({ children }: { children: React.ReactNode }): JSX.Element {

examples/nextjs/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "nextjs-example",
3-
"version": "0.0.11",
3+
"version": "0.0.12",
44
"private": true,
55
"scripts": {
66
"dev": "next dev --port 3002",
@@ -10,14 +10,14 @@
1010
},
1111
"dependencies": {
1212
"@mayank1513/fork-me": "^2.0.0",
13-
"next": "^14.0.3",
13+
"next": "^14.0.4",
1414
"react": "^18.2.0",
1515
"react-dom": "^18.2.0",
1616
"react18-themes": "workspace:*",
1717
"shared-ui": "workspace:*"
1818
},
1919
"devDependencies": {
20-
"@next/eslint-plugin-next": "^14.0.3",
20+
"@next/eslint-plugin-next": "^14.0.4",
2121
"@types/node": "^20.10.4",
2222
"@types/react": "^18.2.42",
2323
"@types/react-dom": "^18.2.17",

examples/remix/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,14 @@
44

55
### Patch Changes
66

7+
- Updated dependencies
8+
9+
10+
11+
## null
12+
13+
### Patch Changes
14+
715
- Updated dependencies [170b3f2]
816
917

examples/remix/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
"sideEffects": false,
55
"type": "module",
66
"scripts": {
7-
"build": "remix build",
8-
"dev": "remix dev --manual",
7+
"build-remix": "remix build",
8+
"dev-remix": "remix dev --manual",
99
"start": "remix-serve ./build/index.js",
1010
"typecheck": "tsc"
1111
},

examples/remix/remix.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/** @type {import('@remix-run/dev').AppConfig} */
22
export default {
33
ignoredRouteFiles: ["**/.*"],
4-
watchPaths: ["../../packages/react18-themes", "../../packages/shared-ui"],
4+
watchPaths: ["../../lib/react18-themes", "../../packages/shared-ui"],
55
serverDependenciesToBundle: ["react18-themes", "shared-ui"],
66
// appDirectory: "app",
77
// assetsBuildDirectory: "public/build",

0 commit comments

Comments
 (0)