Skip to content

Commit 968ecf0

Browse files
authored
Merge branch 'main' into feat/manifest-builtin
2 parents 0f706f8 + a0be7ea commit 968ecf0

File tree

217 files changed

+2641
-2555
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

217 files changed

+2641
-2555
lines changed

.github/renovate.json5

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
extends: [":dependencyDashboard", "helpers:pinGitHubActionDigests"],
55
schedule: ["before 8am on wednesday"],
66
enabledManagers: ["github-actions", "cargo", "npm"],
7-
lockFileMaintenance: {
8-
enabled: true
9-
},
107
ignorePaths: [
118
"**/fixtures/**",
129
"**/no-override-loaded/**",

.prettierignore

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,25 @@
11
# Ignore generated
22
dist/
33
compiled/
4+
target/
45

56
# Ignore lock files
67
pnpm-lock.yaml
78

8-
# Ignore example fixtures
9+
# Ignore unknown format
10+
LICENSE
11+
gitignore
12+
.gitignore
13+
*.svg
914

1015
# Ignore test related
11-
16+
tests/**/*
1217
packages/**/etc/**/*
1318
packages/rspack-test-tools/template/**/*
1419
packages/rspack-test-tools/src/helper/legacy/**/*
15-
16-
crates/**/*
17-
target/**/*
18-
tests/**/*
19-
2020
!tests/**/test.filter.js
21+
22+
# Crates
23+
crates/**
24+
!crates/**/
25+
!crates/**/*.md

.prettierrc.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
module.exports = {
2-
printWidth: 80,
32
useTabs: true,
43
tabWidth: 2,
54
trailingComma: "none",
@@ -21,7 +20,6 @@ module.exports = {
2120
{
2221
files: "website/**",
2322
options: {
24-
printWidth: 80,
2523
singleQuote: true,
2624
trailingComma: "all",
2725
useTabs: false

.vscode/launch.json

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,39 +27,32 @@
2727
"${input:pickPattern}"
2828
],
2929
"cwd": "${workspaceFolder}/packages/rspack-test-tools",
30-
"initCommands": [
31-
"settings set target.process.follow-fork-mode child"
32-
]
30+
"initCommands": ["settings set target.process.follow-fork-mode child"]
3331
},
3432
{
3533
"name": "Attach JavaScript",
3634
"processId": "${command:PickProcess}",
3735
"request": "attach",
38-
"skipFiles": [
39-
"<node_internals>/**"
40-
],
36+
"skipFiles": ["<node_internals>/**"],
4137
"type": "node"
4238
},
4339
{
4440
"type": "lldb",
4541
"request": "attach",
4642
"name": "Attach Rust",
4743
"pid": "${command:pickMyProcess}"
48-
},
44+
}
4945
],
5046
"inputs": [
5147
{
5248
"id": "pickTest",
5349
"type": "command",
54-
"command": "extension.pickTest",
50+
"command": "extension.pickTest"
5551
},
5652
{
5753
"id": "rspackCommand",
5854
"type": "pickString",
59-
"options": [
60-
"build",
61-
"dev"
62-
],
55+
"options": ["build", "dev"],
6356
"description": "choose build or dev mode",
6457
"default": "dev"
6558
},
@@ -85,4 +78,4 @@
8578
"default": ""
8679
}
8780
]
88-
}
81+
}

AGENTS.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ This is a **monorepo** containing both Rust crates and JavaScript packages:
1515
- **Bindings**: Node.js bindings through NAPI
1616
- **Utilities**: Support crates for paths, collections, macros, etc.
1717

18-
### NPM packages (`packages/`)
18+
### NPM packages (`packages/`)
1919

2020
- **CLI Tools**: Command-line interface and tooling
2121
- **API Wrappers**: JavaScript APIs wrapping Rust core
@@ -39,7 +39,7 @@ pnpm run setup
3939
# Build Rust bindings (development)
4040
pnpm run build:binding:dev
4141

42-
# Build JavaScript packages
42+
# Build JavaScript packages
4343
pnpm run build:js
4444

4545
# Full development build

Cargo.lock

Lines changed: 11 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ regex-syntax = { version = "0.8.5", default-features = false, features =
8383
regress = { version = "0.10.4", default-features = false, features = ["pattern"] }
8484
ropey = { version = "1.6.1", default-features = false }
8585
rspack_resolver = { features = ["package_json_raw_json_api", "yarn_pnp"], version = "0.6.4", default-features = false }
86-
rspack_sources = { version = "=0.4.13", default-features = false }
86+
rspack_sources = { version = "0.4.14", default-features = false }
8787
rustc-hash = { version = "2.1.0", default-features = false }
8888
ryu-js = { version = "1.0.2", default-features = false }
8989
scopeguard = { version = "1.2.0", default-features = false }
@@ -99,6 +99,7 @@ sugar_path = { version = "1.2.0", default-features = false, features =
9999
syn = { version = "2.0.95", default-features = false }
100100
termcolor = { version = "1.4.1", default-features = false }
101101
textwrap = { version = "0.16.1", default-features = false }
102+
thread_local = { version = "1.1.9", default-features = false }
102103
tokio = { version = "1.42.0", default-features = false, features = ["rt", "rt-multi-thread"] }
103104
toml = { version = "0.8.19", default-features = false, features = ["parse", "display"] }
104105
tracing = { version = "0.1.41", default-features = false, features = ["max_level_trace", "release_max_level_trace"] }

SECURITY.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ Report a security vulnerability in Rspack via web-infra-security@bytedance.com.
66

77
Normally, your report will be acknowledged within 24 hours, and you'll receive a more detailed response to your report within 5 days indicating the next steps in handling your submission.
88

9-
After the initial reply to your report, the security team will endeavor to keep you informed of the progress being made towards a fix and full announcement, and may ask for additional information or guidance surrounding the reported issue.
9+
After the initial reply to your report, the security team will endeavor to keep you informed of the progress being made towards a fix and full announcement, and may ask for additional information or guidance surrounding the reported issue.

crates/node_binding/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
# @rspack/binding
66

77
Private node binding crate for rspack.
8-
> Rspack's internal package, don't use it directly in your project, This package does *NOT* follow [semantic versioning](https://semver.org/).
8+
9+
> Rspack's internal package, don't use it directly in your project, This package does _NOT_ follow [semantic versioning](https://semver.org/).
910
1011
## Documentation
1112

crates/node_binding/napi-binding.d.ts

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -708,11 +708,11 @@ export interface JsBeforeEmitData {
708708
}
709709

710710
export interface JsBuildMeta {
711-
strictEsmModule: boolean
712-
hasTopLevelAwait: boolean
713-
esm: boolean
714-
exportsType: 'unset' | 'default' | 'namespace' | 'flagged' | 'dynamic'
715-
defaultObject: 'false' | 'redirect' | JsBuildMetaDefaultObjectRedirectWarn
711+
strictEsmModule?: boolean
712+
hasTopLevelAwait?: boolean
713+
esm?: boolean
714+
exportsType?: undefined | 'unset' | 'default' | 'namespace' | 'flagged' | 'dynamic'
715+
defaultObject?: undefined | 'false' | 'redirect' | JsBuildMetaDefaultObjectRedirectWarn
716716
sideEffectFree?: boolean
717717
exportsFinalName?: Array<[string, string]> | undefined
718718
}
@@ -2764,12 +2764,6 @@ export interface RawRslibPluginOptions {
27642764
* @default `false`
27652765
*/
27662766
interceptApiPlugin?: boolean
2767-
/**
2768-
* Use the compact runtime for dynamic import from `modern-module`, commonly used in CommonJS output.
2769-
* This field should not be set to `true` when using `modern-module` with ESM output, as it is already in use.
2770-
* @default `false`
2771-
*/
2772-
compactExternalModuleDynamicImport?: boolean
27732767
/**
27742768
* Add shims for javascript/esm modules
27752769
* @default `false`

0 commit comments

Comments
 (0)