From 23c61a284dcc17e5a1c49f8348c595666244ab53 Mon Sep 17 00:00:00 2001 From: kotaNakatsuji Date: Thu, 10 Jul 2025 14:21:25 +0900 Subject: [PATCH 1/7] =?UTF-8?q?#41=20node.js=20v22=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/release.yml | 12 ++++++------ .github/workflows/tests.yml | 12 ++++++------ package.json | 2 +- test/nodes/core/parsers/70-JSON_spec.js | 6 +++--- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 85fc1f92ad..f7c311ce92 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,22 +14,22 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out node-red repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: path: 'node-red' - name: Check out node-red-docker repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: repository: 'node-red/node-red-docker' path: 'node-red-docker' - name: Check out node-red.github.io repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: repository: 'node-red/node-red.github.io' path: 'node-red.github.io' - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v4 with: - node-version: '16' + node-version: '22' - run: node ./node-red/.github/scripts/update-node-red-docker.js - name: Create Docker Pull Request uses: peter-evans/create-pull-request@v2 @@ -59,4 +59,4 @@ jobs: body: | Updates the Node-RED Website repo for the ${{ env.newVersion }} release. - This PR was auto-generated by a GitHub Action. Any questions, speak to @knolleary + This PR was auto-generated by a GitHub Action. Any questions, speak to @knolleary \ No newline at end of file diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 28d3c1b32e..5bdcaeb19f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -17,11 +17,11 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node-version: [14, 16] + node-version: [22] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} - name: Install Dependencies @@ -30,7 +30,7 @@ jobs: run: | npm run test - name: Publish to coveralls.io - if: ${{ matrix.node-version == 14 }} - uses: coverallsapp/github-action@v1.1.2 + if: ${{ matrix.node-version == 22 }} + uses: coverallsapp/github-action@v2 with: - github-token: ${{ github.token }} + github-token: ${{ github.token }} \ No newline at end of file diff --git a/package.json b/package.json index 864dd1ead3..190890ee90 100644 --- a/package.json +++ b/package.json @@ -125,6 +125,6 @@ "supertest": "6.2.4" }, "engines": { - "node": ">=14" + "node": "22.x" } } diff --git a/test/nodes/core/parsers/70-JSON_spec.js b/test/nodes/core/parsers/70-JSON_spec.js index c3a2216e0a..6e6648cb9b 100644 --- a/test/nodes/core/parsers/70-JSON_spec.js +++ b/test/nodes/core/parsers/70-JSON_spec.js @@ -173,7 +173,7 @@ describe('JSON node', function() { }); logEvents.should.have.length(1); logEvents[0][0].should.have.a.property('msg'); - logEvents[0][0].msg.should.startWith("Unexpected token o"); + logEvents[0][0].msg.should.startWith("Unexpected token 'o'"); logEvents[0][0].should.have.a.property('level',helper.log().ERROR); done(); } catch(err) { done(err) } @@ -199,7 +199,7 @@ describe('JSON node', function() { }); logEvents.should.have.length(1); logEvents[0][0].should.have.a.property('msg'); - logEvents[0][0].msg.should.startWith("Unexpected token o"); + logEvents[0][0].msg.should.startWith("Unexpected token 'o'"); logEvents[0][0].should.have.a.property('level',helper.log().ERROR); done(); } catch(err) { done(err) } @@ -587,4 +587,4 @@ describe('JSON node', function() { jn1.receive({payload:jsonObject, schema:schema}); }); }); -}); +}); \ No newline at end of file From eb66e14df9aa09232e5c343c85dcdf00b8160ad5 Mon Sep 17 00:00:00 2001 From: kotaNakatsuji Date: Thu, 10 Jul 2025 14:25:32 +0900 Subject: [PATCH 2/7] =?UTF-8?q?#41=20GHA=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5bdcaeb19f..771915a885 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -2,9 +2,9 @@ name: Run tests on: push: - branches: [ master, dev ] + branches: [ master, dev, develop ] pull_request: - branches: [ master, dev ] + branches: [ master, dev, develop ] permissions: contents: read From 9675c69460792594ed67947f3012be98a1d3399d Mon Sep 17 00:00:00 2001 From: kotaNakatsuji Date: Thu, 10 Jul 2025 14:35:43 +0900 Subject: [PATCH 3/7] =?UTF-8?q?#41=20GHA=E3=82=92=E3=82=82=E3=81=A8?= =?UTF-8?q?=E3=81=AB=E6=88=BB=E3=81=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/release.yml | 10 +++++----- .github/workflows/tests.yml | 16 ++++++++-------- test/nodes/core/parsers/70-JSON_spec.js | 6 +++--- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f7c311ce92..1c118c1679 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,22 +14,22 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out node-red repository - uses: actions/checkout@v4 + uses: actions/checkout@v2 with: path: 'node-red' - name: Check out node-red-docker repository - uses: actions/checkout@v4 + uses: actions/checkout@v2 with: repository: 'node-red/node-red-docker' path: 'node-red-docker' - name: Check out node-red.github.io repository - uses: actions/checkout@v4 + uses: actions/checkout@v2 with: repository: 'node-red/node-red.github.io' path: 'node-red.github.io' - - uses: actions/setup-node@v4 + - uses: actions/setup-node@v1 with: - node-version: '22' + node-version: '16' - run: node ./node-red/.github/scripts/update-node-red-docker.js - name: Create Docker Pull Request uses: peter-evans/create-pull-request@v2 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 771915a885..28d3c1b32e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -2,9 +2,9 @@ name: Run tests on: push: - branches: [ master, dev, develop ] + branches: [ master, dev ] pull_request: - branches: [ master, dev, develop ] + branches: [ master, dev ] permissions: contents: read @@ -17,11 +17,11 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node-version: [22] + node-version: [14, 16] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v3 - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v4 + uses: actions/setup-node@v3 with: node-version: ${{ matrix.node-version }} - name: Install Dependencies @@ -30,7 +30,7 @@ jobs: run: | npm run test - name: Publish to coveralls.io - if: ${{ matrix.node-version == 22 }} - uses: coverallsapp/github-action@v2 + if: ${{ matrix.node-version == 14 }} + uses: coverallsapp/github-action@v1.1.2 with: - github-token: ${{ github.token }} \ No newline at end of file + github-token: ${{ github.token }} diff --git a/test/nodes/core/parsers/70-JSON_spec.js b/test/nodes/core/parsers/70-JSON_spec.js index 6e6648cb9b..c3a2216e0a 100644 --- a/test/nodes/core/parsers/70-JSON_spec.js +++ b/test/nodes/core/parsers/70-JSON_spec.js @@ -173,7 +173,7 @@ describe('JSON node', function() { }); logEvents.should.have.length(1); logEvents[0][0].should.have.a.property('msg'); - logEvents[0][0].msg.should.startWith("Unexpected token 'o'"); + logEvents[0][0].msg.should.startWith("Unexpected token o"); logEvents[0][0].should.have.a.property('level',helper.log().ERROR); done(); } catch(err) { done(err) } @@ -199,7 +199,7 @@ describe('JSON node', function() { }); logEvents.should.have.length(1); logEvents[0][0].should.have.a.property('msg'); - logEvents[0][0].msg.should.startWith("Unexpected token 'o'"); + logEvents[0][0].msg.should.startWith("Unexpected token o"); logEvents[0][0].should.have.a.property('level',helper.log().ERROR); done(); } catch(err) { done(err) } @@ -587,4 +587,4 @@ describe('JSON node', function() { jn1.receive({payload:jsonObject, schema:schema}); }); }); -}); \ No newline at end of file +}); From 9476578a7820a9233efe3b7835770526a3f27e96 Mon Sep 17 00:00:00 2001 From: kotaNakatsuji Date: Thu, 10 Jul 2025 14:37:25 +0900 Subject: [PATCH 4/7] =?UTF-8?q?#41=20=E5=B7=AE=E5=88=86=E3=81=AE=E8=A7=A3?= =?UTF-8?q?=E6=B6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1c118c1679..85fc1f92ad 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -59,4 +59,4 @@ jobs: body: | Updates the Node-RED Website repo for the ${{ env.newVersion }} release. - This PR was auto-generated by a GitHub Action. Any questions, speak to @knolleary \ No newline at end of file + This PR was auto-generated by a GitHub Action. Any questions, speak to @knolleary From 86bd1385a9c0d89a2dd23371a75a7e30f95351ae Mon Sep 17 00:00:00 2001 From: kotaNakatsuji Date: Thu, 10 Jul 2025 16:27:46 +0900 Subject: [PATCH 5/7] =?UTF-8?q?#41=20=E4=BE=9D=E5=AD=98=E9=96=A2=E4=BF=82?= =?UTF-8?q?=E3=81=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 55 ++++++++++++++++++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index 190890ee90..b0a6bb34d0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { - "name": "@uhuru/node-red", - "version": "3.0.2-n.1", + "name": "node-red", + "version": "3.0.2", "description": "Low-code programming for event-driven applications", "homepage": "http://nodered.org", "license": "Apache-2.0", @@ -28,22 +28,21 @@ "dependencies": { "acorn": "8.7.1", "acorn-walk": "8.2.0", - "ajv": "8.11.0", + "ajv": "^8.12.0", "async-mutex": "0.3.2", "basic-auth": "2.0.1", "bcryptjs": "2.4.3", - "body-parser": "1.20.0", + "body-parser": "^1.20.3", "cheerio": "1.0.0-rc.10", "clone": "2.1.2", "content-type": "1.0.4", - "cookie": "0.5.0", - "cookie-parser": "1.4.6", + "cookie": "^1.0.2", + "cookie-parser": "^1.4.6", "cors": "2.8.5", "cronosjs": "1.7.1", - "d3": "^7.4.2", "denque": "2.1.0", - "express": "4.18.1", - "express-session": "1.17.3", + "express": "^4.21.2", + "express-session": "^1.17.3", "form-data": "4.0.0", "fs-extra": "10.1.0", "got": "11.8.5", @@ -55,20 +54,17 @@ "is-utf8": "0.2.1", "js-yaml": "4.1.0", "json-stringify-safe": "5.0.1", - "jsonata": "1.8.6", + "jsonata": "^1.8.7", "lodash.clonedeep": "^4.5.0", "media-typer": "1.1.0", "memorystore": "1.6.7", "mime": "3.0.0", "moment": "2.29.4", - "moment-timezone": "0.5.34", + "moment-timezone": "^0.5.48", "mqtt": "4.3.7", "multer": "1.4.5-lts.1", "mustache": "4.2.0", "node-red-admin": "^3.0.0", - "node-red-dashboard": "^3.4.0", - "node-red-node-email": "^2.0.0", - "node-red-node-tail": "^0.4.0", "node-watch": "0.7.3", "nopt": "5.0.0", "oauth2orize": "1.11.1", @@ -77,19 +73,19 @@ "passport-http-bearer": "1.0.1", "passport-oauth2-client-password": "0.1.2", "raw-body": "2.5.1", - "semver": "7.3.7", - "tar": "6.1.11", - "tough-cookie": "4.0.0", + "semver": "^7.5.2", + "tar": "^6.2.1", + "tough-cookie": "^4.1.4", "uglify-js": "3.16.3", "uuid": "8.3.2", - "ws": "7.5.6", - "xml2js": "0.4.23" + "ws": "^7.5.10", + "xml2js": "^0.6.2" }, "optionalDependencies": { "bcrypt": "5.0.1" }, "devDependencies": { - "dompurify": "2.3.10", + "dompurify": "^3.2.5", "grunt": "1.5.3", "grunt-chmod": "~1.1.1", "grunt-cli": "~1.4.3", @@ -126,5 +122,22 @@ }, "engines": { "node": "22.x" + }, + "overrides": { + "grunt-jsonlint": { + "ajv": "^6.12.4" + }, + "cross-spawn": "^7.0.6", + "nanoid": "^3.3.9", + "serialize-javascript": "^6.0.2", + "shelljs": "^0.8.5", + "cookie": "^1.0.2", + "jsonata": "^1.8.7", + "moment-timezone": "^0.5.48", + "semver": "^7.5.2", + "tar": "^6.2.1", + "tough-cookie": "^4.1.4", + "ws": "^7.5.10", + "xml2js": "^0.6.2" } -} +} \ No newline at end of file From 32b0cdf1309a77f4ee657de245df387058adc153 Mon Sep 17 00:00:00 2001 From: kotaNakatsuji Date: Thu, 10 Jul 2025 16:32:31 +0900 Subject: [PATCH 6/7] =?UTF-8?q?#41=20grunt=E3=81=AEverifyPackageDependenci?= =?UTF-8?q?es=E3=81=A7=E3=82=A8=E3=83=A9=E3=83=BC=E3=81=8C=E5=87=BA?= =?UTF-8?q?=E3=82=8B=E3=81=9F=E3=82=81overrides=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 53 ++++++++++++++++++++-------------------------------- 1 file changed, 20 insertions(+), 33 deletions(-) diff --git a/package.json b/package.json index b0a6bb34d0..98be319f55 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { - "name": "node-red", - "version": "3.0.2", + "name": "@uhuru/node-red", + "version": "3.0.2-n.1", "description": "Low-code programming for event-driven applications", "homepage": "http://nodered.org", "license": "Apache-2.0", @@ -28,21 +28,22 @@ "dependencies": { "acorn": "8.7.1", "acorn-walk": "8.2.0", - "ajv": "^8.12.0", + "ajv": "8.11.0", "async-mutex": "0.3.2", "basic-auth": "2.0.1", "bcryptjs": "2.4.3", - "body-parser": "^1.20.3", + "body-parser": "1.20.0", "cheerio": "1.0.0-rc.10", "clone": "2.1.2", "content-type": "1.0.4", - "cookie": "^1.0.2", - "cookie-parser": "^1.4.6", + "cookie": "0.5.0", + "cookie-parser": "1.4.6", "cors": "2.8.5", "cronosjs": "1.7.1", + "d3": "^7.4.2", "denque": "2.1.0", - "express": "^4.21.2", - "express-session": "^1.17.3", + "express": "4.18.1", + "express-session": "1.17.3", "form-data": "4.0.0", "fs-extra": "10.1.0", "got": "11.8.5", @@ -54,17 +55,20 @@ "is-utf8": "0.2.1", "js-yaml": "4.1.0", "json-stringify-safe": "5.0.1", - "jsonata": "^1.8.7", + "jsonata": "1.8.6", "lodash.clonedeep": "^4.5.0", "media-typer": "1.1.0", "memorystore": "1.6.7", "mime": "3.0.0", "moment": "2.29.4", - "moment-timezone": "^0.5.48", + "moment-timezone": "0.5.34", "mqtt": "4.3.7", "multer": "1.4.5-lts.1", "mustache": "4.2.0", "node-red-admin": "^3.0.0", + "node-red-dashboard": "^3.4.0", + "node-red-node-email": "^2.0.0", + "node-red-node-tail": "^0.4.0", "node-watch": "0.7.3", "nopt": "5.0.0", "oauth2orize": "1.11.1", @@ -73,19 +77,19 @@ "passport-http-bearer": "1.0.1", "passport-oauth2-client-password": "0.1.2", "raw-body": "2.5.1", - "semver": "^7.5.2", - "tar": "^6.2.1", - "tough-cookie": "^4.1.4", + "semver": "7.3.7", + "tar": "6.1.11", + "tough-cookie": "4.0.0", "uglify-js": "3.16.3", "uuid": "8.3.2", - "ws": "^7.5.10", - "xml2js": "^0.6.2" + "ws": "7.5.6", + "xml2js": "0.4.23" }, "optionalDependencies": { "bcrypt": "5.0.1" }, "devDependencies": { - "dompurify": "^3.2.5", + "dompurify": "2.3.10", "grunt": "1.5.3", "grunt-chmod": "~1.1.1", "grunt-cli": "~1.4.3", @@ -122,22 +126,5 @@ }, "engines": { "node": "22.x" - }, - "overrides": { - "grunt-jsonlint": { - "ajv": "^6.12.4" - }, - "cross-spawn": "^7.0.6", - "nanoid": "^3.3.9", - "serialize-javascript": "^6.0.2", - "shelljs": "^0.8.5", - "cookie": "^1.0.2", - "jsonata": "^1.8.7", - "moment-timezone": "^0.5.48", - "semver": "^7.5.2", - "tar": "^6.2.1", - "tough-cookie": "^4.1.4", - "ws": "^7.5.10", - "xml2js": "^0.6.2" } } \ No newline at end of file From dd226ff91b90e8e4264f8a63fb9332d575b382da Mon Sep 17 00:00:00 2001 From: kotaNakatsuji Date: Thu, 10 Jul 2025 16:33:33 +0900 Subject: [PATCH 7/7] =?UTF-8?q?#41=20=E3=83=AA=E3=83=95=E3=82=A1=E3=82=AF?= =?UTF-8?q?=E3=82=BF=E3=83=AA=E3=83=B3=E3=82=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 98be319f55..190890ee90 100644 --- a/package.json +++ b/package.json @@ -127,4 +127,4 @@ "engines": { "node": "22.x" } -} \ No newline at end of file +}