Merge branch 'canary' into ijjk/migrate-web-server-cont

Author: Timer

.github/labeler.json

@@ -59,6 +59,7 @@
       { "type": "user", "pattern": "ijjk" },
       { "type": "user", "pattern": "lazarv" },
       { "type": "user", "pattern": "lubieowoce" },
+      { "type": "user", "pattern": "nebrelbug" },
       { "type": "user", "pattern": "RobPruzan" },
       { "type": "user", "pattern": "samcx" },
       { "type": "user", "pattern": "sebmarkbage" },

.github/workflows/test_e2e_deploy_release.yml

@@ -110,9 +110,42 @@ jobs:
       - id: test-result
         name: Set test result variable
         run: echo 'immediately-close=${{ needs.test-deploy.result != 'success' && 'true' || 'false' }}' >> "$GITHUB_OUTPUT"
+      - name: Check token
+        run: gh auth status
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_UPDATE_NEXT_WORKFLOW_TRIGGER }}
+      - uses: actions/github-script@v7
+        name: Check if target workflow is enabled
+        id: check-workflow-enabled
+        with:
+          retries: 3
+          retry-exempt-status-codes: 400,401,404
+          github-token: ${{ secrets.GH_UPDATE_NEXT_WORKFLOW_TRIGGER }}
+          result-encoding: string
+          script: |
+            try {
+              const response = await github.request(
+                "GET /repos/{owner}/{repo}/actions/workflows/{workflow_id}",
+                {
+                  owner: "vercel",
+                  repo: "front",
+                  workflow_id: "cron-update-next.yml",
+                }
+              );
+              
+              const isEnabled = response.data.state === 'active';
+              console.info(`Target workflow state: ${response.data.state}`);
+              console.info(`Target workflow enabled: ${isEnabled}`);
+              
+              return isEnabled ? 'true' : 'false';
+            } catch (error) {
+              console.error('Error checking workflow status:', error);
+              return 'false';
+            }
       - uses: actions/github-script@v7
         name: Trigger vercel/front sync
         id: trigger-front-sync
+        if: steps.check-workflow-enabled.outputs.result == 'true'
         with:
           retries: 3
           retry-exempt-status-codes: 400,401,404

crates/napi/src/next_api/endpoint.rs

@@ -15,7 +15,7 @@ use turbo_tasks::{Completion, Effects, OperationVc, ReadRef, Vc};
 use turbopack_core::{diagnostics::PlainDiagnostic, error::PrettyPrintError, issue::PlainIssue};
 
 use super::utils::{
-    NapiDiagnostic, NapiIssue, RootTask, TurbopackResult, VcArc,
+    DetachedVc, NapiDiagnostic, NapiIssue, RootTask, TurbopackResult,
     strongly_consistent_catch_collectables, subscribe,
 };
 
@@ -86,10 +86,10 @@ impl From<Option<EndpointOutputPaths>> for NapiWrittenEndpoint {
 //    some async functions (in this case `endpoint_write_to_disk`) can cause
 //    higher-ranked lifetime errors. See https://github.com/rust-lang/rust/issues/102211
 // 2. the type_complexity clippy lint.
-pub struct ExternalEndpoint(pub VcArc<OptionEndpoint>);
+pub struct ExternalEndpoint(pub DetachedVc<OptionEndpoint>);
 
 impl Deref for ExternalEndpoint {
-    type Target = VcArc<OptionEndpoint>;
+    type Target = DetachedVc<OptionEndpoint>;
 
     fn deref(&self) -> &Self::Target {
         &self.0
@@ -125,9 +125,10 @@ async fn get_written_endpoint_with_issues_operation(
 pub async fn endpoint_write_to_disk(
     #[napi(ts_arg_type = "{ __napiType: \"Endpoint\" }")] endpoint: External<ExternalEndpoint>,
 ) -> napi::Result<TurbopackResult<NapiWrittenEndpoint>> {
-    let turbo_tasks = endpoint.turbo_tasks().clone();
     let endpoint_op = ***endpoint;
-    let (written, issues, diags) = turbo_tasks
+    let (written, issues, diags) = endpoint
+        .turbopack_ctx()
+        .turbo_tasks()
         .run_once(async move {
             let written_entrypoint_with_issues_op =
                 get_written_endpoint_with_issues_operation(endpoint_op);
@@ -158,10 +159,10 @@ pub fn endpoint_server_changed_subscribe(
     issues: bool,
     func: JsFunction,
 ) -> napi::Result<External<RootTask>> {
-    let turbo_tasks = endpoint.turbo_tasks().clone();
+    let turbopack_ctx = endpoint.turbopack_ctx().clone();
     let endpoint = ***endpoint;
     subscribe(
-        turbo_tasks,
+        turbopack_ctx,
         func,
         move || {
             async move {
@@ -247,10 +248,10 @@ pub fn endpoint_client_changed_subscribe(
     #[napi(ts_arg_type = "{ __napiType: \"Endpoint\" }")] endpoint: External<ExternalEndpoint>,
     func: JsFunction,
 ) -> napi::Result<External<RootTask>> {
-    let turbo_tasks = endpoint.turbo_tasks().clone();
+    let turbopack_ctx = endpoint.turbopack_ctx().clone();
     let endpoint_op = ***endpoint;
     subscribe(
-        turbo_tasks,
+        turbopack_ctx,
         func,
         move || {
             async move {

crates/napi/src/next_api/mod.rs

@@ -1,3 +1,4 @@
 pub mod endpoint;
 pub mod project;
+pub mod turbopack_ctx;
 pub mod utils;