From 4f3be51cfdf7ba00a90c3a6b6c9bcf03c567df85 Mon Sep 17 00:00:00 2001 From: Benjamin Dupont <4503241+Benjozork@users.noreply.github.com> Date: Sat, 26 Oct 2024 16:14:02 -0400 Subject: [PATCH 1/3] fix: update typedefs --- lib.d.ts | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/lib.d.ts b/lib.d.ts index 8d66fd9..d33b29b 100644 --- a/lib.d.ts +++ b/lib.d.ts @@ -14,26 +14,27 @@ export interface NamedDirectoryDefinition extends DirectoryDefinition { title: string, } -export type AddonVersion = { - title: string, - date: Date, - type: 'major' | 'minor' | 'patch' +export type FragmenterReleaseModel = { + type: 'fragmenter', } export type GithubReleaseReleaseModel = { + /** @deprecated */ type: 'githubRelease', } export type GithubBranchReleaseModel = { + /** @deprecated */ type: 'githubBranch', branch: string, } export type CDNReleaseModel = { + /** @deprecated */ type: 'CDN', } -export type ReleaseModel = GithubReleaseReleaseModel | GithubBranchReleaseModel | CDNReleaseModel +export type ReleaseModel = FragmenterReleaseModel | GithubReleaseReleaseModel | GithubBranchReleaseModel | CDNReleaseModel type BaseAddonTrack = { name: string, @@ -151,28 +152,41 @@ export interface AddonDependency { } /** - * fields from the addon's manifest.json + * Fields from the addon's manifest.json */ export interface AddonIncompatibleAddon { /** - * Fields from the addon's manifest.json + * Field from the addon's manifest.json * This need to be configured identically to the addon's manifest.json * Leaving a field empty ignores it for the search. */ title?: string, + + /** + * Field from the addon's manifest.json + * This need to be configured identically to the addon's manifest.json + * Leaving a field empty ignores it for the search. + */ creator?: string, + /** - * packageVersion syntax follows: https://www.npmjs.com/package/semver + * Field from the addon's manifest.json + * This need to be configured identically to the addon's manifest.json + * Leaving a field empty ignores it for the search. + * + * This supports semver notation. */ packageVersion?: string, + /** * folder name in community - added later to show the user the corresponding folder name - not used for searching */ folder?: string, + /** * Description of the nature of the incompatibility to display to the user in a warning dialog */ - description?: string + description?: string, } export interface AddonTechSpec { @@ -202,7 +216,7 @@ export interface ConfigurationAspect { /** * The title of the page containing the choices */ - title: string + title: string, /** * What to apply the list of desired choices to @@ -255,7 +269,7 @@ export type AddonCategoryDefinition = DefinitionBase & { kind: 'addonCategory', key: string, title?: string, - styles?: ('align-bottom')[], + styles?: 'align-bottom'[], } export type ExternalApplicationDefinition = DefinitionBase & { From 4c20518efe1dce7b2690f3af0e620e3bc63cc899 Mon Sep 17 00:00:00 2001 From: Benjamin Dupont <4503241+Benjozork@users.noreply.github.com> Date: Sat, 26 Oct 2024 16:14:22 -0400 Subject: [PATCH 2/3] chore: move a32nx tracks to fragmenter release --- config/config.ts | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/config/config.ts b/config/config.ts index c73b72a..5e0e4d1 100644 --- a/config/config.ts +++ b/config/config.ts @@ -96,7 +96,7 @@ const config: Configuration = { 'with each major patch from MSFS.', isExperimental: false, releaseModel: { - type: 'githubRelease', + type: 'fragmenter', }, }, { @@ -121,8 +121,7 @@ const config: Configuration = { 'branch on Github. Please visit our discord for support.', isExperimental: false, releaseModel: { - type: 'githubBranch', - branch: 'master', + type: 'fragmenter', }, }, ], @@ -307,7 +306,7 @@ const config: Configuration = { backgroundImageUrls: ['https://flybywirecdn.com/installer/media-assets/addon-headers/fbw-simbridge/0.png'], backgroundImageShadow: false, shortDescription: 'Airbus A380-800', - description: `⚠ Important: Starting with version 0.6.0, custom resources such as PDF Charts and Company Routes must be stored in the Documents folder (typically located at \`C:\\Users\\\\Documents\\FlyByWireSim\\Simbridge\\resources)\`.
Please ensure you back up your files before updating. After the update, transfer your files to this new location to keep them safe from future updates. You can also use the Resources button in the About section of the installer to locate the folder. \n\nSimBridge is an external app that enables FlyByWire Simulations aircraft to communicate outside your simulator. From remote displays to external terrain display rendering, it is used for a variety of optional features.`, + description: `⚠ Important: Starting with version 0.6.0, custom resources such as PDF Charts and Company Routes must be stored in the Documents folder (typically located at \`C:\\Users\\\\Documents\\FlyByWireSim\\Simbridge\\resources)\`.
Please ensure you back up your files before updating. After the update, transfer your files to this new location to keep them safe from future updates. You can also use the Resources button in the About section of the installer to locate the folder. \n\nSimBridge is an external app that enables FlyByWire Simulations aircraft to communicate outside your simulator. From remote displays to external terrain display rendering, it is used for a variety of optional features.`, targetDirectory: 'flybywire-externaltools-simbridge', tracks: [ { @@ -322,7 +321,7 @@ const config: Configuration = { 'https://cdn.flybywiresim.com/addons/simbridge/release/', ], isExperimental: false, - description: `⚠ Important: Starting with version 0.6.0, custom resources such as PDF Charts and Company Routes must be stored in the Documents folder (typically located at \`C:\\Users\\\\Documents\\FlyByWireSim\\Simbridge\\resources)\`.
Please ensure you back up your files before updating. After the update, transfer your files to this new location to keep them safe from future updates. You can also use the Resources button in the About section of the installer to locate the folder. \n\nSimBridge is an external app that enables FlyByWire Simulations aircraft to communicate outside your simulator. From remote displays to external terrain display rendering, it is used for a variety of optional features.`, + description: `⚠ Important: Starting with version 0.6.0, custom resources such as PDF Charts and Company Routes must be stored in the Documents folder (typically located at \`C:\\Users\\\\Documents\\FlyByWireSim\\Simbridge\\resources)\`.
Please ensure you back up your files before updating. After the update, transfer your files to this new location to keep them safe from future updates. You can also use the Resources button in the About section of the installer to locate the folder. \n\nSimBridge is an external app that enables FlyByWire Simulations aircraft to communicate outside your simulator. From remote displays to external terrain display rendering, it is used for a variety of optional features.`, }, ], disallowedRunningExternalApps: ['@/simbridge-app'], From f64a214d5d232868f15bc68b7cc417dc506a0a0c Mon Sep 17 00:00:00 2001 From: Benjamin Dupont <4503241+Benjozork@users.noreply.github.com> Date: Sat, 26 Oct 2024 16:19:23 -0400 Subject: [PATCH 3/3] chore: move FSLTL injector tracks to fragmenter release --- config/config.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/config.ts b/config/config.ts index 5e0e4d1..f0444f1 100644 --- a/config/config.ts +++ b/config/config.ts @@ -528,19 +528,19 @@ const config: Configuration = { url: 'https://github.com/FSLiveTrafficLiveries/FSLTL_Injector_Releases/releases/latest/download/', isExperimental: false, releaseModel: { - type: 'CDN', + type: 'fragmenter', }, description: 'Stable version of the FSLTL Traffic Injector for use on stable versions of MSFS.\n\n'+ 'Follow the user guide at https://www.fslivetrafficliveries.com/user-guide/ before use.', }, - { + { name: 'Experimental', key: 'development', url: 'https://github.com/FSLiveTrafficLiveries/FSLTL_Injector_Releases/releases/download/beta/', isExperimental: true, warningContent: 'No support is offered for this release, it is a preview of features that may be included in future releases.', releaseModel: { - type: 'CDN', + type: 'fragmenter', }, description: 'Experimental Release that includes features that are not yet ready for stable release.\n\n'+ 'You can provide feedback on these new features in the FSLTL Discord.\n\n'+