Merge branch 'canary' into refactor-data-fetching

.eslintignore

@@ -12,6 +12,7 @@ examples/with-jest/**
 examples/with-mobx-state-tree/**
 examples/with-mobx/**
 packages/next/bundles/webpack/packages/*.runtime.js
+packages/next/bundles/webpack/packages/lazy-compilation-*.js
 packages/next/compiled/**/*
 packages/react-refresh-utils/**/*.js
 packages/react-dev-overlay/lib/**

.github/lock.yml

@@ -1,6 +1,6 @@
 # Configuration for lock-threads - https://github.com/dessant/lock-threads
 
 # Number of days of inactivity before a closed issue or pull request is locked
-daysUntilLock: 45
+daysUntilLock: 30
 # Comment to post before locking. Set to `false` to disable
 lockComment: 'This issue has been automatically locked due to no recent activity. If you are running into a similar issue, please open a new issue with a reproduction. Thank you.'

.prettierignore

@@ -3,6 +3,7 @@ node_modules
 **/_next/**
 **/dist/**
 packages/next/bundles/webpack/packages/*.runtime.js
+packages/next/bundles/webpack/packages/lazy-compilation-*.js
 packages/next/compiled/**
 packages/react-refresh-utils/**/*.js
 packages/react-refresh-utils/**/*.d.ts

docs/migrating/from-gatsby.md

@@ -98,7 +98,7 @@ Gatsby uses the `graphql` tag to query data in the pages of your site. This may
 // src/pages/[slug].js
 
 // Install remark and remark-html
-import remark from 'remark'
+import { remark } from 'remark'
 import html from 'remark-html'
 import { getPostBySlug, getAllPosts } from '../lib/blog'
 

lerna.json

@@ -17,5 +17,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "12.0.8-canary.5"
+  "version": "12.0.8-canary.6"
 }

packages/create-next-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-next-app",
-  "version": "12.0.8-canary.5",
+  "version": "12.0.8-canary.6",
   "keywords": [
     "react",
     "next",

packages/eslint-config-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-next",
-  "version": "12.0.8-canary.5",
+  "version": "12.0.8-canary.6",
   "description": "ESLint configuration used by NextJS.",
   "main": "index.js",
   "license": "MIT",
@@ -9,7 +9,7 @@
     "directory": "packages/eslint-config-next"
   },
   "dependencies": {
-    "@next/eslint-plugin-next": "12.0.8-canary.5",
+    "@next/eslint-plugin-next": "12.0.8-canary.6",
     "@rushstack/eslint-patch": "^1.0.8",
     "@typescript-eslint/parser": "^5.0.0",
     "eslint-import-resolver-node": "^0.3.4",

packages/eslint-plugin-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/eslint-plugin-next",
-  "version": "12.0.8-canary.5",
+  "version": "12.0.8-canary.6",
   "description": "ESLint plugin for NextJS.",
   "main": "lib/index.js",
   "license": "MIT",

packages/next-bundle-analyzer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/bundle-analyzer",
-  "version": "12.0.8-canary.5",
+  "version": "12.0.8-canary.6",
   "main": "index.js",
   "license": "MIT",
   "repository": {

packages/next-codemod/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/codemod",
-  "version": "12.0.8-canary.5",
+  "version": "12.0.8-canary.6",
   "license": "MIT",
   "dependencies": {
     "chalk": "4.1.0",

packages/next-env/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/env",
-  "version": "12.0.8-canary.5",
+  "version": "12.0.8-canary.6",
   "keywords": [
     "react",
     "next",

packages/next-mdx/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/mdx",
-  "version": "12.0.8-canary.5",
+  "version": "12.0.8-canary.6",
   "main": "index.js",
   "license": "MIT",
   "repository": {

packages/next-plugin-storybook/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-storybook",
-  "version": "12.0.8-canary.5",
+  "version": "12.0.8-canary.6",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/next-plugin-storybook"

packages/next-polyfill-module/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-module",
-  "version": "12.0.8-canary.5",
+  "version": "12.0.8-canary.6",
   "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",

packages/next-polyfill-nomodule/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-nomodule",
-  "version": "12.0.8-canary.5",
+  "version": "12.0.8-canary.6",
   "description": "A polyfill for non-dead, nomodule browsers.",
   "main": "dist/polyfill-nomodule.js",
   "license": "MIT",

packages/next-swc/crates/core/src/lib.rs

@@ -79,6 +79,9 @@ pub struct TransformOptions {
     #[serde(default)]
     pub is_development: bool,
 
+    #[serde(default)]
+    pub is_server: bool,
+
     #[serde(default)]
     pub styled_components: Option<styled_components::Config>,
 
@@ -113,7 +116,12 @@ pub fn custom_before_pass(file: Arc<SourceFile>, opts: &TransformOptions) -> imp
         },
         Optional::new(next_ssg::next_ssg(), !opts.disable_next_ssg),
         amp_attributes::amp_attributes(),
-        next_dynamic::next_dynamic(file.name.clone(), opts.pages_dir.clone()),
+        next_dynamic::next_dynamic(
+            opts.is_development,
+            opts.is_server,
+            file.name.clone(),
+            opts.pages_dir.clone()
+        ),
         Optional::new(
             page_config::page_config(opts.is_development, opts.is_page_file),
             !opts.disable_page_config