Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"description": "Test against canary versions of next.js",
"semanticCommitType": "chore",
"matchDepTypes": ["pnpm.catalog.default"],
"matchPackageNames": ["@next/bundle-analyzer", "@next/env", "next"],
"matchPackageNames": ["@next/env", "next"],
"followTag": "canary",
"groupName": "next-canary"
},
Expand Down
20 changes: 1 addition & 19 deletions apps/mvp/next.config.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
import type {NextConfig} from 'next'
import {createRequire} from 'node:module'
import path from 'node:path'

import withBundleAnalyzer from '@next/bundle-analyzer'

const require = createRequire(import.meta.url)

const nextConfig: NextConfig = {
// basePath: process.env.NEXT_PUBLIC_TEST_BASE_PATH,
Expand All @@ -16,19 +11,6 @@ const nextConfig: NextConfig = {
},
},
productionBrowserSourceMaps: true,
webpack: (config) => {
// Resolve sanity package duplicates by forcing all imports to use the same version
config.resolve.alias = {
...config.resolve.alias,
// Force all sanity imports to use a single resolved version
'sanity$': require.resolve('sanity'),
'sanity/*': path.resolve(require.resolve('sanity'), '..', '*'),
}

return config
},
}

export default withBundleAnalyzer({
enabled: process.env.ANALYZE === 'true',
})(nextConfig)
export default nextConfig
4 changes: 1 addition & 3 deletions apps/mvp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
"#groqd": "./groqd-client.ts"
},
"scripts": {
"build": "next build --profile --webpack && sanity manifest extract --path public/studio/static && pnpm copy-analyze",
"copy-analyze": "cp -r .next/analyze public/ || true",
"build": "next build --profile --experimental-analyze && sanity manifest extract --path public/studio/static",
"dev": "next dev",
"start": "next start",
"type-check": "next typegen && tsc --noEmit",
Expand All @@ -27,7 +26,6 @@
"sanity": "catalog:"
},
"devDependencies": {
"@next/bundle-analyzer": "catalog:",
"@next/env": "catalog:",
"@repo/typescript-config": "workspace:*",
"@tailwindcss/postcss": "^4.1.17",
Expand Down
1 change: 0 additions & 1 deletion apps/mvp/turbo.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"tasks": {
"build": {
"env": [
"ANALYZE",
"NEXT_PUBLIC_SANITY_PROJECT_ID",
"NEXT_PUBLIC_SANITY_DATASET",
"NEXT_PUBLIC_TEST_BASE_PATH",
Expand Down
6 changes: 1 addition & 5 deletions apps/static/next.config.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import type {NextConfig} from 'next'

import withBundleAnalyzer from '@next/bundle-analyzer'

const nextConfig: NextConfig = {
output: 'export',
Expand All @@ -12,7 +11,4 @@ const nextConfig: NextConfig = {
productionBrowserSourceMaps: true,
}

export default withBundleAnalyzer({
// eslint-disable-next-line no-process-env
enabled: process.env.ANALYZE === 'true',
})(nextConfig)
export default nextConfig
4 changes: 1 addition & 3 deletions apps/static/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
"#groqd": "./groqd-client.ts"
},
"scripts": {
"build": "next build --webpack && pnpm copy-analyze",
"copy-analyze": "cp -r .next/analyze public/ || true",
"build": "next build",
"dev": "next -p 3001",
"start": "pnpx serve@latest out -p 3001",
"type-check": "next typegen && tsc --noEmit",
Expand All @@ -26,7 +25,6 @@
"sanity": "catalog:"
},
"devDependencies": {
"@next/bundle-analyzer": "catalog:",
"@next/env": "catalog:",
"@repo/typescript-config": "workspace:*",
"@tailwindcss/postcss": "^4.1.17",
Expand Down
2 changes: 1 addition & 1 deletion apps/static/turbo.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"extends": ["//"],
"tasks": {
"build": {
"env": ["ANALYZE", "NEXT_PUBLIC_SANITY_PROJECT_ID", "NEXT_PUBLIC_SANITY_DATASET"],
"env": ["NEXT_PUBLIC_SANITY_PROJECT_ID", "NEXT_PUBLIC_SANITY_DATASET"],
"outputs": [".next/**", "!.next/cache/**", "out/**"]
}
}
Expand Down
780 changes: 385 additions & 395 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

6 changes: 2 additions & 4 deletions pnpm-workspace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ packages:
- packages/*

catalog:
'@next/bundle-analyzer': 16.1.0-canary.4
'@next/env': 16.1.0-canary.4
'@next/env': 16.1.0-canary.9
'@sanity/client': ^7.13.1
'@sanity/image-url': ^2.0.1
'@sanity/preview-url-secret': ^3.0.0
Expand All @@ -15,7 +14,7 @@ catalog:
'@types/react-dom': ^19.2.3
'@types/react-is': ^19.2.0
groqd: ^1.7.1
next: 16.1.0-canary.4
next: 16.1.0-canary.9
react: ^19.2.0
react-dom: ^19.2.0
react-is: ^19.2.0
Expand All @@ -26,7 +25,6 @@ catalog:
linkWorkspacePackages: deep

overrides:
'@next/bundle-analyzer': 'catalog:'
'@next/env': 'catalog:'
'@types/react': 'catalog:'
'@types/react-dom': 'catalog:'
Expand Down