@theia/core 1.72.0-next.59 → 1.72.1

package/lib/common/shell-quoting.js

@@ -0,0 +1,146 @@
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2020 Ericsson and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PowershellQuotingFunctions = exports.CmdQuotingFunctions = exports.BashQuotingFunctions = void 0;
+exports.createShellCommandLine = createShellCommandLine;
+exports.escapeForShell = escapeForShell;
+/**
+ * Converts a list of args into an escaped shell command.
+ *
+ * There are two main use cases when handling command/arguments for a shell:
+ * 1. User already wrote the escaped commandline, then just use that.
+ * 2. User wants a specific process to be invoked with some arguments.
+ *
+ * The `createShellCommandLine` function is useful for the latter.
+ *
+ * @param args Standard list of spawn/exec arguments, first item is the command.
+ * @param quotingFunctions Collection of functions to process arguments.
+ */
+function createShellCommandLine(args, quotingFunctions) {
+    return args.map(arg => escapeForShell(arg, quotingFunctions)).join(' ');
+}
+/**
+ * Escape (or quote) a given input.
+ *
+ * @param arg Input to escape.
+ * @param quotingFunctions Collection of functions to process the given `arg`.
+ * @param quotingType Override the quoting type specified by the given `arg`.
+ */
+function escapeForShell(arg, quotingFunctions, quotingType) {
+    let value;
+    let quoting = quotingType;
+    if (typeof arg === 'string') {
+        if (!quoting) {
+            return arg;
+        }
+        value = arg;
+    }
+    else {
+        if (!quoting) {
+            quoting = arg.quoting;
+        }
+        value = arg.value;
+    }
+    if (quotingFunctions && typeof quotingFunctions[quoting] === 'function') {
+        return quotingFunctions[quoting](value);
+    }
+    return value;
+}
+exports.BashQuotingFunctions = {
+    characters: {
+        needQuotes: '()',
+        escape: '\\',
+        strong: '\'',
+        weak: '"',
+    },
+    escape(arg) {
+        return arg
+            .replace(/[\s\\|(){}<>$&;"']/g, '\\$&');
+    },
+    strong(arg) {
+        // ('+) becomes ('"'+"')
+        return `'${arg
+            .replace(/'+/g, '\'"$&"\'')}'`;
+    },
+    weak(arg) {
+        return `"${arg
+            // Escape escape-characters.
+            .replace(/\\"/g, '\\\\"')
+            // Escape user-specified double-quotes.
+            .replace(/"/g, '\\"')
+            // Escape trailing (\), we don't want the user to escape our last quote.
+            .replace(/\\$/g, '\\\\')}"`;
+    },
+};
+exports.CmdQuotingFunctions = {
+    characters: {
+        weak: '"',
+    },
+    escape(arg) {
+        return arg
+            // Escape forbidden characters (see: cmd /?).
+            .replace(/[%&<>()@^|]/g, '^$&')
+            // Some characters must be escaped using `\`.
+            .replace(/[\\"]/g, '\\$&')
+            // Double-quote whitespaces, else we cannot escape it.
+            .replace(/\s+/g, '"$&"');
+    },
+    strong(arg) {
+        return this.weak(arg)
+            // Try to prevent variable expansion.
+            .replace(/%/g, '"%"');
+    },
+    weak(arg) {
+        return `"${arg
+            // Escape double quotes.
+            .replace(/\\"/g, '\\\\"')
+            .replace(/"/g, '\\"')
+            // Escape forbidden characters (see: cmd /?)
+            .replace(/[&<>()@^|]/g, '^$&')
+            // Escape trailing backslash, we don't want the user to escape our last quote.
+            .replace(/\\$/g, '\\\\')
+            // Escape line returns
+            .replace(/\r?\n/g, '^$&')}"`;
+    },
+};
+exports.PowershellQuotingFunctions = {
+    characters: {
+        needQuotes: '()',
+        escape: '`',
+        strong: '\'',
+        weak: '"',
+    },
+    escape(arg) {
+        return arg.replace(/[`|{}()<>;"' ]/g, '`$&');
+    },
+    strong(arg) {
+        // In powershell, one must write ('') for a single quote to be displayed
+        // within a single quoted string.
+        return `'${arg
+            .replace(/'/g, '\'\'')}'`;
+    },
+    weak(arg) {
+        return `"${arg
+            // Escape escape-characters.
+            .replace(/`"/g, '``"')
+            // Escape user-specified backticks.
+            .replace(/"/g, '`"')
+            // Escape trailing (`), we don't want the user to escape our last quote.
+            .replace(/`$/g, '``')}"`;
+    },
+};
+//# sourceMappingURL=shell-quoting.js.map

package/lib/common/shell-quoting.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"shell-quoting.js","sourceRoot":"","sources":["../../src/common/shell-quoting.ts"],"names":[],"mappings":"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"}

package/lib/common/shell-quoting.spec.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=shell-quoting.spec.d.ts.map

package/lib/common/shell-quoting.spec.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"shell-quoting.spec.d.ts","sourceRoot":"","sources":["../../src/common/shell-quoting.spec.ts"],"names":[],"mappings":""}

package/lib/common/shell-quoting.spec.js

@@ -0,0 +1,171 @@
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2020 Ericsson and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+Object.defineProperty(exports, "__esModule", { value: true });
+const chai_1 = require("chai");
+const shell_quoting_1 = require("./shell-quoting");
+describe('Shell arguments escaping:', () => {
+    // Procedurally execute tests from this list of data.
+    const testData = {
+        bash: {
+            // https://www.gnu.org/software/bash/manual/html_node/Quoting.html
+            quotingFunctions: shell_quoting_1.BashQuotingFunctions,
+            data: {
+                ["escape" /* ShellQuoting.Escape */]: [
+                    { input: 'abc', expected: 'abc' },
+                    { input: 'ab c', expected: 'ab\\ c' },
+                    { input: 'ab"c', expected: 'ab\\"c' },
+                    { input: 'ab\'c', expected: 'ab\\\'c' },
+                    { input: 'ab\\ c\\', expected: 'ab\\\\\\ c\\\\' },
+                    {
+                        input: 'setTimeout(() => { console.log(1, "2\'3"); }, 100)',
+                        expected: 'setTimeout\\(\\(\\)\\ =\\>\\ \\{\\ console.log\\(1,\\ \\"2\\\'3\\"\\)\\;\\ \\},\\ 100\\)',
+                    },
+                ],
+                ["strong" /* ShellQuoting.Strong */]: [
+                    { input: 'abc', expected: '\'abc\'' },
+                    { input: 'ab c', expected: '\'ab c\'' },
+                    { input: 'ab"c', expected: '\'ab"c\'' },
+                    { input: 'ab\'c', expected: '\'ab\'"\'"\'c\'' },
+                    { input: 'ab\\ c\\', expected: '\'ab\\ c\\\'' },
+                    {
+                        input: 'setTimeout(() => { console.log(1, "2\'3"); }, 100)',
+                        expected: '\'setTimeout(() => { console.log(1, "2\'"\'"\'3"); }, 100)\'',
+                    },
+                ],
+                ["weak" /* ShellQuoting.Weak */]: [
+                    { input: 'abc', expected: '"abc"' },
+                    { input: 'ab c', expected: '"ab c"' },
+                    { input: 'ab"c', expected: '"ab\\"c"' },
+                    { input: 'ab\'c', expected: '"ab\'c"' },
+                    { input: 'ab\\ c\\', expected: '"ab\\ c\\\\"' },
+                    {
+                        input: 'setTimeout(() => { console.log(1, "2\'3"); }, 100)',
+                        expected: '"setTimeout(() => { console.log(1, \\"2\'3\\"); }, 100)"',
+                    },
+                ]
+            },
+        },
+        cmd: {
+            // https://ss64.com/nt/syntax-esc.html
+            quotingFunctions: shell_quoting_1.CmdQuotingFunctions,
+            data: {
+                ["escape" /* ShellQuoting.Escape */]: [
+                    { input: 'abc', expected: 'abc' },
+                    { input: 'ab c', expected: 'ab" "c' },
+                    { input: 'ab"c', expected: 'ab\\"c' },
+                    { input: 'ab\'c', expected: 'ab\'c' },
+                    { input: 'ab^ c^', expected: 'ab^^" "c^^' },
+                    {
+                        input: 'setTimeout(() => { console.log(1, "2\'3"); }, 100)',
+                        expected: 'setTimeout^(^(^)" "=^>" "{" "console.log^(1," "\\"2\'3\\"^);" "}," "100^)',
+                    },
+                    {
+                        input: 'console.log("%PATH%")',
+                        expected: 'console.log^(\\"^%PATH^%\\"^)',
+                    },
+                ],
+                ["strong" /* ShellQuoting.Strong */]: [
+                    { input: 'abc', expected: '"abc"' },
+                    { input: 'ab c', expected: '"ab c"' },
+                    { input: 'ab"c', expected: '"ab\\"c"' },
+                    { input: 'ab\'c', expected: '"ab\'c"' },
+                    { input: 'ab^ c^', expected: '"ab^^ c^^"' },
+                    {
+                        input: 'setTimeout(() => { console.log(1, "2\'3"); }, 100)',
+                        expected: '"setTimeout^(^(^) =^> { console.log^(1, \\"2\'3\\"^); }, 100^)"',
+                    },
+                    {
+                        input: 'console.log("%PATH%")',
+                        expected: '"console.log^(\\""%"PATH"%"\\"^)"',
+                    },
+                ],
+                ["weak" /* ShellQuoting.Weak */]: [
+                    { input: 'abc', expected: '"abc"' },
+                    { input: 'ab c', expected: '"ab c"' },
+                    { input: 'ab"c', expected: '"ab\\"c"' },
+                    { input: 'ab\'c', expected: '"ab\'c"' },
+                    { input: 'ab^ c^', expected: '"ab^^ c^^"' },
+                    {
+                        input: 'setTimeout(() => { console.log(1, "2\'3"); }, 100)',
+                        expected: '"setTimeout^(^(^) =^> { console.log^(1, \\"2\'3\\"^); }, 100^)"',
+                    },
+                    {
+                        input: 'console.log("%PATH%")',
+                        expected: '"console.log^(\\"%PATH%\\"^)"',
+                    },
+                ]
+            },
+        },
+        powershell: {
+            // https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.core/about/about_quoting_rules?view=powershell-6
+            quotingFunctions: shell_quoting_1.PowershellQuotingFunctions,
+            data: {
+                ["escape" /* ShellQuoting.Escape */]: [
+                    { input: 'abc', expected: 'abc' },
+                    { input: 'ab c', expected: 'ab` c' },
+                    { input: 'ab"c', expected: 'ab`"c' },
+                    { input: 'ab\'c', expected: 'ab`\'c' },
+                    { input: 'ab` c`', expected: 'ab``` c``' },
+                    {
+                        input: 'setTimeout(() => { console.log(1, "2\'3"); }, 100)',
+                        expected: 'setTimeout`(`(`)` =`>` `{` console.log`(1,` `"2`\'3`"`)`;` `},` 100`)',
+                    },
+                ],
+                ["strong" /* ShellQuoting.Strong */]: [
+                    { input: 'abc', expected: '\'abc\'' },
+                    { input: 'ab c', expected: '\'ab c\'' },
+                    { input: 'ab"c', expected: '\'ab"c\'' },
+                    { input: 'ab\'c', expected: '\'ab\'\'c\'' },
+                    { input: 'ab` c`', expected: '\'ab` c`\'' },
+                    {
+                        input: 'setTimeout(() => { console.log(1, "2\'3"); }, 100)',
+                        expected: '\'setTimeout(() => { console.log(1, "2\'\'3"); }, 100)\'',
+                    },
+                ],
+                ["weak" /* ShellQuoting.Weak */]: [
+                    { input: 'abc', expected: '"abc"' },
+                    { input: 'ab c', expected: '"ab c"' },
+                    { input: 'ab"c', expected: '"ab`"c"' },
+                    { input: 'ab\'c', expected: '"ab\'c"' },
+                    { input: 'ab` c`', expected: '"ab` c``"' },
+                    {
+                        input: 'setTimeout(() => { console.log(1, "2\'3"); }, 100)',
+                        expected: '"setTimeout(() => { console.log(1, `"2\'3`"); }, 100)"',
+                    },
+                ]
+            },
+        }
+    };
+    // Iter through each runtime (bash/cmd/powershell):
+    for (const runtime of Object.keys(testData)) {
+        const testInfo = testData[runtime];
+        // Get all quoting types (escape/strong/weak):
+        for (const quotingType of Object.keys(testInfo.data)) {
+            const testInput = testInfo.data[quotingType];
+            // Run the test for each input:
+            it(`${runtime}/${quotingType}`, () => {
+                for (const test of testInput) {
+                    (0, chai_1.expect)((0, shell_quoting_1.escapeForShell)({
+                        quoting: quotingType,
+                        value: test.input,
+                    }, testInfo.quotingFunctions)).equal(test.expected);
+                }
+            });
+        }
+    }
+});
+//# sourceMappingURL=shell-quoting.spec.js.map

package/lib/common/shell-quoting.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"shell-quoting.spec.js","sourceRoot":"","sources":["../../src/common/shell-quoting.spec.ts"],"names":[],"mappings":"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"}

package/lib/node/process-utils.d.ts

@@ -6,6 +6,7 @@ export declare class ProcessUtils {
     terminateProcessTree(ppid: number): void;
     protected winTerminateProcessTree(ppid: number): void;
     protected unixTerminateProcessTree(ppid: number): void;
+    protected unixKill(pid: number): void;
     protected unixGetPGID(pid: number): number;
     protected unixGetChildrenRecursive(ppid: number): Set<number>;
     protected spawnSync(file: string, argv: string[], options?: cp.SpawnSyncOptions): cp.SpawnSyncReturns<string>;

package/lib/node/process-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"process-utils.d.ts","sourceRoot":"","sources":["../../src/node/process-utils.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,MAAM,eAAe,CAAC;AAGpC;;GAEG;AACH,qBACa,YAAY;IAErB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAQxC,SAAS,CAAC,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAYrD,SAAS,CAAC,wBAAwB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAqBtD,SAAS,CAAC,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAK1C,SAAS,CAAC,wBAAwB,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC;IA4B7D,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,gBAAgB,GAAG,EAAE,CAAC,gBAAgB,CAAC,MAAM,CAAC;CAUhH"}
+{"version":3,"file":"process-utils.d.ts","sourceRoot":"","sources":["../../src/node/process-utils.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,MAAM,eAAe,CAAC;AAGpC;;GAEG;AACH,qBACa,YAAY;IAErB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAQxC,SAAS,CAAC,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAYrD,SAAS,CAAC,wBAAwB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAgBtD,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAYrC,SAAS,CAAC,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAK1C,SAAS,CAAC,wBAAwB,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC;IA4B7D,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,gBAAgB,GAAG,EAAE,CAAC,gBAAgB,CAAC,MAAM,CAAC;CAUhH"}

package/lib/node/process-utils.js

@@ -46,22 +46,28 @@ let ProcessUtils = class ProcessUtils {
         for (const pid of this.unixGetChildrenRecursive(ppid)) {
             // Prevent killing the current process:
             if (pid !== process.pid) {
-                // Don't stop if a process fails to be killed (keep on killing the others):
-                try {
-                    process.kill(pid);
-                }
-                catch (error) {
-                    console.error(error);
-                }
+                this.unixKill(pid);
             }
         }
         if (ppid === this.unixGetPGID(ppid)) {
             // When a process pgid === pid this means the the process is a group leader.
             // We can then kill every process part of its group by doing `kill(-pgid)`.
             // This can catch leaked processes under `init` that are still part of the group.
-            process.kill(-ppid);
+            this.unixKill(-ppid);
+        }
+        this.unixKill(ppid);
+    }
+    unixKill(pid) {
+        try {
+            process.kill(pid);
+        }
+        catch (error) {
+            // ESRCH means the process is already gone, which is the goal here. Log
+            // anything else but keep going so the rest of the tree is still killed.
+            if (error?.code !== 'ESRCH') {
+                console.error(`[${pid}] failed to kill`, error);
+            }
         }
-        process.kill(ppid);
     }
     unixGetPGID(pid) {
         const { stdout } = this.spawnSync('ps', ['-p', pid.toString(10), '-o', 'pgid=']);

package/lib/node/process-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"process-utils.js","sourceRoot":"","sources":["../../src/node/process-utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"process-utils.js","sourceRoot":"","sources":["../../src/node/process-utils.ts"],"names":[],"mappings":"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"}

package/lib/node/process-utils.spec.js

@@ -41,5 +41,46 @@ describe('ProcessUtils', () => {
         const pids = coreProcessManager['unixGetChildrenRecursive'](2);
         (0, chai_1.expect)(Array.from(pids)).members([40, 5, 6, 7]);
     });
+    describe('#unixTerminateProcessTree', () => {
+        let originalKill;
+        let originalConsoleError;
+        let loggedErrors;
+        function throwingKill(code) {
+            return (() => {
+                const error = new Error(`kill ${code}`);
+                error.code = code;
+                throw error;
+            });
+        }
+        beforeEach(() => {
+            originalKill = process.kill;
+            originalConsoleError = console.error;
+            loggedErrors = [];
+            console.error = (...args) => { loggedErrors.push(args); };
+            // One child plus the parent; report the parent as its own group leader so the `kill(-ppid)` branch runs too.
+            coreProcessManager['unixGetChildrenRecursive'] = () => new Set([424242]);
+            coreProcessManager['unixGetPGID'] = (pid) => pid;
+        });
+        afterEach(() => {
+            process.kill = originalKill;
+            console.error = originalConsoleError;
+        });
+        it('does not throw or log when processes in the tree are already gone (ESRCH)', () => {
+            process.kill = throwingKill('ESRCH');
+            (0, chai_1.expect)(() => coreProcessManager['unixTerminateProcessTree'](424243)).to.not.throw();
+            (0, chai_1.expect)(loggedErrors).to.be.empty;
+        });
+        it('logs unexpected kill errors (e.g. EPERM) without throwing', () => {
+            process.kill = throwingKill('EPERM');
+            (0, chai_1.expect)(() => coreProcessManager['unixTerminateProcessTree'](424243)).to.not.throw();
+            (0, chai_1.expect)(loggedErrors).to.not.be.empty;
+        });
+        it('does not throw when a kill rejects with a value that has no code (e.g. undefined)', () => {
+            const thrown = undefined;
+            process.kill = (() => { throw thrown; });
+            (0, chai_1.expect)(() => coreProcessManager['unixTerminateProcessTree'](424243)).to.not.throw();
+            (0, chai_1.expect)(loggedErrors).to.not.be.empty;
+        });
+    });
 });
 //# sourceMappingURL=process-utils.spec.js.map

package/lib/node/process-utils.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"process-utils.spec.js","sourceRoot":"","sources":["../../src/node/process-utils.spec.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;AAEhF,+BAA8B;AAC9B,yCAAsC;AACtC,mDAA+C;AAE/C,gBAAgB;AAChB,MAAM,YAAY,GAAG;;;;;;;;CAQpB,CAAC;AAEF,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAE1B,IAAI,kBAAgC,CAAC;IAErC,UAAU,CAAC,GAAG,EAAE;QACZ,MAAM,SAAS,GAAG,IAAI,qBAAS,EAAE,CAAC;QAClC,SAAS,CAAC,IAAI,CAAC,4BAAY,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;QACzD,kBAAkB,GAAG,SAAS,CAAC,GAAG,CAAC,4BAAY,CAAC,CAAC;IACrD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uCAAuC,EAAE,GAAG,EAAE;QAC7C,8DAA8D;QAC9D,kBAAkB,CAAC,WAAW,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,CAAQ,CAAC;QAC1E,MAAM,IAAI,GAAG,kBAAkB,CAAC,0BAA0B,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/D,IAAA,aAAM,EAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
+{"version":3,"file":"process-utils.spec.js","sourceRoot":"","sources":["../../src/node/process-utils.spec.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@theia/core",
-  "version": "1.72.0-next.59+044f7bfc5",
+  "version": "1.72.1",
   "description": "Theia is a cloud & desktop IDE framework implemented in TypeScript.",
   "main": "lib/common/index.js",
   "typings": "lib/common/index.d.ts",
@@ -17,8 +17,8 @@
     "@lumino/virtualdom": "^2.0.4",
     "@lumino/widgets": "2.7.5",
     "@parcel/watcher": "^2.5.6",
-    "@theia/application-package": "1.72.0-next.59+044f7bfc5",
-    "@theia/request": "1.72.0-next.59+044f7bfc5",
+    "@theia/application-package": "1.72.1",
+    "@theia/request": "1.72.1",
     "@types/body-parser": "^1.19.6",
     "@types/express": "^4.17.25",
     "@types/fs-extra": "^4.0.15",
@@ -213,13 +213,13 @@
     "watch": "theiaext watch"
   },
   "devDependencies": {
-    "@theia/ext-scripts": "1.71.0",
-    "@theia/re-exports": "1.71.0",
+    "@theia/ext-scripts": "1.72.1",
+    "@theia/re-exports": "1.72.1",
     "minimist": "^1.2.8",
     "nodejs-file-downloader": "4.13.0"
   },
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "044f7bfc503932372f324434beabbf5422dc583f"
+  "gitHead": "037c4b3e52055fc9962c9761564f431fc4864eb4"
 }