Merge branch 'canary' into update/fonts-data-1723075867139

Author: samcx

.github/.react-version

@@ -1 +1 @@
-19.0.0-rc-06d0b89e-20240801
+19.0.0-rc-187dd6a7-20240806

crates/next-core/src/next_import_map.rs

@@ -682,9 +682,9 @@ async fn rsc_aliases(
             "react/jsx-dev-runtime" => format!("next/dist/compiled/react{react_channel}/jsx-dev-runtime"),
             "react/compiler-runtime" => format!("next/dist/compiled/react{react_channel}/compiler-runtime"),
             "react-dom/client" => format!("next/dist/compiled/react-dom{react_channel}/{react_client_package}"),
-            "react-dom/static" => format!("next/dist/compiled/react-dom-experimental/static"),
-            "react-dom/static.edge" => format!("next/dist/compiled/react-dom-experimental/static.edge"),
-            "react-dom/static.browser" => format!("next/dist/compiled/react-dom-experimental/static.browser"),
+            "react-dom/static" => format!("next/dist/compiled/react-dom{react_channel}/static"),
+            "react-dom/static.edge" => format!("next/dist/compiled/react-dom{react_channel}/static.edge"),
+            "react-dom/static.browser" => format!("next/dist/compiled/react-dom{react_channel}/static.browser"),
             "react-dom/server" => format!("next/dist/compiled/react-dom{react_channel}/server"),
             "react-dom/server.edge" => format!("next/dist/compiled/react-dom{react_channel}/server.edge"),
             "react-dom/server.browser" => format!("next/dist/compiled/react-dom{react_channel}/server.browser"),

crates/next-custom-transforms/src/transforms/react_server_components.rs

@@ -377,11 +377,24 @@ fn collect_top_level_directives_and_imports(
                     }
                 }
             }
-            ModuleItem::ModuleDecl(ModuleDecl::Import(import)) => {
+            ModuleItem::ModuleDecl(ModuleDecl::Import(
+                import @ ImportDecl {
+                    type_only: false, ..
+                },
+            )) => {
                 let source = import.src.value.clone();
                 let specifiers = import
                     .specifiers
                     .iter()
+                    .filter(|specifier| {
+                        !matches!(
+                            specifier,
+                            ImportSpecifier::Named(ImportNamedSpecifier {
+                                is_type_only: true,
+                                ..
+                            })
+                        )
+                    })
                     .map(|specifier| match specifier {
                         ImportSpecifier::Named(named) => match &named.imported {
                             Some(imported) => match &imported {
@@ -561,7 +574,6 @@ impl ReactServerComponentValidator {
     // assert_invalid_server_lib_apis("react", import)
     // assert_invalid_server_lib_apis("react-dom", import)
     fn assert_invalid_server_lib_apis(&self, import_source: String, import: &ModuleImports) {
-        // keys of invalid_server_lib_apis_mapping
         let invalid_apis = self
             .invalid_server_lib_apis_mapping
             .get(import_source.as_str());

crates/next-custom-transforms/tests/fixture.rs

@@ -309,6 +309,28 @@ fn shake_exports_fixture_default(input: PathBuf) {
     );
 }
 
+#[fixture("tests/fixture/react-server-components/**/input.ts")]
+fn react_server_components_typescript(input: PathBuf) {
+    use next_custom_transforms::transforms::react_server_components::{Config, Options};
+    let output = input.parent().unwrap().join("output.ts");
+    test_fixture(
+        Syntax::Typescript(Default::default()),
+        &|tr| {
+            server_components(
+                FileName::Real(PathBuf::from("/some-project/src/some-file.js")),
+                Config::WithOptions(Options {
+                    is_react_server_layer: true,
+                }),
+                tr.comments.as_ref().clone(),
+                None,
+            )
+        },
+        &input,
+        &output,
+        Default::default(),
+    );
+}
+
 #[fixture("tests/fixture/react-server-components/server-graph/**/input.js")]
 fn react_server_components_server_graph_fixture(input: PathBuf) {
     use next_custom_transforms::transforms::react_server_components::{Config, Options};

crates/next-custom-transforms/tests/fixture/react-server-components/pack-3186/input.ts

@@ -0,0 +1,2 @@
+// This fails if the `type` keyword is removed
+import { type usePathname } from 'next/navigation'

crates/next-custom-transforms/tests/fixture/react-server-components/pack-3186/output.ts

@@ -0,0 +1,2 @@
+// This fails if the `type` keyword is removed
+import { type usePathname } from 'next/navigation';

docs/02-app/01-building-your-application/11-upgrading/02-version-15.mdx

@@ -25,7 +25,10 @@ pnpm up next@rc react@rc react-dom@rc eslint-config-next@rc
 bun add next@rc react@rc react-dom@rc eslint-config-next@rc
 ```
 
-> **Good to know:** If you are using TypeScript, ensure you also upgrade `@types/react` and `@types/react-dom` to their latest versions.
+> **Good to know:**
+>
+> - If you see a peer dependencies warning, you may need to update `react` and `react-dom` to the suggested versions, or you use the `--force` or `--legacy-peer-deps` flag to ignore the warning. This won't be necessary once both Next.js 15 and React 19 are stable.
+> - If you are using TypeScript, you'll need to temporarily override the React types. See the [React 19 RC upgrade guide](https://react.dev/blog/2024/04/25/react-19-upgrade-guide#installing) for more information.
 
 ## Minimum React version
 

docs/02-app/02-api-reference/05-next-config-js/assetPrefix.mdx

@@ -23,16 +23,25 @@ description: Learn how to use the assetPrefix config option to configure your CD
 > suited for hosting your application on a sub-path like `/docs`.
 > We do not suggest you use a custom Asset Prefix for this use case.
 
-To set up a [CDN](https://en.wikipedia.org/wiki/Content_delivery_network), you can set up an asset prefix and configure your CDN's origin to resolve to the domain that Next.js is hosted on.
-
-Open `next.config.js` and add the `assetPrefix` config:
+## Set up a CDN
 
-```js filename="next.config.js"
-const isProd = process.env.NODE_ENV === 'production'
+To set up a [CDN](https://en.wikipedia.org/wiki/Content_delivery_network), you can set up an asset prefix and configure your CDN's origin to resolve to the domain that Next.js is hosted on.
 
-module.exports = {
-  // Use the CDN in production and localhost for development.
-  assetPrefix: isProd ? 'https://cdn.mydomain.com' : undefined,
+Open `next.config.mjs` and add the `assetPrefix` config based on the [phase](/docs/app/api-reference/next-config-js#async-configuration):
+
+```js filename="next.config.mjs"
+// @ts-check
+import { PHASE_DEVELOPMENT_SERVER } from 'next/constants'
+
+export default (phase) => {
+  const isDev = phase === PHASE_DEVELOPMENT_SERVER
+  /**
+   * @type {import('next').NextConfig}
+   */
+  const nextConfig = {
+    assetPrefix: isDev ? undefined : 'https://cdn.mydomain.com',
+  }
+  return nextConfig
 }
 ```
 

docs/02-app/02-api-reference/05-next-config-js/devIndicators.mdx

@@ -24,7 +24,13 @@ description: Optimized pages include an indicator to let you know if it's being
 
 Next.js displays a static indicator in the bottom corner of the screen that signals if a route will be prerendered at build time. This makes it easier to understand whether a route is static or dynamic, and for you to identify if a route [opts out of static rendering](#static-route-not-showing-the-indicator).
 
-{/* TODO: Add screenshot - waiting for design */}
+<Image
+  alt="App Folder Structure"
+  srcLight="/docs/light/static-indicator.png"
+  srcDark="/docs/dark/static-indicator.png"
+  width="1600"
+  height="208"
+/>
 
 You can disable the indicator by closing it, or using the config option `next.config.js`:
 

examples/reproduction-template/package.json

@@ -7,8 +7,8 @@
   },
   "dependencies": {
     "next": "canary",
-    "react": "19.0.0-rc-06d0b89e-20240801",
-    "react-dom": "19.0.0-rc-06d0b89e-20240801"
+    "react": "19.0.0-rc-187dd6a7-20240806",
+    "react-dom": "19.0.0-rc-187dd6a7-20240806"
   },
   "devDependencies": {
     "@types/node": "20.12.12",