@forge/cli 13.3.0-next.0-experimental-620648d → 13.3.0-next.15-experimental-5f9d93a
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 +212 -8
- package/npm-shrinkwrap.json +98 -60
- package/out/autocomplete/autocomplete-config.json +8 -0
- 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/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 +2 -0
- package/out/command-line/dependency-injection.d.ts.map +1 -1
- package/out/command-line/dependency-injection.js +6 -3
- package/out/command-line/dependency-injection.js.map +1 -1
- package/out/command-line/index.d.ts.map +1 -1
- package/out/command-line/index.js +4 -1
- package/out/command-line/index.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/command-line/register-containers-commands.d.ts.map +1 -1
- package/out/command-line/register-containers-commands.js +2 -0
- package/out/command-line/register-containers-commands.js.map +1 -1
- package/out/command-line/register-manifest-commands.d.ts +3 -0
- package/out/command-line/register-manifest-commands.d.ts.map +1 -0
- package/out/command-line/register-manifest-commands.js +27 -0
- package/out/command-line/register-manifest-commands.js.map +1 -0
- 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/manifest/index.d.ts +2 -0
- package/out/manifest/index.d.ts.map +1 -0
- package/out/manifest/index.js +5 -0
- package/out/manifest/index.js.map +1 -0
- package/out/manifest/render.d.ts +17 -0
- package/out/manifest/render.d.ts.map +1 -0
- package/out/manifest/render.js +52 -0
- package/out/manifest/render.js.map +1 -0
- 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/package.json +10 -12
|
@@ -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":"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"}
|
|
@@ -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"}
|
|
@@ -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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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/manifest/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/manifest/index.ts"],"names":[],"mappings":";;;AAAA,mDAAyB"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { AppConfigProvider, ConfigReader, GraphQLClient } from '@forge/cli-shared';
|
|
2
|
+
export interface RenderManifestOptions {
|
|
3
|
+
environment: string;
|
|
4
|
+
placement?: string;
|
|
5
|
+
}
|
|
6
|
+
export type RenderedManifest = Record<string, unknown>;
|
|
7
|
+
export declare class MissingAppManifestTransformationError extends Error {
|
|
8
|
+
constructor();
|
|
9
|
+
}
|
|
10
|
+
export declare class ManifestRenderCommand {
|
|
11
|
+
private readonly graphqlClient;
|
|
12
|
+
private readonly getAppConfig;
|
|
13
|
+
private readonly configFile;
|
|
14
|
+
constructor(graphqlClient: GraphQLClient, getAppConfig: AppConfigProvider, configFile: ConfigReader);
|
|
15
|
+
execute({ environment, placement }: RenderManifestOptions): Promise<RenderedManifest>;
|
|
16
|
+
}
|
|
17
|
+
//# sourceMappingURL=render.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../../src/manifest/render.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,YAAY,EACZ,aAAa,EAGd,MAAM,mBAAmB,CAAC;AAE3B,MAAM,WAAW,qBAAqB;IACpC,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAEvD,qBAAa,qCAAsC,SAAQ,KAAK;;CAI/D;AAED,qBAAa,qBAAqB;IAE9B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,UAAU;gBAFV,aAAa,EAAE,aAAa,EAC5B,YAAY,EAAE,iBAAiB,EAC/B,UAAU,EAAE,YAAY;IAG9B,OAAO,CAAC,EAAE,WAAW,EAAE,SAAS,EAAE,EAAE,qBAAqB,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAqCnG"}
|
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.ManifestRenderCommand = exports.MissingAppManifestTransformationError = void 0;
|
|
4
|
+
const cli_shared_1 = require("@forge/cli-shared");
|
|
5
|
+
class MissingAppManifestTransformationError extends Error {
|
|
6
|
+
constructor() {
|
|
7
|
+
super(cli_shared_1.Text.manifest.render.errorMissingTransformation);
|
|
8
|
+
}
|
|
9
|
+
}
|
|
10
|
+
exports.MissingAppManifestTransformationError = MissingAppManifestTransformationError;
|
|
11
|
+
class ManifestRenderCommand {
|
|
12
|
+
graphqlClient;
|
|
13
|
+
getAppConfig;
|
|
14
|
+
configFile;
|
|
15
|
+
constructor(graphqlClient, getAppConfig, configFile) {
|
|
16
|
+
this.graphqlClient = graphqlClient;
|
|
17
|
+
this.getAppConfig = getAppConfig;
|
|
18
|
+
this.configFile = configFile;
|
|
19
|
+
}
|
|
20
|
+
async execute({ environment, placement }) {
|
|
21
|
+
const [{ id: appId }, manifest] = await Promise.all([this.getAppConfig(), this.configFile.readConfig()]);
|
|
22
|
+
const query = `
|
|
23
|
+
query forge_cli_appManifestTransformation(
|
|
24
|
+
$appId: ID!
|
|
25
|
+
$environmentKey: String!
|
|
26
|
+
$manifest: JSON!
|
|
27
|
+
$contextFilter: AppManifestTransformationContextFilter
|
|
28
|
+
) {
|
|
29
|
+
appManifestTransformation(
|
|
30
|
+
appId: $appId
|
|
31
|
+
environmentKey: $environmentKey
|
|
32
|
+
manifest: $manifest
|
|
33
|
+
contextFilter: $contextFilter
|
|
34
|
+
) {
|
|
35
|
+
manifest
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
`;
|
|
39
|
+
const { appManifestTransformation } = await this.graphqlClient.query(query, {
|
|
40
|
+
appId,
|
|
41
|
+
environmentKey: environment,
|
|
42
|
+
manifest,
|
|
43
|
+
contextFilter: placement ? { placement } : undefined
|
|
44
|
+
});
|
|
45
|
+
if (!appManifestTransformation?.manifest) {
|
|
46
|
+
throw new MissingAppManifestTransformationError();
|
|
47
|
+
}
|
|
48
|
+
return appManifestTransformation.manifest;
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
exports.ManifestRenderCommand = ManifestRenderCommand;
|
|
52
|
+
//# sourceMappingURL=render.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"render.js","sourceRoot":"","sources":["../../src/manifest/render.ts"],"names":[],"mappings":";;;AAAA,kDAM2B;AAS3B,MAAa,qCAAsC,SAAQ,KAAK;IAC9D;QACE,KAAK,CAAC,iBAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,0BAA0B,CAAC,CAAC;IACzD,CAAC;CACF;AAJD,sFAIC;AAED,MAAa,qBAAqB;IAEb;IACA;IACA;IAHnB,YACmB,aAA4B,EAC5B,YAA+B,EAC/B,UAAwB;QAFxB,kBAAa,GAAb,aAAa,CAAe;QAC5B,iBAAY,GAAZ,YAAY,CAAmB;QAC/B,eAAU,GAAV,UAAU,CAAc;IACxC,CAAC;IAEG,KAAK,CAAC,OAAO,CAAC,EAAE,WAAW,EAAE,SAAS,EAAyB;QACpE,MAAM,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,QAAQ,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;QAEzG,MAAM,KAAK,GAAG;;;;;;;;;;;;;;;;KAgBb,CAAC;QAEF,MAAM,EAAE,yBAAyB,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,CAGlE,KAAK,EAAE;YACP,KAAK;YACL,cAAc,EAAE,WAAW;YAC3B,QAAQ;YACR,aAAa,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,SAAS;SACrD,CAAC,CAAC;QAEH,IAAI,CAAC,yBAAyB,EAAE,QAAQ,EAAE,CAAC;YACzC,MAAM,IAAI,qCAAqC,EAAE,CAAC;QACpD,CAAC;QAED,OAAO,yBAAyB,CAAC,QAAQ,CAAC;IAC5C,CAAC;CACF;AA5CD,sDA4CC"}
|
|
@@ -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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"}
|
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.15-experimental-5f9d93a",
|
|
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.15-experimental-5f9d93a",
|
|
25
|
+
"@forge/cli-shared": "9.3.0-next.14-experimental-5f9d93a",
|
|
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.15-experimental-5f9d93a",
|
|
28
|
+
"@forge/manifest": "13.3.0-next.9-experimental-5f9d93a",
|
|
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.15-experimental-5f9d93a",
|
|
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",
|
|
@@ -61,11 +60,11 @@
|
|
|
61
60
|
"semver": "^7.6.0",
|
|
62
61
|
"tmp": "^0.2.3",
|
|
63
62
|
"tslib": "^2.6.2",
|
|
64
|
-
"v8-compile-cache": "^2.4.0"
|
|
63
|
+
"v8-compile-cache": "^2.4.0",
|
|
64
|
+
"yaml": "^2.3.4"
|
|
65
65
|
},
|
|
66
66
|
"devDependencies": {
|
|
67
67
|
"@types/adm-zip": "^0.5.5",
|
|
68
|
-
"@types/archiver": "^8.0.0",
|
|
69
68
|
"@types/command-exists": "^1.2.3",
|
|
70
69
|
"@types/cross-spawn": "^6.0.6",
|
|
71
70
|
"@types/didyoumean": "^1.2.3",
|
|
@@ -81,7 +80,7 @@
|
|
|
81
80
|
"@types/semver": "^7.5.8",
|
|
82
81
|
"@types/tmp": "^0.2.6",
|
|
83
82
|
"adm-zip": "^0.5.10",
|
|
84
|
-
"chokidar": "^
|
|
83
|
+
"chokidar": "^4.0.3",
|
|
85
84
|
"jest": "^29.7.0",
|
|
86
85
|
"jest-matcher-specific-error": "^1.0.0",
|
|
87
86
|
"jest-when": "^3.6.0",
|
|
@@ -90,8 +89,7 @@
|
|
|
90
89
|
"memfs": "4.57.7",
|
|
91
90
|
"sentry-testkit": "^5.0.10",
|
|
92
91
|
"type-fest": "4.10.2",
|
|
93
|
-
"typescript": "5.9.2"
|
|
94
|
-
"yaml": "^2.3.4"
|
|
92
|
+
"typescript": "5.9.2"
|
|
95
93
|
},
|
|
96
94
|
"engines": {
|
|
97
95
|
"node": ">=20.18.1 <22.23.1 || >22.23.1 <24.17.0 || >24.17.0"
|