Merge commit '15b2d7eec59c745b418debf63907d8bd08c4a730' into glitch-soc/merge-upstream

Conflicts: - `package.json`: Upstream split some dependencies, including `express`, to `streaming/package.json`. However, glitch-soc had extra dependencies textually close to `express`. Kept the extra dependencies and moved `express` to streaming. - `yarn.lock`: Upstream split some dependencies, including `express`, to `streaming/package.json`. However, glitch-soc had extra dependencies textually close to `express`. Kept the extra dependencies and moved `express` to streaming.
2023-12-19 20:06:32 +01:00 · 2023-12-19 20:06:32 +01:00 · 8afd313807
parent cd1e3ac2c7 15b2d7eec5
commit 8afd313807
10 changed files with 140 additions and 122 deletions
--- a/.github/workflows/test-ruby.yml
+++ b/.github/workflows/test-ruby.yml
@ -94,7 +94,7 @@ jobs:
      DB_HOST: localhost
      DB_USER: postgres
      DB_PASS: postgres
-      DISABLE_SIMPLECOV: true
+      DISABLE_SIMPLECOV: ${{ matrix.ruby-version != '.ruby-version' }}
      RAILS_ENV: test
      ALLOW_NOPAM: true
      PAM_ENABLED: true
@ -137,6 +137,12 @@ jobs:

      - run: bin/rspec

+      - name: Upload coverage reports to Codecov
+        if: matrix.ruby-version == '.ruby-version'
+        uses: codecov/codecov-action@v3
+        with:
+          files: coverage/lcov/mastodon.lcov
+
  test-e2e:
    name: End to End testing
    runs-on: ubuntu-latest
--- a/1
+++ b/1
@ -139,6 +139,7 @@ group :test do

  # Coverage formatter for RSpec test if DISABLE_SIMPLECOV is false
  gem 'simplecov', '~> 0.22', require: false
+  gem 'simplecov-lcov', '~> 0.8', require: false

  # Stub web requests for specs
  gem 'webmock', '~> 3.18'
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -725,6 +725,7 @@ GEM
      simplecov-html (~> 0.11)
      simplecov_json_formatter (~> 0.1)
    simplecov-html (0.12.3)
+    simplecov-lcov (0.8.0)
    simplecov_json_formatter (0.1.4)
    smart_properties (1.17.0)
    sprockets (3.7.2)
@ -936,6 +937,7 @@ DEPENDENCIES
  simple-navigation (~> 4.4)
  simple_form (~> 5.2)
  simplecov (~> 0.22)
+  simplecov-lcov (~> 0.8)
  sprockets (~> 3.7.2)
  sprockets-rails (~> 3.4)
  stackprof
--- a/Procfile.dev
+++ b/Procfile.dev
@ -1,4 +1,4 @@
 web: env PORT=3000 RAILS_ENV=development bundle exec puma -C config/puma.rb
 sidekiq: env PORT=3000 RAILS_ENV=development bundle exec sidekiq
-stream: env PORT=4000 yarn run start
+stream: env PORT=4000 yarn workspace @mastodon/streaming start
 webpack: bin/webpack-dev-server
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@ -37,7 +37,7 @@ class Tag < ApplicationRecord

  HASHTAG_RE = %r{(?<![=/)\w])#(#{HASHTAG_NAME_PAT})}i
  HASHTAG_NAME_RE = /\A(#{HASHTAG_NAME_PAT})\z/i
-  HASHTAG_INVALID_CHARS_RE = /[^[:alnum:]#{HASHTAG_SEPARATORS}]/
+  HASHTAG_INVALID_CHARS_RE = /[^[:alnum:]\u0E47-\u0E4E#{HASHTAG_SEPARATORS}]/

  validates :name, presence: true, format: { with: HASHTAG_NAME_RE }
  validates :display_name, format: { with: HASHTAG_NAME_RE }
--- a/package.json
+++ b/package.json
@ -1,11 +1,13 @@
 {
  "name": "@mastodon/mastodon",
  "license": "AGPL-3.0-or-later",
+  "packageManager": "yarn@4.0.2",
  "engines": {
    "node": ">=18"
  },
  "workspaces": [
-    "."
+    ".",
+    "streaming"
  ],
  "scripts": {
    "build:development": "cross-env RAILS_ENV=development NODE_ENV=development ./bin/webpack",
@ -72,11 +74,9 @@
    "css-loader": "^5.2.7",
    "cssnano": "^6.0.1",
    "detect-passive-events": "^2.0.3",
-    "dotenv": "^16.0.3",
    "emoji-mart": "npm:emoji-mart-lazyload@latest",
    "escape-html": "^1.0.3",
    "exif-js": "^2.3.0",
-    "express": "^4.18.2",
    "favico.js": "^0.3.10",
    "file-loader": "^6.2.0",
    "font-awesome": "^4.7.0",
@ -88,21 +88,15 @@
    "immutable": "^4.3.0",
    "imports-loader": "^1.2.0",
    "intl-messageformat": "^10.3.5",
-    "ioredis": "^5.3.2",
    "js-yaml": "^4.1.0",
-    "jsdom": "^22.1.0",
    "lodash": "^4.17.21",
    "mark-loader": "^0.1.6",
    "marky": "^1.2.5",
    "mini-css-extract-plugin": "^1.6.2",
    "mkdirp": "^3.0.1",
-    "npmlog": "^7.0.1",
    "path-complete-extname": "^1.0.0",
-    "pg": "^8.5.0",
-    "pg-connection-string": "^2.6.0",
    "postcss": "^8.4.24",
    "postcss-loader": "^4.3.0",
-    "prom-client": "^15.0.0",
    "prop-types": "^15.8.1",
    "punycode": "^2.3.0",
    "react": "^18.2.0",
@ -141,7 +135,6 @@
    "tesseract.js": "^2.1.5",
    "tiny-queue": "^0.2.1",
    "twitter-text": "3.1.0",
-    "uuid": "^9.0.0",
    "webpack": "^4.47.0",
    "webpack-assets-manifest": "^4.0.6",
    "webpack-bundle-analyzer": "^4.8.0",
@ -153,8 +146,7 @@
    "workbox-routing": "^7.0.0",
    "workbox-strategies": "^7.0.0",
    "workbox-webpack-plugin": "^7.0.0",
-    "workbox-window": "^7.0.0",
-    "ws": "^8.12.1"
+    "workbox-window": "^7.0.0"
  },
  "devDependencies": {
    "@formatjs/cli": "^6.1.1",
@ -163,16 +155,13 @@
    "@types/babel__core": "^7.20.1",
    "@types/emoji-mart": "^3.0.9",
    "@types/escape-html": "^1.0.2",
-    "@types/express": "^4.17.17",
    "@types/hoist-non-react-statics": "^3.3.1",
    "@types/http-link-header": "^1.0.3",
    "@types/intl": "^1.2.0",
    "@types/jest": "^29.5.2",
    "@types/js-yaml": "^4.0.5",
    "@types/lodash": "^4.14.195",
-    "@types/npmlog": "^4.1.4",
    "@types/object-assign": "^4.0.30",
-    "@types/pg": "^8.6.6",
    "@types/prop-types": "^15.7.5",
    "@types/punycode": "^2.1.0",
    "@types/react": "^18.2.7",
@ -191,7 +180,6 @@
    "@types/react-toggle": "^4.0.3",
    "@types/redux-immutable": "^4.0.3",
    "@types/requestidlecallback": "^0.3.5",
-    "@types/uuid": "^9.0.0",
    "@types/webpack": "^4.41.33",
    "@types/yargs": "^17.0.24",
    "@typescript-eslint/eslint-plugin": "^6.0.0",
@ -235,15 +223,10 @@
      "optional": true
    }
  },
-  "optionalDependencies": {
-    "bufferutil": "^4.0.7",
-    "utf-8-validate": "^6.0.3"
-  },
  "lint-staged": {
    "*": "prettier --ignore-unknown --write",
    "Capfile|Gemfile|*.{rb,ruby,ru,rake}": "bundle exec rubocop --force-exclusion -a",
    "*.{js,jsx,ts,tsx}": "eslint --fix",
    "*.{css,scss}": "stylelint --fix"
-  },
-  "packageManager": "yarn@4.0.2"
+  }
 }
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@ -2,13 +2,21 @@

 if ENV['DISABLE_SIMPLECOV'] != 'true'
  require 'simplecov'
+  require 'simplecov-lcov'
+  SimpleCov::Formatter::LcovFormatter.config.report_with_single_file = true
+  SimpleCov.formatter = SimpleCov::Formatter::LcovFormatter
  SimpleCov.start 'rails' do
+    enable_coverage :branch
+    enable_coverage_for_eval
+
    add_filter 'lib/linter'
    add_group 'Policies', 'app/policies'
    add_group 'Presenters', 'app/presenters'
    add_group 'Serializers', 'app/serializers'
    add_group 'Services', 'app/services'
    add_group 'Validators', 'app/validators'
+
+    add_group 'Libraries', 'lib'
  end
 end

--- a/streaming/index.js
+++ b/streaming/index.js
@ -2,6 +2,7 @@

 const fs = require('fs');
 const http = require('http');
+const path = require('path');
 const url = require('url');

 const dotenv = require('dotenv');
@ -17,8 +18,11 @@ const WebSocket = require('ws');

 const environment = process.env.NODE_ENV || 'development';

+// Correctly detect and load .env or .env.production file based on environment:
+const dotenvFile = environment === 'production' ? '.env.production' : '.env';
+
 dotenv.config({
-  path: environment === 'production' ? '.env.production' : '.env',
+  path: path.resolve(__dirname, path.join('..', dotenvFile))
 });

 log.level = process.env.LOG_LEVEL || 'verbose';
--- a/streaming/package.json
+++ b/streaming/package.json
@ -0,0 +1,39 @@
+{
+  "name": "@mastodon/streaming",
+  "license": "AGPL-3.0-or-later",
+  "packageManager": "yarn@4.0.1",
+  "engines": {
+    "node": ">=18"
+  },
+  "description": "Mastodon's Streaming Server",
+  "private": true,
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/mastodon/mastodon.git"
+  },
+  "scripts": {
+    "start": "node ./index.js"
+  },
+  "dependencies": {
+    "dotenv": "^16.0.3",
+    "express": "^4.18.2",
+    "ioredis": "^5.3.2",
+    "jsdom": "^22.1.0",
+    "npmlog": "^7.0.1",
+    "pg": "^8.5.0",
+    "pg-connection-string": "^2.6.0",
+    "prom-client": "^15.0.0",
+    "uuid": "^9.0.0",
+    "ws": "^8.12.1"
+  },
+  "devDependencies": {
+    "@types/express": "^4.17.17",
+    "@types/npmlog": "^4.1.4",
+    "@types/pg": "^8.6.6",
+    "@types/uuid": "^9.0.0"
+  },
+  "optionalDependencies": {
+    "bufferutil": "^4.0.7",
+    "utf-8-validate": "^6.0.3"
+  }
+}
--- a/yarn.lock
+++ b/yarn.lock
@ -2368,16 +2368,13 @@ __metadata:
    "@types/babel__core": "npm:^7.20.1"
    "@types/emoji-mart": "npm:^3.0.9"
    "@types/escape-html": "npm:^1.0.2"
-    "@types/express": "npm:^4.17.17"
    "@types/hoist-non-react-statics": "npm:^3.3.1"
    "@types/http-link-header": "npm:^1.0.3"
    "@types/intl": "npm:^1.2.0"
    "@types/jest": "npm:^29.5.2"
    "@types/js-yaml": "npm:^4.0.5"
    "@types/lodash": "npm:^4.14.195"
-    "@types/npmlog": "npm:^4.1.4"
    "@types/object-assign": "npm:^4.0.30"
-    "@types/pg": "npm:^8.6.6"
    "@types/prop-types": "npm:^15.7.5"
    "@types/punycode": "npm:^2.1.0"
    "@types/react": "npm:^18.2.7"
@ -2396,7 +2393,6 @@ __metadata:
    "@types/react-toggle": "npm:^4.0.3"
    "@types/redux-immutable": "npm:^4.0.3"
    "@types/requestidlecallback": "npm:^0.3.5"
-    "@types/uuid": "npm:^9.0.0"
    "@types/webpack": "npm:^4.41.33"
    "@types/yargs": "npm:^17.0.24"
    "@typescript-eslint/eslint-plugin": "npm:^6.0.0"
@ -2413,7 +2409,6 @@ __metadata:
    babel-plugin-preval: "npm:^5.1.0"
    babel-plugin-transform-react-remove-prop-types: "npm:^0.4.24"
    blurhash: "npm:^2.0.5"
-    bufferutil: "npm:^4.0.7"
    circular-dependency-plugin: "npm:^5.2.2"
    classnames: "npm:^2.3.2"
    cocoon-js-vanilla: "npm:^1.3.0"
@ -2424,7 +2419,6 @@ __metadata:
    css-loader: "npm:^5.2.7"
    cssnano: "npm:^6.0.1"
    detect-passive-events: "npm:^2.0.3"
-    dotenv: "npm:^16.0.3"
    emoji-mart: "npm:emoji-mart-lazyload@latest"
    escape-html: "npm:^1.0.3"
    eslint: "npm:^8.41.0"
@ -2439,7 +2433,6 @@ __metadata:
    eslint-plugin-react: "npm:~7.33.0"
    eslint-plugin-react-hooks: "npm:^4.6.0"
    exif-js: "npm:^2.3.0"
-    express: "npm:^4.18.2"
    favico.js: "npm:^0.3.10"
    file-loader: "npm:^6.2.0"
    font-awesome: "npm:^4.7.0"
@ -2452,25 +2445,19 @@ __metadata:
    immutable: "npm:^4.3.0"
    imports-loader: "npm:^1.2.0"
    intl-messageformat: "npm:^10.3.5"
-    ioredis: "npm:^5.3.2"
    jest: "npm:^29.5.0"
    jest-environment-jsdom: "npm:^29.5.0"
    js-yaml: "npm:^4.1.0"
-    jsdom: "npm:^22.1.0"
    lint-staged: "npm:^15.0.0"
    lodash: "npm:^4.17.21"
    mark-loader: "npm:^0.1.6"
    marky: "npm:^1.2.5"
    mini-css-extract-plugin: "npm:^1.6.2"
    mkdirp: "npm:^3.0.1"
-    npmlog: "npm:^7.0.1"
    path-complete-extname: "npm:^1.0.0"
-    pg: "npm:^8.5.0"
-    pg-connection-string: "npm:^2.6.0"
    postcss: "npm:^8.4.24"
    postcss-loader: "npm:^4.3.0"
    prettier: "npm:^3.0.0"
-    prom-client: "npm:^15.0.0"
    prop-types: "npm:^15.8.1"
    punycode: "npm:^2.3.0"
    react: "npm:^18.2.0"
@ -2513,8 +2500,6 @@ __metadata:
    tiny-queue: "npm:^0.2.1"
    twitter-text: "npm:3.1.0"
    typescript: "npm:^5.0.4"
-    utf-8-validate: "npm:^6.0.3"
-    uuid: "npm:^9.0.0"
    webpack: "npm:^4.47.0"
    webpack-assets-manifest: "npm:^4.0.6"
    webpack-bundle-analyzer: "npm:^4.8.0"
@ -2528,13 +2513,7 @@ __metadata:
    workbox-strategies: "npm:^7.0.0"
    workbox-webpack-plugin: "npm:^7.0.0"
    workbox-window: "npm:^7.0.0"
-    ws: "npm:^8.12.1"
    yargs: "npm:^17.7.2"
-  dependenciesMeta:
-    bufferutil:
-      optional: true
-    utf-8-validate:
-      optional: true
  peerDependenciesMeta:
    react:
      optional: true
@ -2545,6 +2524,34 @@ __metadata:
  languageName: unknown
  linkType: soft

+"@mastodon/streaming@workspace:streaming":
+  version: 0.0.0-use.local
+  resolution: "@mastodon/streaming@workspace:streaming"
+  dependencies:
+    "@types/express": "npm:^4.17.17"
+    "@types/npmlog": "npm:^4.1.4"
+    "@types/pg": "npm:^8.6.6"
+    "@types/uuid": "npm:^9.0.0"
+    bufferutil: "npm:^4.0.7"
+    dotenv: "npm:^16.0.3"
+    express: "npm:^4.18.2"
+    ioredis: "npm:^5.3.2"
+    jsdom: "npm:^22.1.0"
+    npmlog: "npm:^7.0.1"
+    pg: "npm:^8.5.0"
+    pg-connection-string: "npm:^2.6.0"
+    prom-client: "npm:^15.0.0"
+    utf-8-validate: "npm:^6.0.3"
+    uuid: "npm:^9.0.0"
+    ws: "npm:^8.12.1"
+  dependenciesMeta:
+    bufferutil:
+      optional: true
+    utf-8-validate:
+      optional: true
+  languageName: unknown
+  linkType: soft
+
 "@material-symbols/svg-600@npm:^0.14.0":
  version: 0.14.0
  resolution: "@material-symbols/svg-600@npm:0.14.0"
@ -3059,21 +3066,21 @@ __metadata:
  linkType: hard

 "@types/body-parser@npm:*":
-  version: 1.19.4
-  resolution: "@types/body-parser@npm:1.19.4"
+  version: 1.19.5
+  resolution: "@types/body-parser@npm:1.19.5"
  dependencies:
    "@types/connect": "npm:*"
    "@types/node": "npm:*"
-  checksum: bec2b8a97861a960ee415f7ab3c2aeb7f4d779fd364d27ddee46057897ea571735f1f854f5ee41682964315d4e3699f62427998b9c21851d773398ef535f0612
+  checksum: aebeb200f25e8818d8cf39cd0209026750d77c9b85381cdd8deeb50913e4d18a1ebe4b74ca9b0b4d21952511eeaba5e9fbbf739b52731a2061e206ec60d568df
  languageName: node
  linkType: hard

 "@types/connect@npm:*":
-  version: 3.4.37
-  resolution: "@types/connect@npm:3.4.37"
+  version: 3.4.38
+  resolution: "@types/connect@npm:3.4.38"
  dependencies:
    "@types/node": "npm:*"
-  checksum: 79fd5c32a8bb5c9548369e6da3221b6a820f3a8c5396d50f6f642712b9f4c1c881ef86bdf48994a4a279e81998563410b8843c5a10dde5521d5ef6a8ae944c3b
+  checksum: 2e1cdba2c410f25649e77856505cd60223250fa12dff7a503e492208dbfdd25f62859918f28aba95315251fd1f5e1ffbfca1e25e73037189ab85dd3f8d0a148c
  languageName: node
  linkType: hard

@ -3118,14 +3125,14 @@ __metadata:
  linkType: hard

 "@types/express-serve-static-core@npm:^4.17.33":
-  version: 4.17.39
-  resolution: "@types/express-serve-static-core@npm:4.17.39"
+  version: 4.17.41
+  resolution: "@types/express-serve-static-core@npm:4.17.41"
  dependencies:
    "@types/node": "npm:*"
    "@types/qs": "npm:*"
    "@types/range-parser": "npm:*"
    "@types/send": "npm:*"
-  checksum: b23b005fddd2ba3f7142ec9713f06b5582c7712cdf99c3419d3972364903b348a103c3264d9a761d6497140e3b89bd416454684c4bdeff206b4c59b86e96428a
+  checksum: dc166cbf4475c00a81fbcab120bf7477c527184be11ae149df7f26d9c1082114c68f8d387a2926fe80291b06477c8bbd9231ff4f5775de328e887695aefce269
  languageName: node
  linkType: hard

@ -3178,9 +3185,9 @@ __metadata:
  linkType: hard

 "@types/http-errors@npm:*":
-  version: 2.0.3
-  resolution: "@types/http-errors@npm:2.0.3"
-  checksum: 717ce3e8f49a1facb7130fed934108fa8a51ab02089a1049c782e353e0e08e79bdfaac054c2a94db14ea400302e523276387363aa820eaf0031af8ba5d2941dc
+  version: 2.0.4
+  resolution: "@types/http-errors@npm:2.0.4"
+  checksum: 494670a57ad4062fee6c575047ad5782506dd35a6b9ed3894cea65830a94367bd84ba302eb3dde331871f6d70ca287bfedb1b2cf658e6132cd2cbd427ab56836
  languageName: node
  linkType: hard

@ -3282,16 +3289,16 @@ __metadata:
  linkType: hard

 "@types/mime@npm:*":
-  version: 3.0.3
-  resolution: "@types/mime@npm:3.0.3"
-  checksum: cef99f8cdc42af9de698027c2a20ba5df12bc9a89dcf5513e70103ebb55e00c5f5c585d02411f4b42fde0e78488342f1b1d3e3546a59a3da42e95fdc616e01eb
+  version: 3.0.4
+  resolution: "@types/mime@npm:3.0.4"
+  checksum: db478bc0f99e40f7b3e01d356a9bdf7817060808a294978111340317bcd80ca35382855578c5b60fbc84ae449674bd9bb38427b18417e1f8f19e4f72f8b242cd
  languageName: node
  linkType: hard

 "@types/mime@npm:^1":
-  version: 1.3.4
-  resolution: "@types/mime@npm:1.3.4"
-  checksum: a0a16d26c0e70a1b133e26e7c46b70b3136b7e894396bdb7de1c642f4ac87fdbbba26bf56cf73f001312289d89de4f1c06ab745d9445850df45a5a802564c4d6
+  version: 1.3.5
+  resolution: "@types/mime@npm:1.3.5"
+  checksum: c2ee31cd9b993804df33a694d5aa3fa536511a49f2e06eeab0b484fef59b4483777dbb9e42a4198a0809ffbf698081fdbca1e5c2218b82b91603dfab10a10fbc
  languageName: node
  linkType: hard

@ -3395,16 +3402,16 @@ __metadata:
  linkType: hard

 "@types/qs@npm:*":
-  version: 6.9.9
-  resolution: "@types/qs@npm:6.9.9"
-  checksum: aede2a4181a49ae8548a1354bac3f8235cb0c5aab066b10875a3e68e88a199e220f4284e7e2bb75a3c18e5d4ff6abe1a6ce0389ef31b63952cc45e0f4d885ba0
+  version: 6.9.10
+  resolution: "@types/qs@npm:6.9.10"
+  checksum: 6be12e5f062d1b41eb037d59bf9cb65bc9410cedd5e6da832dfd7c8e2b3f4c91e81c9b90b51811140770e5052c6c4e8361181bd9437ddcd4515dc128b7c00353
  languageName: node
  linkType: hard

 "@types/range-parser@npm:*":
-  version: 1.2.6
-  resolution: "@types/range-parser@npm:1.2.6"
-  checksum: 46e7fffc54cdacc8fb0cd576f8f9a6436453f0176205d6ec55434a460c7677e78e688673426d5db5e480501b2943ba08a16ececa3a354c222093551c7217fb8f
+  version: 1.2.7
+  resolution: "@types/range-parser@npm:1.2.7"
+  checksum: 361bb3e964ec5133fa40644a0b942279ed5df1949f21321d77de79f48b728d39253e5ce0408c9c17e4e0fd95ca7899da36841686393b9f7a1e209916e9381a3c
  languageName: node
  linkType: hard

@ -3590,23 +3597,23 @@ __metadata:
  linkType: hard

 "@types/send@npm:*":
-  version: 0.17.3
-  resolution: "@types/send@npm:0.17.3"
+  version: 0.17.4
+  resolution: "@types/send@npm:0.17.4"
  dependencies:
    "@types/mime": "npm:^1"
    "@types/node": "npm:*"
-  checksum: 773a0cb55ea03eefbe9a0e6d42114e0f84968db30954a131aae9ba7e9ab984a4776915447ebdeab4412d7f11750126614b0b75e99413f75810045bdb3196554a
+  checksum: 7f17fa696cb83be0a104b04b424fdedc7eaba1c9a34b06027239aba513b398a0e2b7279778af521f516a397ced417c96960e5f50fcfce40c4bc4509fb1a5883c
  languageName: node
  linkType: hard

 "@types/serve-static@npm:*":
-  version: 1.15.4
-  resolution: "@types/serve-static@npm:1.15.4"
+  version: 1.15.5
+  resolution: "@types/serve-static@npm:1.15.5"
  dependencies:
    "@types/http-errors": "npm:*"
    "@types/mime": "npm:*"
    "@types/node": "npm:*"
-  checksum: 061b38993bf8f2b5033f57147c8ec90e1d1a0d6f734958ceb531ba7cc31192fd272c999cdbc57ede8672787e3aa171ec142dc65a467c04078e43823e7476eb49
+  checksum: 811d1a2f7e74a872195e7a013bcd87a2fb1edf07eaedcb9dcfd20c1eb4bc56ad4ea0d52141c13192c91ccda7c8aeb8a530d8a7e60b9c27f5990d7e62e0fecb03
  languageName: node
  linkType: hard

@ -6440,6 +6447,13 @@ __metadata:
  languageName: node
  linkType: hard

+"debounce@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "debounce@npm:1.2.1"
+  checksum: 6c9320aa0973fc42050814621a7a8a78146c1975799b5b3cc1becf1f77ba9a5aa583987884230da0842a03f385def452fad5d60db97c3d1c8b824e38a8edf500
+  languageName: node
+  linkType: hard
+
 "debug@npm:2.6.9, debug@npm:^2.2.0, debug@npm:^2.3.3":
  version: 2.6.9
  resolution: "debug@npm:2.6.9"
@ -8927,7 +8941,7 @@ __metadata:
  languageName: node
  linkType: hard

-"html-escaper@npm:^2.0.0":
+"html-escaper@npm:^2.0.0, html-escaper@npm:^2.0.2":
  version: 2.0.2
  resolution: "html-escaper@npm:2.0.2"
  checksum: 208e8a12de1a6569edbb14544f4567e6ce8ecc30b9394fcaa4e7bb1e60c12a7c9a1ed27e31290817157e8626f3a4f29e76c8747030822eb84a6abb15c255f0a0
@ -11056,20 +11070,6 @@ __metadata:
  languageName: node
  linkType: hard

-"lodash.escape@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "lodash.escape@npm:4.0.1"
-  checksum: 90ade409cec05b6869090476952fdfb84d4d87b1ff4a0e03ebd590f980d9a1248d93ba14579f10d80c6429e4d6af13ba137c28db64cae6dadb71442e54a3ad2b
-  languageName: node
-  linkType: hard
-
-"lodash.flatten@npm:^4.4.0":
-  version: 4.4.0
-  resolution: "lodash.flatten@npm:4.4.0"
-  checksum: 97e8f0d6b61fe4723c02ad0c6e67e51784c4a2c48f56ef283483e556ad01594cf9cec9c773e177bbbdbdb5d19e99b09d2487cb6b6e5dc405c2693e93b125bd3a
-  languageName: node
-  linkType: hard
-
 "lodash.get@npm:^4.0":
  version: 4.4.2
  resolution: "lodash.get@npm:4.4.2"
@ -11084,13 +11084,6 @@ __metadata:
  languageName: node
  linkType: hard

-"lodash.invokemap@npm:^4.6.0":
-  version: 4.6.0
-  resolution: "lodash.invokemap@npm:4.6.0"
-  checksum: 2bcc5f4b8782a316d55ff139215eb797f576f0f6d3db2755ebba7b35fd6061f8cbe81702a72a30bc6d70073a5dcc461f7570eaddcc9184c2e42ec3023645c6a1
-  languageName: node
-  linkType: hard
-
 "lodash.isarguments@npm:^3.1.0":
  version: 3.1.0
  resolution: "lodash.isarguments@npm:3.1.0"
@ -11133,13 +11126,6 @@ __metadata:
  languageName: node
  linkType: hard

-"lodash.pullall@npm:^4.2.0":
-  version: 4.2.0
-  resolution: "lodash.pullall@npm:4.2.0"
-  checksum: b129e8d879258c7db04a7dc1c23dd9e37c52f63a04e105faa8d2ab55e97b5a170d5e15cffbb732a36e7f48c4345c07b6fbddfe50e1f5ec301492b6f64a92040c
-  languageName: node
-  linkType: hard
-
 "lodash.sortby@npm:^4.7.0":
  version: 4.7.0
  resolution: "lodash.sortby@npm:4.7.0"
@ -11161,13 +11147,6 @@ __metadata:
  languageName: node
  linkType: hard

-"lodash.uniqby@npm:^4.7.0":
-  version: 4.7.0
-  resolution: "lodash.uniqby@npm:4.7.0"
-  checksum: c505c0de20ca759599a2ba38710e8fb95ff2d2028e24d86c901ef2c74be8056518571b9b754bfb75053b2818d30dd02243e4a4621a6940c206bbb3f7626db656
-  languageName: node
-  linkType: hard
-
 "lodash@npm:^4.17.10, lodash@npm:^4.17.11, lodash@npm:^4.17.14, lodash@npm:^4.17.15, lodash@npm:^4.17.20, lodash@npm:^4.17.21":
  version: 4.17.21
  resolution: "lodash@npm:4.17.21"
@ -17059,29 +17038,25 @@ __metadata:
  linkType: hard

 "webpack-bundle-analyzer@npm:^4.8.0":
-  version: 4.9.1
-  resolution: "webpack-bundle-analyzer@npm:4.9.1"
+  version: 4.10.0
+  resolution: "webpack-bundle-analyzer@npm:4.10.0"
  dependencies:
    "@discoveryjs/json-ext": "npm:0.5.7"
    acorn: "npm:^8.0.4"
    acorn-walk: "npm:^8.0.0"
    commander: "npm:^7.2.0"
+    debounce: "npm:^1.2.1"
    escape-string-regexp: "npm:^4.0.0"
    gzip-size: "npm:^6.0.0"
+    html-escaper: "npm:^2.0.2"
    is-plain-object: "npm:^5.0.0"
-    lodash.debounce: "npm:^4.0.8"
-    lodash.escape: "npm:^4.0.1"
-    lodash.flatten: "npm:^4.4.0"
-    lodash.invokemap: "npm:^4.6.0"
-    lodash.pullall: "npm:^4.2.0"
-    lodash.uniqby: "npm:^4.7.0"
    opener: "npm:^1.5.2"
    picocolors: "npm:^1.0.0"
    sirv: "npm:^2.0.3"
    ws: "npm:^7.3.1"
  bin:
    webpack-bundle-analyzer: lib/bin/analyzer.js
-  checksum: dd047c306471e6c389d6d4156ff22402e587140310a065a6191ee380f8251063f73a8ec6ac6d977c1cd634dbb717e2522b5d0b6cc9b0e847d4f15737fd9c65c9
+  checksum: f812a8d3c0198ce518baf742bff656526f3eae69fb7a64c7f0c9cff202f6fb3380cabf3baaae965b8d6ffbbb6fb802eacb373fca03a596a38b01b84cfb2e8329
  languageName: node
  linkType: hard