@forge/cli 13.2.0 → 13.3.0-next.7-experimental-116e5ca
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 +128 -0
- package/npm-shrinkwrap.json +40 -38
- package/out/autocomplete/autocomplete-config.json +3 -0
- package/out/command-line/controller/deploy-controller.d.ts +2 -1
- package/out/command-line/controller/deploy-controller.d.ts.map +1 -1
- package/out/command-line/controller/deploy-controller.js +16 -6
- package/out/command-line/controller/deploy-controller.js.map +1 -1
- package/out/command-line/dependency-injection.d.ts.map +1 -1
- package/out/command-line/dependency-injection.js +3 -3
- 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/command-line/register-deployment-commands.d.ts.map +1 -1
- package/out/command-line/register-deployment-commands.js +9 -2
- package/out/command-line/register-deployment-commands.js.map +1 -1
- package/out/command-line/view/deploy-view.d.ts +3 -1
- package/out/command-line/view/deploy-view.d.ts.map +1 -1
- package/out/command-line/view/deploy-view.js +13 -2
- package/out/command-line/view/deploy-view.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 +19 -9
- package/out/deploy/package-upload-deploy.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/service/lint-service.d.ts +5 -3
- package/out/service/lint-service.d.ts.map +1 -1
- package/out/service/lint-service.js +5 -3
- package/out/service/lint-service.js.map +1 -1
- package/out/service/resource-packaging-service.d.ts.map +1 -1
- package/out/service/resource-packaging-service.js +9 -6
- package/out/service/resource-packaging-service.js.map +1 -1
- package/package.json +6 -6
|
@@ -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,7 +1,8 @@
|
|
|
1
|
-
import { ConfigFile, FileSystemReader, StatsigService } from '@forge/cli-shared';
|
|
1
|
+
import { ConfigFile, FileSystemReader, StatsigService, GraphQLClient } from '@forge/cli-shared';
|
|
2
2
|
import { LintFixState, LintResult, LintLogger, ProblemCount } from '@forge/lint';
|
|
3
3
|
interface LintOptions {
|
|
4
4
|
fix?: boolean;
|
|
5
|
+
approveRules?: string[];
|
|
5
6
|
}
|
|
6
7
|
interface RunResult {
|
|
7
8
|
lintResults: LintResult[];
|
|
@@ -12,8 +13,9 @@ export declare class LintService {
|
|
|
12
13
|
private readonly configFile;
|
|
13
14
|
private readonly fileSystemReader;
|
|
14
15
|
private readonly statsigService;
|
|
15
|
-
|
|
16
|
-
|
|
16
|
+
private readonly graphqlClient;
|
|
17
|
+
constructor(configFile: ConfigFile, fileSystemReader: FileSystemReader, statsigService: StatsigService, graphqlClient: GraphQLClient);
|
|
18
|
+
run(environment: string, { fix, approveRules }: LintOptions, logger: LintLogger, directory?: string, lintFunction?: (filesToLint: string[], manifest: import("@forge/manifest").ManifestSchema, environment: string, logger: LintLogger, statsigService: StatsigService, graphqlClient: GraphQLClient, approveRules?: string[], parseFunction?: (filepath: string, parser: typeof import("@forge/lint").tsParser, readFilePromise?: typeof import("fs").readFile.__promisify__) => Promise<import("@forge/lint").LintInput>, lintersOverride?: import("@forge/lint").LinterInterface[]) => Promise<LintResult[]>): Promise<RunResult>;
|
|
17
19
|
private fix;
|
|
18
20
|
problemCount(lintResults: LintResult[]): ProblemCount;
|
|
19
21
|
private failedScopesFromLintResult;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lint-service.d.ts","sourceRoot":"","sources":["../../src/service/lint-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAsB,gBAAgB,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"lint-service.d.ts","sourceRoot":"","sources":["../../src/service/lint-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAsB,gBAAgB,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACpH,OAAO,EAEL,YAAY,EACZ,UAAU,EAGV,UAAU,EACV,YAAY,EACb,MAAM,aAAa,CAAC;AAGrB,UAAU,WAAW;IACnB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;CACzB;AAED,UAAU,SAAS;IACjB,WAAW,EAAE,UAAU,EAAE,CAAC;IAC1B,UAAU,CAAC,EAAE,YAAY,CAAC;CAC3B;AAED,eAAO,MAAM,iBAAiB,UAAU,CAAC;AACzC,qBAAa,WAAW;IAEpB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAHb,UAAU,EAAE,UAAU,EACtB,gBAAgB,EAAE,gBAAgB,EAClC,cAAc,EAAE,cAAc,EAC9B,aAAa,EAAE,aAAa;IAGlC,GAAG,CACd,WAAW,EAAE,MAAM,EACnB,EAAE,GAAG,EAAE,YAAY,EAAE,EAAE,WAAW,EAClC,MAAM,EAAE,UAAU,EAClB,SAAS,SAAoB,EAC7B,YAAY,gTA6DiD,CAAC,8KA7D3C,GAClB,OAAO,CAAC,SAAS,CAAC;YAmCP,GAAG;IASV,YAAY,CAAC,WAAW,EAAE,UAAU,EAAE,GAAG,YAAY;IAI5D,OAAO,CAAC,0BAA0B;IAI3B,YAAY,CAAC,WAAW,EAAE,UAAU,EAAE,GAAG,MAAM,EAAE;CAOzD"}
|
|
@@ -10,12 +10,14 @@ class LintService {
|
|
|
10
10
|
configFile;
|
|
11
11
|
fileSystemReader;
|
|
12
12
|
statsigService;
|
|
13
|
-
|
|
13
|
+
graphqlClient;
|
|
14
|
+
constructor(configFile, fileSystemReader, statsigService, graphqlClient) {
|
|
14
15
|
this.configFile = configFile;
|
|
15
16
|
this.fileSystemReader = fileSystemReader;
|
|
16
17
|
this.statsigService = statsigService;
|
|
18
|
+
this.graphqlClient = graphqlClient;
|
|
17
19
|
}
|
|
18
|
-
async run(environment, { fix }, logger, directory = exports.DEFAULT_DIRECTORY, lintFunction = lint_1.lint) {
|
|
20
|
+
async run(environment, { fix, approveRules }, logger, directory = exports.DEFAULT_DIRECTORY, lintFunction = lint_1.lint) {
|
|
19
21
|
const UIKitResources = await this.configFile.getResources(['nativeUI']);
|
|
20
22
|
const UIKitDirectories = UIKitResources.map((resource) => path_1.default.dirname(resource.path));
|
|
21
23
|
const exclude = [...(await (0, cli_shared_1.listGitIgnoreFiles)(this.fileSystemReader)), '.git', 'node_modules'];
|
|
@@ -27,7 +29,7 @@ class LintService {
|
|
|
27
29
|
const allFilesToLint = filesToLint
|
|
28
30
|
.concat(UIKitFilesToLint)
|
|
29
31
|
.filter((value, index, arr) => arr.indexOf(value) === index);
|
|
30
|
-
const lintResults = await lintFunction(allFilesToLint, await this.configFile.readConfig(), environment, logger, this.statsigService);
|
|
32
|
+
const lintResults = await lintFunction(allFilesToLint, await this.configFile.readConfig(), environment, logger, this.statsigService, this.graphqlClient, approveRules);
|
|
31
33
|
if (fix) {
|
|
32
34
|
return { lintResults, fixResults: await this.fix(lintResults) };
|
|
33
35
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lint-service.js","sourceRoot":"","sources":["../../src/service/lint-service.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"lint-service.js","sourceRoot":"","sources":["../../src/service/lint-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -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,
|
|
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;AAE3B,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAKrC,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"}
|
|
@@ -74,12 +74,15 @@ class ResourcePackagingService {
|
|
|
74
74
|
}));
|
|
75
75
|
}
|
|
76
76
|
transformRelativeResourcePathsToAbsolute(appDir, resources) {
|
|
77
|
-
return resources.map((
|
|
78
|
-
key,
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
77
|
+
return resources.map((resource) => {
|
|
78
|
+
const { key, path, resourceType, entry } = resource;
|
|
79
|
+
return {
|
|
80
|
+
key,
|
|
81
|
+
directory: (0, cli_shared_1.shouldBundleResource)(resource) ? path : (0, path_1.join)(appDir, path),
|
|
82
|
+
resourceType,
|
|
83
|
+
entry
|
|
84
|
+
};
|
|
85
|
+
});
|
|
83
86
|
}
|
|
84
87
|
processFile(filePath, content) {
|
|
85
88
|
if (filePath === CUSTOM_UI_ENTRYPOINT) {
|
|
@@ -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
|
+
"version": "13.3.0-next.7-experimental-116e5ca",
|
|
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,14 +21,14 @@
|
|
|
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.
|
|
24
|
+
"@forge/bundler": "7.1.0-next.7-experimental-116e5ca",
|
|
25
|
+
"@forge/cli-shared": "9.3.0-next.7-experimental-116e5ca",
|
|
26
26
|
"@forge/egress": "3.0.0",
|
|
27
|
-
"@forge/lint": "6.0.
|
|
28
|
-
"@forge/manifest": "13.
|
|
27
|
+
"@forge/lint": "6.0.3-next.7-experimental-116e5ca",
|
|
28
|
+
"@forge/manifest": "13.3.0-next.6-experimental-116e5ca",
|
|
29
29
|
"@forge/i18n": "1.0.0",
|
|
30
30
|
"@forge/runtime": "7.0.0",
|
|
31
|
-
"@forge/tunnel": "7.0.
|
|
31
|
+
"@forge/tunnel": "7.1.0-next.7-experimental-116e5ca",
|
|
32
32
|
"@forge/util": "3.0.0",
|
|
33
33
|
"@sentry/node": "7.106.0",
|
|
34
34
|
"ajv": "^8.18.0",
|