Skip to content

Commit 9b9c099

Browse files
committed
refactor: rename packages
1 parent ebd1357 commit 9b9c099

13 files changed

Lines changed: 55 additions & 48 deletions

File tree

.github/workflows/ci.yml

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ env:
1111
permissions: {}
1212

1313
jobs:
14-
test:
14+
test: # {{{
1515
name: ${{ matrix.name }}
1616
runs-on: ${{ matrix.os }}
1717
strategy:
@@ -222,8 +222,9 @@ jobs:
222222
name: proxytester-${{ matrix.target }}
223223
path: dist/proxytester-${{ matrix.target }}/
224224
if-no-files-found: error
225-
226-
os-config-tests:
225+
# }}}
226+
227+
os-config-tests: # {{{
227228
name: os config round-trip (${{ matrix.name }})
228229
runs-on: ${{ matrix.os }}
229230
strategy:
@@ -281,8 +282,9 @@ jobs:
281282
cargo test --features "$features" os_roundtrip -- --nocapture
282283
fi
283284
shell: bash
285+
# }}}
284286

285-
pac-bench:
287+
pac-bench: # {{{
286288
name: PAC benchmark (${{ matrix.name }})
287289
runs-on: ${{ matrix.os }}
288290
strategy:
@@ -469,8 +471,9 @@ jobs:
469471
- name: Test all embedded PAC backends
470472
run: ${{ matrix.use_cross && 'cross' || 'cargo' }} test --release --lib --tests ${{ matrix.target && format('--target {0}', matrix.target) || '' }} --no-default-features --features "tokio ${{ matrix.features }}"
471473
shell: bash
474+
# }}}
472475

473-
pac-backend-variants:
476+
pac-backend-variants: # {{{
474477
name: PAC backend variant (${{ matrix.name }})
475478
runs-on: ${{ matrix.os }}
476479
strategy:
@@ -523,8 +526,9 @@ jobs:
523526
- name: Build and test
524527
run: cargo test ${{ matrix.features }}
525528
shell: bash
529+
# }}}
526530

527-
no-backend-is-a-compile-error:
531+
no-backend-is-a-compile-error: # {{{
528532
name: no PAC backend is a compile error (non-Windows)
529533
runs-on: ubuntu-latest
530534
steps:
@@ -548,8 +552,9 @@ jobs:
548552
fi
549553
echo "OK: building with no PAC backend fails as expected"
550554
shell: bash
555+
# }}}
551556

552-
electron-pac-bench:
557+
electron-pac-bench: # {{{
553558
name: Electron (Chromium) PAC baseline (${{ matrix.name }})
554559
runs-on: ${{ matrix.os }}
555560
strategy:
@@ -598,8 +603,9 @@ jobs:
598603
fi
599604
working-directory: bench/electron
600605
shell: bash
606+
# }}}
601607

602-
lint:
608+
lint: # {{{
603609
name: rustfmt + clippy + docs
604610
runs-on: macos-latest
605611
steps:
@@ -628,8 +634,9 @@ jobs:
628634
RUSTDOCFLAGS: -D warnings
629635
- run: npm run test:platform-selection
630636
- run: npm run verify:packages
637+
# }}}
631638

632-
licenses:
639+
licenses: # {{{
633640
name: licenses (deny + notices)
634641
runs-on: ubuntu-latest
635642
steps:
@@ -667,4 +674,4 @@ jobs:
667674
echo "::error::npm/ThirdPartyNotices.txt is out of date. Run: cargo about generate --manifest-path npm/native/Cargo.toml --config about.toml --locked --fail --output-file npm/ThirdPartyNotices.txt npm/about.hbs"
668675
exit 1
669676
fi
670-
677+
# }}}

index.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@
33
const { getPlatformPackage } = require('./platform');
44

55
const packages = {
6-
'darwin-arm64': '@vscode/os-proxy-resolver-darwin-arm64',
7-
'darwin-x64': '@vscode/os-proxy-resolver-darwin-x64',
8-
'linux-arm-glibc': '@vscode/os-proxy-resolver-linux-arm-gnueabihf',
9-
'linux-arm64-glibc': '@vscode/os-proxy-resolver-linux-arm64-gnu',
10-
'linux-arm64-musl': '@vscode/os-proxy-resolver-linux-arm64-musl',
11-
'linux-x64-glibc': '@vscode/os-proxy-resolver-linux-x64-gnu',
12-
'linux-x64-musl': '@vscode/os-proxy-resolver-linux-x64-musl',
13-
'win32-arm64': '@vscode/os-proxy-resolver-win32-arm64-msvc',
14-
'win32-x64': '@vscode/os-proxy-resolver-win32-x64-msvc',
6+
'darwin-arm64': '@vscodium/os-proxy-resolver-darwin-arm64',
7+
'darwin-x64': '@vscodium/os-proxy-resolver-darwin-x64',
8+
'linux-arm-glibc': '@vscodium/os-proxy-resolver-linux-arm-gnueabihf',
9+
'linux-arm64-glibc': '@vscodium/os-proxy-resolver-linux-arm64-gnu',
10+
'linux-arm64-musl': '@vscodium/os-proxy-resolver-linux-arm64-musl',
11+
'linux-x64-glibc': '@vscodium/os-proxy-resolver-linux-x64-gnu',
12+
'linux-x64-musl': '@vscodium/os-proxy-resolver-linux-x64-musl',
13+
'win32-arm64': '@vscodium/os-proxy-resolver-win32-arm64-msvc',
14+
'win32-x64': '@vscodium/os-proxy-resolver-win32-x64-msvc',
1515
};
1616

1717
const platform = getPlatformPackage();
1818
const packageName = packages[platform];
1919

2020
if (!packageName) {
21-
throw new Error(`@vscode/os-proxy-resolver does not support ${platform}`);
21+
throw new Error(`@vscodium/os-proxy-resolver does not support ${platform}`);
2222
}
2323

2424
try {

npm/platforms/darwin-arm64/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"name": "@vscode/os-proxy-resolver-darwin-arm64",
2+
"name": "@vscodium/os-proxy-resolver-darwin-arm64",
33
"version": "0.4.0",
4-
"description": "Native binding for @vscode/os-proxy-resolver on macOS arm64",
4+
"description": "Native binding for @vscodium/os-proxy-resolver on macOS arm64",
55
"main": "os_proxy_resolver.node",
66
"files": ["os_proxy_resolver.node", "LICENSE.txt", "ThirdPartyNotices.txt"],
77
"os": ["darwin"],

npm/platforms/darwin-x64/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"name": "@vscode/os-proxy-resolver-darwin-x64",
2+
"name": "@vscodium/os-proxy-resolver-darwin-x64",
33
"version": "0.4.0",
4-
"description": "Native binding for @vscode/os-proxy-resolver on macOS x64",
4+
"description": "Native binding for @vscodium/os-proxy-resolver on macOS x64",
55
"main": "os_proxy_resolver.node",
66
"files": ["os_proxy_resolver.node", "LICENSE.txt", "ThirdPartyNotices.txt"],
77
"os": ["darwin"],

npm/platforms/linux-arm-gnueabihf/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"name": "@vscode/os-proxy-resolver-linux-arm-gnueabihf",
2+
"name": "@vscodium/os-proxy-resolver-linux-arm-gnueabihf",
33
"version": "0.4.0",
4-
"description": "Native binding for @vscode/os-proxy-resolver on Linux armhf",
4+
"description": "Native binding for @vscodium/os-proxy-resolver on Linux armhf",
55
"main": "os_proxy_resolver.node",
66
"files": ["os_proxy_resolver.node", "LICENSE.txt", "ThirdPartyNotices.txt"],
77
"os": ["linux"],

npm/platforms/linux-arm64-gnu/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"name": "@vscode/os-proxy-resolver-linux-arm64-gnu",
2+
"name": "@vscodium/os-proxy-resolver-linux-arm64-gnu",
33
"version": "0.4.0",
4-
"description": "Native binding for @vscode/os-proxy-resolver on Linux arm64",
4+
"description": "Native binding for @vscodium/os-proxy-resolver on Linux arm64",
55
"main": "os_proxy_resolver.node",
66
"files": ["os_proxy_resolver.node", "LICENSE.txt", "ThirdPartyNotices.txt"],
77
"os": ["linux"],

npm/platforms/linux-arm64-musl/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"name": "@vscode/os-proxy-resolver-linux-arm64-musl",
2+
"name": "@vscodium/os-proxy-resolver-linux-arm64-musl",
33
"version": "0.4.0",
4-
"description": "Native binding for @vscode/os-proxy-resolver on Linux arm64 (musl)",
4+
"description": "Native binding for @vscodium/os-proxy-resolver on Linux arm64 (musl)",
55
"main": "os_proxy_resolver.node",
66
"files": ["os_proxy_resolver.node", "LICENSE.txt", "ThirdPartyNotices.txt"],
77
"os": ["linux"],

npm/platforms/linux-x64-gnu/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"name": "@vscode/os-proxy-resolver-linux-x64-gnu",
2+
"name": "@vscodium/os-proxy-resolver-linux-x64-gnu",
33
"version": "0.4.0",
4-
"description": "Native binding for @vscode/os-proxy-resolver on Linux x64",
4+
"description": "Native binding for @vscodium/os-proxy-resolver on Linux x64",
55
"main": "os_proxy_resolver.node",
66
"files": ["os_proxy_resolver.node", "LICENSE.txt", "ThirdPartyNotices.txt"],
77
"os": ["linux"],

npm/platforms/linux-x64-musl/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"name": "@vscode/os-proxy-resolver-linux-x64-musl",
2+
"name": "@vscodium/os-proxy-resolver-linux-x64-musl",
33
"version": "0.4.0",
4-
"description": "Native binding for @vscode/os-proxy-resolver on Linux x64 (musl)",
4+
"description": "Native binding for @vscodium/os-proxy-resolver on Linux x64 (musl)",
55
"main": "os_proxy_resolver.node",
66
"files": ["os_proxy_resolver.node", "LICENSE.txt", "ThirdPartyNotices.txt"],
77
"os": ["linux"],

npm/platforms/win32-arm64-msvc/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"name": "@vscode/os-proxy-resolver-win32-arm64-msvc",
2+
"name": "@vscodium/os-proxy-resolver-win32-arm64-msvc",
33
"version": "0.4.0",
4-
"description": "Native binding for @vscode/os-proxy-resolver on Windows arm64",
4+
"description": "Native binding for @vscodium/os-proxy-resolver on Windows arm64",
55
"main": "os_proxy_resolver.node",
66
"files": ["os_proxy_resolver.node", "LICENSE.txt", "ThirdPartyNotices.txt"],
77
"os": ["win32"],

0 commit comments

Comments
 (0)