Skip to content

chore: Add a rebase rule for PR-695 #701

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

Open
RomanNikitenko wants to merge 2 commits into
base: main
Choose a base branch
from
Open

chore: Add a rebase rule for PR-695 #701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b3595f
chore: Add rebase rule for https://github.com/che-incubator/che-code/…
RomanNikitenko May 11, 2026
3fdbd66
chore: Update changelog
RomanNikitenko May 11, 2026
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
6 changes: 6 additions & 0 deletions .rebase/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,3 +423,9 @@ https://github.com/che-incubator/che-code/pull/400

- code/extensions/git/src/ssh-askpass.sh
---

#### @RomanNikitenko
https://github.com/che-incubator/che-code/pull/695

- code/build/npm/preinstall.ts
---
10 changes: 10 additions & 0 deletions .rebase/replace/code/build/npm/preinstall.ts.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[
{
"from": "installHeaders();",
"by": "installGypDeps();\n\nif (process.env['VSCODE_SKIP_HEADER_INSTALL']) {\n\tconsole.log('Skipping header install (VSCODE_SKIP_HEADER_INSTALL is set).');\n} else {\n\ttry {\n\t\tinstallHeaders();\n\t} catch (error) {\n\t\tconsole.warn(`\\x1b[33m*** Header installation failed: ${(error as Error).message}\\x1b[0m`);\n\t\tconsole.warn('\\x1b[33m*** Continuing without pre-cached headers. Native modules will resolve headers during their own build.\\x1b[0m');\n\t}\n}"
},
{
"from": "function installHeaders() {\n\tconst npm = process.platform === 'win32' ? 'npm.cmd' : 'npm';\n\tchild_process.execSync(`${npm} ${process.env.npm_command || 'ci'}`, {\n\t\tenv: process.env,\n\t\tcwd: path.join(import.meta.dirname, 'gyp'),\n\t\tstdio: 'inherit'\n\t});\n\n\t// The node gyp package got installed using the above npm command using the gyp/package.json\n\t// file checked into our repository. So from that point it is safe to construct the path\n\t// to that executable",
"by": "function installGypDeps() {\n\tconst npm = process.platform === 'win32' ? 'npm.cmd' : 'npm';\n\tchild_process.execSync(`${npm} ${process.env.npm_command || 'ci'}`, {\n\t\tenv: process.env,\n\t\tcwd: path.join(import.meta.dirname, 'gyp'),\n\t\tstdio: 'inherit'\n\t});\n}\n\nfunction installHeaders() {\n\t// The node gyp package got installed using installGypDeps() above.\n\t// So from that point it is safe to construct the path to that executable."
}
]
2 changes: 2 additions & 0 deletions rebase.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,6 +521,8 @@ resolve_conflicts() {
apply_changes_multi_line "$conflictingFile"
elif [[ "$conflictingFile" == "code/build/gulpfile.reh.ts" ]]; then
apply_changes "$conflictingFile"
elif [[ "$conflictingFile" == "code/build/npm/preinstall.ts" ]]; then
apply_changes_multi_line "$conflictingFile"
elif [[ "$conflictingFile" == "code/resources/server/bin/helpers/browser-linux.sh" ]]; then
apply_changes_multi_line "$conflictingFile"
elif [[ "$conflictingFile" == "code/resources/server/bin/remote-cli/code-linux.sh" ]]; then
Expand Down
Loading