Skip to content

fix: hot reload for plugins #3869

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Jack-Works merged 1 commit into from
Aug 11, 2021
Merged

fix: hot reload for plugins #3869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions packages/maskbook/src/plugins/Airdrop/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ registerPlugin({
SNSAdaptor: {
load: () => import('./SNSAdaptor'),
hotModuleReload: (hot) =>
import.meta.webpackHot?.accept('./SNSAdaptor/index', () => hot(import('./SNSAdaptor'))),
import.meta.webpackHot && import.meta.webpackHot.accept('./SNSAdaptor', () => hot(import('./SNSAdaptor'))),
},
Worker: {
load: () => import('./Worker'),
hotModuleReload: (hot) => import.meta.webpackHot?.accept('./Worker/index', () => hot(import('./Worker'))),
hotModuleReload: (hot) =>
import.meta.webpackHot && import.meta.webpackHot.accept('./Worker', () => hot(import('./Worker'))),
},
})
5 changes: 3 additions & 2 deletions packages/maskbook/src/plugins/Collectible/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ registerPlugin({
SNSAdaptor: {
load: () => import('./SNSAdaptor'),
hotModuleReload: (hot) =>
import.meta.webpackHot?.accept('./SNSAdaptor/index', () => hot(import('./SNSAdaptor'))),
import.meta.webpackHot && import.meta.webpackHot.accept('./SNSAdaptor', () => hot(import('./SNSAdaptor'))),
},
Worker: {
load: () => import('./Worker'),
hotModuleReload: (hot) => import.meta.webpackHot?.accept('./Worker/index', () => hot(import('./Worker'))),
hotModuleReload: (hot) =>
import.meta.webpackHot && import.meta.webpackHot.accept('./Worker', () => hot(import('./Worker'))),
},
})
2 changes: 1 addition & 1 deletion packages/maskbook/src/plugins/External/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ registerPlugin({
SNSAdaptor: {
load: () => import('./SNSAdaptor'),
hotModuleReload: (hot) =>
import.meta.webpackHot?.accept('./SNSAdaptor/index', () => hot(import('./SNSAdaptor'))),
import.meta.webpackHot && import.meta.webpackHot.accept('./SNSAdaptor', () => hot(import('./SNSAdaptor'))),
},
})
2 changes: 1 addition & 1 deletion packages/maskbook/src/plugins/FileService/Worker/rpc.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { createPluginMessage, createPluginRPC, createPluginRPCGenerator } from '@masknet/plugin-infra'
import { FileServicePluginID } from '../constants'

import.meta.webpackHot?.accept()
import.meta.webpackHot && import.meta.webpackHot.accept()

const PluginFileServiceMessage = createPluginMessage<{ _: unknown; _2: unknown }>(FileServicePluginID)

Expand Down
4 changes: 2 additions & 2 deletions packages/maskbook/src/plugins/FileService/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ registerPlugin({
SNSAdaptor: {
load: () => import('./SNSAdaptor'),
hotModuleReload: (hot) => {
import.meta.webpackHot?.accept('./SNSAdaptor/index', () => hot(import('./SNSAdaptor')))
import.meta.webpackHot && import.meta.webpackHot.accept('./SNSAdaptor', () => hot(import('./SNSAdaptor')))
},
},
Worker: {
load: () => import('./Worker'),
hotModuleReload: (hot) => {
import.meta.webpackHot?.accept('./Worker/index', () => hot(import('./Worker')))
import.meta.webpackHot && import.meta.webpackHot.accept('./Worker', () => hot(import('./Worker')))
},
},
})
5 changes: 3 additions & 2 deletions packages/maskbook/src/plugins/Gitcoin/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ registerPlugin({
SNSAdaptor: {
load: () => import('./SNSAdaptor'),
hotModuleReload: (hot) =>
import.meta.webpackHot?.accept('./SNSAdaptor/index', () => hot(import('./SNSAdaptor'))),
import.meta.webpackHot && import.meta.webpackHot.accept('./SNSAdaptor', () => hot(import('./SNSAdaptor'))),
},
Worker: {
load: () => import('./Worker'),
hotModuleReload: (hot) => import.meta.webpackHot?.accept('./Worker/index', () => hot(import('./Worker'))),
hotModuleReload: (hot) =>
import.meta.webpackHot && import.meta.webpackHot.accept('./Worker', () => hot(import('./Worker'))),
},
})
2 changes: 1 addition & 1 deletion packages/maskbook/src/plugins/GoodGhosting/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ registerPlugin({
SNSAdaptor: {
load: () => import('./SNSAdaptor'),
hotModuleReload: (hot) =>
import.meta.webpackHot?.accept('./SNSAdaptor/index', () => hot(import('./SNSAdaptor'))),
import.meta.webpackHot && import.meta.webpackHot.accept('./SNSAdaptor', () => hot(import('./SNSAdaptor'))),
},
})
5 changes: 3 additions & 2 deletions packages/maskbook/src/plugins/ITO/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ registerPlugin({
SNSAdaptor: {
load: () => import('./SNSAdaptor'),
hotModuleReload: (hot) =>
import.meta.webpackHot?.accept('./SNSAdaptor/index', () => hot(import('./SNSAdaptor'))),
import.meta.webpackHot && import.meta.webpackHot.accept('./SNSAdaptor', () => hot(import('./SNSAdaptor'))),
},
Worker: {
load: () => import('./Worker'),
hotModuleReload: (hot) => import.meta.webpackHot?.accept('./Worker/index', () => hot(import('./Worker'))),
hotModuleReload: (hot) =>
import.meta.webpackHot && import.meta.webpackHot.accept('./Worker', () => hot(import('./Worker'))),
},
})
2 changes: 1 addition & 1 deletion packages/maskbook/src/plugins/NFT/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ registerPlugin({
SNSAdaptor: {
load: () => import('./SNSAdaptor'),
hotModuleReload: (hot) =>
import.meta.webpackHot?.accept('./SNSAdaptor/index', () => hot(import('./SNSAdaptor'))),
import.meta.webpackHot && import.meta.webpackHot.accept('./SNSAdaptor', () => hot(import('./SNSAdaptor'))),
},
})
5 changes: 3 additions & 2 deletions packages/maskbook/src/plugins/Polls/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ registerPlugin({
SNSAdaptor: {
load: () => import('./SNSAdaptor'),
hotModuleReload: (hot) =>
import.meta.webpackHot?.accept('./SNSAdaptor/index', () => hot(import('./SNSAdaptor'))),
import.meta.webpackHot && import.meta.webpackHot.accept('./SNSAdaptor', () => hot(import('./SNSAdaptor'))),
},
Worker: {
load: () => import('./Worker'),
hotModuleReload: (hot) => import.meta.webpackHot?.accept('./Worker/index', () => hot(import('./Worker'))),
hotModuleReload: (hot) =>
import.meta.webpackHot && import.meta.webpackHot.accept('./Worker', () => hot(import('./Worker'))),
},
})
8 changes: 5 additions & 3 deletions packages/maskbook/src/plugins/PoolTogether/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,16 @@ registerPlugin({
SNSAdaptor: {
load: () => import('./SNSAdaptor'),
hotModuleReload: (hot) =>
import.meta.webpackHot?.accept('./SNSAdaptor/index', () => hot(import('./SNSAdaptor'))),
import.meta.webpackHot && import.meta.webpackHot.accept('./SNSAdaptor', () => hot(import('./SNSAdaptor'))),
},
Dashboard: {
load: () => import('./Dashboard'),
hotModuleReload: (hot) => import.meta.webpackHot?.accept('./Dashboard/index', () => hot(import('./Dashboard'))),
hotModuleReload: (hot) =>
import.meta.webpackHot && import.meta.webpackHot.accept('./Dashboard', () => hot(import('./Dashboard'))),
},
Worker: {
load: () => import('./Worker'),
hotModuleReload: (hot) => import.meta.webpackHot?.accept('./Worker/index', () => hot(import('./Worker'))),
hotModuleReload: (hot) =>
import.meta.webpackHot && import.meta.webpackHot.accept('./Worker', () => hot(import('./Worker'))),
},
})
2 changes: 1 addition & 1 deletion packages/maskbook/src/plugins/PoolTogether/messages.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ interface PoolTogetherMessages {

rpc: unknown
}
import.meta.webpackHot?.accept()
import.meta.webpackHot && import.meta.webpackHot.accept()
export const PluginPoolTogetherMessages: PluginMessageEmitter<PoolTogetherMessages> =
createPluginMessage(POOLTOGETHER_PLUGIN_ID)

Expand Down
5 changes: 3 additions & 2 deletions packages/maskbook/src/plugins/RedPacket/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ registerPlugin({
SNSAdaptor: {
load: () => import('./SNSAdaptor'),
hotModuleReload: (hot) =>
import.meta.webpackHot?.accept('./SNSAdaptor/index', () => hot(import('./SNSAdaptor'))),
import.meta.webpackHot && import.meta.webpackHot.accept('./SNSAdaptor', () => hot(import('./SNSAdaptor'))),
},
Worker: {
load: () => import('./Worker'),
hotModuleReload: (hot) => import.meta.webpackHot?.accept('./Worker/index', () => hot(import('./Worker'))),
hotModuleReload: (hot) =>
import.meta.webpackHot && import.meta.webpackHot.accept('./Worker', () => hot(import('./Worker'))),
},
})
5 changes: 3 additions & 2 deletions packages/maskbook/src/plugins/Snapshot/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ registerPlugin({
SNSAdaptor: {
load: () => import('./SNSAdaptor'),
hotModuleReload: (hot) =>
import.meta.webpackHot?.accept('./SNSAdaptor/index', () => hot(import('./SNSAdaptor'))),
import.meta.webpackHot && import.meta.webpackHot.accept('./SNSAdaptor', () => hot(import('./SNSAdaptor'))),
},
Worker: {
load: () => import('./Worker'),
hotModuleReload: (hot) => import.meta.webpackHot?.accept('./Worker/index', () => hot(import('./Worker'))),
hotModuleReload: (hot) =>
import.meta.webpackHot && import.meta.webpackHot.accept('./Worker', () => hot(import('./Worker'))),
},
})
8 changes: 5 additions & 3 deletions packages/maskbook/src/plugins/Trader/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,16 @@ registerPlugin({
SNSAdaptor: {
load: () => import('./SNSAdaptor'),
hotModuleReload: (hot) =>
import.meta.webpackHot?.accept('./SNSAdaptor/index', () => hot(import('./SNSAdaptor'))),
import.meta.webpackHot && import.meta.webpackHot.accept('./SNSAdaptor', () => hot(import('./SNSAdaptor'))),
},
Dashboard: {
load: () => import('./Dashboard'),
hotModuleReload: (hot) => import.meta.webpackHot?.accept('./Dashboard/index', () => hot(import('./Dashboard'))),
hotModuleReload: (hot) =>
import.meta.webpackHot && import.meta.webpackHot.accept('./Dashboard', () => hot(import('./Dashboard'))),
},
Worker: {
load: () => import('./Worker'),
hotModuleReload: (hot) => import.meta.webpackHot?.accept('./Worker/index', () => hot(import('./Worker'))),
hotModuleReload: (hot) =>
import.meta.webpackHot && import.meta.webpackHot.accept('./Worker', () => hot(import('./Worker'))),
},
})
5 changes: 3 additions & 2 deletions packages/maskbook/src/plugins/Transak/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ registerPlugin({
SNSAdaptor: {
load: () => import('./SNSAdaptor'),
hotModuleReload: (hot) =>
import.meta.webpackHot?.accept('./SNSAdaptor/index', () => hot(import('./SNSAdaptor'))),
import.meta.webpackHot && import.meta.webpackHot.accept('./SNSAdaptor', () => hot(import('./SNSAdaptor'))),
},
Dashboard: {
load: () => import('./Dashboard'),
hotModuleReload: (hot) => import.meta.webpackHot?.accept('./Dashboard/index', () => hot(import('./Dashboard'))),
hotModuleReload: (hot) =>
import.meta.webpackHot && import.meta.webpackHot.accept('./Dashboard', () => hot(import('./Dashboard'))),
},
})
2 changes: 1 addition & 1 deletion packages/maskbook/src/plugins/VCent/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ registerPlugin({
SNSAdaptor: {
load: () => import('./SNSAdaptor'),
hotModuleReload: (hot) =>
import.meta.webpackHot?.accept('./SNSAdaptor/index', () => hot(import('./SNSAdaptor'))),
import.meta.webpackHot && import.meta.webpackHot.accept('./SNSAdaptor', () => hot(import('./SNSAdaptor'))),
},
})
8 changes: 5 additions & 3 deletions packages/maskbook/src/plugins/Wallet/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,16 @@ registerPlugin({
SNSAdaptor: {
load: () => import('./SNSAdaptor'),
hotModuleReload: (hot) =>
import.meta.webpackHot?.accept('./SNSAdaptor/index', () => hot(import('./SNSAdaptor'))),
import.meta.webpackHot && import.meta.webpackHot.accept('./SNSAdaptor', () => hot(import('./SNSAdaptor'))),
},
Dashboard: {
load: () => import('./Dashboard'),
hotModuleReload: (hot) => import.meta.webpackHot?.accept('./Dashboard/index', () => hot(import('./Dashboard'))),
hotModuleReload: (hot) =>
import.meta.webpackHot && import.meta.webpackHot.accept('./Dashboard', () => hot(import('./Dashboard'))),
},
Worker: {
load: () => import('./Worker'),
hotModuleReload: (hot) => import.meta.webpackHot?.accept('./Worker/index', () => hot(import('./Worker'))),
hotModuleReload: (hot) =>
import.meta.webpackHot && import.meta.webpackHot.accept('./Worker', () => hot(import('./Worker'))),
},
})
8 changes: 5 additions & 3 deletions packages/maskbook/src/plugins/dHEDGE/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,16 @@ registerPlugin({
SNSAdaptor: {
load: () => import('./SNSAdaptor'),
hotModuleReload: (hot) =>
import.meta.webpackHot?.accept('./SNSAdaptor/index', () => hot(import('./SNSAdaptor'))),
import.meta.webpackHot && import.meta.webpackHot.accept('./SNSAdaptor', () => hot(import('./SNSAdaptor'))),
},
Dashboard: {
load: () => import('./Dashboard'),
hotModuleReload: (hot) => import.meta.webpackHot?.accept('./Dashboard/index', () => hot(import('./Dashboard'))),
hotModuleReload: (hot) =>
import.meta.webpackHot && import.meta.webpackHot.accept('./Dashboard', () => hot(import('./Dashboard'))),
},
Worker: {
load: () => import('./Worker'),
hotModuleReload: (hot) => import.meta.webpackHot?.accept('./Worker/index', () => hot(import('./Worker'))),
hotModuleReload: (hot) =>
import.meta.webpackHot && import.meta.webpackHot.accept('./Worker', () => hot(import('./Worker'))),
},
})
4 changes: 2 additions & 2 deletions packages/plugin-infra/src/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export namespace Plugin {
* ```ts
* const loader = {
* load: () => import('./code'),
* hotModuleReload: hot => import.meta.webpackHot?.accept('./code', () => hot(import('./code')))
* hotModuleReload: hot => import.meta.webpackHot && import.meta.webpackHot.accept('./code', () => hot(import('./code')))
* }
* ```
*
Expand All @@ -32,7 +32,7 @@ export namespace Plugin {
/**
* This provides the functionality for hot module reload on the plugin.
* When the callback is called, the old instance of the plugin will be unloaded, then the new instance will be init.
* @example hotModuleReload: hot => import.meta.webpackHot?.accept('./path', () => hot(import('./path')))
* @example hotModuleReload: hot => import.meta.webpackHot && import.meta.webpackHot.accept('./path', () => hot(import('./path')))
*/
hotModuleReload(onHot: (hot: Promise<{ default: DeferredModule }>) => void): void
}
Expand Down
8 changes: 5 additions & 3 deletions packages/plugins/example/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,16 @@ registerPlugin({
SNSAdaptor: {
load: () => import('./SNSAdaptor'),
hotModuleReload: (hot) =>
import.meta.webpackHot?.accept('./SNSAdaptor/index', () => hot(import('./SNSAdaptor'))),
import.meta.webpackHot && import.meta.webpackHot.accept('./SNSAdaptor', () => hot(import('./SNSAdaptor'))),
},
Dashboard: {
load: () => import('./Dashboard'),
hotModuleReload: (hot) => import.meta.webpackHot?.accept('./Dashboard/index', () => hot(import('./Dashboard'))),
hotModuleReload: (hot) =>
import.meta.webpackHot && import.meta.webpackHot.accept('./Dashboard', () => hot(import('./Dashboard'))),
},
Worker: {
load: () => import('./Worker'),
hotModuleReload: (hot) => import.meta.webpackHot?.accept('./Worker/index', () => hot(import('./Worker'))),
hotModuleReload: (hot) =>
import.meta.webpackHot && import.meta.webpackHot.accept('./Worker', () => hot(import('./Worker'))),
},
})