Skip to content

Commit 18d6d15

Browse files
avivkellerclaude
avivkeller
and
claude
committed
chore(monorepo): break out platform-specific code
Move deployment-target-specific code out of `apps/site` and into dedicated `platforms/*` workspace packages: `platform-cloudflare`, `platform-vercel`, and a `platform-default` fallback. The site now reaches platform code through `#platform/*` subpath imports, resolved via package import conditions, so `apps/site` no longer carries Cloudflare- or Vercel-only configuration, dependencies, or build scripts. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
1 parent eab3644 commit 18d6d15

53 files changed

Lines changed: 2109 additions & 841 deletions

Some content is hidden

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

‎.github/CODEOWNERS‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ apps/site/next.config.mjs @nodejs/web-infra
1717
apps/site/next.dynamic.mjs @nodejs/web-infra
1818
apps/site/middleware.ts @nodejs/web-infra
1919
apps/site/navigation.mjs @nodejs/web-infra
20-
apps/site/playwright.config.ts @nodejs/web-infra
20+
apps/site/playwright.config.mjs @nodejs/web-infra
2121

2222
# Package Ecosystem
2323
package.json @nodejs/nodejs-website
@@ -27,9 +27,7 @@ turbo.json @nodejs/nodejs-website @nodejs/web-infra
2727
crowdin.yml @nodejs/web-infra
2828
apps/site/redirects.json @nodejs/web-infra
2929
apps/site/site.json @nodejs/web-infra
30-
apps/site/wrangler.jsonc @nodejs/web-infra
31-
apps/site/open-next.config.ts @nodejs/web-infra
32-
apps/site/redirects.json @nodejs/web-infra
30+
platforms @nodejs/web-infra
3331

3432
# Critical Documents
3533
LICENSE @nodejs/tsc

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959

6060
- name: Build Next.js
6161
# We want a ISR build on CI to ensure that regular Next.js builds work as expected.
62-
run: node_modules/.bin/turbo build --cache-dir=.turbo/cache
62+
run: node_modules/.bin/turbo build --filter=@node-core/website --cache-dir=.turbo/cache
6363
env:
6464
# We want to ensure we have enough RAM allocated to the Node.js process
6565
# this should be a last resort in case by any chances the build memory gets too high
@@ -76,7 +76,7 @@ jobs:
7676

7777
- name: Build Next.js (Static Export)
7878
# We want to generate a static build, as it is a requirement of our website.
79-
run: node_modules/.bin/turbo deploy --cache-dir=.turbo/cache
79+
run: node_modules/.bin/turbo deploy --filter=@node-core/website --cache-dir=.turbo/cache
8080
env:
8181
# We want to ensure we have enough RAM allocated to the Node.js process
8282
# this should be a last resort in case by any chances the build memory gets too high

‎.github/workflows/playwright-cloudflare-open-next.yml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,11 @@ jobs:
5050
working-directory: apps/site
5151
run: node_modules/.bin/playwright install --with-deps
5252

53+
- name: Build open-next site
54+
run: node_modules/.bin/turbo build --filter=@node-core/platform-cloudflare --cache-dir=.turbo/cache
55+
5356
- name: Run Playwright tests
54-
working-directory: apps/site
55-
run: node --run playwright
56-
env:
57-
PLAYWRIGHT_RUN_CLOUDFLARE_PREVIEW: true
58-
PLAYWRIGHT_BASE_URL: http://127.0.0.1:8787
57+
run: pnpm --filter=@node-core/platform-cloudflare test:e2e
5958

6059
- name: Upload Playwright test results
6160
if: always()

‎.github/workflows/tmp-cloudflare-open-next-deploy.yml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,17 +52,11 @@ jobs:
5252
- name: Install packages
5353
run: pnpm install --frozen-lockfile
5454

55-
- name: Build blog data
56-
working-directory: apps/site
57-
run: node --run build:blog-data
58-
5955
- name: Build open-next site
60-
working-directory: apps/site
61-
run: node --run cloudflare:build:worker
56+
run: node_modules/.bin/turbo build --filter=@node-core/platform-cloudflare --cache-dir=.turbo/cache
6257

6358
- name: Deploy open-next site
64-
working-directory: apps/site
65-
run: node --run cloudflare:deploy
59+
run: pnpm --filter=@node-core/platform-cloudflare run deploy
6660
env:
6761
CF_WORKERS_SCRIPTS_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
6862
CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ apps/site/public/blog-data.json
1515
apps/site/next-env.d.ts
1616

1717
# Generated Build Artifacts
18-
apps/site/generated
18+
platforms/cloudflare/generated
1919

2020
# Test Runner
2121
junit.xml

‎apps/site/app/[locale]/layout.tsx‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1+
import PlatformAnalytics from '#platform/analytics';
12
import { availableLocales, defaultLocale } from '@node-core/website-i18n';
2-
import { Analytics } from '@vercel/analytics/react';
3-
import { SpeedInsights } from '@vercel/speed-insights/next';
43
import classNames from 'classnames';
54
import { NextIntlClientProvider } from 'next-intl';
65

76
import BaseLayout from '#site/layouts/Base';
8-
import { VERCEL_ENV } from '#site/next.constants.mjs';
97
import { IBM_PLEX_MONO, OPEN_SANS } from '#site/next.fonts';
108
import { ThemeProvider } from '#site/providers/themeProvider';
119

@@ -46,12 +44,7 @@ const RootLayout: FC<RootLayoutProps> = async ({ children, params }) => {
4644
href="https://social.lfx.dev/@nodejs"
4745
/>
4846

49-
{VERCEL_ENV && (
50-
<>
51-
<Analytics />
52-
<SpeedInsights />
53-
</>
54-
)}
47+
<PlatformAnalytics />
5548
</body>
5649
</html>
5750
);

‎apps/site/eslint.config.js‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,7 @@ import baseConfig from '../../eslint.config.js';
66

77
export default baseConfig.concat([
88
{
9-
ignores: [
10-
'pages/en/blog/**/*.{md,mdx}/**',
11-
'public',
12-
'next-env.d.ts',
13-
// The worker entrypoint is bundled by wrangler, not tsc. Its imports
14-
// trigger a tsc crash (see tsconfig.json), so it is excluded from both
15-
// type checking and ESLint's type-aware linting.
16-
'cloudflare/worker-entrypoint.ts',
17-
],
9+
ignores: ['pages/en/blog/**/*.{md,mdx}/**', 'public', 'next-env.d.ts'],
1810
},
1911

2012
eslintReact.configs['recommended-typescript'],

‎apps/site/instrumentation.ts‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1 @@
1-
export async function register() {
2-
if (!('Cloudflare' in globalThis)) {
3-
// Note: we don't need to set up the Vercel OTEL if the application is running on Cloudflare
4-
const { registerOTel } = await import('@vercel/otel');
5-
registerOTel({ serviceName: 'nodejs-org' });
6-
}
7-
}
1+
export { register } from '#platform/instrumentation';

‎apps/site/mdx/plugins.mjs‎

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,17 @@
11
'use strict';
22

3+
import { shikiOptions } from '#platform/shiki.mjs';
34
import rehypeShikiji from '@node-core/rehype-shiki/plugin';
45
import remarkHeadings from '@vcarl/remark-headings';
56
import rehypeAutolinkHeadings from 'rehype-autolink-headings';
67
import rehypeSlug from 'rehype-slug';
78
import remarkGfm from 'remark-gfm';
89
import readingTime from 'remark-reading-time';
910

10-
import { createVfsTwoslasher } from './create-vfs-twoslasher.mjs';
1111
import remarkTableTitles from '../util/table';
1212

13-
// TODO(@avivkeller): When available, use `OPEN_NEXT_CLOUDFLARE` environment
14-
// variable for detection instead of current method, which will enable better
15-
// tree-shaking.
16-
// Reference: https://github.com/nodejs/nodejs.org/pull/7896#issuecomment-3009480615
17-
const OPEN_NEXT_CLOUDFLARE = 'Cloudflare' in global;
18-
19-
// Shiki is created out here to avoid an async rehype plugin
20-
const singletonShiki = await rehypeShikiji({
21-
// We use the faster WASM engine on the server instead of the web-optimized version.
22-
//
23-
// Currently we fall back to the JavaScript RegEx engine
24-
// on Cloudflare workers because `shiki/wasm` requires loading via
25-
// `WebAssembly.instantiate` with custom imports, which Cloudflare doesn't support
26-
// for security reasons.
27-
wasm: !OPEN_NEXT_CLOUDFLARE,
28-
29-
twoslash: true,
30-
31-
// On Cloudflare Workers, the default filesystem-backed Twoslash cannot work
32-
// because there is no real filesystem. Instead, we provide a custom twoslasher
33-
// backed by an in-memory VFS pre-populated at build time with TypeScript
34-
// lib declarations and @types/node.
35-
twoslashOptions: OPEN_NEXT_CLOUDFLARE
36-
? { twoslasher: await createVfsTwoslasher() }
37-
: undefined,
38-
});
13+
// Shiki is created out here to avoid an async rehype plugin.
14+
const singletonShiki = await rehypeShikiji(shikiOptions);
3915

4016
/**
4117
* Provides all our Rehype Plugins that are used within MDX

‎apps/site/next.config.mjs‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,10 @@
11
'use strict';
2+
import platformConfig from '#platform/next.config.mjs';
23
import createNextIntlPlugin from 'next-intl/plugin';
34

4-
import { OPEN_NEXT_CLOUDFLARE } from './next.constants.cloudflare.mjs';
55
import { BASE_PATH, ENABLE_STATIC_EXPORT } from './next.constants.mjs';
6-
import { getImagesConfig } from './next.image.config.mjs';
76
import { redirects, rewrites } from './next.rewrites.mjs';
87

9-
const getDeploymentId = async () => {
10-
if (OPEN_NEXT_CLOUDFLARE) {
11-
// If we're building for the Cloudflare deployment we want to set
12-
// an appropriate deploymentId (needed for skew protection)
13-
const openNextAdapter = await import('@opennextjs/cloudflare');
14-
15-
return openNextAdapter.getDeploymentId();
16-
}
17-
18-
return undefined;
19-
};
20-
218
/** @type {import('next').NextConfig} */
229
const nextConfig = {
2310
// Full Support of React 18 SSR and Streaming
@@ -27,8 +14,19 @@ const nextConfig = {
2714
// We allow the BASE_PATH to be overridden in case that the Website
2815
// is being built on a subdirectory (e.g. /nodejs-website)
2916
basePath: BASE_PATH,
30-
// Vercel/Next.js Image Optimization Settings
31-
images: getImagesConfig(),
17+
images: {
18+
// We disable image optimisation during static export builds
19+
unoptimized: ENABLE_STATIC_EXPORT,
20+
// We add it to the remote pattern for the static images we use from multiple sources
21+
// to be marked as safe sources (these come from Markdown files)
22+
remotePatterns: [
23+
'https://avatars.githubusercontent.com/**',
24+
'https://bestpractices.coreinfrastructure.org/**',
25+
'https://raw.githubusercontent.com/nodejs/**',
26+
'https://user-images.githubusercontent.com/**',
27+
'https://website-assets.oramasearch.com/**',
28+
].map(url => new URL(url)),
29+
},
3230
serverExternalPackages: ['twoslash'],
3331
outputFileTracingIncludes: {
3432
// Twoslash needs TypeScript declarations to function, and, by default, Next.js
@@ -81,8 +79,8 @@ const nextConfig = {
8179
// Faster Development Servers with Turbopack
8280
turbopackFileSystemCacheForDev: true,
8381
},
84-
deploymentId: await getDeploymentId(),
8582
};
8683

8784
const withNextIntl = createNextIntlPlugin('./i18n.tsx');
88-
export default withNextIntl(nextConfig);
85+
86+
export default withNextIntl({ ...nextConfig, ...platformConfig });

0 commit comments

Comments
 (0)