diff options
Diffstat (limited to 'editors/vscode')
| -rw-r--r-- | editors/vscode/Makefile | 23 | ||||
| -rw-r--r-- | editors/vscode/distinfo | 14 | ||||
| -rw-r--r-- | editors/vscode/files/patch-package.json | 4 | ||||
| -rw-r--r-- | editors/vscode/files/patch-src_vs_workbench_services_actions_common_menusExtensionPoint.ts | 4 | ||||
| -rw-r--r-- | editors/vscode/files/patch-test_automation_src_electron.ts | 6 | ||||
| -rw-r--r-- | editors/vscode/pkg-plist | 19 |
6 files changed, 45 insertions, 25 deletions
diff --git a/editors/vscode/Makefile b/editors/vscode/Makefile index 5db491dfea63..d6ca6206a24b 100644 --- a/editors/vscode/Makefile +++ b/editors/vscode/Makefile @@ -1,6 +1,6 @@ PORTNAME= vscode -DISTVERSION= 1.105.1 -PORTREVISION= 4 +DISTVERSION= 1.106.2 +PORTREVISION= 1 CATEGORIES= editors MASTER_SITES= https://github.com/tagattie/FreeBSD-VSCode/releases/download/${DISTVERSION}/:node_modules DISTFILES= vscode-node-modules-${DISTVERSION}${EXTRACT_SUFX}:node_modules \ @@ -20,6 +20,7 @@ EXTRACT_DEPENDS=jq:textproc/jq \ node${NODEJS_VERSION}>0:www/node${NODEJS_VERSION} BUILD_DEPENDS= zip:archivers/zip \ electron${ELECTRON_VER_MAJOR}:devel/electron${ELECTRON_VER_MAJOR} \ + tsgo:lang/typescript-go \ jq:textproc/jq \ rg:textproc/ripgrep \ npm${NODEJS_SUFFIX}>0:www/npm${NODEJS_SUFFIX} @@ -68,7 +69,7 @@ USES= desktop-file-utils display:test gl gmake gnome gssapi:mit \ USE_GITHUB= yes GH_ACCOUNT= microsoft -SOURCE_COMMIT_HASH= 7d842fb85a0275a4a8e4d7e040d2625abbf7f084 +SOURCE_COMMIT_HASH= 1e3c50d64110be466c0b4a45222e81d2c9352888 BINARY_ALIAS= python=${PYTHON_CMD} @@ -212,12 +213,16 @@ do-build: # remove backup files so that they are not included in the package @${FIND} ${WRKSRC} -type f \( -name '*.orig' -o -name '*~' \) -delete # build and package vscode - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} npx tsc -p build/tsconfig.build.json - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ - npm_config_runtime=electron \ - npm_config_target=${ELECTRON_VER} \ - npm_config_nodedir=${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR}/node_headers \ - npm --userconfig=${WRKSRC}/.npmrc run gulp vscode-linux-${ELECTRON_ARCH}-min + cd ${WRKSRC}/build && \ + ${SETENV} ${MAKE_ENV} npm run prebuild-ts + cd ${WRKSRC} && \ + ${SETENV} ${MAKE_ENV} tsgo -p build/tsconfig.build.json + cd ${WRKSRC} && \ + ${SETENV} ${MAKE_ENV} \ + npm_config_runtime=electron \ + npm_config_target=${ELECTRON_VER} \ + npm_config_nodedir=${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR}/node_headers \ + npm --userconfig=${WRKSRC}/.npmrc run gulp vscode-linux-${ELECTRON_ARCH}-min # move marketplace extensions @${MV} ${WRKDIR}/builtInExtensions/* ${WRKDIR}/VSCode-linux-${ELECTRON_ARCH}/resources/app/extensions diff --git a/editors/vscode/distinfo b/editors/vscode/distinfo index 92c871b92577..eb08eaee77f7 100644 --- a/editors/vscode/distinfo +++ b/editors/vscode/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1760854152 -SHA256 (vscode/vscode-node-modules-1.105.1.tar.gz) = 67365390c54f88ca19459ed103391de2abd7af57e56c26d2bd980a9bc8a88671 -SIZE (vscode/vscode-node-modules-1.105.1.tar.gz) = 452657538 -SHA256 (vscode/vscode-marketplace-exts-1.105.1.tar.gz) = 2547f7d85c15ebb6ceb45acfe2e0206b3b0d7ff78d70b3e9b376b4689a60cafc -SIZE (vscode/vscode-marketplace-exts-1.105.1.tar.gz) = 1709001 -SHA256 (vscode/microsoft-vscode-1.105.1_GH0.tar.gz) = eb070c42959c35f59a46659dcb5570e34b11454441c2199a459f8b125e6f907d -SIZE (vscode/microsoft-vscode-1.105.1_GH0.tar.gz) = 23708504 +TIMESTAMP = 1763617404 +SHA256 (vscode/vscode-node-modules-1.106.2.tar.gz) = f89361574a3bc2e14c792201b54c737f16953cbdaa2d126c1d45ec53089c92ab +SIZE (vscode/vscode-node-modules-1.106.2.tar.gz) = 456936788 +SHA256 (vscode/vscode-marketplace-exts-1.106.2.tar.gz) = fd49db5e24afdb3af2022996ebfd1697276b1f9d7c369e089c711e77abd71ace +SIZE (vscode/vscode-marketplace-exts-1.106.2.tar.gz) = 1704787 +SHA256 (vscode/microsoft-vscode-1.106.2_GH0.tar.gz) = 41d6a9e20814ad9629943d5fa0157cfa9e7090fc4a62cd3be7fcc9be4b46f410 +SIZE (vscode/microsoft-vscode-1.106.2_GH0.tar.gz) = 24045425 diff --git a/editors/vscode/files/patch-package.json b/editors/vscode/files/patch-package.json index ba771c020e55..9edf7cfea439 100644 --- a/editors/vscode/files/patch-package.json +++ b/editors/vscode/files/patch-package.json @@ -2,9 +2,9 @@ https://github.com/eclipse/openvsx/issues/543 https://github.com/termux/termux-packages/issues/24739 https://github.com/termux/termux-packages/pull/24757 ---- package.json.orig 2025-10-08 13:50:39 UTC +--- package.json.orig 2025-11-11 14:25:32 UTC +++ package.json -@@ -107,6 +107,7 @@ +@@ -108,6 +108,7 @@ "native-is-elevated": "0.7.0", "native-keymap": "^3.3.5", "native-watchdog": "^1.4.1", diff --git a/editors/vscode/files/patch-src_vs_workbench_services_actions_common_menusExtensionPoint.ts b/editors/vscode/files/patch-src_vs_workbench_services_actions_common_menusExtensionPoint.ts index d31d73e874d3..c581f80ef624 100644 --- a/editors/vscode/files/patch-src_vs_workbench_services_actions_common_menusExtensionPoint.ts +++ b/editors/vscode/files/patch-src_vs_workbench_services_actions_common_menusExtensionPoint.ts @@ -1,6 +1,6 @@ ---- src/vs/workbench/services/actions/common/menusExtensionPoint.ts.orig 2025-08-06 20:09:28 UTC +--- src/vs/workbench/services/actions/common/menusExtensionPoint.ts.orig 2025-11-11 14:25:32 UTC +++ src/vs/workbench/services/actions/common/menusExtensionPoint.ts -@@ -1172,7 +1172,10 @@ class CommandsTableRenderer extends Disposable impleme +@@ -1191,7 +1191,10 @@ class CommandsTableRenderer extends Disposable impleme switch (platform) { case 'win32': key = rawKeyBinding.win; break; diff --git a/editors/vscode/files/patch-test_automation_src_electron.ts b/editors/vscode/files/patch-test_automation_src_electron.ts index 0c4d05bf22f0..d9e0cf8836e2 100644 --- a/editors/vscode/files/patch-test_automation_src_electron.ts +++ b/editors/vscode/files/patch-test_automation_src_electron.ts @@ -1,6 +1,6 @@ ---- test/automation/src/electron.ts.orig 2025-09-09 22:02:15 UTC +--- test/automation/src/electron.ts.orig 2025-11-11 14:25:32 UTC +++ test/automation/src/electron.ts -@@ -95,6 +95,7 @@ export function getDevElectronPath(): string { +@@ -96,6 +96,7 @@ export function getDevElectronPath(): string { case 'darwin': return join(buildPath, 'electron', `${product.nameLong}.app`, 'Contents', 'MacOS', 'Electron'); case 'linux': @@ -8,7 +8,7 @@ return join(buildPath, 'electron', `${product.applicationName}`); case 'win32': return join(buildPath, 'electron', `${product.nameShort}.exe`); -@@ -107,7 +108,8 @@ export function getBuildElectronPath(root: string): st +@@ -108,7 +109,8 @@ export function getBuildElectronPath(root: string): st switch (process.platform) { case 'darwin': return join(root, 'Contents', 'MacOS', 'Electron'); diff --git a/editors/vscode/pkg-plist b/editors/vscode/pkg-plist index 185463c34521..f43777a17063 100644 --- a/editors/vscode/pkg-plist +++ b/editors/vscode/pkg-plist @@ -142,6 +142,10 @@ share/applications/code-oss.desktop %%DATADIR%%/resources/app/extensions/docker/package.json %%DATADIR%%/resources/app/extensions/docker/package.nls.json %%DATADIR%%/resources/app/extensions/docker/syntaxes/docker.tmLanguage.json +%%DATADIR%%/resources/app/extensions/dotenv/language-configuration.json +%%DATADIR%%/resources/app/extensions/dotenv/package.json +%%DATADIR%%/resources/app/extensions/dotenv/package.nls.json +%%DATADIR%%/resources/app/extensions/dotenv/syntaxes/dotenv.tmLanguage.json %%DATADIR%%/resources/app/extensions/emmet/README.md %%DATADIR%%/resources/app/extensions/emmet/dist/node/emmetNodeMain.js %%DATADIR%%/resources/app/extensions/emmet/images/icon.png @@ -306,7 +310,7 @@ share/applications/code-oss.desktop %%DATADIR%%/resources/app/extensions/json-language-features/package.nls.json %%DATADIR%%/resources/app/extensions/json-language-features/server/.npmrc %%DATADIR%%/resources/app/extensions/json-language-features/server/dist/node/774.jsonServerMain.js -%%DATADIR%%/resources/app/extensions/json-language-features/server/dist/node/875.jsonServerMain.js +%%DATADIR%%/resources/app/extensions/json-language-features/server/dist/node/962.jsonServerMain.js %%DATADIR%%/resources/app/extensions/json-language-features/server/dist/node/jsonServerMain.js %%DATADIR%%/resources/app/extensions/json-language-features/server/package.json %%DATADIR%%/resources/app/extensions/json/language-configuration.json @@ -3480,6 +3484,9 @@ share/applications/code-oss.desktop %%DATADIR%%/resources/app/node_modules/@azure/msal-common/dist/error/NetworkError.d.ts.map %%DATADIR%%/resources/app/node_modules/@azure/msal-common/dist/error/NetworkError.mjs %%DATADIR%%/resources/app/node_modules/@azure/msal-common/dist/error/NetworkError.mjs.map +%%DATADIR%%/resources/app/node_modules/@azure/msal-common/dist/error/PlatformBrokerError.d.ts.map +%%DATADIR%%/resources/app/node_modules/@azure/msal-common/dist/error/PlatformBrokerError.mjs +%%DATADIR%%/resources/app/node_modules/@azure/msal-common/dist/error/PlatformBrokerError.mjs.map %%DATADIR%%/resources/app/node_modules/@azure/msal-common/dist/error/ServerError.d.ts.map %%DATADIR%%/resources/app/node_modules/@azure/msal-common/dist/error/ServerError.mjs %%DATADIR%%/resources/app/node_modules/@azure/msal-common/dist/error/ServerError.mjs.map @@ -3589,7 +3596,7 @@ share/applications/code-oss.desktop %%DATADIR%%/resources/app/node_modules/@azure/msal-common/dist/utils/UrlUtils.mjs.map %%DATADIR%%/resources/app/node_modules/@azure/msal-common/lib/index-browser.cjs %%DATADIR%%/resources/app/node_modules/@azure/msal-common/lib/index-browser.cjs.map -%%DATADIR%%/resources/app/node_modules/@azure/msal-common/lib/index-node-D8Iaiqq3.js +%%DATADIR%%/resources/app/node_modules/@azure/msal-common/lib/index-node-BF0Vz18w.js %%DATADIR%%/resources/app/node_modules/@azure/msal-common/lib/index-node.cjs %%DATADIR%%/resources/app/node_modules/@azure/msal-common/lib/index-node.cjs.map %%DATADIR%%/resources/app/node_modules/@azure/msal-common/lib/index.cjs @@ -3660,6 +3667,7 @@ share/applications/code-oss.desktop %%DATADIR%%/resources/app/node_modules/@azure/msal-common/lib/types/error/JoseHeaderError.d.ts.map %%DATADIR%%/resources/app/node_modules/@azure/msal-common/lib/types/error/JoseHeaderErrorCodes.d.ts.map %%DATADIR%%/resources/app/node_modules/@azure/msal-common/lib/types/error/NetworkError.d.ts.map +%%DATADIR%%/resources/app/node_modules/@azure/msal-common/lib/types/error/PlatformBrokerError.d.ts.map %%DATADIR%%/resources/app/node_modules/@azure/msal-common/lib/types/error/ServerError.d.ts.map %%DATADIR%%/resources/app/node_modules/@azure/msal-common/lib/types/exports-browser-only.d.ts.map %%DATADIR%%/resources/app/node_modules/@azure/msal-common/lib/types/exports-common.d.ts.map @@ -4291,6 +4299,7 @@ share/applications/code-oss.desktop %%DATADIR%%/resources/app/node_modules/@typespec/ts-http-runtime/dist/browser/retryStrategies/exponentialRetryStrategy.js %%DATADIR%%/resources/app/node_modules/@typespec/ts-http-runtime/dist/browser/retryStrategies/retryStrategy.js %%DATADIR%%/resources/app/node_modules/@typespec/ts-http-runtime/dist/browser/retryStrategies/throttlingRetryStrategy.js +%%DATADIR%%/resources/app/node_modules/@typespec/ts-http-runtime/dist/browser/util/arrayBuffer.js %%DATADIR%%/resources/app/node_modules/@typespec/ts-http-runtime/dist/browser/util/bytesEncoding-browser.mjs.map %%DATADIR%%/resources/app/node_modules/@typespec/ts-http-runtime/dist/browser/util/bytesEncoding.common.js %%DATADIR%%/resources/app/node_modules/@typespec/ts-http-runtime/dist/browser/util/bytesEncoding.js @@ -4375,6 +4384,7 @@ share/applications/code-oss.desktop %%DATADIR%%/resources/app/node_modules/@typespec/ts-http-runtime/dist/commonjs/retryStrategies/retryStrategy.js %%DATADIR%%/resources/app/node_modules/@typespec/ts-http-runtime/dist/commonjs/retryStrategies/throttlingRetryStrategy.js %%DATADIR%%/resources/app/node_modules/@typespec/ts-http-runtime/dist/commonjs/tsdoc-metadata.json +%%DATADIR%%/resources/app/node_modules/@typespec/ts-http-runtime/dist/commonjs/util/arrayBuffer.js %%DATADIR%%/resources/app/node_modules/@typespec/ts-http-runtime/dist/commonjs/util/bytesEncoding.common.js %%DATADIR%%/resources/app/node_modules/@typespec/ts-http-runtime/dist/commonjs/util/bytesEncoding.js %%DATADIR%%/resources/app/node_modules/@typespec/ts-http-runtime/dist/commonjs/util/checkEnvironment.js @@ -4452,6 +4462,7 @@ share/applications/code-oss.desktop %%DATADIR%%/resources/app/node_modules/@typespec/ts-http-runtime/dist/esm/retryStrategies/exponentialRetryStrategy.js %%DATADIR%%/resources/app/node_modules/@typespec/ts-http-runtime/dist/esm/retryStrategies/retryStrategy.js %%DATADIR%%/resources/app/node_modules/@typespec/ts-http-runtime/dist/esm/retryStrategies/throttlingRetryStrategy.js +%%DATADIR%%/resources/app/node_modules/@typespec/ts-http-runtime/dist/esm/util/arrayBuffer.js %%DATADIR%%/resources/app/node_modules/@typespec/ts-http-runtime/dist/esm/util/bytesEncoding.common.js %%DATADIR%%/resources/app/node_modules/@typespec/ts-http-runtime/dist/esm/util/bytesEncoding.js %%DATADIR%%/resources/app/node_modules/@typespec/ts-http-runtime/dist/esm/util/checkEnvironment.js @@ -4532,6 +4543,7 @@ share/applications/code-oss.desktop %%DATADIR%%/resources/app/node_modules/@typespec/ts-http-runtime/dist/react-native/retryStrategies/exponentialRetryStrategy.js %%DATADIR%%/resources/app/node_modules/@typespec/ts-http-runtime/dist/react-native/retryStrategies/retryStrategy.js %%DATADIR%%/resources/app/node_modules/@typespec/ts-http-runtime/dist/react-native/retryStrategies/throttlingRetryStrategy.js +%%DATADIR%%/resources/app/node_modules/@typespec/ts-http-runtime/dist/react-native/util/arrayBuffer.js %%DATADIR%%/resources/app/node_modules/@typespec/ts-http-runtime/dist/react-native/util/bytesEncoding-react-native.mjs.map %%DATADIR%%/resources/app/node_modules/@typespec/ts-http-runtime/dist/react-native/util/bytesEncoding.common.js %%DATADIR%%/resources/app/node_modules/@typespec/ts-http-runtime/dist/react-native/util/bytesEncoding.js @@ -4573,6 +4585,7 @@ share/applications/code-oss.desktop %%DATADIR%%/resources/app/node_modules/@vscode/deviceid/package.json %%DATADIR%%/resources/app/node_modules/@vscode/iconv-lite-umd/LICENSE %%DATADIR%%/resources/app/node_modules/@vscode/iconv-lite-umd/lib/iconv-lite-umd.js +%%DATADIR%%/resources/app/node_modules/@vscode/iconv-lite-umd/lib/iconv-lite-umd.js.LICENSE.txt %%DATADIR%%/resources/app/node_modules/@vscode/iconv-lite-umd/package.json %%DATADIR%%/resources/app/node_modules/@vscode/policy-watcher/LICENSE %%DATADIR%%/resources/app/node_modules/@vscode/policy-watcher/build/Release/vscode-policy-watcher.node @@ -4618,8 +4631,10 @@ share/applications/code-oss.desktop %%DATADIR%%/resources/app/node_modules/@vscode/tree-sitter-wasm/SECURITY.md %%DATADIR%%/resources/app/node_modules/@vscode/tree-sitter-wasm/cgmanifest.json %%DATADIR%%/resources/app/node_modules/@vscode/tree-sitter-wasm/package.json +%%DATADIR%%/resources/app/node_modules/@vscode/tree-sitter-wasm/wasm/tree-sitter-bash.wasm %%DATADIR%%/resources/app/node_modules/@vscode/tree-sitter-wasm/wasm/tree-sitter-css.wasm %%DATADIR%%/resources/app/node_modules/@vscode/tree-sitter-wasm/wasm/tree-sitter-ini.wasm +%%DATADIR%%/resources/app/node_modules/@vscode/tree-sitter-wasm/wasm/tree-sitter-powershell.wasm %%DATADIR%%/resources/app/node_modules/@vscode/tree-sitter-wasm/wasm/tree-sitter-regex.wasm %%DATADIR%%/resources/app/node_modules/@vscode/tree-sitter-wasm/wasm/tree-sitter-typescript.wasm %%DATADIR%%/resources/app/node_modules/@vscode/tree-sitter-wasm/wasm/tree-sitter.js |