Skip to content

Commit

Permalink
fix: should recognize negative preload value
Browse files Browse the repository at this point in the history
  • Loading branch information
JSerFeng committed Dec 27, 2024
1 parent 170b877 commit 662d379
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
8 changes: 4 additions & 4 deletions crates/rspack_core/src/chunk_group.rs
Original file line number Diff line number Diff line change
Expand Up @@ -506,16 +506,16 @@ impl Display for ChunkGroupOrderKey {
#[derive(Debug, Default, Clone, PartialEq, Eq, Hash, PartialOrd, Ord)]
pub struct ChunkGroupOptions {
pub name: Option<String>,
pub preload_order: Option<u32>,
pub prefetch_order: Option<u32>,
pub preload_order: Option<i32>,
pub prefetch_order: Option<i32>,
pub fetch_priority: Option<DynamicImportFetchPriority>,
}

impl ChunkGroupOptions {
pub fn new(
name: Option<String>,
preload_order: Option<u32>,
prefetch_order: Option<u32>,
preload_order: Option<i32>,
prefetch_order: Option<i32>,
fetch_priority: Option<DynamicImportFetchPriority>,
) -> Self {
Self {
Expand Down
6 changes: 3 additions & 3 deletions crates/rspack_core/src/options/module.rs
Original file line number Diff line number Diff line change
Expand Up @@ -148,11 +148,11 @@ impl From<&str> for JavascriptParserUrl {
#[derive(Debug, Clone, Copy, MergeFrom)]
pub enum JavascriptParserOrder {
Disable,
Order(u32),
Order(i32),
}

impl JavascriptParserOrder {
pub fn get_order(&self) -> Option<u32> {
pub fn get_order(&self) -> Option<i32> {
match self {
Self::Disable => None,
Self::Order(o) => Some(*o),
Expand All @@ -166,7 +166,7 @@ impl From<&str> for JavascriptParserOrder {
"false" => Self::Disable,
"true" => Self::Order(0),
_ => {
if let Ok(order) = value.parse::<u32>() {
if let Ok(order) = value.parse::<i32>() {
Self::Order(order)
} else {
Self::Order(0)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -228,12 +228,12 @@ pub mod expr_name {
pub const IMPORT_META_WEBPACK_CONTEXT: &str = "import.meta.webpackContext";
}

pub fn parse_order_string(x: &str) -> Option<u32> {
pub fn parse_order_string(x: &str) -> Option<i32> {
match x {
"true" => Some(0),
"false" => None,
_ => {
if let Ok(order) = x.parse::<u32>() {
if let Ok(order) = x.parse::<i32>() {
Some(order)
} else {
None
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1210,14 +1210,14 @@ asset normal.js 102 bytes {615} [emitted] (name: normal)
asset prefetched2.js 102 bytes {424} [emitted] (name: prefetched2)
asset prefetched3.js 102 bytes {182} [emitted] (name: prefetched3)
Entrypoint main 13.9 KiB = main.js
prefetch: prefetched.js {674} (name: prefetched)
prefetch: prefetched.js {674} (name: prefetched), prefetched3.js {182} (name: prefetched3), prefetched2.js {424} (name: prefetched2)
chunk {182} (runtime: main) prefetched3.js (prefetched3) 1 bytes <{909}> [rendered]
chunk {424} (runtime: main) prefetched2.js (prefetched2) 1 bytes <{909}> [rendered]
chunk {481} (runtime: main) inner.js (inner) 1 bytes <{674}> [rendered]
chunk {615} (runtime: main) normal.js (normal) 1 bytes <{909}> [rendered]
chunk {674} (runtime: main) prefetched.js (prefetched) 228 bytes <{909}> >{481}< >{857}< (prefetch: {857} {481}) [rendered]
chunk {857} (runtime: main) inner2.js (inner2) 2 bytes <{674}> [rendered]
chunk {909} (runtime: main) main.js (main) 436 bytes (javascript) 11 KiB (runtime) >{182}< >{424}< >{615}< >{674}< (prefetch: {674}) [entry] [rendered]"
chunk {909} (runtime: main) main.js (main) 436 bytes (javascript) 11 KiB (runtime) >{182}< >{424}< >{615}< >{674}< (prefetch: {674} {182} {424}) [entry] [rendered]"
`;
exports[`StatsTestCases should print correct stats for prefetch-preload-mixed 1`] = `
Expand All @@ -1243,14 +1243,14 @@ asset normal.js 102 bytes [emitted] (name: normal)
asset preloaded2.js 101 bytes [emitted] (name: preloaded2)
asset preloaded3.js 100 bytes [emitted] (name: preloaded3)
Entrypoint main 12.5 KiB = main.js
preload: preloaded.js {154} (name: preloaded)
preload: preloaded.js {154} (name: preloaded), preloaded3.js {551} (name: preloaded3), preloaded2.js {577} (name: preloaded2)
chunk (runtime: main) preloaded.js (preloaded) 226 bytes (preload: {857} {481}) [rendered]
chunk (runtime: main) inner.js (inner) 1 bytes [rendered]
chunk (runtime: main) preloaded3.js (preloaded3) 1 bytes [rendered]
chunk (runtime: main) preloaded2.js (preloaded2) 1 bytes [rendered]
chunk (runtime: main) normal.js (normal) 1 bytes [rendered]
chunk (runtime: main) inner2.js (inner2) 2 bytes [rendered]
chunk (runtime: main) main.js (main) 424 bytes (javascript) 9.78 KiB (runtime) (preload: {154}) [entry] [rendered]"
chunk (runtime: main) main.js (main) 424 bytes (javascript) 9.78 KiB (runtime) (preload: {154} {551} {577}) [entry] [rendered]"
`;
exports[`StatsTestCases should print correct stats for preset-errors-only 1`] = `""`;
Expand Down

0 comments on commit 662d379

Please sign in to comment.