Merge branch 'main' into mk/rsc-no-isr

Author: ascorbic

.github/workflows/test-deno.yml

@@ -0,0 +1,21 @@
+name: Deno tests
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Git Checkout Deno Module
+        uses: actions/checkout@v2
+      - name: Use Deno Version ${{ matrix.deno-version }}
+        uses: denolib/setup-deno@v2
+        with:
+          deno-version: vx.x.x
+      - name: Test Deno
+        run: deno test packages/runtime/src/templates/edge-shared/

.release-please-manifest.json

@@ -1,4 +1,4 @@
 {
-  "packages/runtime": "4.29.4",
+  "packages/runtime": "4.30.0",
   "packages/next": "1.4.3"
 }

cypress/integration/middleware/enhanced.spec.ts

@@ -1,16 +1,4 @@
 describe('Enhanced middleware', () => {
-  it('adds request headers', () => {
-    cy.request('/api/hello').then((response) => {
-      expect(response.body).to.have.nested.property('headers.x-hello', 'world')
-    })
-  })
-
-  it('adds request headers to a rewrite', () => {
-    cy.request('/headers').then((response) => {
-      expect(response.body).to.have.nested.property('headers.x-hello', 'world')
-    })
-  })
-
   it('rewrites the response body', () => {
     cy.visit('/static')
     cy.get('#message').contains('This was static but has been transformed in')

cypress/integration/middleware/standard.spec.ts

@@ -1,4 +1,16 @@
 describe('Standard middleware', () => {
+  it('adds request headers', () => {
+    cy.request('/api/hello').then((response) => {
+      expect(response.body).to.have.nested.property('headers.x-hello', 'world')
+    })
+  })
+
+  it('adds request headers to a rewrite', () => {
+    cy.request('/headers').then((response) => {
+      expect(response.body).to.have.nested.property('headers.x-hello', 'world')
+    })
+  })
+
   it('rewrites to internal page', () => {
     // preview mode is off by default
     cy.visit('/shows/rewriteme')

demos/default/pages/api/shows/[...params].js

@@ -10,7 +10,7 @@ export default async (req, res) => {
   const id = params[0]
 
   // Get the data
-  const fetchRes = await fetch(`https://api.tvmaze.com/shows/${id}`)
+  const fetchRes = await fetch(`https://tvproxy.netlify.app/shows/${Number(id)}`)
   const data = await fetchRes.json()
 
   // If show was found, return it

demos/default/pages/api/shows/[id].js

@@ -7,7 +7,7 @@ export default async (req, res) => {
   const { id } = query
 
   // Get the data
-  const fetchRes = await fetch(`https://api.tvmaze.com/shows/${id}`)
+  const fetchRes = await fetch(`https://tvproxy.netlify.app/shows/${Number(id)}`)
   const data = await fetchRes.json()
 
   // If show was found, return it

demos/default/pages/deep/import.js

@@ -25,7 +25,7 @@ const Show = ({ show }) => (
 )
 
 export const getServerSideProps = async ({ params }) => {
-  const res = await fetch('https://api.tvmaze.com/shows/42')
+  const res = await fetch('https://tvproxy.netlify.app/shows/42')
   const data = await res.json()
 
   return {

demos/default/pages/getServerSideProps/[id].js

@@ -34,7 +34,7 @@ export const getServerSideProps = async ({ params }) => {
   // The ID to render
   const { id } = params
 
-  const res = await fetch(`https://api.tvmaze.com/shows/${id}`)
+  const res = await fetch(`https://tvproxy.netlify.app/shows/${Number(id)}`)
   const data = await res.json()
 
   // Set error code if show item could not be found

demos/default/pages/getServerSideProps/all/[[...slug]].js

@@ -34,7 +34,7 @@ export const getServerSideProps = async ({ params }) => {
   // The ID to render
   const { slug } = params
 
-  const res = await fetch(`https://api.tvmaze.com/shows/${slug[0]}`)
+  const res = await fetch(`https://tvproxy.netlify.app/shows/${Number(slug[0])}`)
   const data = await res.json()
 
   // Set error code if show item could not be found

demos/default/pages/getServerSideProps/static.js

@@ -22,7 +22,7 @@ const Show = ({ show }) => (
 )
 
 export const getServerSideProps = async ({ params }) => {
-  const res = await fetch('https://api.tvmaze.com/shows/42')
+  const res = await fetch('https://tvproxy.netlify.app/shows/42')
   const data = await res.json()
 
   return {

demos/default/pages/getStaticProps/[id].js

@@ -28,7 +28,7 @@ export async function getStaticProps({ params }) {
   // The ID to render
   const { id } = params
 
-  const res = await fetch(`https://api.tvmaze.com/shows/${id}`)
+  const res = await fetch(`https://tvproxy.netlify.app/shows/${Number(id)}`)
   const data = await res.json()
   const time = new Date().toLocaleTimeString()
 

demos/default/pages/getStaticProps/static.js

@@ -16,7 +16,7 @@ const Show = ({ show }) => (
 )
 
 export async function getStaticProps(context) {
-  const res = await fetch(`https://api.tvmaze.com/shows/71`)
+  const res = await fetch(`https://tvproxy.netlify.app/shows/71`)
   const data = await res.json()
 
   return {

demos/default/pages/getStaticProps/with-revalidate.js

@@ -16,7 +16,7 @@ const Show = ({ show }) => (
 )
 
 export async function getStaticProps(context) {
-  const res = await fetch(`https://api.tvmaze.com/shows/71`)
+  const res = await fetch(`https://tvproxy.netlify.app/shows/71`)
   const data = await res.json()
 
   return {

demos/default/pages/getStaticProps/withFallback/[...slug].js

@@ -42,7 +42,7 @@ export async function getStaticProps({ params }) {
   const { slug } = params
   const id = slug[slug.length - 1]
 
-  const res = await fetch(`https://api.tvmaze.com/shows/${id}`)
+  const res = await fetch(`https://tvproxy.netlify.app/shows/${Number(id)}`)
   const data = await res.json()
   const time = new Date().toLocaleTimeString()
 

demos/default/pages/getStaticProps/withFallback/[id].js

@@ -41,7 +41,7 @@ export async function getStaticProps({ params }) {
   // The ID to render
   const { id } = params
 
-  const res = await fetch(`https://api.tvmaze.com/shows/${id}`)
+  const res = await fetch(`https://tvproxy.netlify.app/shows/${Number(id)}`)
   const data = await res.json()
   const time = new Date().toLocaleTimeString()
 

demos/default/pages/getStaticProps/withFallbackBlocking/[id].js

@@ -30,7 +30,7 @@ export async function getStaticProps({ params }) {
   // The ID to render
   const { id } = params
 
-  const res = await fetch(`https://api.tvmaze.com/shows/${id}`)
+  const res = await fetch(`https://tvproxy.netlify.app/shows/${Number(id)}`)
   const data = await res.json()
   const time = new Date().toLocaleTimeString()
 

demos/default/pages/getStaticProps/withRevalidate/[id].js

@@ -29,7 +29,7 @@ export async function getStaticProps({ params }) {
   // The ID to render
   const { id } = params
 
-  const res = await fetch(`https://api.tvmaze.com/shows/${id}`)
+  const res = await fetch(`https://tvproxy.netlify.app/shows/${Number(id)}`)
   const data = await res.json()
   const time = new Date().toLocaleTimeString()
 

demos/default/pages/getStaticProps/withRevalidate/withFallback/[id].js

@@ -42,7 +42,7 @@ export async function getStaticProps({ params }) {
   // The ID to render
   const { id } = params
 
-  const res = await fetch(`https://api.tvmaze.com/shows/${id}`)
+  const res = await fetch(`https://tvproxy.netlify.app/shows/${Number(id)}`)
   const data = await res.json()
   const time = new Date().toLocaleTimeString()
 

demos/default/pages/getStaticProps/withRevalidate/withFallbackBlocking/[id].js

@@ -29,7 +29,7 @@ export async function getStaticProps({ params }) {
   // The ID to render
   const { id } = params
 
-  const res = await fetch(`https://api.tvmaze.com/shows/${id}`)
+  const res = await fetch(`https://tvproxy.netlify.app/shows/${Number(id)}`)
   const data = await res.json()
   const time = new Date().toLocaleTimeString()
 

demos/default/pages/index.js

@@ -189,8 +189,8 @@ Index.getInitialProps = async function () {
   const randomPage = Math.floor(Math.random() * 100) + 1
   // FIXME: stub out in dev
   const server = dev
-    ? `https://api.tvmaze.com/shows?page=${randomPage}`
-    : `https://api.tvmaze.com/shows?page=${randomPage}`
+    ? `https://tvproxy.netlify.app/shows/page/${randomPage}`
+    : `https://tvproxy.netlify.app/shows/page/${randomPage}`
 
   // Get the data
   const res = await fetch(server)

demos/default/pages/shows/[...params].js

@@ -47,7 +47,7 @@ CatchAll.getInitialProps = async ({ res: req, query }) => {
   const id = params[0]
 
   // Get the data
-  const res = await fetch(`https://api.tvmaze.com/shows/${id}`)
+  const res = await fetch(`https://tvproxy.netlify.app/shows/${Number(id)}`)
   const data = await res.json()
 
   // Set error code if show item could not be found

demos/default/pages/shows/[id].js

@@ -35,7 +35,7 @@ Show.getInitialProps = async ({ res: req, query }) => {
   const { id } = query
 
   // Get the data
-  const res = await fetch(`https://api.tvmaze.com/shows/${id}`)
+  const res = await fetch(`https://tvproxy.netlify.app/shows/${Number(id)}`)
   const data = await res.json()
 
   // Set error code if show item could not be found