@forge/cli 5.0.0-next.1 → 5.1.0-next.5

package/out/command-line/controller/deploy-controller.d.ts

@@ -3,7 +3,6 @@ import { LintService } from '../../service/lint-service';
 import { DeployView } from '../view/deploy-view';
 import { InstallationService } from '../../service/installation-service';
 import { MigrationKeysService } from '../../service/migration-keys-service';
-import { ResourcePackagingService } from '../../service/resource-packaging-service';
 import { ErrorWithAnalytics } from '../command';
 import { PackageUploadDeployCommand } from '../../deploy';
 import { DeploymentResult } from '../register-deployment-commands';
@@ -29,8 +28,7 @@ export declare class DeployController {
     private readonly migrationKeysService;
     private readonly deployView;
     private readonly packageUploadDeployCommand;
-    private readonly resourcePackagingService;
-    constructor(appConfigProvider: AppConfigProvider, configFile: ConfigFile, lintService: LintService, installationsService: InstallationService, migrationKeysService: MigrationKeysService, deployView: DeployView, packageUploadDeployCommand: PackageUploadDeployCommand, resourcePackagingService: ResourcePackagingService);
+    constructor(appConfigProvider: AppConfigProvider, configFile: ConfigFile, lintService: LintService, installationsService: InstallationService, migrationKeysService: MigrationKeysService, deployView: DeployView, packageUploadDeployCommand: PackageUploadDeployCommand);
     private isMpacProductionApp;
     private connectKeyDeleted;
     private connectKeyChanged;

package/out/command-line/controller/deploy-controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deploy-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/deploy-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,UAAU,EAAE,WAAW,EAAQ,MAAM,mBAAmB,CAAC;AACrF,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,EAA+B,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AACzG,OAAO,EAAE,wBAAwB,EAAE,MAAM,0CAA0C,CAAC;AACpF,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,EAAE,0BAA0B,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAEnE,UAAU,aAAa;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,qBAAa,sBAAuB,SAAQ,WAAY,YAAW,kBAAkB;IACvE,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,MAAM,EAAE;IAItC,aAAa,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC;CAKjD;AAED,qBAAa,sBAAuB,SAAQ,WAAY,YAAW,kBAAkB;IACvE,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,MAAM;IAGpC,aAAa,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;CAK/C;AAED,qBAAa,gBAAgB;IAEzB,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IACrC,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IACrC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,0BAA0B;IAC3C,OAAO,CAAC,QAAQ,CAAC,wBAAwB;gBAPxB,iBAAiB,EAAE,iBAAiB,EACpC,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,WAAW,EACxB,oBAAoB,EAAE,mBAAmB,EACzC,oBAAoB,EAAE,oBAAoB,EAC1C,UAAU,EAAE,UAAU,EACtB,0BAA0B,EAAE,0BAA0B,EACtD,wBAAwB,EAAE,wBAAwB;IAGrE,OAAO,CAAC,mBAAmB;IAI3B,OAAO,CAAC,iBAAiB;IAIzB,OAAO,CAAC,iBAAiB;YAGX,wBAAwB;YAwBxB,mBAAmB;YAiBnB,oBAAoB;IAOrB,GAAG,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,EAAE,aAAa,GAAG,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC;CAsD3F"}
+{"version":3,"file":"deploy-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/deploy-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,UAAU,EAAE,WAAW,EAAQ,MAAM,mBAAmB,CAAC;AACrF,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,EAA+B,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AACzG,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,EAAE,0BAA0B,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAEnE,UAAU,aAAa;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,qBAAa,sBAAuB,SAAQ,WAAY,YAAW,kBAAkB;IACvE,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,MAAM,EAAE;IAItC,aAAa,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC;CAKjD;AAED,qBAAa,sBAAuB,SAAQ,WAAY,YAAW,kBAAkB;IACvE,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,MAAM;IAGpC,aAAa,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;CAK/C;AAED,qBAAa,gBAAgB;IAEzB,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IACrC,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IACrC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,0BAA0B;gBAN1B,iBAAiB,EAAE,iBAAiB,EACpC,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,WAAW,EACxB,oBAAoB,EAAE,mBAAmB,EACzC,oBAAoB,EAAE,oBAAoB,EAC1C,UAAU,EAAE,UAAU,EACtB,0BAA0B,EAAE,0BAA0B;IAGzE,OAAO,CAAC,mBAAmB;IAI3B,OAAO,CAAC,iBAAiB;IAIzB,OAAO,CAAC,iBAAiB;YAGX,wBAAwB;YAwBxB,mBAAmB;YAiBnB,oBAAoB;IAOrB,GAAG,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,EAAE,aAAa,GAAG,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC;CAqD3F"}

package/out/command-line/controller/deploy-controller.js

@@ -27,7 +27,7 @@ class InvalidConnectKeyError extends cli_shared_1.HiddenError {
 }
 exports.InvalidConnectKeyError = InvalidConnectKeyError;
 class DeployController {
-    constructor(appConfigProvider, configFile, lintService, installationsService, migrationKeysService, deployView, packageUploadDeployCommand, resourcePackagingService) {
+    constructor(appConfigProvider, configFile, lintService, installationsService, migrationKeysService, deployView, packageUploadDeployCommand) {
         this.appConfigProvider = appConfigProvider;
         this.configFile = configFile;
         this.lintService = lintService;
@@ -35,7 +35,6 @@ class DeployController {
         this.migrationKeysService = migrationKeysService;
         this.deployView = deployView;
         this.packageUploadDeployCommand = packageUploadDeployCommand;
-        this.resourcePackagingService = resourcePackagingService;
     }
     isMpacProductionApp(mpacAppKey, environment) {
         return !!(mpacAppKey && environment === 'production');
@@ -106,7 +105,6 @@ class DeployController {
         const { id } = await this.appConfigProvider();
         const handlers = await this.configFile.getAppHandlers();
         const resources = await this.configFile.getResources();
-        const archives = await this.resourcePackagingService.zipResources(resources);
         let hasProdInstallations = false;
         try {
             const prodInstallations = await this.installationsService.listAppInstallations({
@@ -119,7 +117,7 @@ class DeployController {
                 throw err;
             }
         }
-        const analytics = await this.deployView.reportDeploymentProgress(id, environment, hasProdInstallations, () => this.packageUploadDeployCommand.execute({ handlers, environmentKey: environment, archives }));
+        const analytics = await this.deployView.reportDeploymentProgress(id, environment, hasProdInstallations, () => this.packageUploadDeployCommand.execute({ handlers, resources, environmentKey: environment }));
         if (verify) {
             await this.verifyPostDeployment(environment);
         }

package/out/command-line/dependency-injection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dependency-injection.d.ts","sourceRoot":"","sources":["../../src/command-line/dependency-injection.ts"],"names":[],"mappings":"AAEA,OAAO,EASL,UAAU,EACV,aAAa,EAEb,UAAU,EAGV,gBAAgB,EAGhB,kBAAkB,EAUlB,YAAY,EACZ,aAAa,EAOb,kBAAkB,EAIlB,kBAAkB,EACnB,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAE/E,OAAO,EAML,0BAA0B,EAG3B,MAAM,WAAW,CAAC;AAEnB,OAAO,EAAE,gCAAgC,EAAE,MAAM,sDAAsD,CAAC;AAExG,OAAO,EAAE,+BAA+B,EAAE,MAAM,qDAAqD,CAAC;AACtG,OAAO,EAAE,6BAA6B,EAAE,MAAM,mDAAmD,CAAC;AAIlG,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAM3E,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAIrE,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAQtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAIzE,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAG3E,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAC9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAWlE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAEhF,eAAO,MAAM,eAAe,eAAsB,UAAU,GAAG,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA2PvE,CAAC;AAGF,aAAK,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;AAC3D,oBAAY,YAAY,GAAG,WAAW,CAAC,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC,CAAC"}
+{"version":3,"file":"dependency-injection.d.ts","sourceRoot":"","sources":["../../src/command-line/dependency-injection.ts"],"names":[],"mappings":"AAEA,OAAO,EASL,UAAU,EACV,aAAa,EAEb,UAAU,EAGV,gBAAgB,EAGhB,kBAAkB,EAUlB,YAAY,EACZ,aAAa,EAOb,kBAAkB,EAIlB,kBAAkB,EACnB,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAE/E,OAAO,EAML,0BAA0B,EAG3B,MAAM,WAAW,CAAC;AAEnB,OAAO,EAAE,gCAAgC,EAAE,MAAM,sDAAsD,CAAC;AAExG,OAAO,EAAE,+BAA+B,EAAE,MAAM,qDAAqD,CAAC;AACtG,OAAO,EAAE,6BAA6B,EAAE,MAAM,mDAAmD,CAAC;AAIlG,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAM3E,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAIrE,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAQtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAIzE,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAG3E,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAC9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAWlE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAIhF,eAAO,MAAM,eAAe,eAAsB,UAAU,GAAG,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAiQvE,CAAC;AAGF,aAAK,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;AAC3D,oBAAY,YAAY,GAAG,WAAW,CAAC,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC,CAAC"}

package/out/command-line/dependency-injection.js

@@ -53,6 +53,8 @@ const tunnel_view_1 = require("./view/tunnel-view");
 const graphql_client_5 = require("../webtrigger/graphql-client");
 const stubController_1 = require("./controller/stubController");
 const prerequisites_controller_1 = require("./controller/prerequisites-controller");
+const runtime_bundler_1 = require("../deploy/packager/runtime-bundler");
+const nativeui_bundler_1 = require("../deploy/packager/nativeui-bundler");
 exports.getDependencies = async (cliDetails) => {
     let cmd;
     const ui = new cli_shared_1.CommandLineUI(() => cmd.verbose);
@@ -123,8 +125,9 @@ exports.getDependencies = async (cliDetails) => {
     const archiveUploader = new deploy_1.AppArchiveUploader(assertiveAppConfigReader, uploaderArtifactClient, fileUploader, ui, new resources_uploader_service_1.ResourcesUploaderService(fileReader));
     const deployer = new deploy_1.ArtifactDeployer(assertiveAppConfigReader, triggerDeployClient, deployMonitorClient, cli_shared_1.pause, ui);
     const bundle = (await featureFlagService.readFlag('xls-lambda-runtime')) === 'nodejs14.x' ? bundler_1.nodeBundle : bundler_1.sandboxBundle;
-    const appPackager = new deploy_1.AppPackager(archiverFactory, ui, bundle);
-    const packageUploadDeployCommand = new deploy_1.PackageUploadDeployCommand(appPackager, archiveUploader, deployer);
+    const runtimeBundler = new runtime_bundler_1.RuntimeBundler(archiverFactory, ui, bundle);
+    const nativeUiBundler = new nativeui_bundler_1.NativeUIBundler(ui, bundler_1.nativeUiBundle);
+    const appPackager = new deploy_1.AppPackager(runtimeBundler, nativeUiBundler, ui);
     const getWebTriggerURLCommand = new get_webtrigger_url_1.GetWebTriggerURLCommand(assertiveAppConfigReader, installationsClient, appEnvironmentClient, webTriggerGraphqlClient);
     const autocompleteController = new autocomplete_controller_1.AutocompleteController(ui);
     const installationsService = new installation_service_1.InstallationService(assertiveAppConfigReader, installationsClient, installationsClient);
@@ -138,7 +141,8 @@ exports.getDependencies = async (cliDetails) => {
     const bridgeScriptService = new cli_shared_1.BridgeScriptService();
     const iframeResizerScriptService = new cli_shared_1.IframeResizerScriptService();
     const resourcePackagingService = new resource_packaging_service_1.ResourcePackagingService(archiverFactory, fileReader, process.cwd(), bridgeScriptService, iframeResizerScriptService);
-    const deployController = new deploy_controller_1.DeployController(assertiveAppConfigReader, configFile, lintService, installationsService, migrationKeysService, deployView, packageUploadDeployCommand, resourcePackagingService);
+    const packageUploadDeployCommand = new deploy_1.PackageUploadDeployCommand(appPackager, archiveUploader, deployer, resourcePackagingService);
+    const deployController = new deploy_controller_1.DeployController(assertiveAppConfigReader, configFile, lintService, installationsService, migrationKeysService, deployView, packageUploadDeployCommand);
     const tunnelView = new tunnel_view_1.TunnelView(ui);
     const configFilePortFindingService = new port_finding_service_1.ConfigFilePortFindingService(configFile);
     const localTunnelService = new tunnel_service_1.LocalTunnelService(configFilePortFindingService);

package/out/command-line/view/install-view.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InstallView = exports.NoScopesError = void 0;
 const cli_shared_1 = require("@forge/cli-shared");
-const csp_1 = require("@forge/csp");
+const egress_1 = require("@forge/egress");
 const lodash_1 = require("lodash");
 class NoScopesError extends Error {
 }
@@ -20,7 +20,7 @@ class InstallView {
         if (egressAddresses.length)
             this.ui.info(text.listEgressAddresses(egressAddresses));
         const cleanedManifestScopes = [...new Set(['read:me', ...manifestScopes])];
-        const groupedManifestEgressAddresses = csp_1.sortAndGroupEgressPermissionsByDomain(manifestEgressAddresses);
+        const groupedManifestEgressAddresses = egress_1.sortAndGroupEgressPermissionsByDomain(manifestEgressAddresses);
         let permissionsMismatchWithManifest = false;
         if (cli_shared_1.environmentToOption(environment) === cli_shared_1.DEFAULT_ENVIRONMENT_OPTION) {
             const scopesMismatch = !lodash_1.isEqual([...cleanedManifestScopes].sort(), [...scopes].sort());

package/out/deploy/package-upload-deploy.d.ts

@@ -1,18 +1,20 @@
 import { Deployer } from './deployer/deployer';
 import { Packager } from './packager/packager';
 import { ArchiveUploader } from './uploader/uploader';
-import { ResourceArchives } from '../service/resource-packaging-service';
 import { DeploymentResult } from '../command-line/register-deployment-commands';
+import { ResourceDetails } from '@forge/cli-shared';
+import { ResourcePackagingService } from '../service/resource-packaging-service';
 export interface Details {
     handlers: Array<string>;
     environmentKey: string;
-    archives: ResourceArchives;
+    resources: ResourceDetails[];
 }
 export declare class PackageUploadDeployCommand {
     private readonly packager;
     private readonly archiveUploader;
     private readonly deployer;
-    constructor(packager: Packager, archiveUploader: ArchiveUploader, deployer: Deployer);
+    private readonly resourcePackagingService;
+    constructor(packager: Packager, archiveUploader: ArchiveUploader, deployer: Deployer, resourcePackagingService: ResourcePackagingService);
     execute(details: Details): Promise<DeploymentResult>;
 }
 //# sourceMappingURL=package-upload-deploy.d.ts.map

package/out/deploy/package-upload-deploy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"package-upload-deploy.d.ts","sourceRoot":"","sources":["../../src/deploy/package-upload-deploy.ts"],"names":[],"mappings":"AAAA,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,uCAAuC,CAAC;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,8CAA8C,CAAC;AAEhF,MAAM,WAAW,OAAO;IACtB,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,gBAAgB,CAAC;CAC5B;AAED,qBAAa,0BAA0B;IAEnC,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAFR,QAAQ,EAAE,QAAQ,EAClB,eAAe,EAAE,eAAe,EAChC,QAAQ,EAAE,QAAQ;IAGxB,OAAO,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAuBlE"}
+{"version":3,"file":"package-upload-deploy.d.ts","sourceRoot":"","sources":["../../src/deploy/package-upload-deploy.ts"],"names":[],"mappings":"AACA,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,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,wBAAwB,EAAE,MAAM,uCAAuC,CAAC;AAEjF,MAAM,WAAW,OAAO;IACtB,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,eAAe,EAAE,CAAC;CAC9B;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;gBAHxB,QAAQ,EAAE,QAAQ,EAClB,eAAe,EAAE,eAAe,EAChC,QAAQ,EAAE,QAAQ,EAClB,wBAAwB,EAAE,wBAAwB;IAGxD,OAAO,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAuClE"}

package/out/deploy/package-upload-deploy.js

@@ -1,21 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PackageUploadDeployCommand = void 0;
+const lodash_1 = require("lodash");
 class PackageUploadDeployCommand {
-    constructor(packager, archiveUploader, deployer) {
+    constructor(packager, archiveUploader, deployer, resourcePackagingService) {
         this.packager = packager;
         this.archiveUploader = archiveUploader;
         this.deployer = deployer;
+        this.resourcePackagingService = resourcePackagingService;
     }
     async execute(details) {
-        const { archivePath, moduleList } = await this.packager.package(details.handlers);
-        const uploadUrl = await this.archiveUploader.uploadArchive(archivePath);
-        const hostedResourceUploadId = await this.archiveUploader.uploadHostedResources(details.environmentKey, details.archives);
+        const [resourcesToBeBundled, preBundledResources] = lodash_1.partition(details.resources, (res) => res.resourceType === 'nativeUI');
+        const { runtimeArchivePath, nativeUiBundlesDetails, moduleList } = await this.packager.package(details.handlers, resourcesToBeBundled);
+        const resourcesArchives = await this.resourcePackagingService.zipResources([
+            ...preBundledResources,
+            ...nativeUiBundlesDetails
+        ]);
+        const [uploadUrl, hostedResourceUploadId] = await Promise.all([
+            this.archiveUploader.uploadArchive(runtimeArchivePath),
+            this.archiveUploader.uploadHostedResources(details.environmentKey, resourcesArchives)
+        ]);
         await this.deployer.deploy(details.environmentKey, uploadUrl, hostedResourceUploadId);
         return {
             analytics: {
                 moduleList,
-                hostedResourceList: Object.values(details.archives).map((a) => ({
+                hostedResourceList: Object.values(resourcesArchives).map((a) => ({
                     extensionList: a.extensions,
                     fileCount: a.fileCount,
                     rawSize: a.rawSize,

package/out/deploy/packager/nativeui-bundler.d.ts

@@ -0,0 +1,12 @@
+import { InDiskBundler } from '@forge/bundler';
+import { Logger, ResourceDetails } from '@forge/cli-shared';
+export interface NativeUIBundleResult {
+    nativeUiBundlesDetails: ResourceDetails[];
+}
+export declare class NativeUIBundler {
+    private readonly logger;
+    private readonly bundler;
+    constructor(logger: Logger, bundler: InDiskBundler);
+    bundle(resources: ResourceDetails[]): Promise<NativeUIBundleResult>;
+}
+//# sourceMappingURL=nativeui-bundler.d.ts.map

package/out/deploy/packager/nativeui-bundler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"nativeui-bundler.d.ts","sourceRoot":"","sources":["../../../src/deploy/packager/nativeui-bundler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAG5D,MAAM,WAAW,oBAAoB;IACnC,sBAAsB,EAAE,eAAe,EAAE,CAAC;CAC3C;AAED,qBAAa,eAAe;IACd,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAU,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAAxC,MAAM,EAAE,MAAM,EAAmB,OAAO,EAAE,aAAa;IAEvE,MAAM,CAAC,SAAS,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,oBAAoB,CAAC;CA8BjF"}

package/out/deploy/packager/nativeui-bundler.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NativeUIBundler = void 0;
+const packager_1 = require("./packager");
+class NativeUIBundler {
+    constructor(logger, bundler) {
+        this.logger = logger;
+        this.bundler = bundler;
+    }
+    async bundle(resources) {
+        const entryPoints = resources.map(({ key, path }) => ({
+            name: key,
+            path
+        }));
+        const nativeUiBundlesDetails = [];
+        if (entryPoints.length > 0) {
+            let bundlerOutputs;
+            try {
+                bundlerOutputs = await Promise.all(entryPoints.map((entrypoint) => this.bundler(process.cwd(), [entrypoint])));
+            }
+            catch (e) {
+                throw new packager_1.BundlerError(e.message);
+            }
+            bundlerOutputs.forEach(({ outputDir }, index) => {
+                this.logger.debug(`NativeUI bundle created: ${outputDir}`);
+                nativeUiBundlesDetails.push(Object.assign(Object.assign({}, resources[index]), { path: outputDir }));
+            });
+        }
+        return {
+            nativeUiBundlesDetails
+        };
+    }
+}
+exports.NativeUIBundler = NativeUIBundler;

package/out/deploy/packager/packager.d.ts

@@ -1,6 +1,6 @@
-import { Logger } from '@forge/cli-shared';
-import { Archiver } from './archiver';
-import { Bundler } from '@forge/bundler';
+import { Logger, ResourceDetails } from '@forge/cli-shared';
+import { NativeUIBundler } from './nativeui-bundler';
+import { RuntimeBundler } from './runtime-bundler';
 export interface PackagerBundlerOutput {
     output: {
         [filename: string]: string;
@@ -13,11 +13,12 @@ export interface PackagerBundlerOutput {
     };
 }
 export interface PackageResult {
-    archivePath: string;
+    runtimeArchivePath: string;
+    nativeUiBundlesDetails: ResourceDetails[];
     moduleList?: string[];
 }
 export interface Packager {
-    package(handlers: Array<string>): Promise<PackageResult>;
+    package(handlers: string[], resources: ResourceDetails[]): Promise<PackageResult>;
 }
 export interface EntryPoint {
     name: string;
@@ -26,10 +27,10 @@ export interface EntryPoint {
 export declare class BundlerError extends Error {
 }
 export declare class AppPackager implements Packager {
-    private readonly archiverFactory;
+    private readonly runtimeBundler;
+    private readonly nativeUiBundler;
     private readonly logger;
-    private readonly bundle;
-    constructor(archiverFactory: () => Archiver, logger: Logger, bundle: Bundler);
-    package(handlers: Array<string>): Promise<PackageResult>;
+    constructor(runtimeBundler: RuntimeBundler, nativeUiBundler: NativeUIBundler, logger: Logger);
+    package(handlers: string[], resources: ResourceDetails[]): Promise<PackageResult>;
 }
 //# sourceMappingURL=packager.d.ts.map

package/out/deploy/packager/packager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"packager.d.ts","sourceRoot":"","sources":["../../../src/deploy/packager/packager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,MAAM,EAAQ,MAAM,mBAAmB,CAAC;AAEtE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAEzC,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE;QAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IACvC,SAAS,CAAC,EAAE;QAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAC3C,QAAQ,CAAC,EAAE;QACT,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KACpB,CAAC;CACH;AAED,MAAM,WAAW,aAAa;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,MAAM,WAAW,QAAQ;IACvB,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;CAC1D;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED,qBAAa,YAAa,SAAQ,KAAK;CAAG;AAE1C,qBAAa,WAAY,YAAW,QAAQ;IAExC,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAFN,eAAe,EAAE,MAAM,QAAQ,EAC/B,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,OAAO;IAGrB,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC;CA0DtE"}
+{"version":3,"file":"packager.d.ts","sourceRoot":"","sources":["../../../src/deploy/packager/packager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,eAAe,EAAQ,MAAM,mBAAmB,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE;QAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IACvC,SAAS,CAAC,EAAE;QAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAC3C,QAAQ,CAAC,EAAE;QACT,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KACpB,CAAC;CACH;AAED,MAAM,WAAW,aAAa;IAC5B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,sBAAsB,EAAE,eAAe,EAAE,CAAC;IAC1C,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,MAAM,WAAW,QAAQ;IACvB,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;CACnF;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED,qBAAa,YAAa,SAAQ,KAAK;CAAG;AAE1C,qBAAa,WAAY,YAAW,QAAQ;IAExC,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAFN,cAAc,EAAE,cAAc,EAC9B,eAAe,EAAE,eAAe,EAChC,MAAM,EAAE,MAAM;IAGpB,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,aAAa,CAAC;CAW/F"}

package/out/deploy/packager/packager.js

@@ -2,60 +2,20 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AppPackager = exports.BundlerError = void 0;
 const cli_shared_1 = require("@forge/cli-shared");
-const path_1 = require("path");
 class BundlerError extends Error {
 }
 exports.BundlerError = BundlerError;
 class AppPackager {
-    constructor(archiverFactory, logger, bundle) {
-        this.archiverFactory = archiverFactory;
+    constructor(runtimeBundler, nativeUiBundler, logger) {
+        this.runtimeBundler = runtimeBundler;
+        this.nativeUiBundler = nativeUiBundler;
         this.logger = logger;
-        this.bundle = bundle;
     }
-    async package(handlers) {
-        let moduleList;
+    async package(handlers, resources) {
         this.logger.info(cli_shared_1.Text.deploy.taskPackage.title);
-        const archiver = this.archiverFactory();
-        archiver.onWarning((err) => {
-            this.logger.warn(cli_shared_1.Text.deploy.taskPackage.archiverWarning(err));
-        });
-        archiver.onEntry((filePath) => {
-            this.logger.debug(cli_shared_1.Text.deploy.taskPackage.fileAddedToArchive(filePath));
-        });
-        const currentDirectory = process.cwd();
-        const entryPoints = [];
-        for (const handler of handlers) {
-            entryPoints.push({
-                name: handler,
-                path: path_1.join(currentDirectory, 'src', handler)
-            });
-        }
-        if (entryPoints.length > 0) {
-            let bundlerResponse;
-            try {
-                bundlerResponse = await this.bundle(process.cwd(), entryPoints);
-            }
-            catch (e) {
-                throw new BundlerError(e.message);
-            }
-            const { output, sourceMap, metadata } = bundlerResponse;
-            if (metadata) {
-                moduleList = metadata.modules;
-            }
-            this.logger.debug(cli_shared_1.Text.deploy.taskPackage.packageBundledFiles);
-            for (const name in output) {
-                archiver.addFile(`${name}.js`, Buffer.from(output[name]));
-            }
-            if (sourceMap) {
-                for (const name in sourceMap) {
-                    archiver.addFile(`${name}.js.map`, Buffer.from(sourceMap[name]));
-                }
-            }
-        }
-        archiver.addRootDependencyFiles(cli_shared_1.dependencyFileNames, this.logger);
-        const archivePath = await archiver.finalise();
-        this.logger.debug(cli_shared_1.Text.deploy.taskPackage.archiveCreated(archivePath));
-        return { archivePath, moduleList };
+        const runtimeBundle = await this.runtimeBundler.bundle(handlers);
+        const nativeUiBundle = await this.nativeUiBundler.bundle(resources);
+        return Object.assign(Object.assign({}, runtimeBundle), nativeUiBundle);
     }
 }
 exports.AppPackager = AppPackager;

package/out/deploy/packager/runtime-bundler.d.ts

@@ -0,0 +1,15 @@
+import { Bundler } from '@forge/bundler';
+import { Logger } from '@forge/cli-shared';
+import { Archiver } from './archiver';
+export interface RuntimeBundleResult {
+    runtimeArchivePath: string;
+    moduleList?: string[];
+}
+export declare class RuntimeBundler {
+    private readonly archiverFactory;
+    private readonly logger;
+    private readonly bundler;
+    constructor(archiverFactory: () => Archiver, logger: Logger, bundler: Bundler);
+    bundle(handlers: string[]): Promise<RuntimeBundleResult>;
+}
+//# sourceMappingURL=runtime-bundler.d.ts.map

package/out/deploy/packager/runtime-bundler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"runtime-bundler.d.ts","sourceRoot":"","sources":["../../../src/deploy/packager/runtime-bundler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAuB,MAAM,EAAQ,MAAM,mBAAmB,CAAC;AACtE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAGtC,MAAM,WAAW,mBAAmB;IAClC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,qBAAa,cAAc;IAEvB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAFP,eAAe,EAAE,MAAM,QAAQ,EAC/B,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO;IAGtB,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,mBAAmB,CAAC;CAyDtE"}

package/out/deploy/packager/runtime-bundler.js

@@ -0,0 +1,58 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RuntimeBundler = void 0;
+const path_1 = require("path");
+const cli_shared_1 = require("@forge/cli-shared");
+const packager_1 = require("./packager");
+class RuntimeBundler {
+    constructor(archiverFactory, logger, bundler) {
+        this.archiverFactory = archiverFactory;
+        this.logger = logger;
+        this.bundler = bundler;
+    }
+    async bundle(handlers) {
+        const archiver = this.archiverFactory();
+        archiver.onWarning((err) => {
+            this.logger.warn(cli_shared_1.Text.deploy.taskPackage.archiverWarning(err));
+        });
+        archiver.onEntry((filePath) => {
+            this.logger.debug(cli_shared_1.Text.deploy.taskPackage.fileAddedToArchive(filePath));
+        });
+        const currentDirectory = process.cwd();
+        const entryPoints = [];
+        for (const handler of handlers) {
+            entryPoints.push({
+                name: handler,
+                path: path_1.join(currentDirectory, 'src', handler)
+            });
+        }
+        const moduleList = [];
+        if (entryPoints.length > 0) {
+            let bundlerResponse;
+            try {
+                bundlerResponse = await this.bundler(process.cwd(), entryPoints);
+            }
+            catch (e) {
+                throw new packager_1.BundlerError(e.message);
+            }
+            const { output, sourceMap, metadata } = bundlerResponse;
+            if (metadata) {
+                moduleList.push(...metadata.modules);
+            }
+            this.logger.debug(cli_shared_1.Text.deploy.taskPackage.packageBundledFiles);
+            for (const name in output) {
+                archiver.addFile(`${name}.js`, Buffer.from(output[name]));
+            }
+            if (sourceMap) {
+                for (const name in sourceMap) {
+                    archiver.addFile(`${name}.js.map`, Buffer.from(sourceMap[name]));
+                }
+            }
+        }
+        archiver.addRootDependencyFiles(cli_shared_1.dependencyFileNames, this.logger);
+        const archivePath = await archiver.finalise();
+        this.logger.debug(cli_shared_1.Text.deploy.taskPackage.archiveCreated(archivePath));
+        return { runtimeArchivePath: archivePath, moduleList };
+    }
+}
+exports.RuntimeBundler = RuntimeBundler;

package/out/service/installation-service.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InstallationService = void 0;
 const cli_shared_1 = require("@forge/cli-shared");
-const csp_1 = require("@forge/csp");
+const egress_1 = require("@forge/egress");
 const lodash_1 = require("lodash");
 const graphql_client_1 = require("../installations/graphql-client");
 const IDENTITY_PRODUCT_NAME = 'identity';
@@ -75,7 +75,7 @@ class InstallationService {
         if (!versions || versions.length === 0)
             return;
         const [{ scopes, egressAddresses }, oldVersion] = versions.map((appEnvironmentVersion) => this.getPermissionsFromAppEnvironmentVersion(appEnvironmentVersion));
-        const groupedEgressAddresses = csp_1.sortAndGroupEgressPermissionsByDomain(egressAddresses);
+        const groupedEgressAddresses = egress_1.sortAndGroupEgressPermissionsByDomain(egressAddresses);
         if (!oldVersion) {
             return {
                 scopes,

package/out/service/resource-packaging-service.d.ts.map

@@ -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,EAGf,mBAAmB,EACnB,0BAA0B,EAC3B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAKrC,qBAAa,6BAA8B,SAAQ,KAAK;gBAC1C,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;CAGrC;AAED,qBAAa,2BAA4B,SAAQ,KAAK;gBACxC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;CAGrC;AAeD,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,KAAK;;CAItD;AAED,qBAAa,0BAA2B,SAAQ,KAAK;;CAIpD;AAED,qBAAa,kCAAmC,SAAQ,KAAK;gBAC/C,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;CAGnD;AAED,qBAAa,oCAAqC,SAAQ,KAAK;gBACjD,WAAW,EAAE,MAAM;CAGhC;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,QAAQ,EAC/B,gBAAgB,EAAE,gBAAgB,EAClC,MAAM,EAAE,MAAM,EACd,mBAAmB,EAAE,mBAAmB,EACxC,0BAA0B,EAAE,0BAA0B;YAG3D,uBAAuB;IAerC,OAAO,CAAC,wCAAwC;IAIhD,OAAO,CAAC,WAAW;IAYnB,OAAO,CAAC,wBAAwB;IAMhC,OAAO,CAAC,iCAAiC;YAM3B,qBAAqB;IAatB,YAAY,CAAC,SAAS,EAAE,eAAe,EAAE,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAiCtG"}
+{"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,EAGf,mBAAmB,EACnB,0BAA0B,EAC3B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAKrC,qBAAa,6BAA8B,SAAQ,KAAK;gBAC1C,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;CAGrC;AAED,qBAAa,2BAA4B,SAAQ,KAAK;gBACxC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;CAGrC;AAeD,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,KAAK;;CAItD;AAED,qBAAa,0BAA2B,SAAQ,KAAK;;CAIpD;AAED,qBAAa,kCAAmC,SAAQ,KAAK;gBAC/C,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;CAGnD;AAED,qBAAa,oCAAqC,SAAQ,KAAK;gBACjD,WAAW,EAAE,MAAM;CAGhC;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,QAAQ,EAC/B,gBAAgB,EAAE,gBAAgB,EAClC,MAAM,EAAE,MAAM,EACd,mBAAmB,EAAE,mBAAmB,EACxC,0BAA0B,EAAE,0BAA0B;YAG3D,uBAAuB;IAerC,OAAO,CAAC,wCAAwC;IAQhD,OAAO,CAAC,WAAW;IAYnB,OAAO,CAAC,wBAAwB;IAMhC,OAAO,CAAC,iCAAiC;YAM3B,qBAAqB;IAatB,YAAY,CAAC,SAAS,EAAE,eAAe,EAAE,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAiCtG"}

package/out/service/resource-packaging-service.js

@@ -62,7 +62,11 @@ class ResourcePackagingService {
         }));
     }
     transformRelativeResourcePathsToAbsolute(appDir, resources) {
-        return resources.map(({ key, path, resourceType }) => ({ key, directory: path_1.join(appDir, path), resourceType }));
+        return resources.map(({ key, path, resourceType }) => ({
+            key,
+            directory: resourceType === 'nativeUI' ? path : path_1.join(appDir, path),
+            resourceType
+        }));
     }
     processFile(filePath, content) {
         if (filePath === CUSTOM_UI_ENTRYPOINT) {
@@ -76,7 +80,7 @@ class ResourcePackagingService {
         return content;
     }
     validateResourceContents({ directory, filePaths, resourceType }) {
-        if (resourceType === 'customUI') {
+        if (resourceType === 'customUI' || resourceType === 'nativeUI') {
             this.assertDirectoryIncludesEntrypoint(directory, filePaths);
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/cli",
-  "version": "5.0.0-next.1",
+  "version": "5.1.0-next.5",
   "description": "A command line interface for managing Atlassian-hosted apps",
   "author": "Atlassian",
   "license": "UNLICENSED",
@@ -18,11 +18,11 @@
     "postinstall": "node -e \"process.exitCode = fs.existsSync('./out/bin/postinstall.js')\" || node ./out/bin/postinstall.js"
   },
   "dependencies": {
-    "@forge/bundler": "3.0.12-next.1",
-    "@forge/cli-shared": "3.0.0-next.1",
-    "@forge/csp": "^1.11.0",
-    "@forge/lint": "3.2.3-next.1",
-    "@forge/manifest": "4.1.0-next.0",
+    "@forge/bundler": "3.1.0-next.4",
+    "@forge/cli-shared": "3.1.0-next.2",
+    "@forge/egress": "^1.1.0-next.1",
+    "@forge/lint": "3.2.4-next.4",
+    "@forge/manifest": "4.2.0-next.1",
     "@forge/util": "1.2.0",
     "ajv": "^6.12.5",
     "archiver": "^5.2.0",
@@ -37,6 +37,7 @@
     "env-paths": "^2.2.0",
     "fs-extra": "^8.1.0",
     "hidefile": "^3.0.0",
+    "keytar": "^7.9.0",
     "latest-version": "^5.1.0",
     "lodash": "^4.17.20",
     "mkdirp": "^1.0.3",