@theia/application-package 1.32.0-next.8 → 1.32.0
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.
- package/lib/api.d.ts +1 -1
- package/lib/api.js +1 -1
- package/lib/application-package.d.ts.map +1 -1
- package/lib/application-package.js +9 -2
- package/lib/application-package.js.map +1 -1
- package/lib/extension-package-collector.js +2 -2
- package/lib/extension-package-collector.js.map +1 -1
- package/package.json +4 -3
- package/src/api.ts +1 -1
- package/src/application-package.ts +9 -2
- package/src/extension-package-collector.ts +2 -2
package/lib/api.d.ts
CHANGED
|
@@ -2,5 +2,5 @@
|
|
|
2
2
|
* The default supported API version the framework supports.
|
|
3
3
|
* The version should be in the format `x.y.z`.
|
|
4
4
|
*/
|
|
5
|
-
export declare const DEFAULT_SUPPORTED_API_VERSION = "1.
|
|
5
|
+
export declare const DEFAULT_SUPPORTED_API_VERSION = "1.55.2";
|
|
6
6
|
//# sourceMappingURL=api.d.ts.map
|
package/lib/api.js
CHANGED
|
@@ -20,5 +20,5 @@ exports.DEFAULT_SUPPORTED_API_VERSION = void 0;
|
|
|
20
20
|
* The default supported API version the framework supports.
|
|
21
21
|
* The version should be in the format `x.y.z`.
|
|
22
22
|
*/
|
|
23
|
-
exports.DEFAULT_SUPPORTED_API_VERSION = '1.
|
|
23
|
+
exports.DEFAULT_SUPPORTED_API_VERSION = '1.55.2';
|
|
24
24
|
//# sourceMappingURL=api.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"application-package.d.ts","sourceRoot":"","sources":["../src/application-package.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,oBAAoB,EAAa,MAAM,gBAAgB,CAAC;AAC3F,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,uBAAuB,EAAuB,MAAM,qBAAqB,CAAC;AAEhH,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"application-package.d.ts","sourceRoot":"","sources":["../src/application-package.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,6 +23,7 @@ const extension_package_1 = require("./extension-package");
|
|
|
23
23
|
const extension_package_collector_1 = require("./extension-package-collector");
|
|
24
24
|
const application_props_1 = require("./application-props");
|
|
25
25
|
const deepmerge = require("deepmerge");
|
|
26
|
+
const resolvePackagePath = require("resolve-package-path");
|
|
26
27
|
class ApplicationPackageOptions {
|
|
27
28
|
}
|
|
28
29
|
exports.ApplicationPackageOptions = ApplicationPackageOptions;
|
|
@@ -214,8 +215,14 @@ class ApplicationPackage {
|
|
|
214
215
|
*/
|
|
215
216
|
get resolveModule() {
|
|
216
217
|
if (!this._moduleResolver) {
|
|
217
|
-
const resolutionPaths =
|
|
218
|
-
this._moduleResolver = modulePath =>
|
|
218
|
+
const resolutionPaths = this.packagePath || process.cwd();
|
|
219
|
+
this._moduleResolver = modulePath => {
|
|
220
|
+
const resolved = resolvePackagePath(modulePath, resolutionPaths);
|
|
221
|
+
if (!resolved) {
|
|
222
|
+
throw new Error('Could not resolve module: ' + modulePath);
|
|
223
|
+
}
|
|
224
|
+
return resolved;
|
|
225
|
+
};
|
|
219
226
|
}
|
|
220
227
|
return this._moduleResolver;
|
|
221
228
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"application-package.js","sourceRoot":"","sources":["../src/application-package.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;AAEhF,8BAA8B;AAC9B,2CAA0D;AAC1D,iDAA2F;AAC3F,2DAAgH;AAChH,+EAA0E;AAC1E,2DAAuD;AACvD,uCAAwC;
|
|
1
|
+
{"version":3,"file":"application-package.js","sourceRoot":"","sources":["../src/application-package.ts"],"names":[],"mappings":"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"}
|
|
@@ -53,9 +53,9 @@ class ExtensionPackageCollector {
|
|
|
53
53
|
this.visited.set(name, true);
|
|
54
54
|
let packagePath;
|
|
55
55
|
try {
|
|
56
|
-
packagePath = this.resolveModule(name
|
|
56
|
+
packagePath = this.resolveModule(name);
|
|
57
57
|
}
|
|
58
|
-
catch (
|
|
58
|
+
catch (_a) {
|
|
59
59
|
console.warn(`Failed to resolve module: ${name}`);
|
|
60
60
|
}
|
|
61
61
|
if (!packagePath) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extension-package-collector.js","sourceRoot":"","sources":["../src/extension-package-collector.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;AAEhF,2CAA2C;AAE3C,2DAAqG;AAErG,MAAa,yBAAyB;IAKlC,YACuB,uBAA2G,EAC3G,aAA6C;QAD7C,4BAAuB,GAAvB,uBAAuB,CAAoF;QAC3G,kBAAa,GAAb,aAAa,CAAgC;QALjD,WAAM,GAAuB,EAAE,CAAC;QAChC,YAAO,GAAG,IAAI,GAAG,EAAmB,CAAC;IAKpD,CAAC;IAGL,OAAO,CAAC,GAAgB;QACpB,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC;QAChB,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;QAC1B,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IAES,eAAe,CAAC,GAAgB;QACtC,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE;YACnB,OAAO;SACV;QACD,wCAAwC;QACxC,KAAK,MAAM,UAAU,IAAI,GAAG,CAAC,YAAY,EAAE;YACvC,MAAM,YAAY,GAAG,GAAG,CAAC,YAAY,CAAC,UAAU,CAAE,CAAC;YACnD,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;SACjD;IACL,CAAC;IAGS,yBAAyB,CAAC,GAAgB,EAAE,MAAwB;QAC1E,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC;QAC5B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;QAC1B,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC;IAC1B,CAAC;IAES,cAAc,CAAC,IAAY,EAAE,YAAoB;QACvD,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;YACxB,OAAO;SACV;QACD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAE7B,IAAI,WAA+B,CAAC;QACpC,IAAI;YACA,WAAW,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,
|
|
1
|
+
{"version":3,"file":"extension-package-collector.js","sourceRoot":"","sources":["../src/extension-package-collector.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;AAEhF,2CAA2C;AAE3C,2DAAqG;AAErG,MAAa,yBAAyB;IAKlC,YACuB,uBAA2G,EAC3G,aAA6C;QAD7C,4BAAuB,GAAvB,uBAAuB,CAAoF;QAC3G,kBAAa,GAAb,aAAa,CAAgC;QALjD,WAAM,GAAuB,EAAE,CAAC;QAChC,YAAO,GAAG,IAAI,GAAG,EAAmB,CAAC;IAKpD,CAAC;IAGL,OAAO,CAAC,GAAgB;QACpB,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC;QAChB,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;QAC1B,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IAES,eAAe,CAAC,GAAgB;QACtC,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE;YACnB,OAAO;SACV;QACD,wCAAwC;QACxC,KAAK,MAAM,UAAU,IAAI,GAAG,CAAC,YAAY,EAAE;YACvC,MAAM,YAAY,GAAG,GAAG,CAAC,YAAY,CAAC,UAAU,CAAE,CAAC;YACnD,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;SACjD;IACL,CAAC;IAGS,yBAAyB,CAAC,GAAgB,EAAE,MAAwB;QAC1E,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC;QAC5B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;QAC1B,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC;IAC1B,CAAC;IAES,cAAc,CAAC,IAAY,EAAE,YAAoB;QACvD,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;YACxB,OAAO;SACV;QACD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAE7B,IAAI,WAA+B,CAAC;QACpC,IAAI;YACA,WAAW,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;SAC1C;QAAC,WAAM;YACJ,OAAO,CAAC,IAAI,CAAC,6BAA6B,IAAI,EAAE,CAAC,CAAC;SACrD;QACD,IAAI,CAAC,WAAW,EAAE;YACd,OAAO;SACV;QACD,MAAM,GAAG,GAAgB,IAAA,wBAAY,EAAC,WAAW,CAAC,CAAC;QACnD,IAAI,uCAAmB,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE;YAC7B,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;YAC3B,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;YAC5B,MAAM,UAAU,GAAG,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,YAAa,CAAC,CAAC;YACtD,GAAG,CAAC,SAAS,GAAG,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC;YAC7D,GAAG,CAAC,OAAO,GAAG,YAAY,CAAC;YAC3B,MAAM,gBAAgB,GAAG,IAAI,CAAC,uBAAuB,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;YAC5E,IAAI,CAAC,yBAAyB,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;YACtD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;SACtC;IACL,CAAC;CAEJ;AAhED,8DAgEC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/application-package",
|
|
3
|
-
"version": "1.32.0
|
|
3
|
+
"version": "1.32.0",
|
|
4
4
|
"description": "Theia application package API.",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public"
|
|
@@ -38,14 +38,15 @@
|
|
|
38
38
|
"is-electron": "^2.1.0",
|
|
39
39
|
"nano": "^9.0.5",
|
|
40
40
|
"request": "^2.82.0",
|
|
41
|
+
"resolve-package-path": "^4.0.3",
|
|
41
42
|
"semver": "^5.4.1",
|
|
42
43
|
"write-json-file": "^2.2.0"
|
|
43
44
|
},
|
|
44
45
|
"devDependencies": {
|
|
45
|
-
"@theia/ext-scripts": "1.
|
|
46
|
+
"@theia/ext-scripts": "1.32.0"
|
|
46
47
|
},
|
|
47
48
|
"nyc": {
|
|
48
49
|
"extends": "../../configs/nyc.json"
|
|
49
50
|
},
|
|
50
|
-
"gitHead": "
|
|
51
|
+
"gitHead": "789d0148748b4dc9dea398520b5a3dd2998d71ec"
|
|
51
52
|
}
|
package/src/api.ts
CHANGED
|
@@ -21,6 +21,7 @@ import { Extension, ExtensionPackage, ExtensionPackageOptions, RawExtensionPacka
|
|
|
21
21
|
import { ExtensionPackageCollector } from './extension-package-collector';
|
|
22
22
|
import { ApplicationProps } from './application-props';
|
|
23
23
|
import deepmerge = require('deepmerge');
|
|
24
|
+
import resolvePackagePath = require('resolve-package-path');
|
|
24
25
|
|
|
25
26
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
26
27
|
export type ApplicationLog = (message?: any, ...optionalParams: any[]) => void;
|
|
@@ -281,8 +282,14 @@ export class ApplicationPackage {
|
|
|
281
282
|
*/
|
|
282
283
|
get resolveModule(): ApplicationModuleResolver {
|
|
283
284
|
if (!this._moduleResolver) {
|
|
284
|
-
const resolutionPaths =
|
|
285
|
-
this._moduleResolver = modulePath =>
|
|
285
|
+
const resolutionPaths = this.packagePath || process.cwd();
|
|
286
|
+
this._moduleResolver = modulePath => {
|
|
287
|
+
const resolved = resolvePackagePath(modulePath, resolutionPaths);
|
|
288
|
+
if (!resolved) {
|
|
289
|
+
throw new Error('Could not resolve module: ' + modulePath);
|
|
290
|
+
}
|
|
291
|
+
return resolved;
|
|
292
|
+
};
|
|
286
293
|
}
|
|
287
294
|
return this._moduleResolver!;
|
|
288
295
|
}
|
|
@@ -62,8 +62,8 @@ export class ExtensionPackageCollector {
|
|
|
62
62
|
|
|
63
63
|
let packagePath: string | undefined;
|
|
64
64
|
try {
|
|
65
|
-
packagePath = this.resolveModule(name
|
|
66
|
-
} catch
|
|
65
|
+
packagePath = this.resolveModule(name);
|
|
66
|
+
} catch {
|
|
67
67
|
console.warn(`Failed to resolve module: ${name}`);
|
|
68
68
|
}
|
|
69
69
|
if (!packagePath) {
|