@forge/cli 13.3.0-next.0-experimental-620648d → 13.3.0-next.12-experimental-4b981ef
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 +165 -8
- package/npm-shrinkwrap.json +96 -63
- package/out/command-line/controller/deploy-controller.d.ts.map +1 -1
- package/out/command-line/controller/deploy-controller.js +1 -0
- package/out/command-line/controller/deploy-controller.js.map +1 -1
- package/out/command-line/controller/feedback-controller.d.ts +0 -1
- package/out/command-line/controller/feedback-controller.d.ts.map +1 -1
- package/out/command-line/controller/feedback-controller.js.map +1 -1
- package/out/command-line/controller/install-controller.d.ts +0 -3
- package/out/command-line/controller/install-controller.d.ts.map +1 -1
- package/out/command-line/controller/install-controller.js +2 -70
- package/out/command-line/controller/install-controller.js.map +1 -1
- package/out/command-line/controller/install-deeplinks.d.ts +33 -0
- package/out/command-line/controller/install-deeplinks.d.ts.map +1 -0
- package/out/command-line/controller/install-deeplinks.js +73 -0
- package/out/command-line/controller/install-deeplinks.js.map +1 -0
- package/out/command-line/dependency-injection.d.ts.map +1 -1
- package/out/command-line/dependency-injection.js +3 -4
- package/out/command-line/dependency-injection.js.map +1 -1
- package/out/command-line/register-app-commands.d.ts.map +1 -1
- package/out/command-line/register-app-commands.js +0 -1
- package/out/command-line/register-app-commands.js.map +1 -1
- package/out/command-line/register-build-commands.d.ts +2 -1
- package/out/command-line/register-build-commands.d.ts.map +1 -1
- package/out/command-line/register-build-commands.js.map +1 -1
- package/out/deploy/deployer/deployer.d.ts +2 -2
- package/out/deploy/deployer/deployer.d.ts.map +1 -1
- package/out/deploy/deployer/deployer.js +4 -3
- package/out/deploy/deployer/deployer.js.map +1 -1
- package/out/deploy/deployer/trigger-deploy-graphql-client.d.ts +1 -0
- package/out/deploy/deployer/trigger-deploy-graphql-client.d.ts.map +1 -1
- package/out/deploy/deployer/trigger-deploy-graphql-client.js.map +1 -1
- package/out/deploy/package-upload-deploy.d.ts +6 -3
- package/out/deploy/package-upload-deploy.d.ts.map +1 -1
- package/out/deploy/package-upload-deploy.js +18 -8
- package/out/deploy/package-upload-deploy.js.map +1 -1
- package/out/deploy/packager/archiver.d.ts +2 -37
- package/out/deploy/packager/archiver.d.ts.map +1 -1
- package/out/deploy/packager/archiver.js +8 -128
- package/out/deploy/packager/archiver.js.map +1 -1
- package/out/deploy/packager/runtime-bundler.d.ts +1 -2
- package/out/deploy/packager/runtime-bundler.d.ts.map +1 -1
- package/out/deploy/packager/runtime-bundler.js +2 -2
- package/out/deploy/packager/runtime-bundler.js.map +1 -1
- package/out/deploy/uploader/uploader.d.ts +15 -2
- package/out/deploy/uploader/uploader.d.ts.map +1 -1
- package/out/deploy/uploader/uploader.js +94 -12
- package/out/deploy/uploader/uploader.js.map +1 -1
- package/out/installations/site-translation/bitbucket.d.ts.map +1 -1
- package/out/installations/site-translation/bitbucket.js +2 -4
- package/out/installations/site-translation/bitbucket.js.map +1 -1
- package/out/service/resource-packaging-service.d.ts +1 -2
- package/out/service/resource-packaging-service.d.ts.map +1 -1
- package/out/service/resource-packaging-service.js.map +1 -1
- package/out/service/resources-uploader-service.d.ts.map +1 -1
- package/out/service/resources-uploader-service.js +5 -3
- package/out/service/resources-uploader-service.js.map +1 -1
- package/package.json +9 -16
|
@@ -89,17 +89,18 @@ class ArtifactDeployer {
|
|
|
89
89
|
this.pause = pause;
|
|
90
90
|
this.ui = ui;
|
|
91
91
|
}
|
|
92
|
-
async deploy(environmentKey, artifactUrl, hostedResourceUploadId, majorVersion, buildTag, skipRollout) {
|
|
92
|
+
async deploy(environmentKey, artifactUrl, hostedResourceUploadId, combinedArtifactUrl, majorVersion, buildTag, skipRollout) {
|
|
93
93
|
const { id } = await this.getConfiguredApp();
|
|
94
|
-
const { deploymentId, requestId } = await this.doDeploy(id, environmentKey, artifactUrl, hostedResourceUploadId, majorVersion, buildTag, skipRollout);
|
|
94
|
+
const { deploymentId, requestId } = await this.doDeploy(id, environmentKey, artifactUrl, hostedResourceUploadId, combinedArtifactUrl, majorVersion, buildTag, skipRollout);
|
|
95
95
|
await this.monitorDeployment(id, environmentKey, deploymentId, requestId);
|
|
96
96
|
}
|
|
97
|
-
async doDeploy(appId, environmentKey, artifactUrl, hostedResourceUploadId, majorVersion, buildTag, skipRollout) {
|
|
97
|
+
async doDeploy(appId, environmentKey, artifactUrl, hostedResourceUploadId, combinedArtifactUrl, majorVersion, buildTag, skipRollout) {
|
|
98
98
|
return await this.deployClient.deploy({
|
|
99
99
|
appId,
|
|
100
100
|
environmentKey,
|
|
101
101
|
artifactUrl,
|
|
102
102
|
hostedResourceUploadId,
|
|
103
|
+
combinedArtifactUrl,
|
|
103
104
|
majorVersion,
|
|
104
105
|
buildTag,
|
|
105
106
|
skipRollout
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deployer.js","sourceRoot":"","sources":["../../../src/deploy/deployer/deployer.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"deployer.js","sourceRoot":"","sources":["../../../src/deploy/deployer/deployer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trigger-deploy-graphql-client.d.ts","sourceRoot":"","sources":["../../../src/deploy/deployer/trigger-deploy-graphql-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,aAAa,EAId,MAAM,mBAAmB,CAAC;AAE3B,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,MAAM,MAAM,qBAAqB,GAAG;IAClC,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,WAAW,mBAAmB;IAClC,MAAM,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAC;CACvE;AAED,qBAAa,iBAAkB,SAAQ,KAAK;;CAI3C;AAED,qBAAa,0BAA2B,YAAW,mBAAmB;IACxD,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAE5C,MAAM,CAAC,iBAAiB,EAAE,oBAAoB;;;;CA4C5D"}
|
|
1
|
+
{"version":3,"file":"trigger-deploy-graphql-client.d.ts","sourceRoot":"","sources":["../../../src/deploy/deployer/trigger-deploy-graphql-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,aAAa,EAId,MAAM,mBAAmB,CAAC;AAE3B,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,MAAM,MAAM,qBAAqB,GAAG;IAClC,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,WAAW,mBAAmB;IAClC,MAAM,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAC;CACvE;AAED,qBAAa,iBAAkB,SAAQ,KAAK;;CAI3C;AAED,qBAAa,0BAA2B,YAAW,mBAAmB;IACxD,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAE5C,MAAM,CAAC,iBAAiB,EAAE,oBAAoB;;;;CA4C5D"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trigger-deploy-graphql-client.js","sourceRoot":"","sources":["../../../src/deploy/deployer/trigger-deploy-graphql-client.ts"],"names":[],"mappings":";;;AAAA,kDAM2B;
|
|
1
|
+
{"version":3,"file":"trigger-deploy-graphql-client.js","sourceRoot":"","sources":["../../../src/deploy/deployer/trigger-deploy-graphql-client.ts"],"names":[],"mappings":";;;AAAA,kDAM2B;AAsB3B,MAAa,iBAAkB,SAAQ,KAAK;IAC1C;QACE,KAAK,CAAC,iBAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IACpC,CAAC;CACF;AAJD,8CAIC;AAED,MAAa,0BAA0B;IACR;IAA7B,YAA6B,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;IAAG,CAAC;IAEtD,KAAK,CAAC,MAAM,CAAC,iBAAuC;QACzD,MAAM,cAAc,GAAG;;;;;;;;;;;;;;;;KAgBtB,CAAC;QAEF,MAAM,EACJ,QAAQ,EAAE,EACR,mBAAmB,EAAE,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,EAAE,EACrD,EACD,SAAS,EACV,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAyD,cAAc,EAAE;YAC1G,KAAK,EAAE,iBAAiB;SACzB,CAAC,CAAC;QAEH,MAAM,KAAK,GAAG,IAAA,qBAAQ,EAAC,MAAM,CAAC,CAAC;QAE/B,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,iCAAoB,CAAC,GAAG,KAAK,CAAC,OAAO,gBAAgB,SAAS,IAAI,SAAS,GAAG,EAAE;gBACxF,SAAS;gBACT,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,UAAU,EAAE,KAAK,CAAC,UAAU;aAC7B,CAAC,CAAC;QACL,CAAC;QAED,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,iBAAiB,EAAE,CAAC;QAChC,CAAC;QAED,OAAO,EAAE,YAAY,EAAE,UAAU,CAAC,EAAE,EAAE,SAAS,EAAE,SAAS,IAAI,SAAS,EAAE,CAAC;IAC5E,CAAC;CACF;AA/CD,gEA+CC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Handler, I18nResourceBundlingService, ResourceDetails, UserError } from '@forge/cli-shared';
|
|
1
|
+
import { AppEnvironmentType, Handler, I18nResourceBundlingService, ResourceDetails, StatsigService, UserError } from '@forge/cli-shared';
|
|
2
2
|
import { App, Modules, Translations } from '@forge/manifest';
|
|
3
3
|
import { Deployer } from './deployer/deployer';
|
|
4
4
|
import { Packager } from './packager/packager';
|
|
@@ -11,6 +11,7 @@ export declare class MissingEnvironmentKeyError extends UserError {
|
|
|
11
11
|
export interface Details {
|
|
12
12
|
handlers: Array<Handler>;
|
|
13
13
|
environmentKey?: string;
|
|
14
|
+
environmentType?: AppEnvironmentType;
|
|
14
15
|
resources: ResourceDetails[];
|
|
15
16
|
packageConfig: App['package'];
|
|
16
17
|
modules?: Modules;
|
|
@@ -25,11 +26,13 @@ export declare class PackageUploadDeployCommand {
|
|
|
25
26
|
private readonly deployer;
|
|
26
27
|
private readonly resourcePackagingService;
|
|
27
28
|
private readonly i18nResourceBundlingService;
|
|
28
|
-
|
|
29
|
+
private readonly statsigService;
|
|
30
|
+
constructor(packager: Packager, archiveUploader: ArchiveUploader, deployer: Deployer, resourcePackagingService: ResourcePackagingService, i18nResourceBundlingService: I18nResourceBundlingService, statsigService: StatsigService);
|
|
29
31
|
execute(details: Details): Promise<DeploymentResult>;
|
|
30
32
|
packageUpload(details: Details): Promise<{
|
|
31
|
-
|
|
33
|
+
artifactUrl: string | undefined;
|
|
32
34
|
hostedResourceUploadId: string | undefined;
|
|
35
|
+
combinedArtifactUrl: string | undefined;
|
|
33
36
|
resourcesArchives: ResourceArchives;
|
|
34
37
|
moduleList: string[] | undefined;
|
|
35
38
|
}>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-upload-deploy.d.ts","sourceRoot":"","sources":["../../src/deploy/package-upload-deploy.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"package-upload-deploy.d.ts","sourceRoot":"","sources":["../../src/deploy/package-upload-deploy.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,OAAO,EACP,2BAA2B,EAC3B,eAAe,EACf,cAAc,EAEd,SAAS,EACV,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAG7D,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,8CAA8C,CAAC;AAChF,OAAO,EAAE,wBAAwB,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AAEnG,qBAAa,0BAA2B,SAAQ,SAAS;;CAIxD;AAED,MAAM,WAAW,OAAO;IACtB,QAAQ,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,kBAAkB,CAAC;IACrC,SAAS,EAAE,eAAe,EAAE,CAAC;IAC7B,aAAa,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC;IAC9B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,YAAY,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,qBAAa,0BAA0B;IAEnC,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,wBAAwB;IACzC,OAAO,CAAC,QAAQ,CAAC,2BAA2B;IAC5C,OAAO,CAAC,QAAQ,CAAC,cAAc;gBALd,QAAQ,EAAE,QAAQ,EAClB,eAAe,EAAE,eAAe,EAChC,QAAQ,EAAE,QAAQ,EAClB,wBAAwB,EAAE,wBAAwB,EAClD,2BAA2B,EAAE,2BAA2B,EACxD,cAAc,EAAE,cAAc;IAGpC,OAAO,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAyCpD,aAAa,CAAC,OAAO,EAAE,OAAO;;;;;;;CA2D5C"}
|
|
@@ -15,25 +15,29 @@ class PackageUploadDeployCommand {
|
|
|
15
15
|
deployer;
|
|
16
16
|
resourcePackagingService;
|
|
17
17
|
i18nResourceBundlingService;
|
|
18
|
-
|
|
18
|
+
statsigService;
|
|
19
|
+
constructor(packager, archiveUploader, deployer, resourcePackagingService, i18nResourceBundlingService, statsigService) {
|
|
19
20
|
this.packager = packager;
|
|
20
21
|
this.archiveUploader = archiveUploader;
|
|
21
22
|
this.deployer = deployer;
|
|
22
23
|
this.resourcePackagingService = resourcePackagingService;
|
|
23
24
|
this.i18nResourceBundlingService = i18nResourceBundlingService;
|
|
25
|
+
this.statsigService = statsigService;
|
|
24
26
|
}
|
|
25
27
|
async execute(details) {
|
|
26
|
-
let
|
|
28
|
+
let artifactUrl;
|
|
27
29
|
let hostedResourceUploadId;
|
|
30
|
+
let combinedArtifactUrl;
|
|
28
31
|
let resourcesArchives = {};
|
|
29
32
|
let moduleList = [];
|
|
30
33
|
if (!details.environmentKey) {
|
|
31
34
|
throw new MissingEnvironmentKeyError();
|
|
32
35
|
}
|
|
33
36
|
if (!details.buildTag) {
|
|
34
|
-
({
|
|
37
|
+
({ artifactUrl, hostedResourceUploadId, combinedArtifactUrl, resourcesArchives, moduleList } =
|
|
38
|
+
await this.packageUpload(details));
|
|
35
39
|
}
|
|
36
|
-
await this.deployer.deploy(details.environmentKey,
|
|
40
|
+
await this.deployer.deploy(details.environmentKey, artifactUrl, hostedResourceUploadId, combinedArtifactUrl, details.majorVersion, details.buildTag, details.skipRollout);
|
|
37
41
|
return {
|
|
38
42
|
analytics: {
|
|
39
43
|
moduleList,
|
|
@@ -52,21 +56,27 @@ class PackageUploadDeployCommand {
|
|
|
52
56
|
const i18nResourceBundle = await this.i18nResourceBundlingService.bundle(details.modules, details.i18nConfig);
|
|
53
57
|
const { runtimeArchivePath, nativeUiBundlesDetails, moduleList } = await this.packager.package(details.handlers, resourcesToBeBundled, details.packageConfig, i18nResourceBundle, details.i18nConfig);
|
|
54
58
|
const resourcesArchives = await this.resourcePackagingService.zipResources([...preBundledResources, ...nativeUiBundlesDetails], i18nResourceBundle);
|
|
55
|
-
let
|
|
59
|
+
let artifactUrl;
|
|
56
60
|
let hostedResourceUploadId;
|
|
61
|
+
let combinedArtifactUrl;
|
|
57
62
|
if (details.buildTag) {
|
|
58
|
-
|
|
63
|
+
artifactUrl = await this.archiveUploader.uploadArchive(runtimeArchivePath, details.buildTag);
|
|
59
64
|
hostedResourceUploadId = await this.archiveUploader.uploadHostedResources(resourcesArchives, undefined, details.buildTag);
|
|
60
65
|
}
|
|
66
|
+
else if (details.environmentType &&
|
|
67
|
+
(await this.statsigService.isCombinedArtifactUploadEnabled(details.environmentType))) {
|
|
68
|
+
combinedArtifactUrl = await this.archiveUploader.uploadCombinedArtifact(runtimeArchivePath, resourcesArchives, details.modules, details.buildTag);
|
|
69
|
+
}
|
|
61
70
|
else {
|
|
62
|
-
[
|
|
71
|
+
[artifactUrl, hostedResourceUploadId] = await Promise.all([
|
|
63
72
|
this.archiveUploader.uploadArchive(runtimeArchivePath, details.buildTag),
|
|
64
73
|
this.archiveUploader.uploadHostedResources(resourcesArchives, details.environmentKey, details.buildTag)
|
|
65
74
|
]);
|
|
66
75
|
}
|
|
67
76
|
return {
|
|
68
|
-
|
|
77
|
+
artifactUrl,
|
|
69
78
|
hostedResourceUploadId,
|
|
79
|
+
combinedArtifactUrl,
|
|
70
80
|
resourcesArchives,
|
|
71
81
|
moduleList
|
|
72
82
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-upload-deploy.js","sourceRoot":"","sources":["../../src/deploy/package-upload-deploy.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"package-upload-deploy.js","sourceRoot":"","sources":["../../src/deploy/package-upload-deploy.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,39 +1,4 @@
|
|
|
1
|
-
import { Logger,
|
|
2
|
-
export
|
|
3
|
-
addContent(fileName: string, contents: Buffer): void;
|
|
4
|
-
addFrom(fileName: string, filePath: string): void;
|
|
5
|
-
finalise(): Promise<string>;
|
|
6
|
-
}
|
|
7
|
-
export declare class ArchiverError extends UserError {
|
|
8
|
-
}
|
|
9
|
-
export declare class ZipArchiver implements Archiver {
|
|
10
|
-
private readonly archive;
|
|
11
|
-
private readonly logger;
|
|
12
|
-
private tempFile;
|
|
13
|
-
private resolves;
|
|
14
|
-
private rejects;
|
|
15
|
-
private constructor();
|
|
16
|
-
static create(logger: Logger): Promise<ZipArchiver>;
|
|
17
|
-
addContent(fileName: string, contents: Buffer): void;
|
|
18
|
-
addFrom(fileName: string, filePath: string): void;
|
|
19
|
-
finalise(): Promise<string>;
|
|
20
|
-
onWarning(cb: (err: Error) => void): void;
|
|
21
|
-
private onArchiveError;
|
|
22
|
-
private onClose;
|
|
23
|
-
}
|
|
24
|
-
export declare class DirectoryArchiver implements Archiver {
|
|
25
|
-
private readonly target;
|
|
26
|
-
constructor(target: string);
|
|
27
|
-
addContent(fileName: string, contents: Buffer): void;
|
|
28
|
-
addFrom(fileName: string, filePath: string): void;
|
|
29
|
-
finalise(): Promise<string>;
|
|
30
|
-
}
|
|
31
|
-
export declare class MultiArchiver implements Archiver {
|
|
32
|
-
private readonly archivers;
|
|
33
|
-
constructor(archivers: Archiver[]);
|
|
34
|
-
addContent(fileName: string, contents: Buffer): void;
|
|
35
|
-
addFrom(fileName: string, filePath: string): void;
|
|
36
|
-
finalise(): Promise<string>;
|
|
37
|
-
}
|
|
1
|
+
import { Logger, type Archiver } from '@forge/cli-shared';
|
|
2
|
+
export { Archiver, DirectoryArchiver, MultiArchiver, ZipArchiver } from '@forge/cli-shared';
|
|
38
3
|
export declare function makeArchiver(logger: Logger): Promise<Archiver>;
|
|
39
4
|
//# sourceMappingURL=archiver.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"archiver.d.ts","sourceRoot":"","sources":["../../../src/deploy/packager/archiver.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"archiver.d.ts","sourceRoot":"","sources":["../../../src/deploy/packager/archiver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,QAAQ,EAAiD,MAAM,mBAAmB,CAAC;AAEzG,OAAO,EAAE,QAAQ,EAAE,iBAAiB,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAE5F,wBAAsB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAMpE"}
|
|
@@ -1,137 +1,17 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.ZipArchiver = exports.MultiArchiver = exports.DirectoryArchiver = exports.Archiver = void 0;
|
|
4
4
|
exports.makeArchiver = makeArchiver;
|
|
5
|
-
const tslib_1 = require("tslib");
|
|
6
|
-
const fs_1 = require("fs");
|
|
7
|
-
const path_1 = tslib_1.__importDefault(require("path"));
|
|
8
|
-
const tmp_1 = tslib_1.__importDefault(require("tmp"));
|
|
9
5
|
const cli_shared_1 = require("@forge/cli-shared");
|
|
10
|
-
|
|
11
|
-
}
|
|
12
|
-
exports.
|
|
13
|
-
function
|
|
14
|
-
|
|
15
|
-
return;
|
|
16
|
-
}
|
|
17
|
-
const normalizedPath = path_1.default.posix.normalize(fileName.replace(/\\/g, '/'));
|
|
18
|
-
if (path_1.default.posix.isAbsolute(normalizedPath) || normalizedPath === '..' || normalizedPath.startsWith('../')) {
|
|
19
|
-
throw new ArchiverError(cli_shared_1.Text.deploy.taskPackage.invalidArchivePath(fileName));
|
|
20
|
-
}
|
|
21
|
-
}
|
|
22
|
-
class ZipArchiver {
|
|
23
|
-
archive;
|
|
24
|
-
logger;
|
|
25
|
-
tempFile = tmp_1.default.fileSync({ postfix: '.zip' });
|
|
26
|
-
resolves = [];
|
|
27
|
-
rejects = [];
|
|
28
|
-
constructor(archive, logger) {
|
|
29
|
-
this.archive = archive;
|
|
30
|
-
this.logger = logger;
|
|
31
|
-
const output = (0, fs_1.createWriteStream)(this.tempFile.name);
|
|
32
|
-
this.archive.pipe(output);
|
|
33
|
-
output.on('close', this.onClose);
|
|
34
|
-
this.archive.on('warning', this.onArchiveError);
|
|
35
|
-
this.archive.on('error', this.onArchiveError);
|
|
36
|
-
}
|
|
37
|
-
static async create(logger) {
|
|
38
|
-
const { ZipArchive } = await Promise.resolve().then(() => tslib_1.__importStar(require('archiver')));
|
|
39
|
-
return new ZipArchiver(new ZipArchive(), logger);
|
|
40
|
-
}
|
|
41
|
-
addContent(fileName, contents) {
|
|
42
|
-
validateArchivePath(fileName);
|
|
43
|
-
this.archive.append(contents, { name: fileName });
|
|
44
|
-
this.logger.debug(cli_shared_1.Text.deploy.taskPackage.packageFile(fileName, null));
|
|
45
|
-
}
|
|
46
|
-
addFrom(fileName, filePath) {
|
|
47
|
-
validateArchivePath(fileName);
|
|
48
|
-
if ((0, fs_1.statSync)(filePath).isDirectory()) {
|
|
49
|
-
this.archive.directory(filePath, fileName || false);
|
|
50
|
-
}
|
|
51
|
-
else {
|
|
52
|
-
this.archive.file(filePath, { name: fileName });
|
|
53
|
-
}
|
|
54
|
-
this.logger.debug(cli_shared_1.Text.deploy.taskPackage.packageFile(fileName, filePath));
|
|
55
|
-
}
|
|
56
|
-
finalise() {
|
|
57
|
-
return new Promise((resolve, reject) => {
|
|
58
|
-
this.resolves.push(resolve);
|
|
59
|
-
this.rejects.push(reject);
|
|
60
|
-
this.archive.finalize();
|
|
61
|
-
});
|
|
62
|
-
}
|
|
63
|
-
onWarning(cb) {
|
|
64
|
-
this.archive.on('warning', cb);
|
|
65
|
-
}
|
|
66
|
-
onArchiveError = (err) => {
|
|
67
|
-
const error = new ArchiverError(err.message);
|
|
68
|
-
for (const reject of this.rejects) {
|
|
69
|
-
reject(error);
|
|
70
|
-
}
|
|
71
|
-
};
|
|
72
|
-
onClose = () => {
|
|
73
|
-
for (const resolve of this.resolves) {
|
|
74
|
-
resolve(this.tempFile.name);
|
|
75
|
-
}
|
|
76
|
-
};
|
|
77
|
-
}
|
|
78
|
-
exports.ZipArchiver = ZipArchiver;
|
|
79
|
-
class DirectoryArchiver {
|
|
80
|
-
target;
|
|
81
|
-
constructor(target) {
|
|
82
|
-
this.target = target;
|
|
83
|
-
}
|
|
84
|
-
addContent(fileName, contents) {
|
|
85
|
-
validateArchivePath(fileName);
|
|
86
|
-
try {
|
|
87
|
-
const targetName = path_1.default.join(this.target, fileName);
|
|
88
|
-
(0, fs_1.mkdirSync)(path_1.default.dirname(targetName), { recursive: true });
|
|
89
|
-
(0, fs_1.writeFileSync)(targetName, contents);
|
|
90
|
-
}
|
|
91
|
-
catch (e) {
|
|
92
|
-
throw new ArchiverError(e.message);
|
|
93
|
-
}
|
|
94
|
-
}
|
|
95
|
-
addFrom(fileName, filePath) {
|
|
96
|
-
validateArchivePath(fileName);
|
|
97
|
-
try {
|
|
98
|
-
const targetName = path_1.default.join(this.target, fileName);
|
|
99
|
-
(0, fs_1.cpSync)(filePath, targetName, { recursive: true });
|
|
100
|
-
}
|
|
101
|
-
catch (e) {
|
|
102
|
-
throw new ArchiverError(e.message);
|
|
103
|
-
}
|
|
104
|
-
}
|
|
105
|
-
async finalise() {
|
|
106
|
-
return this.target;
|
|
107
|
-
}
|
|
108
|
-
}
|
|
109
|
-
exports.DirectoryArchiver = DirectoryArchiver;
|
|
110
|
-
class MultiArchiver {
|
|
111
|
-
archivers;
|
|
112
|
-
constructor(archivers) {
|
|
113
|
-
this.archivers = archivers;
|
|
114
|
-
}
|
|
115
|
-
addContent(fileName, contents) {
|
|
116
|
-
for (const archiver of this.archivers) {
|
|
117
|
-
archiver.addContent(fileName, contents);
|
|
118
|
-
}
|
|
119
|
-
}
|
|
120
|
-
addFrom(fileName, filePath) {
|
|
121
|
-
for (const archiver of this.archivers) {
|
|
122
|
-
archiver.addFrom(fileName, filePath);
|
|
123
|
-
}
|
|
124
|
-
}
|
|
125
|
-
async finalise() {
|
|
126
|
-
const paths = await Promise.all(this.archivers.map((archiver) => archiver.finalise()));
|
|
127
|
-
return paths[0];
|
|
128
|
-
}
|
|
129
|
-
}
|
|
130
|
-
exports.MultiArchiver = MultiArchiver;
|
|
6
|
+
var cli_shared_2 = require("@forge/cli-shared");
|
|
7
|
+
Object.defineProperty(exports, "Archiver", { enumerable: true, get: function () { return cli_shared_2.Archiver; } });
|
|
8
|
+
Object.defineProperty(exports, "DirectoryArchiver", { enumerable: true, get: function () { return cli_shared_2.DirectoryArchiver; } });
|
|
9
|
+
Object.defineProperty(exports, "MultiArchiver", { enumerable: true, get: function () { return cli_shared_2.MultiArchiver; } });
|
|
10
|
+
Object.defineProperty(exports, "ZipArchiver", { enumerable: true, get: function () { return cli_shared_2.ZipArchiver; } });
|
|
131
11
|
async function makeArchiver(logger) {
|
|
132
|
-
const mainArchiver = await ZipArchiver.create(logger);
|
|
12
|
+
const mainArchiver = await cli_shared_1.ZipArchiver.create(logger);
|
|
133
13
|
if (process.env.FORGE_INSPECT_ARCHIVE) {
|
|
134
|
-
return new MultiArchiver([mainArchiver, new DirectoryArchiver(process.env.FORGE_INSPECT_ARCHIVE)]);
|
|
14
|
+
return new cli_shared_1.MultiArchiver([mainArchiver, new cli_shared_1.DirectoryArchiver(process.env.FORGE_INSPECT_ARCHIVE)]);
|
|
135
15
|
}
|
|
136
16
|
return mainArchiver;
|
|
137
17
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"archiver.js","sourceRoot":"","sources":["../../../src/deploy/packager/archiver.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"archiver.js","sourceRoot":"","sources":["../../../src/deploy/packager/archiver.ts"],"names":[],"mappings":";;;AAIA,oCAMC;AAVD,kDAAyG;AAEzG,gDAA4F;AAAnF,sGAAA,QAAQ,OAAA;AAAE,+GAAA,iBAAiB,OAAA;AAAE,2GAAA,aAAa,OAAA;AAAE,yGAAA,WAAW,OAAA;AAEzD,KAAK,UAAU,YAAY,CAAC,MAAc;IAC/C,MAAM,YAAY,GAAG,MAAM,wBAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACtD,IAAI,OAAO,CAAC,GAAG,CAAC,qBAAqB,EAAE,CAAC;QACtC,OAAO,IAAI,0BAAa,CAAC,CAAC,YAAY,EAAE,IAAI,8BAAiB,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;IACrG,CAAC;IACD,OAAO,YAAY,CAAC;AACtB,CAAC"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { Bundler, BundlerMetadata, EntryPoint } from '@forge/bundler';
|
|
2
|
-
import { Handler, Logger, FileSystemReader, ConfigReader, type I18nResourceBundle } from '@forge/cli-shared';
|
|
2
|
+
import { Handler, Logger, FileSystemReader, ConfigReader, Archiver, type I18nResourceBundle } from '@forge/cli-shared';
|
|
3
3
|
import { App } from '@forge/manifest';
|
|
4
|
-
import { Archiver } from './archiver';
|
|
5
4
|
export interface RuntimeBundleResult {
|
|
6
5
|
runtimeArchivePath: string;
|
|
7
6
|
metadata: BundlerMetadata;
|
|
@@ -1 +1 @@
|
|
|
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;
|
|
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,QAAQ,EACR,KAAK,kBAAkB,EACxB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAItC,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,OAAO,CAAC,QAAQ,CAAC,EACxC,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;cA2BX,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"}
|
|
@@ -35,8 +35,8 @@ class RuntimeBundler {
|
|
|
35
35
|
}
|
|
36
36
|
this.logger.debug(cli_shared_1.Text.deploy.taskPackage.packageBundledFiles);
|
|
37
37
|
archiver.addFrom('', outputDir);
|
|
38
|
-
|
|
39
|
-
archiver.
|
|
38
|
+
if (additionalOutputs) {
|
|
39
|
+
archiver.addMany(additionalOutputs);
|
|
40
40
|
}
|
|
41
41
|
}
|
|
42
42
|
return combinedMetadata;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime-bundler.js","sourceRoot":"","sources":["../../../src/deploy/packager/runtime-bundler.ts"],"names":[],"mappings":";;;;AAAA,wDAAwB;AAExB,4CASwB;AACxB,
|
|
1
|
+
{"version":3,"file":"runtime-bundler.js","sourceRoot":"","sources":["../../../src/deploy/packager/runtime-bundler.ts"],"names":[],"mappings":";;;;AAAA,wDAAwB;AAExB,4CASwB;AACxB,kDAW2B;AAG3B,sCAAsD;AAOtD,MAAa,cAAc;IAEN;IACA;IACA;IACE;IACF;IALnB,YACmB,eAAwC,EACxC,MAAc,EACd,OAAgB,EACd,gBAAkC,EACpC,YAA0B;QAJ1B,oBAAe,GAAf,eAAe,CAAyB;QACxC,WAAM,GAAN,MAAM,CAAQ;QACd,YAAO,GAAP,OAAO,CAAS;QACd,qBAAgB,GAAhB,gBAAgB,CAAkB;QACpC,iBAAY,GAAZ,YAAY,CAAc;IAC1C,CAAC;IAEM,KAAK,CAAC,WAAW,CACzB,QAAkB,EAClB,WAAyB,EACzB,kBAAsC;QAEtC,IAAI,gBAAgB,GAAG,IAAA,uBAAa,GAAE,CAAC;QAEvC,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC3B,IAAI,eAA8B,CAAC;YAEnC,IAAI,CAAC;gBACH,eAAe,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,YAAY,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,WAAW,EAAE,kBAAkB,EAAE,CAAC,CAAC;YAChH,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,MAAM,IAAI,sBAAY,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YACpC,CAAC;YAED,MAAM,EAAE,SAAS,EAAE,iBAAiB,EAAE,QAAQ,EAAE,GAAG,eAAe,CAAC;YACnE,IAAI,QAAQ,EAAE,CAAC;gBACb,gBAAgB,GAAG,IAAA,uBAAa,EAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC;YAC/D,CAAC;YAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iBAAI,CAAC,MAAM,CAAC,WAAW,CAAC,mBAAmB,CAAC,CAAC;YAC/D,QAAQ,CAAC,OAAO,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;YAChC,IAAI,iBAAiB,EAAE,CAAC;gBACtB,QAAQ,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;YACtC,CAAC;QACH,CAAC;QAED,OAAO,gBAAgB,CAAC;IAC1B,CAAC;IAES,KAAK,CAAC,mBAAmB,CAAC,QAAkB;QAEpD,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,CAAC,CAAC;QACtE,QAAQ,CAAC,UAAU,CAAC,6BAAgB,EAAE,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;QAE7D,KAAK,MAAM,QAAQ,IAAI,gCAAmB,EAAE,CAAC;YAC3C,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAChD,SAAS;YACX,CAAC;YAED,QAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QACvC,CAAC;IACH,CAAC;IAES,KAAK,CAAC,UAAU,CACxB,QAAkB,EAClB,QAAmB,EACnB,aAA6B,EAC7B,kBAAsC;QAEtC,MAAM,WAAW,GAAG,IAAA,wBAAc,EAAC,QAAQ,CAAC,CAAC;QAE7C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,WAAW,EAAE,kBAAkB,CAAC,CAAC;QAEnF,MAAM,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;QAEzC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAC,aAAa,EAAE,UAAU,IAAI,EAAE,CAAC,CAAC;QAC3F,KAAK,MAAM,QAAQ,IAAI,KAAK,EAAE,CAAC;YAC7B,QAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QACvC,CAAC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;IAES,oBAAoB,CAAC,QAAkB,EAAE,kBAAsC;QACvF,IAAA,0CAA6B,EAAC,kBAAkB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE,EAAE;YACjF,QAAQ,CAAC,OAAO,CAAC,cAAI,CAAC,IAAI,CAAC,8BAAuB,EAAE,QAAQ,CAAC,EAAE,QAAQ,CAAC,CAAC;QAC3E,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,MAAM,CACjB,QAAmB,EACnB,kBAAsC,EACtC,aAA8B;QAE9B,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;QAE9C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,QAAQ,EAAE,aAAa,EAAE,kBAAkB,CAAC,CAAC;QAE9F,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAG1B,IAAI,CAAC,oBAAoB,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;QAC1D,CAAC;QAED,MAAM,WAAW,GAAG,MAAM,QAAQ,CAAC,QAAQ,EAAE,CAAC;QAC9C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iBAAI,CAAC,MAAM,CAAC,WAAW,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,CAAC;QAEvE,OAAO,EAAE,kBAAkB,EAAE,WAAW,EAAE,QAAQ,EAAE,CAAC;IACvD,CAAC;CACF;AApGD,wCAoGC"}
|
|
@@ -1,19 +1,32 @@
|
|
|
1
|
-
import { AppConfigProvider, FileUploader, Logger } from '@forge/cli-shared';
|
|
1
|
+
import { AppConfigProvider, FileSystemReader, FileUploader, Logger } from '@forge/cli-shared';
|
|
2
|
+
import { Modules } from '@forge/manifest';
|
|
2
3
|
import { ArtifactClient } from './artifact-graphql-client';
|
|
3
4
|
import { ResourceArchives } from '../../service/resource-packaging-service';
|
|
4
5
|
import { UploaderService } from '../../service/resources-uploader-service';
|
|
6
|
+
import { Archiver } from '../packager';
|
|
5
7
|
export interface ArchiveUploader {
|
|
6
8
|
uploadArchive(archivePath: string, buildTag?: string): Promise<string>;
|
|
7
9
|
uploadHostedResources(resourceArchives: ResourceArchives, environmentKey?: string, buildTag?: string): Promise<string | undefined>;
|
|
10
|
+
uploadCombinedArtifact(runtimeArchivePath: string, resourcesArchives: ResourceArchives, modules?: Modules, buildTag?: string): Promise<string>;
|
|
8
11
|
}
|
|
9
12
|
export declare class AppArchiveUploader implements ArchiveUploader {
|
|
10
13
|
private readonly getConfiguredApp;
|
|
11
14
|
private readonly artifact;
|
|
12
15
|
private readonly uploader;
|
|
13
16
|
private readonly logger;
|
|
17
|
+
private readonly archiverFactory;
|
|
18
|
+
private readonly fileSystemReader;
|
|
19
|
+
private readonly appDir;
|
|
14
20
|
private readonly uploaderService;
|
|
15
|
-
constructor(getConfiguredApp: AppConfigProvider, artifact: ArtifactClient, uploader: FileUploader, logger: Logger, uploaderService: UploaderService);
|
|
21
|
+
constructor(getConfiguredApp: AppConfigProvider, artifact: ArtifactClient, uploader: FileUploader, logger: Logger, archiverFactory: () => Promise<Archiver>, fileSystemReader: FileSystemReader, appDir: string, uploaderService: UploaderService);
|
|
16
22
|
uploadArchive(archivePath: string, buildTag?: string): Promise<string>;
|
|
17
23
|
uploadHostedResources(resourceArchives: ResourceArchives, environmentKey?: string, buildTag?: string): Promise<string | undefined>;
|
|
24
|
+
uploadCombinedArtifact(runtimeArchivePath: string, resourcesArchives: ResourceArchives, modules?: Modules, buildTag?: string): Promise<string>;
|
|
25
|
+
private createDirectoryArchive;
|
|
26
|
+
private collectManifestPathsByKey;
|
|
27
|
+
private walk;
|
|
28
|
+
private isRecord;
|
|
29
|
+
private normalizePath;
|
|
30
|
+
private toArchivePath;
|
|
18
31
|
}
|
|
19
32
|
//# sourceMappingURL=uploader.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uploader.d.ts","sourceRoot":"","sources":["../../../src/deploy/uploader/uploader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"uploader.d.ts","sourceRoot":"","sources":["../../../src/deploy/uploader/uploader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,EAAmB,MAAM,mBAAmB,CAAC;AAC/G,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAE3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAC5E,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAC3E,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAIvC,MAAM,WAAW,eAAe;IAC9B,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACvE,qBAAqB,CACnB,gBAAgB,EAAE,gBAAgB,EAClC,cAAc,CAAC,EAAE,MAAM,EACvB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAC/B,sBAAsB,CACpB,kBAAkB,EAAE,MAAM,EAC1B,iBAAiB,EAAE,gBAAgB,EACnC,OAAO,CAAC,EAAE,OAAO,EACjB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,MAAM,CAAC,CAAC;CACpB;AAED,qBAAa,kBAAmB,YAAW,eAAe;IAEtD,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,eAAe;gBAPf,gBAAgB,EAAE,iBAAiB,EACnC,QAAQ,EAAE,cAAc,EACxB,QAAQ,EAAE,YAAY,EACtB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,OAAO,CAAC,QAAQ,CAAC,EACxC,gBAAgB,EAAE,gBAAgB,EAClC,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,eAAe;IAGtC,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAYtE,qBAAqB,CAChC,gBAAgB,EAAE,gBAAgB,EAClC,cAAc,CAAC,EAAE,MAAM,EACvB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IA0BjB,sBAAsB,CACjC,kBAAkB,EAAE,MAAM,EAC1B,iBAAiB,EAAE,gBAAgB,EACnC,OAAO,CAAC,EAAE,OAAO,EACjB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,MAAM,CAAC;YA+CJ,sBAAsB;IAYpC,OAAO,CAAC,yBAAyB;IAcjC,OAAO,CAAC,IAAI;IAgBZ,OAAO,CAAC,QAAQ;IAIhB,OAAO,CAAC,aAAa;IAKrB,OAAO,CAAC,aAAa;CAGtB"}
|