From c5d3d1417df0434eeca939df5cdebc0f78cca424 Mon Sep 17 00:00:00 2001
From: Samuel Cochrane <chopshoolihan@gmail.com>
Date: Tue, 28 May 2024 08:39:50 +0100
Subject: [PATCH] feat(context-zone*): support zone.js 0.12.x (#4736)

Signed-off-by: Samuel Cochrane <chopshoolihan@gmail.co>
---
 CHANGELOG.md                                           |  1 +
 package-lock.json                                      | 10 +++++-----
 .../opentelemetry-context-zone-peer-dep/package.json   |  2 +-
 packages/opentelemetry-context-zone/package.json       |  2 +-
 selenium-tests/package.json                            |  2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3cbe7d9a00..480036b7f4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/
 ### :rocket: (Enhancement)
 
 * feat: support node 22 [#4666](https://github.com/open-telemetry/opentelemetry-js/pull/4666) @dyladan
+* feat(context-zone*): support zone.js 0.12.x [#4376](https://github.com/open-telemetry/opentelemetry-js/pull/4736) @maldago
 
 ### :bug: (Bug Fix)
 
diff --git a/package-lock.json b/package-lock.json
index fd6ef7d0a4..443e25bdba 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -33538,7 +33538,7 @@
       "license": "Apache-2.0",
       "dependencies": {
         "@opentelemetry/context-zone-peer-dep": "1.24.1",
-        "zone.js": "^0.11.0 || ^0.13.0 || ^0.14.0"
+        "zone.js": "^0.11.0 || ^0.12.0 || ^0.13.0 || ^0.14.0"
       },
       "devDependencies": {
         "cross-var": "1.1.0",
@@ -33588,7 +33588,7 @@
       },
       "peerDependencies": {
         "@opentelemetry/api": ">=1.0.0 <1.9.0",
-        "zone.js": "^0.10.2 || ^0.11.0 || ^0.13.0 || ^0.14.0"
+        "zone.js": "^0.10.2 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^0.14.0"
       }
     },
     "packages/opentelemetry-context-zone-peer-dep/node_modules/@babel/core": {
@@ -36063,7 +36063,7 @@
         "@opentelemetry/sdk-metrics": "1.24.1",
         "@opentelemetry/sdk-trace-base": "1.24.1",
         "@opentelemetry/sdk-trace-web": "1.24.1",
-        "zone.js": "^0.11.0 || ^0.13.0 || ^0.14.0"
+        "zone.js": "^0.11.0 || ^0.12.0 || ^0.13.0 || ^0.14.0"
       },
       "devDependencies": {
         "@babel/core": "7.23.6",
@@ -39948,7 +39948,7 @@
         "cross-var": "1.1.0",
         "lerna": "6.6.2",
         "typescript": "4.4.4",
-        "zone.js": "^0.11.0 || ^0.13.0 || ^0.14.0"
+        "zone.js": "^0.11.0 || ^0.12.0 || ^0.13.0 || ^0.14.0"
       }
     },
     "@opentelemetry/context-zone-peer-dep": {
@@ -45284,7 +45284,7 @@
         "webpack-cli": "5.1.4",
         "webpack-dev-server": "4.5.0",
         "webpack-merge": "5.10.0",
-        "zone.js": "^0.11.0 || ^0.13.0 || ^0.14.0"
+        "zone.js": "^0.11.0 || ^0.12.0 || ^0.13.0 || ^0.14.0"
       },
       "dependencies": {
         "@babel/core": {
diff --git a/packages/opentelemetry-context-zone-peer-dep/package.json b/packages/opentelemetry-context-zone-peer-dep/package.json
index bf7a7925c3..f32ee4ff25 100644
--- a/packages/opentelemetry-context-zone-peer-dep/package.json
+++ b/packages/opentelemetry-context-zone-peer-dep/package.json
@@ -85,7 +85,7 @@
   },
   "peerDependencies": {
     "@opentelemetry/api": ">=1.0.0 <1.9.0",
-    "zone.js": "^0.10.2 || ^0.11.0 || ^0.13.0 || ^0.14.0"
+    "zone.js": "^0.10.2 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^0.14.0"
   },
   "sideEffects": false,
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-context-zone-peer-dep"
diff --git a/packages/opentelemetry-context-zone/package.json b/packages/opentelemetry-context-zone/package.json
index 97d69c3dba..bc85a4f72a 100644
--- a/packages/opentelemetry-context-zone/package.json
+++ b/packages/opentelemetry-context-zone/package.json
@@ -57,7 +57,7 @@
   },
   "dependencies": {
     "@opentelemetry/context-zone-peer-dep": "1.24.1",
-    "zone.js": "^0.11.0 || ^0.13.0 || ^0.14.0"
+    "zone.js": "^0.11.0 || ^0.12.0 || ^0.13.0 || ^0.14.0"
   },
   "sideEffects": true,
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-context-zone"
diff --git a/selenium-tests/package.json b/selenium-tests/package.json
index d2b94d1315..80676ae770 100644
--- a/selenium-tests/package.json
+++ b/selenium-tests/package.json
@@ -67,6 +67,6 @@
     "@opentelemetry/sdk-metrics": "1.24.1",
     "@opentelemetry/sdk-trace-base": "1.24.1",
     "@opentelemetry/sdk-trace-web": "1.24.1",
-    "zone.js": "^0.11.0 || ^0.13.0 || ^0.14.0"
+    "zone.js": "^0.11.0 || ^0.12.0 || ^0.13.0 || ^0.14.0"
   }
 }