Unverified Commit 2dade5df authored by Alex Kirszenberg's avatar Alex Kirszenberg Committed by GitHub

Refactor pages structure (#49802)

parent e5ad96ed
......@@ -7,4 +7,4 @@ export {
__N_SSG,
// @ts-expect-error
__N_SSP,
} from '@vercel/turbopack-next/internal/_error'
} from '@vercel/turbopack-next/pages/_error'
export * from '@vercel/turbopack-next/pages/_app'
export { default } from '@vercel/turbopack-next/pages/_app'
export * from '@vercel/turbopack-next/pages/_document'
export { default } from '@vercel/turbopack-next/pages/_document'
export * from '@vercel/turbopack-next/pages/_error'
export { default } from '@vercel/turbopack-next/pages/_error'
......@@ -26,6 +26,7 @@
"@vercel/turbopack-next/*": ["src/*"],
"@vercel/turbopack-next/pages/_app": ["node_modules/next/app"],
"@vercel/turbopack-next/pages/_document": ["node_modules/next/document"],
"@vercel/turbopack-next/pages/_error": ["node_modules/next/error"],
"@vercel/turbopack-next/internal/_error": ["node_modules/next/error"],
"next/*": ["node_modules/next/*"]
},
......
......@@ -79,7 +79,7 @@ pub async fn get_next_client_import_map(
);
insert_alias_to_alternatives(
&mut import_map,
format!("{VIRTUAL_PACKAGE_NAME}/internal/_error"),
format!("{VIRTUAL_PACKAGE_NAME}/pages/_error"),
vec![
request_to_import_mapping(pages_dir, "./_error"),
request_to_import_mapping(pages_dir, "next/error"),
......@@ -375,7 +375,7 @@ pub async fn insert_next_server_special_aliases(
);
insert_alias_to_alternatives(
import_map,
format!("{VIRTUAL_PACKAGE_NAME}/internal/_error"),
format!("{VIRTUAL_PACKAGE_NAME}/pages/_error"),
vec![
request_to_import_mapping(pages_dir, "./_error"),
external_request_to_import_mapping("next/error"),
......
use anyhow::{anyhow, bail, Context, Result};
use anyhow::{bail, Context, Result};
use serde::{de::DeserializeOwned, Deserialize, Serialize};
use swc_core::ecma::ast::Program;
use turbo_tasks::{
primitives::{JsonValue, JsonValueVc, StringVc},
trace::TraceRawVcs,
Value, ValueToString,
TaskInput, Value, ValueToString,
};
use turbopack_binding::{
turbo::tasks_fs::{json::parse_json_rope_with_source_context, FileContent, FileSystemPathVc},
......@@ -30,13 +30,18 @@ use turbopack_binding::{
use crate::next_config::{NextConfigVc, OutputType};
#[derive(Debug, Clone, Copy, PartialEq, Eq, TaskInput)]
pub enum PathType {
Page,
Data,
}
/// Converts a filename within the server root into a next pathname.
#[turbo_tasks::function]
pub async fn pathname_for_path(
server_root: FileSystemPathVc,
server_path: FileSystemPathVc,
has_extension: bool,
data: bool,
path_ty: PathType,
) -> Result<StringVc> {
let server_path_value = &*server_path.await?;
let path = if let Some(path) = server_root.await?.get_path_to(server_path_value) {
......@@ -48,19 +53,12 @@ pub async fn pathname_for_path(
server_root.to_string().await?
)
};
let path = if has_extension {
path.rsplit_once('.')
.ok_or_else(|| anyhow!("path ({}) has no extension", path))?
.0
} else {
path
};
// `get_path_to` always strips the leading `/` from the path, so we need to add
// it back here.
let path = if path == "index" && !data {
"/".to_string()
} else {
format!("/{}", path.strip_suffix("/index").unwrap_or(path))
let path = match (path_ty, path) {
// "/" is special-cased to "/index" for data routes.
(PathType::Data, "") => "/index".to_string(),
// `get_path_to` always strips the leading `/` from the path, so we need to add
// it back here.
(_, path) => format!("/{}", path),
};
Ok(StringVc::cell(path))
......
......@@ -14,7 +14,7 @@ PlainIssue {
context: Some(
"[project]/packages/next-swc/crates/next-dev-tests/tests/temp/next/error/ssr/input/pages/broken.tsx",
),
description: "Next.js pages directory",
description: "Next.js page file",
},
PlainIssueProcessingPathItem {
context: Some(
......
......@@ -28,7 +28,7 @@ PlainIssue {
context: Some(
"[project]/packages/next-swc/crates/next-dev-tests/tests/temp/next/externals/cjs-in-esm/input/pages/index.js",
),
description: "Next.js pages directory",
description: "Next.js page file",
},
PlainIssueProcessingPathItem {
context: Some(
......
......@@ -28,7 +28,7 @@ PlainIssue {
context: Some(
"[project]/packages/next-swc/crates/next-dev-tests/tests/temp/next/externals/cjs-in-esm/input/pages/index.js",
),
description: "Next.js pages directory",
description: "Next.js page file",
},
],
),
......
......@@ -14,7 +14,7 @@ PlainIssue {
context: Some(
"[project]/packages/next-swc/crates/next-dev-tests/tests/temp/next/image/basic/input/pages/index.js",
),
description: "Next.js pages directory",
description: "Next.js page file",
},
PlainIssueProcessingPathItem {
context: Some(
......
......@@ -14,7 +14,7 @@ PlainIssue {
context: Some(
"[project]/packages/next-swc/crates/next-dev-tests/tests/temp/next/image/basic/input/pages/index.js",
),
description: "Next.js pages directory",
description: "Next.js page file",
},
PlainIssueProcessingPathItem {
context: Some(
......
......@@ -14,7 +14,7 @@ PlainIssue {
context: Some(
"[project]/packages/next-swc/crates/next-dev-tests/tests/temp/next/image/basic/input/pages/index.js",
),
description: "Next.js pages directory",
description: "Next.js page file",
},
],
),
......
......@@ -14,7 +14,7 @@ PlainIssue {
context: Some(
"[project]/packages/next-swc/crates/next-dev-tests/tests/temp/next/image/basic/input/pages/index.js",
),
description: "Next.js pages directory",
description: "Next.js page file",
},
],
),
......
......@@ -14,7 +14,7 @@ PlainIssue {
context: Some(
"[project]/packages/next-swc/crates/next-dev-tests/tests/temp/next/image/remotepattern/input/pages/invalid.js",
),
description: "Next.js pages directory",
description: "Next.js page file",
},
PlainIssueProcessingPathItem {
context: Some(
......
......@@ -28,7 +28,7 @@ PlainIssue {
context: Some(
"[project]/packages/next-swc/crates/next-dev-tests/tests/temp/next/tailwind/basic/input/pages/index.jsx",
),
description: "Next.js pages directory",
description: "Next.js page file",
},
PlainIssueProcessingPathItem {
context: Some(
......
......@@ -28,7 +28,7 @@ PlainIssue {
context: Some(
"[project]/packages/next-swc/crates/next-dev-tests/tests/temp/next/tailwind/basic/input/pages/index.jsx",
),
description: "Next.js pages directory",
description: "Next.js page file",
},
PlainIssueProcessingPathItem {
context: Some(
......
......@@ -28,7 +28,7 @@ PlainIssue {
context: Some(
"[project]/packages/next-swc/crates/next-dev-tests/tests/temp/next/tailwind/basic/input/pages/index.jsx",
),
description: "Next.js pages directory",
description: "Next.js page file",
},
PlainIssueProcessingPathItem {
context: Some(
......
......@@ -28,7 +28,7 @@ PlainIssue {
context: Some(
"[project]/packages/next-swc/crates/next-dev-tests/tests/temp/next/tailwind/basic/input/pages/index.jsx",
),
description: "Next.js pages directory",
description: "Next.js page file",
},
PlainIssueProcessingPathItem {
context: Some(
......
......@@ -28,7 +28,7 @@ PlainIssue {
context: Some(
"[project]/packages/next-swc/crates/next-dev-tests/tests/temp/next/tailwind/basic/input/pages/index.jsx",
),
description: "Next.js pages directory",
description: "Next.js page file",
},
PlainIssueProcessingPathItem {
context: Some(
......
......@@ -28,7 +28,7 @@ PlainIssue {
context: Some(
"[project]/packages/next-swc/crates/next-dev-tests/tests/temp/next/tailwind/basic/input/pages/index.jsx",
),
description: "Next.js pages directory",
description: "Next.js page file",
},
PlainIssueProcessingPathItem {
context: Some(
......
......@@ -14,7 +14,7 @@ PlainIssue {
context: Some(
"[project]/packages/next-swc/crates/next-dev-tests/tests/temp/next/webpack-loaders/emitted-errors/input/pages/index.js",
),
description: "Next.js pages directory",
description: "Next.js page file",
},
PlainIssueProcessingPathItem {
context: Some(
......
......@@ -14,7 +14,7 @@ PlainIssue {
context: Some(
"[project]/packages/next-swc/crates/next-dev-tests/tests/temp/next/webpack-loaders/emitted-errors/input/pages/index.js",
),
description: "Next.js pages directory",
description: "Next.js page file",
},
PlainIssueProcessingPathItem {
context: Some(
......
......@@ -14,7 +14,7 @@ PlainIssue {
context: Some(
"[project]/packages/next-swc/crates/next-dev-tests/tests/temp/next/webpack-loaders/emitted-errors/input/pages/index.js",
),
description: "Next.js pages directory",
description: "Next.js page file",
},
],
),
......
......@@ -14,7 +14,7 @@ PlainIssue {
context: Some(
"[project]/packages/next-swc/crates/next-dev-tests/tests/temp/next/webpack-loaders/emitted-errors/input/pages/index.js",
),
description: "Next.js pages directory",
description: "Next.js page file",
},
PlainIssueProcessingPathItem {
context: Some(
......
......@@ -14,7 +14,7 @@ PlainIssue {
context: Some(
"[project]/packages/next-swc/crates/next-dev-tests/tests/temp/next/webpack-loaders/emitted-errors/input/pages/index.js",
),
description: "Next.js pages directory",
description: "Next.js page file",
},
],
),
......
......@@ -14,7 +14,7 @@ PlainIssue {
context: Some(
"[project]/packages/next-swc/crates/next-dev-tests/tests/temp/next/webpack-loaders/emitted-errors/input/pages/index.js",
),
description: "Next.js pages directory",
description: "Next.js page file",
},
PlainIssueProcessingPathItem {
context: Some(
......
......@@ -14,7 +14,7 @@ PlainIssue {
context: Some(
"[project]/packages/next-swc/crates/next-dev-tests/tests/temp/next/webpack-loaders/emitted-errors/input/pages/index.js",
),
description: "Next.js pages directory",
description: "Next.js page file",
},
],
),
......
......@@ -14,7 +14,7 @@ PlainIssue {
context: Some(
"[project]/packages/next-swc/crates/next-dev-tests/tests/temp/next/webpack-loaders/emitted-errors/input/pages/index.js",
),
description: "Next.js pages directory",
description: "Next.js page file",
},
],
),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment