Merge branch 'canary' into font

vercel · Apr 5, 2021 · 964a8bc · 964a8bc
2 parents cf771cd + bf629f9
commit 964a8bc
Show file tree

Hide file tree

Showing 35 changed files with 636 additions and 310 deletions.
diff --git a/examples/custom-server-express/README.md b/examples/custom-server-express/README.md
@@ -28,11 +28,11 @@ npm install body-parser
 
 Use the package within server.js:
 
-```bash
-const bodyParser = require('body-parser');
+```js
+const bodyParser = require('body-parser')
 
 app.prepare().then(() => {
-  const server = express();
+  const server = express()
   server.use(bodyParser.urlencoded({ extended: true }))
   server.use(bodyParser.json())
 })

diff --git a/examples/with-glamor/.babelrc b/examples/with-glamor/.babelrc
diff --git a/examples/with-glamor/.gitignore b/examples/with-glamor/.gitignore
diff --git a/examples/with-glamor/README.md b/examples/with-glamor/README.md
diff --git a/examples/with-glamor/next.config.js b/examples/with-glamor/next.config.js
diff --git a/examples/with-glamor/package.json b/examples/with-glamor/package.json
diff --git a/examples/with-glamor/pages/_document.js b/examples/with-glamor/pages/_document.js
diff --git a/examples/with-glamor/pages/index.js b/examples/with-glamor/pages/index.js
diff --git a/examples/with-mqtt-js/.env.local.example b/examples/with-mqtt-js/.env.local.example
@@ -1,4 +1,4 @@
-NEXT_MQTT_URI="wss://test.mosquitto.org:8081/mqtt"
-NEXT_MQTT_CLIENTID="a_client_id"
-NEXT_MQTT_USERNAME="username"
-CONTENTFUL_PREVIEW_SECRET="a_secure_password"
+NEXT_PUBLIC_MQTT_URI="wss://test.mosquitto.org:8081/mqtt"
+NEXT_PUBLIC_MQTT_CLIENTID="a_client_id"
+NEXT_PUBLIC_MQTT_USERNAME="username"
+NEXT_PUBLIC_MQTT_PASSWORD="a_secure_password"
diff --git a/examples/with-styled-jsx-plugins/package.json b/examples/with-styled-jsx-plugins/package.json
@@ -7,12 +7,13 @@
     "start": "next start"
   },
   "dependencies": {
-    "lost": "8.2.0",
     "next": "latest",
-    "postcss-nested": "2.1.2",
+    "lost": "8.2.0",
+    "postcss-nested": "5.0.5",
+    "postcss": "8.2.9",
     "react": "^16.7.0",
     "react-dom": "^16.7.0",
-    "styled-jsx-plugin-postcss": "0.1.0"
+    "styled-jsx-plugin-postcss": "4.0.1"
   },
   "license": "MIT",
   "postcss": {

diff --git a/examples/with-web-worker/README.md b/examples/with-web-worker/README.md
@@ -1,6 +1,6 @@
 # WebWorker example
 
-This example shows how to run code in WebWorkers by utilizing [worker-plugin](https://github.com/GoogleChromeLabs/worker-plugin).
+This example shows how to run code in WebWorkers by utilizing [webpack 5](https://nextjs.org/docs/messages/webpack5).
 
 ## Deploy your own
 

diff --git a/examples/with-web-worker/next.config.js b/examples/with-web-worker/next.config.js
@@ -1,15 +1,5 @@
-const WorkerPlugin = require('worker-plugin')
-
 module.exports = {
-  webpack: (config, { buildId, dev, isServer, defaultLoaders, webpack }) => {
-    if (!isServer) {
-      config.plugins.push(
-        new WorkerPlugin({
-          // use "self" as the global object when receiving hot updates.
-          globalObject: 'self',
-        })
-      )
-    }
-    return config
+  future: {
+    webpack5: true,
   },
 }
diff --git a/examples/with-web-worker/package.json b/examples/with-web-worker/package.json
@@ -10,8 +10,7 @@
   "dependencies": {
     "next": "latest",
     "react": "16.13.1",
-    "react-dom": "16.13.1",
-    "worker-plugin": "^4.0.3"
+    "react-dom": "16.13.1"
   },
   "license": "MIT"
 }
diff --git a/examples/with-web-worker/pages/index.js b/examples/with-web-worker/pages/index.js
@@ -3,7 +3,7 @@ import { useEffect, useRef, useCallback } from 'react'
 export default function Index() {
   const workerRef = useRef()
   useEffect(() => {
-    workerRef.current = new Worker('../worker.js', { type: 'module' })
+    workerRef.current = new Worker(new URL('../worker.js', import.meta.url))
     workerRef.current.onmessage = (evt) =>
       alert(`WebWorker Response => ${evt.data}`)
     return () => {

diff --git a/lerna.json b/lerna.json
@@ -17,5 +17,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "10.1.3-canary.0"
+  "version": "10.1.4-canary.0"
 }
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.1.3-canary.0",
+  "version": "10.1.4-canary.0",
   "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.1.3-canary.0",
+  "version": "10.1.4-canary.0",
   "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,6 +1,6 @@
 {
   "name": "@next/bundle-analyzer",
-  "version": "10.1.3-canary.0",
+  "version": "10.1.4-canary.0",
   "main": "index.js",
   "license": "MIT",
   "repository": {

diff --git a/packages/next-codemod/package.json b/packages/next-codemod/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/codemod",
-  "version": "10.1.3-canary.0",
+  "version": "10.1.4-canary.0",
   "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.1.3-canary.0",
+  "version": "10.1.4-canary.0",
   "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.1.3-canary.0",
+  "version": "10.1.4-canary.0",
   "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.1.3-canary.0",
+  "version": "10.1.4-canary.0",
   "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.1.3-canary.0",
+  "version": "10.1.4-canary.0",
   "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.1.3-canary.0",
+  "version": "10.1.4-canary.0",
   "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.1.3-canary.0",
+  "version": "10.1.4-canary.0",
   "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.1.3-canary.0",
+  "version": "10.1.4-canary.0",
   "description": "A polyfill for non-dead, nomodule browsers.",
   "main": "dist/polyfill-nomodule.js",
   "license": "MIT",