Unverified Commit b7776146 authored by Donny/강동윤's avatar Donny/강동윤 Committed by GitHub

refactor(turbopack): Use `ResolvedVc<T>` for struct fields in `next-api`, part 1 (#73366)

<!-- Thanks for opening a PR! Your contribution is much appreciated.
To make sure your PR is handled as smoothly as possible we request that you follow the checklist sections below.
Choose the right checklist for the change(s) that you're making:

## For Contributors

### Improving Documentation

- Run `pnpm prettier-fix` to fix formatting issues before opening the PR.
- Read the Docs Contribution Guide to ensure your contribution follows the docs guidelines: https://nextjs.org/docs/community/contribution-guide

### Adding or Updating Examples

- The "examples guidelines" are followed from our contributing doc https://github.com/vercel/next.js/blob/canary/contributing/examples/adding-examples.md
- Make sure the linting passes by running `pnpm build && pnpm lint`. See https://github.com/vercel/next.js/blob/canary/contributing/repository/linting.md

### Fixing a bug

- Related issues linked using `fixes #number`
- Tests added. See: https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs
- Errors have a helpful link attached, see https://github.com/vercel/next.js/blob/canary/contributing.md

### Adding a feature

- Implements an existing feature request or RFC. Make sure the feature request has been accepted for implementation before opening a PR. (A discussion must be opened, see https://github.com/vercel/next.js/discussions/new?category=ideas)
- Related issues/discussions are linked using `fixes #number`
- e2e tests added (https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs)
- Documentation added
- Telemetry added. In case of a feature if it's used or not.
- Errors have a helpful link attached, see https://github.com/vercel/next.js/blob/canary/contributing.md


## For Maintainers

- Minimal description (aim for explaining to someone not on the team to understand the PR)
- When linking to a Slack thread, you might want to share details of the conclusion
- Link both the Linear (Fixes NEXT-xxx) and the GitHub issues
- Add review comments if necessary to explain to the reviewer the logic behind a change

### What?

### Why?

### How?

Closes NEXT-
Fixes #

-->
parent 45095461
......@@ -493,10 +493,10 @@ impl ProjectDefineEnv {
#[turbo_tasks::value(shared)]
struct ConflictIssue {
path: Vc<FileSystemPath>,
title: Vc<StyledString>,
description: Vc<StyledString>,
severity: Vc<IssueSeverity>,
path: ResolvedVc<FileSystemPath>,
title: ResolvedVc<StyledString>,
description: ResolvedVc<StyledString>,
severity: ResolvedVc<IssueSeverity>,
}
#[turbo_tasks::value_impl]
......@@ -508,22 +508,22 @@ impl Issue for ConflictIssue {
#[turbo_tasks::function]
fn severity(&self) -> Vc<IssueSeverity> {
self.severity
*self.severity
}
#[turbo_tasks::function]
fn file_path(&self) -> Vc<FileSystemPath> {
self.path
*self.path
}
#[turbo_tasks::function]
fn title(&self) -> Vc<StyledString> {
self.title
*self.title
}
#[turbo_tasks::function]
fn description(&self) -> Vc<OptionStyledString> {
Vc::cell(Some(self.description))
Vc::cell(Some(*self.description))
}
}
......@@ -879,20 +879,20 @@ impl Project {
match routes.entry(pathname.clone()) {
Entry::Occupied(mut entry) => {
ConflictIssue {
path: self.project_path(),
path: self.project_path().to_resolved().await?,
title: StyledString::Text(
format!("App Router and Pages Router both match path: {}", pathname)
.into(),
)
.cell(),
.resolved_cell(),
description: StyledString::Text(
"Next.js does not support having both App Router and Pages Router \
routes matching the same path. Please remove one of the conflicting \
routes."
.into(),
)
.cell(),
severity: IssueSeverity::Error.cell(),
.resolved_cell(),
severity: IssueSeverity::Error.resolved_cell(),
}
.cell()
.emit();
......
......@@ -396,7 +396,7 @@ async fn parse_actions(module: Vc<Box<dyn Module>>) -> Result<Vc<OptionActionMap
let mut actions = FxIndexMap::from_iter(actions.into_iter());
actions.sort_keys();
Ok(Vc::cell(Some(Vc::cell(actions))))
Ok(Vc::cell(Some(ResolvedVc::cell(actions))))
}
fn all_export_names(program: &Program) -> Vec<Atom> {
......@@ -485,7 +485,7 @@ fn is_turbopack_internal_var(with: &Option<Box<ObjectLit>>) -> bool {
/// collecting into a flat-mapped [FxIndexMap].
async fn parse_actions_filter_map(
(layer, module, name): FindActionsNode,
) -> Result<Option<(FindActionsNode, Vc<ActionMap>)>> {
) -> Result<Option<(FindActionsNode, ResolvedVc<ActionMap>)>> {
parse_actions(*module).await.map(|option_action_map| {
option_action_map
.clone_value()
......@@ -514,7 +514,7 @@ struct ActionMap(FxIndexMap<String, String>);
/// An Option wrapper around [ActionMap].
#[turbo_tasks::value(transparent)]
struct OptionActionMap(Option<Vc<ActionMap>>);
struct OptionActionMap(Option<ResolvedVc<ActionMap>>);
#[turbo_tasks::value_impl]
impl OptionActionMap {
......
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