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.

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

add TS support for storybook preview tsx config extension #9309

Merged
merged 27 commits into from
Dec 25, 2023
Merged
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
120702e
feat: update storybook paths
bnn1 Oct 5, 2023
d5b9929
Merge branch 'main' of github.com:bnn1/redwood into 9118/storybook-ts…
bnn1 Oct 5, 2023
26cb17f
feat: create storybook tsx templates
bnn1 Oct 5, 2023
737feba
feat: update storybook template paths
bnn1 Oct 5, 2023
2fabf18
feat: remove storybook js templates
bnn1 Oct 5, 2023
2ca7f25
Merge branch 'main' of github.com:bnn1/redwood into 9118/storybook-ts…
bnn1 Oct 17, 2023
a20e396
feat: add support for ts/tsx files
bnn1 Oct 17, 2023
3953f32
feat: use tsx storybook template
bnn1 Oct 17, 2023
a373973
feat: read tsx storybook preview config if the project is ts
bnn1 Oct 17, 2023
1e3bf75
fix: failing tests
bnn1 Oct 18, 2023
1904f2a
revert: ts support for storybook manager and config files
bnn1 Oct 18, 2023
b57d724
Merge branch 'redwoodjs:main' into 9118/storybook-tsx-support
bnn1 Oct 18, 2023
19b6d79
Merge branch 'main' of github.com:bnn1/redwood into 9118/storybook-ts…
bnn1 Oct 18, 2023
8a292c0
revert: type annotations for js storybook preview files
bnn1 Oct 18, 2023
bc74dcf
Merge branch '9118/storybook-tsx-support' of github.com:bnn1/redwood …
bnn1 Oct 18, 2023
3f713a4
Merge branch 'main' of github.com:bnn1/redwood into 9118/storybook-ts…
bnn1 Nov 6, 2023
40aabfd
feat: include 'config' directory in web tsconfig
bnn1 Nov 6, 2023
a476d18
fix: regenerate fixtures, crwa, fix comment type
bnn1 Nov 6, 2023
2c5e9d0
fix: add backward compatibility for ts users
bnn1 Nov 7, 2023
6e124df
Merge branch 'main' of github.com:bnn1/redwood into 9118/storybook-ts…
bnn1 Dec 1, 2023
36a0323
fix: pr
bnn1 Dec 2, 2023
de828f0
fix: failing tests
bnn1 Dec 2, 2023
44bdd24
Merge branch 'main' into 9118/storybook-tsx-support
dac09 Dec 5, 2023
b1926bb
Merge branch 'redwoodjs:main' into 9118/storybook-tsx-support
bnn1 Dec 24, 2023
79ef0f0
fix: pr suggestions
bnn1 Dec 24, 2023
a0f91f6
feat: jsx/tsx/ts merge tests
bnn1 Dec 24, 2023
a91cc77
Merge branch 'main' into 9118/storybook-tsx-support
dac09 Dec 25, 2023
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
Prev Previous commit
Next Next commit
fix: failing tests
bnn1 committed Dec 2, 2023
commit de828f00af01bad9e2a72ea8474cf3152dab1201
28 changes: 4 additions & 24 deletions packages/project-config/src/__tests__/paths.test.ts
Original file line number Diff line number Diff line change
@@ -131,12 +131,7 @@ describe('paths', () => {
'config',
'storybook.config.js'
),
storybookPreviewConfig: path.join(
FIXTURE_BASEDIR,
'web',
'config',
'storybook.preview'
),
storybookPreviewConfig: null,
storybookManagerConfig: path.join(
FIXTURE_BASEDIR,
'web',
@@ -411,12 +406,7 @@ describe('paths', () => {
'config',
'storybook.config.js'
),
storybookPreviewConfig: path.join(
FIXTURE_BASEDIR,
'web',
'config',
'storybook.preview'
),
storybookPreviewConfig: null,
storybookManagerConfig: path.join(
FIXTURE_BASEDIR,
'web',
@@ -737,12 +727,7 @@ describe('paths', () => {
'config',
'storybook.config.js'
),
storybookPreviewConfig: path.join(
FIXTURE_BASEDIR,
'web',
'config',
'storybook.preview'
),
storybookPreviewConfig: null,
storybookManagerConfig: path.join(
FIXTURE_BASEDIR,
'web',
@@ -1020,12 +1005,7 @@ describe('paths', () => {
'config',
'storybook.config.js'
),
storybookPreviewConfig: path.join(
FIXTURE_BASEDIR,
'web',
'config',
'storybook.preview'
),
storybookPreviewConfig: null,
storybookManagerConfig: path.join(
FIXTURE_BASEDIR,
'web',