dir-2.5.0 \ + wasi-0.11.0+wasi-snapshot-preview1 \ + wasi-0.14.2+wasi-0.2.4 \ + wasi-common-35.0.0 \ + wasm-bindgen-0.2.100 \ + wasm-bindgen-backend-0.2.100 \ + wasm-bindgen-macro-0.2.100 \ + wasm-bindgen-macro-support-0.2.100 \ + wasm-bindgen-shared-0.2.100 \ + wasm-encoder-0.235.0 \ + wasmparser-0.222.0 \ + wasmparser-0.235.0 \ + wasmprinter-0.235.0 \ + wasmtime-35.0.0 \ + wasmtime-environ-35.0.0 \ + wasmtime-internal-asm-macros-35.0.0 \ + wasmtime-internal-cranelift-35.0.0 \ + wasmtime-internal-fiber-35.0.0 \ + wasmtime-internal-jit-icache-coherence-35.0.0 \ + wasmtime-internal-math-35.0.0 \ + wasmtime-internal-slab-35.0.0 \ + wasmtime-internal-unwinder-35.0.0 \ + wasmtime-internal-versioned-export-macros-35.0.0 \ + wasmtime-internal-winch-35.0.0 \ + wast-35.0.2 \ + wayland-backend-0.3.15 \ + wayland-client-0.31.14 \ wayland-clipboard-listener-0.3.1 \ - wayland-protocols-0.32.11 \ - wayland-protocols-wlr-0.3.11 \ - wayland-scanner-0.31.9 \ - wayland-sys-0.31.10 \ + wayland-protocols-0.32.12 \ + wayland-protocols-wlr-0.3.12 \ + wayland-scanner-0.31.10 \ + wayland-sys-0.31.11 \ + web-time-1.1.0 \ weezl-0.1.12 \ + wiggle-35.0.0 \ + wiggle-generate-35.0.0 \ + wiggle-macro-35.0.0 \ + winapi-0.3.9 \ + winapi-i686-pc-windows-gnu-0.4.0 \ + winapi-util-0.1.9 \ + winapi-x86_64-pc-windows-gnu-0.4.0 \ + winch-codegen-35.0.0 \ windows-0.59.0 \ + windows-0.61.3 \ + windows-collections-0.2.0 \ + windows-core-0.52.0 \ windows-core-0.59.0 \ + windows-core-0.61.2 \ + windows-future-0.2.1 \ windows-implement-0.59.0 \ + windows-implement-0.60.2 \ windows-interface-0.59.3 \ windows-link-0.1.3 \ windows-link-0.2.1 \ + windows-numerics-0.2.0 \ windows-result-0.3.4 \ windows-strings-0.3.1 \ + windows-strings-0.4.2 \ + windows-sys-0.52.0 \ + windows-sys-0.59.0 \ + windows-sys-0.60.2 \ windows-sys-0.61.2 \ + windows-targets-0.52.6 \ + windows-targets-0.53.2 \ windows-targets-0.53.5 \ + windows-threading-0.1.0 \ windows-win-3.0.0 \ + windows_aarch64_gnullvm-0.52.6 \ + windows_aarch64_gnullvm-0.53.0 \ windows_aarch64_gnullvm-0.53.1 \ + windows_aarch64_msvc-0.52.6 \ + windows_aarch64_msvc-0.53.0 \ windows_aarch64_msvc-0.53.1 \ + windows_i686_gnu-0.52.6 \ + windows_i686_gnu-0.53.0 \ windows_i686_gnu-0.53.1 \ + windows_i686_gnullvm-0.52.6 \ + windows_i686_gnullvm-0.53.0 \ windows_i686_gnullvm-0.53.1 \ + windows_i686_msvc-0.52.6 \ + windows_i686_msvc-0.53.0 \ windows_i686_msvc-0.53.1 \ + windows_x86_64_gnu-0.52.6 \ + windows_x86_64_gnu-0.53.0 \ windows_x86_64_gnu-0.53.1 \ + windows_x86_64_gnullvm-0.52.6 \ + windows_x86_64_gnullvm-0.53.0 \ windows_x86_64_gnullvm-0.53.1 \ + windows_x86_64_msvc-0.52.6 \ + windows_x86_64_msvc-0.53.0 \ windows_x86_64_msvc-0.53.1 \ + winnow-0.7.14 \ + winx-0.36.4 \ + wit-bindgen-rt-0.39.0 \ + witx-0.9.1 \ + write16-1.0.0 \ + writeable-0.5.5 \ + writeable-0.6.2 \ + wyz-0.5.1 \ x11rb-0.13.2 \ x11rb-protocol-0.13.2 \ + xxhash-rust-0.8.15 \ + yansi-1.0.1 \ + yoke-0.7.5 \ + yoke-0.8.1 \ + yoke-derive-0.7.5 \ + yoke-derive-0.8.1 \ + zerocopy-0.7.35 \ + zerocopy-0.8.25 \ zerocopy-0.8.48 \ + zerocopy-derive-0.7.35 \ + zerocopy-derive-0.8.25 \ zerocopy-derive-0.8.48 \ + zerofrom-0.1.5 \ + zerofrom-derive-0.1.5 \ + zerotrie-0.2.3 \ + zerovec-0.10.4 \ + zerovec-0.11.5 \ + zerovec-derive-0.10.3 \ + zerovec-derive-0.11.2 \ + zlib-rs-0.5.2 \ + zmij-1.0.5 \ zune-core-0.5.1 \ zune-jpeg-0.5.15 diff --git a/editors/vscode/Makefile.reh b/editors/vscode/Makefile.reh index 13c39c3e684a..59c2294c0ab1 100644 --- a/editors/vscode/Makefile.reh +++ b/editors/vscode/Makefile.reh @@ -38,10 +38,15 @@ USES= cargo electron:env gssapi:mit localbase:ldflags \ USE_GITHUB= yes GH_ACCOUNT= microsoft -GH_TUPLE= Teddy-Zhu:node-clipboard-rs:v0.0.5:node_clipboard_rs/node-clipboard-rs - -CARGO_CARGOTOML=${WRKSRC}/node-clipboard-rs/Cargo.toml -CARGO_CARGOLOCK=${WRKSRC}/node-clipboard-rs/Cargo.lock +GH_TUPLE= Teddy-Zhu:node-clipboard-rs:v0.0.5:node_clipboard_rs/node-clipboard-rs \ + web-infra-dev:rspack:v1.7.11:rspack/rspack + +CARGO_CARGOTOML_CLIPBOARD= ${WRKSRC}/node-clipboard-rs/Cargo.toml +CARGO_CARGOLOCK_CLIPBOARD= ${WRKSRC}/node-clipboard-rs/Cargo.lock +CARGO_CARGOTOML_RSPACK= ${WRKSRC}/rspack/Cargo.toml +CARGO_CARGOLOCK_RSPACK= ${WRKSRC}/rspack/Cargo.lock +CARGO_CARGOTOML= ${CARGO_CARGOTOML_CLIPBOARD} +CARGO_CARGOLOCK= ${CARGO_CARGOLOCK_CLIPBOARD} CARGO_BUILD= no CARGO_INSTALL= no CARGO_TEST= no @@ -116,11 +121,18 @@ pre-build: done # build native node module for @teddyzhu/clipboard @${CARGO_CARGO_RUN} build \ - --manifest-path ${CARGO_CARGOTOML} \ + --manifest-path ${CARGO_CARGOTOML_CLIPBOARD} \ --verbose --verbose \ ${CARGO_BUILD_ARGS} ${CP} ${CARGO_TARGET_DIR}/*/libclipboard.so \ ${WRKSRC}/remote/node_modules/@github/copilot/clipboard/node_modules/@teddyzhu/clipboard/clipboard.freebsd-${NODEJS_ARCH}.node + # # build native node module for @rspack/binding + # @${CARGO_CARGO_RUN} build \ + # --manifest-path ${CARGO_CARGOTOML_RSPACK} \ + # --verbose --verbose \ + # ${CARGO_BUILD_ARGS} + # ${CP} ${CARGO_TARGET_DIR}/*/librspack.so \ + # ${WRKSRC}/build/rspack/node_modules/@rspack/binding/rspack.freebsd-${ELECTRON_ARCH}.node # copy rg binary file to @vscode/ripgrep node module directory @${MKDIR} ${WRKSRC}/build/node_modules/@vscode/ripgrep/bin \ ${WRKSRC}/remote/node_modules/@vscode/ripgrep/bin @@ -147,6 +159,11 @@ do-build: @${FIND} ${WRKSRC} -type f \( -name '*.bak' -o -name '*.orig' -o -name '*~' \) -delete # build vscode remote extension host cd ${WRKSRC} && \ + ${SETENV} ${MAKE_ENV} \ + npm_config_runtime=node \ + npm_config_target=${NODEJS_PORTVERSION} \ + npm_config_nodedir=${LOCALBASE} \ + npm --userconfig=${WRKSRC}/remote/.npmrc run compile && \ ${SETENV} ${MAKE_ENV} \ npm_config_runtime=node \ npm_config_target=${NODEJS_PORTVERSION} \ diff --git a/editors/vscode/Makefile.version b/editors/vscode/Makefile.version index 93d28f28705e..93021dd8cc5e 100644 --- a/editors/vscode/Makefile.version +++ b/editors/vscode/Makefile.version @@ -1,2 +1,2 @@ -VSCODE_VERSION= 1.113.0 +VSCODE_VERSION= 1.115.0 SOURCE_COMMIT_HASH= cfbea10c5ffb233ea9177d34726e6056e89913dc diff --git a/editors/vscode/distinfo b/editors/vscode/distinfo index 55fe58fecc8c..aba73849e638 100644 --- a/editors/vscode/distinfo +++ b/editors/vscode/distinfo @@ -1,112 +1,702 @@ -TIMESTAMP = 1774875897 -SHA256 (vscode/vscode-node-modules-1.113.0.tar.gz) = d1aa9970eaebbe4fc55ac1dd71dbd955dab67830720c874ce0bcd6ff98ae1393 *** 2381 LINES SKIPPED ***