Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge recent 2025.01 updates to main #6035

Merged
merged 8 commits into from
Jan 22, 2025
Merged

Merge recent 2025.01 updates to main #6035

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
012ff17
Pull in missing 1.96 upstream changes (#6024)
melissa-barca Jan 17, 2025
fc2474e
use correct reh/reh-web package.json in bundle (#6028)
jmcphers Jan 17, 2025
afbae90
Merge remote-tracking branch 'origin/main' into merge/2025.01-updates
jmcphers Jan 17, 2025
7538cf6
Merge remote-tracking branch 'origin/main' into merge/2025.01-updates
jmcphers Jan 18, 2025
df61a68
add missing esm modules and help.html to reh-web (#6058)
sharon-wang Jan 21, 2025
3874d72
Merge remote-tracking branch 'origin/main' into merge/2025.01-updates
jmcphers Jan 21, 2025
646ad76
Merge remote-tracking branch 'origin/main' into merge/2025.01-updates
jmcphers Jan 21, 2025
b4325b6
only send a heartbeat in Workbench sessions
jmcphers Jan 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion build/gulpfile.reh.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,8 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
// --- Start Positron ---
// Note: The remote/reh-web/package.json is generated/updated in build/npm/postinstall.js
const packageJsonBase = type === 'reh-web' ? 'remote/reh-web' : 'remote';
const packageJsonStream = gulp.src(['remote/package.json'], { base: packageJsonBase })
const packageJsonStream = gulp.src([`${packageJsonBase}/package.json`], { base: packageJsonBase })
// --- End Positron ---
.pipe(json({ name, version, dependencies: undefined, optionalDependencies: undefined, type: 'module' }))
.pipe(es.through(function (file) {
packageJsonContents = file.contents.toString();
Expand Down
4 changes: 2 additions & 2 deletions extensions/npm/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@
"@types/which": "^3.0.0"
},
"overrides": {
"micromatch": "^4.0.6",
"micromatch": "^4.0.8",
"braces": "^3.0.3"
},
"resolutions": {
"micromatch": "^4.0.6",
"micromatch": "^4.0.8",
"braces": "^3.0.3"
},
"main": "./out/npmMain",
Expand Down
Loading
Loading