Skip to content

Commit 1dbc188

Browse files
committed
Merge main: resolve test conflicts
Resolved merge conflicts by keeping both decompress and logging tests for Cloudflare and Compute@Edge, and taking main's version of context-logger.test.js which includes Fastly logger tests. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> Signed-off-by: Lars Trieloff <lars@trieloff.net>
2 parents 2d3eee9 + e3d7cf4 commit 1dbc188

File tree

5 files changed

+503
-146
lines changed

5 files changed

+503
-146
lines changed

CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
## [1.2.3](https://github.com/adobe/helix-deploy-plugin-edge/compare/v1.2.2...v1.2.3) (2025-11-24)
2+
3+
4+
### Bug Fixes
5+
6+
* **deps:** update external fixes ([#91](https://github.com/adobe/helix-deploy-plugin-edge/issues/91)) ([f713084](https://github.com/adobe/helix-deploy-plugin-edge/commit/f7130847ca847a35bb815daa2efa2cf737806225))
7+
8+
## [1.2.2](https://github.com/adobe/helix-deploy-plugin-edge/compare/v1.2.1...v1.2.2) (2025-11-24)
9+
10+
11+
### Bug Fixes
12+
13+
* **deps:** update dependency @adobe/fastly-native-promises to v3.0.19 ([#90](https://github.com/adobe/helix-deploy-plugin-edge/issues/90)) ([f164d1f](https://github.com/adobe/helix-deploy-plugin-edge/commit/f164d1fb13d46be3bd2a5a1d80b6edb595f60653))
14+
115
## [1.2.1](https://github.com/adobe/helix-deploy-plugin-edge/compare/v1.2.0...v1.2.1) (2025-11-24)
216

317

package-lock.json

Lines changed: 126 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@adobe/helix-deploy-plugin-edge",
3-
"version": "1.2.1",
3+
"version": "1.2.3",
44
"description": "Helix Deploy - Plugin for Edge Compute",
55
"main": "src/index.js",
66
"type": "module",
@@ -41,10 +41,10 @@
4141
"fs-extra": "11.3.2",
4242
"husky": "9.1.7",
4343
"lint-staged": "16.2.6",
44-
"mocha": "11.7.4",
44+
"mocha": "11.7.5",
4545
"mocha-multi-reporters": "1.5.1",
4646
"nock": "13.5.6",
47-
"semantic-release": "25.0.1",
47+
"semantic-release": "25.0.2",
4848
"yauzl": "3.2.0"
4949
},
5050
"lint-staged": {
@@ -56,8 +56,8 @@
5656
"@adobe/helix-deploy-plugin-webpack": "^1.0.2"
5757
},
5858
"dependencies": {
59-
"@adobe/fastly-native-promises": "3.0.18",
60-
"@fastly/js-compute": "3.35.1",
59+
"@adobe/fastly-native-promises": "3.0.19",
60+
"@fastly/js-compute": "3.35.2",
6161
"chalk-template": "1.1.2",
6262
"constants-browserify": "1.0.0",
6363
"form-data": "4.0.4",

0 commit comments

Comments
 (0)