@forge/cli-shared 2.2.2 → 2.3.0-next.10

package/CHANGELOG.md

@@ -1,5 +1,87 @@
 # @forge/cli-shared
 
+## 2.3.0-next.10
+
+### Patch Changes
+
+- 47a71a62: Upgrade graphql-request for node 16 compatibility
+- Updated dependencies [fcd95803]
+- Updated dependencies [e65d33e6]
+  - @forge/manifest@3.3.0-next.8
+
+## 2.3.0-next.9
+
+### Minor Changes
+
+- cf2420d2: Added root package.json and lock files to app bundle.
+
+## 2.3.0-next.8
+
+### Patch Changes
+
+- Updated dependencies [8e35955]
+  - @forge/manifest@3.3.0-next.7
+
+## 2.3.0-next.7
+
+### Patch Changes
+
+- Updated dependencies [ad94136]
+  - @forge/manifest@3.3.0-next.6
+
+## 2.3.0-next.6
+
+### Patch Changes
+
+- Updated dependencies [e95919f]
+- Updated dependencies [f894871]
+  - @forge/manifest@3.3.0-next.5
+
+## 2.3.0-next.5
+
+### Patch Changes
+
+- Updated dependencies [ae111cd]
+  - @forge/manifest@3.3.0-next.4
+
+## 2.3.0-next.4
+
+### Patch Changes
+
+- Updated dependencies [6c44d2b]
+- Updated dependencies [051ed1f]
+  - @forge/manifest@3.3.0-next.3
+
+## 2.3.0-next.3
+
+### Patch Changes
+
+- Updated dependencies [88e57a1]
+- Updated dependencies [e822a8a]
+- Updated dependencies [c255b24]
+  - @forge/util@1.2.0-next.0
+  - @forge/manifest@3.3.0-next.2
+
+## 2.3.0-next.2
+
+### Patch Changes
+
+- Updated dependencies [24203783]
+  - @forge/manifest@3.3.0-next.1
+
+## 2.3.0-next.1
+
+### Patch Changes
+
+- Updated dependencies [c145946]
+  - @forge/manifest@3.3.0-next.0
+
+## 2.3.0-next.0
+
+### Minor Changes
+
+- 949bd40: The @forge/cli will now download templates from a new service (previously bitbucket), old versions of the CLI won't receive template updates
+
 ## 2.2.2
 
 ### Patch Changes

package/out/apps/template.d.ts

@@ -17,7 +17,7 @@ export interface TemplateLister {
 export interface Templater extends TemplateLister {
     downloadAndExtract(template: string, directory: string): Promise<void>;
 }
-export declare class BitbucketTemplateDownloader implements TemplateDownloader {
+export declare class TemplateServiceDownloader implements TemplateDownloader {
     download(template: string, zipFile: string): Promise<void>;
     private buildZipUrl;
 }
@@ -30,7 +30,9 @@ export declare class ZipTemplateExtractor implements TemplateExtractor {
 export declare class TemplateFetchError extends Error {
     constructor();
 }
-export declare class BitbucketTemplateLister implements TemplateLister {
+export declare class TemplateServiceLister implements TemplateLister {
+    private isValidTemplateMapEntry;
+    private isValidTemplatesResponse;
     getAvailableTemplates(): Promise<string[]>;
 }
 export declare class ComposableTemplater implements Templater {

package/out/apps/template.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"template.d.ts","sourceRoot":"","sources":["../../src/apps/template.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAK/B,qBAAa,eAAgB,SAAQ,KAAK;gBAC5B,QAAQ,EAAE,MAAM;CAG7B;AAED,qBAAa,2BAA4B,SAAQ,KAAK;CAAG;AAEzD,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5D;AAED,MAAM,WAAW,iBAAiB;IAChC,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAChE;AAED,MAAM,WAAW,cAAc;IAC7B,qBAAqB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;CAC5C;AAED,MAAM,WAAW,SAAU,SAAQ,cAAc;IAC/C,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACxE;AAED,qBAAa,2BAA4B,YAAW,kBAAkB;IACvD,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAmBvE,OAAO,CAAC,WAAW;CAGpB;AAED,qBAAa,oBAAqB,YAAW,iBAAiB;IAChD,OAAO,CAAC,QAAQ,CAAC,WAAW;gBAAX,WAAW,EAAE,WAAW;IAExC,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAc7D,2BAA2B;CAqB1C;AAED,qBAAa,kBAAmB,SAAQ,KAAK;;CAI5C;AAED,qBAAa,uBAAwB,YAAW,cAAc;IAC/C,qBAAqB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;CAgBxD;AAED,qBAAa,mBAAoB,YAAW,SAAS;IAEjD,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAHN,UAAU,EAAE,kBAAkB,EAC9B,SAAS,EAAE,iBAAiB,EAC5B,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,MAAM;IAEpB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAsBnF,qBAAqB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;CAG3C"}
+{"version":3,"file":"template.d.ts","sourceRoot":"","sources":["../../src/apps/template.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAM/B,qBAAa,eAAgB,SAAQ,KAAK;gBAC5B,QAAQ,EAAE,MAAM;CAG7B;AAED,qBAAa,2BAA4B,SAAQ,KAAK;CAAG;AAEzD,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5D;AAED,MAAM,WAAW,iBAAiB;IAChC,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAChE;AAED,MAAM,WAAW,cAAc;IAC7B,qBAAqB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;CAC5C;AAED,MAAM,WAAW,SAAU,SAAQ,cAAc;IAC/C,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACxE;AAED,qBAAa,yBAA0B,YAAW,kBAAkB;IACrD,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAevE,OAAO,CAAC,WAAW;CAGpB;AAED,qBAAa,oBAAqB,YAAW,iBAAiB;IAChD,OAAO,CAAC,QAAQ,CAAC,WAAW;gBAAX,WAAW,EAAE,WAAW;IAExC,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAc7D,2BAA2B;CAqB1C;AAED,qBAAa,kBAAmB,SAAQ,KAAK;;CAI5C;AAKD,qBAAa,qBAAsB,YAAW,cAAc;IAC1D,OAAO,CAAC,uBAAuB;IAI/B,OAAO,CAAC,wBAAwB;IAOnB,qBAAqB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;CAkBxD;AAED,qBAAa,mBAAoB,YAAW,SAAS;IAEjD,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAHN,UAAU,EAAE,kBAAkB,EAC9B,SAAS,EAAE,iBAAiB,EAC5B,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,MAAM;IAEpB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAsBnF,qBAAqB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;CAG3C"}

package/out/apps/template.js

@@ -1,16 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ComposableTemplater = exports.BitbucketTemplateLister = exports.TemplateFetchError = exports.ZipTemplateExtractor = exports.BitbucketTemplateDownloader = exports.InvalidTemplateArchiveError = exports.NoTemplateError = void 0;
+exports.ComposableTemplater = exports.TemplateServiceLister = exports.TemplateFetchError = exports.ZipTemplateExtractor = exports.TemplateServiceDownloader = exports.InvalidTemplateArchiveError = exports.NoTemplateError = void 0;
 const tslib_1 = require("tslib");
 const fs_1 = tslib_1.__importDefault(require("fs"));
 const fs_extra_1 = require("fs-extra");
-const https_1 = require("https");
 const ignore_walk_1 = tslib_1.__importDefault(require("ignore-walk"));
 const node_fetch_1 = tslib_1.__importDefault(require("node-fetch"));
 const path_1 = require("path");
 const tmp_1 = tslib_1.__importDefault(require("tmp"));
+const url_1 = require("url");
 const ui_1 = require("../ui");
-const BITBUCKET_PROJECT = 'XTEM';
+const TEMPLATE_SERVICE_URL = 'https://forge-templates.us-west-2.prod.public.atl-paas.net/';
+const TEMPLATE_MAP = 'templates.json';
 class NoTemplateError extends Error {
     constructor(template) {
         super(ui_1.Text.create.error.template.notFound(template));
@@ -20,27 +21,24 @@ exports.NoTemplateError = NoTemplateError;
 class InvalidTemplateArchiveError extends Error {
 }
 exports.InvalidTemplateArchiveError = InvalidTemplateArchiveError;
-class BitbucketTemplateDownloader {
+class TemplateServiceDownloader {
     async download(template, zipFile) {
-        return new Promise((resolve, reject) => {
-            const zipUrl = this.buildZipUrl(template);
-            const fileStream = fs_1.default.createWriteStream(zipFile);
-            const downloadRequest = https_1.request(zipUrl, (res) => {
-                if (res.statusCode !== 200) {
-                    reject(new NoTemplateError(template));
-                    return;
-                }
-                res.pipe(fileStream);
-            });
-            downloadRequest.end();
+        const zipUrl = this.buildZipUrl(template);
+        const fileStream = fs_1.default.createWriteStream(zipFile);
+        const response = await node_fetch_1.default(zipUrl);
+        if (!response.ok) {
+            throw new NoTemplateError(template);
+        }
+        await new Promise((resolve) => {
             fileStream.on('finish', resolve);
+            response.body.pipe(fileStream);
         });
     }
     buildZipUrl(template) {
-        return `https://bitbucket.org/atlassian/${template}/get/master.zip`;
+        return new url_1.URL(`${template}.zip`, TEMPLATE_SERVICE_URL);
     }
 }
-exports.BitbucketTemplateDownloader = BitbucketTemplateDownloader;
+exports.TemplateServiceDownloader = TemplateServiceDownloader;
 class ZipTemplateExtractor {
     constructor(zipAccessor) {
         this.zipAccessor = zipAccessor;
@@ -80,22 +78,36 @@ class TemplateFetchError extends Error {
     }
 }
 exports.TemplateFetchError = TemplateFetchError;
-class BitbucketTemplateLister {
+class TemplateServiceLister {
+    isValidTemplateMapEntry(entry) {
+        return typeof entry === 'object' && entry !== null && typeof entry.name === 'string';
+    }
+    isValidTemplatesResponse(response) {
+        if (Array.isArray(response)) {
+            return response.every((curr) => this.isValidTemplateMapEntry(curr));
+        }
+        return false;
+    }
     async getAvailableTemplates() {
         try {
-            const res = await node_fetch_1.default(`https://api.bitbucket.org/2.0/repositories/atlassian?q=project.key=%22${BITBUCKET_PROJECT}%22&sort=name&pagelen=50`);
+            const res = await node_fetch_1.default(new url_1.URL(TEMPLATE_MAP, TEMPLATE_SERVICE_URL));
             if (!res.ok) {
                 throw new TemplateFetchError();
             }
             const json = await res.json();
-            return json.values.map((repo) => repo.name);
+            if (this.isValidTemplatesResponse(json)) {
+                return json.map(({ name }) => name);
+            }
+            else {
+                throw new TemplateFetchError();
+            }
         }
         catch (e) {
             throw new TemplateFetchError();
         }
     }
 }
-exports.BitbucketTemplateLister = BitbucketTemplateLister;
+exports.TemplateServiceLister = TemplateServiceLister;
 class ComposableTemplater {
     constructor(downloader, extractor, lister, logger) {
         this.downloader = downloader;

package/out/config/config-file.js

@@ -30,23 +30,23 @@ class ConfigFile {
         return functions.map((funcs) => funcs.handler.split('.')[0]);
     }
     async readConfig() {
-        const manifestFileContents = this.fileReader.readFile(_1.manifestFilename);
+        const manifestFileContents = this.fileReader.readFile(_1.manifestFileName);
         try {
             yaml_1.default.scalarOptions.null.nullStr = '';
             return yaml_1.parse(manifestFileContents);
         }
         catch (_a) {
-            throw new ui_1.ValidationError(ui_1.Text.artifact.error.invalidYaml(_1.manifestFilename));
+            throw new ui_1.ValidationError(ui_1.Text.artifact.error.invalidYaml(_1.manifestFileName));
         }
     }
     async readConfigToDocument() {
-        const manifestFileContents = this.fileReader.readFile(_1.manifestFilename);
+        const manifestFileContents = this.fileReader.readFile(_1.manifestFileName);
         if (manifestFileContents) {
             try {
                 return yaml_1.parseDocument(manifestFileContents);
             }
             catch (_a) {
-                throw new ui_1.ValidationError(ui_1.Text.artifact.error.invalidYaml(_1.manifestFilename));
+                throw new ui_1.ValidationError(ui_1.Text.artifact.error.invalidYaml(_1.manifestFileName));
             }
         }
     }
@@ -76,18 +76,18 @@ class ConfigFile {
         return actualModules;
     }
     async prependAppNameToModules(name) {
-        const manifestFileContents = this.fileReader.readFile(_1.manifestFilename);
+        const manifestFileContents = this.fileReader.readFile(_1.manifestFileName);
         const currentConfigDoc = yaml_1.parseDocument(manifestFileContents || '');
         const modules = currentConfigDoc.get('modules');
         if (modules && modules.type === util_1.Type.MAP) {
             const modulesObject = modules.toJSON();
             const modulesWithUniqueName = this.makeManifestUnique(modulesObject, name);
             currentConfigDoc.set('modules', modulesWithUniqueName);
-            this.fileWriter.writeStringToFile(currentConfigDoc.toString(), _1.manifestFilename);
+            this.fileWriter.writeStringToFile(currentConfigDoc.toString(), _1.manifestFileName);
         }
     }
     async writeToConfigFile(configKey, config) {
-        const manifestFileContents = this.fileReader.readFile(_1.manifestFilename);
+        const manifestFileContents = this.fileReader.readFile(_1.manifestFileName);
         const currentConfigDoc = yaml_1.parseDocument(manifestFileContents || '');
         Object.keys(config).forEach((key) => {
             if (config[key] === undefined) {
@@ -95,7 +95,7 @@ class ConfigFile {
             }
         });
         currentConfigDoc.set(configKey, config);
-        this.fileWriter.writeStringToFile(currentConfigDoc.toString(), _1.manifestFilename);
+        this.fileWriter.writeStringToFile(currentConfigDoc.toString(), _1.manifestFileName);
     }
     getHostedResourceKeys(modules) {
         const resourceKeys = [];

package/out/config/config.d.ts

@@ -1,5 +1,6 @@
 import { ManifestSchema, Resources } from '@forge/manifest';
-export declare const manifestFilename = "manifest.yml";
+export declare const manifestFileName = "manifest.yml";
+export declare const dependencyFileNames: string[];
 export interface BaseModule {
     key: string;
 }

package/out/config/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5D,eAAO,MAAM,gBAAgB,iBAAiB,CAAC;AAE/C,MAAM,WAAW,UAAU;IACzB,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,qBAAsB,SAAQ,UAAU;IACvD,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,YAAY;IAC3B,UAAU,IAAI,OAAO,CAAC,cAAc,CAAC,CAAC;CACvC;AAED,MAAM,WAAW,YAAY;IAC3B,iBAAiB,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,MAAM,EAAE,SAAS,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9F,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACtD;AAED,eAAO,MAAM,gBAAgB,aAAc,GAAG,0BAG7C,CAAC;AAEF,eAAO,MAAM,sBAAsB,WAAY,GAAG,oCAGjD,CAAC"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5D,eAAO,MAAM,gBAAgB,iBAAiB,CAAC;AAC/C,eAAO,MAAM,mBAAmB,UAAuE,CAAC;AAExG,MAAM,WAAW,UAAU;IACzB,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,qBAAsB,SAAQ,UAAU;IACvD,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,YAAY;IAC3B,UAAU,IAAI,OAAO,CAAC,cAAc,CAAC,CAAC;CACvC;AAED,MAAM,WAAW,YAAY;IAC3B,iBAAiB,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,MAAM,EAAE,SAAS,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9F,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACtD;AAED,eAAO,MAAM,gBAAgB,aAAc,GAAG,0BAG7C,CAAC;AAEF,eAAO,MAAM,sBAAsB,WAAY,GAAG,oCAGjD,CAAC"}

package/out/config/config.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isHostedResourceModule = exports.validateResource = exports.manifestFilename = void 0;
-exports.manifestFilename = 'manifest.yml';
+exports.isHostedResourceModule = exports.validateResource = exports.dependencyFileNames = exports.manifestFileName = void 0;
+exports.manifestFileName = 'manifest.yml';
+exports.dependencyFileNames = [exports.manifestFileName, 'package.json', 'package-lock.json', 'yarn.lock'];
 exports.validateResource = (resource) => {
     const { key, path } = resource;
     return typeof key === 'string' && typeof path === 'string';