Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/rollup/rollup into sync-7…
Browse files Browse the repository at this point in the history
…a8ac460
  • Loading branch information
docschina-bot committed Dec 13, 2024
2 parents 07c7483 + 7a8ac46 commit 73a50ee
Show file tree
Hide file tree
Showing 8 changed files with 643 additions and 630 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-and-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ jobs:
key: ${{ matrix.settings.target }}-cargo-${{ hashFiles('rust/Cargo.lock') }}
restore-keys: ${{ matrix.settings.target }}-cargo
- name: Build
uses: cross-platform-actions/action@v0.25.0
uses: cross-platform-actions/action@v0.26.0
with:
operating_system: ${{ matrix.settings.name }}
architecture: ${{ matrix.settings.architecture }}
Expand Down
2 changes: 1 addition & 1 deletion docs/command-line-interface/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ export default {
// 更多信息参见:
// https://nodejs.org/docs/latest-v16.x/api/esm.html#importmetaurl
const packageJson = JSON.parse(
readFileSync(new URL('./package.json', import.meta.url))
readFileSync(new URL('./package.json', import.meta.url), 'utf-8')
);

// ...
Expand Down
1,184 changes: 599 additions & 585 deletions package-lock.json

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,10 @@
"@codemirror/lang-javascript": "^6.2.2",
"@codemirror/language": "^6.10.6",
"@codemirror/search": "^6.5.8",
"@codemirror/state": "^6.4.1",
"@codemirror/view": "^6.35.0",
"@codemirror/state": "^6.5.0",
"@codemirror/view": "^6.35.3",
"@eslint/js": "^9.16.0",
"@inquirer/prompts": "^7.1.0",
"@inquirer/prompts": "^7.2.0",
"@jridgewell/sourcemap-codec": "^1.5.0",
"@mermaid-js/mermaid-cli": "^11.4.2",
"@napi-rs/cli": "^2.18.4",
Expand All @@ -138,7 +138,7 @@
"@rollup/plugin-terser": "^0.4.4",
"@rollup/plugin-typescript": "^12.1.1",
"@rollup/pluginutils": "^5.1.3",
"@shikijs/vitepress-twoslash": "^1.24.0",
"@shikijs/vitepress-twoslash": "^1.24.1",
"@types/mocha": "^10.0.10",
"@types/node": "^18.19.67",
"@types/semver": "^7.5.8",
Expand Down Expand Up @@ -176,13 +176,13 @@
"nodemon": "^3.1.7",
"npm-audit-resolver": "^3.0.0-RC.0",
"nyc": "^17.1.0",
"pinia": "^2.2.8",
"prettier": "^3.4.1",
"pinia": "^2.3.0",
"prettier": "^3.4.2",
"prettier-plugin-organize-imports": "^4.1.0",
"pretty-bytes": "^6.1.1",
"pretty-ms": "^9.2.0",
"requirejs": "^2.3.7",
"rollup": "^4.28.0",
"rollup": "^4.28.1",
"rollup-plugin-license": "^3.5.3",
"rollup-plugin-string": "^3.0.0",
"semver": "^7.6.3",
Expand All @@ -191,19 +191,19 @@
"source-map": "^0.7.4",
"source-map-support": "^0.5.21",
"systemjs": "^6.15.1",
"terser": "^5.36.0",
"terser": "^5.37.0",
"tslib": "^2.8.1",
"typescript": "^5.7.2",
"typescript-eslint": "^8.17.0",
"vite": "^6.0.2",
"typescript-eslint": "^8.18.0",
"vite": "^6.0.3",
"vitepress": "^1.5.0",
"vue": "^3.5.13",
"vue-tsc": "^2.1.10",
"wasm-pack": "^0.13.1",
"yargs-parser": "^21.1.1"
},
"overrides": {
"axios": "^1.7.8",
"axios": "^1.7.9",
"semver": "^7.6.3",
"readable-stream": "npm:@built-in/readable-stream@1"
},
Expand Down
55 changes: 27 additions & 28 deletions rust/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 rust/bindings_napi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ crate-type = ["cdylib"]
[dependencies]
# Default enable napi4 feature, see https://nodejs.org/api/n-api.html#node-api-version-matrix
napi = { version = "2.16.13", default-features = false, features = ["napi4"] }
napi-derive = "2.16.12"
napi-derive = "2.16.13"
parse_ast = { path = "../parse_ast" }
xxhash = { path = "../xxhash" }

Expand Down
4 changes: 2 additions & 2 deletions rust/bindings_wasm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ version = "0.0.0"
edition = "2021"

[dependencies]
wasm-bindgen = "0.2.97"
wasm-bindgen = "0.2.99"
parse_ast = { path = "../parse_ast" }
xxhash = { path = "../xxhash" }
js-sys = "0.3.74"
js-sys = "0.3.76"
getrandom = { version = "0.2.15", features = ["js"] }

[lib]
Expand Down
2 changes: 1 addition & 1 deletion rust/parse_ast/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
anyhow = "1.0.93"
anyhow = "1.0.94"
swc_atoms = "3.0.0"
swc_compiler_base = "7.0.0"
swc_common = { version = "5.0.0", features = ["ahash", "parking_lot"] }
Expand Down

0 comments on commit 73a50ee

Please sign in to comment.