This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/storm.git
The following commit(s) were added to refs/heads/master by this push:
new da2eeca77 build(deps): bump js-yaml from 4.2.0 to 5.2.0 in
/storm-webapp (#8855)
da2eeca77 is described below
commit da2eeca77ecbbc19ca72e54f8c0e74f89cd89122
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Thu Jul 2 13:32:56 2026 +0200
build(deps): bump js-yaml from 4.2.0 to 5.2.0 in /storm-webapp (#8855)
* build(deps): bump js-yaml from 4.2.0 to 5.2.0 in /storm-webapp
Bumps [js-yaml](https://github.com/nodeca/js-yaml) from 4.2.0 to 5.2.0.
- [Changelog](https://github.com/nodeca/js-yaml/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nodeca/js-yaml/compare/4.2.0...5.2.0)
---
updated-dependencies:
- dependency-name: js-yaml
dependency-version: 5.2.0
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <[email protected]>
* build(deps): bump netty-tcnative.version (#8821)
Bumps `netty-tcnative.version` from 2.0.77.Final to 2.0.80.Final.
Updates `io.netty:netty-tcnative` from 2.0.77.Final to 2.0.80.Final
- [Release notes](https://github.com/netty/netty-tcnative/releases)
-
[Commits](https://github.com/netty/netty-tcnative/compare/netty-tcnative-parent-2.0.77.Final...netty-tcnative-parent-2.0.80.Final)
Updates `io.netty:netty-tcnative-boringssl-static` from 2.0.77.Final to
2.0.80.Final
- [Release notes](https://github.com/netty/netty-tcnative/releases)
-
[Commits](https://github.com/netty/netty-tcnative/compare/netty-tcnative-parent-2.0.77.Final...netty-tcnative-parent-2.0.80.Final)
---
updated-dependencies:
- dependency-name: io.netty:netty-tcnative
dependency-version: 2.0.80.Final
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: io.netty:netty-tcnative-boringssl-static
dependency-version: 2.0.80.Final
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
* fix(webapp): guard Flux viewer against js-yaml 5.x empty-input throw
js-yaml 5.x changed load('') to throw a YAMLException ('expected a
document, but the input is empty') instead of returning undefined (see
js-yaml migrate_v4_to_v5). The Flux Topology Viewer calls
parseAndRender() on page load while the textarea holds only a comment
(# YAML Definition), so jsyaml.load() now throws before the existing
if(doc==null) guard, surfacing as an uncaught exception that fails the
cypress-e2e suite (flux-page.cy.js).
Wrap the load in try/catch and treat empty/comment-only or malformed
input as 'no document'. Also broaden cypress-tests.yml to run on 2.x so
this class of webapp regression is exercised there too (2.x already
shipped js-yaml 5.2.0 and carries the same latent bug).
---------
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Richard Zowalla <[email protected]>
---
.github/workflows/cypress-tests.yml | 4 ++--
storm-webapp/package-lock.json | 10 +++++-----
storm-webapp/package.json | 2 +-
.../src/main/java/org/apache/storm/daemon/ui/WEB-INF/flux.html | 9 ++++++++-
4 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/.github/workflows/cypress-tests.yml
b/.github/workflows/cypress-tests.yml
index fc2c6007e..50b71368c 100644
--- a/.github/workflows/cypress-tests.yml
+++ b/.github/workflows/cypress-tests.yml
@@ -17,11 +17,11 @@ name: Cypress E2E Tests
on:
push:
- branches: [ "master" ]
+ branches: [ "master", "2.x" ]
paths:
- 'storm-webapp/**'
pull_request:
- branches: [ "master" ]
+ branches: [ "master", "2.x" ]
paths:
- 'storm-webapp/**'
workflow_dispatch:
diff --git a/storm-webapp/package-lock.json b/storm-webapp/package-lock.json
index 05cc6b267..9777b69b5 100644
--- a/storm-webapp/package-lock.json
+++ b/storm-webapp/package-lock.json
@@ -20,7 +20,7 @@
"jquery": "4.0.0",
"jquery-blockui": "2.7.0",
"js-cookie": "3.0.8",
- "js-yaml": "4.2.0",
+ "js-yaml": "5.2.0",
"moment": "2.30.1",
"mustache": "4.2.0",
"typeahead.js": "0.11.1",
@@ -3123,9 +3123,9 @@
"license": "MIT"
},
"node_modules/js-yaml": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.2.0.tgz";,
- "integrity":
"sha512-ePWsvanv0DWuDRsW8dnt+R4jQ31SCRCQ7hhNcPXZPsoBZiemuZNYGf7adZdqX2D86j6rvKp3RpCxVTSb8WQlOw==",
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-5.2.0.tgz";,
+ "integrity":
"sha512-YeLUMlvR4Ou1B119LIaM0r65JvbOBooJDc9yEu0dClb/uSC5P4FrLU8OCCz/HXWvtPoIrR0dRzABTjo1sTN9Bw==",
"funding": [
{
"type": "github",
@@ -3141,7 +3141,7 @@
"argparse": "^2.0.1"
},
"bin": {
- "js-yaml": "bin/js-yaml.js"
+ "js-yaml": "bin/js-yaml.mjs"
}
},
"node_modules/jsbn": {
diff --git a/storm-webapp/package.json b/storm-webapp/package.json
index 1af031636..3765ad54e 100644
--- a/storm-webapp/package.json
+++ b/storm-webapp/package.json
@@ -24,7 +24,7 @@
"jquery": "4.0.0",
"jquery-blockui": "2.7.0",
"js-cookie": "3.0.8",
- "js-yaml": "4.2.0",
+ "js-yaml": "5.2.0",
"moment": "2.30.1",
"mustache": "4.2.0",
"typeahead.js": "0.11.1",
diff --git
a/storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/flux.html
b/storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/flux.html
index ad676c17a..9d8699921 100644
--- a/storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/flux.html
+++ b/storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/flux.html
@@ -70,7 +70,14 @@
function parseAndRender() {
var input = document.getElementById('taInput').value;
- var doc = jsyaml.load(input);
+ var doc;
+ try {
+ doc = jsyaml.load(input);
+ } catch (e) {
+ // js-yaml >=5 throws on empty/comment-only input instead of
+ // returning undefined (see migrate_v4_to_v5); treat as no document.
+ return;
+ }
if(doc==null){
return;
}
