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

Nextjs: Fix v13.5.x #24453

Merged
merged 15 commits into from
Oct 12, 2023
Merged

Nextjs: Fix v13.5.x #24453

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
11aeb97
Readd Angular 17 prerelease sandbox
valentinpalkovic Oct 12, 2023
4c43bc5
Add Next.js Canary sandbox
valentinpalkovic Oct 12, 2023
2a8ab8e
Fix CircleCI parallelism
valentinpalkovic Oct 12, 2023
99382b9
Temporarily change ref branch in generate-sandboxes-next.yml
valentinpalkovic Oct 12, 2023
20e69a6
Add inDevelopment for Next.js Prerelease sandbox
valentinpalkovic Oct 12, 2023
8c0453e
Fix creating Nextjs Sandbox
valentinpalkovic Oct 12, 2023
296202b
Temporarily only create angular/prerelease and nextjs/prerelease sand…
valentinpalkovic Oct 12, 2023
10f11ed
Generate all sandboxes again
valentinpalkovic Oct 12, 2023
6da3c0d
Fix Next.js canary
valentinpalkovic Oct 12, 2023
3c0f77a
Fix parallelism config for CircleCI
valentinpalkovic Oct 12, 2023
62e4b47
Revert ref in genreate-sandboxes-next.yml
valentinpalkovic Oct 12, 2023
66b15ff
Update code/frameworks/nextjs/src/dependency-map.ts
valentinpalkovic Oct 12, 2023
c8ec3a6
Fix Next.js 12
valentinpalkovic Oct 12, 2023
eb52b37
Fix Next.js default sandboxes
valentinpalkovic Oct 12, 2023
74bd3b0
Fix Next.js 12
valentinpalkovic Oct 12, 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
10 changes: 5 additions & 5 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,30 +609,30 @@ workflows:
requires:
- build
- create-sandboxes:
parallelism: 34
parallelism: 35
requires:
- build
# - smoke-test-sandboxes: # disabled for now
# requires:
# - create-sandboxes
- build-sandboxes:
parallelism: 34
parallelism: 35
requires:
- create-sandboxes
- chromatic-sandboxes:
parallelism: 31
parallelism: 32
requires:
- build-sandboxes
- e2e-production:
parallelism: 31
parallelism: 32
requires:
- build-sandboxes
- e2e-dev:
parallelism: 4
requires:
- create-sandboxes
- test-runner-production:
parallelism: 31
parallelism: 32
requires:
- build-sandboxes
# TODO: reenable once we find out the source of flakyness
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/generate-sandboxes-main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
run: yarn wait-on http://localhost:6001
working-directory: ./code
- name: Generate
run: yarn generate-sandboxes --local-registry --exclude=angular-cli/prerelease
run: yarn generate-sandboxes --local-registry
working-directory: ./code
- name: Publish
run: yarn publish-sandboxes --remote=https://storybook-bot:${{ secrets.PAT_STORYBOOK_BOT}}@github.com/storybookjs/sandboxes.git --push --branch=main
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/generate-sandboxes-next.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
steps:
- uses: actions/checkout@v3
with:
ref: next
ref: valentin/setup-sandboxes
valentinpalkovic marked this conversation as resolved.
Show resolved Hide resolved
- uses: actions/setup-node@v3
with:
node-version-file: '.nvmrc'
Expand All @@ -43,7 +43,7 @@ jobs:
run: yarn wait-on http://localhost:6001
working-directory: ./code
- name: Generate
run: yarn generate-sandboxes --local-registry --exclude=angular-cli/prerelease --debug
run: yarn generate-sandboxes --local-registry --debug
working-directory: ./code
- name: Publish
run: yarn publish-sandboxes --remote=https://storybook-bot:${{ secrets.PAT_STORYBOOK_BOT}}@github.com/storybookjs/sandboxes.git --push --branch=next
Expand Down
15 changes: 13 additions & 2 deletions code/lib/cli/src/sandbox-templates.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,17 @@ const baseTemplates = {
},
skipTasks: ['e2e-tests-dev', 'bench'],
},
'nextjs/prerelease': {
name: 'Next.js Prerelease (Webpack | TypeScript)',
script: 'npx create-next-app@canary {{beforeDir}} --typescript --eslint',
expected: {
framework: '@storybook/nextjs',
renderer: '@storybook/react',
builder: '@storybook/builder-webpack5',
},
skipTasks: ['e2e-tests-dev', 'bench'],
inDevelopment: true,
},
'react-vite/default-js': {
name: 'React Latest (Vite | JavaScript)',
script: 'npm create vite@latest --yes {{beforeDir}} -- --template react',
Expand Down Expand Up @@ -586,8 +597,7 @@ export const merged: TemplateKey[] = [
];
export const daily: TemplateKey[] = [
...merged,
// TODO: Should be re-added after we merge this PR: https://github.com/storybookjs/storybook/pull/24188
// 'angular-cli/prerelease',
'angular-cli/prerelease',
'cra/default-js',
'react-vite/default-js',
'vue3-vite/default-js',
Expand All @@ -598,6 +608,7 @@ export const daily: TemplateKey[] = [
'svelte-vite/default-js',
'nextjs/12-js',
'nextjs/default-js',
'nextjs/prerelease',
'qwik-vite/default-ts',
'preact-webpack5/default-js',
'preact-vite/default-js',
Expand Down
1 change: 1 addition & 0 deletions scripts/sandbox/generate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,7 @@ export const generate = async ({
debug,
}: OptionValues<typeof options>) => {
const generatorConfigs = Object.entries(sandboxTemplates)
.filter(([key]) => key === 'nextjs/prerelease' || key === 'angular-cli/prerelease')
valentinpalkovic marked this conversation as resolved.
Show resolved Hide resolved
.map(([dirName, configuration]) => ({
dirName,
...configuration,
Expand Down