Merge branch 'canary' into hotfix/pass-preview-data

vercel · Mar 2, 2020 · 00404c2 · 00404c2
2 parents 8b0fa28 + 9400942
commit 00404c2
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 12 deletions.
diff --git a/examples/with-react-native-web/next.config.js b/examples/with-react-native-web/next.config.js
@@ -1,11 +1,16 @@
 module.exports = {
-  webpack: (config, { defaultLoaders }) => {
+  webpack: config => {
     config.resolve.alias = {
       ...(config.resolve.alias || {}),
       // Transform all direct `react-native` imports to `react-native-web`
       'react-native$': 'react-native-web',
     }
-    config.resolve.extensions.push('.web.js', '.web.ts', '.web.tsx')
+    config.resolve.extensions = [
+      '.web.js',
+      '.web.ts',
+      '.web.tsx',
+      ...config.resolve.extensions,
+    ]
     return config
   },
 }
diff --git a/lerna.json b/lerna.json
@@ -12,5 +12,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "9.2.3-canary.18"
+  "version": "9.2.3-canary.19"
 }
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": "9.2.3-canary.18",
+  "version": "9.2.3-canary.19",
   "keywords": [
     "react",
     "next",

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": "9.2.3-canary.18",
+  "version": "9.2.3-canary.19",
   "main": "index.js",
   "license": "MIT",
   "repository": {

diff --git a/packages/next-mdx/package.json b/packages/next-mdx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/mdx",
-  "version": "9.2.3-canary.18",
+  "version": "9.2.3-canary.19",
   "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": "9.2.3-canary.18",
+  "version": "9.2.3-canary.19",
   "nextjs": {
     "name": "Google Analytics",
     "required-env": [

diff --git a/packages/next-plugin-material-ui/package.json b/packages/next-plugin-material-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-material-ui",
-  "version": "9.2.3-canary.18",
+  "version": "9.2.3-canary.19",
   "nextjs": {
     "name": "Material UI",
     "required-env": []

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": "9.2.3-canary.18",
+  "version": "9.2.3-canary.19",
   "nextjs": {
     "name": "Sentry",
     "required-env": [

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": "9.2.3-canary.18",
+  "version": "9.2.3-canary.19",
   "description": "A polyfill for non-dead, nomodule browsers.",
   "main": "dist/polyfill-nomodule.js",
   "license": "MIT",

diff --git a/packages/next/package.json b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "9.2.3-canary.18",
+  "version": "9.2.3-canary.19",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -73,7 +73,7 @@
     "@babel/preset-typescript": "7.7.2",
     "@babel/runtime": "7.7.2",
     "@babel/types": "7.7.4",
-    "@next/polyfill-nomodule": "9.2.3-canary.18",
+    "@next/polyfill-nomodule": "9.2.3-canary.19",
     "amphtml-validator": "1.0.30",
     "async-retry": "1.2.3",
     "async-sema": "3.0.0",