@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
|
@@ -2,17 +2,25 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.AppArchiveUploader = void 0;
|
|
4
4
|
const cli_shared_1 = require("@forge/cli-shared");
|
|
5
|
+
const hidefile_1 = require("hidefile");
|
|
6
|
+
const path_1 = require("path");
|
|
5
7
|
class AppArchiveUploader {
|
|
6
8
|
getConfiguredApp;
|
|
7
9
|
artifact;
|
|
8
10
|
uploader;
|
|
9
11
|
logger;
|
|
12
|
+
archiverFactory;
|
|
13
|
+
fileSystemReader;
|
|
14
|
+
appDir;
|
|
10
15
|
uploaderService;
|
|
11
|
-
constructor(getConfiguredApp, artifact, uploader, logger, uploaderService) {
|
|
16
|
+
constructor(getConfiguredApp, artifact, uploader, logger, archiverFactory, fileSystemReader, appDir, uploaderService) {
|
|
12
17
|
this.getConfiguredApp = getConfiguredApp;
|
|
13
18
|
this.artifact = artifact;
|
|
14
19
|
this.uploader = uploader;
|
|
15
20
|
this.logger = logger;
|
|
21
|
+
this.archiverFactory = archiverFactory;
|
|
22
|
+
this.fileSystemReader = fileSystemReader;
|
|
23
|
+
this.appDir = appDir;
|
|
16
24
|
this.uploaderService = uploaderService;
|
|
17
25
|
}
|
|
18
26
|
async uploadArchive(archivePath, buildTag) {
|
|
@@ -29,20 +37,94 @@ class AppArchiveUploader {
|
|
|
29
37
|
if (resourceKeys.length === 0) {
|
|
30
38
|
return undefined;
|
|
31
39
|
}
|
|
32
|
-
const { preSignedUrls, uploadId } = await this.artifact.getHostedResourcesUploadUrls(appDetails,
|
|
33
|
-
const uploadDetails = resourceKeys.map((resourceKey, i) => {
|
|
34
|
-
|
|
35
|
-
|
|
40
|
+
const { preSignedUrls, uploadId } = await this.artifact.getHostedResourcesUploadUrls(appDetails, resourceKeys, environmentKey, buildTag);
|
|
41
|
+
const uploadDetails = resourceKeys.map((resourceKey, i) => ({
|
|
42
|
+
archive: resourceArchives[resourceKey].zipPath,
|
|
43
|
+
preSignedUrl: preSignedUrls[i]
|
|
44
|
+
}));
|
|
45
|
+
this.logger.debug(cli_shared_1.Text.deploy.taskUpload.uploadingResources());
|
|
46
|
+
await Promise.all(uploadDetails.map((details) => this.uploaderService.upload(details)));
|
|
47
|
+
return uploadId;
|
|
48
|
+
}
|
|
49
|
+
async uploadCombinedArtifact(runtimeArchivePath, resourcesArchives, modules, buildTag) {
|
|
50
|
+
this.logger.info(cli_shared_1.Text.deploy.taskUpload.title);
|
|
51
|
+
const appDetails = await this.getConfiguredApp();
|
|
52
|
+
const uploadUrl = await this.artifact.getUploadUrl(appDetails, buildTag);
|
|
53
|
+
const combinedArchive = await this.archiverFactory();
|
|
54
|
+
combinedArchive.addFrom('app-bundle.zip', runtimeArchivePath);
|
|
55
|
+
for (const [key, archive] of Object.entries(resourcesArchives)) {
|
|
56
|
+
combinedArchive.addFrom(`hosted-resources/${key}.zip`, archive.zipPath);
|
|
57
|
+
}
|
|
58
|
+
for (const filePath of this.collectManifestPathsByKey(modules, 'file')) {
|
|
59
|
+
const fileAbsolutePath = (0, path_1.resolve)(this.appDir, filePath);
|
|
60
|
+
if (!this.fileSystemReader.fileExists(fileAbsolutePath)) {
|
|
61
|
+
throw new cli_shared_1.UserError(cli_shared_1.Text.deploy.error.manifestFilePathNotFound(filePath));
|
|
62
|
+
}
|
|
63
|
+
combinedArchive.addFrom(`files/${this.toArchivePath(filePath)}`, fileAbsolutePath);
|
|
64
|
+
}
|
|
65
|
+
const directoryArchives = await Promise.all(this.collectManifestPathsByKey(modules, 'dir').map(async (directoryPath) => {
|
|
66
|
+
const directoryAbsolutePath = (0, path_1.resolve)(this.appDir, directoryPath);
|
|
67
|
+
if (!this.fileSystemReader.fileExists(directoryAbsolutePath)) {
|
|
68
|
+
throw new cli_shared_1.UserError(cli_shared_1.Text.deploy.error.manifestDirectoryPathNotFound(directoryPath));
|
|
69
|
+
}
|
|
36
70
|
return {
|
|
37
|
-
|
|
38
|
-
|
|
71
|
+
archivePath: `dirs/${this.toArchivePath(directoryPath)}.zip`,
|
|
72
|
+
filePath: await this.createDirectoryArchive(directoryAbsolutePath)
|
|
39
73
|
};
|
|
40
|
-
});
|
|
41
|
-
this.logger.debug(cli_shared_1.Text.deploy.taskUpload.uploadingResources());
|
|
42
|
-
await Promise.all(uploadDetails.map((uploadDetails) => {
|
|
43
|
-
return this.uploaderService.upload(uploadDetails);
|
|
44
74
|
}));
|
|
45
|
-
|
|
75
|
+
for (const { archivePath, filePath } of directoryArchives) {
|
|
76
|
+
combinedArchive.addFrom(archivePath, filePath);
|
|
77
|
+
}
|
|
78
|
+
const combinedZipPath = await combinedArchive.finalise();
|
|
79
|
+
this.logger.debug(cli_shared_1.Text.deploy.taskUpload.uploadingArchive(uploadUrl));
|
|
80
|
+
await this.uploader.uploadFromPath(uploadUrl, combinedZipPath);
|
|
81
|
+
return uploadUrl;
|
|
82
|
+
}
|
|
83
|
+
async createDirectoryArchive(directoryAbsolutePath) {
|
|
84
|
+
const archiver = await this.archiverFactory();
|
|
85
|
+
const filePaths = await this.fileSystemReader.recursiveReadDir(directoryAbsolutePath, [hidefile_1.isHiddenSync]);
|
|
86
|
+
for (const filePath of filePaths) {
|
|
87
|
+
const relativePath = this.toArchivePath((0, path_1.relative)(directoryAbsolutePath, filePath));
|
|
88
|
+
archiver.addFrom(relativePath, filePath);
|
|
89
|
+
}
|
|
90
|
+
return archiver.finalise();
|
|
91
|
+
}
|
|
92
|
+
collectManifestPathsByKey(modules, key) {
|
|
93
|
+
const paths = new Set();
|
|
94
|
+
this.walk(modules, (entry) => {
|
|
95
|
+
if (!this.isRecord(entry)) {
|
|
96
|
+
return;
|
|
97
|
+
}
|
|
98
|
+
const value = entry[key];
|
|
99
|
+
if (typeof value === 'string') {
|
|
100
|
+
paths.add(this.normalizePath(value));
|
|
101
|
+
}
|
|
102
|
+
});
|
|
103
|
+
return [...paths];
|
|
104
|
+
}
|
|
105
|
+
walk(value, visit) {
|
|
106
|
+
if (Array.isArray(value)) {
|
|
107
|
+
for (const item of value) {
|
|
108
|
+
this.walk(item, visit);
|
|
109
|
+
}
|
|
110
|
+
return;
|
|
111
|
+
}
|
|
112
|
+
if (this.isRecord(value)) {
|
|
113
|
+
visit(value);
|
|
114
|
+
for (const child of Object.values(value)) {
|
|
115
|
+
this.walk(child, visit);
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
isRecord(value) {
|
|
120
|
+
return typeof value === 'object' && value !== null;
|
|
121
|
+
}
|
|
122
|
+
normalizePath(path) {
|
|
123
|
+
const normalized = (0, path_1.normalize)(path).replace(/\\/g, '/');
|
|
124
|
+
return normalized.startsWith('./') ? normalized.slice(2) : normalized;
|
|
125
|
+
}
|
|
126
|
+
toArchivePath(path) {
|
|
127
|
+
return path.split(path_1.sep).join('/');
|
|
46
128
|
}
|
|
47
129
|
}
|
|
48
130
|
exports.AppArchiveUploader = AppArchiveUploader;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uploader.js","sourceRoot":"","sources":["../../../src/deploy/uploader/uploader.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"uploader.js","sourceRoot":"","sources":["../../../src/deploy/uploader/uploader.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bitbucket.d.ts","sourceRoot":"","sources":["../../../src/installations/site-translation/bitbucket.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"bitbucket.d.ts","sourceRoot":"","sources":["../../../src/installations/site-translation/bitbucket.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC1B,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAGvD,qBAAa,qBAAsB,SAAQ,KAAK;gBAClC,GAAG,EAAE,GAAG;CAGrB;AAOD,eAAO,MAAM,oBAAoB,QAAO,MAEvC,CAAC;AAEF,qBAAa,mBAAoB,YAAW,cAAc;IACjD,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAInC,wBAAwB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;IAUlE,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YAcvE,cAAc;IAwBf,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,GAAG,IAAI,CAAC;IAsBtE,OAAO,CAAC,mBAAmB;IAI3B,OAAO,CAAC,kBAAkB;IAI1B,OAAO,CAAC,aAAa;IAKrB,OAAO,CAAC,oBAAoB;IAW5B,OAAO,CAAC,iBAAiB;CAG1B"}
|
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.BitbucketTranslator = exports.getBitbucketEndpoint = exports.InvalidWorkspaceError = void 0;
|
|
4
|
-
const tslib_1 = require("tslib");
|
|
5
|
-
const node_fetch_1 = tslib_1.__importDefault(require("node-fetch"));
|
|
6
4
|
const url_1 = require("url");
|
|
7
5
|
const ari_1 = require("@forge/util/packages/ari");
|
|
8
6
|
const cli_shared_1 = require("@forge/cli-shared");
|
|
@@ -46,7 +44,7 @@ class BitbucketTranslator {
|
|
|
46
44
|
async getWorkspaceId(site) {
|
|
47
45
|
const workspaceName = this.extractWorkspaceName(site);
|
|
48
46
|
const url = this.buildFetchUrl(workspaceName);
|
|
49
|
-
const res = await (
|
|
47
|
+
const res = await fetch(url);
|
|
50
48
|
if (!res.ok) {
|
|
51
49
|
throw new InvalidWorkspaceError(site);
|
|
52
50
|
}
|
|
@@ -64,7 +62,7 @@ class BitbucketTranslator {
|
|
|
64
62
|
}
|
|
65
63
|
async getWorkspaceUrl(workspaceId) {
|
|
66
64
|
const url = this.buildFetchUrl(this.decorateWorkspaceId(workspaceId));
|
|
67
|
-
const res = await (
|
|
65
|
+
const res = await fetch(url);
|
|
68
66
|
if (!res.ok) {
|
|
69
67
|
return null;
|
|
70
68
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bitbucket.js","sourceRoot":"","sources":["../../../src/installations/site-translation/bitbucket.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"bitbucket.js","sourceRoot":"","sources":["../../../src/installations/site-translation/bitbucket.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { Modules } from '@forge/manifest';
|
|
2
|
-
import { FileSystemReader, ResourceDetails, BridgeScriptService, IframeResizerScriptService, UserError, type I18nResourceBundle } from '@forge/cli-shared';
|
|
3
|
-
import { Archiver } from '../deploy';
|
|
2
|
+
import { FileSystemReader, ResourceDetails, BridgeScriptService, IframeResizerScriptService, UserError, Archiver, type I18nResourceBundle } from '@forge/cli-shared';
|
|
4
3
|
export declare class ResourceDirectoryMissingError extends UserError {
|
|
5
4
|
constructor(key: string, dir: string);
|
|
6
5
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resource-packaging-service.d.ts","sourceRoot":"","sources":["../../src/service/resource-packaging-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EACL,gBAAgB,EAChB,eAAe,EAEf,mBAAmB,EACnB,0BAA0B,EAE1B,SAAS,EAET,KAAK,kBAAkB,EAExB,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"resource-packaging-service.d.ts","sourceRoot":"","sources":["../../src/service/resource-packaging-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EACL,gBAAgB,EAChB,eAAe,EAEf,mBAAmB,EACnB,0BAA0B,EAE1B,SAAS,EAET,QAAQ,EACR,KAAK,kBAAkB,EAExB,MAAM,mBAAmB,CAAC;AAM3B,qBAAa,6BAA8B,SAAQ,SAAS;gBAC9C,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;CAGrC;AAED,qBAAa,2BAA4B,SAAQ,SAAS;gBAC5C,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;CAGrC;AAiBD,MAAM,WAAW,gBAAgB;IAC/B,CAAC,GAAG,EAAE,MAAM,GAAG;QACb,OAAO,EAAE,MAAM,CAAC;QAChB,UAAU,EAAE,MAAM,EAAE,CAAC;QACrB,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,MAAM,CAAC;QAChB,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;CACH;AAED,qBAAa,4BAA6B,SAAQ,SAAS;;CAI1D;AAED,qBAAa,0BAA2B,SAAQ,SAAS;;CAIxD;AAED,qBAAa,kCAAmC,SAAQ,SAAS;gBACnD,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;CAGnD;AAED,qBAAa,oCAAqC,SAAQ,SAAS;gBACrD,WAAW,EAAE,MAAM;CAGhC;AAED,qBAAa,2BAA4B,SAAQ,SAAS;gBAC5C,GAAG,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE;CAGlD;AAED,qBAAa,wBAAwB;IAEjC,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,0BAA0B;gBAJ1B,eAAe,EAAE,MAAM,OAAO,CAAC,QAAQ,CAAC,EACxC,gBAAgB,EAAE,gBAAgB,EAClC,MAAM,EAAE,MAAM,EACd,mBAAmB,EAAE,mBAAmB,EACxC,0BAA0B,EAAE,0BAA0B;YAG3D,uBAAuB;IAerC,OAAO,CAAC,wCAAwC;IAiBhD,OAAO,CAAC,WAAW;IAYnB,OAAO,CAAC,wBAAwB;IAYhC,OAAO,CAAC,iCAAiC;IAMzC,OAAO,CAAC,oBAAoB;IAM5B,OAAO,CAAC,qBAAqB;YAuBf,qBAAqB;IAanC,OAAO,CAAC,oBAAoB;IAMf,YAAY,CACvB,SAAS,EAAE,eAAe,EAAE,EAC5B,kBAAkB,EAAE,kBAAkB,EACtC,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,gBAAgB,CAAC;CAoC7B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resource-packaging-service.js","sourceRoot":"","sources":["../../src/service/resource-packaging-service.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"resource-packaging-service.js","sourceRoot":"","sources":["../../src/service/resource-packaging-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resources-uploader-service.d.ts","sourceRoot":"","sources":["../../src/service/resources-uploader-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,gBAAgB,EAAE,0BAA0B,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"resources-uploader-service.d.ts","sourceRoot":"","sources":["../../src/service/resources-uploader-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,gBAAgB,EAAE,0BAA0B,EAAE,MAAM,mBAAmB,CAAC;AAG5F,MAAM,WAAW,eAAe;IAC9B,MAAM,CAAC,OAAO,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,0BAA0B,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/F;AAcD,qBAAa,wBAAyB,YAAW,eAAe;IAClD,OAAO,CAAC,QAAQ,CAAC,gBAAgB;gBAAhB,gBAAgB,EAAE,gBAAgB;IAClD,MAAM,CAAC,EAClB,OAAO,EACP,YAAY,EACb,EAAE;QACD,OAAO,EAAE,MAAM,CAAC;QAChB,YAAY,EAAE,0BAA0B,CAAC;KAC1C,GAAG,OAAO,CAAC,IAAI,CAAC;CAyBlB"}
|
|
@@ -4,7 +4,6 @@ exports.ResourcesUploaderService = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const cli_shared_1 = require("@forge/cli-shared");
|
|
6
6
|
const form_data_1 = tslib_1.__importDefault(require("form-data"));
|
|
7
|
-
const node_fetch_1 = tslib_1.__importDefault(require("node-fetch"));
|
|
8
7
|
class ResourceUploadError extends cli_shared_1.BaseError {
|
|
9
8
|
userError;
|
|
10
9
|
constructor(userError = false, requestId) {
|
|
@@ -29,9 +28,12 @@ class ResourcesUploaderService {
|
|
|
29
28
|
formData.append(k, v);
|
|
30
29
|
});
|
|
31
30
|
formData.append('file', content);
|
|
32
|
-
const
|
|
31
|
+
const body = new Uint8Array(formData.getBuffer());
|
|
32
|
+
const headers = formData.getHeaders();
|
|
33
|
+
const response = await fetch(preSignedUrl.uploadUrl, {
|
|
33
34
|
method: 'POST',
|
|
34
|
-
|
|
35
|
+
headers,
|
|
36
|
+
body
|
|
35
37
|
});
|
|
36
38
|
if (!response.ok) {
|
|
37
39
|
throw new ResourceUploadError(response.status >= 400 && response.status < 500);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resources-uploader-service.js","sourceRoot":"","sources":["../../src/service/resources-uploader-service.ts"],"names":[],"mappings":";;;;AAAA,kDAA4F;AAC5F,kEAAiC;
|
|
1
|
+
{"version":3,"file":"resources-uploader-service.js","sourceRoot":"","sources":["../../src/service/resources-uploader-service.ts"],"names":[],"mappings":";;;;AAAA,kDAA4F;AAC5F,kEAAiC;AAMjC,MAAM,mBAAoB,SAAQ,sBAAS;IAEtB;IADnB,YACmB,YAAqB,KAAK,EAC3C,SAA8B;QAE9B,KAAK,CAAC,SAAS,EAAE,iCAAiC,CAAC,CAAC;QAHnC,cAAS,GAAT,SAAS,CAAiB;IAI7C,CAAC;IACM,WAAW;QAChB,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;CACF;AAED,MAAa,wBAAwB;IACN;IAA7B,YAA6B,gBAAkC;QAAlC,qBAAgB,GAAhB,gBAAgB,CAAkB;IAAG,CAAC;IAC5D,KAAK,CAAC,MAAM,CAAC,EAClB,OAAO,EACP,YAAY,EAIb;QACC,MAAM,OAAO,GAAG,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAE9D,MAAM,QAAQ,GAAG,IAAI,mBAAQ,EAAE,CAAC;QAChC,QAAQ,CAAC,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAAC;QACnD,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,2BAA2B,CAAC,CAAC;QAEpD,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;YAC7D,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACxB,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACjC,MAAM,IAAI,GAAG,IAAI,UAAU,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC,CAAC;QAClD,MAAM,OAAO,GAAG,QAAQ,CAAC,UAAU,EAAiB,CAAC;QAErD,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,YAAY,CAAC,SAAS,EAAE;YACnD,MAAM,EAAE,MAAM;YACd,OAAO;YACP,IAAI;SACL,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,IAAI,mBAAmB,CAAC,QAAQ,CAAC,MAAM,IAAI,GAAG,IAAI,QAAQ,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC;QACjF,CAAC;IACH,CAAC;CACF;AAjCD,4DAiCC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@forge/cli",
|
|
3
|
-
"version": "13.3.0-next.
|
|
3
|
+
"version": "13.3.0-next.12-experimental-4b981ef",
|
|
4
4
|
"description": "A command line interface for managing Atlassian-hosted apps",
|
|
5
5
|
"author": "Atlassian",
|
|
6
6
|
"license": "SEE LICENSE IN LICENSE.txt",
|
|
@@ -21,18 +21,17 @@
|
|
|
21
21
|
"generate:custom-scopes-types": "json2ts --input src/custom-scopes/validation/schema.json --output src/custom-scopes/generated-types.d.ts --style.singleQuote"
|
|
22
22
|
},
|
|
23
23
|
"dependencies": {
|
|
24
|
-
"@forge/bundler": "7.0
|
|
25
|
-
"@forge/cli-shared": "9.3.0-next.
|
|
24
|
+
"@forge/bundler": "7.1.0-next.12-experimental-4b981ef",
|
|
25
|
+
"@forge/cli-shared": "9.3.0-next.11-experimental-4b981ef",
|
|
26
26
|
"@forge/egress": "3.0.0",
|
|
27
|
-
"@forge/lint": "6.0.3-next.
|
|
28
|
-
"@forge/manifest": "13.3.0-next.
|
|
27
|
+
"@forge/lint": "6.0.3-next.12-experimental-4b981ef",
|
|
28
|
+
"@forge/manifest": "13.3.0-next.7-experimental-4b981ef",
|
|
29
29
|
"@forge/i18n": "1.0.0",
|
|
30
30
|
"@forge/runtime": "7.0.0",
|
|
31
|
-
"@forge/tunnel": "7.1.0-next.
|
|
31
|
+
"@forge/tunnel": "7.1.0-next.12-experimental-4b981ef",
|
|
32
32
|
"@forge/util": "3.0.0",
|
|
33
33
|
"@sentry/node": "7.106.0",
|
|
34
34
|
"ajv": "^8.18.0",
|
|
35
|
-
"archiver": "^8.0.0",
|
|
36
35
|
"case": "^1.6.3",
|
|
37
36
|
"chalk": "^4.1.2",
|
|
38
37
|
"cheerio": "^1.2.0",
|
|
@@ -52,7 +51,6 @@
|
|
|
52
51
|
"http-proxy-agent": "^7.0.2",
|
|
53
52
|
"latest-version": "^7.0.0",
|
|
54
53
|
"lodash": "^4.17.21",
|
|
55
|
-
"node-fetch": "2.7.0",
|
|
56
54
|
"node-machine-id": "^1.1.12",
|
|
57
55
|
"omelette": "^0.4.17",
|
|
58
56
|
"ora": "^5.4.1",
|
|
@@ -65,7 +63,6 @@
|
|
|
65
63
|
},
|
|
66
64
|
"devDependencies": {
|
|
67
65
|
"@types/adm-zip": "^0.5.5",
|
|
68
|
-
"@types/archiver": "^8.0.0",
|
|
69
66
|
"@types/command-exists": "^1.2.3",
|
|
70
67
|
"@types/cross-spawn": "^6.0.6",
|
|
71
68
|
"@types/didyoumean": "^1.2.3",
|
|
@@ -76,12 +73,11 @@
|
|
|
76
73
|
"@types/jest": "^29.5.14",
|
|
77
74
|
"@types/jws": "^3.2.10",
|
|
78
75
|
"@types/node": "20.19.1",
|
|
79
|
-
"@types/node-fetch": "^2.6.12",
|
|
80
76
|
"@types/omelette": "^0.4.5",
|
|
81
77
|
"@types/semver": "^7.5.8",
|
|
82
78
|
"@types/tmp": "^0.2.6",
|
|
83
79
|
"adm-zip": "^0.5.10",
|
|
84
|
-
"chokidar": "^
|
|
80
|
+
"chokidar": "^4.0.3",
|
|
85
81
|
"jest": "^29.7.0",
|
|
86
82
|
"jest-matcher-specific-error": "^1.0.0",
|
|
87
83
|
"jest-when": "^3.6.0",
|
|
@@ -94,12 +90,9 @@
|
|
|
94
90
|
"yaml": "^2.3.4"
|
|
95
91
|
},
|
|
96
92
|
"engines": {
|
|
97
|
-
"node": ">=20.18.1
|
|
98
|
-
},
|
|
99
|
-
"engines_why": {
|
|
100
|
-
"22.23.1": "ECO-1586: Includes bug https://github.com/nodejs/node/issues/63989 triggering 'Premature close' on node-fetch",
|
|
101
|
-
"24.17.0": "ECO-1586: Includes bug https://github.com/nodejs/node/issues/63989 triggering 'Premature close' on node-fetch"
|
|
93
|
+
"node": ">=20.18.1"
|
|
102
94
|
},
|
|
95
|
+
"engines_why": {},
|
|
103
96
|
"publishConfig": {
|
|
104
97
|
"registry": "https://packages.atlassian.com/api/npm/npm-public/"
|
|
105
98
|
},
|