Skip to content

Commit 66ce483

Browse files
Merge pull request #703 from denoland/main
Create a new pull request by comparing changes across two branches
2 parents 3c2df91 + 0060e74 commit 66ce483

File tree

196 files changed

+4524
-2457
lines changed

Some content is hidden

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

196 files changed

+4524
-2457
lines changed

.dprint.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
],
7070
"plugins": [
7171
"https://plugins.dprint.dev/typescript-0.93.0.wasm",
72-
"https://plugins.dprint.dev/json-0.19.3.wasm",
72+
"https://plugins.dprint.dev/json-0.19.4.wasm",
7373
"https://plugins.dprint.dev/markdown-0.17.8.wasm",
7474
"https://plugins.dprint.dev/toml-0.6.3.wasm",
7575
"https://plugins.dprint.dev/exec-0.5.0.json@8d9972eee71fa1590e04873540421f3eda7674d0f1aae3d7c788615e7b7413d0",

.github/workflows/cargo_publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- uses: dsherret/rust-toolchain-file@v1
3434

3535
- name: Install deno
36-
uses: denoland/setup-deno@v1
36+
uses: denoland/setup-deno@v2
3737
with:
3838
deno-version: v1.x
3939

.github/workflows/ci.generate.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ const installNodeStep = {
193193
};
194194
const installDenoStep = {
195195
name: "Install Deno",
196-
uses: "denoland/setup-deno@v1",
196+
uses: "denoland/setup-deno@v2",
197197
with: { "deno-version": "v1.x" },
198198
};
199199

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ jobs:
178178
if: '!(matrix.skip)'
179179
- if: '!(matrix.skip) && (matrix.job == ''lint'' || matrix.job == ''test'' || matrix.job == ''bench'')'
180180
name: Install Deno
181-
uses: denoland/setup-deno@v1
181+
uses: denoland/setup-deno@v2
182182
with:
183183
deno-version: v1.x
184184
- name: Install Python

.github/workflows/promote_to_release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
project_id: denoland
4141

4242
- name: Install deno
43-
uses: denoland/setup-deno@v1
43+
uses: denoland/setup-deno@v2
4444
with:
4545
deno-version: v1.x
4646

.github/workflows/start_release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
uses: actions/checkout@v4
3535

3636
- name: Install deno
37-
uses: denoland/setup-deno@v1
37+
uses: denoland/setup-deno@v2
3838
with:
3939
deno-version: v1.x
4040

.github/workflows/version_bump.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
- uses: dsherret/rust-toolchain-file@v1
4040

4141
- name: Install deno
42-
uses: denoland/setup-deno@v1
42+
uses: denoland/setup-deno@v2
4343
with:
4444
deno-version: v1.x
4545

.github/workflows/wpt_epoch.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
persist-credentials: false
3131

3232
- name: Setup Deno
33-
uses: denoland/setup-deno@v1
33+
uses: denoland/setup-deno@v2
3434
with:
3535
deno-version: ${{ matrix.deno-version }}
3636

Cargo.lock

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

Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ resolver = "2"
55
members = [
66
"bench_util",
77
"cli",
8-
"cli/napi/sym",
98
"ext/broadcast_channel",
109
"ext/cache",
1110
"ext/canvas",
@@ -19,6 +18,7 @@ members = [
1918
"ext/io",
2019
"ext/kv",
2120
"ext/napi",
21+
"ext/napi/sym",
2222
"ext/net",
2323
"ext/node",
2424
"ext/url",
@@ -55,9 +55,9 @@ deno_npm = "=0.25.4"
5555
deno_path_util = "=0.2.1"
5656
deno_permissions = { version = "0.33.0", path = "./runtime/permissions" }
5757
deno_runtime = { version = "0.182.0", path = "./runtime" }
58-
deno_semver = "=0.5.14"
58+
deno_semver = "=0.5.16"
5959
deno_terminal = "0.2.0"
60-
napi_sym = { version = "0.103.0", path = "./cli/napi/sym" }
60+
napi_sym = { version = "0.103.0", path = "./ext/napi/sym" }
6161
test_util = { package = "test_server", path = "./tests/util/server" }
6262

6363
denokv_proto = "0.8.1"
@@ -137,7 +137,7 @@ hyper-util = { version = "=0.1.7", features = ["tokio", "client", "client-legacy
137137
hyper_v014 = { package = "hyper", version = "0.14.26", features = ["runtime", "http1"] }
138138
indexmap = { version = "2", features = ["serde"] }
139139
ipnet = "2.3"
140-
jsonc-parser = { version = "=0.23.0", features = ["serde"] }
140+
jsonc-parser = { version = "=0.26.1", features = ["serde"] }
141141
lazy-regex = "3"
142142
libc = "0.2.126"
143143
libz-sys = { version = "1.1.20", default-features = false }
@@ -187,7 +187,7 @@ tar = "=0.4.40"
187187
tempfile = "3.4.0"
188188
termcolor = "1.1.3"
189189
thiserror = "1.0.61"
190-
tokio = { version = "=1.36.0", features = ["full"] }
190+
tokio = { version = "1.36.0", features = ["full"] }
191191
tokio-metrics = { version = "0.3.0", features = ["rt"] }
192192
tokio-rustls = { version = "0.26.0", default-features = false, features = ["ring", "tls12"] }
193193
tokio-socks = "0.5.1"

0 commit comments

Comments
 (0)