Skip to content
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.

Sign up for GitHub

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

Jump to bottom

fix: stop inlining rxjs and @sanity/comlink #2012

Merged
merged 1 commit into from
Oct 21, 2024
+126 −266
Merged

fix: stop inlining rxjs and @sanity/comlink #2012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions apps/next-with-i18n/app/(website)/[locale]/[...path]/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ import { Page } from '@/components/Page'
import { loadPage } from '@/data/sanity'

export default async function DynamicRoute({
params: { path, locale },
params,
}: {
params: { path: string[]; locale: string }
params: Promise<{ path: string[]; locale: string }>
}) {
const { path, locale } = await params
const pathname = `/${path.join('/')}`
const data = await loadPage(pathname, locale)

Expand Down
9 changes: 5 additions & 4 deletions apps/next-with-i18n/app/(website)/[locale]/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,22 @@ const sans = Inter({
})

export default async function RootLayout({
params: { locale },
params,
children,
}: {
params: { locale: string }
params: Promise<{ locale: string }>
children: React.ReactNode
}) {
const { locale } = await params
return (
<html lang={locale} className={sans.variable}>
<body>
{children}
{draftMode().isEnabled && (
{(await draftMode()).isEnabled && (
<VisualEditing
refresh={async (payload) => {
'use server'
if (!draftMode().isEnabled) {
if (!(await draftMode()).isEnabled) {
console.debug(
'Skipped manual refresh because draft mode is not enabled',
)
Expand Down
5 changes: 3 additions & 2 deletions apps/next-with-i18n/app/(website)/[locale]/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ import { Page } from '@/components/Page'
import { loadPage } from '@/data/sanity'

export default async function IndexRoute({
params: { locale },
params,
}: {
params: { locale: string }
params: Promise<{ locale: string }>
}) {
const { locale } = await params
const data = await loadPage('/', locale)

return <Page data={data} />
Expand Down
4 changes: 2 additions & 2 deletions apps/next-with-i18n/app/api/disable-draft/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { draftMode } from 'next/headers'
import { NextRequest, NextResponse } from 'next/server'

export function GET(request: NextRequest) {
draftMode().disable()
export async function GET(request: NextRequest) {
;(await draftMode()).disable()
const url = new URL(request.nextUrl)
return NextResponse.redirect(new URL('/', url.origin))
}
2 changes: 1 addition & 1 deletion apps/next-with-i18n/app/api/draft/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export async function GET(request: Request) {
return new Response('Invalid secret', { status: 401 })
}

draftMode().enable()
;(await draftMode()).enable()

redirect(redirectTo)
}
2 changes: 1 addition & 1 deletion apps/next-with-i18n/data/sanity/loadQuery.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export async function loadQuery<QueryResponse>({
query: string
params?: QueryParams
}): Promise<QueryResponse> {
const isDraftMode = draftMode().isEnabled
const isDraftMode = (await draftMode()).isEnabled
const token = config.sanity.token

if (isDraftMode && !token) {
Expand Down
4 changes: 2 additions & 2 deletions apps/next/src/app/api/draft-mode/disable/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import {draftMode} from 'next/headers'
import {NextRequest, NextResponse} from 'next/server'

export function GET(request: NextRequest) {
draftMode().disable()
export async function GET(request: NextRequest) {
;(await draftMode()).disable()
const url = new URL(request.nextUrl)
return NextResponse.redirect(new URL('/pages-router/shoes', url.origin))
}
4 changes: 2 additions & 2 deletions apps/next/src/app/compat/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ export default async function RootLayout({children}: {children: React.ReactNode}
<html lang="en">
<body>
{children}
{draftMode().isEnabled && <VisualEditing />}
{(await draftMode()).isEnabled && <VisualEditing />}
<a className="fixed bottom-1 left-1 block rounded bg-slate-900 px-2 py-1 text-xs text-slate-100">
app-router:{' '}
{draftMode().isEnabled
{(await draftMode()).isEnabled
? 'draftMode'
: process.env.NEXT_PUBLIC_VERCEL_ENV || 'development'}
{', '}
Expand Down
4 changes: 2 additions & 2 deletions apps/next/src/app/compat/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ export default async function ShoesPage() {
{},
{
filterResponse: false,
perspective: draftMode().isEnabled ? 'previewDrafts' : 'published',
useCdn: draftMode().isEnabled ? false : true,
perspective: (await draftMode()).isEnabled ? 'previewDrafts' : 'published',
useCdn: (await draftMode()).isEnabled ? false : true,
cache: 'no-store',
},
)
Expand Down
6 changes: 3 additions & 3 deletions apps/next/src/app/only-visual-editing/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ export default async function RootLayout({children}: {children: React.ReactNode}
<body>
{children}
<VercelToolbar />
{draftMode().isEnabled && (
{(await draftMode()).isEnabled && (
<VisualEditing
refresh={async (payload) => {
'use server'
if (!draftMode().isEnabled) {
if (!(await draftMode()).isEnabled) {
console.error('Draft Mode is not enabled, ignoring refresh')
return
}
Expand All @@ -42,7 +42,7 @@ export default async function RootLayout({children}: {children: React.ReactNode}
)}
<a className="fixed bottom-1 left-1 block rounded bg-slate-900 px-2 py-1 text-xs text-slate-100">
app-router:{' '}
{draftMode().isEnabled
{(await draftMode()).isEnabled
? 'draftMode'
: process.env.NEXT_PUBLIC_VERCEL_ENV || 'development'}
{', '}
Expand Down
4 changes: 2 additions & 2 deletions apps/next/src/app/only-visual-editing/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ export default async function ShoesPage() {
{},
{
filterResponse: false,
perspective: draftMode().isEnabled ? 'previewDrafts' : 'published',
useCdn: draftMode().isEnabled ? false : true,
perspective: (await draftMode()).isEnabled ? 'previewDrafts' : 'published',
useCdn: (await draftMode()).isEnabled ? false : true,
next: {revalidate: false, tags: ['shoe']},
},
)
Expand Down
8 changes: 4 additions & 4 deletions apps/next/src/app/shoes/[slug]/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ import {loadQuery} from '../sanity.ssr'
import ShoePageClient from './page.client'

type Props = {
params: {slug: string}
params: Promise<{slug: string}>
}

export default async function ShoePage(props: Props) {
const {params} = props
const params = await props.params
const initial = loadQuery<ShoeResult>(shoe, params, {
perspective: draftMode().isEnabled ? 'previewDrafts' : 'published',
perspective: (await draftMode()).isEnabled ? 'previewDrafts' : 'published',
next: {
revalidate: draftMode().isEnabled ? 0 : false,
revalidate: (await draftMode()).isEnabled ? 0 : false,
tags: [`shoe:${params.slug}`],
},
})
Expand Down
4 changes: 2 additions & 2 deletions apps/next/src/app/shoes/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ export default async function RootLayout({children}: {children: React.ReactNode}
<html lang="en">
<body>
{children}
{draftMode().isEnabled && <LiveVisualEditing />}
{(await draftMode()).isEnabled && <LiveVisualEditing />}
<a className="fixed bottom-1 left-1 block rounded bg-slate-900 px-2 py-1 text-xs text-slate-100">
app-router:{' '}
{draftMode().isEnabled
{(await draftMode()).isEnabled
? 'draftMode'
: process.env.NEXT_PUBLIC_VERCEL_ENV || 'development'}
{', '}
Expand Down
4 changes: 2 additions & 2 deletions apps/next/src/app/shoes/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ export default async function ShoesPage() {
shoesList,
{},
{
perspective: draftMode().isEnabled ? 'previewDrafts' : 'published',
next: {revalidate: draftMode().isEnabled ? 0 : false, tags: ['shoe']},
perspective: (await draftMode()).isEnabled ? 'previewDrafts' : 'published',
next: {revalidate: (await draftMode()).isEnabled ? 0 : false, tags: ['shoe']},
},
)
return <ShoesPageClient initial={initial} />
Expand Down
7 changes: 4 additions & 3 deletions apps/next/src/app/shoes/sanity.ssr.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@ setServerClient(
)

// Automatically handle draft mode
export const loadQuery = ((query, params = {}, options = {}) => {
const isDraftMode = draftMode().isEnabled
const perspective = options.perspective || draftMode().isEnabled ? 'previewDrafts' : 'published'
export const loadQuery = (async (query, params = {}, options = {}) => {
const isDraftMode = (await draftMode()).isEnabled
const perspective =
options.perspective || (await draftMode()).isEnabled ? 'previewDrafts' : 'published'
return _loadQuery(query, params, {
...options,
perspective,
Expand Down
4 changes: 2 additions & 2 deletions apps/page-builder-demo/src/app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ export default async function RootLayout({children}: {children: React.ReactNode}
return (
<html lang="en" className={`${mono.variable} ${sans.variable} ${serif.variable}`}>
<body className="bg-white text-black dark:bg-black dark:text-white">
{draftMode().isEnabled && <AlertBanner />}
{(await draftMode()).isEnabled && <AlertBanner />}
<AppLayout data={data}>{children}</AppLayout>
{draftMode().isEnabled && <VisualEditing />}
{(await draftMode()).isEnabled && <VisualEditing />}
<SanityLive />
</body>
</html>
Expand Down
4 changes: 2 additions & 2 deletions apps/page-builder-demo/src/app/pages/[slug]/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ export async function generateStaticParams() {
return data
}

export default async function PagesPage({params}: {params: {slug: string}}) {
const {data} = await sanityFetch({query: pageQuery, params})
export default async function PagesPage({params}: {params: Promise<{slug: string}>}) {
const {data} = await sanityFetch({query: pageQuery, params: await params})
if (!data) {
notFound()
}
Expand Down
7 changes: 5 additions & 2 deletions apps/page-builder-demo/src/app/product/[slug]/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,12 @@ export async function generateStaticParams() {

const productPageQuery = defineQuery(`*[_type == "product" && slug.current == $slug][0]`)

export default async function ProductPage({params}: {params: {slug: string}}) {
export default async function ProductPage({params}: {params: Promise<{slug: string}>}) {
// @TODO fix typegen vs manual types issues
const {data} = (await sanityFetch({query: productPageQuery, params})) as unknown as {
const {data} = (await sanityFetch({
query: productPageQuery,
params: await params,
})) as unknown as {
data: ProductData | null
}

Expand Down
7 changes: 5 additions & 2 deletions apps/page-builder-demo/src/app/project/[slug]/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,12 @@ export async function generateStaticParams() {

const projectPageQuery = defineQuery(`*[_type == "project" && slug.current == $slug][0]`)

export default async function ProjectPage({params}: {params: {slug: string}}) {
export default async function ProjectPage({params}: {params: Promise<{slug: string}>}) {
// @TODO fix typegen vs manual types issues
const {data} = (await sanityFetch({query: projectPageQuery, params})) as unknown as {
const {data} = (await sanityFetch({
query: projectPageQuery,
params: await params,
})) as unknown as {
data: ProjectData | null
}

Expand Down
4 changes: 3 additions & 1 deletion packages/core-loader/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,15 @@
],
"root": true
},
"dependencies": {
"@sanity/comlink": "workspace:*"
},
"devDependencies": {
"@repo/eslint-config": "workspace:*",
"@repo/package.config": "workspace:*",
"@repo/prettier-config": "workspace:*",
"@repo/visual-editing-helpers": "workspace:*",
"@sanity/client": "^6.22.2",
"@sanity/comlink": "workspace:*",
"@sanity/pkg-utils": "6.11.4",
"@typescript-eslint/eslint-plugin": "^7.18.0",
"@typescript-eslint/parser": "^7.18.0",
Expand Down
4 changes: 3 additions & 1 deletion packages/preview-kit-compat/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,15 @@
],
"root": true
},
"dependencies": {
"@sanity/comlink": "workspace:*"
},
"devDependencies": {
"@repo/eslint-config": "workspace:*",
"@repo/package.config": "workspace:*",
"@repo/prettier-config": "workspace:*",
"@repo/visual-editing-helpers": "workspace:*",
"@sanity/client": "^6.22.2",
"@sanity/comlink": "workspace:*",
"@sanity/pkg-utils": "6.11.4",
"@types/react": "^18.3.11",
"eslint": "^8.57.1",
Expand Down
1 change: 1 addition & 0 deletions packages/visual-editing-helpers/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
},
"peerDependencies": {
"@sanity/client": "^6.22.2",
"@sanity/comlink": "workspace:*",
"react": "^18.2.0",
"valibot": "0.31.1"
},
Expand Down
1 change: 1 addition & 0 deletions packages/visual-editing/package.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ export default defineConfig({
'process.env.NODE_ENV': 'production',
},
rollup: {
...baseConfig.rollup,
treeshake: {
preset: 'smallest',
manualPureFunctions: ['createElement', 'forwardRef', 'memo', 'styled'],
Expand Down
3 changes: 2 additions & 1 deletion packages/visual-editing/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,11 @@
"root": true
},
"dependencies": {
"@sanity/comlink": "workspace:*",
"@sanity/mutate": "0.10.1-canary.4",
"@sanity/preview-url-secret": "workspace:*",
"@vercel/stega": "0.1.2",
"rxjs": "^7.8.1",
"scroll-into-view-if-needed": "^3.1.0",
"use-effect-event": "^1.0.2",
"valibot": "0.31.1",
Expand All @@ -124,7 +126,6 @@
"@repo/visual-editing-helpers": "workspace:*",
"@sanity/client": "^6.22.2",
"@sanity/color": "^3.0.6",
"@sanity/comlink": "workspace:*",
"@sanity/demo": "^2.0.0",
"@sanity/pkg-utils": "6.11.4",
"@sanity/ui": "2.8.9",
Expand Down
Loading