From bf8714edcba8a2384db857696a1608215548d182 Mon Sep 17 00:00:00 2001
From: Rodger Brennan <4884521+rodgerbrennan@users.noreply.github.com>
Date: Tue, 16 Jan 2024 22:45:56 -0500
Subject: [PATCH] chore(opentelemetry-context-zone-peer-dep): support zone.js
 ^v0.13.0 (#4320)

* chore(opentelemetry-context-zone-peer-dep):
update deps to support angular 16
closes issue #4245

Signed-off-by: rbrennan <4884521+rodgerbrennan@users.noreply.github.com>

* update packages

* Revert "update packages"

This reverts commit 624df4ea2e3dcd235f0dfd72da66cbf427aaccd2.

* chore: sync package-lock.json

* chore: sync package-lock.json

* chore: sync package-lock.json

* Update ZoneContextManager.test to use ES5 UMD bundle

* add changelog

* remove trailing space from changelog

---------

Signed-off-by: rbrennan <4884521+rodgerbrennan@users.noreply.github.com>
Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
---
 CHANGELOG.md                                  |  2 ++
 package-lock.json                             | 19 +++++++++++--------
 .../package.json                              |  4 ++--
 .../test/ZoneContextManager.test.ts           |  2 +-
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fc065fe434..7079975e3d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,8 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/
 
 ### :house: (Internal)
 
+* chore(opentelemetry-context-zone-peer-dep): support zone.js ^v0.13.0 [#4320](https://github.com/open-telemetry/opentelemetry-js/pull/4320)
+
 ## 1.20.0
 
 ### :rocket: (Enhancement)
diff --git a/package-lock.json b/package-lock.json
index 3d300e8275..2f9b117d0d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -33029,14 +33029,14 @@
         "typescript": "4.4.4",
         "webpack": "5.89.0",
         "webpack-cli": "5.1.4",
-        "zone.js": "0.11.4"
+        "zone.js": "0.13.3"
       },
       "engines": {
         "node": ">=14"
       },
       "peerDependencies": {
         "@opentelemetry/api": ">=1.0.0 <1.8.0",
-        "zone.js": "^0.10.2 || ^0.11.0"
+        "zone.js": "^0.10.2 || ^0.11.0 || ^0.13.0"
       }
     },
     "packages/opentelemetry-context-zone-peer-dep/node_modules/@webpack-cli/configtest": {
@@ -33305,11 +33305,12 @@
       }
     },
     "packages/opentelemetry-context-zone-peer-dep/node_modules/zone.js": {
-      "version": "0.11.4",
+      "version": "0.13.3",
+      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.13.3.tgz",
+      "integrity": "sha512-MKPbmZie6fASC/ps4dkmIhaT5eonHkEt6eAy80K42tAm0G2W+AahLJjbfi6X9NPdciOE9GRFTTM8u2IiF6O3ww==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "tslib": "^2.0.0"
+        "tslib": "^2.3.0"
       }
     },
     "packages/opentelemetry-context-zone/node_modules/@webpack-cli/configtest": {
@@ -39331,7 +39332,7 @@
         "typescript": "4.4.4",
         "webpack": "5.89.0",
         "webpack-cli": "5.1.4",
-        "zone.js": "0.11.4"
+        "zone.js": "0.13.3"
       },
       "dependencies": {
         "@webpack-cli/configtest": {
@@ -39468,10 +39469,12 @@
           }
         },
         "zone.js": {
-          "version": "0.11.4",
+          "version": "0.13.3",
+          "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.13.3.tgz",
+          "integrity": "sha512-MKPbmZie6fASC/ps4dkmIhaT5eonHkEt6eAy80K42tAm0G2W+AahLJjbfi6X9NPdciOE9GRFTTM8u2IiF6O3ww==",
           "dev": true,
           "requires": {
-            "tslib": "^2.0.0"
+            "tslib": "^2.3.0"
           }
         }
       }
diff --git a/packages/opentelemetry-context-zone-peer-dep/package.json b/packages/opentelemetry-context-zone-peer-dep/package.json
index d183ebeec8..91c7ce8a19 100644
--- a/packages/opentelemetry-context-zone-peer-dep/package.json
+++ b/packages/opentelemetry-context-zone-peer-dep/package.json
@@ -79,11 +79,11 @@
     "typescript": "4.4.4",
     "webpack": "5.89.0",
     "webpack-cli": "5.1.4",
-    "zone.js": "0.11.4"
+    "zone.js": "0.13.3"
   },
   "peerDependencies": {
     "@opentelemetry/api": ">=1.0.0 <1.8.0",
-    "zone.js": "^0.10.2 || ^0.11.0"
+    "zone.js": "^0.10.2 || ^0.11.0 || ^0.13.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-peer-dep/test/ZoneContextManager.test.ts b/packages/opentelemetry-context-zone-peer-dep/test/ZoneContextManager.test.ts
index aea0dacb27..068107de42 100644
--- a/packages/opentelemetry-context-zone-peer-dep/test/ZoneContextManager.test.ts
+++ b/packages/opentelemetry-context-zone-peer-dep/test/ZoneContextManager.test.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import 'zone.js';
+import 'zone.js/dist/zone';
 import * as sinon from 'sinon';
 import * as assert from 'assert';
 import { ZoneContextManager } from '../src';