Merge of VS Code 1.92 #4283
Merged
Merge of VS Code 1.92 #4283
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
The full test suite passes: https://github.com/posit-dev/positron/actions/runs/10302180420/job/28515305759 But still one failure for macOS release builds to figure out: https://github.com/posit-dev/positron-builds/actions/runs/10300519194/job/28515899776 |
From microsoft/vscode@af5cf64 Work around this error: ``` Error: src/playwrightDriver.ts(235,20): error TS2769: No overload matches this call. Overload 1 of 2, '(pageFunction: PageFunction<IWindowDriver[], T>, arg: IWindowDriver[]): Promise<T>', gave the following error. Type 'JSHandle<IWindowDriver>' is missing the following properties from type 'IWindowDriver': setValue, isActiveElement, getElements, getElementXY, and 8 more. Overload 2 of 2, '(pageFunction: PageFunction<void, T>, arg?: any): Promise<T>', gave the following error. Argument of type 'PageFunction<IWindowDriver[], T>' is not assignable to parameter of type 'PageFunction<void, T>'. Type '(arg: IWindowDriver[]) => T | Promise<T>' is not assignable to type 'PageFunction<void, T>'. Type '(arg: IWindowDriver[]) => T | Promise<T>' is not assignable to type '(arg: void) => T | Promise<T>'. Types of parameters 'arg' and 'arg' are incompatible. Type 'void' is not assignable to type 'IWindowDriver[]'. ```
For nodejs/node#52554 Fixes: ``` [4/4] Building fresh packages... error C:\a\positron\positron\extensions\jupyter-adapter\node_modules\lzma-native: Command failed. Exit code: 1 Command: node-gyp-build Arguments: Directory: C:\a\positron\positron\extensions\jupyter-adapter\node_modules\lzma-native Output: node:internal/child_process:421 info Visit https://yarnpkg.com/en/docs/cli/install for documentation about this command. throw new ErrnoException(err, 'spawn'); ^ Error: spawn EINVAL at ChildProcess.spawn (node:internal/child_process:421:11) at Object.spawn (node:child_process:761:9) at build (C:\a\positron\positron\extensions\jupyter-adapter\node_modules\node-gyp-build\bin.js:29:8) at preinstall (C:\a\positron\positron\extensions\jupyter-adapter\node_modules\node-gyp-build\bin.js:38:32) at Object.<anonymous> (C:\a\positron\positron\extensions\jupyter-adapter\node_modules\node-gyp-build\bin.js:15:3) at Module._compile (node:internal/modules/cjs/loader:1358:14) at Module._extensions..js (node:internal/modules/cjs/loader:1416:10) at Module.load (node:internal/modules/cjs/loader:1208:32) at Module._load (node:internal/modules/cjs/loader:1024:12) at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:174:12) { errno: -4071, code: 'EINVAL', syscall: 'spawn' } ```
Fixes
```
node_modules/@parcel/watcher',
gyp info spawn args '-Dnode_engine=v8',
gyp info spawn args '--depth=.',
gyp info spawn args '--no-parallel',
gyp info spawn args '--generator-output',
gyp info spawn args 'build',
gyp info spawn args '-Goutput_dir=.'
gyp info spawn args ]
Traceback (most recent call last):
File "/opt/hostedtoolcache/node/20.16.0/x64/lib/node_modules/npm/node_modules/node-gyp/gyp/gyp_main.py", line 45, in <module>
sys.exit(gyp.script_main())
File "/opt/hostedtoolcache/node/20.16.0/x64/lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/__init__.py", line 688, in script_main
return main(sys.argv[1:])
File "/opt/hostedtoolcache/node/20.16.0/x64/lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/__init__.py", line 680, in main
return gyp_main(args)
File "/opt/hostedtoolcache/node/20.16.0/x64/lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/__init__.py", line 647, in gyp_main
[generator, flat_list, targets, data] = Load(
File "/opt/hostedtoolcache/node/20.16.0/x64/lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/__init__.py", line 157, in Load
result = gyp.input.Load(
File "/opt/hostedtoolcache/node/20.16.0/x64/lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/input.py", line 2985, in Load
LoadTargetBuildFile(
File "/opt/hostedtoolcache/node/20.16.0/x64/lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/input.py", line 400, in LoadTargetBuildFile
build_file_data = LoadOneBuildFile(
File "/opt/hostedtoolcache/node/20.16.0/x64/lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/input.py", line 255, in LoadOneBuildFile
LoadBuildFileIncludesIntoDict(
File "/opt/hostedtoolcache/node/20.16.0/x64/lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/input.py", line 299, in LoadBuildFileIncludesIntoDict
LoadOneBuildFile(include, data, aux_data, None, False, check),
File "/opt/hostedtoolcache/node/20.16.0/x64/lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/input.py", line 237, in LoadOneBuildFile
build_file_data = eval(build_file_contents, {"__builtins__": {}}, None)
File "/home/runner/.cache/node-gyp/20.14.0/include/node/common.gypi", line 546
'l
^
SyntaxError: unterminated string literal (detected at line 546)
```
Fixes
```
Error: src/areas/positron/plots/plots.test.ts(92,82): error TS2345: Argument of type 'Buffer' is not assignable to parameter of type 'string | ArrayBufferView'.
Type 'Buffer' is not assignable to type 'Uint8Array | DataView'.
Type 'Buffer' is not assignable to type 'Uint8Array'.
The types returned by 'entries()' are incompatible between these types.
Type 'IterableIterator<[number, number]>' is missing the following properties from type 'ArrayIterator<[number, number]>': map, filter, take, drop, and 8 more.
Error: src/areas/positron/plots/plots.test.ts(135,73): error TS2345: Argument of type 'Buffer' is not assignable to parameter of type 'string | ArrayBufferView'.
Type 'Buffer' is not assignable to type 'Uint8Array | DataView'.
Type 'Buffer' is not assignable to type 'Uint8Array'.
The types returned by 'entries()' are incompatible between these types.
Type 'IterableIterator<[number, number]>' is missing the following properties from type 'ArrayIterator<[number, number]>': map, filter, take, drop, and 8 more.
Error: src/areas/positron/plots/plots.test.ts(314,70): error TS2345: Argument of type 'Buffer' is not assignable to parameter of type 'string | ArrayBufferView'.
Type 'Buffer' is not assignable to type 'Uint8Array | DataView'.
Type 'Buffer' is not assignable to type 'Uint8Array'.
The types returned by 'entries()' are incompatible between these types.
Type 'IterableIterator<[number, number]>' is missing the following properties from type 'ArrayIterator<[number, number]>': map, filter, take, drop, and 8 more.
```
f686a03 to
8b2d597
Compare
`filesToSkip` no longer works for us. It is not consulted for x64-only files, which should be ignored via `x64ArchFiles`, which only accepts a single glob pattern. So we now have our own procedure to stash away such files and move them back into the universal bundle at the end. We also create a new set of files to reconcile following this upstream change: microsoft/vscode@f6f90e0 Localised strings are now stored in an array and the strings are replaced at build time by references to this array. Somehow this array differs across arch distributions, so we fix that up by copying from the relevant files from the x64 dist to the arm64 one.
|
@jmcphers The universal build is now fixed. The full test suite passes and I've checked the built app manually. See commit messages for description of needed fixes to the build. |
jmcphers
approved these changes
Aug 20, 2024
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge of https://code.visualstudio.com/updates/v1_92
Joint work with @jmcphers.
In manual tests I checked in particular that the new "panel on top" feature interacts well with our changes for bottom panel minimisation. Our icons for minimise and restore only appear when in the bottom position. We might want to support them in the top position as well but for now this works well enough.
This merge updates the version of node used to build Positron. If you're building locally, you will need to run
nvm installbefore rebuilding.