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

Add handling for static generation in app #40561

Merged
merged 9 commits into from Sep 19, 2022
Merged

Add handling for static generation in app #40561

merged 9 commits into from Sep 19, 2022

Commits on Sep 14, 2022

  1. Add handling for static generation in app

    @ijjk
    ijjk committed Sep 14, 2022
    Copy the full SHA
    a4e01ce View commit details
    Browse the repository at this point in the history

  2. update test

    @ijjk
    ijjk committed Sep 14, 2022
    Copy the full SHA
    a382f24 View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2022

  1. Merge branch 'canary' into feat/app-static-generation 

    # Conflicts:
#	packages/next/server/app-render.tsx
    @ijjk
    ijjk committed Sep 15, 2022
    Copy the full SHA
    3a9a75e View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2022

  1. Merge branch 'canary' into feat/app-static-generation

    @ijjk
    ijjk committed Sep 16, 2022
    Copy the full SHA
    1affb8f View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2022

  1. Add additional tests and ensure dev behavior matches

    @ijjk
    ijjk committed Sep 17, 2022
    Copy the full SHA
    e582c3a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'canary' into feat/app-static-generation

    @ijjk
    ijjk committed Sep 17, 2022
    Copy the full SHA
    6edba02 View commit details
    Browse the repository at this point in the history

  3. fix lint

    @ijjk
    ijjk committed Sep 17, 2022
    Copy the full SHA
    974be76 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2022

  1. Merge branch 'canary' into feat/app-static-generation 

    # Conflicts:
#	packages/next/build/index.ts
#	packages/next/server/app-render.tsx
#	test/e2e/app-dir/app-rendering/app/getserversideprops-only/layout.js
#	test/e2e/app-dir/app-rendering/app/getserversideprops-only/nested/page.js
#	test/e2e/app-dir/app-rendering/app/getserversideprops-only/slow/layout.js
#	test/e2e/app-dir/app-rendering/app/getserversideprops-only/slow/page.js
#	test/e2e/app-dir/app-rendering/app/getstaticprops-getserversideprops-combined/nested/layout.js
#	test/e2e/app-dir/app-rendering/app/getstaticprops-getserversideprops-combined/nested/page.js
#	test/e2e/app-dir/app-rendering/app/getstaticprops-getserversideprops-combined/slow/layout.js
#	test/e2e/app-dir/app-rendering/app/getstaticprops-getserversideprops-combined/slow/page.js
#	test/e2e/app-dir/app-rendering/app/getstaticprops-isr-multiple/layout.js
#	test/e2e/app-dir/app-rendering/app/getstaticprops-isr-multiple/nested/page.js
#	test/e2e/app-dir/app-rendering/app/getstaticprops-only/layout.js
#	test/e2e/app-dir/app-rendering/app/getstaticprops-only/nested/page.js
#	test/e2e/app-dir/app-rendering/app/getstaticprops-only/slow/layout.js
#	test/e2e/app-dir/app-rendering/app/getstaticprops-only/slow/page.js
#	test/e2e/app-dir/app/pages/api/preview.js
    @ijjk
    ijjk committed Sep 19, 2022
    Copy the full SHA
    368351c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'canary' into feat/app-static-generation

    @ijjk
    ijjk committed Sep 19, 2022
    Copy the full SHA
    16c4c78 View commit details
    Browse the repository at this point in the history