@theia/task 1.18.0-next.166 → 1.18.0-next.170
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -38,6 +38,7 @@ let ProcessTaskResolver = class ProcessTaskResolver {
|
|
|
38
38
|
* sane default values. Also, resolve all known variables, e.g. `${workspaceFolder}`.
|
|
39
39
|
*/
|
|
40
40
|
async resolveTask(taskConfig) {
|
|
41
|
+
var _a;
|
|
41
42
|
const type = taskConfig.taskType || taskConfig.type;
|
|
42
43
|
if (type !== 'process' && type !== 'shell') {
|
|
43
44
|
throw new Error('Unsupported task configuration type.');
|
|
@@ -68,7 +69,7 @@ let ProcessTaskResolver = class ProcessTaskResolver {
|
|
|
68
69
|
options: processTaskConfig.linux.options
|
|
69
70
|
} : undefined, options: {
|
|
70
71
|
cwd: await this.variableResolverService.resolve(cwd, variableResolverOptions),
|
|
71
|
-
env: processTaskConfig.options && processTaskConfig.options.env,
|
|
72
|
+
env: ((_a = processTaskConfig.options) === null || _a === void 0 ? void 0 : _a.env) && await this.variableResolverService.resolve(processTaskConfig.options.env, variableResolverOptions),
|
|
72
73
|
shell: processTaskConfig.options && processTaskConfig.options.shell
|
|
73
74
|
} });
|
|
74
75
|
return result;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-task-resolver.js","sourceRoot":"","sources":["../../../src/browser/process/process-task-resolver.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;AAElF,4DAAkE;AAClE,kEAA+E;AAI/E,0EAAqE;AACrE,oDAA6C;AAC7C,0DAAgE;AAGhE,IAAa,mBAAmB,GAAhC,MAAa,mBAAmB;IAW5B;;;;;OAKG;IACH,KAAK,CAAC,WAAW,CAAC,UAA6B
|
|
1
|
+
{"version":3,"file":"process-task-resolver.js","sourceRoot":"","sources":["../../../src/browser/process/process-task-resolver.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;AAElF,4DAAkE;AAClE,kEAA+E;AAI/E,0EAAqE;AACrE,oDAA6C;AAC7C,0DAAgE;AAGhE,IAAa,mBAAmB,GAAhC,MAAa,mBAAmB;IAW5B;;;;;OAKG;IACH,KAAK,CAAC,WAAW,CAAC,UAA6B;;QAC3C,MAAM,IAAI,GAAG,UAAU,CAAC,QAAQ,IAAI,UAAU,CAAC,IAAI,CAAC;QACpD,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,KAAK,OAAO,EAAE;YACxC,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;SAC3D;QACD,MAAM,OAAO,GAAG,OAAO,UAAU,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,aAAG,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAC/F,MAAM,uBAAuB,GAAG;YAC5B,OAAO,EAAE,oBAAoB,EAAE,OAAO;SACzC,CAAC;QACF,MAAM,iBAAiB,GAAG,UAAsC,CAAC;QACjE,IAAI,GAAG,GAAG,iBAAiB,CAAC,OAAO,IAAI,iBAAiB,CAAC,OAAO,CAAC,GAAG,CAAC;QACrE,IAAI,CAAC,GAAG,EAAE;YACN,MAAM,OAAO,GAAG,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;YACnE,IAAI,OAAO,EAAE;gBACT,GAAG,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;aAC5B;SACJ;QAED,MAAM,MAAM,mCACL,iBAAiB,KACpB,OAAO,EAAE,MAAM,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC,iBAAiB,CAAC,OAAO,EAAE,uBAAuB,CAAC,EACvG,IAAI,EAAE,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,uBAAuB,CAAC,YAAY,CAAC,iBAAiB,CAAC,IAAI,EAAE,uBAAuB,CAAC,CAAC,CAAC,CAAC,SAAS,EAC3I,OAAO,EAAE,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC;gBACjC,OAAO,EAAE,MAAM,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC,iBAAiB,CAAC,OAAO,CAAC,OAAO,EAAE,uBAAuB,CAAC;gBAC/G,IAAI,EAAE,iBAAiB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,uBAAuB,CAAC,YAAY,CAAC,iBAAiB,CAAC,OAAO,CAAC,IAAI,EAAE,uBAAuB,CAAC,CAAC,CAAC,CAAC,SAAS;gBAC3J,OAAO,EAAE,iBAAiB,CAAC,OAAO,CAAC,OAAO;aAC7C,CAAC,CAAC,CAAC,SAAS,EACb,GAAG,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC;gBACzB,OAAO,EAAE,MAAM,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,OAAO,EAAE,uBAAuB,CAAC;gBAC3G,IAAI,EAAE,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,uBAAuB,CAAC,YAAY,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,EAAE,uBAAuB,CAAC,CAAC,CAAC,CAAC,SAAS;gBACnJ,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,OAAO;aACzC,CAAC,CAAC,CAAC,SAAS,EACb,KAAK,EAAE,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC;gBAC7B,OAAO,EAAE,MAAM,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC,iBAAiB,CAAC,KAAK,CAAC,OAAO,EAAE,uBAAuB,CAAC;gBAC7G,IAAI,EAAE,iBAAiB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,uBAAuB,CAAC,YAAY,CAAC,iBAAiB,CAAC,KAAK,CAAC,IAAI,EAAE,uBAAuB,CAAC,CAAC,CAAC,CAAC,SAAS;gBACvJ,OAAO,EAAE,iBAAiB,CAAC,KAAK,CAAC,OAAO;aAC3C,CAAC,CAAC,CAAC,SAAS,EACb,OAAO,EAAE;gBACL,GAAG,EAAE,MAAM,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC,GAAG,EAAE,uBAAuB,CAAC;gBAC7E,GAAG,EAAE,OAAA,iBAAiB,CAAC,OAAO,0CAAE,GAAG,KAAI,MAAM,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC,iBAAiB,CAAC,OAAO,CAAC,GAAG,EAAE,uBAAuB,CAAC;gBACzI,KAAK,EAAE,iBAAiB,CAAC,OAAO,IAAI,iBAAiB,CAAC,OAAO,CAAC,KAAK;aACtE,GACJ,CAAC;QACF,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ,CAAA;AA3DG;IADC,kBAAM,CAAC,iCAAuB,CAAC;8BACY,iCAAuB;oEAAC;AAGpE;IADC,kBAAM,CAAC,iDAAsB,CAAC;8BACY,iDAAsB;mEAAC;AAGlE;IADC,kBAAM,CAAC,0BAAgB,CAAC;8BACY,0BAAgB;6DAAC;AAT7C,mBAAmB;IAD/B,sBAAU,EAAE;GACA,mBAAmB,CA8D/B;AA9DY,kDAAmB"}
|
package/package.json
CHANGED
|
@@ -1,19 +1,19 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/task",
|
|
3
|
-
"version": "1.18.0-next.
|
|
3
|
+
"version": "1.18.0-next.170+3453800243a",
|
|
4
4
|
"description": "Theia - Task extension. This extension adds support for executing raw or terminal processes in the backend.",
|
|
5
5
|
"dependencies": {
|
|
6
|
-
"@theia/core": "1.18.0-next.
|
|
7
|
-
"@theia/editor": "1.18.0-next.
|
|
8
|
-
"@theia/filesystem": "1.18.0-next.
|
|
9
|
-
"@theia/markers": "1.18.0-next.
|
|
10
|
-
"@theia/monaco": "1.18.0-next.
|
|
11
|
-
"@theia/preferences": "1.18.0-next.
|
|
12
|
-
"@theia/process": "1.18.0-next.
|
|
13
|
-
"@theia/terminal": "1.18.0-next.
|
|
14
|
-
"@theia/userstorage": "1.18.0-next.
|
|
15
|
-
"@theia/variable-resolver": "1.18.0-next.
|
|
16
|
-
"@theia/workspace": "1.18.0-next.
|
|
6
|
+
"@theia/core": "1.18.0-next.170+3453800243a",
|
|
7
|
+
"@theia/editor": "1.18.0-next.170+3453800243a",
|
|
8
|
+
"@theia/filesystem": "1.18.0-next.170+3453800243a",
|
|
9
|
+
"@theia/markers": "1.18.0-next.170+3453800243a",
|
|
10
|
+
"@theia/monaco": "1.18.0-next.170+3453800243a",
|
|
11
|
+
"@theia/preferences": "1.18.0-next.170+3453800243a",
|
|
12
|
+
"@theia/process": "1.18.0-next.170+3453800243a",
|
|
13
|
+
"@theia/terminal": "1.18.0-next.170+3453800243a",
|
|
14
|
+
"@theia/userstorage": "1.18.0-next.170+3453800243a",
|
|
15
|
+
"@theia/variable-resolver": "1.18.0-next.170+3453800243a",
|
|
16
|
+
"@theia/workspace": "1.18.0-next.170+3453800243a",
|
|
17
17
|
"ajv": "^6.5.3",
|
|
18
18
|
"async-mutex": "^0.3.1",
|
|
19
19
|
"jsonc-parser": "^2.2.0",
|
|
@@ -58,5 +58,5 @@
|
|
|
58
58
|
"nyc": {
|
|
59
59
|
"extends": "../../configs/nyc.json"
|
|
60
60
|
},
|
|
61
|
-
"gitHead": "
|
|
61
|
+
"gitHead": "3453800243a4f857b1fc7fda6d3f1e1b22d4876c"
|
|
62
62
|
}
|
|
@@ -80,7 +80,7 @@ export class ProcessTaskResolver implements TaskResolver {
|
|
|
80
80
|
} : undefined,
|
|
81
81
|
options: {
|
|
82
82
|
cwd: await this.variableResolverService.resolve(cwd, variableResolverOptions),
|
|
83
|
-
env: processTaskConfig.options && processTaskConfig.options.env,
|
|
83
|
+
env: processTaskConfig.options?.env && await this.variableResolverService.resolve(processTaskConfig.options.env, variableResolverOptions),
|
|
84
84
|
shell: processTaskConfig.options && processTaskConfig.options.shell
|
|
85
85
|
}
|
|
86
86
|
};
|