Skip to content

Commit

Permalink
Merge branch 'main' into conformance-tests-into-docs
Browse files Browse the repository at this point in the history
  • Loading branch information
kriswest authored Dec 12, 2024
2 parents 122f07b + d5aab3f commit 8934705
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 17 deletions.
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,10 @@
"listenerType": {
"title": "Event listener type",
"description": "The type of PrivateChannel event that the listener should be applied to.",
"$ref": "common.schema.json#/$defs/PrivateChannelEventListenerTypes"
"oneOf": [
{ "$ref": "common.schema.json#/$defs/PrivateChannelEventListenerTypes" },
{ "type": "null" }
]
}
},
"additionalProperties": false,
Expand Down
10 changes: 4 additions & 6 deletions src/api/BrowserTypes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1442,7 +1442,7 @@ export interface AppMetadata {
}

/**
* Describes an Icon images that may be used to represent the application.
* Describes an Icon image that may be used to represent the application.
*/
export interface Icon {
/**
Expand Down Expand Up @@ -2107,7 +2107,7 @@ export interface GetCurrentContextResponsePayload {
*/

/**
* Request to retrieve information about the FDC3 Desktop Agent implementation and the
* Request to retrieve information about the FDC3 Desktop Agent implementation and the
* metadata of the calling application according to the Desktop Agent.
*
* A request message from an FDC3-enabled app to a Desktop Agent.
Expand Down Expand Up @@ -2907,16 +2907,14 @@ export interface TPayload {
/**
* The type of PrivateChannel event that the listener should be applied to.
*/
listenerType: PrivateChannelEventListenerTypes;
listenerType: PrivateChannelEventListenerTypes | null;
/**
* The Id of the PrivateChannel that the listener should be added to.
*/
privateChannelId: string;
}

/**
* The type of PrivateChannel event that the listener should be applied to.
*
* Event listener type names for Private Channel events.
*/
export type PrivateChannelEventListenerTypes = "onAddContextListener" | "onUnsubscribe" | "onDisconnect";
Expand Down Expand Up @@ -5257,7 +5255,7 @@ const typeMap: any = {
{ json: "type", js: "type", typ: r("PrivateChannelAddEventListenerRequestType") },
], false),
"TPayload": o([
{ json: "listenerType", js: "listenerType", typ: r("PrivateChannelEventListenerTypes") },
{ json: "listenerType", js: "listenerType", typ: u(r("PrivateChannelEventListenerTypes"), null) },
{ json: "privateChannelId", js: "privateChannelId", typ: "" },
], false),
"PrivateChannelAddEventListenerResponse": o([
Expand Down
2 changes: 1 addition & 1 deletion src/context/ContextTypes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ export type ActionType = "broadcast" | "raiseIntent";
export interface AppIdentifier {
/**
* The unique application identifier located within a specific application directory
* instance. An example of an appId might be '[email protected]'
* instance. An example of an appId might be '[email protected]'.
*/
appId: string;
/**
Expand Down
12 changes: 6 additions & 6 deletions website/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3437,9 +3437,9 @@ cross-fetch@^3.1.5:
node-fetch "^2.6.12"

cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.3:
version "7.0.3"
resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz"
integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
version "7.0.6"
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
dependencies:
path-key "^3.1.0"
shebang-command "^2.0.0"
Expand Down Expand Up @@ -6073,9 +6073,9 @@ multicast-dns@^7.2.5:
thunky "^1.0.2"

nanoid@^3.3.7:
version "3.3.7"
resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz"
integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==
version "3.3.8"
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.8.tgz#b1be3030bee36aaff18bacb375e5cce521684baf"
integrity sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==

[email protected]:
version "0.6.3"
Expand Down

0 comments on commit 8934705

Please sign in to comment.