Skip to content

Commit 081098b

Browse files
james-elicxvicb
james-elicx
authored and
vicb
committed
refactor: use join instead of path.join
1 parent 2d4d9bc commit 081098b

File tree

10 files changed

+58
-66
lines changed

10 files changed

+58
-66
lines changed

‎packages/cloudflare/src/cli/build/build-worker.ts‎

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { Plugin, build } from "esbuild";
22
import { cp, readFile, writeFile } from "node:fs/promises";
3+
import { dirname, join } from "node:path";
34
import { existsSync, readFileSync } from "node:fs";
45
import { Config } from "../config";
56
import { copyPackageCliFiles } from "./patches/investigated/copy-package-cli-files";
@@ -14,11 +15,10 @@ import { patchFindDir } from "./patches/to-investigate/patch-find-dir";
1415
import { patchReadFile } from "./patches/to-investigate/patch-read-file";
1516
import { patchRequire } from "./patches/investigated/patch-require";
1617
import { patchWranglerDeps } from "./patches/to-investigate/wrangler-deps";
17-
import path from "node:path";
1818
import { updateWebpackChunksFile } from "./patches/investigated/update-webpack-chunks-file";
1919

2020
/** The dist directory of the Cloudflare adapter package */
21-
const packageDistDir = path.join(path.dirname(fileURLToPath(import.meta.url)), "..");
21+
const packageDistDir = join(dirname(fileURLToPath(import.meta.url)), "..");
2222

2323
/**
2424
* Using the Next.js build output in the `.next` directory builds a workerd compatible output
@@ -30,18 +30,14 @@ export async function buildWorker(config: Config): Promise<void> {
3030
console.log(`\x1b[35m⚙️ Copying files...\n\x1b[0m`);
3131

3232
// Copy over client-side generated files
33-
await cp(
34-
path.join(config.paths.dotNext, "static"),
35-
path.join(config.paths.outputDir, "assets", "_next", "static"),
36-
{
37-
recursive: true,
38-
}
39-
);
33+
await cp(join(config.paths.dotNext, "static"), join(config.paths.outputDir, "assets", "_next", "static"), {
34+
recursive: true,
35+
});
4036

4137
// Copy over any static files (e.g. images) from the source project
42-
const publicDir = path.join(config.paths.sourceDir, "public");
38+
const publicDir = join(config.paths.sourceDir, "public");
4339
if (existsSync(publicDir)) {
44-
await cp(publicDir, path.join(config.paths.outputDir, "assets"), {
40+
await cp(publicDir, join(config.paths.outputDir, "assets"), {
4541
recursive: true,
4642
});
4743
}
@@ -51,11 +47,11 @@ export async function buildWorker(config: Config): Promise<void> {
5147

5248
copyPackageCliFiles(packageDistDir, config);
5349

54-
const workerEntrypoint = path.join(config.paths.internalTemplates, "worker.ts");
55-
const workerOutputFile = path.join(config.paths.outputDir, "index.mjs");
50+
const workerEntrypoint = join(config.paths.internalTemplates, "worker.ts");
51+
const workerOutputFile = join(config.paths.outputDir, "index.mjs");
5652

5753
const nextConfigStr =
58-
readFileSync(path.join(config.paths.standaloneApp, "/server.js"), "utf8")?.match(
54+
readFileSync(join(config.paths.standaloneApp, "/server.js"), "utf8")?.match(
5955
/const nextConfig = ({.+?})\n/
6056
)?.[1] ?? {};
6157

@@ -76,15 +72,15 @@ export async function buildWorker(config: Config): Promise<void> {
7672
// Note: we apply an empty shim to next/dist/compiled/ws because it generates two `eval`s:
7773
// eval("require")("bufferutil");
7874
// eval("require")("utf-8-validate");
79-
"next/dist/compiled/ws": path.join(config.paths.internalTemplates, "shims", "empty.ts"),
75+
"next/dist/compiled/ws": join(config.paths.internalTemplates, "shims", "empty.ts"),
8076
// Note: we apply an empty shim to next/dist/compiled/edge-runtime since (amongst others) it generated the following `eval`:
8177
// eval(getModuleCode)(module, module.exports, throwingRequire, params.context, ...Object.values(params.scopedContext));
8278
// which comes from https://github.com/vercel/edge-runtime/blob/6e96b55f/packages/primitives/src/primitives/load.js#L57-L63
8379
// QUESTION: Why did I encountered this but mhart didn't?
84-
"next/dist/compiled/edge-runtime": path.join(config.paths.internalTemplates, "shims", "empty.ts"),
80+
"next/dist/compiled/edge-runtime": join(config.paths.internalTemplates, "shims", "empty.ts"),
8581
// `@next/env` is a library Next.js uses for loading dotenv files, for obvious reasons we need to stub it here
8682
// source: https://github.com/vercel/next.js/tree/0ac10d79720/packages/next-env
87-
"@next/env": path.join(config.paths.internalTemplates, "shims", "env.ts"),
83+
"@next/env": join(config.paths.internalTemplates, "shims", "env.ts"),
8884
},
8985
define: {
9086
// config file used by Next.js, see: https://github.com/vercel/next.js/blob/68a7128/packages/next/src/build/utils.ts#L2137-L2139
@@ -178,10 +174,10 @@ function createFixRequiresESBuildPlugin(config: Config): Plugin {
178174
setup(build) {
179175
// Note: we (empty) shim require-hook modules as they generate problematic code that uses requires
180176
build.onResolve({ filter: /^\.\/require-hook$/ }, () => ({
181-
path: path.join(config.paths.internalTemplates, "shims", "empty.ts"),
177+
path: join(config.paths.internalTemplates, "shims", "empty.ts"),
182178
}));
183179
build.onResolve({ filter: /\.\/lib\/node-fs-methods$/ }, () => ({
184-
path: path.join(config.paths.internalTemplates, "shims", "empty.ts"),
180+
path: join(config.paths.internalTemplates, "shims", "empty.ts"),
185181
}));
186182
},
187183
};

‎packages/cloudflare/src/cli/build/patches/investigated/copy-package-cli-files.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import { Config } from "../../../config";
22
import { cpSync } from "node:fs";
3-
import path from "node:path";
3+
import { join } from "node:path";
44

55
/**
66
* Copies the template files present in the cloudflare adapter package into the standalone node_modules folder
77
*/
88
export function copyPackageCliFiles(packageDistDir: string, config: Config) {
99
console.log("# copyPackageTemplateFiles");
10-
const sourceDir = path.join(packageDistDir, "cli");
11-
const destinationDir = path.join(config.paths.internalPackage, "cli");
10+
const sourceDir = join(packageDistDir, "cli");
11+
const destinationDir = join(config.paths.internalPackage, "cli");
1212

1313
cpSync(sourceDir, destinationDir, { recursive: true });
1414
}

‎packages/cloudflare/src/cli/build/patches/investigated/update-webpack-chunks-file/index.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { readFileSync, readdirSync, writeFileSync } from "node:fs";
22
import { Config } from "../../../../config";
33
import { getUpdatedWebpackChunksFileContent } from "./get-updated-webpack-chunks-file-content";
4-
import path from "node:path";
4+
import { join } from "node:path";
55

66
/**
77
* Fixes the webpack-runtime.js file by removing its webpack dynamic requires.
@@ -11,11 +11,11 @@ import path from "node:path";
1111
*/
1212
export async function updateWebpackChunksFile(config: Config) {
1313
console.log("# updateWebpackChunksFile");
14-
const webpackRuntimeFile = path.join(config.paths.standaloneAppServer, "webpack-runtime.js");
14+
const webpackRuntimeFile = join(config.paths.standaloneAppServer, "webpack-runtime.js");
1515

1616
const fileContent = readFileSync(webpackRuntimeFile, "utf-8");
1717

18-
const chunks = readdirSync(path.join(config.paths.standaloneAppServer, "chunks"))
18+
const chunks = readdirSync(join(config.paths.standaloneAppServer, "chunks"))
1919
.filter((chunk) => /^\d+\.js$/.test(chunk))
2020
.map((chunk) => {
2121
console.log(` - chunk ${chunk}`);

‎packages/cloudflare/src/cli/build/patches/to-investigate/inline-eval-manifest.ts‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
import { join, posix } from "node:path";
12
import { Config } from "../../../config";
23
import { globSync } from "glob";
3-
import path from "node:path";
44
import { normalizePath } from "../../utils";
55

66
/**
@@ -13,18 +13,16 @@ import { normalizePath } from "../../utils";
1313
export function inlineEvalManifest(code: string, config: Config): string {
1414
console.log("# inlineEvalManifest");
1515
const manifestJss = globSync(
16-
normalizePath(path.join(config.paths.standaloneAppDotNext, "**", "*_client-reference-manifest.js"))
17-
).map((file) =>
18-
normalizePath(file).replace(normalizePath(config.paths.standaloneApp) + path.posix.sep, "")
19-
);
16+
normalizePath(join(config.paths.standaloneAppDotNext, "**", "*_client-reference-manifest.js"))
17+
).map((file) => normalizePath(file).replace(normalizePath(config.paths.standaloneApp) + posix.sep, ""));
2018
return code.replace(
2119
/function evalManifest\((.+?), .+?\) {/,
2220
`$&
2321
${manifestJss
2422
.map(
2523
(manifestJs) => `
2624
if ($1.endsWith("${manifestJs}")) {
27-
require(${JSON.stringify(path.join(config.paths.standaloneApp, manifestJs))});
25+
require(${JSON.stringify(join(config.paths.standaloneApp, manifestJs))});
2826
return {
2927
__RSC_MANIFEST: {
3028
"${manifestJs

‎packages/cloudflare/src/cli/build/patches/to-investigate/inline-middleware-manifest-require.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { existsSync, readFileSync } from "node:fs";
22
import { Config } from "../../../config";
3-
import path from "node:path";
3+
import { join } from "node:path";
44

55
/**
66
* Inlines the middleware manifest from the build output to prevent a dynamic require statement
@@ -9,7 +9,7 @@ import path from "node:path";
99
export function inlineMiddlewareManifestRequire(code: string, config: Config) {
1010
console.log("# inlineMiddlewareManifestRequire");
1111

12-
const middlewareManifestPath = path.join(config.paths.standaloneAppServer, "middleware-manifest.json");
12+
const middlewareManifestPath = join(config.paths.standaloneAppServer, "middleware-manifest.json");
1313

1414
const middlewareManifest = existsSync(middlewareManifestPath)
1515
? JSON.parse(readFileSync(middlewareManifestPath, "utf-8"))

‎packages/cloudflare/src/cli/build/patches/to-investigate/inline-next-require.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
import { existsSync, readFileSync } from "node:fs";
22
import { Config } from "../../../config";
3-
import path from "node:path";
3+
import { join } from "node:path";
44

55
/**
66
* The following avoid various Next.js specific files `require`d at runtime since we can just read
77
* and inline their content during build time
88
*/
99
export function inlineNextRequire(code: string, config: Config) {
1010
console.log("# inlineNextRequire");
11-
const pagesManifestFile = path.join(config.paths.standaloneAppServer, "pages-manifest.json");
12-
const appPathsManifestFile = path.join(config.paths.standaloneAppServer, "app-paths-manifest.json");
11+
const pagesManifestFile = join(config.paths.standaloneAppServer, "pages-manifest.json");
12+
const appPathsManifestFile = join(config.paths.standaloneAppServer, "app-paths-manifest.json");
1313

1414
const pagesManifestFiles = existsSync(pagesManifestFile)
1515
? Object.values(JSON.parse(readFileSync(pagesManifestFile, "utf-8"))).map(
@@ -33,7 +33,7 @@ export function inlineNextRequire(code: string, config: Config) {
3333
.map(
3434
(htmlPage) => `
3535
if (pagePath.endsWith("${htmlPage}")) {
36-
return ${JSON.stringify(readFileSync(path.join(config.paths.standaloneApp, htmlPage), "utf-8"))};
36+
return ${JSON.stringify(readFileSync(join(config.paths.standaloneApp, htmlPage), "utf-8"))};
3737
}
3838
`
3939
)
@@ -42,7 +42,7 @@ export function inlineNextRequire(code: string, config: Config) {
4242
.map(
4343
(module) => `
4444
if (pagePath.endsWith("${module}")) {
45-
return require(${JSON.stringify(path.join(config.paths.standaloneApp, module))});
45+
return require(${JSON.stringify(join(config.paths.standaloneApp, module))});
4646
}
4747
`
4848
)

‎packages/cloudflare/src/cli/build/patches/to-investigate/patch-find-dir.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Config } from "../../../config";
22
import { existsSync } from "node:fs";
3-
import path from "node:path";
3+
import { join } from "node:path";
44

55
/**
66
* Here we patch `findDir` so that the next server can detect whether the `app` or `pages` directory exists
@@ -15,10 +15,10 @@ export function patchFindDir(code: string, config: Config): string {
1515
`function findDir(dir, name) {
1616
if (dir.endsWith(".next/server")) {
1717
if (name === "app") {
18-
return ${existsSync(`${path.join(config.paths.standaloneAppServer, "app")}`)};
18+
return ${existsSync(`${join(config.paths.standaloneAppServer, "app")}`)};
1919
}
2020
if (name === "pages") {
21-
return ${existsSync(`${path.join(config.paths.standaloneAppServer, "pages")}`)};
21+
return ${existsSync(`${join(config.paths.standaloneAppServer, "pages")}`)};
2222
}
2323
}
2424
throw new Error("Unknown findDir call: " + dir + " " + name);

‎packages/cloudflare/src/cli/build/patches/to-investigate/patch-read-file.ts‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
import { join, posix } from "node:path";
12
import { Config } from "../../../config";
23
import { globSync } from "glob";
3-
import path from "node:path";
44
import { normalizePath } from "../../utils";
55
import { readFileSync } from "node:fs";
66

@@ -13,26 +13,24 @@ export function patchReadFile(code: string, config: Config): string {
1313
code = code.replace(
1414
"getBuildId() {",
1515
`getBuildId() {
16-
return ${JSON.stringify(readFileSync(path.join(config.paths.standaloneAppDotNext, "BUILD_ID"), "utf-8"))};
16+
return ${JSON.stringify(readFileSync(join(config.paths.standaloneAppDotNext, "BUILD_ID"), "utf-8"))};
1717
`
1818
);
1919

2020
// Same as above, the next-server code loads the manifests with `readFileSync` and we want to avoid that
2121
// (source: https://github.com/vercel/next.js/blob/15aeb92e/packages/next/src/server/load-manifest.ts#L34-L56)
2222
// Note: we could/should probably just patch readFileSync here or something!
2323
const manifestJsons = globSync(
24-
normalizePath(path.join(config.paths.standaloneAppDotNext, "**", "*-manifest.json"))
25-
).map((file) =>
26-
normalizePath(file).replace(normalizePath(config.paths.standaloneApp) + path.posix.sep, "")
27-
);
24+
normalizePath(join(config.paths.standaloneAppDotNext, "**", "*-manifest.json"))
25+
).map((file) => normalizePath(file).replace(normalizePath(config.paths.standaloneApp) + posix.sep, ""));
2826
code = code.replace(
2927
/function loadManifest\((.+?), .+?\) {/,
3028
`$&
3129
${manifestJsons
3230
.map(
3331
(manifestJson) => `
3432
if ($1.endsWith("${manifestJson}")) {
35-
return ${readFileSync(path.join(config.paths.standaloneApp, manifestJson), "utf-8")};
33+
return ${readFileSync(join(config.paths.standaloneApp, manifestJson), "utf-8")};
3634
}
3735
`
3836
)

‎packages/cloudflare/src/cli/build/patches/to-investigate/wrangler-deps.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { readFileSync, statSync, writeFileSync } from "node:fs";
22
import { Config } from "../../../config";
3-
import path from "node:path";
3+
import { join } from "node:path";
44

55
export function patchWranglerDeps(config: Config) {
66
console.log("# patchWranglerDeps");
@@ -13,7 +13,7 @@ export function patchWranglerDeps(config: Config) {
1313
// [alias]
1414
// # critters is `require`d from `pages.runtime.prod.js` when running wrangler dev, so we need to stub it out
1515
// "critters" = "./.next/standalone/node_modules/cf/templates/shims/empty.ts"
16-
const pagesRuntimeFile = path.join(distPath, "compiled", "next-server", "pages.runtime.prod.js");
16+
const pagesRuntimeFile = join(distPath, "compiled", "next-server", "pages.runtime.prod.js");
1717

1818
const patchedPagesRuntime = readFileSync(pagesRuntimeFile, "utf-8").replace(
1919
`e.exports=require("critters")`,
@@ -32,7 +32,7 @@ export function patchWranglerDeps(config: Config) {
3232
// # try block here: https://github.com/vercel/next.js/blob/9e8266a7/packages/next/src/server/lib/trace/tracer.ts#L27-L31
3333
// # causing the code to require the 'next/dist/compiled/@opentelemetry/api' module instead (which properly works)
3434
// #"@opentelemetry/api" = "./.next/standalone/node_modules/cf/templates/shims/throw.ts"
35-
const tracerFile = path.join(distPath, "server", "lib", "trace", "tracer.js");
35+
const tracerFile = join(distPath, "server", "lib", "trace", "tracer.js");
3636

3737
const patchedTracer = readFileSync(tracerFile, "utf-8").replaceAll(
3838
/\w+\s*=\s*require\([^/]*opentelemetry.*\)/g,
@@ -57,7 +57,7 @@ export function patchWranglerDeps(config: Config) {
5757
function getDistPath(config: Config): string {
5858
for (const root of [config.paths.standaloneApp, config.paths.standaloneRoot]) {
5959
try {
60-
const distPath = path.join(root, "node_modules", "next", "dist");
60+
const distPath = join(root, "node_modules", "next", "dist");
6161
if (statSync(distPath).isDirectory()) return distPath;
6262
} catch {
6363
/* empty */

‎packages/cloudflare/src/cli/config.ts‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import path, { relative } from "node:path";
1+
import { join, relative } from "node:path";
22
import { readdirSync, statSync } from "node:fs";
33

44
const PACKAGE_NAME = "@opennextjs/cloudflare";
@@ -49,16 +49,16 @@ export type Config = {
4949
* @returns The configuration, see `Config`
5050
*/
5151
export function getConfig(projectOpts: ProjectOptions): Config {
52-
const dotNext = path.join(projectOpts.outputDir, ".next");
52+
const dotNext = join(projectOpts.outputDir, ".next");
5353
const appPath = getNextjsApplicationPath(dotNext).replace(/\/$/, "");
54-
const standaloneRoot = path.join(dotNext, "standalone");
55-
const standaloneApp = path.join(standaloneRoot, appPath);
56-
const standaloneAppDotNext = path.join(standaloneApp, ".next");
57-
const standaloneAppServer = path.join(standaloneAppDotNext, "server");
54+
const standaloneRoot = join(dotNext, "standalone");
55+
const standaloneApp = join(standaloneRoot, appPath);
56+
const standaloneAppDotNext = join(standaloneApp, ".next");
57+
const standaloneAppServer = join(standaloneAppDotNext, "server");
5858

59-
const nodeModules = path.join(standaloneApp, "node_modules");
60-
const internalPackage = path.join(nodeModules, ...PACKAGE_NAME.split("/"));
61-
const internalTemplates = path.join(internalPackage, "cli", "templates");
59+
const nodeModules = join(standaloneApp, "node_modules");
60+
const internalPackage = join(nodeModules, ...PACKAGE_NAME.split("/"));
61+
const internalTemplates = join(internalPackage, "cli", "templates");
6262

6363
process.env.__OPENNEXT_KV_BINDING_NAME ??= "NEXT_CACHE_WORKERS_KV";
6464

@@ -91,7 +91,7 @@ export function getConfig(projectOpts: ProjectOptions): Config {
9191

9292
export function containsDotNextDir(folder: string): boolean {
9393
try {
94-
return statSync(path.join(folder, ".next")).isDirectory();
94+
return statSync(join(folder, ".next")).isDirectory();
9595
} catch {
9696
return false;
9797
}
@@ -124,12 +124,12 @@ function getNextjsApplicationPath(dotNextDir: string): string {
124124
throw new Error(`Unexpected Error: no \`.next/server\` folder could be found in \`${serverPath}\``);
125125
}
126126

127-
return relative(path.join(dotNextDir, "standalone"), serverPath);
127+
return relative(join(dotNextDir, "standalone"), serverPath);
128128
}
129129

130130
function findServerParentPath(parentPath: string): string | undefined {
131131
try {
132-
if (statSync(path.join(parentPath, ".next", "server")).isDirectory()) {
132+
if (statSync(join(parentPath, ".next", "server")).isDirectory()) {
133133
return parentPath;
134134
}
135135
} catch {
@@ -139,8 +139,8 @@ function findServerParentPath(parentPath: string): string | undefined {
139139
const folders = readdirSync(parentPath);
140140

141141
for (const folder of folders) {
142-
const subFolder = path.join(parentPath, folder);
143-
if (statSync(path.join(parentPath, folder)).isDirectory()) {
142+
const subFolder = join(parentPath, folder);
143+
if (statSync(join(parentPath, folder)).isDirectory()) {
144144
const dirServerPath = findServerParentPath(subFolder);
145145
if (dirServerPath) {
146146
return dirServerPath;

0 commit comments

Comments
 (0)