From 69439d8583ba8c76cad6db3ba27dc19b1f9371f0 Mon Sep 17 00:00:00 2001
From: Tim Neutkens <tim@timneutkens.nl>
Date: Mon, 25 Sep 2023 14:01:52 +0200
Subject: [PATCH] Add trailingSlash, basePath, and assetPrefix to Turbopack
 (#55921)

Still some failing tests but it's a start. Adds the env vars used to
support trailing slash, base path and asset prefix.

<!-- Thanks for opening a PR! Your contribution is much appreciated.
To make sure your PR is handled as smoothly as possible we request that
you follow the checklist sections below.
Choose the right checklist for the change(s) that you're making:

## For Contributors

### Improving Documentation

- Run `pnpm prettier-fix` to fix formatting issues before opening the
PR.
- Read the Docs Contribution Guide to ensure your contribution follows
the docs guidelines:
https://nextjs.org/docs/community/contribution-guide

### Adding or Updating Examples

- The "examples guidelines" are followed from our contributing doc
https://github.com/vercel/next.js/blob/canary/contributing/examples/adding-examples.md
- Make sure the linting passes by running `pnpm build && pnpm lint`. See
https://github.com/vercel/next.js/blob/canary/contributing/repository/linting.md

### Fixing a bug

- Related issues linked using `fixes #number`
- Tests added. See:
https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs
- Errors have a helpful link attached, see
https://github.com/vercel/next.js/blob/canary/contributing.md

### Adding a feature

- Implements an existing feature request or RFC. Make sure the feature
request has been accepted for implementation before opening a PR. (A
discussion must be opened, see
https://github.com/vercel/next.js/discussions/new?category=ideas)
- Related issues/discussions are linked using `fixes #number`
- e2e tests added
(https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs)
- Documentation added
- Telemetry added. In case of a feature if it's used or not.
- Errors have a helpful link attached, see
https://github.com/vercel/next.js/blob/canary/contributing.md


## For Maintainers

- Minimal description (aim for explaining to someone not on the team to
understand the PR)
- When linking to a Slack thread, you might want to share details of the
conclusion
- Link both the Linear (Fixes NEXT-xxx) and the GitHub issues
- Add review comments if necessary to explain to the reviewer the logic
behind a change

### What?

### Why?

### How?

Closes NEXT-
Fixes #

-->
---
 packages/next-swc/crates/next-core/src/env.rs | 29 +++++++++++++++++++
 .../crates/next-core/src/next_config.rs       |  6 ++--
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/packages/next-swc/crates/next-core/src/env.rs b/packages/next-swc/crates/next-core/src/env.rs
index c6907be0e6865..9fff7bea98c63 100644
--- a/packages/next-swc/crates/next-core/src/env.rs
+++ b/packages/next-swc/crates/next-core/src/env.rs
@@ -70,6 +70,35 @@ pub async fn env_for_js(
         },
     );
 
+    map.insert(
+        "__NEXT_TRAILING_SLASH".to_string(),
+        if next_config.trailing_slash.unwrap_or(false) {
+            "true".to_string()
+        } else {
+            "false".to_string()
+        },
+    );
+
+    map.insert(
+        "__NEXT_ROUTER_BASEPATH".to_string(),
+        // Don't stringify undefined
+        if let Some(base_path) = next_config.base_path.as_ref() {
+            serde_json::to_string(base_path)?
+        } else {
+            "undefined".to_string()
+        },
+    );
+
+    map.insert(
+        "__NEXT_ASSET_PREFIX".to_string(),
+        // Don't stringify undefined
+        if let Some(asset_prefix) = next_config.asset_prefix.as_ref() {
+            serde_json::to_string(asset_prefix)?
+        } else {
+            "undefined".to_string()
+        },
+    );
+
     if !test_mode.is_empty() {
         map.insert("__NEXT_TEST_MODE".to_string(), "true".to_string());
     }
diff --git a/packages/next-swc/crates/next-core/src/next_config.rs b/packages/next-swc/crates/next-core/src/next_config.rs
index 517ecd4f2e199..79fc29fd7668a 100644
--- a/packages/next-swc/crates/next-core/src/next_config.rs
+++ b/packages/next-swc/crates/next-core/src/next_config.rs
@@ -85,7 +85,9 @@ pub struct NextConfig {
     pub modularize_imports: Option<IndexMap<String, ModularizeImportPackageConfig>>,
     pub dist_dir: Option<String>,
     sass_options: Option<serde_json::Value>,
-    trailing_slash: bool,
+    pub trailing_slash: Option<bool>,
+    pub asset_prefix: Option<String>,
+    pub base_path: Option<String>,
 
     // Partially supported
     pub compiler: Option<CompilerConfig>,
@@ -96,8 +98,6 @@ pub struct NextConfig {
     cross_origin: Option<String>,
     amp: AmpConfig,
     analytics_id: String,
-    asset_prefix: String,
-    base_path: String,
     clean_dist_dir: bool,
     compress: bool,
     dev_indicators: DevIndicatorsConfig,