Merge branch 'main' into hk/docs-manual-install

Author: hrishikesh-k

.eslintignore

@@ -6,4 +6,5 @@ demos
 packages/runtime/src/templates/edge
 packages/runtime/src/templates/edge-shared
 packages/runtime/lib
-packages/runtime/dist-types
+packages/runtime/dist-types
+jestSetup.js

.eslintrc.js

@@ -46,6 +46,7 @@ module.exports = {
         // TODO: re-enable after dropping support for Node 12
         'n/no-unsupported-features/es-syntax': 'off',
         '@typescript-eslint/no-extra-semi': 'off',
+        'n/no-missing-import': 'off',
       },
     },
     {

cypress/integration/middleware/enhanced.spec.ts

@@ -36,4 +36,16 @@ describe('Enhanced middleware', () => {
       expect(response.body).to.have.nested.property('headers.x-geo-timezone')
     })
   })
+
+  it('handles uppercase i18n redirects properly ', () => {
+    cy.visit('/de-DE/static')
+    cy.get('#message').contains('This was static but has been transformed in')
+    cy.contains("This is an ad that isn't shown by default")
+  })
+
+  it('handles lowercase i18n redirects properly ', () => {
+    cy.visit('/de-de/static')
+    cy.get('#message').contains('This was static but has been transformed in')
+    cy.contains("This is an ad that isn't shown by default")
+  })
 })

demos/base-path/package.json

@@ -3,6 +3,7 @@
   "version": "1.0.0",
   "description": "",
   "devDependencies": {
+    "@netlify/next": "*",
     "@netlify/plugin-nextjs": "*",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.4.1",

demos/canary/package-lock.json

@@ -14,6 +14,7 @@
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
+    "@netlify/next": "*",
     "@netlify/plugin-nextjs": "*",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.4.1",

demos/canary/package.json

@@ -3,6 +3,7 @@
   "version": "1.0.0",
   "description": "",
   "devDependencies": {
+    "@netlify/next": "*",
     "@netlify/plugin-nextjs": "*",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.4.1",

demos/custom-routes/package.json

@@ -21,12 +21,13 @@
     "@netlify/next": "*",
     "@reach/dialog": "^0.16.2",
     "@reach/visually-hidden": "^0.16.0",
-    "@vercel/og": "^0.0.20",
+    "@vercel/og": "^0.0.21",
     "next": "^13.0.3",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
+    "@netlify/next": "*",
     "@netlify/plugin-nextjs": "*",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.4.1",

demos/default/package.json

@@ -9,7 +9,7 @@ const nextConfig = {
   generateBuildId: () => 'build-id',
   i18n: {
     defaultLocale: 'en',
-    locales: ['en'],
+    locales: ['en', 'de-DE'],
   },
 }
 

demos/middleware/next.config.js

@@ -30,6 +30,7 @@
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
+    "@netlify/next": "*",
     "@netlify/plugin-nextjs": "*",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.4.1",

demos/next-auth/package.json

@@ -6,6 +6,7 @@
     "next": "^13.0.3"
   },
   "devDependencies": {
+    "@netlify/next": "*",
     "@netlify/plugin-nextjs": "*",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.4.1",