Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
The Snozzberries taste like Snozzberries...! Co-authored-by: OJ Kwon <kwon.ohjoong@gmail.com> Co-authored-by: LongYinan <lynweklm@gmail.com> Co-authored-by: JJ Kasper <jj@jjsweb.site> Co-authored-by: Jared Palmer <jared@jaredpalmer.com>
- Loading branch information
1 parent
a090b5c
commit b69dcb5
Showing
48 changed files
with
881 additions
and
120 deletions.
There are no files selected for viewing
4 changes: 2 additions & 2 deletions
4
packages/next-swc/crates/core/tests/errors/next-font-loaders/export-let/output.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
import firaCode from '@next/font/google/target.css?{"arguments":[],"import":"Abel","path":"pages/test.tsx"}'; | ||
import inter from '@next/font/google/target.css?{"arguments":[],"import":"Inter","path":"pages/test.tsx"}'; | ||
import firaCode from '@next/font/google/target.css?{"path":"pages/test.tsx","import":"Abel","arguments":[]}'; | ||
import inter from '@next/font/google/target.css?{"path":"pages/test.tsx","import":"Inter","arguments":[]}'; | ||
import React from 'react'; | ||
export { firaCode }; | ||
export { inter }; |
4 changes: 2 additions & 2 deletions
4
packages/next-swc/crates/core/tests/errors/next-font-loaders/not-const/output.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
import inter1 from '@next/font/google/target.css?{"arguments":[{"variant":"400"}],"import":"Inter","path":"pages/test.tsx"}'; | ||
import inter2 from '@next/font/google/target.css?{"arguments":[{"variant":"400"}],"import":"Inter","path":"pages/test.tsx"}'; | ||
import inter1 from '@next/font/google/target.css?{"path":"pages/test.tsx","import":"Inter","arguments":[{"variant":"400"}]}'; | ||
import inter2 from '@next/font/google/target.css?{"path":"pages/test.tsx","import":"Inter","arguments":[{"variant":"400"}]}'; | ||
var i = 10; | ||
var i2 = 20; |
8 changes: 4 additions & 4 deletions
8
packages/next-swc/crates/core/tests/errors/next-font-loaders/options-object/output.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
packages/next-swc/crates/core/tests/errors/next-font-loaders/spread-arg/output.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
import inter from '@next/font/google/target.css?{"arguments":[{},[]],"import":"Inter","path":"pages/test.tsx"}'; | ||
import inter from '@next/font/google/target.css?{"path":"pages/test.tsx","import":"Inter","arguments":[{},[]]}'; | ||
const a = fn(...{}, ...[]); |
2 changes: 1 addition & 1 deletion
2
packages/next-swc/crates/core/tests/fixture/next-font-loaders/default-import/output.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
import font from 'cool-fonts/target.css?{"arguments":[{"prop":true}],"import":"","path":"pages/test.tsx"}'; | ||
import font from 'cool-fonts/target.css?{"path":"pages/test.tsx","import":"","arguments":[{"prop":true}]}'; |
4 changes: 2 additions & 2 deletions
4
packages/next-swc/crates/core/tests/fixture/next-font-loaders/export-const/output.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
import firaCode from '@next/font/google/target.css?{"arguments":[],"import":"Abel","path":"pages/test.tsx"}'; | ||
import inter from '@next/font/google/target.css?{"arguments":[],"import":"Inter","path":"pages/test.tsx"}'; | ||
import firaCode from '@next/font/google/target.css?{"path":"pages/test.tsx","import":"Abel","arguments":[]}'; | ||
import inter from '@next/font/google/target.css?{"path":"pages/test.tsx","import":"Inter","arguments":[]}'; | ||
import React from 'react'; | ||
export { firaCode }; | ||
export { inter }; |
4 changes: 2 additions & 2 deletions
4
packages/next-swc/crates/core/tests/fixture/next-font-loaders/exports/output.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
import firaCode from '@next/font/google/target.css?{"arguments":[],"import":"Abel","path":"pages/test.tsx"}'; | ||
import inter from '@next/font/google/target.css?{"arguments":[],"import":"Inter","path":"pages/test.tsx"}'; | ||
import firaCode from '@next/font/google/target.css?{"path":"pages/test.tsx","import":"Abel","arguments":[]}'; | ||
import inter from '@next/font/google/target.css?{"path":"pages/test.tsx","import":"Inter","arguments":[]}'; | ||
import React from 'react'; | ||
export { firaCode }; | ||
export default inter; |
2 changes: 1 addition & 1 deletion
2
packages/next-swc/crates/core/tests/fixture/next-font-loaders/font-options/output.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
import firaCode from '@next/font/google/target.css?{"arguments":[{"fallback":["system-ui",{"key":false},[]],"key":{"key2":{}},"preload":true,"variant":"400"}],"import":"Fira_Code","path":"pages/test.tsx"}'; | ||
import firaCode from '@next/font/google/target.css?{"path":"pages/test.tsx","import":"Fira_Code","arguments":[{"variant":"400","fallback":["system-ui",{"key":false},[]],"preload":true,"key":{"key2":{}}}]}'; | ||
import React from 'react'; | ||
console.log(firaCode); |
2 changes: 1 addition & 1 deletion
2
packages/next-swc/crates/core/tests/fixture/next-font-loaders/import-as/output.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
import acme1 from 'cool-fonts/target.css?{"arguments":[{"variant":"400"}],"import":"Acme","path":"pages/test.tsx"}'; | ||
import acme1 from 'cool-fonts/target.css?{"path":"pages/test.tsx","import":"Acme","arguments":[{"variant":"400"}]}'; | ||
import React from 'react'; |
2 changes: 1 addition & 1 deletion
2
packages/next-swc/crates/core/tests/fixture/next-font-loaders/many-args/output.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
import geo from '@next/font/google/target.css?{"arguments":["test",[1.0],{"a":2.0},3.0],"import":"Geo","path":"pages/test.tsx"}'; | ||
import geo from '@next/font/google/target.css?{"path":"pages/test.tsx","import":"Geo","arguments":["test",[1.0],{"a":2.0},3.0]}'; |
4 changes: 2 additions & 2 deletions
4
packages/next-swc/crates/core/tests/fixture/next-font-loaders/multiple-calls/output.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
import inter from '@next/font/google/target.css?{"arguments":[{"display":"swap","variant":"900"}],"import":"Inter","path":"pages/test.tsx"}'; | ||
import inter from '@next/font/google/target.css?{"arguments":[{"display":"swap","variant":"900"}],"import":"Inter","path":"pages/test.tsx"}'; | ||
import inter from '@next/font/google/target.css?{"path":"pages/test.tsx","import":"Inter","arguments":[{"variant":"900","display":"swap"}]}'; | ||
import inter from '@next/font/google/target.css?{"path":"pages/test.tsx","import":"Inter","arguments":[{"variant":"900","display":"swap"}]}'; | ||
import React from 'react'; |
4 changes: 2 additions & 2 deletions
4
.../next-swc/crates/core/tests/fixture/next-font-loaders/multiple-font-downloaders/output.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
import inter from '@next/font/google/target.css?{"arguments":[{"variant":"900"}],"import":"Inter","path":"pages/test.tsx"}'; | ||
import fira from 'cool-fonts/target.css?{"arguments":[{"display":"swap","variant":"400"}],"import":"Fira_Code","path":"pages/test.tsx"}'; | ||
import inter from '@next/font/google/target.css?{"path":"pages/test.tsx","import":"Inter","arguments":[{"variant":"900"}]}'; | ||
import fira from 'cool-fonts/target.css?{"path":"pages/test.tsx","import":"Fira_Code","arguments":[{"variant":"400","display":"swap"}]}'; | ||
import React from 'react'; |
4 changes: 2 additions & 2 deletions
4
packages/next-swc/crates/core/tests/fixture/next-font-loaders/multiple-fonts/output.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
import firaCode from '@next/font/google/target.css?{"arguments":[{"fallback":["system-ui"],"variant":"400"}],"import":"Fira_Code","path":"pages/test.tsx"}'; | ||
import inter from '@next/font/google/target.css?{"arguments":[{"display":"swap","variant":"900"}],"import":"Inter","path":"pages/test.tsx"}'; | ||
import firaCode from '@next/font/google/target.css?{"path":"pages/test.tsx","import":"Fira_Code","arguments":[{"variant":"400","fallback":["system-ui"]}]}'; | ||
import inter from '@next/font/google/target.css?{"path":"pages/test.tsx","import":"Inter","arguments":[{"variant":"900","display":"swap"}]}'; | ||
import React from 'react'; |
4 changes: 2 additions & 2 deletions
4
packages/next-swc/crates/core/tests/fixture/next-font-loaders/multiple-imports/output.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
import inter from '@next/font/google/target.css?{"arguments":[{"variant":"900"}],"import":"Inter","path":"pages/test.tsx"}'; | ||
import fira from '@next/font/google/target.css?{"arguments":[{"display":"swap","variant":"400"}],"import":"Fira_Code","path":"pages/test.tsx"}'; | ||
import inter from '@next/font/google/target.css?{"path":"pages/test.tsx","import":"Inter","arguments":[{"variant":"900"}]}'; | ||
import fira from '@next/font/google/target.css?{"path":"pages/test.tsx","import":"Fira_Code","arguments":[{"variant":"400","display":"swap"}]}'; | ||
import React from 'react'; |
2 changes: 1 addition & 1 deletion
2
packages/next-swc/crates/core/tests/fixture/next-font-loaders/no-args/output.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
import fira from '@next/font/google/target.css?{"arguments":[],"import":"Fira_Code","path":"pages/test.tsx"}'; | ||
import fira from '@next/font/google/target.css?{"path":"pages/test.tsx","import":"Fira_Code","arguments":[]}'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
use std::sync::Arc; | ||
|
||
use napi::bindgen_prelude::*; | ||
use node_file_trace::{start, Args}; | ||
|
||
#[napi] | ||
pub async fn run_turbo_tracing(options: Buffer) -> napi::Result<Vec<String>> { | ||
let args: Args = serde_json::from_slice(options.as_ref())?; | ||
let files = start(Arc::new(args)).await?; | ||
Ok(files) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,157 @@ | ||
use std::{ | ||
future::join, | ||
net::{IpAddr, Ipv4Addr}, | ||
path::PathBuf, | ||
time::{Duration, Instant}, | ||
}; | ||
|
||
use crate::util::MapErr; | ||
use napi::bindgen_prelude::*; | ||
use next_dev::{register, NextDevServerBuilder}; | ||
use owo_colors::OwoColorize; | ||
use serde::Deserialize; | ||
use turbo_tasks::{util::FormatDuration, TurboTasks}; | ||
use turbo_tasks_memory::MemoryBackend; | ||
use turbopack_core::issue::IssueSeverity; | ||
|
||
#[derive(Clone, Debug, Deserialize)] | ||
#[serde(rename_all = "camelCase")] | ||
#[allow(unused)] | ||
struct TurboDevServerOptions { | ||
#[serde(default = "default_port")] | ||
port: u16, | ||
|
||
#[serde(default = "default_host")] | ||
hostname: IpAddr, | ||
|
||
#[serde(default)] | ||
eager_compile: bool, | ||
|
||
#[serde(default)] | ||
log_level: Option<IssueSeverity>, | ||
|
||
#[serde(default)] | ||
show_all: bool, | ||
|
||
#[serde(default)] | ||
log_detail: bool, | ||
|
||
#[serde(default = "default_dir")] | ||
dir: PathBuf, | ||
|
||
#[serde(default = "default_dir")] | ||
root_dir: PathBuf, | ||
|
||
#[serde(default)] | ||
allow_retry: bool, | ||
|
||
#[serde(default)] | ||
dev: bool, | ||
|
||
#[serde(default)] | ||
is_next_dev_command: bool, | ||
|
||
#[serde(default)] | ||
server_components_external_packages: Vec<String>, | ||
} | ||
|
||
fn default_port() -> u16 { | ||
3000 | ||
} | ||
|
||
fn default_host() -> IpAddr { | ||
IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)) | ||
} | ||
|
||
fn default_dir() -> PathBuf { | ||
std::env::current_dir().expect("Current dir should be accessible") | ||
} | ||
|
||
async fn start_server(options: TurboDevServerOptions) -> napi::Result<()> { | ||
let start = Instant::now(); | ||
|
||
register(); | ||
|
||
let tt = TurboTasks::new(MemoryBackend::new()); | ||
let tt_clone = tt.clone(); | ||
|
||
let dir = options | ||
.dir | ||
.canonicalize() | ||
.expect("Cannot canonicalize project directory") | ||
.to_str() | ||
.expect("project directory contains invalid characters") | ||
.to_string(); | ||
|
||
let root_dir = options | ||
.root_dir | ||
.canonicalize() | ||
.expect("Cannot canonicalize project directory") | ||
.to_str() | ||
.expect("project directory contains invalid characters") | ||
.to_string(); | ||
|
||
//server_component_external | ||
|
||
let mut server = NextDevServerBuilder::new(tt, dir, root_dir) | ||
.entry_request("src/index".into()) | ||
.eager_compile(options.eager_compile) | ||
.hostname(options.hostname) | ||
.port(options.port) | ||
.log_detail(options.log_detail) | ||
.show_all(options.show_all) | ||
.log_level( | ||
options | ||
.log_level | ||
.map_or_else(|| IssueSeverity::Warning, |l| l), | ||
); | ||
|
||
for package in options.server_components_external_packages { | ||
server = server.server_component_external(package); | ||
} | ||
|
||
let server = server.build().await.convert_err()?; | ||
|
||
let index_uri = if server.addr.ip().is_loopback() || server.addr.ip().is_unspecified() { | ||
format!("http://localhost:{}", server.addr.port()) | ||
} else { | ||
format!("http://{}", server.addr) | ||
}; | ||
println!( | ||
"{} - started server on {}:{}, url: {}", | ||
"ready".green(), | ||
server.addr.ip(), | ||
server.addr.port(), | ||
index_uri | ||
); | ||
|
||
let stats_future = async move { | ||
println!( | ||
"{event_type} - initial compilation {start}", | ||
event_type = "event".purple(), | ||
start = FormatDuration(start.elapsed()), | ||
); | ||
|
||
loop { | ||
let (elapsed, _count) = tt_clone | ||
.get_or_wait_update_info(Duration::from_millis(100)) | ||
.await; | ||
println!( | ||
"{event_type} - updated in {elapsed}", | ||
event_type = "event".purple(), | ||
elapsed = FormatDuration(elapsed), | ||
); | ||
} | ||
}; | ||
|
||
join!(stats_future, async { server.future.await.unwrap() }).await; | ||
|
||
Ok(()) | ||
} | ||
|
||
#[napi] | ||
pub async fn start_turbo_dev(options: Buffer) -> napi::Result<()> { | ||
let options: TurboDevServerOptions = serde_json::from_slice(&options)?; | ||
|
||
start_server(options).await | ||
} |
Oops, something went wrong.