diff --git a/packages/cli/src/lib/SchemaComposer.ts b/packages/cli/src/lib/SchemaComposer.ts index 9e88eaf1f..9726da3fd 100644 --- a/packages/cli/src/lib/SchemaComposer.ts +++ b/packages/cli/src/lib/SchemaComposer.ts @@ -73,7 +73,7 @@ export class SchemaComposer { private _abiResolver( schemaFile: SchemaFile, importFrom: string, - import_abis?: NonNullable["import_abis"] + import_abis?: PolywrapManifest["import_abis"] ): Promise { if (Uri.isValidUri(importFrom)) { return this._resolveUri(importFrom, import_abis); @@ -97,7 +97,7 @@ export class SchemaComposer { private async _resolveUri( uri: string, - import_abis?: NonNullable["import_abis"] + import_abis?: PolywrapManifest["import_abis"] ): Promise { // Check to see if we have any import redirects that match if (import_abis) { @@ -155,7 +155,7 @@ export class SchemaComposer { private async _loadGraphqlAbi( path: string, - import_abis: NonNullable["import_abis"] + import_abis: PolywrapManifest["import_abis"] ): Promise { const schema = fs.readFileSync(path, "utf-8"); diff --git a/packages/cli/src/lib/project/AppProject.ts b/packages/cli/src/lib/project/AppProject.ts index c44b508af..9fbe97edc 100644 --- a/packages/cli/src/lib/project/AppProject.ts +++ b/packages/cli/src/lib/project/AppProject.ts @@ -107,11 +107,9 @@ export class AppProject extends Project { : path.join(dir, manifest.source.schema); } - public async getImportAbis(): Promise< - NonNullable["import_abis"] - > { + public async getImportAbis(): Promise { const manifest = await this.getManifest(); - return manifest.source?.import_abis || []; + return manifest.import_abis || []; } public async getGenerationDirectory( diff --git a/packages/cli/src/lib/project/PluginProject.ts b/packages/cli/src/lib/project/PluginProject.ts index 71f6f95e3..67cfd7859 100644 --- a/packages/cli/src/lib/project/PluginProject.ts +++ b/packages/cli/src/lib/project/PluginProject.ts @@ -108,11 +108,9 @@ export class PluginProject extends Project { : path.join(dir, manifest.source.schema); } - public async getImportAbis(): Promise< - NonNullable["import_abis"] - > { + public async getImportAbis(): Promise { const manifest = await this.getManifest(); - return manifest.source?.import_abis || []; + return manifest.import_abis || []; } public async getGenerationDirectory( diff --git a/packages/cli/src/lib/project/PolywrapProject.ts b/packages/cli/src/lib/project/PolywrapProject.ts index 16cd87c76..93bbd4ae7 100644 --- a/packages/cli/src/lib/project/PolywrapProject.ts +++ b/packages/cli/src/lib/project/PolywrapProject.ts @@ -157,11 +157,9 @@ export class PolywrapProject extends Project { : path.join(dir, manifest.source.schema); } - public async getImportAbis(): Promise< - NonNullable["import_abis"] - > { + public async getImportAbis(): Promise { const manifest = await this.getManifest(); - return manifest.source?.import_abis || []; + return manifest.import_abis || []; } public async getGenerationDirectory( diff --git a/packages/cli/src/lib/project/Project.ts b/packages/cli/src/lib/project/Project.ts index d5bf5329c..098938a80 100644 --- a/packages/cli/src/lib/project/Project.ts +++ b/packages/cli/src/lib/project/Project.ts @@ -62,9 +62,7 @@ export abstract class Project { public abstract getSchemaNamedPath(): Promise; - public abstract getImportAbis(): Promise< - NonNullable["import_abis"] - >; + public abstract getImportAbis(): Promise; public abstract getGenerationDirectory( generationSubPath?: string diff --git a/packages/js/manifests/polywrap/src/formats/polywrap.app/0.6.0.ts b/packages/js/manifests/polywrap/src/formats/polywrap.app/0.6.0.ts new file mode 100644 index 000000000..9916b1f40 --- /dev/null +++ b/packages/js/manifests/polywrap/src/formats/polywrap.app/0.6.0.ts @@ -0,0 +1,75 @@ +/* eslint-disable @typescript-eslint/naming-convention */ +/* tslint:disable */ +/** + * This file was automatically generated by json-schema-to-typescript. + * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file, + * and run json-schema-to-typescript to regenerate this file. + */ + +export interface AppManifest { + /** + * Polywrap manifest format version. + */ + format: "0.6.0"; + /** + * Basic project properties. + */ + project: { + /** + * Name of this project. + */ + name: string; + /** + * Type of this project. + */ + type: string; + }; + /** + * Project source files. + */ + source?: { + /** + * Path to the project's graphql schema. + */ + schema?: string; + }; + /** + * Specify URIs to be used to import ABIs in your schema. + */ + imports?: { + /** + * This interface was referenced by `undefined`'s JSON-Schema definition + * via the `patternProperty` ".*". + */ + [k: string]: ImportUri | string; + }; + /** + * Specify redirects from import URIs to ABIs on your filesystem. + */ + import_abis?: ImportAbi[]; + __type: "AppManifest"; +} +export interface ImportUri { + /** + * Wrap URI to import. + */ + uri: string; + /** + * List of types to import from Wrap (defaults to all). + */ + types?: string[]; + /** + * List of functions to import from Wrap (defaults to all). + */ + functions?: string[]; +} +export interface ImportAbi { + /** + * Import URI + */ + uri: string; + /** + * Path to a local ABI (or schema). Supported file formats: [*.graphql, *.info, *.json, *.yaml] + */ + abi: string; +} diff --git a/packages/js/manifests/polywrap/src/formats/polywrap.app/index.ts b/packages/js/manifests/polywrap/src/formats/polywrap.app/index.ts index f84da24cd..9b53fa8b8 100644 --- a/packages/js/manifests/polywrap/src/formats/polywrap.app/index.ts +++ b/packages/js/manifests/polywrap/src/formats/polywrap.app/index.ts @@ -20,6 +20,9 @@ import { import { AppManifest as AppManifest_0_5_0, } from "./0.5.0"; +import { + AppManifest as AppManifest_0_6_0, +} from "./0.6.0"; export { AppManifest_0_1_0, @@ -27,6 +30,7 @@ export { AppManifest_0_3_0, AppManifest_0_4_0, AppManifest_0_5_0, + AppManifest_0_6_0, }; export enum AppManifestFormats { @@ -37,6 +41,7 @@ export enum AppManifestFormats { "v0.3.0" = "0.3.0", "v0.4.0" = "0.4.0", "v0.5.0" = "0.5.0", + "v0.6.0" = "0.6.0", } export const AppManifestSchemaFiles: Record = { @@ -47,6 +52,7 @@ export const AppManifestSchemaFiles: Record = { "0.3.0": "formats/polywrap.app/0.3.0.json", "0.4.0": "formats/polywrap.app/0.4.0.json", "0.5.0": "formats/polywrap.app/0.5.0.json", + "0.6.0": "formats/polywrap.app/0.6.0.json", } export type AnyAppManifest = @@ -55,11 +61,12 @@ export type AnyAppManifest = | AppManifest_0_3_0 | AppManifest_0_4_0 | AppManifest_0_5_0 + | AppManifest_0_6_0 -export type AppManifest = AppManifest_0_5_0; +export type AppManifest = AppManifest_0_6_0; -export const latestAppManifestFormat = AppManifestFormats["v0.5.0"] +export const latestAppManifestFormat = AppManifestFormats["v0.6.0"] export { migrateAppManifest } from "./migrate"; diff --git a/packages/js/manifests/polywrap/src/formats/polywrap.app/migrators/0.5.0_to_0.6.0.ts b/packages/js/manifests/polywrap/src/formats/polywrap.app/migrators/0.5.0_to_0.6.0.ts new file mode 100644 index 000000000..497a0eda9 --- /dev/null +++ b/packages/js/manifests/polywrap/src/formats/polywrap.app/migrators/0.5.0_to_0.6.0.ts @@ -0,0 +1,19 @@ +import { AppManifest as OldManifest } from "../0.5.0"; +import { AppManifest as NewManifest } from "../0.6.0"; + +export function migrate(migrate: OldManifest): NewManifest { + const newManifest: Partial = { + ...migrate, + format: "0.6.0", + }; + if (migrate.source) { + newManifest["source"] = {}; + if (migrate.source.schema) { + newManifest.source["schema"] = migrate.source.schema; + } + if (migrate.source.import_abis) { + newManifest["import_abis"] = migrate.source.import_abis; + } + } + return newManifest as NewManifest; +} diff --git a/packages/js/manifests/polywrap/src/formats/polywrap.app/migrators/index.ts b/packages/js/manifests/polywrap/src/formats/polywrap.app/migrators/index.ts index 41aaf3ab4..a7a2dcf27 100644 --- a/packages/js/manifests/polywrap/src/formats/polywrap.app/migrators/index.ts +++ b/packages/js/manifests/polywrap/src/formats/polywrap.app/migrators/index.ts @@ -3,6 +3,7 @@ import { migrate as migrate_0_1_0_to_0_2_0 } from "./0.1.0_to_0.2.0"; import { migrate as migrate_0_2_0_to_0_3_0 } from "./0.2.0_to_0.3.0"; import { migrate as migrate_0_3_0_to_0_4_0 } from "./0.3.0_to_0.4.0"; import { migrate as migrate_0_4_0_to_0_5_0 } from "./0.4.0_to_0.5.0"; +import { migrate as migrate_0_5_0_to_0_6_0 } from "./0.5.0_to_0.6.0"; export const migrators: Migrator[] = [ { @@ -30,4 +31,9 @@ export const migrators: Migrator[] = [ to: "0.5.0", migrate: migrate_0_4_0_to_0_5_0, }, + { + from: "0.5.0", + to: "0.6.0", + migrate: migrate_0_5_0_to_0_6_0, + }, ]; diff --git a/packages/js/manifests/polywrap/src/formats/polywrap.app/validate.ts b/packages/js/manifests/polywrap/src/formats/polywrap.app/validate.ts index eb590b4ed..f483069e5 100644 --- a/packages/js/manifests/polywrap/src/formats/polywrap.app/validate.ts +++ b/packages/js/manifests/polywrap/src/formats/polywrap.app/validate.ts @@ -14,6 +14,7 @@ import AppManifestSchema_0_2_0 from "@polywrap/polywrap-manifest-schemas/formats import AppManifestSchema_0_3_0 from "@polywrap/polywrap-manifest-schemas/formats/polywrap.app/0.3.0.json"; import AppManifestSchema_0_4_0 from "@polywrap/polywrap-manifest-schemas/formats/polywrap.app/0.4.0.json"; import AppManifestSchema_0_5_0 from "@polywrap/polywrap-manifest-schemas/formats/polywrap.app/0.5.0.json"; +import AppManifestSchema_0_6_0 from "@polywrap/polywrap-manifest-schemas/formats/polywrap.app/0.6.0.json"; import { Schema, @@ -34,6 +35,7 @@ const schemas: AppManifestSchemas = { "0.3.0": AppManifestSchema_0_3_0, "0.4.0": AppManifestSchema_0_4_0, "0.5.0": AppManifestSchema_0_5_0, + "0.6.0": AppManifestSchema_0_6_0, }; const validator = new Validator(); diff --git a/packages/js/manifests/polywrap/src/formats/polywrap.plugin/0.6.0.ts b/packages/js/manifests/polywrap/src/formats/polywrap.plugin/0.6.0.ts new file mode 100644 index 000000000..c991d1e9e --- /dev/null +++ b/packages/js/manifests/polywrap/src/formats/polywrap.plugin/0.6.0.ts @@ -0,0 +1,79 @@ +/* eslint-disable @typescript-eslint/naming-convention */ +/* tslint:disable */ +/** + * This file was automatically generated by json-schema-to-typescript. + * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file, + * and run json-schema-to-typescript to regenerate this file. + */ + +export interface PluginManifest { + /** + * Polywrap manifest format version. + */ + format: "0.6.0"; + /** + * Basic project properties. + */ + project: { + /** + * Name of this project. + */ + name: string; + /** + * Type of this project. + */ + type: string; + }; + /** + * Project source files. + */ + source?: { + /** + * Path to the project's entry point. + */ + module?: string; + /** + * Path to the project's graphql schema. + */ + schema?: string; + }; + /** + * Specify URIs to be used to import ABIs in your schema. + */ + imports?: { + /** + * This interface was referenced by `undefined`'s JSON-Schema definition + * via the `patternProperty` ".*". + */ + [k: string]: ImportUri | string; + }; + /** + * Specify redirects from import URIs to ABIs on your filesystem. + */ + import_abis?: ImportAbi[]; + __type: "PluginManifest"; +} +export interface ImportUri { + /** + * Wrap URI to import. + */ + uri: string; + /** + * List of types to import from Wrap (defaults to all). + */ + types?: string[]; + /** + * List of functions to import from Wrap (defaults to all). + */ + functions?: string[]; +} +export interface ImportAbi { + /** + * Import URI + */ + uri: string; + /** + * Path to a local ABI (or schema). Supported file formats: [*.graphql, *.info, *.json, *.yaml] + */ + abi: string; +} diff --git a/packages/js/manifests/polywrap/src/formats/polywrap.plugin/index.ts b/packages/js/manifests/polywrap/src/formats/polywrap.plugin/index.ts index ee1275072..e94d33a47 100644 --- a/packages/js/manifests/polywrap/src/formats/polywrap.plugin/index.ts +++ b/packages/js/manifests/polywrap/src/formats/polywrap.plugin/index.ts @@ -20,6 +20,9 @@ import { import { PluginManifest as PluginManifest_0_5_0, } from "./0.5.0"; +import { + PluginManifest as PluginManifest_0_6_0, +} from "./0.6.0"; export { PluginManifest_0_1_0, @@ -27,6 +30,7 @@ export { PluginManifest_0_3_0, PluginManifest_0_4_0, PluginManifest_0_5_0, + PluginManifest_0_6_0, }; export enum PluginManifestFormats { @@ -37,6 +41,7 @@ export enum PluginManifestFormats { "v0.3.0" = "0.3.0", "v0.4.0" = "0.4.0", "v0.5.0" = "0.5.0", + "v0.6.0" = "0.6.0", } export const PluginManifestSchemaFiles: Record = { @@ -47,6 +52,7 @@ export const PluginManifestSchemaFiles: Record = { "0.3.0": "formats/polywrap.plugin/0.3.0.json", "0.4.0": "formats/polywrap.plugin/0.4.0.json", "0.5.0": "formats/polywrap.plugin/0.5.0.json", + "0.6.0": "formats/polywrap.plugin/0.6.0.json", } export type AnyPluginManifest = @@ -55,11 +61,12 @@ export type AnyPluginManifest = | PluginManifest_0_3_0 | PluginManifest_0_4_0 | PluginManifest_0_5_0 + | PluginManifest_0_6_0 -export type PluginManifest = PluginManifest_0_5_0; +export type PluginManifest = PluginManifest_0_6_0; -export const latestPluginManifestFormat = PluginManifestFormats["v0.5.0"] +export const latestPluginManifestFormat = PluginManifestFormats["v0.6.0"] export { migratePluginManifest } from "./migrate"; diff --git a/packages/js/manifests/polywrap/src/formats/polywrap.plugin/migrators/0.5.0_to_0.6.0.ts b/packages/js/manifests/polywrap/src/formats/polywrap.plugin/migrators/0.5.0_to_0.6.0.ts new file mode 100644 index 000000000..8b3aaa482 --- /dev/null +++ b/packages/js/manifests/polywrap/src/formats/polywrap.plugin/migrators/0.5.0_to_0.6.0.ts @@ -0,0 +1,22 @@ +import { PluginManifest as OldManifest } from "../0.5.0"; +import { PluginManifest as NewManifest } from "../0.6.0"; + +export function migrate(migrate: OldManifest): NewManifest { + const newManifest: Partial = { + ...migrate, + format: "0.6.0", + }; + if (migrate.source) { + newManifest["source"] = {}; + if (migrate.source.schema) { + newManifest.source["schema"] = migrate.source.schema; + } + if (migrate.source.module) { + newManifest.source["module"] = migrate.source.module; + } + if (migrate.source.import_abis) { + newManifest["import_abis"] = migrate.source.import_abis; + } + } + return newManifest as NewManifest; +} diff --git a/packages/js/manifests/polywrap/src/formats/polywrap.plugin/migrators/index.ts b/packages/js/manifests/polywrap/src/formats/polywrap.plugin/migrators/index.ts index 41aaf3ab4..a7a2dcf27 100644 --- a/packages/js/manifests/polywrap/src/formats/polywrap.plugin/migrators/index.ts +++ b/packages/js/manifests/polywrap/src/formats/polywrap.plugin/migrators/index.ts @@ -3,6 +3,7 @@ import { migrate as migrate_0_1_0_to_0_2_0 } from "./0.1.0_to_0.2.0"; import { migrate as migrate_0_2_0_to_0_3_0 } from "./0.2.0_to_0.3.0"; import { migrate as migrate_0_3_0_to_0_4_0 } from "./0.3.0_to_0.4.0"; import { migrate as migrate_0_4_0_to_0_5_0 } from "./0.4.0_to_0.5.0"; +import { migrate as migrate_0_5_0_to_0_6_0 } from "./0.5.0_to_0.6.0"; export const migrators: Migrator[] = [ { @@ -30,4 +31,9 @@ export const migrators: Migrator[] = [ to: "0.5.0", migrate: migrate_0_4_0_to_0_5_0, }, + { + from: "0.5.0", + to: "0.6.0", + migrate: migrate_0_5_0_to_0_6_0, + }, ]; diff --git a/packages/js/manifests/polywrap/src/formats/polywrap.plugin/validate.ts b/packages/js/manifests/polywrap/src/formats/polywrap.plugin/validate.ts index 5bf5f7ebe..fb34be68d 100644 --- a/packages/js/manifests/polywrap/src/formats/polywrap.plugin/validate.ts +++ b/packages/js/manifests/polywrap/src/formats/polywrap.plugin/validate.ts @@ -14,6 +14,7 @@ import PluginManifestSchema_0_2_0 from "@polywrap/polywrap-manifest-schemas/form import PluginManifestSchema_0_3_0 from "@polywrap/polywrap-manifest-schemas/formats/polywrap.plugin/0.3.0.json"; import PluginManifestSchema_0_4_0 from "@polywrap/polywrap-manifest-schemas/formats/polywrap.plugin/0.4.0.json"; import PluginManifestSchema_0_5_0 from "@polywrap/polywrap-manifest-schemas/formats/polywrap.plugin/0.5.0.json"; +import PluginManifestSchema_0_6_0 from "@polywrap/polywrap-manifest-schemas/formats/polywrap.plugin/0.6.0.json"; import { Schema, @@ -34,6 +35,7 @@ const schemas: PluginManifestSchemas = { "0.3.0": PluginManifestSchema_0_3_0, "0.4.0": PluginManifestSchema_0_4_0, "0.5.0": PluginManifestSchema_0_5_0, + "0.6.0": PluginManifestSchema_0_6_0, }; const validator = new Validator(); diff --git a/packages/js/manifests/polywrap/src/formats/polywrap/0.7.0.ts b/packages/js/manifests/polywrap/src/formats/polywrap/0.7.0.ts new file mode 100644 index 000000000..27337e01b --- /dev/null +++ b/packages/js/manifests/polywrap/src/formats/polywrap/0.7.0.ts @@ -0,0 +1,96 @@ +/* eslint-disable @typescript-eslint/naming-convention */ +/* tslint:disable */ +/** + * This file was automatically generated by json-schema-to-typescript. + * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file, + * and run json-schema-to-typescript to regenerate this file. + */ + +export interface PolywrapManifest { + /** + * Polywrap manifest format version. + */ + format: "0.7.0"; + /** + * Basic project properties. + */ + project: { + /** + * Name of this project. + */ + name: string; + /** + * Type of this project. + */ + type: string; + }; + /** + * Project source files. + */ + source?: { + /** + * Path to the project's entry point. + */ + module?: string; + /** + * Path to the project's graphql schema. + */ + schema?: string; + }; + /** + * Specify URIs to be used to import ABIs in your schema. + */ + imports?: { + /** + * This interface was referenced by `undefined`'s JSON-Schema definition + * via the `patternProperty` ".*". + */ + [k: string]: ImportUri | string; + }; + /** + * Specify redirects from import URIs to ABIs on your filesystem. + */ + import_abis?: ImportAbi[]; + /** + * Project resources folder + */ + resources?: string; + /** + * Project extension manifest files. + */ + extensions?: { + /** + * Path to the project build manifest file. + */ + build?: string; + /** + * Path to the project docs manifest file. + */ + docs?: string; + }; + __type: "PolywrapManifest"; +} +export interface ImportUri { + /** + * Wrap URI to import. + */ + uri: string; + /** + * List of types to import from Wrap (defaults to all). + */ + types?: string[]; + /** + * List of functions to import from Wrap (defaults to all). + */ + functions?: string[]; +} +export interface ImportAbi { + /** + * Import URI + */ + uri: string; + /** + * Path to a local ABI (or schema). Supported file formats: [*.graphql, *.info, *.json, *.yaml] + */ + abi: string; +} diff --git a/packages/js/manifests/polywrap/src/formats/polywrap/index.ts b/packages/js/manifests/polywrap/src/formats/polywrap/index.ts index b545d9b23..f56acbc92 100644 --- a/packages/js/manifests/polywrap/src/formats/polywrap/index.ts +++ b/packages/js/manifests/polywrap/src/formats/polywrap/index.ts @@ -23,6 +23,9 @@ import { import { PolywrapManifest as PolywrapManifest_0_6_0, } from "./0.6.0"; +import { + PolywrapManifest as PolywrapManifest_0_7_0, +} from "./0.7.0"; export { PolywrapManifest_0_1_0, @@ -31,6 +34,7 @@ export { PolywrapManifest_0_4_0, PolywrapManifest_0_5_0, PolywrapManifest_0_6_0, + PolywrapManifest_0_7_0, }; export enum PolywrapManifestFormats { @@ -42,6 +46,7 @@ export enum PolywrapManifestFormats { "v0.4.0" = "0.4.0", "v0.5.0" = "0.5.0", "v0.6.0" = "0.6.0", + "v0.7.0" = "0.7.0", } export const PolywrapManifestSchemaFiles: Record = { @@ -53,6 +58,7 @@ export const PolywrapManifestSchemaFiles: Record = { "0.4.0": "formats/polywrap/0.4.0.json", "0.5.0": "formats/polywrap/0.5.0.json", "0.6.0": "formats/polywrap/0.6.0.json", + "0.7.0": "formats/polywrap/0.7.0.json", } export type AnyPolywrapManifest = @@ -62,11 +68,12 @@ export type AnyPolywrapManifest = | PolywrapManifest_0_4_0 | PolywrapManifest_0_5_0 | PolywrapManifest_0_6_0 + | PolywrapManifest_0_7_0 -export type PolywrapManifest = PolywrapManifest_0_6_0; +export type PolywrapManifest = PolywrapManifest_0_7_0; -export const latestPolywrapManifestFormat = PolywrapManifestFormats["v0.6.0"] +export const latestPolywrapManifestFormat = PolywrapManifestFormats["v0.7.0"] export { migratePolywrapManifest } from "./migrate"; diff --git a/packages/js/manifests/polywrap/src/formats/polywrap/migrators/0.1.0_to_0.2.0.ts b/packages/js/manifests/polywrap/src/formats/polywrap/migrators/0.1.0_to_0.2.0.ts index 4abb7e777..911d5f0c9 100644 --- a/packages/js/manifests/polywrap/src/formats/polywrap/migrators/0.1.0_to_0.2.0.ts +++ b/packages/js/manifests/polywrap/src/formats/polywrap/migrators/0.1.0_to_0.2.0.ts @@ -1,7 +1,8 @@ -import { ILogger } from "@polywrap/logging-js"; import { PolywrapManifest as OldManifest } from "../0.1.0"; import { PolywrapManifest as NewManifest } from "../0.2.0"; +import { ILogger } from "@polywrap/logging-js"; + export function migrate(manifest: OldManifest, logger?: ILogger): NewManifest { const shouldHaveExtensions = manifest.build || manifest.deploy || manifest.meta; diff --git a/packages/js/manifests/polywrap/src/formats/polywrap/migrators/0.6.0_to_0.7.0.ts b/packages/js/manifests/polywrap/src/formats/polywrap/migrators/0.6.0_to_0.7.0.ts new file mode 100644 index 000000000..e5d474161 --- /dev/null +++ b/packages/js/manifests/polywrap/src/formats/polywrap/migrators/0.6.0_to_0.7.0.ts @@ -0,0 +1,22 @@ +import { PolywrapManifest as OldManifest } from "../0.6.0"; +import { PolywrapManifest as NewManifest } from "../0.7.0"; + +export function migrate(migrate: OldManifest): NewManifest { + const newManifest: Partial = { + ...migrate, + format: "0.7.0", + }; + if (migrate.source) { + newManifest["source"] = {}; + if (migrate.source.schema) { + newManifest.source["schema"] = migrate.source.schema; + } + if (migrate.source.module) { + newManifest.source["module"] = migrate.source.module; + } + if (migrate.source.import_abis) { + newManifest["import_abis"] = migrate.source.import_abis; + } + } + return newManifest as NewManifest; +} diff --git a/packages/js/manifests/polywrap/src/formats/polywrap/migrators/index.ts b/packages/js/manifests/polywrap/src/formats/polywrap/migrators/index.ts index a7a2dcf27..8754dbf35 100644 --- a/packages/js/manifests/polywrap/src/formats/polywrap/migrators/index.ts +++ b/packages/js/manifests/polywrap/src/formats/polywrap/migrators/index.ts @@ -4,6 +4,7 @@ import { migrate as migrate_0_2_0_to_0_3_0 } from "./0.2.0_to_0.3.0"; import { migrate as migrate_0_3_0_to_0_4_0 } from "./0.3.0_to_0.4.0"; import { migrate as migrate_0_4_0_to_0_5_0 } from "./0.4.0_to_0.5.0"; import { migrate as migrate_0_5_0_to_0_6_0 } from "./0.5.0_to_0.6.0"; +import { migrate as migrate_0_6_0_to_0_7_0 } from "./0.6.0_to_0.7.0"; export const migrators: Migrator[] = [ { @@ -36,4 +37,9 @@ export const migrators: Migrator[] = [ to: "0.6.0", migrate: migrate_0_5_0_to_0_6_0, }, + { + from: "0.6.0", + to: "0.7.0", + migrate: migrate_0_6_0_to_0_7_0, + }, ]; diff --git a/packages/js/manifests/polywrap/src/formats/polywrap/validate.ts b/packages/js/manifests/polywrap/src/formats/polywrap/validate.ts index e26bad2ce..5b7df8d72 100644 --- a/packages/js/manifests/polywrap/src/formats/polywrap/validate.ts +++ b/packages/js/manifests/polywrap/src/formats/polywrap/validate.ts @@ -15,6 +15,7 @@ import PolywrapManifestSchema_0_3_0 from "@polywrap/polywrap-manifest-schemas/fo import PolywrapManifestSchema_0_4_0 from "@polywrap/polywrap-manifest-schemas/formats/polywrap/0.4.0.json"; import PolywrapManifestSchema_0_5_0 from "@polywrap/polywrap-manifest-schemas/formats/polywrap/0.5.0.json"; import PolywrapManifestSchema_0_6_0 from "@polywrap/polywrap-manifest-schemas/formats/polywrap/0.6.0.json"; +import PolywrapManifestSchema_0_7_0 from "@polywrap/polywrap-manifest-schemas/formats/polywrap/0.7.0.json"; import { Schema, @@ -36,6 +37,7 @@ const schemas: PolywrapManifestSchemas = { "0.4.0": PolywrapManifestSchema_0_4_0, "0.5.0": PolywrapManifestSchema_0_5_0, "0.6.0": PolywrapManifestSchema_0_6_0, + "0.7.0": PolywrapManifestSchema_0_7_0, }; const validator = new Validator(); diff --git a/packages/manifests/polywrap/formats/polywrap.app/0.6.0.json b/packages/manifests/polywrap/formats/polywrap.app/0.6.0.json new file mode 100644 index 000000000..cdd643a57 --- /dev/null +++ b/packages/manifests/polywrap/formats/polywrap.app/0.6.0.json @@ -0,0 +1,109 @@ +{ + "id": "AppManifest", + "type": "object", + "additionalProperties": false, + "required": ["format", "project"], + "properties": { + "format": { + "description": "Polywrap manifest format version.", + "type": "string", + "enum": ["0.6.0"] + }, + "project": { + "description": "Basic project properties.", + "type": "object", + "additionalProperties": false, + "required": ["name", "type"], + "properties": { + "name": { + "description": "Name of this project.", + "type": "string", + "pattern": "^[a-zA-Z0-9\\-\\_]+$" + }, + "type": { + "description": "Type of this project.", + "type": "string", + "pattern": "^app\\/[a-z0-9]+$" + } + } + }, + "source": { + "description": "Project source files.", + "type": "object", + "additionalProperties": false, + "required": [], + "properties": { + "schema": { + "description": "Path to the project's graphql schema.", + "type": "string", + "pattern": "^\\.?\\.?\\/?((\\/[\\w\\-\\.@]+|\\/\\.\\.|\\/\\.)+\\/)?[\\w\\-\\.]+\\.graphql$" + } + } + }, + "imports": { + "description": "Specify URIs to be used to import ABIs in your schema.", + "type": "object", + "propertyNames": { + "pattern": "^[A-Z][a-zA-Z0-9_]+$" + }, + "patternProperties": { + ".*": { + "oneOf": [ + { + "$ref": "#/definitions/import_uri" + }, + { + "type": "string" + } + ] + } + } + }, + "import_abis": { + "description": "Specify redirects from import URIs to ABIs on your filesystem.", + "type": "array", + "items": { + "$ref": "#/definitions/import_abi" + } + } + }, + "definitions": { + "import_uri": { + "type": "object", + "additionalProperties": false, + "properties": { + "uri": { + "description": "Wrap URI to import.", + "type": "string" + }, + "types": { + "description": "List of types to import from Wrap (defaults to all).", + "type": "array", + "items": { "type": "string" } + }, + "functions": { + "description": "List of functions to import from Wrap (defaults to all).", + "type": "array", + "items": { "type": "string" } + } + }, + "required": ["uri"] + }, + "import_abi": { + "type": "object", + "additionalProperties": false, + "properties": { + "uri": { + "description": "Import URI", + "type": "string" + }, + "abi": { + "description": "Path to a local ABI (or schema). Supported file formats: [*.graphql, *.info, *.json, *.yaml]", + "type": "string", + "pattern": "^\\.?\\.?\\/?((\\/[\\w\\-\\.@]+|\\/\\.\\.|\\/\\.)+\\/)?[\\w\\-\\.]+\\.(info|graphql|json|yaml)$" + } + }, + "required": ["uri", "abi"] + } + } +} diff --git a/packages/manifests/polywrap/formats/polywrap.plugin/0.6.0.json b/packages/manifests/polywrap/formats/polywrap.plugin/0.6.0.json new file mode 100644 index 000000000..433b728e2 --- /dev/null +++ b/packages/manifests/polywrap/formats/polywrap.plugin/0.6.0.json @@ -0,0 +1,114 @@ +{ + "id": "PluginManifest", + "type": "object", + "additionalProperties": false, + "required": ["format", "project"], + "properties": { + "format": { + "description": "Polywrap manifest format version.", + "type": "string", + "enum": ["0.6.0"] + }, + "project": { + "description": "Basic project properties.", + "type": "object", + "additionalProperties": false, + "required": ["name", "type"], + "properties": { + "name": { + "description": "Name of this project.", + "type": "string", + "pattern": "^[a-zA-Z0-9\\-\\_]+$" + }, + "type": { + "description": "Type of this project.", + "type": "string", + "pattern": "^plugin\\/[a-z0-9]+$" + } + } + }, + "source": { + "description": "Project source files.", + "type": "object", + "additionalProperties": false, + "required": [], + "properties": { + "module": { + "description": "Path to the project's entry point.", + "type": "string", + "pattern": "^\\.?\\.?\\/?((\\/[\\w\\-\\.@]+|\\/\\.\\.|\\/\\.)+\\/)?[\\w\\-\\.]+\\.?[\\w\\-\\.]*$" + }, + "schema": { + "description": "Path to the project's graphql schema.", + "type": "string", + "pattern": "^\\.?\\.?\\/?((\\/[\\w\\-\\.@]+|\\/\\.\\.|\\/\\.)+\\/)?[\\w\\-\\.]+\\.graphql$" + } + } + }, + "imports": { + "description": "Specify URIs to be used to import ABIs in your schema.", + "type": "object", + "propertyNames": { + "pattern": "^[A-Z][a-zA-Z0-9_]+$" + }, + "patternProperties": { + ".*": { + "oneOf": [ + { + "$ref": "#/definitions/import_uri" + }, + { + "type": "string" + } + ] + } + } + }, + "import_abis": { + "description": "Specify redirects from import URIs to ABIs on your filesystem.", + "type": "array", + "items": { + "$ref": "#/definitions/import_abi" + } + } + }, + "definitions": { + "import_uri": { + "type": "object", + "additionalProperties": false, + "properties": { + "uri": { + "description": "Wrap URI to import.", + "type": "string" + }, + "types": { + "description": "List of types to import from Wrap (defaults to all).", + "type": "array", + "items": { "type": "string" } + }, + "functions": { + "description": "List of functions to import from Wrap (defaults to all).", + "type": "array", + "items": { "type": "string" } + } + }, + "required": ["uri"] + }, + "import_abi": { + "type": "object", + "additionalProperties": false, + "properties": { + "uri": { + "description": "Import URI", + "type": "string" + }, + "abi": { + "description": "Path to a local ABI (or schema). Supported file formats: [*.graphql, *.info, *.json, *.yaml]", + "type": "string", + "pattern": "^\\.?\\.?\\/?((\\/[\\w\\-\\.@]+|\\/\\.\\.|\\/\\.)+\\/)?[\\w\\-\\.]+\\.(info|graphql|json|yaml)$" + } + }, + "required": ["uri", "abi"] + } + } +} diff --git a/packages/manifests/polywrap/formats/polywrap/0.7.0.json b/packages/manifests/polywrap/formats/polywrap/0.7.0.json new file mode 100644 index 000000000..d0123ef23 --- /dev/null +++ b/packages/manifests/polywrap/formats/polywrap/0.7.0.json @@ -0,0 +1,136 @@ +{ + "id": "PolywrapManifest", + "type": "object", + "additionalProperties": false, + "required": ["format", "project"], + "properties": { + "format": { + "description": "Polywrap manifest format version.", + "type": "string", + "enum": ["0.7.0"] + }, + "project": { + "description": "Basic project properties.", + "type": "object", + "additionalProperties": false, + "required": ["name", "type"], + "properties": { + "name": { + "description": "Name of this project.", + "type": "string", + "pattern": "^[a-zA-Z0-9\\-\\_]+$" + }, + "type": { + "description": "Type of this project.", + "type": "string", + "pattern": "^((interface)|(wasm\\/[a-z0-9]+))$" + } + } + }, + "source": { + "description": "Project source files.", + "type": "object", + "additionalProperties": false, + "required": [], + "properties": { + "module": { + "description": "Path to the project's entry point.", + "type": "string", + "pattern": "^\\.?\\.?\\/?((\\/[\\w\\-\\.@]+|\\/\\.\\.|\\/\\.)+\\/)?[\\w\\-\\.]+\\.?[\\w\\-\\.]*$" + }, + "schema": { + "description": "Path to the project's graphql schema.", + "type": "string", + "pattern": "^\\.?\\.?\\/?((\\/[\\w\\-\\.@]+|\\/\\.\\.|\\/\\.)+\\/)?[\\w\\-\\.]+\\.graphql$" + } + } + }, + "imports": { + "description": "Specify URIs to be used to import ABIs in your schema.", + "type": "object", + "propertyNames": { + "pattern": "^[A-Z][a-zA-Z0-9_]+$" + }, + "patternProperties": { + ".*": { + "oneOf": [ + { + "$ref": "#/definitions/import_uri" + }, + { + "type": "string" + } + ] + } + } + }, + "import_abis": { + "description": "Specify redirects from import URIs to ABIs on your filesystem.", + "type": "array", + "items": { + "$ref": "#/definitions/import_abi" + } + }, + "resources": { + "description": "Project resources folder", + "type": "string", + "pattern": "^\\.?\\.?\\/?((\\/[\\w\\-\\.@]+|\\/\\.\\.|\\/\\.)+\\/)?[\\w\\-\\.]+\\.?[\\w\\-\\.]*\\/?$" + }, + "extensions": { + "description": "Project extension manifest files.", + "type": "object", + "additionalProperties": false, + "properties": { + "build": { + "description": "Path to the project build manifest file.", + "type": "string", + "pattern": "^\\.?\\.?(\\/[\\w\\-\\.@]+|\\/\\.\\.|\\/\\.)*\\/[\\w\\-\\.]+\\.(yaml|json)$" + }, + "docs": { + "description": "Path to the project docs manifest file.", + "type": "string", + "pattern": "^\\.?\\.?(\\/[\\w\\-\\.@]+|\\/\\.\\.|\\/\\.)*\\/[\\w\\-\\.]+\\.(yaml|json)$" + } + } + } + }, + "definitions": { + "import_uri": { + "type": "object", + "additionalProperties": false, + "properties": { + "uri": { + "description": "Wrap URI to import.", + "type": "string" + }, + "types": { + "description": "List of types to import from Wrap (defaults to all).", + "type": "array", + "items": { "type": "string" } + }, + "functions": { + "description": "List of functions to import from Wrap (defaults to all).", + "type": "array", + "items": { "type": "string" } + } + }, + "required": ["uri"] + }, + "import_abi": { + "type": "object", + "additionalProperties": false, + "properties": { + "uri": { + "description": "Import URI", + "type": "string" + }, + "abi": { + "description": "Path to a local ABI (or schema). Supported file formats: [*.graphql, *.info, *.json, *.yaml]", + "type": "string", + "pattern": "^\\.?\\.?\\/?((\\/[\\w\\-\\.@]+|\\/\\.\\.|\\/\\.)+\\/)?[\\w\\-\\.]+\\.(info|graphql|json|yaml)$" + } + }, + "required": ["uri", "abi"] + } + } +} diff --git a/yarn.lock b/yarn.lock index a289de26e..eb5923c97 100644 --- a/yarn.lock +++ b/yarn.lock @@ -120,21 +120,21 @@ integrity sha512-BQYjKbpXjoXwFW5jGqiizJQQT/aC7pFm9Ok1OWssonuguICi264lbgMzRp2ZMmRSlfkX6DsWDDcsrctK8Rwfiw== "@babel/core@^7.1.0", "@babel/core@^7.12.3", "@babel/core@^7.7.5": - version "7.22.20" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.22.20.tgz#e3d0eed84c049e2a2ae0a64d27b6a37edec385b7" - integrity sha512-Y6jd1ahLubuYweD/zJH+vvOY141v4f9igNQAQ+MBgq9JlHS2iTsZKn1aMsb3vGccZsXI16VzTBw52Xx0DWmtnA== + version "7.23.0" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.0.tgz#f8259ae0e52a123eb40f552551e647b506a94d83" + integrity sha512-97z/ju/Jy1rZmDxybphrBuI+jtJjFVoz7Mr9yUQVVVi+DNZE333uFQeMOqcCIy1x3WYBIbWftUSLmbNXNT7qFQ== dependencies: "@ampproject/remapping" "^2.2.0" "@babel/code-frame" "^7.22.13" - "@babel/generator" "^7.22.15" + "@babel/generator" "^7.23.0" "@babel/helper-compilation-targets" "^7.22.15" - "@babel/helper-module-transforms" "^7.22.20" - "@babel/helpers" "^7.22.15" - "@babel/parser" "^7.22.16" + "@babel/helper-module-transforms" "^7.23.0" + "@babel/helpers" "^7.23.0" + "@babel/parser" "^7.23.0" "@babel/template" "^7.22.15" - "@babel/traverse" "^7.22.20" - "@babel/types" "^7.22.19" - convert-source-map "^1.7.0" + "@babel/traverse" "^7.23.0" + "@babel/types" "^7.23.0" + convert-source-map "^2.0.0" debug "^4.1.0" gensync "^1.0.0-beta.2" json5 "^2.2.3" @@ -149,12 +149,12 @@ "@jridgewell/gen-mapping" "^0.3.0" jsesc "^2.5.1" -"@babel/generator@^7.22.15": - version "7.22.15" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.22.15.tgz#1564189c7ec94cb8f77b5e8a90c4d200d21b2339" - integrity sha512-Zu9oWARBqeVOW0dZOjXc3JObrzuqothQ3y/n1kUtrjCoCPLkXUwMvOo/F/TCfoHMbWIFlWwpZtkZVb9ga4U2pA== +"@babel/generator@^7.23.0": + version "7.23.0" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.0.tgz#df5c386e2218be505b34837acbcb874d7a983420" + integrity sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g== dependencies: - "@babel/types" "^7.22.15" + "@babel/types" "^7.23.0" "@jridgewell/gen-mapping" "^0.3.2" "@jridgewell/trace-mapping" "^0.3.17" jsesc "^2.5.1" @@ -175,13 +175,13 @@ resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz#96159db61d34a29dba454c959f5ae4a649ba9167" integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA== -"@babel/helper-function-name@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz#ede300828905bb15e582c037162f99d5183af1be" - integrity sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ== +"@babel/helper-function-name@^7.23.0": + version "7.23.0" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz#1f9a3cdbd5b2698a670c30d2735f9af95ed52759" + integrity sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw== dependencies: - "@babel/template" "^7.22.5" - "@babel/types" "^7.22.5" + "@babel/template" "^7.22.15" + "@babel/types" "^7.23.0" "@babel/helper-hoist-variables@^7.22.5": version "7.22.5" @@ -197,10 +197,10 @@ dependencies: "@babel/types" "^7.22.15" -"@babel/helper-module-transforms@^7.22.20": - version "7.22.20" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.22.20.tgz#da9edc14794babbe7386df438f3768067132f59e" - integrity sha512-dLT7JVWIUUxKOs1UnJUBR3S70YK+pKX6AbJgB2vMIvEkZkrfJDbYDJesnPshtKV4LhDOR3Oc5YULeDizRek+5A== +"@babel/helper-module-transforms@^7.23.0": + version "7.23.0" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.23.0.tgz#3ec246457f6c842c0aee62a01f60739906f7047e" + integrity sha512-WhDWw1tdrlT0gMgUJSlX0IQvoO1eN279zrAUbVB+KpV2c3Tylz8+GnKOLllCS6Z/iZQEyVYxhZVUdPTqs2YYPw== dependencies: "@babel/helper-environment-visitor" "^7.22.20" "@babel/helper-module-imports" "^7.22.15" @@ -232,7 +232,7 @@ resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f" integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw== -"@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.22.19", "@babel/helper-validator-identifier@^7.22.20": +"@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.22.20": version "7.22.20" resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0" integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A== @@ -242,14 +242,14 @@ resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.22.15.tgz#694c30dfa1d09a6534cdfcafbe56789d36aba040" integrity sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA== -"@babel/helpers@^7.22.15": - version "7.22.15" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.22.15.tgz#f09c3df31e86e3ea0b7ff7556d85cdebd47ea6f1" - integrity sha512-7pAjK0aSdxOwR+CcYAqgWOGy5dcfvzsTIfFTb2odQqW47MDfv14UaJDY6eng8ylM2EaeKXdxaSWESbkmaQHTmw== +"@babel/helpers@^7.23.0": + version "7.23.1" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.23.1.tgz#44e981e8ce2b9e99f8f0b703f3326a4636c16d15" + integrity sha512-chNpneuK18yW5Oxsr+t553UZzzAs3aZnFm4bxhebsNTeshrC95yA7l5yl7GBAG+JG1rF0F7zzD2EixK9mWSDoA== dependencies: "@babel/template" "^7.22.15" - "@babel/traverse" "^7.22.15" - "@babel/types" "^7.22.15" + "@babel/traverse" "^7.23.0" + "@babel/types" "^7.23.0" "@babel/highlight@^7.22.13": version "7.22.20" @@ -265,10 +265,10 @@ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.4.tgz#6774231779dd700e0af29f6ad8d479582d7ce5ef" integrity sha512-FDge0dFazETFcxGw/EXzOkN8uJp0PC7Qbm+Pe9T+av2zlBpOgunFHkQPPn+eRuClU73JF+98D531UgayY89tow== -"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.22.15", "@babel/parser@^7.22.16": - version "7.22.16" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.16.tgz#180aead7f247305cce6551bea2720934e2fa2c95" - integrity sha512-+gPfKv8UWeKKeJTUxe59+OobVcrYHETCsORl61EmSkmgymguYk/X5bp7GuUIXaFsc6y++v8ZxPsLSSuujqDphA== +"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.22.15", "@babel/parser@^7.23.0": + version "7.23.0" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.0.tgz#da950e622420bf96ca0d0f2909cdddac3acd8719" + integrity sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw== "@babel/plugin-syntax-async-generators@^7.8.4": version "7.8.4" @@ -354,7 +354,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.14.5" -"@babel/template@^7.22.15", "@babel/template@^7.22.5", "@babel/template@^7.3.3": +"@babel/template@^7.22.15", "@babel/template@^7.3.3": version "7.22.15" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.15.tgz#09576efc3830f0430f4548ef971dde1350ef2f38" integrity sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w== @@ -363,19 +363,19 @@ "@babel/parser" "^7.22.15" "@babel/types" "^7.22.15" -"@babel/traverse@^7.1.0", "@babel/traverse@^7.22.15", "@babel/traverse@^7.22.20": - version "7.22.20" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.22.20.tgz#db572d9cb5c79e02d83e5618b82f6991c07584c9" - integrity sha512-eU260mPZbU7mZ0N+X10pxXhQFMGTeLb9eFS0mxehS8HZp9o1uSnFeWQuG1UPrlxgA7QoUzFhOnilHDp0AXCyHw== +"@babel/traverse@^7.1.0", "@babel/traverse@^7.23.0": + version "7.23.0" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.0.tgz#18196ddfbcf4ccea324b7f6d3ada00d8c5a99c53" + integrity sha512-t/QaEvyIoIkwzpiZ7aoSKK8kObQYeF7T2v+dazAYCb8SXtp58zEVkWW7zAnju8FNKNdr4ScAOEDmMItbyOmEYw== dependencies: "@babel/code-frame" "^7.22.13" - "@babel/generator" "^7.22.15" + "@babel/generator" "^7.23.0" "@babel/helper-environment-visitor" "^7.22.20" - "@babel/helper-function-name" "^7.22.5" + "@babel/helper-function-name" "^7.23.0" "@babel/helper-hoist-variables" "^7.22.5" "@babel/helper-split-export-declaration" "^7.22.6" - "@babel/parser" "^7.22.16" - "@babel/types" "^7.22.19" + "@babel/parser" "^7.23.0" + "@babel/types" "^7.23.0" debug "^4.1.0" globals "^11.1.0" @@ -388,13 +388,13 @@ "@babel/helper-validator-identifier" "^7.18.6" to-fast-properties "^2.0.0" -"@babel/types@^7.0.0", "@babel/types@^7.18.2", "@babel/types@^7.20.7", "@babel/types@^7.22.15", "@babel/types@^7.22.19", "@babel/types@^7.22.5", "@babel/types@^7.3.3": - version "7.22.19" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.22.19.tgz#7425343253556916e440e662bb221a93ddb75684" - integrity sha512-P7LAw/LbojPzkgp5oznjE6tQEIWbp4PkkfrZDINTro9zgBRtI324/EYsiSI7lhPbpIQ+DCeR2NNmMWANGGfZsg== +"@babel/types@^7.0.0", "@babel/types@^7.18.2", "@babel/types@^7.20.7", "@babel/types@^7.22.15", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.3.3": + version "7.23.0" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.0.tgz#8c1f020c9df0e737e4e247c0619f58c68458aaeb" + integrity sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg== dependencies: "@babel/helper-string-parser" "^7.22.5" - "@babel/helper-validator-identifier" "^7.22.19" + "@babel/helper-validator-identifier" "^7.22.20" to-fast-properties "^2.0.0" "@bcherny/json-schema-ref-parser@9.0.9": @@ -2382,9 +2382,9 @@ semver "~7.5.4" "@rollup/plugin-commonjs@^25.0.4": - version "25.0.4" - resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-25.0.4.tgz#a7547a0c4ec3fa79818eb313e1de0023e548f4e6" - integrity sha512-L92Vz9WUZXDnlQQl3EwbypJR4+DM2EbsO+/KOcEkP4Mc6Ct453EeDB2uH9lgRwj4w5yflgNpq9pHOiY8aoUXBQ== + version "25.0.5" + resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-25.0.5.tgz#0bac8f985a5de151b4b09338847f8c7f20a28a29" + integrity sha512-xY8r/A9oisSeSuLCTfhssyDjo9Vp/eDiRLXkg1MXCcEEgEjPmLU+ZyDB20OOD0NlyDa/8SGbK5uIggF5XTx77w== dependencies: "@rollup/pluginutils" "^5.0.1" commondir "^1.0.1" @@ -2394,9 +2394,9 @@ magic-string "^0.27.0" "@rollup/plugin-node-resolve@^15.2.0": - version "15.2.1" - resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.2.1.tgz#a15b14fb7969229e26a30feff2816d39eff503f0" - integrity sha512-nsbUg588+GDSu8/NS8T4UAshO6xeaOfINNuXeVHcKV02LJtoRaM1SiOacClw4kws1SFiNhdLGxlbMY9ga/zs/w== + version "15.2.3" + resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.2.3.tgz#e5e0b059bd85ca57489492f295ce88c2d4b0daf9" + integrity sha512-j/lym8nf5E21LwBT4Df1VD6hRO2L2iwUeUmP7litikRsVp1H6NWx20NEp0Y7su+7XGc476GnXXc4kFeZNGmaSQ== dependencies: "@rollup/pluginutils" "^5.0.1" "@types/resolve" "1.20.2" @@ -2406,26 +2406,26 @@ resolve "^1.22.1" "@rollup/plugin-terser@^0.4.3": - version "0.4.3" - resolved "https://registry.yarnpkg.com/@rollup/plugin-terser/-/plugin-terser-0.4.3.tgz#c2bde2fe3a85e45fa68a454d48f4e73e57f98b30" - integrity sha512-EF0oejTMtkyhrkwCdg0HJ0IpkcaVg1MMSf2olHb2Jp+1mnLM04OhjpJWGma4HobiDTF0WCyViWuvadyE9ch2XA== + version "0.4.4" + resolved "https://registry.yarnpkg.com/@rollup/plugin-terser/-/plugin-terser-0.4.4.tgz#15dffdb3f73f121aa4fbb37e7ca6be9aeea91962" + integrity sha512-XHeJC5Bgvs8LfukDwWZp7yeqin6ns8RTl2B9avbejt6tZqsqvVoWI7ZTQrcNsfKEDWBTnTxM8nMDkO2IFFbd0A== dependencies: serialize-javascript "^6.0.1" smob "^1.0.0" terser "^5.17.4" "@rollup/plugin-typescript@^11.1.2": - version "11.1.3" - resolved "https://registry.yarnpkg.com/@rollup/plugin-typescript/-/plugin-typescript-11.1.3.tgz#8172858a1e5f4c181aebc61f8920002fd5e04b91" - integrity sha512-8o6cNgN44kQBcpsUJTbTXMTtb87oR1O0zgP3Dxm71hrNgparap3VujgofEilTYJo+ivf2ke6uy3/E5QEaiRlDA== + version "11.1.5" + resolved "https://registry.yarnpkg.com/@rollup/plugin-typescript/-/plugin-typescript-11.1.5.tgz#039c763bf943a5921f3f42be255895e75764cb91" + integrity sha512-rnMHrGBB0IUEv69Q8/JGRD/n4/n6b3nfpufUu26axhUcboUzv/twfZU8fIBbTOphRAe0v8EyxzeDpKXqGHfyDA== dependencies: "@rollup/pluginutils" "^5.0.1" resolve "^1.22.1" "@rollup/pluginutils@^5.0.1": - version "5.0.4" - resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-5.0.4.tgz#74f808f9053d33bafec0cc98e7b835c9667d32ba" - integrity sha512-0KJnIoRI8A+a1dqOYLxH8vBf8bphDmty5QvIm2hqm7oFCFYKCAZWWd2hXgMibaPsNDhI0AtpYfQZJG47pt/k4g== + version "5.0.5" + resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-5.0.5.tgz#bbb4c175e19ebfeeb8c132c2eea0ecb89941a66c" + integrity sha512-6aEYR910NyP73oHiJglti74iRyOwgFU4x3meH/H8OJx6Ry0j6cOVZ5X/wTvub7G7Ao6qaHBEaNsV3GLJkSsF+Q== dependencies: "@types/estree" "^1.0.0" estree-walker "^2.0.2" @@ -2550,9 +2550,9 @@ "@types/json-schema" "*" "@types/estree@*", "@types/estree@^1.0.0": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.1.tgz#aa22750962f3bf0e79d753d3cc067f010c95f194" - integrity sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA== + version "1.0.2" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.2.tgz#ff02bc3dc8317cd668dfec247b750ba1f1d62453" + integrity sha512-VeiPZ9MMwXjO32/Xu7+OwflfmeoRwkE/qzndw42gGtgJwZopBnzy2gD//NN1+go1mADzkDcqf/KnFRSjTJ8xJA== "@types/fs-extra@9.0.12": version "9.0.12" @@ -2590,9 +2590,9 @@ integrity sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g== "@types/istanbul-lib-report@*": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#c14c24f18ea8190c118ee7562b7ff99a36552686" - integrity sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg== + version "3.0.1" + resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz#412e0725ef41cde73bfa03e0e833eaff41e0fd63" + integrity sha512-gPQuzaPR5h/djlAv2apEG1HVOyj1IUs7GpfMZixU0/0KXT3pm64ylHuMUI1/Akh+sq/iikxg6Z2j+fcMDXaaTQ== dependencies: "@types/istanbul-lib-coverage" "*" @@ -2605,9 +2605,9 @@ "@types/istanbul-lib-report" "*" "@types/istanbul-reports@^3.0.0": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz#9153fe98bba2bd565a63add9436d6f0d7f8468ff" - integrity sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw== + version "3.0.2" + resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.2.tgz#edc8e421991a3b4df875036d381fc0a5a982f549" + integrity sha512-kv43F9eb3Lhj+lr/Hn6OcLCs/sSM8bt+fIaP11rCYngfV6NVjzWXJ17owQtDQTL9tQ8WSLUrGsSJ6rJz0F1w1A== dependencies: "@types/istanbul-lib-report" "*" @@ -2635,9 +2635,9 @@ integrity sha512-0d5Wd09ItQWH1qFbEyQ7oTQ3GZrMfth5JkbN3EvTKLXcHLRDSXeLnlvlOn0wvxVIwK5o2M8JzP/OWz7T3NRsbw== "@types/lodash@^4.14.182": - version "4.14.198" - resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.198.tgz#4d27465257011aedc741a809f1269941fa2c5d4c" - integrity sha512-trNJ/vtMZYMLhfN45uLq4ShQSw0/S7xCTLLVM+WM1rmFpba/VS42jVUgaO3w/NOLiWR/09lnYk0yMaA/atdIsg== + version "4.14.199" + resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.199.tgz#c3edb5650149d847a277a8961a7ad360c474e9bf" + integrity sha512-Vrjz5N5Ia4SEzWWgIVwnHNEnb1UE1XMkvY5DGXrAeOGE9imk0hgTHh5GyDjLDJi9OTCn9oo9dXH1uToK1VRfrg== "@types/minimatch@*", "@types/minimatch@^5.1.2": version "5.1.2" @@ -2650,9 +2650,9 @@ integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ== "@types/minimist@^1.2.0": - version "1.2.2" - resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c" - integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ== + version "1.2.3" + resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.3.tgz#dd249cef80c6fff2ba6a0d4e5beca913e04e25f8" + integrity sha512-ZYFzrvyWUNhaPomn80dsMNgMeXxNWZBdkuG/hWlUvXvbdUH8ZERNBGXnU87McuGcWDsyzX2aChCv/SVN348k3A== "@types/mustache@4.0.1": version "4.0.1" @@ -2665,9 +2665,9 @@ integrity sha512-z6nr0TTEOBGkzLGmbypWOGnpSpSIBorEhC4L+4HeQ2iezKCi4f77kyslRwvHeNitymGQ+oFyIWGP96l/DPSV9w== "@types/normalize-package-data@^2.4.0": - version "2.4.1" - resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301" - integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw== + version "2.4.2" + resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.2.tgz#9b0e3e8533fe5024ad32d6637eb9589988b6fdca" + integrity sha512-lqa4UEhhv/2sjjIQgjX8B+RBjj47eo0mzGasklVJ78UKGQY1r0VpB9XHDaZZO9qzEFDdy4MrXLuEaSmPrPSe/A== "@types/parse-json@^4.0.0": version "4.0.0" @@ -2685,9 +2685,9 @@ integrity sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA== "@types/prop-types@*": - version "15.7.6" - resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.6.tgz#bbf819813d6be21011b8f5801058498bec555572" - integrity sha512-RK/kBbYOQQHLYj9Z95eh7S6t7gq4Ojt/NT8HTk8bWVhA5DaF+5SMnxHKkP4gPNN3wAZkKP+VjAf0ebtYzf+fxg== + version "15.7.8" + resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.8.tgz#805eae6e8f41bd19e88917d2ea200dc992f405d3" + integrity sha512-kMpQpfZKSCBqltAJwskgePRaYRFukDkm1oItcAbC3gNELR20XIBcN9VRgg4+m8DKsTfkWeA4m4Imp4DDuWy7FQ== "@types/react-dom@16.9.0": version "16.9.0" @@ -2736,21 +2736,21 @@ integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw== "@types/yargs-parser@*": - version "21.0.0" - resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz#0c60e537fa790f5f9472ed2776c2b71ec117351b" - integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA== + version "21.0.1" + resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.1.tgz#07773d7160494d56aa882d7531aac7319ea67c3b" + integrity sha512-axdPBuLuEJt0c4yI5OZssC19K2Mq1uKdrfZBzuxLvaztgqUtFYZUNw7lETExPYJR9jdEoIg4mb7RQKRQzOkeGQ== "@types/yargs@^15.0.0": - version "15.0.15" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.15.tgz#e609a2b1ef9e05d90489c2f5f45bbfb2be092158" - integrity sha512-IziEYMU9XoVj8hWg7k+UJrXALkGFjWJhn5QFEv9q4p+v40oZhSuC135M38st8XPjICL7Ey4TV64ferBGUoJhBg== + version "15.0.16" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.16.tgz#258009dc52907e8f03041eb64ffdac297ba4b208" + integrity sha512-2FeD5qezW3FvLpZ0JpfuaEWepgNLl9b2gQYiz/ce0NhoB1W/D+VZu98phITXkADYerfr/jb7JcDcVhITsc9bwg== dependencies: "@types/yargs-parser" "*" "@types/yauzl@^2.9.1": - version "2.10.0" - resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.10.0.tgz#b3248295276cf8c6f153ebe6a9aba0c988cb2599" - integrity sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw== + version "2.10.1" + resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.10.1.tgz#4e8f299f0934d60f36c74f59cb5a8483fd786691" + integrity sha512-CHzgNU3qYBnp/O4S3yv2tXPlvMTq0YWSTVg2/JYLqWZGHwwgJGAwd00poay/11asPq8wLFwHzubyInqHIFmmiw== dependencies: "@types/node" "*" @@ -3455,12 +3455,12 @@ browser-process-hrtime@^1.0.0: integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow== browserslist@^4.21.9: - version "4.21.11" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.11.tgz#35f74a3e51adc4d193dcd76ea13858de7b8fecb8" - integrity sha512-xn1UXOKUz7DjdGlg9RrUr0GGiWzI97UQJnugHtH0OLDfJB7jMgoIkYvRIEO1l9EeEERVqeqLYOcFBW9ldjypbQ== + version "4.22.1" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.22.1.tgz#ba91958d1a59b87dab6fed8dfbcb3da5e2e9c619" + integrity sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ== dependencies: - caniuse-lite "^1.0.30001538" - electron-to-chromium "^1.4.526" + caniuse-lite "^1.0.30001541" + electron-to-chromium "^1.4.535" node-releases "^2.0.13" update-browserslist-db "^1.0.13" @@ -3597,10 +3597,10 @@ camelcase@^6.0.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== -caniuse-lite@^1.0.30001538: - version "1.0.30001538" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001538.tgz#9dbc6b9af1ff06b5eb12350c2012b3af56744f3f" - integrity sha512-HWJnhnID+0YMtGlzcp3T9drmBJUVDchPJ08tpUGFLs9CYlwWPH2uLgpHn8fND5pCgXVtnGS3H4QR9XLMHVNkHw== +caniuse-lite@^1.0.30001541: + version "1.0.30001546" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001546.tgz#10fdad03436cfe3cc632d3af7a99a0fb497407f0" + integrity sha512-zvtSJwuQFpewSyRrI3AsftF6rM0X80mZkChIt1spBGEvRglCrjTniXvinc8JKRoqTwXAgvqTImaN9igfSMtUBw== capture-exit@^2.0.0: version "2.0.0" @@ -4004,11 +4004,16 @@ conventional-recommended-bump@^6.1.0: meow "^8.0.0" q "^1.5.1" -convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0: +convert-source-map@^1.4.0, convert-source-map@^1.6.0: version "1.9.0" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f" integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A== +convert-source-map@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a" + integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg== + copy-descriptor@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" @@ -4401,10 +4406,10 @@ ecc-jsbn@~0.1.1: jsbn "~0.1.0" safer-buffer "^2.1.0" -electron-to-chromium@^1.4.526: - version "1.4.527" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.527.tgz#5acf0bcc5bf015eb31dd2279989a3712e341a554" - integrity sha512-EafxEiEDzk2aLrdbtVczylHflHdHkNrpGNHIgDyA63sUQLQVS2ayj2hPw3RsVB42qkwURH+T2OxV7kGPUuYszA== +electron-to-chromium@^1.4.535: + version "1.4.544" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.544.tgz#fcb156d83f0ee6e4c9d030c6fedb2a37594f3abf" + integrity sha512-54z7squS1FyFRSUqq/knOFSptjjogLZXbKcYk3B0qkE1KZzvqASwRZnY2KzZQJqIYLVD38XZeoiMRflYSwyO4w== elliptic@6.5.4: version "6.5.4" @@ -5111,15 +5116,15 @@ find-up@^4.0.0, find-up@^4.1.0: path-exists "^4.0.0" flat-cache@^3.0.4: - version "3.1.0" - resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.1.0.tgz#0e54ab4a1a60fe87e2946b6b00657f1c99e1af3f" - integrity sha512-OHx4Qwrrt0E4jEIcI5/Xb+f+QmJYNj2rrK8wiIdQOIrB9WrrJL8cjZvXdXuBTkkEwEqLycb5BeZDV1o2i9bTew== + version "3.1.1" + resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.1.1.tgz#a02a15fdec25a8f844ff7cc658f03dd99eb4609b" + integrity sha512-/qM2b3LUIaIgviBQovTLvijfyOQXPtSRnRK26ksj2J7rzPIecePUIpJsZ4T02Qg+xiAEKIs5K8dsHEd+VaKa/Q== dependencies: - flatted "^3.2.7" + flatted "^3.2.9" keyv "^4.5.3" rimraf "^3.0.2" -flatted@^3.2.7: +flatted@^3.2.9: version "3.2.9" resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.9.tgz#7eb4c67ca1ba34232ca9d2d93e9886e611ad7daf" integrity sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ== @@ -5615,11 +5620,9 @@ has-values@^1.0.0: kind-of "^4.0.0" has@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" - integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== - dependencies: - function-bind "^1.1.1" + version "1.0.4" + resolved "https://registry.yarnpkg.com/has/-/has-1.0.4.tgz#2eb2860e000011dae4f1406a86fe80e530fb2ec6" + integrity sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ== hash.js@1.1.7, hash.js@^1.0.0, hash.js@^1.0.3: version "1.1.7" @@ -6905,9 +6908,9 @@ jsprim@^1.2.2: verror "1.10.0" keyv@^4.5.3: - version "4.5.3" - resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.3.tgz#00873d2b046df737963157bd04f294ca818c9c25" - integrity sha512-QCiSav9WaX1PgETJ+SpNnx2PRRapJ/oRSXM4VO5OGYGSjrxbKPVFVhB3l2OCbLCk329N8qyAtsJjSjvVBWzEug== + version "4.5.4" + resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93" + integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw== dependencies: json-buffer "3.0.1" @@ -8947,9 +8950,9 @@ rimraf@^2.6.3: glob "^7.1.3" rollup@^3.28.0: - version "3.29.2" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.29.2.tgz#cbc76cd5b03b9f9e93be991d23a1dff9c6d5b740" - integrity sha512-CJouHoZ27v6siztc21eEQGo0kIcE5D1gVPA571ez0mMYb25LGYGKnVNXpEj5MGlepmDWGXNjDB5q7uNiPHC11A== + version "3.29.4" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.29.4.tgz#4d70c0f9834146df8705bfb69a9a19c9e1109981" + integrity sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw== optionalDependencies: fsevents "~2.3.2" @@ -9343,9 +9346,9 @@ spdx-expression-parse@^3.0.0: spdx-license-ids "^3.0.0" spdx-license-ids@^3.0.0: - version "3.0.15" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.15.tgz#142460aabaca062bc7cd4cc87b7d50725ed6a4ba" - integrity sha512-lpT8hSQp9jAKp9mhtBU4Xjon8LPGBvLIuBiSVhMEtmLecTh2mO0tlqrAMp47tBXzMr13NJMQ2lf7RpQGLJ3HsQ== + version "3.0.16" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz#a14f64e0954f6e25cc6587bd4f392522db0d998f" + integrity sha512-eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw== split-on-first@^1.0.0: version "1.1.0" @@ -9673,9 +9676,9 @@ terminal-link@^2.0.0: supports-hyperlinks "^2.0.0" terser@^5.17.4: - version "5.20.0" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.20.0.tgz#ea42aea62578703e33def47d5c5b93c49772423e" - integrity sha512-e56ETryaQDyebBwJIWYB2TT6f2EZ0fL0sW/JRXNMN26zZdKi2u/E/5my5lG6jNxym6qsrVXfFRmOdV42zlAgLQ== + version "5.21.0" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.21.0.tgz#d2b27e92b5e56650bc83b6defa00a110f0b124b2" + integrity sha512-WtnFKrxu9kaoXuiZFSGrcAvvBqAdmKx0SFNmVNYdJamMu9yyN3I/QF0FbH4QcqJQ+y1CJnzxGIKH0cSj+FGYRw== dependencies: "@jridgewell/source-map" "^0.3.3" acorn "^8.8.2" @@ -10248,14 +10251,14 @@ vscode-json-languageservice@^4.0.2: vscode-uri "^3.0.3" vscode-languageserver-textdocument@^1.0.3: - version "1.0.8" - resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.8.tgz#9eae94509cbd945ea44bca8dcfe4bb0c15bb3ac0" - integrity sha512-1bonkGqQs5/fxGT5UchTgjGVnfysL0O8v1AYMBjqTbWQTFn721zaPGDYFkOKtfDgFiSgXM3KwaG3FMGfW4Ed9Q== + version "1.0.11" + resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.11.tgz#0822a000e7d4dc083312580d7575fe9e3ba2e2bf" + integrity sha512-X+8T3GoiwTVlJbicx/sIAF+yuJAqz8VvwJyoMVhwEMoEKE/fkDmrqUgDMyBECcM2A2frVZIUj5HI/ErRXCfOeA== vscode-languageserver-types@^3.16.0: - version "3.17.4" - resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.4.tgz#0b422ecbc305f364f6579ba9e32b1d7ddb7ca789" - integrity sha512-9YXi5pA3XF2V+NUQg6g+lulNS0ncRCKASYdK3Cs7kiH9sVFXWq27prjkC/B8M/xJLRPPRSPCHVMuBTgRNFh2sQ== + version "3.17.5" + resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz#3273676f0cf2eab40b3f44d085acbb7f08a39d8a" + integrity sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg== vscode-nls@^5.0.0: version "5.2.0" @@ -10263,9 +10266,9 @@ vscode-nls@^5.0.0: integrity sha512-RAaHx7B14ZU04EU31pT+rKz2/zSl7xMsfIZuo8pd+KZO6PXtQmpevpq3vxvWNcrGbdmhM/rr5Uw5Mz+NBfhVng== vscode-uri@^3.0.3: - version "3.0.7" - resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.7.tgz#6d19fef387ee6b46c479e5fb00870e15e58c1eb8" - integrity sha512-eOpPHogvorZRobNqJGhapa0JdwaxpjVvyBp0QIUMRMSf8ZAlqOdEquKuRmw9Qwu0qXtJIWqFtMkmvJjUZmMjVA== + version "3.0.8" + resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.8.tgz#1770938d3e72588659a172d0fd4642780083ff9f" + integrity sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw== w3c-hr-time@^1.0.2: version "1.0.2"