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

Reverse Merge #1

Merged
merged 1,028 commits into from
Nov 2, 2022
Merged

Reverse Merge #1

merged 1,028 commits into from
Nov 2, 2022

Conversation

sriram-km
Copy link
Owner

Issue:

What I did

How to test

  • Is this testable with Jest or Chromatic screenshots?
  • Does this need a new example in the kitchen sink apps?
  • Does this need an update to the documentation?

If your answer is yes to any of these, please make sure to include it in your PR.

kasperpeulen and others added 30 commits October 25, 2022 14:32
@kasperpeulen
Rollback vue.extends for safety
68f9bd7
@kasperpeulen
fix deepscan
5f1e77c
@kasperpeulen
Merge pull request #19602 from storybookjs/future/CSF3-vue3
7bcf944 
Vue3: Improve CSF3 types
@ndelangen
fixes, revert throwing an error after consulting with shilman
876eef5
@JReinhold
Merge branch 'next' of github.com:storybookjs/storybook into jeppe/sb…
fcf92c1 
…-604-chromatic-for-ssb
@ndelangen
remove the throw or the error
a3687d5
@JReinhold
Merge pull request #19619 from storybookjs/jeppe/sb-604-chromatic-for…
1bd3336 
…-ssb
@ndelangen
fix
c5c575e
@kasperpeulen
Merge remote-tracking branch 'origin/next' into future/CSF3-vue2
4e6ed75
@ndelangen
Merge pull request #19553 from storybookjs/deprecate/remaining-lib-cli
ec0f15f 
final few deprecations removal in a batch
@ndelangen
Merge branch 'deprecate/remaining-lib-cli' into norbert/sb-799-create…
0194680 
…-a-storybooktypes
@ndelangen
Merge branch 'next' into norbert/sb-799-create-a-storybooktypes
bc19711
@kasperpeulen
Merge pull request #19603 from storybookjs/future/CSF3-vue2
065bd82 
Vue2: Improve CSF3 types
@ndelangen
Merge branch 'next' into norbert/sb-799-create-a-storybooktypes
113ee50
@dannyhw
fix: register should be used instead of manager
68cbcb7 
React native's stable version uses 5.3 where register is still the correct import
@ndelangen
Merge pull request #19580 from storybookjs/norbert/sb-799-create-a-st…
65957e6 
…orybooktypes

Future - restructure storybook types
@ndelangen
Merge branch 'next' into norbert/sb-799-create-a-storybooktypes-cleanup
0961a23
@ndelangen
fixes
d32d484
@ndelangen
sorting imports
a6a0452
@ndelangen
cleanup
6bb0752
@JReinhold
add blocksOnly configuration to SB4SB
4b76534
@shilman
Merge pull request #19620 from storybookjs/react-native-cli-template-…
a578aa7 
…register

CLI/React native: Fix addons template to import register instead of manager
@tmeasday
Ensure v6 store works even with no explicit renderer
ad444a3
@tmeasday
Update code/lib/core-common/src/utils/get-renderer-name.ts
1c91324
@tmeasday
Merge pull request #19624 from storybookjs/tom/sb-879-fix-v6-angulare…
82e91db 
…mber-support

Ensure v6 store works even with no explicit renderer
@tmeasday
Handle tags in prepareStory and add to index generated from facade
15a68c5
@tmeasday
Add tag story
2911f55
@tmeasday
Add tags to manager type
0385965
@tmeasday
Add story | docs tags to all entries
3a1a90a
@shilman
CSF tools: Add tags support
1593be6
JReinhold and others added 29 commits October 31, 2022 15:25
@JReinhold
Merge pull request #19688 from kqito/next
cecc4f9
@shilman
Fix csf-plugin to load "pre" & async for perf
d0cddf5
@shilman
CSF-tools: Fix parameters merge for enrichCsf
ec5dc1c
@shilman
CsfPlugin: Fix options handling, add tests
ffc9553
@shilman
Fix typo [ci skip]
789a21b
@yannbf
Merge pull request #19383 from storybookjs/vite/base-config
e568418 
Vite: Set default `base` for subfolder deployments
@shilman
Merge pull request #19673 from konsalex/patch-1
66346bb 
future tag to next
@shilman
Rename ci to ci-tests [ci skip]
86376b3
@shilman
Merge pull request #19664 from storybookjs/kasper/cli-templates
f02422a 
CLI: Move all templates out of cli into renderers
@shilman
Merge pull request #19665 from storybookjs/kasper/templates-to-csf3
bf5ec56 
CLI: Migrate CLI templates to CSF3
@shilman
Fix comment [ci skip]
5954bd8
@shilman
Merge pull request #19684 from storybookjs/shilman/csf-plugin-docgen-…
75f1cb6 
…description

CSF-tools: Turn story comments into docs descriptions
@shilman
Fix deepscan [ci skip]
498aa5f
@shilman
Merge pull request #19680 from storybookjs/shilman/csf-plugin
e8427c9 
Addon-docs: Replace source-loader with csf-plugin
@shilman
7.0.0-alpha.47 changelog
1fcd568
@shilman
Update root, peer deps, version.ts/json to 7.0.0-alpha.47 [ci skip]
aba7964
@shilman
v7.0.0-alpha.47
1c706a4
@shilman
Update git head to 7.0.0-alpha.47, update yarn.lock [ci skip]
93e154b
@shilman
7.0.0-alpha.47 next.json version file [skip ci]
0f5575c
@SebastianKapunkt
vue-webpack-5 Add babel loader 9.0.0 and up to peer dependencies
04a16c3
@IanVS
Merge pull request #19670 from storybookjs/eslint-unignores
1dab163 
Cleanup: Un-ignore some files from eslint
@ndelangen
Merge pull request #19658 from pankali/patch-1
5a3d1e2 
Update Code of Conduct to Contributor Covenant v2.1
@shilman
Fix typo
92e354f
@shilman
Merge branch 'next' of github.com:storybookjs/storybook into next
87d463e
@IanVS
Expose ReactFramework type
0e0d6e6
@shilman
Merge pull request #19697 from SebastianKapunkt/vue-webpack-5-babel
aeaced7 
Vue: Add babel loader 9.0.0 to vue-webpack5 peer dependencies
@shilman
Build: Re-enable test-runner for vue-cli
f645906
@shilman
Merge pull request #19706 from storybookjs/shilman/19453-fix-vue-test…
02623ae 
…-runner

Build: Re-enable test-runner for vue-cli
@kasperpeulen
Merge pull request #19704 from storybookjs/export-react-framework
426c6c0 
React: Expose ReactFramework type
@sriram-km sriram-km merged commit 95802b0 into sriram-km:sri-ram-contribution Nov 2, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone