Merge branch 'canary' into fix/incoming-message-cookies-type

vercel · Dec 18, 2020 · 3145c45 · 3145c45
2 parents bb7449e + bad9a8c
commit 3145c45
Show file tree

Hide file tree

Showing 23 changed files with 112 additions and 129 deletions.
diff --git a/docs/advanced-features/source-maps.md b/docs/advanced-features/source-maps.md
@@ -1,5 +1,5 @@
 ---
-description: Save pages under the `src` directory as an alternative to the root `pages` directory.
+description: Enables browser source map generation during the production build.
 ---
 
 # Source Maps

diff --git a/examples/progressive-web-app/pages/_app.js b/examples/progressive-web-app/pages/_app.js
@@ -17,13 +17,13 @@ export default function MyApp({ Component, pageProps }) {
 
         <link rel="manifest" href="/manifest.json" />
         <link
-          href="/favicon-16x16.png"
+          href="/icons/favicon-16x16.png"
           rel="icon"
           type="image/png"
           sizes="16x16"
         />
         <link
-          href="/favicon-32x32.png"
+          href="/icons/favicon-32x32.png"
           rel="icon"
           type="image/png"
           sizes="32x32"

diff --git a/examples/progressive-web-app/public/icons/icon-16x16.png b/examples/progressive-web-app/public/icons/icon-16x16.png
diff --git a/examples/progressive-web-app/public/icons/icon-32x32.png b/examples/progressive-web-app/public/icons/icon-32x32.png
diff --git a/examples/with-sentry/.env.local.example b/examples/with-sentry/.env.local.example
@@ -5,6 +5,10 @@ NEXT_PUBLIC_SENTRY_DSN=
 # SENTRY_PROJECT=
 # SENTRY_AUTH_TOKEN=
 #
+# Only required if sentry for organization
+# Ex: https://sentry.ORG.com/
+# SENTRY_URL=
+#
 # For sourcemaps to work with server-side exceptions, the file path of the
 # uploaded .map file needs to match the file paths in Error.stack. In Node.js,
 # Error.stack file paths are absolute. Since the .map files we upload to Sentry

diff --git a/lerna.json b/lerna.json
@@ -17,5 +17,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "10.0.4-canary.7"
+  "version": "10.0.4-canary.8"
 }
diff --git a/package.json b/package.json
@@ -126,7 +126,7 @@
     "typescript": "3.8.3",
     "wait-port": "0.2.2",
     "web-streams-polyfill": "2.1.1",
-    "webpack-bundle-analyzer": "3.6.1",
+    "webpack-bundle-analyzer": "4.3.0",
     "worker-loader": "2.0.0"
   },
   "resolutions": {

diff --git a/packages/create-next-app/package.json b/packages/create-next-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-next-app",
-  "version": "10.0.4-canary.7",
+  "version": "10.0.4-canary.8",
   "keywords": [
     "react",
     "next",

diff --git a/packages/eslint-plugin-next/package.json b/packages/eslint-plugin-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/eslint-plugin-next",
-  "version": "10.0.4-canary.7",
+  "version": "10.0.4-canary.8",
   "description": "ESLint plugin for NextJS.",
   "main": "lib/index.js",
   "license": "MIT",

diff --git a/packages/next-bundle-analyzer/package.json b/packages/next-bundle-analyzer/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@next/bundle-analyzer",
-  "version": "10.0.4-canary.7",
+  "version": "10.0.4-canary.8",
   "main": "index.js",
   "license": "MIT",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/next-bundle-analyzer"
   },
   "dependencies": {
-    "webpack-bundle-analyzer": "3.6.1"
+    "webpack-bundle-analyzer": "4.3.0"
   }
 }
diff --git a/packages/next-codemod/package.json b/packages/next-codemod/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/codemod",
-  "version": "10.0.4-canary.7",
+  "version": "10.0.4-canary.8",
   "license": "MIT",
   "dependencies": {
     "chalk": "4.1.0",

diff --git a/packages/next-env/package.json b/packages/next-env/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/env",
-  "version": "10.0.4-canary.7",
+  "version": "10.0.4-canary.8",
   "keywords": [
     "react",
     "next",

diff --git a/packages/next-mdx/package.json b/packages/next-mdx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/mdx",
-  "version": "10.0.4-canary.7",
+  "version": "10.0.4-canary.8",
   "main": "index.js",
   "license": "MIT",
   "repository": {

diff --git a/packages/next-plugin-google-analytics/package.json b/packages/next-plugin-google-analytics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-google-analytics",
-  "version": "10.0.4-canary.7",
+  "version": "10.0.4-canary.8",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/next-plugin-google-analytics"

diff --git a/packages/next-plugin-sentry/package.json b/packages/next-plugin-sentry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-sentry",
-  "version": "10.0.4-canary.7",
+  "version": "10.0.4-canary.8",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/next-plugin-sentry"

diff --git a/packages/next-plugin-storybook/package.json b/packages/next-plugin-storybook/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-storybook",
-  "version": "10.0.4-canary.7",
+  "version": "10.0.4-canary.8",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/next-plugin-storybook"

diff --git a/packages/next-polyfill-module/package.json b/packages/next-polyfill-module/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-module",
-  "version": "10.0.4-canary.7",
+  "version": "10.0.4-canary.8",
   "description": "A standard library polyfill for ES Modules supporting browsers (Edge 16+, Firefox 60+, Chrome 61+, Safari 10.1+)",
   "main": "dist/polyfill-module.js",
   "license": "MIT",

diff --git a/packages/next-polyfill-nomodule/package.json b/packages/next-polyfill-nomodule/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-nomodule",
-  "version": "10.0.4-canary.7",
+  "version": "10.0.4-canary.8",
   "description": "A polyfill for non-dead, nomodule browsers.",
   "main": "dist/polyfill-nomodule.js",
   "license": "MIT",

diff --git a/packages/next/compiled/terser/bundle.min.js b/packages/next/compiled/terser/bundle.min.js
diff --git a/packages/next/package.json b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "10.0.4-canary.7",
+  "version": "10.0.4-canary.8",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -63,10 +63,10 @@
     "@ampproject/toolbox-optimizer": "2.7.1-alpha.0",
     "@babel/runtime": "7.12.5",
     "@hapi/accept": "5.0.1",
-    "@next/env": "10.0.4-canary.7",
-    "@next/polyfill-module": "10.0.4-canary.7",
-    "@next/react-dev-overlay": "10.0.4-canary.7",
-    "@next/react-refresh-utils": "10.0.4-canary.7",
+    "@next/env": "10.0.4-canary.8",
+    "@next/polyfill-module": "10.0.4-canary.8",
+    "@next/react-dev-overlay": "10.0.4-canary.8",
+    "@next/react-refresh-utils": "10.0.4-canary.8",
     "ast-types": "0.13.2",
     "babel-plugin-transform-define": "2.0.0",
     "babel-plugin-transform-react-remove-prop-types": "0.4.24",
@@ -129,7 +129,7 @@
     "@babel/preset-react": "7.12.5",
     "@babel/preset-typescript": "7.12.1",
     "@babel/types": "7.12.6",
-    "@next/polyfill-nomodule": "10.0.4-canary.7",
+    "@next/polyfill-nomodule": "10.0.4-canary.8",
     "@taskr/clear": "1.1.0",
     "@taskr/esnext": "1.1.0",
     "@taskr/watch": "1.1.0",

diff --git a/packages/react-dev-overlay/package.json b/packages/react-dev-overlay/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/react-dev-overlay",
-  "version": "10.0.4-canary.7",
+  "version": "10.0.4-canary.8",
   "description": "A development-only overlay for developing React applications.",
   "repository": {
     "url": "vercel/next.js",

diff --git a/packages/react-refresh-utils/package.json b/packages/react-refresh-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/react-refresh-utils",
-  "version": "10.0.4-canary.7",
+  "version": "10.0.4-canary.8",
   "description": "An experimental package providing utilities for React Refresh.",
   "repository": {
     "url": "vercel/next.js",