-
Notifications
You must be signed in to change notification settings - Fork 1.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update kitchen-sink with App Router. #4840
Merged
Merged
Changes from 5 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
164e1cf
Update kitchen-sink with App Router.
anthonyshew 91417ff
Bump packages.
anthonyshew 266452a
Remove pages dir.
anthonyshew 53e6d1e
More cleanup.
anthonyshew b92508f
Clean up tsup.
anthonyshew a74b09e
Merge branch 'main' into shew/app-router-kitchen-sink
anthonyshew a355c99
Merge branch 'main' into shew/app-router-kitchen-sink
anthonyshew 598fbdb
Maybe it needs transpiled?
anthonyshew 825ca68
Guess not.
anthonyshew 919ade6
Restoring old tsup config.
anthonyshew 64aa04e
Merge branch 'main' into shew/app-router-kitchen-sink
anthonyshew File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
import "./styles.css"; | ||
|
||
export default function RootLayout({ | ||
children, | ||
}: { | ||
children: React.ReactNode; | ||
}) { | ||
return ( | ||
<html lang="en"> | ||
<body>{children}</body> | ||
</html> | ||
); | ||
} |
8 changes: 4 additions & 4 deletions
8
...-sink/apps/storefront/src/pages/index.tsx → ...hen-sink/apps/storefront/src/app/page.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
html { | ||
font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, | ||
Segoe UI, Roboto, Helvetica Neue, Arial, sans-serif; | ||
-webkit-text-size-adjust: 100%; | ||
-webkit-font-smoothing: antialiased; | ||
-moz-osx-font-smoothing: grayscale; | ||
-webkit-tap-highlight-color: transparent; | ||
line-height: 1.5; | ||
tab-size: 4; | ||
} | ||
|
||
body { | ||
margin: 0; | ||
} | ||
|
||
.container { | ||
min-height: 100vh; | ||
display: flex; | ||
flex-direction: column; | ||
align-items: center; | ||
justify-content: center; | ||
gap: 1.5rem; | ||
max-width: 100%; | ||
margin: 0 auto; | ||
padding: 0 16px; | ||
text-align: center; | ||
} | ||
|
||
.title { | ||
font-size: 3rem; | ||
font-weight: 700; | ||
margin: 0; | ||
} | ||
|
||
.title span { | ||
display: inline-block; | ||
background-image: linear-gradient(to right, #3b82f6, #ef4444); | ||
-webkit-background-clip: text; | ||
background-clip: text; | ||
color: transparent; | ||
} | ||
|
||
.description { | ||
color: #9ca3af; | ||
font-weight: 500; | ||
} | ||
|
||
.description a { | ||
color: #3b82f6; | ||
text-decoration: none; | ||
} | ||
|
||
.description a:hover { | ||
text-decoration: underline; | ||
} |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,16 +1,16 @@ | ||
{ | ||
"private": true, | ||
"scripts": { | ||
"build": "turbo run build", | ||
"clean": "turbo run clean", | ||
"dev": "turbo run dev --no-cache --continue", | ||
"build": "turbo build", | ||
"clean": "turbo clean", | ||
"dev": "turbo dev --no-cache --continue", | ||
"format": "prettier --write \"**/*.{ts,tsx,md}\"", | ||
"lint": "turbo run lint", | ||
"test": "turbo run test" | ||
"lint": "turbo lint", | ||
"test": "turbo test" | ||
}, | ||
"devDependencies": { | ||
"prettier": "^2.7.1", | ||
"turbo": "latest" | ||
"turbo": "^1.9.3" | ||
}, | ||
"packageManager": "pnpm@7.15.0" | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
import { defineConfig, Options } from "tsup"; | ||
|
||
export default defineConfig((options: Options) => ({ | ||
entry: { | ||
".": "src/index.tsx", | ||
}, | ||
banner: { | ||
js: "'use client'", | ||
}, | ||
format: ["cjs", "esm"], | ||
external: ["react"], | ||
dts: true, | ||
...options, | ||
})); |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This works, but it's a little confusing as it's now dictating the type of components we can put in this package. And it makes the decision between bundling / using an internal package more nuanced. Not a change request, just a comment!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's definitely weird but I poked around the ecosystem and it doesn't look like there is an idiomatic way that people handle this yet. It's also notable that it's generally an okay approach as we're all learning how to migrate together. 😬