node-red 4.1.15 → 4.1.17
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +9 -0
- package/package.json +8 -8
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,12 @@
|
|
|
1
|
+
#### 4.1.17: Maintenance Release
|
|
2
|
+
|
|
3
|
+
- Fix merge conflict resolution bug (#5999) @knolleary
|
|
4
|
+
- Verify resolveMerge is called for valid files pending conflict resolution (#5998) @knolleary
|
|
5
|
+
|
|
6
|
+
#### 4.1.16: Maintenance Release
|
|
7
|
+
|
|
8
|
+
- Update dependencies
|
|
9
|
+
|
|
1
10
|
#### 4.1.15: Maintenance Release
|
|
2
11
|
|
|
3
12
|
- Migrate to patched JSONata (4.1.x backport) (#5939)0 @knolleary
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "node-red",
|
|
3
|
-
"version": "4.1.
|
|
3
|
+
"version": "4.1.17",
|
|
4
4
|
"description": "Low-code programming for event-driven applications",
|
|
5
5
|
"homepage": "https://nodered.org",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -31,16 +31,16 @@
|
|
|
31
31
|
"flow"
|
|
32
32
|
],
|
|
33
33
|
"dependencies": {
|
|
34
|
-
"@node-red/editor-api": "4.1.
|
|
35
|
-
"@node-red/runtime": "4.1.
|
|
36
|
-
"@node-red/util": "4.1.
|
|
37
|
-
"@node-red/nodes": "4.1.
|
|
34
|
+
"@node-red/editor-api": "4.1.17",
|
|
35
|
+
"@node-red/runtime": "4.1.17",
|
|
36
|
+
"@node-red/util": "4.1.17",
|
|
37
|
+
"@node-red/nodes": "4.1.17",
|
|
38
38
|
"basic-auth": "2.0.1",
|
|
39
39
|
"bcryptjs": "3.0.3",
|
|
40
40
|
"cors": "2.8.6",
|
|
41
|
-
"express": "4.22.
|
|
42
|
-
"fs-extra": "11.4.
|
|
43
|
-
"node-red-admin": "^4.1.
|
|
41
|
+
"express": "4.22.3",
|
|
42
|
+
"fs-extra": "11.4.1",
|
|
43
|
+
"node-red-admin": "^4.1.8",
|
|
44
44
|
"nopt": "5.0.0",
|
|
45
45
|
"semver": "7.8.5"
|
|
46
46
|
},
|