Merge pull request #92 from vcl/chore/resolve-upstream-conflit

chore: resolve upstream conflit in ng-vcl module
vcl · Sep 24, 2024 · 83515c5 · 83515c5
2 parents 8b934dc + 5d387a9
commit 83515c5
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 18 deletions.
diff --git a/lib/ng-vcl/package.json b/lib/ng-vcl/package.json
@@ -9,12 +9,12 @@
   "author": "The ng-vcl authors",
   "license": "MIT",
   "peerDependencies": {
-    "@angular/cdk": "^17.3.2",
-    "@angular/common": "^17.3.2",
-    "@angular/animations": "^17.3.2",
-    "@angular/core": "^17.3.2",
-    "@angular/forms": "^17.3.2",
-    "@angular/router": "^17.3.2",
+    "@angular/cdk": "^18.2.5",
+    "@angular/common": "^18.2.5",
+    "@angular/animations": "^18.2.5",
+    "@angular/core": "^18.2.5",
+    "@angular/forms": "^18.2.5",
+    "@angular/router": "^18.2.5",
     "rxjs": "^7.8.1"
   }
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -49,15 +49,15 @@
     "fuse.js": "^7.0.0",
     "hammerjs": "^2.0.8",
     "jsonschema": "^1.4.1",
-    "marked": "^14.1.2",
+    "marked": "^13.0.2",
     "ngx-markdown": "^18.0.0",
     "normalize.css": "^8.0.1",
     "raw-loader": "^4.0.2",
     "rxjs": "^7.8.1",
     "sass": "^1.79.3",
     "sass-loader": "^16.0.2",
     "tslib": "^2.7.0",
-    "zone.js": "^0.15.0"
+    "zone.js": "~0.14.10"
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "^18.2.5",