Skip to content
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

Jump to bottom

only connect to serverChannel in development mode #22575

Merged
merged 3 commits into from
May 22, 2023
Merged

only connect to serverChannel in development mode #22575

merged 3 commits into from
May 22, 2023

Conversation

ndelangen
Copy link
Member

What I did

I made it so the manager frame only attempts to connect to the serverChannel in development-mode.

@ndelangen ndelangen requested review from tmeasday and yannbf May 16, 2023 13:17
@ndelangen ndelangen self-assigned this May 16, 2023
@ndelangen ndelangen added bug patch:yes Bugfix & documentation PR that need to be picked to main branch builder-manager labels May 16, 2023
tmeasday
tmeasday reviewed May 17, 2023
View reviewed changes
Copy link
Member

@tmeasday tmeasday left a comment

Choose a reason for hiding this comment

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

LGTM. What about the preview side?

@ndelangen
Copy link
Member Author

@tmeasday here's what I could find:

storybook/code/lib/builder-vite/src/codegen-set-addon-channel.ts

Line 11 in d760a5a

const serverChannel = createWebSocketChannel({});

storybook/code/lib/builder-webpack5/templates/virtualModuleModernEntry.js.handlebars

Lines 15 to 17 in d760a5a

const serverChannel = createWebSocketChannel({});
addons.setServerChannel(serverChannel);
window.__STORYBOOK_SERVER_CHANNEL__ = serverChannel;

These 2 places seem unguarded indeed.

@ndelangen ndelangen requested a review from tmeasday May 19, 2023 07:05
tmeasday
tmeasday reviewed May 21, 2023
View reviewed changes
Copy link
Member

@tmeasday tmeasday left a comment

Choose a reason for hiding this comment

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

OK, LGTM

tmeasday
tmeasday approved these changes May 21, 2023
View reviewed changes
Copy link
Member

@tmeasday tmeasday left a comment

Choose a reason for hiding this comment

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

OK, LGTM

@ndelangen ndelangen merged commit 28f8733 into next May 22, 2023
@ndelangen ndelangen deleted the norbert/serverchannel-manager-fix branch May 22, 2023 11:34
@shilman shilman added the patch:done Patch/release PRs already cherry-picked to main/release branch label May 22, 2023
shilman pushed a commit that referenced this pull request May 22, 2023
@ndelangen @shilman
Merge pull request #22575 from storybookjs/norbert/serverchannel-mana…
2aef693 
…ger-fix

only connect to serverChannel in development mode
@shilman shilman mentioned this pull request May 22, 2023
Merged
@shilman shilman removed the patch:done Patch/release PRs already cherry-picked to main/release branch label May 22, 2023
shilman added a commit that referenced this pull request May 22, 2023
@shilman
Revert "Merge pull request #22575 from storybookjs/norbert/serverchan…
9a3353d 
…nel-manager-fix"

This reverts commit 2aef693.
shilman pushed a commit that referenced this pull request May 23, 2023
@ndelangen @shilman
Merge pull request #22575 from storybookjs/norbert/serverchannel-mana…
ad50f72 
…ger-fix

only connect to serverChannel in development mode
@shilman shilman mentioned this pull request May 23, 2023
Merged
@shilman shilman added the patch:done Patch/release PRs already cherry-picked to main/release branch label May 23, 2023
@dannyhw dannyhw mentioned this pull request Feb 5, 2024
Merged
8 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tmeasday tmeasday tmeasday approved these changes

@yannbf yannbf Awaiting requested review from yannbf

Assignees

@ndelangen ndelangen

Labels
bug builder-manager patch:done Patch/release PRs already cherry-picked to main/release branch patch:yes Bugfix & documentation PR that need to be picked to main branch
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ndelangen @tmeasday @shilman