2
0
Эх сурвалжийг харах

Fixed building WeKan. Updated dompurify. Forked Meteor 2.14 version of meteor-node-stubs to update elliptic.

Thanks to delopers of depedencies and xet7 !

Fixes #5694
Lauri Ojansivu 3 сар өмнө
parent
commit
18d0fa4327
2 өөрчлөгдсөн 77 нэмэгдсэн , 156 устгасан
  1. 75 154
      package-lock.json
  2. 2 2
      package.json

+ 75 - 154
package-lock.json

@@ -108,6 +108,12 @@
       "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.63.tgz",
       "integrity": "sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ=="
     },
+    "@types/trusted-types": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz",
+      "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==",
+      "optional": true
+    },
     "@wekanteam/dragscroll": {
       "version": "git+https://github.com/wekan/dragscroll.git#6ea215c8cdbde9362ecba8ffb72ce9f9fde842d2",
       "from": "git+https://github.com/wekan/dragscroll.git"
@@ -600,9 +606,12 @@
       }
     },
     "dompurify": {
-      "version": "2.5.6",
-      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.5.6.tgz",
-      "integrity": "sha512-zUTaUBO8pY4+iJMPE1B9XlO2tXVYIcEA4SNGtvDELzTSCQO7RzH+j7S180BmhmJId78lqGU2z19vgVx2Sxs/PQ=="
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.2.4.tgz",
+      "integrity": "sha512-ysFSFEDVduQpyhzAob/kkuJjf5zWkZD8/A9ywSp1byueyuCfHamrCBa14/Oc2iiB0e51B+NpxSl5gmzn+Ms/mg==",
+      "requires": {
+        "@types/trusted-types": "^2.0.7"
+      }
     },
     "domutils": {
       "version": "2.8.0",
@@ -1373,16 +1382,15 @@
       "integrity": "sha512-SBbbYWvFYvsxHVL+q6ZB8lT3rp2LSvfALD2V52H+MGH2IgJsevy0VtXRkRG0EsUewwOaDTIKBn9DlD8HQ3GSwg=="
     },
     "meteor-node-stubs": {
-      "version": "1.2.12",
-      "resolved": "https://registry.npmjs.org/meteor-node-stubs/-/meteor-node-stubs-1.2.12.tgz",
-      "integrity": "sha512-mzp3KI2aGNDhFlCVXPd0pfMr2z9A5vl1AqEgV13/z7AgKwcbd2X+ymE6tpSAMkrrQb40PU9PC2B59bCb6XkAaw==",
+      "version": "git+https://github.com/wekan/meteor-node-stubs.git#4f2609bc4d9d700ff79424ad4ed8dbf1f06666cb",
+      "from": "git+https://github.com/wekan/meteor-node-stubs.git",
       "requires": {
-        "@meteorjs/crypto-browserify": "^3.12.1",
         "assert": "^2.1.0",
         "browserify-zlib": "^0.2.0",
         "buffer": "^5.7.1",
         "console-browserify": "^1.2.0",
         "constants-browserify": "^1.0.0",
+        "crypto-browserify": "^3.12.0",
         "domain-browser": "^4.23.0",
         "elliptic": "^6.6.0",
         "events": "^3.3.0",
@@ -1398,46 +1406,19 @@
         "string_decoder": "^1.3.0",
         "timers-browserify": "^2.0.12",
         "tty-browserify": "0.0.1",
-        "url": "^0.11.4",
+        "url": "^0.11.3",
         "util": "^0.12.5",
         "vm-browserify": "^1.1.2"
       },
       "dependencies": {
-        "@meteorjs/crypto-browserify": {
-          "version": "3.12.1",
-          "bundled": true,
-          "requires": {
-            "browserify-cipher": "^1.0.1",
-            "browserify-sign": "^4.2.3",
-            "create-ecdh": "^4.0.4",
-            "create-hash": "^1.2.0",
-            "create-hmac": "^1.1.7",
-            "diffie-hellman": "^5.0.3",
-            "hash-base": "~3.0.4",
-            "inherits": "^2.0.4",
-            "pbkdf2": "^3.1.2",
-            "public-encrypt": "^4.0.3",
-            "randombytes": "^2.1.0",
-            "randomfill": "^1.0.4"
-          },
-          "dependencies": {
-            "hash-base": {
-              "version": "3.0.4",
-              "bundled": true,
-              "requires": {
-                "inherits": "^2.0.1",
-                "safe-buffer": "^5.0.1"
-              }
-            }
-          }
-        },
         "asn1.js": {
-          "version": "4.10.1",
+          "version": "5.4.1",
           "bundled": true,
           "requires": {
             "bn.js": "^4.0.0",
             "inherits": "^2.0.1",
-            "minimalistic-assert": "^1.0.0"
+            "minimalistic-assert": "^1.0.0",
+            "safer-buffer": "^2.1.0"
           },
           "dependencies": {
             "bn.js": {
@@ -1513,64 +1494,23 @@
           }
         },
         "browserify-sign": {
-          "version": "4.2.3",
+          "version": "4.2.2",
           "bundled": true,
           "requires": {
             "bn.js": "^5.2.1",
             "browserify-rsa": "^4.1.0",
             "create-hash": "^1.2.0",
             "create-hmac": "^1.1.7",
-            "elliptic": "^6.5.5",
-            "hash-base": "~3.0",
+            "elliptic": "^6.5.4",
             "inherits": "^2.0.4",
-            "parse-asn1": "^5.1.7",
-            "readable-stream": "^2.3.8",
+            "parse-asn1": "^5.1.6",
+            "readable-stream": "^3.6.2",
             "safe-buffer": "^5.2.1"
           },
           "dependencies": {
             "bn.js": {
               "version": "5.2.1",
               "bundled": true
-            },
-            "hash-base": {
-              "version": "3.0.4",
-              "bundled": true,
-              "requires": {
-                "inherits": "^2.0.1",
-                "safe-buffer": "^5.0.1"
-              }
-            },
-            "readable-stream": {
-              "version": "2.3.8",
-              "bundled": true,
-              "requires": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.3",
-                "isarray": "~1.0.0",
-                "process-nextick-args": "~2.0.0",
-                "safe-buffer": "~5.1.1",
-                "string_decoder": "~1.1.1",
-                "util-deprecate": "~1.0.1"
-              },
-              "dependencies": {
-                "safe-buffer": {
-                  "version": "5.1.2",
-                  "bundled": true
-                }
-              }
-            },
-            "string_decoder": {
-              "version": "1.1.1",
-              "bundled": true,
-              "requires": {
-                "safe-buffer": "~5.1.0"
-              },
-              "dependencies": {
-                "safe-buffer": {
-                  "version": "5.1.2",
-                  "bundled": true
-                }
-              }
             }
           }
         },
@@ -1598,14 +1538,12 @@
           "bundled": true
         },
         "call-bind": {
-          "version": "1.0.7",
+          "version": "1.0.5",
           "bundled": true,
           "requires": {
-            "es-define-property": "^1.0.0",
-            "es-errors": "^1.3.0",
             "function-bind": "^1.1.2",
-            "get-intrinsic": "^1.2.4",
-            "set-function-length": "^1.2.1"
+            "get-intrinsic": "^1.2.1",
+            "set-function-length": "^1.1.1"
           }
         },
         "cipher-base": {
@@ -1624,10 +1562,6 @@
           "version": "1.0.0",
           "bundled": true
         },
-        "core-util-is": {
-          "version": "1.0.3",
-          "bundled": true
-        },
         "create-ecdh": {
           "version": "4.0.4",
           "bundled": true,
@@ -1665,13 +1599,30 @@
             "sha.js": "^2.4.8"
           }
         },
+        "crypto-browserify": {
+          "version": "3.12.0",
+          "bundled": true,
+          "requires": {
+            "browserify-cipher": "^1.0.0",
+            "browserify-sign": "^4.0.0",
+            "create-ecdh": "^4.0.0",
+            "create-hash": "^1.1.0",
+            "create-hmac": "^1.1.0",
+            "diffie-hellman": "^5.0.0",
+            "inherits": "^2.0.1",
+            "pbkdf2": "^3.0.3",
+            "public-encrypt": "^4.0.0",
+            "randombytes": "^2.0.0",
+            "randomfill": "^1.0.3"
+          }
+        },
         "define-data-property": {
-          "version": "1.1.4",
+          "version": "1.1.1",
           "bundled": true,
           "requires": {
-            "es-define-property": "^1.0.0",
-            "es-errors": "^1.3.0",
-            "gopd": "^1.0.1"
+            "get-intrinsic": "^1.2.1",
+            "gopd": "^1.0.1",
+            "has-property-descriptors": "^1.0.0"
           }
         },
         "define-properties": {
@@ -1711,7 +1662,7 @@
           "bundled": true
         },
         "elliptic": {
-          "version": "6.6.0",
+          "version": "6.6.1",
           "bundled": true,
           "requires": {
             "bn.js": "^4.11.9",
@@ -1724,22 +1675,11 @@
           },
           "dependencies": {
             "bn.js": {
-              "version": "4.12.0",
+              "version": "4.12.1",
               "bundled": true
             }
           }
         },
-        "es-define-property": {
-          "version": "1.0.0",
-          "bundled": true,
-          "requires": {
-            "get-intrinsic": "^1.2.4"
-          }
-        },
-        "es-errors": {
-          "version": "1.3.0",
-          "bundled": true
-        },
         "events": {
           "version": "3.3.0",
           "bundled": true
@@ -1764,10 +1704,9 @@
           "bundled": true
         },
         "get-intrinsic": {
-          "version": "1.2.4",
+          "version": "1.2.2",
           "bundled": true,
           "requires": {
-            "es-errors": "^1.3.0",
             "function-bind": "^1.1.2",
             "has-proto": "^1.0.1",
             "has-symbols": "^1.0.3",
@@ -1782,10 +1721,10 @@
           }
         },
         "has-property-descriptors": {
-          "version": "1.0.2",
+          "version": "1.0.1",
           "bundled": true,
           "requires": {
-            "es-define-property": "^1.0.0"
+            "get-intrinsic": "^1.2.2"
           }
         },
         "has-proto": {
@@ -1882,10 +1821,6 @@
             "which-typed-array": "^1.1.11"
           }
         },
-        "isarray": {
-          "version": "1.0.0",
-          "bundled": true
-        },
         "md5.js": {
           "version": "1.3.5",
           "bundled": true,
@@ -1918,7 +1853,7 @@
           "bundled": true
         },
         "object-inspect": {
-          "version": "1.13.2",
+          "version": "1.13.1",
           "bundled": true
         },
         "object-is": {
@@ -1952,25 +1887,14 @@
           "bundled": true
         },
         "parse-asn1": {
-          "version": "5.1.7",
+          "version": "5.1.6",
           "bundled": true,
           "requires": {
-            "asn1.js": "^4.10.1",
-            "browserify-aes": "^1.2.0",
-            "evp_bytestokey": "^1.0.3",
-            "hash-base": "~3.0",
-            "pbkdf2": "^3.1.2",
-            "safe-buffer": "^5.2.1"
-          },
-          "dependencies": {
-            "hash-base": {
-              "version": "3.0.4",
-              "bundled": true,
-              "requires": {
-                "inherits": "^2.0.1",
-                "safe-buffer": "^5.0.1"
-              }
-            }
+            "asn1.js": "^5.2.0",
+            "browserify-aes": "^1.0.0",
+            "evp_bytestokey": "^1.0.0",
+            "pbkdf2": "^3.0.3",
+            "safe-buffer": "^5.1.1"
           }
         },
         "path-browserify": {
@@ -1992,10 +1916,6 @@
           "version": "0.11.10",
           "bundled": true
         },
-        "process-nextick-args": {
-          "version": "2.0.1",
-          "bundled": true
-        },
         "public-encrypt": {
           "version": "4.0.3",
           "bundled": true,
@@ -2019,10 +1939,10 @@
           "bundled": true
         },
         "qs": {
-          "version": "6.13.0",
+          "version": "6.11.2",
           "bundled": true,
           "requires": {
-            "side-channel": "^1.0.6"
+            "side-channel": "^1.0.4"
           }
         },
         "querystring-es3": {
@@ -2065,16 +1985,18 @@
           "version": "5.2.1",
           "bundled": true
         },
+        "safer-buffer": {
+          "version": "2.1.2",
+          "bundled": true
+        },
         "set-function-length": {
-          "version": "1.2.2",
+          "version": "1.1.1",
           "bundled": true,
           "requires": {
-            "define-data-property": "^1.1.4",
-            "es-errors": "^1.3.0",
-            "function-bind": "^1.1.2",
-            "get-intrinsic": "^1.2.4",
+            "define-data-property": "^1.1.1",
+            "get-intrinsic": "^1.2.1",
             "gopd": "^1.0.1",
-            "has-property-descriptors": "^1.0.2"
+            "has-property-descriptors": "^1.0.0"
           }
         },
         "setimmediate": {
@@ -2090,13 +2012,12 @@
           }
         },
         "side-channel": {
-          "version": "1.0.6",
+          "version": "1.0.4",
           "bundled": true,
           "requires": {
-            "call-bind": "^1.0.7",
-            "es-errors": "^1.3.0",
-            "get-intrinsic": "^1.2.4",
-            "object-inspect": "^1.13.1"
+            "call-bind": "^1.0.0",
+            "get-intrinsic": "^1.0.2",
+            "object-inspect": "^1.9.0"
           }
         },
         "stream-browserify": {
@@ -2136,11 +2057,11 @@
           "bundled": true
         },
         "url": {
-          "version": "0.11.4",
+          "version": "0.11.3",
           "bundled": true,
           "requires": {
             "punycode": "^1.4.1",
-            "qs": "^6.12.3"
+            "qs": "^6.11.2"
           }
         },
         "util": {

+ 2 - 2
package.json

@@ -28,7 +28,7 @@
     "ajv": "^6.12.6",
     "bcryptjs": "^2.4.3",
     "bson": "^4.5.2",
-    "dompurify": "^2.5.6",
+    "dompurify": "^3.2.4",
     "es6-promise": "^4.2.4",
     "escape-string-regexp": "^5.0.0",
     "fibers": "^5.0.3",
@@ -44,7 +44,7 @@
     "markdown-it-emoji": "^2.0.0",
     "markdown-it-mathjax3": "^4.3.2",
     "meteor-accounts-t9n": "^2.6.0",
-    "meteor-node-stubs": "^1.2.12",
+    "meteor-node-stubs": "https://github.com/wekan/meteor-node-stubs.git",
     "minio": "^7.1.3",
     "moment": "^2.29.4",
     "os": "^0.1.2",