@forge/cli 12.2.0 → 12.3.0-next.0-experimental-8a53773
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/CHANGELOG.md +46 -0
- package/npm-shrinkwrap.json +46 -44
- package/out/analytics-client/analytics-client.d.ts +21 -11
- package/out/analytics-client/analytics-client.d.ts.map +1 -1
- package/out/analytics-client/analytics-client.js +33 -23
- package/out/analytics-client/analytics-client.js.map +1 -1
- package/out/analytics-client/analytics-message-handler.d.ts +13 -5
- package/out/analytics-client/analytics-message-handler.d.ts.map +1 -1
- package/out/analytics-client/analytics-message-handler.js +8 -7
- package/out/analytics-client/analytics-message-handler.js.map +1 -1
- package/out/bin/postinstall.js +18 -13
- package/out/bin/postinstall.js.map +1 -1
- package/out/command-line/command.d.ts +1 -2
- package/out/command-line/command.d.ts.map +1 -1
- package/out/command-line/command.js +9 -21
- package/out/command-line/command.js.map +1 -1
- package/out/command-line/controller/install-controller.d.ts +1 -1
- package/out/command-line/controller/install-controller.d.ts.map +1 -1
- package/out/command-line/controller/install-controller.js +5 -4
- package/out/command-line/controller/install-controller.js.map +1 -1
- package/out/command-line/dependency-injection.d.ts +4 -1
- package/out/command-line/dependency-injection.d.ts.map +1 -1
- package/out/command-line/dependency-injection.js +10 -5
- package/out/command-line/dependency-injection.js.map +1 -1
- package/out/command-line/register-app-commands.d.ts +3 -2
- package/out/command-line/register-app-commands.d.ts.map +1 -1
- package/out/command-line/register-app-commands.js +42 -6
- package/out/command-line/register-app-commands.js.map +1 -1
- package/out/command-line/register-authentication-command.d.ts +1 -2
- package/out/command-line/register-authentication-command.d.ts.map +1 -1
- package/out/command-line/register-authentication-command.js +0 -1
- package/out/command-line/register-authentication-command.js.map +1 -1
- package/out/deploy/packager/packager.d.ts +3 -1
- package/out/deploy/packager/packager.d.ts.map +1 -1
- package/out/deploy/packager/packager.js +17 -1
- package/out/deploy/packager/packager.js.map +1 -1
- package/out/deploy/packager/runtime-bundler.d.ts +4 -4
- package/out/deploy/packager/runtime-bundler.d.ts.map +1 -1
- package/out/deploy/packager/runtime-bundler.js +7 -9
- package/out/deploy/packager/runtime-bundler.js.map +1 -1
- package/out/devspace/devspace-service.d.ts +16 -0
- package/out/devspace/devspace-service.d.ts.map +1 -0
- package/out/devspace/devspace-service.js +103 -0
- package/out/devspace/devspace-service.js.map +1 -0
- package/out/devspace/graphql-client.d.ts +39 -0
- package/out/devspace/graphql-client.d.ts.map +1 -0
- package/out/devspace/graphql-client.js +116 -0
- package/out/devspace/graphql-client.js.map +1 -0
- package/out/devspace/index.d.ts +3 -0
- package/out/devspace/index.d.ts.map +1 -0
- package/out/devspace/index.js +6 -0
- package/out/devspace/index.js.map +1 -0
- package/out/service/tunnel-analytics-service.d.ts +2 -2
- package/out/service/tunnel-analytics-service.d.ts.map +1 -1
- package/out/service/tunnel-analytics-service.js +2 -2
- package/out/service/tunnel-analytics-service.js.map +1 -1
- package/out/service/tunnel-service.js +1 -1
- package/out/service/tunnel-service.js.map +1 -1
- package/package.json +8 -8
|
@@ -1,11 +1,10 @@
|
|
|
1
|
-
import { CredentialGetter, Logger, LoginCommand,
|
|
1
|
+
import { CredentialGetter, Logger, LoginCommand, UI, UserRepository } from '@forge/cli-shared';
|
|
2
2
|
import { Dependencies } from './dependency-injection';
|
|
3
3
|
export interface LoginCommandOptions {
|
|
4
4
|
email?: string;
|
|
5
5
|
token?: string;
|
|
6
6
|
}
|
|
7
7
|
export declare function loginCommandHandler(ui: UI, instructionsUrl: string, loginCommand: LoginCommand, { email, token }: LoginCommandOptions): Promise<{
|
|
8
|
-
creds: PersonalApiCredentialsValidated;
|
|
9
8
|
analytics: {
|
|
10
9
|
userId: string;
|
|
11
10
|
anonymousId: string | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"register-authentication-command.d.ts","sourceRoot":"","sources":["../../src/command-line/register-authentication-command.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,gBAAgB,EAEhB,MAAM,EACN,YAAY,
|
|
1
|
+
{"version":3,"file":"register-authentication-command.d.ts","sourceRoot":"","sources":["../../src/command-line/register-authentication-command.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,gBAAgB,EAEhB,MAAM,EACN,YAAY,EAEZ,EAAE,EAEF,cAAc,EAEf,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAYtD,MAAM,WAAW,mBAAmB;IAClC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,wBAAsB,mBAAmB,CACvC,EAAE,EAAE,EAAE,EACN,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,YAAY,EAC1B,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,mBAAmB,GACpC,OAAO,CAAC;IAAE,SAAS,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAA;CAAE,CAAC,CAoC7E;AA0BD,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,MAAM,EACd,gBAAgB,EAAE,gBAAgB,EAClC,cAAc,EAAE,cAAc,GAC7B,OAAO,CAAC,IAAI,CAAC,CAgBf;AASD,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,YAAY,QAIlD"}
|
|
@@ -33,7 +33,6 @@ async function loginCommandHandler(ui, instructionsUrl, loginCommand, { email, t
|
|
|
33
33
|
ui.emptyLine();
|
|
34
34
|
ui.info(cli_shared_1.Text.login.nextStep);
|
|
35
35
|
return {
|
|
36
|
-
creds: { email, token, accountId: user.accountId },
|
|
37
36
|
analytics: { userId: user.accountId, anonymousId: (0, anon_user_id_1.getAnonId)(true) }
|
|
38
37
|
};
|
|
39
38
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"register-authentication-command.js","sourceRoot":"","sources":["../../src/command-line/register-authentication-command.ts"],"names":[],"mappings":";;;;AAAA,0EAAyC;AAEzC,
|
|
1
|
+
{"version":3,"file":"register-authentication-command.js","sourceRoot":"","sources":["../../src/command-line/register-authentication-command.ts"],"names":[],"mappings":";;;;AAAA,0EAAyC;AAEzC,kDAW2B;AAE3B,iDAA2C;AAE3C,SAAS,UAAU;IACjB,MAAM,KAAK,GAAG,uBAAY,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,UAAU,EAAE,YAAY,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACrH,IAAI,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,KAAK,EAAE;QAC/B,OAAO,SAAS,CAAC;KAClB;IAED,OAAO,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;AAC7B,CAAC;AAOM,KAAK,UAAU,mBAAmB,CACvC,EAAM,EACN,eAAuB,EACvB,YAA0B,EAC1B,EAAE,KAAK,EAAE,KAAK,EAAuB;IAErC,IAAI;QACF,EAAE,CAAC,IAAI,CAAC,iBAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAC9B,EAAE,CAAC,IAAI,CAAC,iBAAI,CAAC,KAAK,CAAC,CAAC;QAEpB,EAAE,CAAC,SAAS,EAAE,CAAC;QAEf,IAAI,CAAC,KAAK,EAAE;YACV,MAAM,UAAU,GAAG,UAAU,EAAE,CAAC;YAChC,KAAK,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,iBAAI,CAAC,KAAK,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;YACnE,EAAE,CAAC,SAAS,EAAE,CAAC;SAChB;QAED,IAAI,CAAC,KAAK,EAAE;YACV,EAAE,CAAC,IAAI,CAAC,iBAAI,CAAC,KAAK,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC;YAEzC,EAAE,CAAC,SAAS,EAAE,CAAC;YACf,KAAK,GAAG,MAAM,EAAE,CAAC,eAAe,CAAC,iBAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;YACzD,EAAE,CAAC,SAAS,EAAE,CAAC;SAChB;QAED,MAAM,IAAI,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;QAC9B,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,eAAe,CACnC,GAAG,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,EAChC,iBAAI,CAAC,KAAK,CAAC,QAAQ,EACnB,CAAC,IAAI,EAAE,EAAE,CAAC,iBAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CACxC,CAAC;QAEF,EAAE,CAAC,SAAS,EAAE,CAAC;QACf,EAAE,CAAC,IAAI,CAAC,iBAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC7B,OAAO;YACL,SAAS,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,SAAS,EAAE,WAAW,EAAE,IAAA,wBAAS,EAAC,IAAI,CAAC,EAAE;SACpE,CAAC;KACH;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,KAAK,YAAY,8BAAiB,CAAC,CAAC,CAAC,IAAI,8BAAiB,CAAC,iBAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;KAC5F;AACH,CAAC;AAzCD,kDAyCC;AAED,SAAS,oBAAoB,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,YAAY,EAAE,EAAgB;IACjF,MAAM,eAAe,GAAG,IAAA,+BAAkB,GAAE,CAAC;IAE7C,GAAG;SACA,OAAO,CAAC,OAAO,CAAC;SAChB,WAAW,CAAC,iBAAI,CAAC,KAAK,CAAC,GAAG,CAAC;SAC3B,MAAM,CAAC,0BAA0B,EAAE,iBAAI,CAAC,KAAK,CAAC,WAAW,CAAC;SAC1D,MAAM,CAAC,yBAAyB,EAAE,iBAAI,CAAC,KAAK,CAAC,WAAW,CAAC;SACzD,uBAAuB,EAAE;SACzB,oBAAoB,CAAC,SAAS,EAAE,SAAS,CAAC;SAC1C,MAAM,CAAC,CAAC,OAA4B,EAAE,EAAE,CAAC,mBAAmB,CAAC,EAAE,EAAE,eAAe,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC,CAAC;AAC/G,CAAC;AAED,SAAS,qBAAqB,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,aAAa,EAAE,EAAgB;IACnF,GAAG;SACA,OAAO,CAAC,QAAQ,CAAC;SACjB,WAAW,CAAC,iBAAI,CAAC,MAAM,CAAC,GAAG,CAAC;SAC5B,uBAAuB,EAAE;SACzB,MAAM,CAAC,KAAK,IAAI,EAAE;QACjB,MAAM,aAAa,CAAC,OAAO,EAAE,CAAC;QAC9B,EAAE,CAAC,IAAI,CAAC,iBAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IACjC,CAAC,CAAC,CAAC;AACP,CAAC;AAEM,KAAK,UAAU,oBAAoB,CACxC,MAAc,EACd,gBAAkC,EAClC,cAA8B;IAE9B,IAAI;QACF,MAAM,WAAW,GAAG,MAAM,gBAAgB,CAAC,cAAc,EAAE,CAAC;QAC5D,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,MAAM,cAAc,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QACtE,MAAM,CAAC,IAAI,CAAC,iBAAI,CAAC,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC,WAAW,CAAC,KAAK,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;KAC1F;IAAC,OAAO,KAAK,EAAE;QACd,IAAI,KAAK,YAAY,8BAAiB,EAAE;YACtC,IAAI,OAAO,CAAC,GAAG,CAAC,sBAAS,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,0BAAa,CAAC,EAAE;gBACxD,MAAM,IAAI,8BAAiB,CAAC,iBAAI,CAAC,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,sBAAS,EAAE,0BAAa,CAAC,CAAC,CAAC;aACjG;iBAAM;gBACL,MAAM,IAAI,8BAAiB,CAAC,iBAAI,CAAC,MAAM,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;aAC1E;SACF;QAED,MAAM,KAAK,CAAC;KACb;AACH,CAAC;AApBD,oDAoBC;AAED,SAAS,qBAAqB,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,eAAe,EAAE,cAAc,EAAE,EAAgB;IACrG,GAAG;SACA,OAAO,CAAC,QAAQ,CAAC;SACjB,WAAW,CAAC,iBAAI,CAAC,MAAM,CAAC,GAAG,CAAC;SAC5B,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC,oBAAoB,CAAC,EAAE,EAAE,eAAe,EAAE,cAAc,CAAC,CAAC,CAAC;AACnF,CAAC;AAED,SAAgB,gBAAgB,CAAC,IAAkB;IACjD,oBAAoB,CAAC,IAAI,CAAC,CAAC;IAC3B,qBAAqB,CAAC,IAAI,CAAC,CAAC;IAC5B,qBAAqB,CAAC,IAAI,CAAC,CAAC;AAC9B,CAAC;AAJD,4CAIC"}
|
|
@@ -2,6 +2,7 @@ import { Handler, type I18nResourceBundle, Logger, ResourceDetails } from '@forg
|
|
|
2
2
|
import { NativeUIBundler } from '@forge/bundler';
|
|
3
3
|
import { App, Translations } from '@forge/manifest';
|
|
4
4
|
import { RuntimeBundler } from './runtime-bundler';
|
|
5
|
+
import { AnalyticsClientReporter } from '../../analytics-client/analytics-client';
|
|
5
6
|
export interface PackageResult {
|
|
6
7
|
runtimeArchivePath: string;
|
|
7
8
|
nativeUiBundlesDetails: ResourceDetails[];
|
|
@@ -14,7 +15,8 @@ export declare class AppPackager implements Packager {
|
|
|
14
15
|
private readonly runtimeBundler;
|
|
15
16
|
private readonly nativeUiBundler;
|
|
16
17
|
private readonly logger;
|
|
17
|
-
|
|
18
|
+
private readonly analyticsClient;
|
|
19
|
+
constructor(runtimeBundler: RuntimeBundler, nativeUiBundler: NativeUIBundler, logger: Logger, analyticsClient: AnalyticsClientReporter);
|
|
18
20
|
package(handlers: Handler[], resources: ResourceDetails[], packageConfig: App['package'], i18nResourceBundle: I18nResourceBundle, i18nConfig?: Translations): Promise<PackageResult>;
|
|
19
21
|
}
|
|
20
22
|
//# sourceMappingURL=packager.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packager.d.ts","sourceRoot":"","sources":["../../../src/deploy/packager/packager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,EAAE,eAAe,EAAQ,MAAM,mBAAmB,CAAC;AACpG,OAAO,
|
|
1
|
+
{"version":3,"file":"packager.d.ts","sourceRoot":"","sources":["../../../src/deploy/packager/packager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,EAAE,eAAe,EAAQ,MAAM,mBAAmB,CAAC;AACpG,OAAO,EAAkC,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjF,OAAO,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAEpD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAyB,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AAGzG,MAAM,WAAW,aAAa;IAC5B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,sBAAsB,EAAE,eAAe,EAAE,CAAC;IAC1C,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,MAAM,WAAW,QAAQ;IACvB,OAAO,CACL,QAAQ,EAAE,OAAO,EAAE,EACnB,SAAS,EAAE,eAAe,EAAE,EAC5B,aAAa,EAAE,GAAG,CAAC,SAAS,CAAC,EAC7B,kBAAkB,EAAE,kBAAkB,EACtC,UAAU,CAAC,EAAE,YAAY,GACxB,OAAO,CAAC,aAAa,CAAC,CAAC;CAC3B;AAED,qBAAa,WAAY,YAAW,QAAQ;IAExC,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,eAAe;gBAHf,cAAc,EAAE,cAAc,EAC9B,eAAe,EAAE,eAAe,EAChC,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,uBAAuB;IAG9C,OAAO,CAClB,QAAQ,EAAE,OAAO,EAAE,EACnB,SAAS,EAAE,eAAe,EAAE,EAC5B,aAAa,EAAE,GAAG,CAAC,SAAS,CAAC,EAC7B,kBAAkB,EAAE,kBAAkB,EACtC,UAAU,CAAC,EAAE,YAAY,GACxB,OAAO,CAAC,aAAa,CAAC;CAe1B"}
|
|
@@ -2,19 +2,25 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.AppPackager = void 0;
|
|
4
4
|
const cli_shared_1 = require("@forge/cli-shared");
|
|
5
|
+
const bundler_1 = require("@forge/bundler");
|
|
6
|
+
const process_1 = require("process");
|
|
5
7
|
class AppPackager {
|
|
6
8
|
runtimeBundler;
|
|
7
9
|
nativeUiBundler;
|
|
8
10
|
logger;
|
|
9
|
-
|
|
11
|
+
analyticsClient;
|
|
12
|
+
constructor(runtimeBundler, nativeUiBundler, logger, analyticsClient) {
|
|
10
13
|
this.runtimeBundler = runtimeBundler;
|
|
11
14
|
this.nativeUiBundler = nativeUiBundler;
|
|
12
15
|
this.logger = logger;
|
|
16
|
+
this.analyticsClient = analyticsClient;
|
|
13
17
|
}
|
|
14
18
|
async package(handlers, resources, packageConfig, i18nResourceBundle, i18nConfig) {
|
|
15
19
|
this.logger.info(cli_shared_1.Text.deploy.taskPackage.title);
|
|
16
20
|
const runtimeBundle = await this.runtimeBundler.bundle(handlers, i18nResourceBundle, packageConfig);
|
|
17
21
|
const nativeUiBundle = await this.nativeUiBundler.bundleResources(resources, i18nConfig);
|
|
22
|
+
const metadata = getAppMetadata({ bundleMetadata: (0, bundler_1.mergeMetadata)(runtimeBundle.metadata, nativeUiBundle.metadata) });
|
|
23
|
+
await this.analyticsClient.reportAppPackaged(metadata);
|
|
18
24
|
return {
|
|
19
25
|
...runtimeBundle,
|
|
20
26
|
...nativeUiBundle
|
|
@@ -22,4 +28,14 @@ class AppPackager {
|
|
|
22
28
|
}
|
|
23
29
|
}
|
|
24
30
|
exports.AppPackager = AppPackager;
|
|
31
|
+
function getAppMetadata({ bundleMetadata }) {
|
|
32
|
+
return {
|
|
33
|
+
jsFiles: bundleMetadata.jsFiles,
|
|
34
|
+
tsFiles: bundleMetadata.tsFiles,
|
|
35
|
+
esm: bundleMetadata.esm,
|
|
36
|
+
dependencies: Array.from(bundleMetadata.dependencies),
|
|
37
|
+
sdkImports: Array.from(bundleMetadata.sdkImports),
|
|
38
|
+
isCI: process_1.env.CI === 'true'
|
|
39
|
+
};
|
|
40
|
+
}
|
|
25
41
|
//# sourceMappingURL=packager.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packager.js","sourceRoot":"","sources":["../../../src/deploy/packager/packager.ts"],"names":[],"mappings":";;;AAAA,kDAAoG;
|
|
1
|
+
{"version":3,"file":"packager.js","sourceRoot":"","sources":["../../../src/deploy/packager/packager.ts"],"names":[],"mappings":";;;AAAA,kDAAoG;AACpG,4CAAiF;AAKjF,qCAA8B;AAkB9B,MAAa,WAAW;IAEH;IACA;IACA;IACA;IAJnB,YACmB,cAA8B,EAC9B,eAAgC,EAChC,MAAc,EACd,eAAwC;QAHxC,mBAAc,GAAd,cAAc,CAAgB;QAC9B,oBAAe,GAAf,eAAe,CAAiB;QAChC,WAAM,GAAN,MAAM,CAAQ;QACd,oBAAe,GAAf,eAAe,CAAyB;IACxD,CAAC;IAEG,KAAK,CAAC,OAAO,CAClB,QAAmB,EACnB,SAA4B,EAC5B,aAA6B,EAC7B,kBAAsC,EACtC,UAAyB;QAEzB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAI,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAEhD,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,QAAQ,EAAE,kBAAkB,EAAE,aAAa,CAAC,CAAC;QACpG,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;QAEzF,MAAM,QAAQ,GAAG,cAAc,CAAC,EAAE,cAAc,EAAE,IAAA,uBAAa,EAAC,aAAa,CAAC,QAAQ,EAAE,cAAc,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QAEpH,MAAM,IAAI,CAAC,eAAe,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;QAEvD,OAAO;YACL,GAAG,aAAa;YAChB,GAAG,cAAc;SAClB,CAAC;IACJ,CAAC;CACF;AA7BD,kCA6BC;AAED,SAAS,cAAc,CAAC,EAAE,cAAc,EAAuC;IAC7E,OAAO;QACL,OAAO,EAAE,cAAc,CAAC,OAAO;QAC/B,OAAO,EAAE,cAAc,CAAC,OAAO;QAC/B,GAAG,EAAE,cAAc,CAAC,GAAG;QACvB,YAAY,EAAE,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC;QACrD,UAAU,EAAE,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC;QACjD,IAAI,EAAE,aAAG,CAAC,EAAE,KAAK,MAAM;KACxB,CAAC;AACJ,CAAC"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import { Bundler, EntryPoint } from '@forge/bundler';
|
|
1
|
+
import { Bundler, BundlerMetadata, EntryPoint } from '@forge/bundler';
|
|
2
2
|
import { Handler, Logger, FileSystemReader, ConfigReader, type I18nResourceBundle } from '@forge/cli-shared';
|
|
3
3
|
import { App } from '@forge/manifest';
|
|
4
4
|
import { Archiver } from './archiver';
|
|
5
5
|
export interface RuntimeBundleResult {
|
|
6
6
|
runtimeArchivePath: string;
|
|
7
|
-
|
|
7
|
+
metadata: BundlerMetadata;
|
|
8
8
|
}
|
|
9
9
|
export declare class RuntimeBundler {
|
|
10
10
|
private readonly archiverFactory;
|
|
@@ -13,9 +13,9 @@ export declare class RuntimeBundler {
|
|
|
13
13
|
protected readonly fileSystemReader: FileSystemReader;
|
|
14
14
|
private readonly configReader;
|
|
15
15
|
constructor(archiverFactory: () => Archiver, logger: Logger, bundler: Bundler, fileSystemReader: FileSystemReader, configReader: ConfigReader);
|
|
16
|
-
protected packageCode(archiver: Archiver, entryPoints: EntryPoint[], i18nResourceBundle: I18nResourceBundle): Promise<
|
|
16
|
+
protected packageCode(archiver: Archiver, entryPoints: EntryPoint[], i18nResourceBundle: I18nResourceBundle): Promise<BundlerMetadata>;
|
|
17
17
|
protected packageDependencies(archiver: Archiver): Promise<void>;
|
|
18
|
-
protected packageAll(archiver: Archiver, handlers: Handler[], packageConfig: App['package'], i18nResourceBundle: I18nResourceBundle): Promise<
|
|
18
|
+
protected packageAll(archiver: Archiver, handlers: Handler[], packageConfig: App['package'], i18nResourceBundle: I18nResourceBundle): Promise<BundlerMetadata>;
|
|
19
19
|
protected packageI18nResources(archiver: Archiver, i18nResourceBundle: I18nResourceBundle): void;
|
|
20
20
|
bundle(handlers: Handler[], i18nResourceBundle: I18nResourceBundle, packageConfig?: App['package']): Promise<RuntimeBundleResult>;
|
|
21
21
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime-bundler.d.ts","sourceRoot":"","sources":["../../../src/deploy/packager/runtime-bundler.ts"],"names":[],"mappings":"AAEA,OAAO,
|
|
1
|
+
{"version":3,"file":"runtime-bundler.d.ts","sourceRoot":"","sources":["../../../src/deploy/packager/runtime-bundler.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,OAAO,EAEP,eAAe,EAEf,UAAU,EAIX,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAEL,OAAO,EACP,MAAM,EAEN,gBAAgB,EAEhB,YAAY,EAEZ,KAAK,kBAAkB,EACxB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAEtC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAGtC,MAAM,WAAW,mBAAmB;IAClC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,QAAQ,EAAE,eAAe,CAAC;CAC3B;AAED,qBAAa,cAAc;IAEvB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB;IACrD,OAAO,CAAC,QAAQ,CAAC,YAAY;gBAJZ,eAAe,EAAE,MAAM,QAAQ,EAC/B,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO,EACd,gBAAgB,EAAE,gBAAgB,EACpC,YAAY,EAAE,YAAY;cAG7B,WAAW,CACzB,QAAQ,EAAE,QAAQ,EAClB,WAAW,EAAE,UAAU,EAAE,EACzB,kBAAkB,EAAE,kBAAkB,GACrC,OAAO,CAAC,eAAe,CAAC;cA0BX,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;cActD,UAAU,CACxB,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,OAAO,EAAE,EACnB,aAAa,EAAE,GAAG,CAAC,SAAS,CAAC,EAC7B,kBAAkB,EAAE,kBAAkB,GACrC,OAAO,CAAC,eAAe,CAAC;IAe3B,SAAS,CAAC,oBAAoB,CAAC,QAAQ,EAAE,QAAQ,EAAE,kBAAkB,EAAE,kBAAkB,GAAG,IAAI;IAMnF,MAAM,CACjB,QAAQ,EAAE,OAAO,EAAE,EACnB,kBAAkB,EAAE,kBAAkB,EACtC,aAAa,CAAC,EAAE,GAAG,CAAC,SAAS,CAAC,GAC7B,OAAO,CAAC,mBAAmB,CAAC;CAgBhC"}
|
|
@@ -20,7 +20,7 @@ class RuntimeBundler {
|
|
|
20
20
|
this.configReader = configReader;
|
|
21
21
|
}
|
|
22
22
|
async packageCode(archiver, entryPoints, i18nResourceBundle) {
|
|
23
|
-
|
|
23
|
+
let combinedMetadata = (0, bundler_1.emptyMetadata)();
|
|
24
24
|
if (entryPoints.length > 0) {
|
|
25
25
|
let bundlerResponse;
|
|
26
26
|
try {
|
|
@@ -31,16 +31,14 @@ class RuntimeBundler {
|
|
|
31
31
|
}
|
|
32
32
|
const { outputDir, metadata } = bundlerResponse;
|
|
33
33
|
if (metadata) {
|
|
34
|
-
|
|
35
|
-
moduleList.push(...metadata.modules);
|
|
36
|
-
}
|
|
34
|
+
combinedMetadata = (0, bundler_1.mergeMetadata)(combinedMetadata, metadata);
|
|
37
35
|
}
|
|
38
36
|
this.logger.debug(cli_shared_1.Text.deploy.taskPackage.packageBundledFiles);
|
|
39
37
|
for (const name of await this.fileSystemReader.getFileGlobList([`${outputDir}/**`])) {
|
|
40
38
|
archiver.addFileFrom(path_1.default.relative(outputDir, name), name);
|
|
41
39
|
}
|
|
42
40
|
}
|
|
43
|
-
return
|
|
41
|
+
return combinedMetadata;
|
|
44
42
|
}
|
|
45
43
|
async packageDependencies(archiver) {
|
|
46
44
|
const manifest = JSON.stringify(await this.configReader.readConfig());
|
|
@@ -54,13 +52,13 @@ class RuntimeBundler {
|
|
|
54
52
|
}
|
|
55
53
|
async packageAll(archiver, handlers, packageConfig, i18nResourceBundle) {
|
|
56
54
|
const entryPoints = (0, bundler_1.getEntryPoints)(handlers);
|
|
57
|
-
const
|
|
55
|
+
const metadata = await this.packageCode(archiver, entryPoints, i18nResourceBundle);
|
|
58
56
|
await this.packageDependencies(archiver);
|
|
59
57
|
const files = await this.fileSystemReader.getFileGlobList(packageConfig?.extraFiles ?? []);
|
|
60
58
|
for (const fileName of files) {
|
|
61
59
|
archiver.addFileFrom(fileName, fileName);
|
|
62
60
|
}
|
|
63
|
-
return
|
|
61
|
+
return metadata;
|
|
64
62
|
}
|
|
65
63
|
packageI18nResources(archiver, i18nResourceBundle) {
|
|
66
64
|
(0, cli_shared_1.listFilesInI18nResourceBundle)(i18nResourceBundle).forEach(([fileName, filePath]) => {
|
|
@@ -69,13 +67,13 @@ class RuntimeBundler {
|
|
|
69
67
|
}
|
|
70
68
|
async bundle(handlers, i18nResourceBundle, packageConfig) {
|
|
71
69
|
const archiver = this.archiverFactory();
|
|
72
|
-
const
|
|
70
|
+
const metadata = await this.packageAll(archiver, handlers, packageConfig, i18nResourceBundle);
|
|
73
71
|
if (handlers.length === 0) {
|
|
74
72
|
this.packageI18nResources(archiver, i18nResourceBundle);
|
|
75
73
|
}
|
|
76
74
|
const archivePath = await archiver.finalise();
|
|
77
75
|
this.logger.debug(cli_shared_1.Text.deploy.taskPackage.archiveCreated(archivePath));
|
|
78
|
-
return { runtimeArchivePath: archivePath,
|
|
76
|
+
return { runtimeArchivePath: archivePath, metadata };
|
|
79
77
|
}
|
|
80
78
|
}
|
|
81
79
|
exports.RuntimeBundler = RuntimeBundler;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime-bundler.js","sourceRoot":"","sources":["../../../src/deploy/packager/runtime-bundler.ts"],"names":[],"mappings":";;;;AAAA,wDAAwB;AAExB,
|
|
1
|
+
{"version":3,"file":"runtime-bundler.js","sourceRoot":"","sources":["../../../src/deploy/packager/runtime-bundler.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import { CommandLineUI } from '@forge/cli-shared';
|
|
2
|
+
import { DevSpaceClient, DevSpaceDetails, DevSpaceCreateResult } from './graphql-client';
|
|
3
|
+
export declare class DevSpaceService {
|
|
4
|
+
private readonly devSpaceClient;
|
|
5
|
+
constructor(devSpaceClient: DevSpaceClient);
|
|
6
|
+
private fetchAllDevSpaces;
|
|
7
|
+
private doesDevSpaceAlreadyExists;
|
|
8
|
+
getDevSpaces(ui: CommandLineUI): Promise<DevSpaceDetails[]>;
|
|
9
|
+
selectDevSpace(ui: CommandLineUI, devSpaces: DevSpaceDetails[]): Promise<{
|
|
10
|
+
devSpace: DevSpaceDetails;
|
|
11
|
+
isNewlyCreated: boolean;
|
|
12
|
+
} | null>;
|
|
13
|
+
createDevSpaceFlow(ui: CommandLineUI): Promise<DevSpaceCreateResult | null>;
|
|
14
|
+
private promptForNameAndCreate;
|
|
15
|
+
}
|
|
16
|
+
//# sourceMappingURL=devspace-service.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"devspace-service.d.ts","sourceRoot":"","sources":["../../src/devspace/devspace-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAQ,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAMzF,qBAAa,eAAe;IACd,OAAO,CAAC,QAAQ,CAAC,cAAc;gBAAd,cAAc,EAAE,cAAc;YAE7C,iBAAiB;IAU/B,OAAO,CAAC,yBAAyB;IAKpB,YAAY,CAAC,EAAE,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IAI3D,cAAc,CACzB,EAAE,EAAE,aAAa,EACjB,SAAS,EAAE,eAAe,EAAE,GAC3B,OAAO,CAAC;QAAE,QAAQ,EAAE,eAAe,CAAC;QAAC,cAAc,EAAE,OAAO,CAAA;KAAE,GAAG,IAAI,CAAC;IA2C5D,kBAAkB,CAAC,EAAE,EAAE,aAAa,GAAG,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC;YAS1E,sBAAsB;CAiCrC"}
|
|
@@ -0,0 +1,103 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.DevSpaceService = void 0;
|
|
4
|
+
const cli_shared_1 = require("@forge/cli-shared");
|
|
5
|
+
const DEV_SPACE_ERROR_MESSAGES = {
|
|
6
|
+
NAME_ALREADY_EXISTS: 'Developer space with this name already exists'
|
|
7
|
+
};
|
|
8
|
+
class DevSpaceService {
|
|
9
|
+
devSpaceClient;
|
|
10
|
+
constructor(devSpaceClient) {
|
|
11
|
+
this.devSpaceClient = devSpaceClient;
|
|
12
|
+
}
|
|
13
|
+
async fetchAllDevSpaces() {
|
|
14
|
+
const devSpaceIds = await this.devSpaceClient.getDevSpacesWithLinkingAccess();
|
|
15
|
+
if (!devSpaceIds || devSpaceIds.length === 0) {
|
|
16
|
+
return [];
|
|
17
|
+
}
|
|
18
|
+
return await this.devSpaceClient.getDevSpaceDetails(devSpaceIds);
|
|
19
|
+
}
|
|
20
|
+
doesDevSpaceAlreadyExists(error) {
|
|
21
|
+
const errorMessage = error instanceof Error ? error.message : String(error);
|
|
22
|
+
return errorMessage.includes(DEV_SPACE_ERROR_MESSAGES.NAME_ALREADY_EXISTS);
|
|
23
|
+
}
|
|
24
|
+
async getDevSpaces(ui) {
|
|
25
|
+
return await ui.displayTemporaryMessage(() => this.fetchAllDevSpaces(), cli_shared_1.Text.devSpace.fetching);
|
|
26
|
+
}
|
|
27
|
+
async selectDevSpace(ui, devSpaces) {
|
|
28
|
+
try {
|
|
29
|
+
if (devSpaces.length === 0) {
|
|
30
|
+
ui.info(cli_shared_1.Text.devSpace.noSpacesFound(cli_shared_1.Text.devSpace.documentationLink));
|
|
31
|
+
const created = await this.createDevSpaceFlow(ui);
|
|
32
|
+
if (created) {
|
|
33
|
+
return { devSpace: { id: created.id, name: created.name }, isNewlyCreated: true };
|
|
34
|
+
}
|
|
35
|
+
return null;
|
|
36
|
+
}
|
|
37
|
+
const choices = devSpaces.map((ds) => ds.name);
|
|
38
|
+
choices.push(cli_shared_1.Text.devSpace.createNewOption);
|
|
39
|
+
const selectedName = await ui.promptForList(cli_shared_1.Text.devSpace.selectPrompt, choices);
|
|
40
|
+
if (selectedName === cli_shared_1.Text.devSpace.createNewOption) {
|
|
41
|
+
ui.info(cli_shared_1.Text.devSpace.createNewSpaceInfo(cli_shared_1.Text.devSpace.documentationLink));
|
|
42
|
+
ui.emptyLine();
|
|
43
|
+
try {
|
|
44
|
+
const created = await this.createDevSpaceFlow(ui);
|
|
45
|
+
if (created) {
|
|
46
|
+
return { devSpace: { id: created.id, name: created.name }, isNewlyCreated: true };
|
|
47
|
+
}
|
|
48
|
+
return null;
|
|
49
|
+
}
|
|
50
|
+
catch (error) {
|
|
51
|
+
const errorMessage = error instanceof Error ? error.message : String(error);
|
|
52
|
+
ui.error(new Error(cli_shared_1.Text.devSpace.error.create(errorMessage)));
|
|
53
|
+
return null;
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
const selectedDevSpace = devSpaces.find((ds) => ds.name === selectedName);
|
|
57
|
+
if (!selectedDevSpace) {
|
|
58
|
+
throw new Error(cli_shared_1.Text.devSpace.error.selectedNotFound);
|
|
59
|
+
}
|
|
60
|
+
return { devSpace: selectedDevSpace, isNewlyCreated: false };
|
|
61
|
+
}
|
|
62
|
+
catch (error) {
|
|
63
|
+
const errorMessage = error instanceof Error ? error.message : String(error);
|
|
64
|
+
ui.error(new Error(cli_shared_1.Text.devSpace.error.fetchOrSelect(errorMessage)));
|
|
65
|
+
return null;
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
async createDevSpaceFlow(ui) {
|
|
69
|
+
const cont = await ui.confirm(cli_shared_1.Text.devSpace.createContinuePrompt);
|
|
70
|
+
if (!cont) {
|
|
71
|
+
return null;
|
|
72
|
+
}
|
|
73
|
+
return await this.promptForNameAndCreate(ui);
|
|
74
|
+
}
|
|
75
|
+
async promptForNameAndCreate(ui, isRetry = false) {
|
|
76
|
+
if (isRetry) {
|
|
77
|
+
ui.info(cli_shared_1.Text.devSpace.error.nameAlreadyExists);
|
|
78
|
+
ui.emptyLine();
|
|
79
|
+
}
|
|
80
|
+
else {
|
|
81
|
+
ui.info(cli_shared_1.Text.devSpace.createMessage);
|
|
82
|
+
}
|
|
83
|
+
const name = await ui.promptForText(cli_shared_1.Text.devSpace.createPrompt);
|
|
84
|
+
if (!name || !name.trim()) {
|
|
85
|
+
ui.info(cli_shared_1.Text.devSpace.nameRequired);
|
|
86
|
+
return null;
|
|
87
|
+
}
|
|
88
|
+
ui.emptyLine();
|
|
89
|
+
ui.clearSpinner();
|
|
90
|
+
try {
|
|
91
|
+
const result = await ui.displayProgress(() => this.devSpaceClient.createDevSpace({ name: name.trim() }), cli_shared_1.Text.devSpace.createInProgress, (result) => cli_shared_1.Text.devSpace.createdAndContributing(result.name));
|
|
92
|
+
return result;
|
|
93
|
+
}
|
|
94
|
+
catch (error) {
|
|
95
|
+
if (this.doesDevSpaceAlreadyExists(error)) {
|
|
96
|
+
return await this.promptForNameAndCreate(ui, true);
|
|
97
|
+
}
|
|
98
|
+
throw error;
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
exports.DevSpaceService = DevSpaceService;
|
|
103
|
+
//# sourceMappingURL=devspace-service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"devspace-service.js","sourceRoot":"","sources":["../../src/devspace/devspace-service.ts"],"names":[],"mappings":";;;AAAA,kDAAwD;AAGxD,MAAM,wBAAwB,GAAG;IAC/B,mBAAmB,EAAE,+CAA+C;CACrE,CAAC;AAEF,MAAa,eAAe;IACG;IAA7B,YAA6B,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;IAAG,CAAC;IAEvD,KAAK,CAAC,iBAAiB;QAC7B,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,6BAA6B,EAAE,CAAC;QAE9E,IAAI,CAAC,WAAW,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE;YAC5C,OAAO,EAAE,CAAC;SACX;QAED,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;IACnE,CAAC;IAEO,yBAAyB,CAAC,KAAc;QAC9C,MAAM,YAAY,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC5E,OAAO,YAAY,CAAC,QAAQ,CAAC,wBAAwB,CAAC,mBAAmB,CAAC,CAAC;IAC7E,CAAC;IAEM,KAAK,CAAC,YAAY,CAAC,EAAiB;QACzC,OAAO,MAAM,EAAE,CAAC,uBAAuB,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,iBAAiB,EAAE,EAAE,iBAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAClG,CAAC;IAEM,KAAK,CAAC,cAAc,CACzB,EAAiB,EACjB,SAA4B;QAE5B,IAAI;YACF,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC1B,EAAE,CAAC,IAAI,CAAC,iBAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,iBAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,CAAC;gBACtE,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;gBAClD,IAAI,OAAO,EAAE;oBACX,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC;iBACnF;gBACD,OAAO,IAAI,CAAC;aACb;YAED,MAAM,OAAO,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;YAC/C,OAAO,CAAC,IAAI,CAAC,iBAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;YAC5C,MAAM,YAAY,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,iBAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;YAEjF,IAAI,YAAY,KAAK,iBAAI,CAAC,QAAQ,CAAC,eAAe,EAAE;gBAClD,EAAE,CAAC,IAAI,CAAC,iBAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,iBAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,CAAC;gBAC3E,EAAE,CAAC,SAAS,EAAE,CAAC;gBACf,IAAI;oBACF,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;oBAClD,IAAI,OAAO,EAAE;wBACX,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC;qBACnF;oBACD,OAAO,IAAI,CAAC;iBACb;gBAAC,OAAO,KAAK,EAAE;oBACd,MAAM,YAAY,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;oBAC5E,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,iBAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;oBAC9D,OAAO,IAAI,CAAC;iBACb;aACF;YAED,MAAM,gBAAgB,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,KAAK,YAAY,CAAC,CAAC;YAC1E,IAAI,CAAC,gBAAgB,EAAE;gBACrB,MAAM,IAAI,KAAK,CAAC,iBAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;aACvD;YACD,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,cAAc,EAAE,KAAK,EAAE,CAAC;SAC9D;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,YAAY,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC5E,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,iBAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;YACrE,OAAO,IAAI,CAAC;SACb;IACH,CAAC;IAEM,KAAK,CAAC,kBAAkB,CAAC,EAAiB;QAC/C,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,iBAAI,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAC;QAClE,IAAI,CAAC,IAAI,EAAE;YACT,OAAO,IAAI,CAAC;SACb;QAED,OAAO,MAAM,IAAI,CAAC,sBAAsB,CAAC,EAAE,CAAC,CAAC;IAC/C,CAAC;IAEO,KAAK,CAAC,sBAAsB,CAAC,EAAiB,EAAE,OAAO,GAAG,KAAK;QACrE,IAAI,OAAO,EAAE;YACX,EAAE,CAAC,IAAI,CAAC,iBAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;YAC/C,EAAE,CAAC,SAAS,EAAE,CAAC;SAChB;aAAM;YACL,EAAE,CAAC,IAAI,CAAC,iBAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;SACtC;QAED,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,iBAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;QAChE,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE;YACzB,EAAE,CAAC,IAAI,CAAC,iBAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;YACpC,OAAO,IAAI,CAAC;SACb;QAED,EAAE,CAAC,SAAS,EAAE,CAAC;QACf,EAAE,CAAC,YAAY,EAAE,CAAC;QAElB,IAAI;YACF,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,eAAe,CACrC,GAAG,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC,EAC/D,iBAAI,CAAC,QAAQ,CAAC,gBAAgB,EAC9B,CAAC,MAA4B,EAAE,EAAE,CAAC,iBAAI,CAAC,QAAQ,CAAC,sBAAsB,CAAC,MAAM,CAAC,IAAI,CAAC,CACpF,CAAC;YAEF,OAAO,MAAM,CAAC;SACf;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,IAAI,CAAC,yBAAyB,CAAC,KAAK,CAAC,EAAE;gBACzC,OAAO,MAAM,IAAI,CAAC,sBAAsB,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;aACpD;YAED,MAAM,KAAK,CAAC;SACb;IACH,CAAC;CACF;AA9GD,0CA8GC"}
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
import { GraphQLClient } from '@forge/cli-shared';
|
|
2
|
+
export interface DevSpaceDetails {
|
|
3
|
+
id: string;
|
|
4
|
+
name: string;
|
|
5
|
+
}
|
|
6
|
+
export interface DevSpaceBulkResult {
|
|
7
|
+
developerSpaceId: string;
|
|
8
|
+
success: boolean;
|
|
9
|
+
details?: {
|
|
10
|
+
name: string;
|
|
11
|
+
logo?: string;
|
|
12
|
+
};
|
|
13
|
+
error?: {
|
|
14
|
+
code: string;
|
|
15
|
+
message: string;
|
|
16
|
+
};
|
|
17
|
+
}
|
|
18
|
+
export interface DevConsoleCreateDeveloperSpaceInput {
|
|
19
|
+
name: string;
|
|
20
|
+
}
|
|
21
|
+
export interface DevSpaceCreateResult {
|
|
22
|
+
id: string;
|
|
23
|
+
name: string;
|
|
24
|
+
}
|
|
25
|
+
export interface DevSpaceClient {
|
|
26
|
+
getDevSpacesWithLinkingAccess(): Promise<string[]>;
|
|
27
|
+
getDevSpaceDetails(devSpaceIds: string[]): Promise<DevSpaceDetails[]>;
|
|
28
|
+
getDevSpaceDetailsBulk(devSpaceIds: string[]): Promise<DevSpaceBulkResult[]>;
|
|
29
|
+
createDevSpace(input: DevConsoleCreateDeveloperSpaceInput): Promise<DevSpaceCreateResult>;
|
|
30
|
+
}
|
|
31
|
+
export declare class DevSpaceGraphQLClient implements DevSpaceClient {
|
|
32
|
+
private readonly graphqlClient;
|
|
33
|
+
constructor(graphqlClient: GraphQLClient);
|
|
34
|
+
getDevSpacesWithLinkingAccess(): Promise<string[]>;
|
|
35
|
+
getDevSpaceDetails(devSpaceIds: string[]): Promise<DevSpaceDetails[]>;
|
|
36
|
+
getDevSpaceDetailsBulk(devSpaceIds: string[]): Promise<DevSpaceBulkResult[]>;
|
|
37
|
+
createDevSpace(input: DevConsoleCreateDeveloperSpaceInput): Promise<DevSpaceCreateResult>;
|
|
38
|
+
}
|
|
39
|
+
//# sourceMappingURL=graphql-client.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"graphql-client.d.ts","sourceRoot":"","sources":["../../src/devspace/graphql-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,aAAa,EAAwB,MAAM,mBAAmB,CAAC;AAElF,MAAM,WAAW,eAAe;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,kBAAkB;IACjC,gBAAgB,EAAE,MAAM,CAAC;IACzB,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE;QACR,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,CAAC,EAAE,MAAM,CAAC;KACf,CAAC;IACF,KAAK,CAAC,EAAE;QACN,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;CACH;AAED,MAAM,WAAW,mCAAmC;IAClD,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,oBAAoB;IACnC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,cAAc;IAC7B,6BAA6B,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IACnD,kBAAkB,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC,CAAC;IACtE,sBAAsB,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAAC;IAC7E,cAAc,CAAC,KAAK,EAAE,mCAAmC,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;CAC3F;AAED,qBAAa,qBAAsB,YAAW,cAAc;IAC9C,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAE5C,6BAA6B,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAoBlD,kBAAkB,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IA4BrE,sBAAsB,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC;IAmC5E,cAAc,CAAC,KAAK,EAAE,mCAAmC,GAAG,OAAO,CAAC,oBAAoB,CAAC;CA+CvG"}
|
|
@@ -0,0 +1,116 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.DevSpaceGraphQLClient = void 0;
|
|
4
|
+
const cli_shared_1 = require("@forge/cli-shared");
|
|
5
|
+
class DevSpaceGraphQLClient {
|
|
6
|
+
graphqlClient;
|
|
7
|
+
constructor(graphqlClient) {
|
|
8
|
+
this.graphqlClient = graphqlClient;
|
|
9
|
+
}
|
|
10
|
+
async getDevSpacesWithLinkingAccess() {
|
|
11
|
+
const query = `
|
|
12
|
+
query GetDevSpaceWithLinkingAccess {
|
|
13
|
+
ecosystem {
|
|
14
|
+
devConsole {
|
|
15
|
+
getDeveloperSpaceWithLinkingAccess
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
`;
|
|
20
|
+
const result = await this.graphqlClient.query(query, {});
|
|
21
|
+
const devSpaceIds = result?.ecosystem?.devConsole?.getDeveloperSpaceWithLinkingAccess;
|
|
22
|
+
if (!devSpaceIds || !Array.isArray(devSpaceIds)) {
|
|
23
|
+
return [];
|
|
24
|
+
}
|
|
25
|
+
return devSpaceIds;
|
|
26
|
+
}
|
|
27
|
+
async getDevSpaceDetails(devSpaceIds) {
|
|
28
|
+
const batchSize = 10;
|
|
29
|
+
const batches = [];
|
|
30
|
+
for (let i = 0; i < devSpaceIds.length; i += batchSize) {
|
|
31
|
+
batches.push(devSpaceIds.slice(i, i + batchSize));
|
|
32
|
+
}
|
|
33
|
+
const batchResults = await Promise.all(batches.map((batch) => this.getDevSpaceDetailsBulk(batch)));
|
|
34
|
+
const devSpaceDetails = [];
|
|
35
|
+
for (const results of batchResults) {
|
|
36
|
+
for (const result of results) {
|
|
37
|
+
if (result.success && result.details) {
|
|
38
|
+
devSpaceDetails.push({
|
|
39
|
+
id: result.developerSpaceId,
|
|
40
|
+
name: result.details.name
|
|
41
|
+
});
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
return devSpaceDetails;
|
|
46
|
+
}
|
|
47
|
+
async getDevSpaceDetailsBulk(devSpaceIds) {
|
|
48
|
+
const query = `
|
|
49
|
+
query GetDevSpaceDetails($devSpaceIds: [String!]!) {
|
|
50
|
+
ecosystem {
|
|
51
|
+
devConsole {
|
|
52
|
+
getDeveloperSpaceDetails(developerSpaceIds: $devSpaceIds) {
|
|
53
|
+
results {
|
|
54
|
+
developerSpaceId
|
|
55
|
+
success
|
|
56
|
+
details {
|
|
57
|
+
name
|
|
58
|
+
}
|
|
59
|
+
error {
|
|
60
|
+
code
|
|
61
|
+
message
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
`;
|
|
69
|
+
const result = await this.graphqlClient.query(query, {
|
|
70
|
+
devSpaceIds: devSpaceIds
|
|
71
|
+
});
|
|
72
|
+
const bulkResult = result?.ecosystem?.devConsole?.getDeveloperSpaceDetails;
|
|
73
|
+
if (!bulkResult || !bulkResult.results || !Array.isArray(bulkResult.results)) {
|
|
74
|
+
return [];
|
|
75
|
+
}
|
|
76
|
+
return bulkResult.results;
|
|
77
|
+
}
|
|
78
|
+
async createDevSpace(input) {
|
|
79
|
+
const mutation = `
|
|
80
|
+
mutation CreateDeveloperSpace($input: DevConsoleCreateDeveloperSpaceInput!) {
|
|
81
|
+
ecosystem {
|
|
82
|
+
devConsole {
|
|
83
|
+
createDeveloperSpace(input: $input) {
|
|
84
|
+
devSpace {
|
|
85
|
+
id
|
|
86
|
+
name
|
|
87
|
+
}
|
|
88
|
+
success
|
|
89
|
+
errors {
|
|
90
|
+
message
|
|
91
|
+
extensions {
|
|
92
|
+
statusCode
|
|
93
|
+
errorType
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
`;
|
|
101
|
+
const { response: { ecosystem: { devConsole: { createDeveloperSpace: { devSpace, success, errors } } } }, requestId } = await this.graphqlClient.mutate(mutation, {
|
|
102
|
+
input
|
|
103
|
+
});
|
|
104
|
+
const error = (0, cli_shared_1.getError)(errors);
|
|
105
|
+
if (!success) {
|
|
106
|
+
throw new cli_shared_1.GraphQlMutationError(`${error.message} (requestId: ${requestId || 'unknown'})`, {
|
|
107
|
+
requestId,
|
|
108
|
+
code: error.code,
|
|
109
|
+
statusCode: error.statusCode
|
|
110
|
+
});
|
|
111
|
+
}
|
|
112
|
+
return devSpace;
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
exports.DevSpaceGraphQLClient = DevSpaceGraphQLClient;
|
|
116
|
+
//# sourceMappingURL=graphql-client.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"graphql-client.js","sourceRoot":"","sources":["../../src/devspace/graphql-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/devspace/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const tslib_1 = require("tslib");
|
|
4
|
+
tslib_1.__exportStar(require("./graphql-client"), exports);
|
|
5
|
+
tslib_1.__exportStar(require("./devspace-service"), exports);
|
|
6
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/devspace/index.ts"],"names":[],"mappings":";;;AAAA,2DAAiC;AACjC,6DAAmC"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { CLIDetails } from '@forge/cli-shared';
|
|
2
2
|
import { AnalyticsClientReporter } from '../analytics-client/analytics-client';
|
|
3
3
|
export declare class TunnelAnalyticsService {
|
|
4
4
|
private readonly analyticsClientReporter;
|
|
5
5
|
private readonly cliDetails;
|
|
6
6
|
constructor(analyticsClientReporter: AnalyticsClientReporter, cliDetails: CLIDetails | undefined);
|
|
7
|
-
reportTunnelFailure(
|
|
7
|
+
reportTunnelFailure(errorName: string, attributes: {
|
|
8
8
|
[key: string]: any;
|
|
9
9
|
}): Promise<void>;
|
|
10
10
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tunnel-analytics-service.d.ts","sourceRoot":"","sources":["../../src/service/tunnel-analytics-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE
|
|
1
|
+
{"version":3,"file":"tunnel-analytics-service.d.ts","sourceRoot":"","sources":["../../src/service/tunnel-analytics-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAsB,MAAM,mBAAmB,CAAC;AACnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAE/E,qBAAa,sBAAsB;IAE/B,OAAO,CAAC,QAAQ,CAAC,uBAAuB;IACxC,OAAO,CAAC,QAAQ,CAAC,UAAU;gBADV,uBAAuB,EAAE,uBAAuB,EAChD,UAAU,EAAE,UAAU,GAAG,SAAS;IAGxC,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE;CAevF"}
|
|
@@ -9,7 +9,7 @@ class TunnelAnalyticsService {
|
|
|
9
9
|
this.analyticsClientReporter = analyticsClientReporter;
|
|
10
10
|
this.cliDetails = cliDetails;
|
|
11
11
|
}
|
|
12
|
-
async reportTunnelFailure(
|
|
12
|
+
async reportTunnelFailure(errorName, attributes) {
|
|
13
13
|
attributes = {
|
|
14
14
|
error: errorName,
|
|
15
15
|
version: this.cliDetails?.version,
|
|
@@ -21,7 +21,7 @@ class TunnelAnalyticsService {
|
|
|
21
21
|
if (attributes.isUserError === undefined) {
|
|
22
22
|
attributes = { ...attributes, isUserError: false };
|
|
23
23
|
}
|
|
24
|
-
this.analyticsClientReporter.reportInvokeFailure('tunnel',
|
|
24
|
+
await this.analyticsClientReporter.reportInvokeFailure('tunnel', attributes);
|
|
25
25
|
}
|
|
26
26
|
}
|
|
27
27
|
exports.TunnelAnalyticsService = TunnelAnalyticsService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tunnel-analytics-service.js","sourceRoot":"","sources":["../../src/service/tunnel-analytics-service.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"tunnel-analytics-service.js","sourceRoot":"","sources":["../../src/service/tunnel-analytics-service.ts"],"names":[],"mappings":";;;AAAA,kDAAmE;AAGnE,MAAa,sBAAsB;IAEd;IACA;IAFnB,YACmB,uBAAgD,EAChD,UAAkC;QADlC,4BAAuB,GAAvB,uBAAuB,CAAyB;QAChD,eAAU,GAAV,UAAU,CAAwB;IAClD,CAAC;IAEG,KAAK,CAAC,mBAAmB,CAAC,SAAiB,EAAE,UAAkC;QACpF,UAAU,GAAG;YACX,KAAK,EAAE,SAAS;YAChB,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE,OAAO;YACjC,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,MAAM;YAC/B,QAAQ,EAAE,IAAA,+BAAkB,EAAC,IAAI,CAAC,UAAU,CAAC;YAC7C,kBAAkB,EAAE,IAAI;YACxB,GAAG,UAAU;SACd,CAAC;QACF,IAAI,UAAU,CAAC,WAAW,KAAK,SAAS,EAAE;YACxC,UAAU,GAAG,EAAE,GAAG,UAAU,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC;SACpD;QAED,MAAM,IAAI,CAAC,uBAAuB,CAAC,mBAAmB,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IAC/E,CAAC;CACF;AArBD,wDAqBC"}
|
|
@@ -54,7 +54,7 @@ class InProcessTunnelService extends TunnelServiceBase {
|
|
|
54
54
|
await this.tunnelInteractor.handleUserExitEvent(tunnel.stopFunction, monitor, manifestFileWatcher);
|
|
55
55
|
}
|
|
56
56
|
catch (e) {
|
|
57
|
-
await this.analyticsService.reportTunnelFailure(
|
|
57
|
+
await this.analyticsService.reportTunnelFailure(e.constructor.name, (0, cli_shared_1.getErrorAttributes)(e));
|
|
58
58
|
if (onError) {
|
|
59
59
|
await onError(e);
|
|
60
60
|
}
|