Merge remote-tracking branch 'origin/canary' into sokra/analyse-data

Author: wbinnssmith

crates/napi/build.rs

@@ -2,8 +2,6 @@ use std::{env, fs, path::Path, process::Command, str};
 
 use serde_json::Value;
 
-extern crate napi_build;
-
 fn main() -> anyhow::Result<()> {
     println!("cargo:rerun-if-env-changed=CI");
     let is_ci = env::var("CI").is_ok_and(|value| !value.is_empty());

crates/napi/src/lib.rs

@@ -32,9 +32,6 @@ DEALINGS IN THE SOFTWARE.
 #![feature(arbitrary_self_types_pointers)]
 #![feature(iter_intersperse)]
 
-#[macro_use]
-extern crate napi_derive;
-
 use std::sync::Arc;
 
 use napi::bindgen_prelude::*;

crates/napi/src/lockfile.rs

@@ -6,6 +6,7 @@ use std::{
 
 use anyhow::Context;
 use napi::bindgen_prelude::External;
+use napi_derive::napi;
 
 /// A wrapper around [`File`] that is passed to JS, and is set to `None` when [`lockfile_unlock`] is
 /// called.

crates/napi/src/mdx.rs

@@ -1,5 +1,6 @@
 use mdxjs::{Options, compile};
 use napi::bindgen_prelude::*;
+use napi_derive::napi;
 
 pub struct MdxCompileTask {
     pub input: String,

crates/napi/src/minify.rs

@@ -28,6 +28,7 @@ DEALINGS IN THE SOFTWARE.
 
 use anyhow::Context;
 use napi::bindgen_prelude::*;
+use napi_derive::napi;
 use serde::Serialize;
 use swc_core::{
     base::{config::JsMinifyOptions, try_with_handler},

crates/napi/src/next_api/endpoint.rs

@@ -3,6 +3,7 @@ use std::{ops::Deref, sync::Arc};
 use anyhow::Result;
 use futures_util::TryFutureExt;
 use napi::{JsFunction, bindgen_prelude::External};
+use napi_derive::napi;
 use next_api::{
     operation::OptionEndpoint,
     paths::ServerPath,
@@ -15,7 +16,7 @@ use tracing::Instrument;
 use turbo_tasks::{Completion, Effects, OperationVc, ReadRef, Vc};
 use turbopack_core::{diagnostics::PlainDiagnostic, issue::PlainIssue};
 
-use super::utils::{
+use crate::next_api::utils::{
     DetachedVc, NapiDiagnostic, NapiIssue, RootTask, TurbopackResult,
     strongly_consistent_catch_collectables, subscribe,
 };

crates/napi/src/next_api/project.rs

@@ -8,6 +8,7 @@ use napi::{
     bindgen_prelude::{External, within_runtime_if_available},
     threadsafe_function::{ThreadsafeFunction, ThreadsafeFunctionCallMode},
 };
+use napi_derive::napi;
 use next_api::{
     entrypoints::Entrypoints,
     next_server_nft::next_server_nft_assets,

crates/napi/src/next_api/turbopack_ctx.rs

@@ -12,6 +12,7 @@ use std::{
 use anyhow::Result;
 use either::Either;
 use napi::{JsFunction, threadsafe_function::ThreadsafeFunction};
+use napi_derive::napi;
 use once_cell::sync::Lazy;
 use owo_colors::OwoColorize;
 use serde::Serialize;

crates/napi/src/next_api/utils.rs

@@ -7,6 +7,7 @@ use napi::{
     bindgen_prelude::{Buffer, External, ToNapiValue},
     threadsafe_function::{ThreadSafeCallContext, ThreadsafeFunction, ThreadsafeFunctionCallMode},
 };
+use napi_derive::napi;
 use rustc_hash::FxHashMap;
 use serde::Serialize;
 use turbo_tasks::{

crates/napi/src/parse.rs

@@ -2,6 +2,7 @@ use std::sync::Arc;
 
 use anyhow::Context as _;
 use napi::bindgen_prelude::*;
+use napi_derive::napi;
 use swc_core::{
     base::{config::ParseOptions, try_with_handler},
     common::{