@forge/manifest 12.3.0-next.2 → 12.3.0-next.4

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @forge/manifest
 
+## 12.3.0-next.4
+
+### Patch Changes
+
+- 6581f58: Update manifest definitions
+
+## 12.3.0-next.3
+
+### Patch Changes
+
+- 06fc76b: Removing `ENABLE_CONFIGURABLE_REMOTES` environment variable in advance of Preview
+
 ## 12.3.0-next.2
 
 ### Minor Changes

package/out/utils/index.d.ts

@@ -4,6 +4,5 @@ export * from './module-key-cleaner';
 export * from './module-references';
 export * from './manifest-parser-builder';
 export type { ManifestParser } from './manifest-parser';
-export * from './features';
 export * from './i18n';
 //# sourceMappingURL=index.d.ts.map

package/out/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,eAAe,CAAC;AAC9B,cAAc,sBAAsB,CAAC;AACrC,cAAc,qBAAqB,CAAC;AACpC,cAAc,2BAA2B,CAAC;AAC1C,YAAY,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACxD,cAAc,YAAY,CAAC;AAC3B,cAAc,QAAQ,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,eAAe,CAAC;AAC9B,cAAc,sBAAsB,CAAC;AACrC,cAAc,qBAAqB,CAAC;AACpC,cAAc,2BAA2B,CAAC;AAC1C,YAAY,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACxD,cAAc,QAAQ,CAAC"}

package/out/utils/index.js

@@ -6,5 +6,4 @@ tslib_1.__exportStar(require("./line-finder"), exports);
 tslib_1.__exportStar(require("./module-key-cleaner"), exports);
 tslib_1.__exportStar(require("./module-references"), exports);
 tslib_1.__exportStar(require("./manifest-parser-builder"), exports);
-tslib_1.__exportStar(require("./features"), exports);
 tslib_1.__exportStar(require("./i18n"), exports);

package/out/validators/permissions-validator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"permissions-validator.d.ts","sourceRoot":"","sources":["../../src/validators/permissions-validator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,wBAAwB,EAAmB,MAAM,UAAU,CAAC;AAGrF,OAAO,EAAE,cAAc,EAAU,MAAM,oBAAoB,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAQ3D,eAAO,MAAM,kBAAkB,UAa9B,CAAC;AAEF,qBAAa,oBACX,YAAW,kBAAkB,CAAC,cAAc,CAAC,cAAc,CAAC,GAAG,SAAS,EAAE,cAAc,CAAC;IAEzF,OAAO,CAAC,0BAA0B;IAQlC,OAAO,CAAC,UAAU;IAwClB,OAAO,CAAC,WAAW;IAUnB,OAAO,CAAC,gBAAgB;IAaxB,OAAO,CAAC,mBAAmB;IAgB3B,OAAO,CAAC,8BAA8B;IA2DhC,QAAQ,CACZ,QAAQ,EAAE,cAAc,CAAC,cAAc,CAAC,GAAG,SAAS,GACnD,OAAO,CAAC,wBAAwB,CAAC,cAAc,CAAC,CAAC;CA8MrD"}
+{"version":3,"file":"permissions-validator.d.ts","sourceRoot":"","sources":["../../src/validators/permissions-validator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,wBAAwB,EAAmB,MAAM,UAAU,CAAC;AAGrF,OAAO,EAAE,cAAc,EAAU,MAAM,oBAAoB,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAO3D,eAAO,MAAM,kBAAkB,UAa9B,CAAC;AAEF,qBAAa,oBACX,YAAW,kBAAkB,CAAC,cAAc,CAAC,cAAc,CAAC,GAAG,SAAS,EAAE,cAAc,CAAC;IAEzF,OAAO,CAAC,0BAA0B;IAQlC,OAAO,CAAC,UAAU;IAwClB,OAAO,CAAC,WAAW;IAUnB,OAAO,CAAC,gBAAgB;IAaxB,OAAO,CAAC,mBAAmB;IAgB3B,OAAO,CAAC,8BAA8B;IA2DhC,QAAQ,CACZ,QAAQ,EAAE,cAAc,CAAC,cAAc,CAAC,GAAG,SAAS,GACnD,OAAO,CAAC,wBAAwB,CAAC,cAAc,CAAC,CAAC;CAkMrD"}

package/out/validators/permissions-validator.js

@@ -9,7 +9,6 @@ const url_1 = require("url");
 const shipyard_scopes_json_1 = tslib_1.__importDefault(require("../scopes/shipyard-scopes.json"));
 const deprecated_shipyard_scopes_json_1 = tslib_1.__importDefault(require("../scopes/deprecated-shipyard-scopes.json"));
 const scopes_1 = require("../utils/scopes");
-const features_1 = require("../utils/features");
 exports.PROTOCOL_BLOCKLIST = [
     'javascript:',
     'data:',
@@ -239,25 +238,14 @@ class PermissionsValidator {
             }
         });
         const remoteMap = manifest.typedContent.remotes?.reduce((prev, item) => {
-            if ((0, features_1.configurableRemotesEnabled)()) {
-                if (item.baseUrl) {
-                    const baseUrl = typeof item.baseUrl === 'string' ? item.baseUrl : item.baseUrl.default;
-                    return prev.set(item.key, baseUrl);
-                }
-                if (!item.baseUrl && item?.configurable) {
-                    return prev.set(item.key, null);
-                }
-                return prev;
+            if (item.baseUrl) {
+                const baseUrl = typeof item.baseUrl === 'string' ? item.baseUrl : item.baseUrl.default;
+                return prev.set(item.key, baseUrl);
             }
-            else {
-                if (item.baseUrl !== undefined) {
-                    const baseUrl = typeof item.baseUrl === 'string' ? item.baseUrl : item.baseUrl.default;
-                    return prev.set(item.key, baseUrl);
-                }
-                else {
-                    return prev;
-                }
+            if (!item.baseUrl && item?.configurable) {
+                return prev.set(item.key, null);
             }
+            return prev;
         }, new Map());
         const invalidBackendRemotes = manifest.typedContent.permissions.external?.fetch?.backend
             ?.filter((item) => typeof item === 'object' && 'remote' in item && !this.remotesHasValidEntryForKey(remoteMap, item.remote))

package/out/validators/remotes-is-configurable-validator.d.ts

@@ -2,8 +2,7 @@ import { ValidatorInterface } from './validator-interface';
 import { ManifestSchema } from '../schema/manifest';
 import { ManifestObject, ManifestValidationResult } from '../types';
 export declare class RemotesIsUserConfigurableValidator implements ValidatorInterface<ManifestObject<ManifestSchema> | undefined, ManifestSchema> {
-    private validateOld;
-    validateNew(manifest: ManifestObject<ManifestSchema> | undefined): Promise<ManifestValidationResult<ManifestSchema>>;
+    validateRemote(manifest: ManifestObject<ManifestSchema> | undefined): Promise<ManifestValidationResult<ManifestSchema>>;
     validate(manifest: ManifestObject<ManifestSchema> | undefined): Promise<ManifestValidationResult<ManifestSchema>>;
 }
 //# sourceMappingURL=remotes-is-configurable-validator.d.ts.map

package/out/validators/remotes-is-configurable-validator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"remotes-is-configurable-validator.d.ts","sourceRoot":"","sources":["../../src/validators/remotes-is-configurable-validator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,wBAAwB,EAAmB,MAAM,UAAU,CAAC;AAKrF,qBAAa,kCACX,YAAW,kBAAkB,CAAC,cAAc,CAAC,cAAc,CAAC,GAAG,SAAS,EAAE,cAAc,CAAC;YAI3E,WAAW;IAiCnB,WAAW,CACf,QAAQ,EAAE,cAAc,CAAC,cAAc,CAAC,GAAG,SAAS,GACnD,OAAO,CAAC,wBAAwB,CAAC,cAAc,CAAC,CAAC;IAgC9C,QAAQ,CACZ,QAAQ,EAAE,cAAc,CAAC,cAAc,CAAC,GAAG,SAAS,GACnD,OAAO,CAAC,wBAAwB,CAAC,cAAc,CAAC,CAAC;CAOrD"}
+{"version":3,"file":"remotes-is-configurable-validator.d.ts","sourceRoot":"","sources":["../../src/validators/remotes-is-configurable-validator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,wBAAwB,EAAmB,MAAM,UAAU,CAAC;AAKrF,qBAAa,kCACX,YAAW,kBAAkB,CAAC,cAAc,CAAC,cAAc,CAAC,GAAG,SAAS,EAAE,cAAc,CAAC;IAEnF,cAAc,CAClB,QAAQ,EAAE,cAAc,CAAC,cAAc,CAAC,GAAG,SAAS,GACnD,OAAO,CAAC,wBAAwB,CAAC,cAAc,CAAC,CAAC;IAgC9C,QAAQ,CACZ,QAAQ,EAAE,cAAc,CAAC,cAAc,CAAC,GAAG,SAAS,GACnD,OAAO,CAAC,wBAAwB,CAAC,cAAc,CAAC,CAAC;CAGrD"}

package/out/validators/remotes-is-configurable-validator.js

@@ -4,32 +4,7 @@ exports.RemotesIsUserConfigurableValidator = void 0;
 const text_1 = require("../text");
 const utils_1 = require("../utils");
 class RemotesIsUserConfigurableValidator {
-    async validateOld(manifest) {
-        if (!manifest?.typedContent?.remotes) {
-            return {
-                success: true,
-                manifestObject: manifest
-            };
-        }
-        const remotes = manifest.typedContent.remotes;
-        const validationErrors = [];
-        remotes?.forEach((remote) => {
-            if (remote.baseUrl === undefined) {
-                validationErrors.push({
-                    message: text_1.errors.modules.remote.baseUrlNotPresent(remote.key),
-                    reference: text_1.References.App,
-                    level: 'error',
-                    ...(0, utils_1.findPosition)(remote.key, manifest.yamlContentByLine)
-                });
-            }
-        });
-        return {
-            success: validationErrors.length === 0,
-            manifestObject: manifest,
-            errors: validationErrors
-        };
-    }
-    async validateNew(manifest) {
+    async validateRemote(manifest) {
         if (!manifest?.typedContent?.remotes) {
             return {
                 success: true,
@@ -56,12 +31,7 @@ class RemotesIsUserConfigurableValidator {
         };
     }
     async validate(manifest) {
-        if (!(0, utils_1.configurableRemotesEnabled)()) {
-            return this.validateOld(manifest);
-        }
-        else {
-            return this.validateNew(manifest);
-        }
+        return this.validateRemote(manifest);
     }
 }
 exports.RemotesIsUserConfigurableValidator = RemotesIsUserConfigurableValidator;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/manifest",
-  "version": "12.3.0-next.2",
+  "version": "12.3.0-next.4",
   "description": "Definitions and validations of the Forge manifest",
   "main": "out/index.js",
   "scripts": {

package/out/utils/features.d.ts

@@ -1,3 +0,0 @@
-export declare const ENABLE_CONFIGURABLE_REMOTES: string | undefined;
-export declare function configurableRemotesEnabled(): boolean;
-//# sourceMappingURL=features.d.ts.map

package/out/utils/features.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"features.d.ts","sourceRoot":"","sources":["../../src/utils/features.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,2BAA2B,oBAA0C,CAAC;AAEnF,wBAAgB,0BAA0B,IAAI,OAAO,CAMpD"}

package/out/utils/features.js

@@ -1,13 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.configurableRemotesEnabled = exports.ENABLE_CONFIGURABLE_REMOTES = void 0;
-exports.ENABLE_CONFIGURABLE_REMOTES = process.env.ENABLE_CONFIGURABLE_REMOTES;
-function configurableRemotesEnabled() {
-    if (!exports.ENABLE_CONFIGURABLE_REMOTES || exports.ENABLE_CONFIGURABLE_REMOTES.length === 0) {
-        return false;
-    }
-    else {
-        return true;
-    }
-}
-exports.configurableRemotesEnabled = configurableRemotesEnabled;