Skip to content

Commit a588e83

Browse files
committed
Merge branch 'main' into rr7
2 parents 501bc08 + 66d252e commit a588e83

Some content is hidden

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

48 files changed

+3044
-8267
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,4 +135,4 @@ dist
135135

136136
# IDE
137137
.idea
138-
.tsup
138+
.tsup

README.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,12 @@ Detailed documentation can be found here:
2121
https://remix-development-tools.fly.dev/
2222

2323

24+
# Deprecation warning!
25+
26+
Huge news! The remix-development-tools will be turning into react-router-devtools once the stable release of react-router 7 is out! As you already might've heard remix is being merged into react-router, so naturally these devtools are going to be supporting react-router users rather than remix users!
27+
28+
We are looking forward to expanding the scope of our users to a much broader audience and helping even more projects. When it comes to remix-development-tools all the updates will be coming out regularly until the official release of react-router v7 where this package will be rebranded with the same feature set.
29+
2430
## Getting Started
2531

2632
1. Install the package via npm:
@@ -61,6 +67,6 @@ Thanks to all the contributors on this project and the support to the community.
6167

6268
---
6369

64-
Devoted to my loving wife.
70+
Devoted to my loving wife and my little late bird Kiira who helped me initially build out these tools by keeping me company and being my rubber duck, she will forever be my best friend.
6571

66-
In loving memory of my late Grandfather, who taught me to always be curious, never stop learning, and to always be kind to others. I miss you, Grandpa.
72+
In loving memory of my late Grandfather, who taught me to always be curious, never stop learning, and to always be kind to others, and my late Grandmother who always encouraged me to learn new things, and stand up for the things I believe in.

docs/app/components/ClientHint.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { useRevalidator } from '@remix-run/react'
22
import { useEffect } from 'react'
33

4-
export const clientHints = {
4+
const clientHints = {
55
theme: {
66
cookieName: 'CH-prefers-color-scheme',
77
getValueCode:
@@ -127,7 +127,7 @@ document.cookie = encodeURIComponent(hint.name) + '=' + encodeURIComponent(hint.
127127
}
128128
}
129129
130-
// On Cookie change, reload the page, unless the browser doesn't support Cookies.
130+
// On Cookie change, reload the page, unless the browser doesn't support Cookies.
131131
if (hasCookieChanged && navigator.cookieEnabled) {
132132
window.location.reload();
133133
}

docs/app/components/FeaturesSection.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const content = [
1111
</span>
1212
in real time. See your deferred data load in and see your cached loader
1313
information . No more
14-
<span className="mx-1 font-bold text-red-500">console.log().</span>Get
14+
<span className="mx-1 font-bold text-red-500">console.log</span>Get
1515
the information you need when you need it.
1616
</div>
1717
),

docs/app/components/ui/Button.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ export function Button({
6868
)
6969
}
7070

71-
export const MovingBorder = ({
71+
const MovingBorder = ({
7272
children,
7373
duration = 2000,
7474
rx,

docs/app/components/ui/Lamp.tsx

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,7 @@ import React from 'react'
22
import { motion } from 'framer-motion'
33
import { cn } from '~/utils/cn'
44

5-
export function LampDemo() {
6-
return (
7-
<LampContainer>
8-
<motion.h1
9-
initial={{ opacity: 0.5, y: 100 }}
10-
whileInView={{ opacity: 1, y: 0 }}
11-
transition={{
12-
delay: 0.3,
13-
duration: 0.8,
14-
ease: 'easeInOut',
15-
}}
16-
className="mt-8 bg-gradient-to-br from-slate-300 to-slate-500 bg-clip-text py-4 text-center text-4xl font-medium tracking-tight text-transparent md:text-7xl"
17-
>
18-
Build lamps <br /> the right way
19-
</motion.h1>
20-
</LampContainer>
21-
)
22-
}
5+
236

247
export const LampContainer = ({
258
children,

docs/app/components/ui/Spotlight.tsx

Lines changed: 0 additions & 55 deletions
This file was deleted.

docs/app/components/ui/navbar-menu.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const transition = {
1212
restSpeed: 0.001,
1313
}
1414

15-
export const MenuItem = ({
15+
const MenuItem = ({
1616
setActive,
1717
active,
1818
item,
@@ -59,7 +59,7 @@ export const MenuItem = ({
5959
)
6060
}
6161

62-
export const Menu = ({
62+
const Menu = ({
6363
setActive,
6464
children,
6565
}: {
@@ -76,7 +76,7 @@ export const Menu = ({
7676
)
7777
}
7878

79-
export const HoveredLink = ({ children, ...rest }: any) => {
79+
const HoveredLink = ({ children, ...rest }: any) => {
8080
return (
8181
<Link
8282
{...rest}

docs/app/components/ui/text-generate-effect.tsx

Lines changed: 0 additions & 53 deletions
This file was deleted.

0 commit comments

Comments
 (0)