@forge/cli-shared 3.20.0-next.16 → 3.20.0-next.17

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @forge/cli-shared
 
+## 3.20.0-next.17
+
+### Patch Changes
+
+- de5d2023: Allow packaging extra files in Forge apps
+- Updated dependencies [de5d2023]
+  - @forge/manifest@4.20.2-next.5
+
 ## 3.20.0-next.16
 
 ### Patch Changes

package/out/apps/register-app.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"register-app.d.ts","sourceRoot":"","sources":["../../src/apps/register-app.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AACrE,OAAO,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,eAAe;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,YAAY,EAAE;QACZ,GAAG,EAAE,MAAM,CAAC;KACb,EAAE,CAAC;CACL;AAED,MAAM,WAAW,eAAe;IAC9B,SAAS,CAAC,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;CAClE;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,EAAE;QACT,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;CACH,CAAC;AAEF,qBAAa,kBAAkB;IAE3B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAHN,SAAS,EAAE,eAAe,EAC1B,eAAe,EAAE,mBAAmB,CAAC,UAAU,CAAC,EAChD,eAAe,EAAE,mBAAmB,CAAC,UAAU,CAAC,EAChD,MAAM,EAAE,MAAM;IAGpB,OAAO,CAAC,KAAK,EAAE,oBAAoB,EAAE,oBAAoB,UAAQ,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAQ9F,WAAW,CACtB,KAAK,EAAE,oBAAoB,EAC3B,SAAS,EAAE,MAAM,EACjB,oBAAoB,EAAE,OAAO,GAC5B,OAAO,CAAC,eAAe,CAAC;CAyB5B"}
+{"version":3,"file":"register-app.d.ts","sourceRoot":"","sources":["../../src/apps/register-app.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAErE,OAAO,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,eAAe;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,YAAY,EAAE;QACZ,GAAG,EAAE,MAAM,CAAC;KACb,EAAE,CAAC;CACL;AAED,MAAM,WAAW,eAAe;IAC9B,SAAS,CAAC,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;CAClE;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,EAAE;QACT,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;CACH,CAAC;AAEF,qBAAa,kBAAkB;IAE3B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAHN,SAAS,EAAE,eAAe,EAC1B,eAAe,EAAE,mBAAmB,CAAC,UAAU,CAAC,EAChD,eAAe,EAAE,mBAAmB,CAAC,UAAU,CAAC,EAChD,MAAM,EAAE,MAAM;IAGpB,OAAO,CAAC,KAAK,EAAE,oBAAoB,EAAE,oBAAoB,UAAQ,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAQ9F,WAAW,CACtB,KAAK,EAAE,oBAAoB,EAC3B,SAAS,EAAE,MAAM,EACjB,oBAAoB,EAAE,OAAO,GAC5B,OAAO,CAAC,eAAe,CAAC;CAqB5B"}

package/out/apps/register-app.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RegisterAppCommand = void 0;
-const path_1 = require("path");
+const file_system_1 = require("../file-system");
 const ui_1 = require("../ui");
 class RegisterAppCommand {
     constructor(appClient, appConfigReader, appConfigWriter, logger) {
@@ -20,9 +20,7 @@ class RegisterAppCommand {
     async registerApp(input, directory, shouldPrependAppName) {
         this.logger.info(ui_1.Text.create.taskRegister);
         const result = await this.appClient.createApp(input);
-        const cwd = process.cwd();
-        process.chdir((0, path_1.resolve)(cwd, directory));
-        try {
+        await (0, file_system_1.inDirectory)(directory, async () => {
             const section = await this.appConfigReader.readConfigSection();
             let newAppDetails = {
                 id: result.id
@@ -34,10 +32,7 @@ class RegisterAppCommand {
             if (shouldPrependAppName) {
                 await this.appConfigWriter.prependAppNameToModules(input.name);
             }
-        }
-        finally {
-            process.chdir(cwd);
-        }
+        });
         this.logger.info(ui_1.Text.create.taskCreateEnvironments);
         return result;
     }

package/out/file-system/file-system-reader.d.ts

@@ -7,7 +7,10 @@ export declare class FileSystemReader {
     readFile(filePath: string): string | undefined;
     readFileAsync(filePath: string): Promise<string | undefined>;
     recursiveReadDir(rootDir: string, ignores?: ReadonlyArray<string | IgnoreFunction>): Promise<string[]>;
-    readGlob(pattern: string): Promise<string[]>;
+    readGlob({ pattern, filesOnly }: {
+        pattern: string;
+        filesOnly?: boolean;
+    }): Promise<string[]>;
     hasGlobSpecialChars(pattern: string): boolean;
     readBinaryFile(filePath: string): Buffer | undefined;
     readBinaryFileAsync(filePath: string): Promise<Buffer | undefined>;
@@ -16,6 +19,7 @@ export declare class FileSystemReader {
     getSize(filePath: string): number | undefined;
     getFolderSizeAsync(directory: string): Promise<number | undefined>;
     private handleFileError;
+    getFileGlobList(globList: string[]): Promise<string[]>;
 }
 export {};
 //# sourceMappingURL=file-system-reader.d.ts.map

package/out/file-system/file-system-reader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"file-system-reader.d.ts","sourceRoot":"","sources":["../../src/file-system/file-system-reader.ts"],"names":[],"mappings":";;AAAA,OAAO,EAA4B,MAAM,IAAI,CAAC;AAU9C,KAAK,cAAc,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,OAAO,CAAC;AAEjE,qBAAa,gBAAgB;IACpB,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;IAIrC,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAQxC,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAS5D,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,aAAa,CAAC,MAAM,GAAG,cAAc,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAgBtG,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAMlD,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAI7C,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAQ9C,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IASxE,gBAAgB,IAAI,MAAM;IAI1B,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM;IAO3C,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAQvC,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAW/E,OAAO,CAAC,eAAe;CAOxB"}
+{"version":3,"file":"file-system-reader.d.ts","sourceRoot":"","sources":["../../src/file-system/file-system-reader.ts"],"names":[],"mappings":";;AAAA,OAAO,EAA4B,MAAM,IAAI,CAAC;AAW9C,KAAK,cAAc,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,OAAO,CAAC;AAEjE,qBAAa,gBAAgB;IACpB,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;IAIrC,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAQxC,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAS5D,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,aAAa,CAAC,MAAM,GAAG,cAAc,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAgBtG,QAAQ,CAAC,EAAE,OAAO,EAAE,SAAiB,EAAE,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAmB3G,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAI7C,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAQ9C,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IASxE,gBAAgB,IAAI,MAAM;IAI1B,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM;IAO3C,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAQvC,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAW/E,OAAO,CAAC,eAAe;IAQV,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;CAIpE"}

package/out/file-system/file-system-reader.js

@@ -9,6 +9,7 @@ const path_1 = tslib_1.__importStar(require("path"));
 const util_1 = require("util");
 const recursive_readdir_1 = tslib_1.__importDefault(require("recursive-readdir"));
 const get_folder_size_1 = tslib_1.__importDefault(require("get-folder-size"));
+const shared_1 = require("../shared");
 const FILE_NOT_FOUND_CODE = 'ENOENT';
 class FileSystemReader {
     fileExists(filePath) {
@@ -43,8 +44,18 @@ class FileSystemReader {
         }
         return (0, recursive_readdir_1.default)(rootDir, ignoreDirs);
     }
-    async readGlob(pattern) {
-        const results = await (0, glob_1.glob)(pattern, {});
+    async readGlob({ pattern, filesOnly = false }) {
+        let results = await (0, glob_1.glob)(pattern, {});
+        if (filesOnly) {
+            results = (0, shared_1.flat)(await Promise.all(results.map(async (result) => {
+                if ((await fs_1.default.promises.lstat(result)).isFile()) {
+                    return [result];
+                }
+                else {
+                    return [];
+                }
+            })));
+        }
         results.sort();
         return results;
     }
@@ -103,5 +114,9 @@ class FileSystemReader {
             throw error;
         }
     }
+    async getFileGlobList(globList) {
+        const files = await Promise.all(globList.map((pattern) => this.readGlob({ pattern, filesOnly: true })));
+        return (0, shared_1.flat)(files);
+    }
 }
 exports.FileSystemReader = FileSystemReader;

package/out/file-system/index.d.ts

@@ -1,4 +1,5 @@
 export * from './file-system-reader';
 export * from './file-system-writer';
+export * from './util';
 export * from './zip-accessor';
 //# sourceMappingURL=index.d.ts.map

package/out/file-system/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/file-system/index.ts"],"names":[],"mappings":"AAEA,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,gBAAgB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/file-system/index.ts"],"names":[],"mappings":"AAEA,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,QAAQ,CAAC;AACvB,cAAc,gBAAgB,CAAC"}

package/out/file-system/index.js

@@ -3,4 +3,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./file-system-reader"), exports);
 tslib_1.__exportStar(require("./file-system-writer"), exports);
+tslib_1.__exportStar(require("./util"), exports);
 tslib_1.__exportStar(require("./zip-accessor"), exports);

package/out/file-system/util.d.ts

@@ -0,0 +1,2 @@
+export declare function inDirectory<T>(path: string, action: () => Promise<T>): Promise<T>;
+//# sourceMappingURL=util.d.ts.map

package/out/file-system/util.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/file-system/util.ts"],"names":[],"mappings":"AAAA,wBAAsB,WAAW,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAQvF"}

package/out/file-system/util.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.inDirectory = void 0;
+async function inDirectory(path, action) {
+    const originalPath = process.cwd();
+    try {
+        process.chdir(path);
+        return await action();
+    }
+    finally {
+        process.chdir(originalPath);
+    }
+}
+exports.inDirectory = inDirectory;

package/out/graphql/graphql-types.d.ts

@@ -13825,6 +13825,7 @@ export type JiraBitbucketWorkspace = {
     approvalState?: Maybe<JiraBitbucketWorkspaceApprovalState>;
     name?: Maybe<Scalars['String']['output']>;
     workspaceId?: Maybe<Scalars['ID']['output']>;
+    workspaceUrl?: Maybe<Scalars['URL']['output']>;
 };
 export declare enum JiraBitbucketWorkspaceApprovalState {
     Approved = "APPROVED",