Merge branch 'canary' into client-only-error

vercel · Feb 7, 2023 · 18acd4f · 18acd4f
2 parents 6319ce8 + 836ac9c
commit 18acd4f
Show file tree

Hide file tree

Showing 116 changed files with 1,127 additions and 495 deletions.
diff --git a/.github/workflows/build_test_deploy.yml b/.github/workflows/build_test_deploy.yml
@@ -73,7 +73,7 @@ jobs:
         run: echo STORE_PATH=$(pnpm store path) >> $GITHUB_OUTPUT
 
       - uses: actions/cache@v3
-        timeout-minutes: 2
+        timeout-minutes: 5
         id: cache-pnpm-store
         with:
           path: ${{ steps.get-store-path.outputs.STORE_PATH }}
@@ -102,7 +102,7 @@ jobs:
         run: echo "WEEK=$(date +%U)" >> $GITHUB_OUTPUT
 
       - uses: actions/cache@v3
-        timeout-minutes: 2
+        timeout-minutes: 5
         id: cache-build
         with:
           path: ./*
@@ -121,7 +121,7 @@ jobs:
       - run: npm i -g pnpm@${PNPM_VERSION}
 
       - uses: actions/cache@v3
-        timeout-minutes: 2
+        timeout-minutes: 5
         id: restore-build
         with:
           path: ./*
@@ -134,7 +134,7 @@ jobs:
     needs: build
     steps:
       - uses: actions/cache@v3
-        timeout-minutes: 2
+        timeout-minutes: 5
         id: restore-build
         if: ${{needs.build.outputs.docsChange == 'nope'}}
         with:
@@ -156,15 +156,15 @@ jobs:
 
       - name: Cache cargo registry
         uses: actions/cache@v3
-        timeout-minutes: 2
+        timeout-minutes: 5
         if: ${{ steps.swc-change.outputs.SWC_CHANGE == 'yup' }}
         with:
           path: ~/.cargo/registry
           key: stable-ubuntu-clippy-cargo-registry
 
       - name: Cache cargo index
         uses: actions/cache@v3
-        timeout-minutes: 2
+        timeout-minutes: 5
         if: ${{ steps.swc-change.outputs.SWC_CHANGE == 'yup' }}
         with:
           path: ~/.cargo/git
@@ -203,7 +203,7 @@ jobs:
         if: ${{needs.build.outputs.docsChange == 'nope'}}
 
       - uses: actions/cache@v3
-        timeout-minutes: 2
+        timeout-minutes: 5
         if: ${{needs.build.outputs.docsChange == 'nope'}}
         id: restore-build
         with:
@@ -240,7 +240,7 @@ jobs:
           check-latest: true
 
       - uses: actions/cache@v3
-        timeout-minutes: 2
+        timeout-minutes: 5
         if: ${{needs.build.outputs.docsChange == 'nope'}}
         id: restore-build
         with:
@@ -280,7 +280,7 @@ jobs:
         run: sudo ethtool -K eth0 tx off rx off
 
       - uses: actions/cache@v3
-        timeout-minutes: 2
+        timeout-minutes: 5
         if: ${{needs.build.outputs.docsChange == 'nope'}}
         id: restore-build
         with:
@@ -341,7 +341,7 @@ jobs:
         run: sudo ethtool -K eth0 tx off rx off
 
       - uses: actions/cache@v3
-        timeout-minutes: 2
+        timeout-minutes: 5
         if: ${{needs.build.outputs.docsChange == 'nope'}}
         id: restore-build
         with:
@@ -401,7 +401,7 @@ jobs:
         run: sudo ethtool -K eth0 tx off rx off
 
       - uses: actions/cache@v3
-        timeout-minutes: 2
+        timeout-minutes: 5
         if: ${{needs.build.outputs.docsChange == 'nope'}}
         id: restore-build
         with:
@@ -452,7 +452,7 @@ jobs:
         run: sudo ethtool -K eth0 tx off rx off
 
       - uses: actions/cache@v3
-        timeout-minutes: 2
+        timeout-minutes: 5
         if: ${{needs.build.outputs.docsChange == 'nope'}}
         id: restore-build
         with:
@@ -498,7 +498,7 @@ jobs:
         run: sudo ethtool -K eth0 tx off rx off
 
       - uses: actions/cache@v3
-        timeout-minutes: 2
+        timeout-minutes: 5
         if: ${{ needs.build.outputs.docsChange == 'nope' }}
         id: restore-build
         with:
@@ -574,7 +574,7 @@ jobs:
         run: sudo ethtool -K eth0 tx off rx off
 
       - uses: actions/cache@v3
-        timeout-minutes: 2
+        timeout-minutes: 5
         if: ${{needs.build.outputs.docsChange == 'nope'}}
         id: restore-build
         with:
@@ -630,7 +630,7 @@ jobs:
           check-latest: true
 
       - uses: actions/cache@v3
-        timeout-minutes: 2
+        timeout-minutes: 5
         if: ${{needs.build.outputs.docsChange == 'nope'}}
         id: restore-build
         with:
@@ -678,7 +678,7 @@ jobs:
       NEXT_TELEMETRY_DISABLED: 1
     steps:
       - uses: actions/cache@v3
-        timeout-minutes: 2
+        timeout-minutes: 5
         if: ${{needs.build.outputs.docsChange == 'nope'}}
         id: restore-build
         with:
@@ -707,7 +707,7 @@ jobs:
         run: sudo ethtool -K eth0 tx off rx off
 
       - uses: actions/cache@v3
-        timeout-minutes: 2
+        timeout-minutes: 5
         if: ${{needs.build.outputs.docsChange == 'nope'}}
         id: restore-build
         with:
@@ -732,7 +732,7 @@ jobs:
       NEXT_TELEMETRY_DISABLED: 1
     steps:
       - uses: actions/cache@v3
-        timeout-minutes: 2
+        timeout-minutes: 5
         if: ${{needs.build.outputs.docsChange == 'nope'}}
         id: restore-build
         with:
@@ -772,7 +772,7 @@ jobs:
         run: sudo ethtool -K eth0 tx off rx off
 
       - uses: actions/cache@v3
-        timeout-minutes: 2
+        timeout-minutes: 5
         id: restore-build
         with:
           path: ./*
@@ -803,7 +803,7 @@ jobs:
       VERCEL_TEST_TEAM: vtest314-next-e2e-tests
     steps:
       - uses: actions/cache@v3
-        timeout-minutes: 2
+        timeout-minutes: 5
         id: restore-build
         with:
           path: ./*
@@ -843,7 +843,7 @@ jobs:
           check-latest: true
 
       - uses: actions/cache@v3
-        timeout-minutes: 2
+        timeout-minutes: 5
         id: restore-build
         with:
           path: ./*
@@ -878,15 +878,15 @@ jobs:
 
       - name: Cache cargo registry
         uses: actions/cache@v3
-        timeout-minutes: 2
+        timeout-minutes: 5
         if: ${{ steps.docs-change.outputs.DOCS_CHANGE == 'nope' }}
         with:
           path: ~/.cargo/registry
           key: stable-ubuntu-latest-cargo-registry
 
       - name: Cache cargo index
         uses: actions/cache@v3
-        timeout-minutes: 2
+        timeout-minutes: 5
         if: ${{ steps.docs-change.outputs.DOCS_CHANGE == 'nope' }}
         with:
           path: ~/.cargo/git
@@ -899,7 +899,7 @@ jobs:
       - name: Turbo Cache
         id: turbo-cache
         uses: actions/cache@v3
-        timeout-minutes: 2
+        timeout-minutes: 5
         if: ${{ steps.docs-change.outputs.DOCS_CHANGE == 'nope' }}
         with:
           path: .turbo
@@ -987,7 +987,7 @@ jobs:
 
     steps:
       - uses: actions/cache@v3
-        timeout-minutes: 2
+        timeout-minutes: 5
         if: ${{needs.build.outputs.docsChange == 'nope'}}
         id: restore-build
         with:
@@ -1197,14 +1197,14 @@ jobs:
 
       - name: Cache cargo registry
         uses: actions/cache@v3
-        timeout-minutes: 2
+        timeout-minutes: 5
         with:
           path: ~/.cargo/registry
           key: ${{ matrix.settings.target }}-cargo-registry
 
       - name: Cache cargo index
         uses: actions/cache@v3
-        timeout-minutes: 2
+        timeout-minutes: 5
         with:
           path: ~/.cargo/git
           key: ${{ matrix.settings.target }}-cargo-index
@@ -1383,7 +1383,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/cache@v3
-        timeout-minutes: 2
+        timeout-minutes: 5
         if: ${{needs.build.outputs.docsChange == 'nope'}}
         id: restore-build
         with:
@@ -1411,7 +1411,7 @@ jobs:
       - name: Turbo Cache
         id: turbo-cache
         uses: actions/cache@v3
-        timeout-minutes: 2
+        timeout-minutes: 5
         if: ${{needs.build.outputs.docsChange == 'nope'}}
         with:
           path: .turbo
@@ -1471,7 +1471,7 @@ jobs:
           check-latest: true
 
       - uses: actions/cache@v3
-        timeout-minutes: 2
+        timeout-minutes: 5
         id: restore-build
         if: ${{needs.build.outputs.docsChange == 'nope'}}
         with:

diff --git a/.github/workflows/pull_request_stats.yml b/.github/workflows/pull_request_stats.yml
@@ -29,15 +29,15 @@ jobs:
 
       - name: Cache cargo registry
         uses: actions/cache@v3
-        timeout-minutes: 2
+        timeout-minutes: 5
         if: ${{ steps.docs-change.outputs.DOCS_CHANGE == 'nope' }}
         with:
           path: ~/.cargo/registry
           key: stable-ubuntu-latest-node@14-cargo-registry-trimmed-${{ hashFiles('**/Cargo.lock') }}
 
       - name: Cache cargo index
         uses: actions/cache@v3
-        timeout-minutes: 2
+        timeout-minutes: 5
         if: ${{ steps.docs-change.outputs.DOCS_CHANGE == 'nope' }}
         with:
           path: ~/.cargo/git
@@ -50,7 +50,7 @@ jobs:
       - name: Turbo Cache
         id: turbo-cache
         uses: actions/cache@v3
-        timeout-minutes: 2
+        timeout-minutes: 5
         if: ${{ steps.docs-change.outputs.DOCS_CHANGE == 'nope' }}
         with:
           path: .turbo
@@ -65,7 +65,7 @@ jobs:
       # So we get latest cache
       - name: Cache built files
         uses: actions/cache@v3
-        timeout-minutes: 2
+        timeout-minutes: 5
         with:
           path: ./packages/next-target
           key: next-swc-cargo-cache-ubuntu-latest--${{ hashFiles('**/Cargo.lock') }}

diff --git a/docs/basic-features/script.md b/docs/basic-features/script.md
@@ -143,7 +143,7 @@ There are a number of trade-offs that need to be considered when loading a third
 Inline scripts, or scripts not loaded from an external file, are also supported by the Script component. They can be written by placing the JavaScript within curly braces:
 
 ```jsx
-<Script id="show-banner">
+<Script id="show-banner" strategy="afterInteractive">
   {`document.getElementById('banner').classList.remove('hidden')`}
 </Script>
 ```
@@ -153,6 +153,7 @@ Or by using the `dangerouslySetInnerHTML` property:
 ```jsx
 <Script
   id="show-banner"
+  strategy="afterInteractive"
   dangerouslySetInnerHTML={{
     __html: `document.getElementById('banner').classList.remove('hidden')`,
   }}

diff --git a/examples/cms-kontent/.env.local.example → examples/cms-kontent-ai/.env.local.example b/examples/cms-kontent/.env.local.example → examples/cms-kontent-ai/.env.local.example
@@ -1,3 +1,3 @@
-KONTENT_PROJECT_ID=
-KONTENT_PREVIEW_SECRET=
+KONTENT_PROJECT_ID=
+KONTENT_PREVIEW_SECRET=
 KONTENT_PREVIEW_API_KEY=
diff --git a/examples/cms-kontent/.gitignore → examples/cms-kontent-ai/.gitignore b/examples/cms-kontent/.gitignore → examples/cms-kontent-ai/.gitignore