Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion formidable/vendor/resolvers/BroadcastServiceResolver.imba
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { BroadcastServiceResolver as ServiceResolver } from '@formidablejs/broadcaster/src/server'
import { BroadcastServiceResolver as ServiceResolver } from '@formidablejs/broadcaster'

export class BroadcastServiceResolver < ServiceResolver

Expand Down
2 changes: 1 addition & 1 deletion formidable/vendor/resolvers/BroadcastServiceResolver.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { BroadcastServiceResolver as ServiceResolver } from '@formidablejs/broadcaster/src/server'
import { BroadcastServiceResolver as ServiceResolver } from '@formidablejs/broadcaster'

export class BroadcastServiceResolver extends ServiceResolver {
/**
Expand Down
2 changes: 1 addition & 1 deletion formidable/vendor/routes/channels.imba
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Broadcast } from '@formidablejs/broadcaster/src/server'
import { Broadcast } from '@formidablejs/broadcaster'
import type { ChannelMessage } from '@formidablejs/broadcaster'

# --------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion formidable/vendor/routes/channels.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Broadcast } from '@formidablejs/broadcaster/src/server'
import { Broadcast } from '@formidablejs/broadcaster'
import type { ChannelMessage } from '@formidablejs/broadcaster'

/**
Expand Down
34 changes: 28 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,38 @@
"description": "Channel Broadcaster for Formidable.",
"author": "Donald Pakkies <donaldpakkies@gmail.com>",
"license": "MIT",
"main": "src/index.js",
"types": "src/index.d.ts",
"main": "src/server/index.js",
"types": "src/server/index.d.ts",
Comment on lines -7 to +8

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need to revert this change

"exports": {
".": {
"import": "./src/server/index.js",
"require": "./src/server/index.js",
"types": "./src/server/index.d.ts"
},
"./server": {
"import": "./src/server/index.js",
"require": "./src/server/index.js",
"types": "./src/server/index.d.ts"
},
"./client": {
"import": "./src/client/index.js",
"require": "./src/client/index.js",
"types": "./src/client/index.d.ts"
}
},
"publisher": "formidable/Package.js",
"bugs": "https://github.com/formidablejs/broadcaster/issues",
"bugs": {
"url": "https://github.com/formidablejs/broadcaster/issues"
},
"homepage": "https://formidablejs.org/docs/broadcasting",
"repository": "https://github.com/formidablejs/broadcaster",
"repository": {
"type": "git",
"url": "https://github.com/formidablejs/broadcaster.git"
},
"files": [
"formidable",
"formidable",
"src",
"types"
"types"
],
"peerDependencies": {
"@formidablejs/framework": ">=0.21.0"
Expand Down
21 changes: 20 additions & 1 deletion src/client/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
import BroadcastingConfig from '../types/BroadcastingConfig'
import subscribe from './subscribe'
import SubscribeCallback from '../../types/SubscribeCallback'
import SubscribeOnError from '../../types/SubscribeOnError'
import SubscribeOnReady from '../../types/SubscribeOnReady'
import SubscriptionOptions from '../../types/SubscriptionOptions'

export { subscribe }
declare global {
interface Window {
BroadcastConfig: BroadcastingConfig
}

var BroadcastConfig: BroadcastingConfig
}

export {
subscribe,
SubscriptionOptions,
SubscribeCallback,
SubscribeOnError,
SubscribeOnReady
}
10 changes: 1 addition & 9 deletions src/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import Broadcast from './server/Broadcast'
import BroadcastChannel from './server/BroadcastChannel'
import BroadcastingConfig from '../types/BroadcastingConfig'
import BroadcastServiceResolver from './server/BroadcastServiceResolver'
import Channel from './server/Channel'
import ChannelCallback, { ChannelMessage } from './../types/ChannelCallback'
Expand All @@ -9,15 +10,6 @@ import SubscribeOnError from './../types/SubscribeOnError'
import SubscribeOnReady from './../types/SubscribeOnReady'
import SubscriptionOptions from './../types/SubscriptionOptions'

type BroadcastingConfig = {
/**
* Specify the prefix that will be used to prefix the channel
* paths. For example, if you specify a prefix of `_broadcast`, the channel
* path will be `/_broadcast/channel`.
*/
prefix: string
}

declare global {
interface Window {
BroadcastConfig: BroadcastingConfig
Expand Down
6 changes: 5 additions & 1 deletion src/server/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
import { ChannelMessage } from '../../types/ChannelCallback'
import Broadcast from './Broadcast'
import BroadcastChannel from './BroadcastChannel'
import BroadcastServiceResolver from './BroadcastServiceResolver'
import Channel from './Channel'
import ConnectionEvent from '../../types/ConnectionEvent'

export {
Broadcast,
BroadcastChannel,
BroadcastServiceResolver,
Channel
Channel,
ChannelMessage,
ConnectionEvent,
}
10 changes: 10 additions & 0 deletions types/BroadcastingConfig.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
type BroadcastingConfig = {
/**
* Specify the prefix that will be used to prefix the channel
* paths. For example, if you specify a prefix of `_broadcast`, the channel
* path will be `/_broadcast/channel`.
*/
prefix: string
}

export default BroadcastingConfig