From fe187226bb8972e0559e377a4b269cef3976d1f2 Mon Sep 17 00:00:00 2001 From: Evan Hahn <69474926+EvanHahn-Signal@users.noreply.github.com> Date: Fri, 12 Feb 2021 18:43:24 -0600 Subject: [PATCH] Upgrade protobufjs to 6.10.2 --- package.json | 2 +- ts/util/lint/exceptions.json | 54 ++++++++++++++++++------------------ yarn.lock | 29 ++++++++----------- 3 files changed, 40 insertions(+), 45 deletions(-) diff --git a/package.json b/package.json index 0dc480000c..ebb862707b 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "parchment": "1.1.4", "pify": "3.0.0", "popper.js": "1.15.0", - "protobufjs": "6.8.6", + "protobufjs": "6.10.2", "proxy-agent": "3.1.1", "quill": "1.3.7", "quill-delta": "4.0.1", diff --git a/ts/util/lint/exceptions.json b/ts/util/lint/exceptions.json index e8ef749bab..63727572f2 100644 --- a/ts/util/lint/exceptions.json +++ b/ts/util/lint/exceptions.json @@ -11947,7 +11947,7 @@ "rule": "eval", "path": "node_modules/protobufjs/dist/light/protobuf.js", "line": " var mod = eval(\"quire\".replace(/^/,\"re\"))(moduleName); // eslint-disable-line no-eval", - "lineNumber": 878, + "lineNumber": 880, "reasonCategory": "usageTrusted", "updated": "2019-03-09T00:08:44.242Z", "reasonDetail": "Eval is used here to produce and evaluate the expression 'require'" @@ -11956,7 +11956,7 @@ "rule": "jQuery-load(", "path": "node_modules/protobufjs/dist/light/protobuf.js", "line": "function load(filename, root, callback) {", - "lineNumber": 2185, + "lineNumber": 2217, "reasonCategory": "falseMatch", "updated": "2019-03-09T00:08:44.242Z" }, @@ -11964,7 +11964,7 @@ "rule": "jQuery-load(", "path": "node_modules/protobufjs/dist/light/protobuf.js", "line": " return root.load(filename, callback);", - "lineNumber": 2191, + "lineNumber": 2223, "reasonCategory": "falseMatch", "updated": "2019-03-09T00:08:44.242Z" }, @@ -11972,7 +11972,7 @@ "rule": "jQuery-load(", "path": "node_modules/protobufjs/dist/light/protobuf.js", "line": "// function load(filename:string, callback:LoadCallback):undefined", - "lineNumber": 2204, + "lineNumber": 2236, "reasonCategory": "exampleCode", "updated": "2019-03-09T00:08:44.242Z" }, @@ -11980,7 +11980,7 @@ "rule": "jQuery-load(", "path": "node_modules/protobufjs/dist/light/protobuf.js", "line": "// function load(filename:string, [root:Root]):Promise", - "lineNumber": 2216, + "lineNumber": 2248, "reasonCategory": "exampleCode", "updated": "2019-03-09T00:08:44.242Z" }, @@ -11988,7 +11988,7 @@ "rule": "jQuery-load(", "path": "node_modules/protobufjs/dist/light/protobuf.js", "line": "Root.prototype.load = function load(filename, options, callback) {", - "lineNumber": 4096, + "lineNumber": 4195, "reasonCategory": "falseMatch", "updated": "2019-03-09T00:08:44.242Z" }, @@ -11996,7 +11996,7 @@ "rule": "jQuery-load(", "path": "node_modules/protobufjs/dist/light/protobuf.js", "line": "// function load(filename:string, options:IParseOptions, callback:LoadCallback):undefined", - "lineNumber": 4223, + "lineNumber": 4324, "reasonCategory": "exampleCode", "updated": "2019-03-09T00:08:44.242Z" }, @@ -12004,7 +12004,7 @@ "rule": "jQuery-load(", "path": "node_modules/protobufjs/dist/light/protobuf.js", "line": "// function load(filename:string, callback:LoadCallback):undefined", - "lineNumber": 4233, + "lineNumber": 4334, "reasonCategory": "exampleCode", "updated": "2019-03-09T00:08:44.242Z" }, @@ -12012,7 +12012,7 @@ "rule": "jQuery-load(", "path": "node_modules/protobufjs/dist/light/protobuf.js", "line": "// function load(filename:string, [options:IParseOptions]):Promise", - "lineNumber": 4243, + "lineNumber": 4344, "reasonCategory": "exampleCode", "updated": "2019-03-09T00:08:44.242Z" }, @@ -12020,7 +12020,7 @@ "rule": "jQuery-load(", "path": "node_modules/protobufjs/dist/light/protobuf.js", "line": " return this.load(filename, options, SYNC);", - "lineNumber": 4256, + "lineNumber": 4357, "reasonCategory": "falseMatch", "updated": "2019-03-09T00:08:44.242Z" }, @@ -12043,7 +12043,7 @@ "rule": "eval", "path": "node_modules/protobufjs/dist/minimal/protobuf.js", "line": " var mod = eval(\"quire\".replace(/^/,\"re\"))(moduleName); // eslint-disable-line no-eval", - "lineNumber": 660, + "lineNumber": 662, "reasonCategory": "usageTrusted", "updated": "2019-03-09T00:08:44.242Z", "reasonDetail": "Eval is used here to produce and evaluate the expression 'require'" @@ -12060,7 +12060,7 @@ "rule": "eval", "path": "node_modules/protobufjs/dist/protobuf.js", "line": " var mod = eval(\"quire\".replace(/^/,\"re\"))(moduleName); // eslint-disable-line no-eval", - "lineNumber": 878, + "lineNumber": 880, "reasonCategory": "usageTrusted", "updated": "2019-03-09T00:08:44.242Z", "reasonDetail": "Eval is used here to produce and evaluate the expression 'require'" @@ -12069,7 +12069,7 @@ "rule": "jQuery-load(", "path": "node_modules/protobufjs/dist/protobuf.js", "line": "function load(filename, root, callback) {", - "lineNumber": 2586, + "lineNumber": 2618, "reasonCategory": "falseMatch", "updated": "2019-03-09T00:08:44.242Z" }, @@ -12077,7 +12077,7 @@ "rule": "jQuery-load(", "path": "node_modules/protobufjs/dist/protobuf.js", "line": " return root.load(filename, callback);", - "lineNumber": 2592, + "lineNumber": 2624, "reasonCategory": "falseMatch", "updated": "2019-03-09T00:08:44.242Z" }, @@ -12085,7 +12085,7 @@ "rule": "jQuery-load(", "path": "node_modules/protobufjs/dist/protobuf.js", "line": "// function load(filename:string, callback:LoadCallback):undefined", - "lineNumber": 2605, + "lineNumber": 2637, "reasonCategory": "exampleCode", "updated": "2019-03-09T00:08:44.242Z" }, @@ -12093,7 +12093,7 @@ "rule": "jQuery-load(", "path": "node_modules/protobufjs/dist/protobuf.js", "line": "// function load(filename:string, [root:Root]):Promise", - "lineNumber": 2617, + "lineNumber": 2649, "reasonCategory": "exampleCode", "updated": "2019-03-09T00:08:44.242Z" }, @@ -12101,7 +12101,7 @@ "rule": "jQuery-load(", "path": "node_modules/protobufjs/dist/protobuf.js", "line": "Root.prototype.load = function load(filename, options, callback) {", - "lineNumber": 5270, + "lineNumber": 5399, "reasonCategory": "falseMatch", "updated": "2019-03-09T00:08:44.242Z" }, @@ -12109,7 +12109,7 @@ "rule": "jQuery-load(", "path": "node_modules/protobufjs/dist/protobuf.js", "line": "// function load(filename:string, options:IParseOptions, callback:LoadCallback):undefined", - "lineNumber": 5397, + "lineNumber": 5528, "reasonCategory": "exampleCode", "updated": "2019-03-09T00:08:44.242Z" }, @@ -12117,7 +12117,7 @@ "rule": "jQuery-load(", "path": "node_modules/protobufjs/dist/protobuf.js", "line": "// function load(filename:string, callback:LoadCallback):undefined", - "lineNumber": 5407, + "lineNumber": 5538, "reasonCategory": "exampleCode", "updated": "2019-03-09T00:08:44.242Z" }, @@ -12125,7 +12125,7 @@ "rule": "jQuery-load(", "path": "node_modules/protobufjs/dist/protobuf.js", "line": "// function load(filename:string, [options:IParseOptions]):Promise", - "lineNumber": 5417, + "lineNumber": 5548, "reasonCategory": "exampleCode", "updated": "2019-03-09T00:08:44.242Z" }, @@ -12133,7 +12133,7 @@ "rule": "jQuery-load(", "path": "node_modules/protobufjs/dist/protobuf.js", "line": " return this.load(filename, options, SYNC);", - "lineNumber": 5430, + "lineNumber": 5561, "reasonCategory": "falseMatch", "updated": "2019-03-09T00:08:44.242Z" }, @@ -12195,7 +12195,7 @@ "rule": "jQuery-load(", "path": "node_modules/protobufjs/src/root.js", "line": "Root.prototype.load = function load(filename, options, callback) {", - "lineNumber": 75, + "lineNumber": 85, "reasonCategory": "falseMatch", "updated": "2018-09-15T00:38:04.183Z" }, @@ -12203,7 +12203,7 @@ "rule": "jQuery-load(", "path": "node_modules/protobufjs/src/root.js", "line": "// function load(filename:string, options:IParseOptions, callback:LoadCallback):undefined", - "lineNumber": 202, + "lineNumber": 214, "reasonCategory": "falseMatch", "updated": "2018-09-15T00:38:04.183Z" }, @@ -12211,7 +12211,7 @@ "rule": "jQuery-load(", "path": "node_modules/protobufjs/src/root.js", "line": "// function load(filename:string, callback:LoadCallback):undefined", - "lineNumber": 212, + "lineNumber": 224, "reasonCategory": "falseMatch", "updated": "2018-09-15T00:38:04.183Z" }, @@ -12219,7 +12219,7 @@ "rule": "jQuery-load(", "path": "node_modules/protobufjs/src/root.js", "line": "// function load(filename:string, [options:IParseOptions]):Promise", - "lineNumber": 222, + "lineNumber": 234, "reasonCategory": "falseMatch", "updated": "2018-09-15T00:38:04.183Z" }, @@ -12227,7 +12227,7 @@ "rule": "jQuery-load(", "path": "node_modules/protobufjs/src/root.js", "line": " return this.load(filename, options, SYNC);", - "lineNumber": 235, + "lineNumber": 247, "reasonCategory": "falseMatch", "updated": "2018-09-15T00:38:04.183Z" }, @@ -15321,4 +15321,4 @@ "updated": "2021-01-08T15:46:32.143Z", "reasonDetail": "Doesn't manipulate the DOM. This is just a function." } -] +] \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index 0c33106a38..f21c0b6304 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2313,16 +2313,11 @@ resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.106.tgz#6093e9a02aa567ddecfe9afadca89e53e5dce4dd" integrity sha512-tOSvCVrvSqFZ4A/qrqqm6p37GZoawsZtoR0SJhlF7EonNZUgrn8FfT+RNQ11h+NUpMt6QVe36033f3qEKBwfWA== -"@types/long@4.0.1": +"@types/long@4.0.1", "@types/long@^4.0.1": version "4.0.1" resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.1.tgz#459c65fa1867dafe6a8f322c4c51695663cc55e9" integrity sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w== -"@types/long@^3.0.32": - version "3.0.32" - resolved "https://registry.yarnpkg.com/@types/long/-/long-3.0.32.tgz#f4e5af31e9e9b196d8e5fca8a5e2e20aa3d60b69" - integrity sha512-ZXyOOm83p7X8p3s0IYM3VeueNmHpkk/yMlP8CLeOnEcu6hIwPH7YjZBvhQkR0ZFS2DqZAxKtJ/M5fcuv3OU5BA== - "@types/memoizee@0.4.2": version "0.4.2" resolved "https://registry.yarnpkg.com/@types/memoizee/-/memoizee-0.4.2.tgz#a500158999a8144a9b46cf9a9fb49b15f1853573" @@ -2375,16 +2370,16 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.27.tgz#d7506f73160ad30fcebbcf5b8b7d2d976e649e42" integrity sha512-odQFl/+B9idbdS0e8IxDl2ia/LP8KZLXhV3BUeI98TrZp0uoIzQPhGd+5EtzHmT0SMOIaPd7jfz6pOHLWTtl7A== +"@types/node@^13.7.0": + version "13.13.41" + resolved "https://registry.yarnpkg.com/@types/node/-/node-13.13.41.tgz#045a4981318d31a581650ce70f340a32c3461198" + integrity sha512-qLT9IvHiXJfdrje9VmsLzun7cQ65obsBTmtU3EOnCSLFOoSHx1hpiRHoBnpdbyFqnzqdUUIv81JcEJQCB8un9g== + "@types/node@^6.14.4": version "6.14.10" resolved "https://registry.yarnpkg.com/@types/node/-/node-6.14.10.tgz#d9ce598127eb0cc02821476862d11389cb01f6a4" integrity sha512-pF4HjZGSog75kGq7B1InK/wt/N08BuPATo+7HRfv7gZUzccebwv/fmWVGs/j6LvSiLWpCuGGhql51M/wcQsNzA== -"@types/node@^8.9.4": - version "8.10.40" - resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.40.tgz#4314888d5cd537945d73e9ce165c04cc550144a4" - integrity sha512-RRSjdwz63kS4u7edIwJUn8NqKLLQ6LyqF/X4+4jp38MBT3Vwetewi2N4dgJEshLbDwNgOJXNYoOwzVZUSSLhkQ== - "@types/normalize-path@3.0.0": version "3.0.0" resolved "https://registry.yarnpkg.com/@types/normalize-path/-/normalize-path-3.0.0.tgz#bb5c46cab77b93350b4cf8d7ff1153f47189ae31" @@ -12945,10 +12940,10 @@ proto-list@~1.2.1: resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849" integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk= -protobufjs@6.8.6: - version "6.8.6" - resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.8.6.tgz#ce3cf4fff9625b62966c455fc4c15e4331a11ca2" - integrity sha512-eH2OTP9s55vojr3b7NBaF9i4WhWPkv/nq55nznWNp/FomKrLViprUcqnBjHph2tFQ+7KciGPTPsVWGz0SOhL0Q== +protobufjs@6.10.2: + version "6.10.2" + resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.10.2.tgz#b9cb6bd8ec8f87514592ba3fdfd28e93f33a469b" + integrity sha512-27yj+04uF6ya9l+qfpH187aqEzfCF4+Uit0I9ZBQVqK09hk/SQzKa2MUqUpXaVa7LOFRg1TSSr3lVxGOk6c0SQ== dependencies: "@protobufjs/aspromise" "^1.1.2" "@protobufjs/base64" "^1.1.2" @@ -12960,8 +12955,8 @@ protobufjs@6.8.6: "@protobufjs/path" "^1.1.2" "@protobufjs/pool" "^1.1.0" "@protobufjs/utf8" "^1.1.0" - "@types/long" "^3.0.32" - "@types/node" "^8.9.4" + "@types/long" "^4.0.1" + "@types/node" "^13.7.0" long "^4.0.0" protocols@^1.1.0, protocols@^1.4.0: