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

Enable @storybook/nextjs framework in CLI #19478

Merged
merged 8 commits into from
Oct 21, 2022
Merged

Enable @storybook/nextjs framework in CLI #19478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
68c763f
Add nextjs repros to ci
kylegach Oct 13, 2022
db31983
Enable `nextjs` detection in CLI
kylegach Oct 13, 2022
ab925cc
Merge branch 'nextjs-framework-support' into nextjs-framework-add-to-ci
yannbf Oct 20, 2022
76ee2fe
remove unnecessary mock
yannbf Oct 20, 2022
1de78c4
upgrade parallelism for nextjs example
yannbf Oct 20, 2022
7272953
Merge branch 'nextjs-framework-support' into nextjs-framework-add-to-ci
yannbf Oct 20, 2022
316aff4
fix parallelism
yannbf Oct 20, 2022
4bf683e
Merge branch 'nextjs-framework-support' into nextjs-framework-add-to-ci
yannbf Oct 21, 2022
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
12 changes: 6 additions & 6 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ jobs:
executor:
class: medium+
name: sb_node_16_browsers
parallelism: 22
parallelism: 24
steps:
- git-shallow-clone/checkout_advanced:
clone_options: '--depth 1 --verbose'
Expand All @@ -341,7 +341,7 @@ jobs:
executor:
class: medium+
name: sb_node_16_browsers
parallelism: 22
parallelism: 24
steps:
- git-shallow-clone/checkout_advanced:
clone_options: '--depth 1 --verbose'
Expand All @@ -356,7 +356,7 @@ jobs:
executor:
class: medium+
name: sb_node_16_browsers
parallelism: 22
parallelism: 24
steps:
- git-shallow-clone/checkout_advanced:
clone_options: '--depth 1 --verbose'
Expand All @@ -375,7 +375,7 @@ jobs:
executor:
class: medium+
name: sb_playwright
parallelism: 20
parallelism: 22
steps:
- git-shallow-clone/checkout_advanced:
clone_options: '--depth 1 --verbose'
Expand All @@ -390,7 +390,7 @@ jobs:
executor:
class: medium+
name: sb_node_16_browsers
parallelism: 22
parallelism: 24
steps:
- git-shallow-clone/checkout_advanced:
clone_options: '--depth 1 --verbose'
Expand All @@ -405,7 +405,7 @@ jobs:
executor:
class: medium+
name: sb_playwright
parallelism: 22
parallelism: 24
steps:
- git-shallow-clone/checkout_advanced:
clone_options: '--depth 1 --verbose'
Expand Down
4 changes: 0 additions & 4 deletions code/lib/cli/src/detect.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,10 +354,6 @@ describe('Detect', () => {

MOCK_FRAMEWORK_FILES.forEach((structure) => {
it(`${structure.name}`, () => {
// TODO: remove this once we fully enable nextjs framework in CI. @yannbf
if (structure.name === ProjectType.NEXTJS) {
process.env.STORYBOOK_REPRO_GENERATOR = 'true';
}
(fs.existsSync as jest.Mock).mockImplementation((filePath) => {
return Object.keys(structure.files).includes(filePath);
});
Expand Down
2 changes: 1 addition & 1 deletion code/lib/cli/src/project_types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ export const supportedTemplates: TemplateConfiguration[] = [
next: (versionRange) => eqMajor(versionRange, 9) || gtMajor(versionRange, 9),
},
matcherFunction: ({ dependencies }) => {
return process.env.STORYBOOK_REPRO_GENERATOR && dependencies.every(Boolean);
return dependencies.every(Boolean);
},
},
{
Expand Down
4 changes: 2 additions & 2 deletions code/lib/cli/src/repro-templates.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const nextjsTemplates = {
'nextjs/default-js': {
name: 'Next.js (JavaScript)',
script: 'npx create-next-app {{beforeDir}}',
cadence: [] as string[],
cadence: ['ci', 'daily', 'weekly'],
expected: {
framework: '@storybook/nextjs',
renderer: '@storybook/react',
Expand All @@ -39,7 +39,7 @@ const nextjsTemplates = {
'nextjs/default-ts': {
name: 'Next.js (TypeScript)',
script: 'npx create-next-app {{beforeDir}} --typescript',
cadence: [] as string[],
cadence: ['ci', 'daily', 'weekly'],
expected: {
framework: '@storybook/nextjs',
renderer: '@storybook/react',
Expand Down