@forge/cli 6.12.0 → 6.13.0-next.7
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 +91 -0
- package/npm-shrinkwrap.json +79 -77
- package/out/command-line/controller/default-environment-controller.d.ts.map +1 -1
- package/out/command-line/controller/default-environment-controller.js +2 -2
- package/out/command-line/controller/deploy-controller.d.ts +5 -2
- package/out/command-line/controller/deploy-controller.d.ts.map +1 -1
- package/out/command-line/controller/deploy-controller.js +22 -5
- package/out/command-line/controller/install-controller.d.ts.map +1 -1
- package/out/command-line/controller/install-controller.js +5 -5
- package/out/command-line/controller/settings-controller.d.ts.map +1 -1
- package/out/command-line/controller/settings-controller.js +7 -4
- package/out/command-line/controller/tunnel-controller.d.ts +3 -3
- package/out/command-line/controller/tunnel-controller.d.ts.map +1 -1
- package/out/command-line/controller/tunnel-controller.js +3 -3
- package/out/command-line/dependency-injection.d.ts +5 -2
- package/out/command-line/dependency-injection.d.ts.map +1 -1
- package/out/command-line/dependency-injection.js +17 -11
- package/out/command-line/environment.d.ts.map +1 -1
- package/out/command-line/environment.js +1 -1
- package/out/command-line/register-app-commands.d.ts.map +1 -1
- package/out/command-line/register-app-commands.js +23 -24
- package/out/command-line/register-environment-commands.d.ts.map +1 -1
- package/out/command-line/register-environment-commands.js +2 -2
- package/out/command-line/register-environment-variables-commands.d.ts.map +1 -1
- package/out/command-line/register-environment-variables-commands.js +4 -4
- package/out/command-line/register-installation-commands.d.ts.map +1 -1
- package/out/command-line/register-installation-commands.js +2 -2
- package/out/command-line/register-providers-commands.d.ts.map +1 -1
- package/out/command-line/register-providers-commands.js +1 -2
- package/out/command-line/register-storage-commands.d.ts.map +1 -1
- package/out/command-line/register-storage-commands.js +4 -2
- package/out/command-line/view/deploy-view.d.ts +4 -2
- package/out/command-line/view/deploy-view.d.ts.map +1 -1
- package/out/command-line/view/deploy-view.js +13 -5
- package/out/command-line/view/install-view.js +1 -1
- package/out/command-line/view/settings-view.d.ts +1 -0
- package/out/command-line/view/settings-view.d.ts.map +1 -1
- package/out/command-line/view/settings-view.js +5 -0
- package/out/command-line/view/tunnel-view.d.ts.map +1 -1
- package/out/command-line/view/tunnel-view.js +1 -1
- package/out/entities/graphql-client.d.ts +1 -1
- package/out/entities/graphql-client.d.ts.map +1 -1
- package/out/entities/graphql-client.js +5 -7
- package/out/entities/list-indexes.d.ts +7 -7
- package/out/entities/list-indexes.d.ts.map +1 -1
- package/out/entities/list-indexes.js +4 -48
- package/out/environment/graphql-client.d.ts.map +1 -1
- package/out/environment/graphql-client.js +1 -1
- package/out/installations/graphql-client.d.ts.map +1 -1
- package/out/installations/graphql-client.js +1 -1
- package/out/service/custom-entities-service.d.ts +12 -0
- package/out/service/custom-entities-service.d.ts.map +1 -0
- package/out/service/custom-entities-service.js +76 -0
- package/out/service/tunnel-service.d.ts.map +1 -1
- package/out/service/tunnel-service.js +1 -2
- package/package.json +6 -6
|
@@ -5,13 +5,12 @@ class EntitiesGraphqlClient {
|
|
|
5
5
|
constructor(graphQLClient) {
|
|
6
6
|
this.graphQLClient = graphQLClient;
|
|
7
7
|
}
|
|
8
|
-
async getEntitiesDefinitions(oauthClientId
|
|
8
|
+
async getEntitiesDefinitions(oauthClientId) {
|
|
9
9
|
var _a;
|
|
10
10
|
const query = `
|
|
11
|
-
query forge_cli_getAppOauthClientIdDetails($oauthClientId: String
|
|
11
|
+
query forge_cli_getAppOauthClientIdDetails($oauthClientId: String!) {
|
|
12
12
|
ersLifecycle {
|
|
13
|
-
|
|
14
|
-
entities: $entities
|
|
13
|
+
doneEntitiesFromERS(
|
|
15
14
|
oauthClientId: $oauthClientId
|
|
16
15
|
) {
|
|
17
16
|
indexes {
|
|
@@ -27,10 +26,9 @@ class EntitiesGraphqlClient {
|
|
|
27
26
|
}
|
|
28
27
|
`;
|
|
29
28
|
const result = await this.graphQLClient.query(query, {
|
|
30
|
-
oauthClientId
|
|
31
|
-
entities
|
|
29
|
+
oauthClientId
|
|
32
30
|
});
|
|
33
|
-
return ((_a = result === null || result === void 0 ? void 0 : result.ersLifecycle) === null || _a === void 0 ? void 0 : _a.
|
|
31
|
+
return ((_a = result === null || result === void 0 ? void 0 : result.ersLifecycle) === null || _a === void 0 ? void 0 : _a.doneEntitiesFromERS) || [];
|
|
34
32
|
}
|
|
35
33
|
}
|
|
36
34
|
exports.EntitiesGraphqlClient = EntitiesGraphqlClient;
|
|
@@ -1,8 +1,10 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { CustomEntitiesService } from '../service/custom-entities-service';
|
|
2
2
|
export interface CustomEntityIndex {
|
|
3
3
|
entityName: string;
|
|
4
4
|
indexName: string;
|
|
5
5
|
indexStatus: CustomEntityIndexStatus;
|
|
6
|
+
partition: string;
|
|
7
|
+
range: string;
|
|
6
8
|
}
|
|
7
9
|
export declare enum CustomEntityIndexStatus {
|
|
8
10
|
ACTIVE = "ACTIVE",
|
|
@@ -15,13 +17,11 @@ export interface AppCustomEntitiesIndexes {
|
|
|
15
17
|
indexes: CustomEntityIndex[];
|
|
16
18
|
}
|
|
17
19
|
export interface EntitiesClient {
|
|
18
|
-
getEntitiesDefinitions(oauthClientId: string
|
|
20
|
+
getEntitiesDefinitions(oauthClientId: string): Promise<any[]>;
|
|
19
21
|
}
|
|
20
22
|
export declare class ListEntitiesIndexesCommand {
|
|
21
|
-
private readonly
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
constructor(getAppConfig: AppConfigProvider, appOauthClient: AppOauthClientIdClient, entitiesGraphqlClient: EntitiesClient);
|
|
25
|
-
execute(environment: string, entities: string[]): Promise<AppCustomEntitiesIndexes>;
|
|
23
|
+
private readonly customEntitiesService;
|
|
24
|
+
constructor(customEntitiesService: CustomEntitiesService);
|
|
25
|
+
execute(environment: string): Promise<AppCustomEntitiesIndexes>;
|
|
26
26
|
}
|
|
27
27
|
//# sourceMappingURL=list-indexes.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list-indexes.d.ts","sourceRoot":"","sources":["../../src/entities/list-indexes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"list-indexes.d.ts","sourceRoot":"","sources":["../../src/entities/list-indexes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAE3E,MAAM,WAAW,iBAAiB;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,uBAAuB,CAAC;IACrC,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,oBAAY,uBAAuB;IACjC,MAAM,WAAW;IACjB,QAAQ,aAAa;CACtB;AAED,MAAM,WAAW,wBAAwB;IACvC,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,iBAAiB,EAAE,CAAC;CAC9B;AAED,MAAM,WAAW,cAAc;IAC7B,sBAAsB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;CAC/D;AAED,qBAAa,0BAA0B;IACzB,OAAO,CAAC,QAAQ,CAAC,qBAAqB;gBAArB,qBAAqB,EAAE,qBAAqB;IAE5D,OAAO,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,wBAAwB,CAAC;CAG7E"}
|
|
@@ -7,55 +7,11 @@ var CustomEntityIndexStatus;
|
|
|
7
7
|
CustomEntityIndexStatus["CREATING"] = "CREATING";
|
|
8
8
|
})(CustomEntityIndexStatus = exports.CustomEntityIndexStatus || (exports.CustomEntityIndexStatus = {}));
|
|
9
9
|
class ListEntitiesIndexesCommand {
|
|
10
|
-
constructor(
|
|
11
|
-
this.
|
|
12
|
-
this.appOauthClient = appOauthClient;
|
|
13
|
-
this.entitiesGraphqlClient = entitiesGraphqlClient;
|
|
10
|
+
constructor(customEntitiesService) {
|
|
11
|
+
this.customEntitiesService = customEntitiesService;
|
|
14
12
|
}
|
|
15
|
-
async execute(environment
|
|
16
|
-
|
|
17
|
-
const { id: appId } = await this.getAppConfig();
|
|
18
|
-
const { environmentId, oauthClientId } = await this.appOauthClient.getAppOauthClientIdDetails(appId, environment);
|
|
19
|
-
const results = await this.entitiesGraphqlClient.getEntitiesDefinitions(oauthClientId, entities);
|
|
20
|
-
const transformedIndexes = [];
|
|
21
|
-
const indexesToExclude = ['by-context-ari'];
|
|
22
|
-
for (const entity of results) {
|
|
23
|
-
const [, , , ...entityName] = entity.name.split('_');
|
|
24
|
-
for (const index of (_a = entity.indexes) !== null && _a !== void 0 ? _a : []) {
|
|
25
|
-
if (indexesToExclude.indexOf(index.name) < 0) {
|
|
26
|
-
transformedIndexes.push({
|
|
27
|
-
entityName: entityName.join('_'),
|
|
28
|
-
indexName: index.name,
|
|
29
|
-
indexStatus: index.status
|
|
30
|
-
});
|
|
31
|
-
}
|
|
32
|
-
}
|
|
33
|
-
}
|
|
34
|
-
transformedIndexes.sort((index1, index2) => {
|
|
35
|
-
if (index1.indexStatus > index2.indexStatus) {
|
|
36
|
-
return -1;
|
|
37
|
-
}
|
|
38
|
-
else if (index1.indexStatus < index2.indexStatus) {
|
|
39
|
-
return 1;
|
|
40
|
-
}
|
|
41
|
-
else {
|
|
42
|
-
if (index1.entityName < index2.entityName) {
|
|
43
|
-
return -1;
|
|
44
|
-
}
|
|
45
|
-
else if (index1.entityName > index2.entityName) {
|
|
46
|
-
return 1;
|
|
47
|
-
}
|
|
48
|
-
else {
|
|
49
|
-
return 0;
|
|
50
|
-
}
|
|
51
|
-
}
|
|
52
|
-
});
|
|
53
|
-
return {
|
|
54
|
-
appId,
|
|
55
|
-
environmentId,
|
|
56
|
-
oauthClientId,
|
|
57
|
-
indexes: transformedIndexes
|
|
58
|
-
};
|
|
13
|
+
async execute(environment) {
|
|
14
|
+
return await this.customEntitiesService.listEntitiesIndexes(environment);
|
|
59
15
|
}
|
|
60
16
|
}
|
|
61
17
|
exports.ListEntitiesIndexesCommand = ListEntitiesIndexesCommand;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"graphql-client.d.ts","sourceRoot":"","sources":["../../src/environment/graphql-client.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,
|
|
1
|
+
{"version":3,"file":"graphql-client.d.ts","sourceRoot":"","sources":["../../src/environment/graphql-client.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAIlB,aAAa,EAIb,SAAS,EACV,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,qBAAqB,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AACtF,OAAO,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AACnF,OAAO,EACL,6BAA6B,EAC7B,uBAAuB,EACvB,wBAAwB,EACxB,uBAAuB,EACxB,MAAM,sBAAsB,CAAC;AAE9B,eAAO,MAAM,0BAA0B,0BAA0B,CAAC;AAElE,qBAAa,eAAgB,SAAQ,SAAS;CAAG;AAEjD,qBAAa,aAAc,YAAW,uBAAuB,EAAE,qBAAqB,EAAE,uBAAuB;IAC/F,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAE5C,iBAAiB,CAAC,OAAO,EAAE,qBAAqB;IAgDhD,eAAe,CAAC,OAAO,EAAE,sBAAsB;;;;;IAmC/C,kBAAkB,CAAC,OAAO,EAAE,6BAA6B;IAkBzD,iBAAiB,CAAC,OAAO,EAAE,wBAAwB;CAuDjE"}
|
|
@@ -124,7 +124,7 @@ class GraphqlClient {
|
|
|
124
124
|
const error = (0, cli_shared_1.getError)(errors);
|
|
125
125
|
let errorMessage = error.message;
|
|
126
126
|
if (error.code === exports.APP_HAS_INSTALLATIONS_CODE) {
|
|
127
|
-
errorMessage = cli_shared_1.Text.deleteEnvironment.hasInstallationError(details.environmentKey
|
|
127
|
+
errorMessage = cli_shared_1.Text.deleteEnvironment.hasInstallationError(details.environmentKey);
|
|
128
128
|
}
|
|
129
129
|
if (!success) {
|
|
130
130
|
throw new cli_shared_1.GraphQlMutationError(`${errorMessage} (requestId: ${requestId || 'unknown'})`, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"graphql-client.d.ts","sourceRoot":"","sources":["../../src/installations/graphql-client.ts"],"names":[],"mappings":"AAEA,OAAO,EAKL,sBAAsB,EAItB,aAAa,EACb,oBAAoB,EAMpB,KAAK,EAGL,SAAS,EACT,SAAS,
|
|
1
|
+
{"version":3,"file":"graphql-client.d.ts","sourceRoot":"","sources":["../../src/installations/graphql-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,7 +37,7 @@ class UpgradeError extends cli_shared_1.GraphQlMutationError {
|
|
|
37
37
|
exports.UpgradeError = UpgradeError;
|
|
38
38
|
class EnvironmentNotFoundError extends cli_shared_1.UserError {
|
|
39
39
|
constructor(environmentKey) {
|
|
40
|
-
super(cli_shared_1.Text.env.error.envNotExist(environmentKey
|
|
40
|
+
super(cli_shared_1.Text.env.error.envNotExist(environmentKey));
|
|
41
41
|
}
|
|
42
42
|
}
|
|
43
43
|
exports.EnvironmentNotFoundError = EnvironmentNotFoundError;
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { AppConfigProvider, AppOauthClientIdClient } from '@forge/cli-shared';
|
|
2
|
+
import { AppCustomEntitiesIndexes, CustomEntityIndex, EntitiesClient } from '../entities/list-indexes';
|
|
3
|
+
export declare class CustomEntitiesService {
|
|
4
|
+
private readonly appConfigProvider;
|
|
5
|
+
private readonly appOauthClient;
|
|
6
|
+
private readonly entitiesGraphqlClient;
|
|
7
|
+
constructor(appConfigProvider: AppConfigProvider, appOauthClient: AppOauthClientIdClient, entitiesGraphqlClient: EntitiesClient);
|
|
8
|
+
sortTransformedIndexes(transformedIndexes: CustomEntityIndex[]): CustomEntityIndex[];
|
|
9
|
+
listEntitiesIndexes(environment: string): Promise<AppCustomEntitiesIndexes>;
|
|
10
|
+
isReindexingInProgress(environment: string): Promise<boolean>;
|
|
11
|
+
}
|
|
12
|
+
//# sourceMappingURL=custom-entities-service.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"custom-entities-service.d.ts","sourceRoot":"","sources":["../../src/service/custom-entities-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,sBAAsB,EAAuB,MAAM,mBAAmB,CAAC;AACnG,OAAO,EACL,wBAAwB,EACxB,iBAAiB,EAEjB,cAAc,EACf,MAAM,0BAA0B,CAAC;AAElC,qBAAa,qBAAqB;IAE9B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,qBAAqB;gBAFrB,iBAAiB,EAAE,iBAAiB,EACpC,cAAc,EAAE,sBAAsB,EACtC,qBAAqB,EAAE,cAAc;IAGxD,sBAAsB,CAAC,kBAAkB,EAAE,iBAAiB,EAAE,GAAG,iBAAiB,EAAE;IAavE,mBAAmB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,wBAAwB,CAAC;IAkD3E,sBAAsB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAM3E"}
|
|
@@ -0,0 +1,76 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.CustomEntitiesService = void 0;
|
|
4
|
+
const cli_shared_1 = require("@forge/cli-shared");
|
|
5
|
+
const list_indexes_1 = require("../entities/list-indexes");
|
|
6
|
+
class CustomEntitiesService {
|
|
7
|
+
constructor(appConfigProvider, appOauthClient, entitiesGraphqlClient) {
|
|
8
|
+
this.appConfigProvider = appConfigProvider;
|
|
9
|
+
this.appOauthClient = appOauthClient;
|
|
10
|
+
this.entitiesGraphqlClient = entitiesGraphqlClient;
|
|
11
|
+
}
|
|
12
|
+
sortTransformedIndexes(transformedIndexes) {
|
|
13
|
+
transformedIndexes.sort((index1, index2) => {
|
|
14
|
+
if (index1.indexStatus > index2.indexStatus) {
|
|
15
|
+
return -1;
|
|
16
|
+
}
|
|
17
|
+
else if (index1.indexStatus < index2.indexStatus) {
|
|
18
|
+
return 1;
|
|
19
|
+
}
|
|
20
|
+
else {
|
|
21
|
+
return 0;
|
|
22
|
+
}
|
|
23
|
+
});
|
|
24
|
+
return transformedIndexes;
|
|
25
|
+
}
|
|
26
|
+
async listEntitiesIndexes(environment) {
|
|
27
|
+
var _a;
|
|
28
|
+
const { id: appId } = await this.appConfigProvider();
|
|
29
|
+
const { environmentId, oauthClientId } = await this.appOauthClient.getAppOauthClientIdDetails(appId, environment);
|
|
30
|
+
const results = await this.entitiesGraphqlClient.getEntitiesDefinitions(oauthClientId);
|
|
31
|
+
const transformedIndexes = [];
|
|
32
|
+
const indexesToExclude = ['by-context-ari'];
|
|
33
|
+
for (const entity of results) {
|
|
34
|
+
const [, , , ...entityName] = entity.name.split('_');
|
|
35
|
+
const transformedIndexesPerEntity = [];
|
|
36
|
+
let byKeyIndex = {};
|
|
37
|
+
for (const index of (_a = entity.indexes) !== null && _a !== void 0 ? _a : []) {
|
|
38
|
+
if (indexesToExclude.indexOf(index.name) < 0) {
|
|
39
|
+
if (index.name === 'by-key') {
|
|
40
|
+
byKeyIndex = {
|
|
41
|
+
entityName: entityName.join('_'),
|
|
42
|
+
indexName: index.name.concat(' (default)'),
|
|
43
|
+
indexStatus: index.status,
|
|
44
|
+
partition: index.partition.length ? index.partition.join(', ') : 'None',
|
|
45
|
+
range: 'key (data key)'
|
|
46
|
+
};
|
|
47
|
+
}
|
|
48
|
+
else {
|
|
49
|
+
transformedIndexesPerEntity.push({
|
|
50
|
+
entityName: entityName.join('_'),
|
|
51
|
+
indexName: index.name,
|
|
52
|
+
indexStatus: index.status,
|
|
53
|
+
partition: index.partition.length ? index.partition.join(', ') : 'None',
|
|
54
|
+
range: index.range.length ? index.range.join(', ') : 'None'
|
|
55
|
+
});
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
this.sortTransformedIndexes(transformedIndexesPerEntity);
|
|
60
|
+
transformedIndexesPerEntity.push(byKeyIndex);
|
|
61
|
+
transformedIndexes.push(...transformedIndexesPerEntity);
|
|
62
|
+
}
|
|
63
|
+
return {
|
|
64
|
+
appId,
|
|
65
|
+
environmentId,
|
|
66
|
+
oauthClientId,
|
|
67
|
+
indexes: transformedIndexes
|
|
68
|
+
};
|
|
69
|
+
}
|
|
70
|
+
async isReindexingInProgress(environment) {
|
|
71
|
+
const { indexes: indexes } = await this.listEntitiesIndexes((0, cli_shared_1.optionToEnvironment)(environment || 'development'));
|
|
72
|
+
const indexStatuses = indexes.map((index) => index.indexStatus);
|
|
73
|
+
return indexStatuses.includes(list_indexes_1.CustomEntityIndexStatus.CREATING);
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
exports.CustomEntitiesService = CustomEntitiesService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tunnel-service.d.ts","sourceRoot":"","sources":["../../src/service/tunnel-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAMpC,OAAO,EAIL,WAAW,EACX,sBAAsB,EACtB,+BAA+B,EAE/B,EAAE,EACF,SAAS,EACV,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAGrE,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,4BAA4B,EAAE,MAAM,wBAAwB,CAAC;AACtE,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAEpE,MAAM,WAAW,aAAa;IAC5B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;
|
|
1
|
+
{"version":3,"file":"tunnel-service.d.ts","sourceRoot":"","sources":["../../src/service/tunnel-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,6 @@ const semver_1 = require("semver");
|
|
|
10
10
|
const cli_shared_1 = require("@forge/cli-shared");
|
|
11
11
|
const version_info_1 = require("../command-line/version-info");
|
|
12
12
|
const DISABLE_TTY = process.env.DISABLE_TTY === 'true';
|
|
13
|
-
const CUR_WORK_APP_DIR = process.env.CUR_WORK_APP_DIR;
|
|
14
13
|
exports.CONTAINER_NAME = 'forge-tunnel-docker';
|
|
15
14
|
const cliDetails = (0, version_info_1.getCLIDetails)();
|
|
16
15
|
let versionTags;
|
|
@@ -157,7 +156,7 @@ class TunnelServiceBase {
|
|
|
157
156
|
return [`-it`];
|
|
158
157
|
}
|
|
159
158
|
getVolumeOptions() {
|
|
160
|
-
const options = [`-v=${
|
|
159
|
+
const options = [`-v=${process.cwd()}:/app:cached`];
|
|
161
160
|
if (process.env.FORGE_DEV_DOCKER_TUNNEL) {
|
|
162
161
|
const monorepoRoot = (0, path_1.join)(__dirname, '../../../..');
|
|
163
162
|
options.push(`-v=${monorepoRoot}:/monorepo:cached`);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@forge/cli",
|
|
3
|
-
"version": "6.
|
|
3
|
+
"version": "6.13.0-next.7",
|
|
4
4
|
"description": "A command line interface for managing Atlassian-hosted apps",
|
|
5
5
|
"author": "Atlassian",
|
|
6
6
|
"license": "UNLICENSED",
|
|
@@ -18,13 +18,13 @@
|
|
|
18
18
|
"postinstall": "node -e \"process.exitCode = fs.existsSync('./out/bin/postinstall.js')\" || node ./out/bin/postinstall.js"
|
|
19
19
|
},
|
|
20
20
|
"dependencies": {
|
|
21
|
-
"@forge/bundler": "4.
|
|
22
|
-
"@forge/cli-shared": "3.
|
|
21
|
+
"@forge/bundler": "4.10.0-next.6",
|
|
22
|
+
"@forge/cli-shared": "3.14.0-next.5",
|
|
23
23
|
"@forge/egress": "1.2.1",
|
|
24
|
-
"@forge/lint": "3.5.
|
|
25
|
-
"@forge/manifest": "4.
|
|
24
|
+
"@forge/lint": "3.5.2-next.5",
|
|
25
|
+
"@forge/manifest": "4.15.0-next.0",
|
|
26
26
|
"@forge/runtime": "4.4.1",
|
|
27
|
-
"@forge/tunnel": "3.5.
|
|
27
|
+
"@forge/tunnel": "3.5.2-next.6",
|
|
28
28
|
"@forge/util": "1.2.3",
|
|
29
29
|
"@sentry/node": "^7.29.0",
|
|
30
30
|
"ajv": "^6.12.6",
|