@forge/manifest
12.3.0-next.212.3.0-next.3
−
Removed (3 files)
~
Modified (10 files)
Index: package/out/utils/index.js
===================================================================
--- package/out/utils/index.js
+++ package/out/utils/index.js
@@ -5,6 +5,5 @@
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); Index: package/out/validators/permissions-validator.js
===================================================================
--- package/out/validators/permissions-validator.js
+++ package/out/validators/permissions-validator.js
@@ -8,9 +8,8 @@
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:',
'vbscript:',
@@ -238,27 +237,16 @@
});
}
});
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))
.map((item) => item.remote); Index: package/out/validators/remotes-is-configurable-validator.js
===================================================================
--- package/out/validators/remotes-is-configurable-validator.js
+++ package/out/validators/remotes-is-configurable-validator.js
@@ -3,9 +3,9 @@
exports.RemotesIsUserConfigurableValidator = void 0;
const text_1 = require("../text");
const utils_1 = require("../utils");
class RemotesIsUserConfigurableValidator {
- async validateOld(manifest) {
+ async validateRemote(manifest) {
if (!manifest?.typedContent?.remotes) {
return {
success: true,
manifestObject: manifest
@@ -13,33 +13,8 @@
}
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) {
- if (!manifest?.typedContent?.remotes) {
- return {
- success: true,
- manifestObject: manifest
- };
- }
- const remotes = manifest.typedContent.remotes;
- const validationErrors = [];
- remotes?.forEach((remote) => {
const hasConfigurable = remote?.configurable !== undefined;
if (!hasConfigurable && remote.baseUrl === undefined) {
validationErrors.push({
message: text_1.errors.modules.remote.neitherBaseUrlNorUserConfigurationPresent(remote.key),
@@ -55,13 +30,8 @@
errors: validationErrors
};
}
async validate(manifest) {
- if (!(0, utils_1.configurableRemotesEnabled)()) {
- return this.validateOld(manifest);
- }
- else {
- return this.validateNew(manifest);
- }
+ return this.validateRemote(manifest);
}
}
exports.RemotesIsUserConfigurableValidator = RemotesIsUserConfigurableValidator; Index: package/package.json
===================================================================
--- package/package.json
+++ package/package.json
@@ -1,7 +1,7 @@
{
"name": "@forge/manifest",
- "version": "12.3.0-next.2",
+ "version": "12.3.0-next.3",
"description": "Definitions and validations of the Forge manifest",
"main": "out/index.js",
"scripts": {
"build": "yarn run compile", Index: package/out/utils/index.d.ts.map
===================================================================
--- package/out/utils/index.d.ts.map
+++ package/out/utils/index.d.ts.map
@@ -1,1 +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"}
\ No newline at end of file
+{"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"}
\ No newline at end of file Index: package/out/validators/permissions-validator.d.ts.map
===================================================================
--- package/out/validators/permissions-validator.d.ts.map
+++ package/out/validators/permissions-validator.d.ts.map
@@ -1,1 +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"}
\ No newline at end of file
+{"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"}
\ No newline at end of file Index: package/out/validators/remotes-is-configurable-validator.d.ts.map
===================================================================
--- package/out/validators/remotes-is-configurable-validator.d.ts.map
+++ package/out/validators/remotes-is-configurable-validator.d.ts.map
@@ -1,1 +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"}
\ No newline at end of file
+{"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"}
\ No newline at end of file File too large for inline diff
Index: package/out/utils/index.d.ts
===================================================================
--- package/out/utils/index.d.ts
+++ package/out/utils/index.d.ts
@@ -3,7 +3,6 @@
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
\ No newline at end of file Index: package/out/validators/remotes-is-configurable-validator.d.ts
===================================================================
--- package/out/validators/remotes-is-configurable-validator.d.ts
+++ package/out/validators/remotes-is-configurable-validator.d.ts
@@ -1,9 +1,8 @@
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
\ No newline at end of file