revert gate

mischnic · mischnic · commit 0a54adba7dd3 · 2026-01-31T00:08:40.000+01:00
diff --git a/crates/next-api/src/project.rs b/crates/next-api/src/project.rs
@@ -1097,13 +1097,8 @@ impl Project {
     }
 
     #[turbo_tasks::function]
-    pub(super) async fn client_compile_time_info(self: Vc<Self>) -> Result<Vc<CompileTimeInfo>> {
-        let this = self.await?;
-        Ok(get_client_compile_time_info(
-            this.browserslist_query.clone(),
-            this.define_env.client(),
-            self.ci_has_next_support(),
-        ))
+    pub(super) fn client_compile_time_info(&self) -> Vc<CompileTimeInfo> {
+        get_client_compile_time_info(self.browserslist_query.clone(), self.define_env.client())
     }
 
     #[turbo_tasks::function]
@@ -1341,7 +1336,6 @@ impl Project {
             self.project_path(),
             this.define_env.nodejs(),
             self.current_node_js_version(),
-            self.ci_has_next_support(),
         ))
     }
 
@@ -1352,7 +1346,6 @@ impl Project {
             self.project_path().owned().await?,
             this.define_env.edge(),
             self.current_node_js_version(),
-            self.ci_has_next_support(),
         ))
     }
 
diff --git a/crates/next-core/src/next_client/context.rs b/crates/next-core/src/next_client/context.rs
@@ -80,15 +80,9 @@ async fn next_client_defines(define_env: Vc<OptionEnvMap>) -> Result<Vc<CompileT
 }
 
 #[turbo_tasks::function]
-async fn next_client_free_vars(
-    define_env: Vc<OptionEnvMap>,
-    has_next_support: Vc<bool>,
-) -> Result<Vc<FreeVarReferences>> {
+async fn next_client_free_vars(define_env: Vc<OptionEnvMap>) -> Result<Vc<FreeVarReferences>> {
     Ok(free_var_references!(
-        ..free_var_references_with_vercel_system_env_warnings(
-            defines(&*define_env.await?),
-            *has_next_support.await?
-        ),
+        ..free_var_references_with_vercel_system_env_warnings(defines(&*define_env.await?)),
         Buffer = FreeVarReference::EcmaScriptModule {
             request: rcstr!("node:buffer"),
             lookup_path: None,
@@ -107,7 +101,6 @@ async fn next_client_free_vars(
 pub async fn get_client_compile_time_info(
     browserslist_query: RcStr,
     define_env: Vc<OptionEnvMap>,
-    has_next_support: Vc<bool>,
 ) -> Result<Vc<CompileTimeInfo>> {
     CompileTimeInfo::builder(
         Environment::new(ExecutionEnvironment::Browser(
@@ -123,11 +116,7 @@ pub async fn get_client_compile_time_info(
         .await?,
     )
     .defines(next_client_defines(define_env).to_resolved().await?)
-    .free_var_references(
-        next_client_free_vars(define_env, has_next_support)
-            .to_resolved()
-            .await?,
-    )
+    .free_var_references(next_client_free_vars(define_env).to_resolved().await?)
     .cell()
     .await
 }
diff --git a/crates/next-core/src/next_edge/context.rs b/crates/next-core/src/next_edge/context.rs
@@ -47,13 +47,9 @@ async fn next_edge_defines(define_env: Vc<OptionEnvMap>) -> Result<Vc<CompileTim
 async fn next_edge_free_vars(
     project_path: FileSystemPath,
     define_env: Vc<OptionEnvMap>,
-    has_next_support: Vc<bool>,
 ) -> Result<Vc<FreeVarReferences>> {
     Ok(free_var_references!(
-        ..free_var_references_with_vercel_system_env_warnings(
-            defines(&*define_env.await?),
-            *has_next_support.await?
-        ),
+        ..free_var_references_with_vercel_system_env_warnings(defines(&*define_env.await?)),
         Buffer = FreeVarReference::EcmaScriptModule {
             request: rcstr!("buffer"),
             lookup_path: Some(project_path),
@@ -68,7 +64,6 @@ pub async fn get_edge_compile_time_info(
     project_path: FileSystemPath,
     define_env: Vc<OptionEnvMap>,
     node_version: ResolvedVc<NodeJsVersion>,
-    has_next_support: Vc<bool>,
 ) -> Result<Vc<CompileTimeInfo>> {
     CompileTimeInfo::builder(
         Environment::new(ExecutionEnvironment::EdgeWorker(
@@ -79,7 +74,7 @@ pub async fn get_edge_compile_time_info(
     )
     .defines(next_edge_defines(define_env).to_resolved().await?)
     .free_var_references(
-        next_edge_free_vars(project_path, define_env, has_next_support)
+        next_edge_free_vars(project_path, define_env)
             .to_resolved()
             .await?,
     )
diff --git a/crates/next-core/src/next_server/context.rs b/crates/next-core/src/next_server/context.rs
@@ -355,23 +355,15 @@ async fn next_server_defines(define_env: Vc<OptionEnvMap>) -> Result<Vc<CompileT
 }
 
 #[turbo_tasks::function]
-async fn next_server_free_vars(
-    define_env: Vc<OptionEnvMap>,
-    has_next_support: Vc<bool>,
-) -> Result<Vc<FreeVarReferences>> {
-    Ok(free_var_references_with_vercel_system_env_warnings(
-        defines(&*define_env.await?),
-        *has_next_support.await?,
-    )
-    .cell())
+async fn next_server_free_vars(define_env: Vc<OptionEnvMap>) -> Result<Vc<FreeVarReferences>> {
+    Ok(free_var_references_with_vercel_system_env_warnings(defines(&*define_env.await?)).cell())
 }
 
 #[turbo_tasks::function]
 pub async fn get_server_compile_time_info(
     cwd: Vc<FileSystemPath>,
     define_env: Vc<OptionEnvMap>,
     node_version: ResolvedVc<NodeJsVersion>,
-    has_next_support: Vc<bool>,
 ) -> Result<Vc<CompileTimeInfo>> {
     CompileTimeInfo::builder(
         Environment::new(ExecutionEnvironment::NodeJsLambda(
@@ -386,11 +378,7 @@ pub async fn get_server_compile_time_info(
         .await?,
     )
     .defines(next_server_defines(define_env).to_resolved().await?)
-    .free_var_references(
-        next_server_free_vars(define_env, has_next_support)
-            .to_resolved()
-            .await?,
-    )
+    .free_var_references(next_server_free_vars(define_env).to_resolved().await?)
     .cell()
     .await
 }
diff --git a/crates/next-core/src/util.rs b/crates/next-core/src/util.rs
@@ -65,34 +65,37 @@ pub fn defines(define_env: &FxIndexMap<RcStr, Option<RcStr>>) -> CompileTimeDefi
 /// Emits warnings or errors when inlining frequently changing Vercel system env vars
 pub fn free_var_references_with_vercel_system_env_warnings(
     defines: CompileTimeDefines,
-    has_next_support: bool,
 ) -> FreeVarReferences {
-    // constant:
-    //      VERCEL
+    // List of system env vars:
+    //   not available as NEXT_PUBLIC_* anyway:
     //      CI
-    //      VERCEL_PROJECT_PRODUCTION_URL
-    //      VERCEL_REGION
+    //      VERCEL
     //      VERCEL_SKEW_PROTECTION_ENABLED
     //      VERCEL_AUTOMATION_BYPASS_SECRET
-    //      VERCEL_PROJECT_ID
     //      VERCEL_GIT_PROVIDER
     //      VERCEL_GIT_REPO_SLUG
     //      VERCEL_GIT_REPO_OWNER
     //      VERCEL_GIT_REPO_ID
-
-    // suboptimal (changes production main branch VS preview branches):
+    //      VERCEL_OIDC_TOKEN
+    //
+    //   constant:
+    //      VERCEL_PROJECT_PRODUCTION_URL
+    //      VERCEL_REGION
+    //      VERCEL_PROJECT_ID
+    //
+    //   suboptimal (changes production main branch VS preview branches):
     //      VERCEL_ENV
     //      VERCEL_TARGET_ENV
-
-    // bad (changes per branch):
+    //
+    //   bad (changes per branch):
     //      VERCEL_BRANCH_URL
     //      VERCEL_GIT_COMMIT_REF
     //      VERCEL_GIT_PULL_REQUEST_ID
-
-    // catastrophic (changes per commit):
+    //
+    //   catastrophic (changes per commit):
+    //      NEXT_DEPLOYMENT_ID
     //      VERCEL_URL
     //      VERCEL_DEPLOYMENT_ID
-    //      VERCEL_OIDC_TOKEN
     //      VERCEL_GIT_COMMIT_SHA
     //      VERCEL_GIT_COMMIT_MESSAGE
     //      VERCEL_GIT_COMMIT_AUTHOR_LOGIN
@@ -104,97 +107,87 @@ pub fn free_var_references_with_vercel_system_env_warnings(
         .into_iter()
         .map(|(k, value)| (k, FreeVarReference::Value(value)));
 
-    let entries = if has_next_support {
-        let should_error = std::env::var("NEXT_TURBOPACK_SYSTEM_ENV_ERROR")
-            .ok()
-            .is_some_and(|v| !v.is_empty());
-
-        fn wrap_report_next_public_usage(
-            public_env_var: &str,
-            inner: Option<Box<FreeVarReference>>,
-            should_error: bool,
-        ) -> FreeVarReference {
-            let message = match public_env_var {
-                "NEXT_DEPLOYMENT_ID" | "VERCEL_DEPLOYMENT_ID" => {
-                    rcstr!(
-                        "The deployment id is being inlined. Use process.env.NEXT_DEPLOYMENT_ID \
-                         instead to access the same value without inlining, for faster deploy \
-                         times and better browser client-side caching."
-                    )
-                }
-                _ => format!(
-                    "A system environment variable is being inlined. This variable changes on \
-                     every deployment, causing slower deploy times and worse browser client-side \
-                     caching. For server-side code, replace with process.env.{} and for browser \
-                     code, try to remove it.",
-                    public_env_var.strip_prefix("NEXT_PUBLIC_").unwrap(),
+    let should_error = std::env::var("NEXT_TURBOPACK_SYSTEM_ENV_ERROR")
+        .ok()
+        .is_some_and(|v| !v.is_empty());
+
+    fn wrap_report_next_public_usage(
+        public_env_var: &str,
+        inner: Option<Box<FreeVarReference>>,
+        should_error: bool,
+    ) -> FreeVarReference {
+        let message = match public_env_var {
+            "NEXT_PUBLIC_NEXT_DEPLOYMENT_ID" | "NEXT_PUBLIC_VERCEL_DEPLOYMENT_ID" => {
+                rcstr!(
+                    "The deployment id is being inlined. Use process.env.NEXT_DEPLOYMENT_ID \
+                     instead to access the same value without inlining, for faster deploy times \
+                     and better browser client-side caching."
                 )
-                .into(),
-            };
-            FreeVarReference::ReportUsage {
-                message,
-                severity: if should_error {
-                    IssueSeverity::Error
-                } else {
-                    IssueSeverity::Warning
-                },
-                inner,
             }
+            _ => format!(
+                "A system environment variable is being inlined. This variable changes on every \
+                 deployment, causing slower deploy times and worse browser client-side caching. \
+                 For server-side code, replace with process.env.{} and for browser code, try to \
+                 remove it.",
+                public_env_var.strip_prefix("NEXT_PUBLIC_").unwrap(),
+            )
+            .into(),
+        };
+        FreeVarReference::ReportUsage {
+            message,
+            severity: if should_error {
+                IssueSeverity::Error
+            } else {
+                IssueSeverity::Warning
+            },
+            inner,
         }
+    }
 
-        let mut list = fxindexset!(
-            "NEXT_PUBLIC_NEXT_DEPLOYMENT_ID",
-            "NEXT_PUBLIC_VERCEL_BRANCH_URL",
-            "NEXT_PUBLIC_VERCEL_DEPLOYMENT_ID",
-            "NEXT_PUBLIC_VERCEL_GIT_COMMIT_AUTHOR_LOGIN",
-            "NEXT_PUBLIC_VERCEL_GIT_COMMIT_AUTHOR_NAME",
-            "NEXT_PUBLIC_VERCEL_GIT_COMMIT_MESSAGE",
-            "NEXT_PUBLIC_VERCEL_GIT_COMMIT_REF",
-            "NEXT_PUBLIC_VERCEL_GIT_COMMIT_SHA",
-            "NEXT_PUBLIC_VERCEL_GIT_PREVIOUS_SHA",
-            "NEXT_PUBLIC_VERCEL_GIT_PULL_REQUEST_ID",
-            "NEXT_PUBLIC_VERCEL_OIDC_TOKEN",
-            "NEXT_PUBLIC_VERCEL_URL",
-        );
+    let mut list = fxindexset!(
+        "NEXT_PUBLIC_NEXT_DEPLOYMENT_ID",
+        "NEXT_PUBLIC_VERCEL_BRANCH_URL",
+        "NEXT_PUBLIC_VERCEL_DEPLOYMENT_ID",
+        "NEXT_PUBLIC_VERCEL_GIT_COMMIT_AUTHOR_LOGIN",
+        "NEXT_PUBLIC_VERCEL_GIT_COMMIT_AUTHOR_NAME",
+        "NEXT_PUBLIC_VERCEL_GIT_COMMIT_MESSAGE",
+        "NEXT_PUBLIC_VERCEL_GIT_COMMIT_REF",
+        "NEXT_PUBLIC_VERCEL_GIT_COMMIT_SHA",
+        "NEXT_PUBLIC_VERCEL_GIT_PREVIOUS_SHA",
+        "NEXT_PUBLIC_VERCEL_GIT_PULL_REQUEST_ID",
+        "NEXT_PUBLIC_VERCEL_URL",
+    );
 
-        let mut entries: FxIndexMap<_, _> = entries
-            .map(|(k, value)| {
-                let value = if let &[
-                    DefinableNameSegment::Name(a),
-                    DefinableNameSegment::Name(b),
-                    DefinableNameSegment::Name(public_env_var),
-                ] = &&*k
-                    && a == "process"
-                    && b == "env"
-                    && list.swap_remove(&**public_env_var)
-                {
-                    wrap_report_next_public_usage(
-                        public_env_var,
-                        Some(Box::new(value)),
-                        should_error,
-                    )
-                } else {
-                    value
-                };
-                (k, value)
-            })
-            .collect();
-
-        // For the remaining ones, still add a warning, but without replacement
-        for public_env_var in list {
-            entries.insert(
-                vec![
-                    rcstr!("process").into(),
-                    rcstr!("env").into(),
-                    DefinableNameSegment::Name(public_env_var.into()),
-                ],
-                wrap_report_next_public_usage(public_env_var, None, should_error),
-            );
-        }
-        entries
-    } else {
-        entries.collect()
-    };
+    let mut entries: FxIndexMap<_, _> = entries
+        .map(|(k, value)| {
+            let value = if let &[
+                DefinableNameSegment::Name(a),
+                DefinableNameSegment::Name(b),
+                DefinableNameSegment::Name(public_env_var),
+            ] = &&*k
+                && a == "process"
+                && b == "env"
+                && list.swap_remove(&**public_env_var)
+            {
+                wrap_report_next_public_usage(public_env_var, Some(Box::new(value)), should_error)
+            } else {
+                value
+            };
+            (k, value)
+        })
+        .collect();
+
+    // For the remaining ones, still add a warning, but without replacement
+    for public_env_var in list {
+        entries.insert(
+            vec![
+                rcstr!("process").into(),
+                rcstr!("env").into(),
+                DefinableNameSegment::Name(public_env_var.into()),
+            ],
+            wrap_report_next_public_usage(public_env_var, None, should_error),
+        );
+    }
 
     FreeVarReferences(entries)
 }
