Skip to content

Commit

Permalink
Merge branch 'main' into fix/align_provide_exports
Browse files Browse the repository at this point in the history
  • Loading branch information
stormslowly authored Jan 20, 2025
2 parents 75bedca + c06787b commit 0c305ad
Show file tree
Hide file tree
Showing 284 changed files with 2,469 additions and 977 deletions.
5 changes: 3 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ rayon = { version = "1.10.0" }
regex = { version = "1.11.1" }
ropey = "1.6.1"
rspack_resolver = { features = ["package_json_raw_json_api"], version = "0.5.0" }
rspack_sources = { version = "0.4.1" }
rspack_sources = { version = "0.4.3" }
rustc-hash = { version = "2.1.0" }
serde = { version = "1.0.217" }
serde_json = { version = "1.0.134" }
Expand Down
21 changes: 21 additions & 0 deletions crates/node_binding/binding.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1043,11 +1043,19 @@ export interface JsStatsModuleReason {
moduleChunks?: number
type?: string
userRequest?: string
explanation?: string
active: boolean
loc?: string
}

export interface JsStatsModuleTrace {
origin: JsStatsModuleTraceModule
module: JsStatsModuleTraceModule
dependencies: Array<JsStatsModuleTraceDependency>
}

export interface JsStatsModuleTraceDependency {
loc: string
}

export interface JsStatsModuleTraceModule {
Expand Down Expand Up @@ -1143,6 +1151,7 @@ export interface RawAssetGeneratorOptions {
outputPath?: JsFilename
publicPath?: "auto" | JsFilename
dataUrl?: RawAssetGeneratorDataUrlOptions | ((source: Buffer, context: RawAssetGeneratorDataUrlFnCtx) => string)
importMode?: "url" | "preserve"
}

export interface RawAssetInlineGeneratorOptions {
Expand All @@ -1167,6 +1176,7 @@ export interface RawAssetResourceGeneratorOptions {
filename?: JsFilename
outputPath?: JsFilename
publicPath?: "auto" | JsFilename
importMode?: "url" | "preserve"
}

export interface RawBannerPluginOptions {
Expand Down Expand Up @@ -1374,6 +1384,16 @@ export interface RawEnvironment {
const?: boolean
arrowFunction?: boolean
nodePrefixForCoreModules?: boolean
asyncFunction?: boolean
bigIntLiteral?: boolean
destructuring?: boolean
document?: boolean
dynamicImport?: boolean
forOf?: boolean
globalThis?: boolean
module?: boolean
optionalChaining?: boolean
templateLiteral?: boolean
}

export interface RawEvalDevToolModulePluginOptions {
Expand Down Expand Up @@ -1983,6 +2003,7 @@ export interface RawSourceMapDevToolPluginOptions {
test?: string | RegExp | (string | RegExp)[]
include?: string | RegExp | (string | RegExp)[]
exclude?: string | RegExp | (string | RegExp)[]
debugIds?: boolean
}

export interface RawSplitChunkSizes {
Expand Down
1 change: 1 addition & 0 deletions crates/rspack/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ enum-tag = { workspace = true }
indexmap = { workspace = true, features = ["rayon"] }
regex = { workspace = true }
rspack_core = { workspace = true }
rspack_fs = { workspace = true }
rspack_hash = { workspace = true }
rspack_ids = { workspace = true }
rspack_paths = { workspace = true }
Expand Down
Loading

0 comments on commit 0c305ad

Please sign in to comment.