fixup!

Author: avivkeller

.github/CODEOWNERS

@@ -38,15 +38,15 @@ docs @nodejs/nodejs-website @nodejs/web-infra
 SECURITY.md @nodejs/security-wg
 
 # Node.js Release Blog Posts
-apps/site/pages/en/blog/release @nodejs/releasers
-apps/site/pages/en/blog/announcements @nodejs/releasers
+packages/content/src/en/blog/release @nodejs/releasers
+packages/content/src/en/blog/announcements @nodejs/releasers
 
 # The following users DO NOT have write access, and their review is requested
 # via a GitHub action.
-apps/site/pages/en/learn/diagnostics @nodejs/diagnostics
-apps/site/pages/en/learn/getting-started/security-best-practices.md @nodejs/security-wg
-apps/site/pages/en/learn/manipulating-files @nodejs/fs
-apps/site/pages/en/learn/test-runner @nodejs/test_runner
-apps/site/pages/en/learn/typescript @nodejs/typescript
-apps/site/pages/en/about/partners.mdx @nodejs/marketing
-apps/site/pages/en/about/branding.mdx @nodejs/marketing
+packages/content/src/en/learn/diagnostics @nodejs/diagnostics
+packages/content/src/en/learn/getting-started/security-best-practices.md @nodejs/security-wg
+packages/content/src/en/learn/manipulating-files @nodejs/fs
+packages/content/src/en/learn/test-runner @nodejs/test_runner
+packages/content/src/en/learn/typescript @nodejs/typescript
+packages/content/src/en/about/partners.mdx @nodejs/marketing
+packages/content/src/en/about/branding.mdx @nodejs/marketing

.github/workflows/translations-pr-lint.yml

@@ -9,10 +9,10 @@ on:
     branches:
       - main
     paths:
-      - 'apps/site/pages/**/*.md'
-      - 'apps/site/pages/**/*.mdx'
-      - '!apps/site/pages/en/**/*.md'
-      - '!apps/site/pages/en/**/*.mdx'
+      - 'packages/content/src/**/*.md'
+      - 'packages/content/src/**/*.mdx'
+      - '!packages/content/src/en/**/*.md'
+      - '!packages/content/src/en/**/*.mdx'
       - 'packages/i18n/src/locales/*.json'
       - '!packages/i18n/src/locales/en.json'
       - 'apps/site/snippets/**/*.bash'

apps/site/next.helpers.mjs

@@ -2,18 +2,9 @@
 
 import { glob } from 'node:fs/promises';
 import { join } from 'node:path';
-import { fileURLToPath } from 'node:url';
 
 import { defaultLocale } from '@node-core/website-i18n/index.mjs';
 
-/**
- * This gets the relative path from `import.meta.url`
- *
- * @param {string} path the current import path
- * @returns {string} the relative path from import
- */
-export const getRelativePath = path => fileURLToPath(new URL('.', path));
-
 // TODO(@avivkeller): Turbopack doesn't support `import.meta.resolve`-ing this path
 export const contentBase = join(
   process.cwd(),

apps/site/package.json

@@ -5,7 +5,6 @@
     "prebuild": "node --run build:blog-data",
     "build": "cross-env NODE_NO_WARNINGS=1 next build",
     "build:blog-data": "cross-env NODE_NO_WARNINGS=1 node ./scripts/blog-data/index.mjs",
-    "build:blog-data:watch": "node --watch --watch-path=pages/en/blog ./scripts/blog-data/index.mjs",
     "cloudflare:build:worker": "OPEN_NEXT_CLOUDFLARE=true opennextjs-cloudflare build",
     "cloudflare:deploy": "opennextjs-cloudflare deploy",
     "cloudflare:preview": "wrangler dev",
@@ -14,7 +13,7 @@
     "predev": "node --run build:blog-data",
     "dev": "cross-env NODE_NO_WARNINGS=1 next dev",
     "lint": "node --run lint:js && node --run lint:css && node --run lint:md",
-    "lint:fix": "node --run lint:js:fix && node --run lint:css:fix && node --run lint:md:fix",
+    "lint:fix": "node --run lint:js:fix && node --run lint:css:fix",
     "lint:css": "stylelint \"**/*.css\" --allow-empty-input --cache --cache-strategy=content --cache-location=.stylelintcache",
     "lint:css:fix": "node --run lint:css -- --fix",
     "lint:js": "eslint \"**/*.{js,mjs,ts,tsx}\"",
@@ -80,7 +79,6 @@
     "unist-util-visit": "^5.0.0"
   },
   "devDependencies": {
-    "@flarelabs-net/wrangler-build-time-fs-assets-polyfilling": "^0.0.1",
     "@next/eslint-plugin-next": "16.0.7",
     "@opennextjs/cloudflare": "^1.14.4",
     "@playwright/test": "^1.56.1",

apps/site/scripts/orama-search/get-documents.mjs

@@ -2,7 +2,6 @@ import { readFile, glob } from 'node:fs/promises';
 import { join, basename, posix, win32 } from 'node:path';
 
 import generateReleaseData from '#site/next-data/generators/releaseData.mjs';
-import { getRelativePath } from '#site/next.helpers.mjs';
 
 import { processDocument } from './process-documents.mjs';
 
@@ -47,12 +46,11 @@ export const getAPIDocs = async () => {
 };
 
 /**
- * Collect all local markdown/mdx articles under /pages/en,
+ * Collect all local markdown/mdx articles,
  * excluding blog content.
  */
 export const getArticles = async () => {
-  const relativePath = getRelativePath(import.meta.url);
-  const root = join(relativePath, '..', '..', 'pages', 'en');
+  const root = new URL(import.meta.resolve('@node-core/content/en'));
 
   // Find all markdown files (excluding blog)
   const files = await Array.fromAsync(glob('**/*.{md,mdx}', { cwd: root }));

apps/site/scripts/release-post/index.mjs

@@ -12,7 +12,7 @@
  * will be picked from https://nodejs.org/dist/index.json.
  *
  * It'll create a file with the blog post content
- * into ../../pages/en/blog/release/vX.md ready for you to commit
+ * into packages/content/src/en/blog/release/vX.md ready for you to commit
  * or possibly edit by hand before committing.
  *
  * Happy releasing!
@@ -22,15 +22,13 @@
 
 import { existsSync, readFileSync, appendFileSync } from 'node:fs';
 import { writeFile } from 'node:fs/promises';
-import { resolve } from 'node:path';
 import { parseArgs } from 'node:util';
 
 import handlebars from 'handlebars';
 import { format } from 'prettier';
 
 import { downloadsTable } from './downloadsTable.mjs';
 import prettierConfig from '../../../../.prettierrc.json' with { type: 'json' };
-import { getRelativePath } from '../../next.helpers.mjs';
 
 const URLS = {
   NODE_DIST_JSON: 'https://nodejs.org/dist/index.json',
@@ -70,14 +68,10 @@ const parsedArgs = parseArgs({
 });
 
 const ARGS = {
-  CURRENT_PATH: process.argv[1],
   SPECIFIC_VERSION: parsedArgs.positionals[0]?.replace(/^v/, ''),
   SHOULD_FORCE: Boolean(parsedArgs.values.force),
 };
 
-// this allows us to get the current module working directory
-const __dirname = getRelativePath(import.meta.url);
-
 const request = options => {
   return fetch(options.url, options).then(resp => {
     if (resp.status !== 200) {
@@ -216,7 +210,7 @@ const urlOrComingSoon = binary => {
 
 const renderPost = results => {
   const blogTemplateSource = readFileSync(
-    resolve(__dirname, 'template.hbs'),
+    import.meta.resolve('./template.hbs'),
     'utf8'
   );
 
@@ -240,47 +234,30 @@ const formatPost = results => {
 };
 
 const writeToFile = results => {
-  const blogPostPath = resolve(
-    __dirname,
-    '../../pages/en/blog/release',
-    `v${results.version}.md`
+  const blogPostURL = new URL(
+    import.meta.resolve(
+      `@node-core/content/en/blog/release/v${results.version}.md`
+    )
   );
 
   return new Promise((resolve, reject) => {
-    if (existsSync(blogPostPath) && !ARGS.SHOULD_FORCE) {
+    if (existsSync(blogPostURL) && !ARGS.SHOULD_FORCE) {
       reject(ERRORS.RELEASE_EXISTS(results.version));
       return;
     }
 
-    writeFile(blogPostPath, results.content)
-      .then(() => resolve(blogPostPath))
+    writeFile(blogPostURL, results.content)
+      .then(() => resolve(blogPostURL))
       .catch(error => reject(ERRORS.FAILED_FILE_CREATION(error.message)));
   });
 };
 
 const slugify = str => str.replace(/\./g, '-');
 
-export {
-  explicitVersion,
-  fetchShasums,
-  writeToFile,
-  findLatestVersion,
-  verifyDownloads,
-  fetchChangelog,
-  fetchChangelogBody,
-  fetchAuthor,
-  fetchVersionPolicy,
-};
-
-// This allows us to verify that the script is being run directly from node.js/cli
-if (import.meta.url.startsWith('file:')) {
-  if (ARGS.CURRENT_PATH === `${__dirname}index.mjs`) {
-    explicitVersion(ARGS.SPECIFIC_VERSION)
-      .then(null, findLatestVersion)
-      .then(fetchDocs)
-      .then(renderPost)
-      .then(formatPost)
-      .then(writeToFile)
-      .then(filepath => console.log('Release post created:', filepath));
-  }
-}
+explicitVersion(ARGS.SPECIFIC_VERSION)
+  .then(null, findLatestVersion)
+  .then(fetchDocs)
+  .then(renderPost)
+  .then(formatPost)
+  .then(writeToFile)
+  .then(filepath => console.log('Release post created:', filepath));

apps/site/turbo.json

@@ -26,10 +26,10 @@
     "build": {
       "dependsOn": ["build:blog-data", "^build"],
       "inputs": [
-        "{app,components,hooks,i18n,layouts,middlewares,pages,providers,types,util}/**/*.{ts,tsx}",
-        "{app,components,layouts,pages,styles}/**/*.css",
+        "{app,components,hooks,i18n,layouts,middlewares,providers,types,util}/**/*.{ts,tsx}",
+        "{app,components,layouts,styles}/**/*.css",
         "{next-data,scripts,i18n}/**/*.{mjs,json}",
-        "{app,pages}/**/*.{mdx,md}",
+        "app/**/*.{mdx,md}",
         "*.{md,mdx,json,ts,tsx,mjs,yml}"
       ],
       "outputs": [".next/**", "!.next/cache/**"],
@@ -73,10 +73,10 @@
     },
     "deploy": {
       "inputs": [
-        "{app,components,hooks,i18n,layouts,middlewares,pages,providers,types,util}/**/*.{ts,tsx}",
-        "{app,components,layouts,pages,styles}/**/*.css",
+        "{app,components,hooks,i18n,layouts,middlewares,providers,types,util}/**/*.{ts,tsx}",
+        "{app,components,layouts,styles}/**/*.css",
         "{next-data,scripts,i18n}/**/*.{mjs,json}",
-        "{app,pages}/**/*.{mdx,md}",
+        "app/**/*.{mdx,md}",
         "*.{md,mdx,json,ts,tsx,mjs,yml}"
       ],
       "outputs": [".next/**", "!.next/cache/**"],
@@ -99,18 +99,14 @@
     },
     "lint:js": {
       "inputs": [
-        "{app,components,hooks,i18n,layouts,middlewares,pages,providers,types,util}/**/*.{ts,tsx,mjs}",
+        "{app,components,hooks,i18n,layouts,middlewares,providers,types,util}/**/*.{ts,tsx,mjs}",
         "{next-data,scripts,i18n}/**/*.{mjs,json}",
         "public/**/*.{ts,js,json}",
         "*.{json,ts,tsx}"
       ]
     },
-    "lint:md": {
-      "inputs": ["{app,pages}/**/*.{md,mdx}", "*.{md,mdx}"],
-      "outputs": [".eslintmdcache"]
-    },
     "lint:css": {
-      "inputs": ["{app,components,layouts,pages,styles}/**/*.css"],
+      "inputs": ["{app,components,layouts,styles}/**/*.css"],
       "outputs": [".stylelintcache"]
     },
     "lint:fix": {
@@ -125,16 +121,15 @@
     "test:unit": {
       "dependsOn": ["build:blog-data"],
       "inputs": [
-        "{app,components,hooks,i18n,layouts,middlewares,pages,providers,types,util}/**/*.{ts,tsx,mjs}",
-        "{app,components,layouts,pages,styles}/**/*.css",
+        "{app,components,hooks,i18n,layouts,middlewares,providers,types,util}/**/*.{ts,tsx,mjs}",
+        "{app,components,layouts,styles}/**/*.css",
         "{next-data,scripts,i18n}/**/*.{mjs,json}",
-        "{app,pages}/**/*.{mdx,md}",
+        "{app}/**/*.{mdx,md}",
         "*.{md,mdx,json,ts,tsx,mjs,yml}"
       ],
       "outputs": ["coverage/**", "junit.xml"]
     },
     "build:blog-data": {
-      "inputs": ["{pages}/**/*.{mdx,md}"],
       "outputs": ["public/blog-data.json"],
       "env": [
         "VERCEL_ENV",
@@ -148,32 +143,32 @@
     "cloudflare:build:worker": {
       "dependsOn": ["build:blog-data"],
       "inputs": [
-        "{app,components,hooks,i18n,layouts,middlewares,pages,providers,types,util}/**/*.{ts,tsx}",
-        "{app,components,layouts,pages,styles}/**/*.css",
+        "{app,components,hooks,i18n,layouts,middlewares,providers,types,util}/**/*.{ts,tsx}",
+        "{app,components,layouts,styles}/**/*.css",
         "{next-data,scripts,i18n}/**/*.{mjs,json}",
-        "{app,pages}/**/*.{mdx,md}",
+        "app/**/*.{mdx,md}",
         "*.{md,mdx,json,ts,tsx,mjs,yml}"
       ],
       "outputs": [".open-next/**"]
     },
     "cloudflare:preview": {
       "dependsOn": ["cloudflare:build:worker"],
       "inputs": [
-        "{app,components,hooks,i18n,layouts,middlewares,pages,providers,types,util}/**/*.{ts,tsx}",
-        "{app,components,layouts,pages,styles}/**/*.css",
+        "{app,components,hooks,i18n,layouts,middlewares,providers,types,util}/**/*.{ts,tsx}",
+        "{app,components,layouts,styles}/**/*.css",
         "{next-data,scripts,i18n}/**/*.{mjs,json}",
-        "{app,pages}/**/*.{mdx,md}",
+        "{app}/**/*.{mdx,md}",
         "*.{md,mdx,json,ts,tsx,mjs,yml}"
       ],
       "outputs": [".open-next/**"]
     },
     "cloudflare:deploy": {
       "dependsOn": ["cloudflare:build:worker"],
       "inputs": [
-        "{app,components,hooks,i18n,layouts,middlewares,pages,providers,types,util}/**/*.{ts,tsx}",
-        "{app,components,layouts,pages,styles}/**/*.css",
+        "{app,components,hooks,i18n,layouts,middlewares,providers,types,util}/**/*.{ts,tsx}",
+        "{app,components,layouts,styles}/**/*.css",
         "{next-data,scripts,i18n}/**/*.{mjs,json}",
-        "{app,pages}/**/*.{mdx,md}",
+        "{app}/**/*.{mdx,md}",
         "*.{md,mdx,json,ts,tsx,mjs,yml}"
       ],
       "outputs": [".open-next/**"]

apps/site/wrangler.jsonc

@@ -24,15 +24,6 @@
     "enabled": true,
     "head_sampling_rate": 1,
   },
-  "build": {
-    "command": "wrangler-build-time-fs-assets-polyfilling --assets pages --assets snippets --assets-output-dir .open-next/assets",
-  },
-  "alias": {
-    "node:fs": "./.wrangler/fs-assets-polyfilling/polyfills/node/fs.ts",
-    "node:fs/promises": "./.wrangler/fs-assets-polyfilling/polyfills/node/fs/promises.ts",
-    "fs": "./.wrangler/fs-assets-polyfilling/polyfills/node/fs.ts",
-    "fs/promises": "./.wrangler/fs-assets-polyfilling/polyfills/node/fs/promises.ts",
-  },
   "r2_buckets": [
     {
       "binding": "NEXT_INC_CACHE_R2_BUCKET",

docs/adding-pages.md

@@ -41,7 +41,7 @@ This guide explains how to create new pages and content for the Node.js website.
 
 ### 1. Create the Page Content
 
-Create a new markdown file in `apps/site/pages/en/` with the appropriate subdirectory structure.
+Create a new markdown file in `packages/content/src/en/` with the appropriate subdirectory structure.
 
 ```markdown
 ---
@@ -82,7 +82,7 @@ The Learn section has special requirements and structure.
 ### Learn Page Structure
 
 ```
-apps/site/pages/en/learn/
+packages/content/src/en/learn/
 ├── category-name/
 │   ├── article-name.md
 │   └── another-article.md
@@ -184,7 +184,7 @@ import vm from 'node:vm';
 ### Content Structure
 
 ```
-apps/site/pages/
+packages/content/src/
 ├── en/                    # English content (source)
 │   ├── learn/            # Learn section
 │   ├── blog/             # Blog posts

docs/cloudflare-build-and-deployment.md

@@ -17,7 +17,6 @@ Key configurations include:
 - `main`: Points to the worker generated by the OpenNext adapter.
 - `account_id`: Specifies the Cloudflare account ID. This is not required for local previews but is necessary for deployments. You can obtain an account ID for free by signing up at [dash.cloudflare.com](https://dash.cloudflare.com/login).
   - This is currently set to `fb4a2d0f103c6ff38854ac69eb709272`, which is the ID of a Cloudflare account controlled by Node.js, and used for testing.
-- `build`: Defines the build command to generate the Node.js filesystem polyfills required for the application to run on Cloudflare Workers. This uses the [`@flarelabs/wrangler-build-time-fs-assets-polyfilling`](https://github.com/flarelabs-net/wrangler-build-time-fs-assets-polyfilling) package.
 - `alias`: Maps aliases for the Node.js filesystem polyfills generated during the build process.
 - `r2_buckets`: Contains a single R2 binding definition for `NEXT_INC_CACHE_R2_BUCKET`. This is used to implement the Next.js incremental cache.
   - This is currently set up to a R2 bucket in the aforementioned Cloudflare testing account.