Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-05-12 06:21:33 +00:00 committed by GitHub
commit d8fb37f470
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
27 changed files with 2617 additions and 2768 deletions

View File

@ -32,6 +32,7 @@ with pkgs; {
linux_5_4 = makeKernelTest "5.4" linuxPackages_5_4;
linux_5_10 = makeKernelTest "5.10" linuxPackages_5_10;
linux_5_11 = makeKernelTest "5.11" linuxPackages_5_11;
linux_5_12 = makeKernelTest "5.12" linuxPackages_5_12;
linux_testing = makeKernelTest "testing" linuxPackages_testing;
}

View File

@ -2,26 +2,25 @@
buildGoModule rec {
pname = "popeye";
version = "0.9.0";
version = "0.9.2";
src = fetchFromGitHub {
rev = "v${version}";
owner = "derailed";
repo = "popeye";
sha256 = "1rslmcdjs53zvv0xaf00vxqsfc3jh2p584j3q6nfgrghc978xmpf";
sha256 = "sha256-GSH9q0hnyuGiJAdbFWKbaaYoHKl4e0SNmBkOvpn5a6s=";
};
buildFlagsArray = ''
-ldflags=
-s -w
-X github.com/derailed/popeye/cmd.version=${version}
-X github.com/derailed/popeye/cmd.commit=022c3104b642aab6bdb287468fb79068a33e1b0d
-X github.com/derailed/popeye/cmd.date=2020-10-31T16:44:45Z
-X github.com/derailed/popeye/cmd.commit=${version}
'';
vendorSha256 = "08195dnka7rs38py3kjii9zh9nifg2fnbi1wzjl0pc38i2bbrz0k";
vendorSha256 = "sha256-pK04vGL9Izv1aK8UA+/3lSt/SjLyckjnfSCrOalRj3c=";
doCheck = false;
doCheck = true;
meta = with lib; {
description = "A Kubernetes cluster resource sanitizer";

View File

@ -1,16 +1,16 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "terraform-docs";
version = "0.12.1";
version = "0.13.0";
src = fetchFromGitHub {
owner = "terraform-docs";
repo = pname;
rev = "v${version}";
sha256 = "sha256-zQFPuHxfFvfwPVV0vPeA+A6XCw2Vt4tY4S2JBGcqaBQ=";
sha256 = "sha256-lx+yp0ybgZfmxvPM2BY2yq39qA6XebcKGrFd0AJa4yg=";
};
vendorSha256 = "sha256-HO2E8i5A/2Xi7Pq+Mqb/2ogK1to8IvZjRuDXfzGvOXk=";
vendorSha256 = "sha256-qoZUgSSr7jsDVVPBUyfN5Uw4CnH9EnD/4tX+TCSNV0Q=";
subPackages = [ "." ];

View File

@ -1,7 +1,6 @@
{ stdenv
, lib
, fetchurl
, fetchpatch
, makeWrapper
, readline
, gmp
@ -35,7 +34,7 @@ let
"autpgrp-*"
"alnuth-*"
"crisp-*"
"ctbllib"
"ctbllib-*"
"FactInt-*"
"fga"
"irredsol-*"
@ -62,11 +61,11 @@ in
stdenv.mkDerivation rec {
pname = "gap";
# https://www.gap-system.org/Releases/
version = "4.11.0";
version = "4.11.1";
src = fetchurl {
url = "https://files.gap-system.org/gap-${lib.versions.major version}.${lib.versions.minor version}/tar.bz2/gap-${version}.tar.bz2";
sha256 = "sha256-vwcKENwqxgWT/mXfD4c9ctTWdQHobrJipva9SPyGhgI=";
url = "https://github.com/gap-system/gap/releases/download/v${version}/gap-${version}.tar.gz";
sha256 = "sha256-ZjXF2n2CdV+DOUhrnKwzdm9YcS8pfoI0+6QIGJAuowQ=";
};
# remove all non-essential packages (which take up a lot of space)
@ -84,23 +83,6 @@ stdenv.mkDerivation rec {
makeWrapper
];
patches = [
# Fix for locale specific tests causing issues. Already upstream.
# Backport of https://github.com/gap-system/gap/pull/4022
(fetchpatch {
name = "remove-locale-specific-tests.patch";
url = "https://github.com/gap-system/gap/commit/c18b0c4215b5212a2cc4f305e2d5b94ba716bee8.patch";
sha256 = "sha256-De+T9Y7ewRT6plJrj2VR8axRvD/JCTYKOBWB7Bw0oq0=";
})
# fixes aarch64 gc crashes: https://github.com/gap-system/gap/pull/3965
(fetchpatch {
name = "mark-genstackfuncbags-as-noinline.patch";
url = "https://github.com/gap-system/gap/commit/f0a8f49ff8dad0a5fa77253d45457c6f40f96778.patch";
sha256 = "sha256-GU9tOP1stX2vn8m8kXOBupEpxIYArA76ibKL8eLn0MY=";
})
];
# "teststandard" is a superset of testinstall. It takes ~1h instead of ~1min.
# tests are run twice, once with all packages loaded and once without
# checkTarget = "teststandard";

View File

@ -1,13 +0,0 @@
diff --git a/src/gasman.c b/src/gasman.c
index 417811401..314a74190 100644
--- a/src/gasman.c
+++ b/src/gasman.c
@@ -1861,7 +1861,7 @@ void SparcStackFuncBags( void )
#endif
-void GenStackFuncBags ( void )
+NOINLINE void GenStackFuncBags ( void )
{
Bag * top; /* top of stack */
Bag * p; /* loop variable */

View File

@ -22,23 +22,44 @@ stdenv.mkDerivation rec {
};
patches = [
(fetchpatch {
name = "handle_factor.patch";
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pynac/patches/handle_factor.patch?h=9.3.rc3";
sha256 = "sha256-U1lb5qwBqZZgklfDMhBX4K5u8bz5x42O4w7hyNy2YVw=";
})
# the five patches below are included with sage 9.3. since pynac
# is a self-described "Sage Math support library", we include them
# here.
# https://trac.sagemath.org/ticket/30688
(fetchpatch {
name = "power_inf_loop.patch";
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pynac/patches/power_inf_loop.patch?h=9.3.rc3";
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pynac/patches/power_inf_loop.patch?h=9.3";
sha256 = "sha256-VYeaJl8u2wl7FQ/6xnpZv1KpdNYEmJoPhuMrBADyTRs=";
})
# https://trac.sagemath.org/ticket/31479
(fetchpatch {
name = "disable_poly_mul_expand.patch";
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pynac/patches/disable_poly_mul_expand.patch?h=9.3";
sha256 = "sha256-gRjoltU9Tzj7fjNyE25fY+iyDxERzSTOMigzxFpUqPo=";
})
# https://trac.sagemath.org/ticket/31530
(fetchpatch {
name = "too_much_sub.patch";
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pynac/patches/too_much_sub.patch?h=9.3.rc3";
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pynac/patches/too_much_sub.patch?h=9.3";
sha256 = "sha256-lw7xSQ/l+rzPu+ghWF4omYF0mKksGGPuuHJTktvbdis=";
})
# https://trac.sagemath.org/ticket/31554
(fetchpatch {
name = "handle_factor.patch";
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pynac/patches/handle_factor.patch?h=9.3";
sha256 = "sha256-U1lb5qwBqZZgklfDMhBX4K5u8bz5x42O4w7hyNy2YVw=";
})
# https://trac.sagemath.org/ticket/31645
(fetchpatch {
name = "seriesbug.patch";
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pynac/patches/seriesbug.patch?h=9.3";
sha256 = "sha256-b3//oirN7JHDYqrvE+tDYcnKpSYQJ08yBzcNlII2Dts=";
})
];
buildInputs = [

View File

@ -24,14 +24,14 @@ let
);
in
stdenv.mkDerivation rec {
version = "9.3.rc4";
version = "9.3";
pname = "sage-src";
src = fetchFromGitHub {
owner = "sagemath";
repo = "sage";
rev = version;
sha256 = "sha256-LDY07By2j6JagkgT9zeDJ93+m2/oXXEnDRTDzmR8ftk=";
sha256 = "sha256-l9DX8jcDdKA7GJ6xU+nBsmlZxrcZ9ZUAJju621ooBEo=";
};
# Patches needed because of particularities of nix or the way this is packaged.

View File

@ -31,11 +31,9 @@ stdenv.mkDerivation rec {
owner = "Singular";
repo = "Singular";
# 4.2.0p2 is not tagged, but the tarball matches commit
# 6f68939ddf612d96e3caaaaa8275f77613ac1da8. the commit below has
# two extra fixes.
rev = "3cda50c00a849455efa2502e56596955491a353a";
sha256 = "sha256-OizPhGE6L2LTOrKfeDdDB6BSdvYkDVXvbbYjV14hnHM=";
# 4.2.0p2 is not tagged, but the tarball matches the commit below.
rev = "6f68939ddf612d96e3caaaaa8275f77613ac1da8";
sha256 = "sha256-BJNzYylzDqD/5YjzjxPRb/c96tYiuGy9Y+A7qf3ZSG8=";
# if a release is tagged it will be in the format below.
# rev = "Release${lib.replaceStrings ["."] ["-"] version}";
@ -60,6 +58,13 @@ stdenv.mkDerivation rec {
# https://github.com/alsa-project/alsa-firmware/issues/3 for a
# related issue.
./use-older-ax-prog-cc-for-build.patch
# https://github.com/Singular/Singular/issues/1086
(fetchpatch {
name = "schubert-lib-fails-with-too-many-cpus.patch";
url = "https://github.com/Singular/Singular/commit/3cda50c00a849455efa2502e56596955491a353a.patch";
sha256 = "sha256-fgYd+2vT32w5Ki8kKx6PfZn2e4QSJcYWOwEFXtc+lSA=";
})
] ++ lib.optionals enableDocs [
# singular supports building without 4ti2, bertini, normaliz or
# topcom just fine, but the docbuilding does not skip manual pages
@ -67,6 +72,13 @@ stdenv.mkDerivation rec {
# doc2tex.pl::HandleLib, since it seems to ignore "-exclude"
# argumens). skip them manually.
./disable-docs-for-optional-unpackaged-deps.patch
# fix some non-ascii characters in doc/decodegb.doc
(fetchpatch {
name = "decodegb-ascii.patch";
url = "https://github.com/Singular/Singular/commit/36966d9009de572ee4dbc487f3e5744098fe91be.patch";
sha256 = "sha256-9WcEov/oOQRC584ag6WVHFwY2aCjbM75HWyvZoEwppw=";
})
];
configureFlags = [
@ -83,9 +95,6 @@ stdenv.mkDerivation rec {
substituteInPlace Tst/regress.cmd --replace 'mysystem_catch("hostname")' 'nix_test_runner'
patchShebangs .
'' + lib.optionalString enableDocs ''
# work around encoding problem
sed -i -e 's/\xb7/@cdot{}/g' doc/decodegb.doc
'';
# For reference (last checked on commit 75f460d):
@ -149,7 +158,7 @@ stdenv.mkDerivation rec {
# singular tests are a bit complicated, see
# https://github.com/Singular/Singular/tree/spielwiese/Tst
# https://www.singular.uni-kl.de/forum/viewtopic.php&t=2773
# https://www.singular.uni-kl.de/forum/viewtopic.php?f=10&t=2773
testsToRun = [
"Old/universal.lst"
"Buch/buch.lst"
@ -181,7 +190,7 @@ stdenv.mkDerivation rec {
2>"$TMPDIR/out-err.log"
# unfortunately regress.cmd always returns exit code 0, so check stderr
# https://www.singular.uni-kl.de/forum/viewtopic.php&t=2773
# https://www.singular.uni-kl.de/forum/viewtopic.php?f=10&t=2773
if [[ -s "$TMPDIR/out-err.log" ]]; then
cat "$TMPDIR/out-err.log"
exit 1

View File

@ -7,9 +7,7 @@ stdenv.mkDerivation rec {
version = "20210214";
src = fetchurl {
url = "https://mirrors.mit.edu/sage/spkg/upstream/${pname}/${pname}-${version}.tar.bz2";
# TODO: switch to the url below once Sage 9.3 is released
# url = "mirror://sageupstream/${pname}/${pname}-${version}.tar.bz2";
url = "mirror://sageupstream/${pname}/${pname}-${version}.tar.bz2";
sha256 = "sha256-ByN8DZhTYRUFw4n9e7klAMh0P1YxurtND0Xf2DMvN0E=";
};

View File

@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "img2pdf";
version = "0.4.0";
version = "0.4.1";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "eaee690ab8403dd1a9cb4db10afee41dd3e6c7ed63bdace02a0121f9feadb0c9";
sha256 = "sha256-OKEinKhLIR13gtHWWtclGpeBvyT29kl8c4x1X8/tVVI=";
};
propagatedBuildInputs = [

View File

@ -1,39 +1,81 @@
{ lib, stdenv, fetchFromGitHub, cmake, doxygen, graphviz, makeWrapper
, boost168, SDL2, python2, freetype, openal, libogg, libvorbis, zlib, libpng, libtiff
, libjpeg, libGLU, libGL, glew, libxslt
{ lib
, stdenv
, fetchFromGitHub
, cmake
, doxygen
, graphviz
, makeWrapper
, cppcheck
, boost16x
, SDL2
, python3
, freetype
, openal
, libogg
, libvorbis
, zlib
, libpng
, libtiff
, libjpeg
, libGLU
, libGL
, glew
, libxslt
}:
stdenv.mkDerivation rec {
version = "0.4.9";
version = "0.4.10.1";
pname = "freeorion";
src = fetchFromGitHub {
owner = "freeorion";
repo = "freeorion";
owner = "freeorion";
repo = "freeorion";
rev = "v${version}";
sha256 = "18xigx4qla225ybf7mc1w8zfm81nhcm1i5181n5l2fbndvslb1wf";
sha256 = "sha256-Itt2JIStx+JsnMMBvbeJXSEJpaS/pd1UMvPGNd50k7I=";
};
buildInputs = [
(boost168.override { enablePython = true; })
SDL2 python2 freetype openal libogg libvorbis zlib libpng libtiff libjpeg libGLU libGL glew ];
(boost16x.override { enablePython = true; python = python3; })
(python3.withPackages (p: with p; [ pycodestyle ]))
SDL2
freetype
glew
libGL
libGLU
libjpeg
libogg
libpng
libtiff
libvorbis
openal
zlib
];
nativeBuildInputs = [ cmake doxygen graphviz makeWrapper ];
nativeBuildInputs = [
cmake
cppcheck
doxygen
graphviz
makeWrapper
];
# as of 0.4.10.1 FreeOrion doesn't work with "-DOpenGL_GL_PREFERENCE=GLVND"
cmakeFlags = [ "-DOpenGL_GL_PREFERENCE=LEGACY" ];
postInstall = ''
mkdir -p $out/fixpaths
mkdir -p $out/libexec
# We need final slashes for XSLT replace to work properly
substitute ${./fix-paths.xslt} $out/fixpaths/fix-paths.xslt \
substitute ${./fix-paths.xslt} $out/share/freeorion/fix-paths.xslt \
--subst-var-by nixStore "$NIX_STORE/" \
--subst-var-by out "$out/"
substitute ${./fix-paths.sh} $out/fixpaths/fix-paths \
substitute ${./fix-paths.sh} $out/libexec/fix-paths \
--subst-var-by libxsltBin ${libxslt.bin} \
--subst-var-by shell ${stdenv.shell} \
--subst-var out
chmod +x $out/fixpaths/fix-paths
chmod +x $out/libexec/fix-paths
wrapProgram $out/bin/freeorion \
--run $out/fixpaths/fix-paths \
--run $out/libexec/fix-paths \
--prefix LD_LIBRARY_PATH : $out/lib/freeorion
'';

View File

@ -1,6 +1,6 @@
#!@shell@
if [ -e ~/.config/freeorion/config.xml ]; then
@libxsltBin@/bin/xsltproc -o ~/.config/freeorion/config.xml @out@/fixpaths/fix-paths.xslt ~/.config/freeorion/config.xml
@libxsltBin@/bin/xsltproc -o ~/.config/freeorion/config.xml @out@/share/freeorion/fix-paths.xslt ~/.config/freeorion/config.xml
fi
exit 0

View File

@ -0,0 +1,20 @@
{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args:
with lib;
buildLinux (args // rec {
version = "5.12.2";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
# branchVersion needs to be x.y
extraMeta.branch = versions.majorMinor version;
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "03gp5vq8vkwvksjsa1birds37rmrr73s9ik6m1wvgz8mdncvk64c";
};
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_12 ];
} // (args.argsOverride or {}))

View File

@ -10,13 +10,13 @@
mkYarnPackage rec {
name = "grafana-image-renderer";
version = "2.0.1";
version = "2.1.0";
src = fetchFromGitHub {
owner = "grafana";
repo = "grafana-image-renderer";
rev = "v${version}";
sha256 = "sha256-3zvtlBjg+Yv5XDWdIN9HHLf+/Gv06ctbBaFhCgHeAMU=";
sha256 = "sha256-loWLbeu8h0fhMcUzmeYVSw4x6R0GVfqwb/vHwCNT/fM=";
};
buildPhase = ''

View File

@ -25,22 +25,21 @@
"express": "^4.16.3",
"express-prom-bundle": "^5.1.5",
"google-protobuf": "3.5.0",
"lodash": "^4.17.19",
"lodash": "^4.17.21",
"minimist": "^1.2.0",
"morgan": "^1.9.0",
"mz": "^2.7.0",
"prom-client": "^11.5.3",
"puppeteer": "^2.0.0",
"puppeteer-cluster": "^0.18.0",
"puppeteer": "^3.3.0",
"puppeteer-cluster": "^0.22.0",
"unique-filename": "^1.1.0",
"winston": "^3.2.1"
},
"devDependencies": {
"@types/express": "^4.11.1",
"@types/node": "^10.0.9",
"husky": "^3.1.0",
"@types/node": "^14.14.41",
"husky": "^4.3.8",
"lint-staged": "^9.5.0",
"pkg": "4.4.8",
"pkg": "^5.1.0",
"prettier": "^1.19.1",
"tsc-watch": "^4.2.3",
"typescript": "^3.8.3"
@ -61,9 +60,9 @@
},
"bin": "build/app.js",
"engines": {
"node": ">=12 <13"
"node": ">=14 <15"
},
"volta": {
"node": "12.19.0"
"node": "14.16.1"
}
}

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,19 +1,46 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper
, which, nodejs, mkYarnPackage, python2, nixosTests }:
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, makeWrapper
, which
, nodejs
, mkYarnPackage
, python2
, nixosTests
, buildGoModule
}:
let
# we need a different version than the one already available in nixpkgs
esbuild-hedgedoc = buildGoModule rec {
pname = "esbuild";
version = "0.11.20";
src = fetchFromGitHub {
owner = "evanw";
repo = "esbuild";
rev = "v${version}";
sha256 = "009f2mfgzkzgxjh3034mzdkcvm5vz17sgy1cs604f0425i22z8qm";
};
vendorSha256 = "1n5538yik72x94vzfq31qaqrkpxds5xys1wlibw2gn2am0z5c06q";
};
in
mkYarnPackage rec {
name = "hedgedoc";
version = "1.8.0";
version = "1.8.2";
src = fetchFromGitHub {
owner = "hedgedoc";
repo = "hedgedoc";
rev = version;
sha256 = "1xi4gi1yjwggdsnz5hljx9xl4qhnm9r3c24q7i6d5y8yv6lh6lsr";
sha256 = "1h2wyhap264iqm2jh0i05w0hb2j86jsq1plyl7k3an90w7wngyg1";
};
nativeBuildInputs = [ which makeWrapper ];
extraBuildInputs = [ python2 ];
extraBuildInputs = [ python2 esbuild-hedgedoc ];
yarnNix = ./yarn.nix;
yarnLock = ./yarn.lock;
@ -35,6 +62,11 @@ mkYarnPackage rec {
npm run install --build-from-source --nodedir=${nodejs}/include/node
popd
pushd node_modules/esbuild
rm bin/esbuild
ln -s ${lib.getBin esbuild-hedgedoc}/bin/esbuild bin/
popd
npm run build
patchShebangs bin/*

View File

@ -1,6 +1,6 @@
{
"name": "HedgeDoc",
"version": "1.8.0",
"version": "1.8.2",
"description": "The best platform to write and share markdown.",
"main": "app.js",
"license": "AGPL-3.0",
@ -25,11 +25,8 @@
"azure-storage": "^2.7.0",
"base64url": "^3.0.0",
"body-parser": "^1.15.2",
"bootstrap": "^3.4.0",
"bootstrap-validator": "^0.11.8",
"chance": "^1.0.4",
"cheerio": "^0.22.0",
"codemirror": "git+https://github.com/hedgedoc/CodeMirror.git",
"compression": "^1.6.2",
"connect-flash": "^0.1.1",
"connect-session-sequelize": "^7.0.0",
@ -38,32 +35,16 @@
"deep-freeze": "^0.0.1",
"diff-match-patch": "git+https://github.com/hackmdio/diff-match-patch.git",
"ejs": "^3.0.0",
"emojify.js": "^1.1.0",
"escape-html": "^1.0.3",
"express": ">=4.14",
"express-session": "^1.14.2",
"file-saver": "^2.0.0",
"file-type": "^16.1.0",
"flowchart.js": "^1.6.4",
"fork-awesome": "^1.1.3",
"formidable": "^1.0.17",
"gist-embed": "^2.6.0",
"graceful-fs": "^4.1.11",
"handlebars": "^4.5.2",
"helmet": "^4.5.0",
"highlight.js": "^10.0.0",
"i18n": "^0.13.0",
"ionicons": "^2.0.1",
"is-svg": "^4.3.1",
"jquery": "^3.5.1",
"jquery-mousewheel": "^3.1.13",
"jquery-ui": "^1.12.1",
"js-cookie": "^2.1.3",
"js-sequence-diagrams": "git+https://github.com/hedgedoc/js-sequence-diagrams.git",
"js-yaml": "^3.13.1",
"jsdom-nogyp": "^0.8.3",
"keymaster": "^1.6.2",
"list.js": "^2.0.0",
"lodash": "^4.17.20",
"lutim": "^1.0.2",
"lz-string": "git+https://github.com/hackmdio/lz-string.git",
@ -81,9 +62,7 @@
"markdown-it-regexp": "^0.4.0",
"markdown-it-sub": "^1.0.0",
"markdown-it-sup": "^1.0.0",
"mathjax": "^2.7.6",
"mattermost": "^3.4.0",
"mermaid": "^8.5.1",
"meta-marked": "git+https://github.com/hedgedoc/meta-marked",
"method-override": "^3.0.0",
"minimist": "^1.2.0",
@ -107,36 +86,25 @@
"pdfobject": "^2.0.201604172",
"pg": "^8.2.1",
"pg-hstore": "^2.3.3",
"prismjs": "^1.21.0",
"prom-client": "^13.1.0",
"prometheus-api-metrics": "^3.2.0",
"randomcolor": "^0.6.0",
"raphael": "^2.3.0",
"readline-sync": "^1.4.7",
"reveal.js": "^3.9.2",
"rimraf": "^3.0.2",
"scrypt-kdf": "^2.0.1",
"select2": "^3.5.2-browserify",
"sequelize": "^5.21.1",
"shortid": "2.2.16",
"socket.io": "^2.1.1",
"socket.io-client": "^2.1.1",
"spin.js": "^4.0.0",
"sqlite3": "^5.0.0",
"store": "^2.0.12",
"string": "^3.3.3",
"tedious": "^6.6.0",
"toobusy-js": "^0.5.1",
"turndown": "^7.0.0",
"umzug": "^2.3.0",
"uuid": "^8.0.0",
"validator": "^13.0.0",
"velocity-animate": "^1.4.0",
"visibilityjs": "^2.0.0",
"viz.js": "^1.7.0",
"winston": "^3.1.0",
"ws": "^7.4.4",
"wurl": "^2.5.3",
"xss": "^1.0.3"
},
"resolutions": {
@ -163,6 +131,10 @@
"name": "Christoph (Sheogorath) Kern",
"email": "codimd@sheogorath.shivering-isles.com",
"url": "https://shivering-isles.com"
},
{
"name":"David Mehren",
"email": "hedgedoc@herrmehren.de"
}
],
"repository": {
@ -177,9 +149,15 @@
"babel-polyfill": "6.26.0",
"babel-preset-env": "1.7.0",
"babel-runtime": "6.26.0",
"bootstrap": "3.4.1",
"bootstrap-validator": "0.11.9",
"codemirror": "git+https://github.com/hedgedoc/CodeMirror.git",
"copy-webpack-plugin": "6.4.1",
"css-loader": "5.2.4",
"eslint": "7.25.0",
"emojify.js": "1.1.0",
"esbuild-loader": "2.13.0",
"escape-html": "1.0.3",
"eslint": "7.26.0",
"eslint-config-standard": "16.0.2",
"eslint-plugin-import": "2.22.1",
"eslint-plugin-node": "11.1.0",
@ -187,23 +165,50 @@
"eslint-plugin-standard": "4.1.0",
"expose-loader": "1.0.3",
"file-loader": "6.2.0",
"file-saver": "2.0.5",
"flowchart.js": "1.15.0",
"fork-awesome": "1.1.7",
"gist-embed": "2.6.0",
"highlight.js": "10.7.2",
"html-webpack-plugin": "4.5.2",
"imports-loader": "1.2.0",
"ionicons": "2.0.1",
"jquery": "3.6.0",
"jquery-mousewheel": "3.1.13",
"jquery-ui": "1.12.1",
"js-cookie": "2.2.1",
"js-sequence-diagrams": "git+https://github.com/hedgedoc/js-sequence-diagrams.git",
"js-yaml": "3.14.1",
"jsonlint": "1.6.3",
"keymaster": "1.6.2",
"less": "4.1.1",
"less-loader": "7.3.0",
"list.js": "2.3.1",
"mathjax": "2.7.9",
"mermaid": "8.10.1",
"mini-css-extract-plugin": "1.6.0",
"mocha": "8.3.2",
"mocha": "8.4.0",
"mock-require": "3.0.3",
"optimize-css-assets-webpack-plugin": "5.0.4",
"prismjs": "1.23.0",
"raphael": "2.3.0",
"remark-cli": "9.0.0",
"remark-preset-lint-markdown-style-guide": "4.0.0",
"reveal.js": "3.9.2",
"script-loader": "0.7.2",
"select2": "3.5.2-browserify",
"socket.io-client": "2.4.0",
"spin.js": "4.1.0",
"string-loader": "0.0.1",
"turndown": "7.0.0",
"url-loader": "4.1.1",
"velocity-animate": "1.5.2",
"visibilityjs": "2.0.2",
"viz.js": "1.8.2",
"webpack": "4.46.0",
"webpack-cli": "4.6.0",
"webpack-merge": "5.7.3"
"webpack-cli": "4.7.0",
"webpack-merge": "5.7.3",
"wurl": "2.5.4"
},
"optionalDependencies": {
"bufferutil": "^4.0.0",

View File

@ -92,10 +92,10 @@
resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.2.tgz#8f03a22a04de437254e8ce8cc84ba39689288752"
integrity sha512-HyYEUDeIj5rRQU2Hk5HTB2uHsbRQpF70nvMhVzi+VJR0X+xNEhjPui4/kBf3VeH/wqD28PT4sVOm8qqLjBrSZg==
"@eslint/eslintrc@^0.4.0":
version "0.4.0"
resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.0.tgz#99cc0a0584d72f1df38b900fb062ba995f395547"
integrity sha512-2ZPCc+uNbjV5ERJr+aKSPRwZgKd2z11x0EgLvb1PURmUrn9QNRXFqje0Ldq454PfAVyaJYyrDvvIKSFP4NnBog==
"@eslint/eslintrc@^0.4.1":
version "0.4.1"
resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.1.tgz#442763b88cecbe3ee0ec7ca6d6dd6168550cbf14"
integrity sha512-5v7TDE9plVhvxQeWLXDTvFvJBdH6pEsdnl2g/dAptmuFEPedQ4Erq5rsDsX+mvAM610IhNaO2W5V1dOOnDKxkQ==
dependencies:
ajv "^6.12.4"
debug "^4.1.1"
@ -296,19 +296,19 @@
integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==
"@types/node@*":
version "15.0.1"
resolved "https://registry.yarnpkg.com/@types/node/-/node-15.0.1.tgz#ef34dea0881028d11398be5bf4e856743e3dc35a"
integrity sha512-TMkXt0Ck1y0KKsGr9gJtWGjttxlZnnvDtphxUOSd0bfaR6Q1jle+sPvrzNR1urqYTWMinoKvjKfXUGsumaO1PA==
version "15.0.2"
resolved "https://registry.yarnpkg.com/@types/node/-/node-15.0.2.tgz#51e9c0920d1b45936ea04341aa3e2e58d339fb67"
integrity sha512-p68+a+KoxpoB47015IeYZYRrdqMUcpbK8re/zpFB8Ld46LHC1lPEbp3EXgkEhAYEcPvjJF6ZO+869SQ0aH1dcA==
"@types/node@^12.12.17":
version "12.20.11"
resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.11.tgz#980832cd56efafff8c18aa148c4085eb02a483f4"
integrity sha512-gema+apZ6qLQK7k7F0dGkGCWQYsL0qqKORWOQO6tq46q+x+1C0vbOiOqOwRVlh4RAdbQwV/j/ryr3u5NOG1fPQ==
version "12.20.12"
resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.12.tgz#fd9c1c2cfab536a2383ed1ef70f94adea743a226"
integrity sha512-KQZ1al2hKOONAs2MFv+yTQP1LkDWMrRJ9YCVRalXltOfXsBmH5IownLxQaiq0lnAHwAViLnh2aTYqrPcRGEbgg==
"@types/node@^14.14.28":
version "14.14.43"
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.43.tgz#26bcbb0595b305400e8ceaf9a127a7f905ae49c8"
integrity sha512-3pwDJjp1PWacPTpH0LcfhgjvurQvrZFBrC6xxjaUEZ7ifUtT32jtjPxEMMblpqd2Mvx+k8haqQJLQxolyGN/cQ==
version "14.14.44"
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.44.tgz#df7503e6002847b834371c004b372529f3f85215"
integrity sha512-+gaugz6Oce6ZInfI/tK4Pq5wIIkJMEJUu92RB3Eu93mtj4wjjjz9EB5mLp5s1pSsLXdC/CPut/xF20ZzAQJbTA==
"@types/node@^8.0.47":
version "8.10.66"
@ -378,9 +378,9 @@
source-map "^0.7.3"
"@types/webpack@^4.41.8":
version "4.41.27"
resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.27.tgz#f47da488c8037e7f1b2dbf2714fbbacb61ec0ffc"
integrity sha512-wK/oi5gcHi72VMTbOaQ70VcDxSQ1uX8S2tukBK9ARuGXrYM/+u4ou73roc7trXDNmCxCoerE8zruQqX/wuHszA==
version "4.41.28"
resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.28.tgz#0069a2159b7ad4d83d0b5801942c17d54133897b"
integrity sha512-Nn84RAiJjKRfPFFCVR8LC4ueTtTdfWAMZ03THIzZWRJB+rX24BD3LqPSFnbMscWauEsT4segAsylPDIaZyZyLQ==
dependencies:
"@types/anymatch" "*"
"@types/node" "*"
@ -539,22 +539,22 @@
"@webassemblyjs/wast-parser" "1.9.0"
"@xtuc/long" "4.2.2"
"@webpack-cli/configtest@^1.0.2":
version "1.0.2"
resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.0.2.tgz#2a20812bfb3a2ebb0b27ee26a52eeb3e3f000836"
integrity sha512-3OBzV2fBGZ5TBfdW50cha1lHDVf9vlvRXnjpVbJBa20pSZQaSkMJZiwA8V2vD9ogyeXn8nU5s5A6mHyf5jhMzA==
"@webpack-cli/configtest@^1.0.3":
version "1.0.3"
resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.0.3.tgz#204bcff87cda3ea4810881f7ea96e5f5321b87b9"
integrity sha512-WQs0ep98FXX2XBAfQpRbY0Ma6ADw8JR6xoIkaIiJIzClGOMqVRvPCWqndTxf28DgFopWan0EKtHtg/5W1h0Zkw==
"@webpack-cli/info@^1.2.3":
version "1.2.3"
resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.2.3.tgz#ef819d10ace2976b6d134c7c823a3e79ee31a92c"
integrity sha512-lLek3/T7u40lTqzCGpC6CAbY6+vXhdhmwFRxZLMnRm6/sIF/7qMpT8MocXCRQfz0JAh63wpbXLMnsQ5162WS7Q==
"@webpack-cli/info@^1.2.4":
version "1.2.4"
resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.2.4.tgz#7381fd41c9577b2d8f6c2594fad397ef49ad5573"
integrity sha512-ogE2T4+pLhTTPS/8MM3IjHn0IYplKM4HbVNMCWA9N4NrdPzunwenpCsqKEXyejMfRu6K8mhauIPYf8ZxWG5O6g==
dependencies:
envinfo "^7.7.3"
"@webpack-cli/serve@^1.3.1":
version "1.3.1"
resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.3.1.tgz#911d1b3ff4a843304b9c3bacf67bb34672418441"
integrity sha512-0qXvpeYO6vaNoRBI52/UsbcaBydJCggoBBnIo/ovQQdn6fug0BgwsjorV1hVS7fMqGVTZGcVxv8334gjmbj5hw==
"@webpack-cli/serve@^1.4.0":
version "1.4.0"
resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.4.0.tgz#f84fd07bcacefe56ce762925798871092f0f228e"
integrity sha512-xgT/HqJ+uLWGX+Mzufusl3cgjAcnqYYskaB7o0vRcwOEfuu6hMzSILQpnIzFMGsTaeaX4Nnekl+6fadLbl1/Vg==
"@xtuc/ieee754@^1.2.0":
version "1.2.0"
@ -658,9 +658,9 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5:
uri-js "^4.2.2"
ajv@^8.0.1:
version "8.2.0"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.2.0.tgz#c89d3380a784ce81b2085f48811c4c101df4c602"
integrity sha512-WSNGFuyWd//XO8n/m/EaOlNLtO0yL8EXT/74LqT4khdhpZjP7lkj/kT5uwRmGitKEVp/Oj7ZUHeGfPtgHhQ5CA==
version "8.3.0"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.3.0.tgz#25ee7348e32cdc4a1dbb38256bf6bdc451dd577c"
integrity sha512-RYE7B5An83d7eWnDR8kbdaIFqmKCNsP16ay1hDbJEU+sa0e3H9SebskCt0Uufem6cfAVu7Col6ubcn/W+Sm8/Q==
dependencies:
fast-deep-equal "^3.1.1"
json-schema-traverse "^1.0.0"
@ -949,9 +949,9 @@ available-typed-arrays@^1.0.2:
array-filter "^1.0.0"
aws-sdk@^2.888.0:
version "2.898.0"
resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.898.0.tgz#fd07b9748d302fccc2d1e069ae313e911b526578"
integrity sha512-6XxsKEDgDEQlLAVrPDNO01UgflCaKJlp6bYTSxv2z50ApTktadwSr/uJgpaBdAiZ8EKVlWN4UgM7vgOmrI/MPg==
version "2.904.0"
resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.904.0.tgz#45a53e918698e451f762e44005dfce177a50b7e6"
integrity sha512-BnlMgxiQ0as0LSigm/QVgdh8CoIVY29DItmnFOnL6ahJ5W/m1Xzpge2jJoj+gqwZ+QQvOO31dDYw9PtteiR/IQ==
dependencies:
buffer "4.9.2"
events "1.1.1"
@ -1727,12 +1727,12 @@ boolbase@^1.0.0, boolbase@~1.0.0:
resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
bootstrap-validator@^0.11.8:
bootstrap-validator@0.11.9:
version "0.11.9"
resolved "https://registry.yarnpkg.com/bootstrap-validator/-/bootstrap-validator-0.11.9.tgz#fb7058eef53623e78f5aa7967026f98f875a9404"
integrity sha1-+3BY7vU2I+ePWqeWcCb5j4dalAQ=
bootstrap@^3.4.0:
bootstrap@3.4.1:
version "3.4.1"
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-3.4.1.tgz#c3a347d419e289ad11f4033e3c4132b87c081d72"
integrity sha512-yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA==
@ -2064,9 +2064,9 @@ caniuse-api@^3.0.0:
lodash.uniq "^4.5.0"
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30001219:
version "1.0.30001220"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001220.tgz#c080e1c8eefb99f6cc9685da6313840bdbaf4c36"
integrity sha512-pjC2T4DIDyGAKTL4dMvGUQaMUHRmhvPpAgNNTa14jaBWHu+bLQgvpFqElxh9L4829Fdx0PlKiMp3wnYldRtECA==
version "1.0.30001228"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz#bfdc5942cd3326fa51ee0b42fbef4da9d492a7fa"
integrity sha512-QQmLOGJ3DEgokHbMSA8cj2a+geXqmnpyOFT0lhQV6P3/YOJvGDEwoedcwxEQ30gJIwIIunHIicunJ2rzK5gB2A==
caseless@~0.12.0:
version "0.12.0"
@ -3505,9 +3505,9 @@ ejs@^3.0.0:
jake "^10.6.1"
electron-to-chromium@^1.3.47, electron-to-chromium@^1.3.723:
version "1.3.725"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.725.tgz#04fc83f9189169aff50f0a00c6b4090b910cba85"
integrity sha512-2BbeAESz7kc6KBzs7WVrMc1BY5waUphk4D4DX5dSQXJhsc3tP5ZFaiyuL0AB7vUKzDYpIeYwTYlEfxyjsGUrhw==
version "1.3.727"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.727.tgz#857e310ca00f0b75da4e1db6ff0e073cc4a91ddf"
integrity sha512-Mfz4FIB4FSvEwBpDfdipRIrwd6uo8gUDoRDF4QEYb4h4tSuI3ov594OrjU6on042UlFHouIJpClDODGkPcBSbg==
elliptic@^6.5.3:
version "6.5.4"
@ -3527,7 +3527,7 @@ emoji-regex@^8.0.0:
resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
emojify.js@^1.1.0:
emojify.js@1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/emojify.js/-/emojify.js-1.1.0.tgz#079fff223307c9007f570785e8e4935d5c398beb"
integrity sha1-B5//IjMHyQB/VweF6OSTXVw5i+s=
@ -3555,9 +3555,9 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.1:
once "^1.4.0"
engine.io-client@~3.5.0:
version "3.5.1"
resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.5.1.tgz#b500458a39c0cd197a921e0e759721a746d0bdb9"
integrity sha512-oVu9kBkGbcggulyVF0kz6BV3ganqUeqXvD79WOFKa+11oK692w1NyFkuEj4xrkFRpZhn92QOqTk4RQq5LiBXbQ==
version "3.5.2"
resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.5.2.tgz#0ef473621294004e9ceebe73cef0af9e36f2f5fa"
integrity sha512-QEqIp+gJ/kMHeUun7f5Vv3bteRHppHH/FMBQX/esFj/fuYfjyUKWGMo3VCvIP/V8bE9KcjHmRZrhIz2Z9oNsDA==
dependencies:
component-emitter "~1.3.0"
component-inherit "0.0.3"
@ -3568,7 +3568,7 @@ engine.io-client@~3.5.0:
parseqs "0.0.6"
parseuri "0.0.6"
ws "~7.4.2"
xmlhttprequest-ssl "~1.5.4"
xmlhttprequest-ssl "~1.6.2"
yeast "0.1.2"
engine.io-parser@~2.2.0:
@ -3603,7 +3603,7 @@ enhanced-resolve@^4.5.0:
memory-fs "^0.5.0"
tapable "^1.0.0"
enquirer@^2.3.5, enquirer@^2.3.6:
enquirer@^2.3.5:
version "2.3.6"
resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d"
integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==
@ -3701,12 +3701,29 @@ es6-error@^4.1.1:
resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d"
integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==
esbuild-loader@2.13.0:
version "2.13.0"
resolved "https://registry.yarnpkg.com/esbuild-loader/-/esbuild-loader-2.13.0.tgz#f5a3602a89a3b728506ae3e1887304fffeef9270"
integrity sha512-gC9lML8RGkTSWG2pJVEOZRLMoIluq1Jd7OzzVkOZKMzbMDMWDhXEwXLs60n+aglnAYa9GVrD/UXjTHkM51nBsg==
dependencies:
esbuild "^0.11.19"
joycon "^3.0.1"
json5 "^2.2.0"
loader-utils "^2.0.0"
type-fest "^1.0.1"
webpack-sources "^2.2.0"
esbuild@^0.11.19:
version "0.11.20"
resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.11.20.tgz#7cefa1aee8b372c184e42457885f7ce5d3e62a1e"
integrity sha512-QOZrVpN/Yz74xfat0H6euSgn3RnwLevY1mJTEXneukz1ln9qB+ieaerRMzSeETpz/UJWsBMzRVR/andBht5WKw==
escalade@^3.1.1:
version "3.1.1"
resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
escape-html@^1.0.3, escape-html@~1.0.3:
escape-html@1.0.3, escape-html@^1.0.3, escape-html@~1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
@ -3820,17 +3837,17 @@ eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0:
integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
eslint-visitor-keys@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
version "2.1.0"
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
eslint@7.25.0:
version "7.25.0"
resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.25.0.tgz#1309e4404d94e676e3e831b3a3ad2b050031eb67"
integrity sha512-TVpSovpvCNpLURIScDRB6g5CYu/ZFq9GfX2hLNIV4dSBKxIWojeDODvYl3t0k0VtMxYeR8OXPCFE5+oHMlGfhw==
eslint@7.26.0:
version "7.26.0"
resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.26.0.tgz#d416fdcdcb3236cd8f282065312813f8c13982f6"
integrity sha512-4R1ieRf52/izcZE7AlLy56uIHHDLT74Yzz2Iv2l6kDaYvEu9x+wMB5dZArVL8SYGXSYV2YAg70FcW5Y5nGGNIg==
dependencies:
"@babel/code-frame" "7.12.11"
"@eslint/eslintrc" "^0.4.0"
"@eslint/eslintrc" "^0.4.1"
ajv "^6.10.0"
chalk "^4.0.0"
cross-spawn "^7.0.2"
@ -4192,15 +4209,15 @@ file-loader@6.2.0:
loader-utils "^2.0.0"
schema-utils "^3.0.0"
file-saver@^2.0.0:
file-saver@2.0.5:
version "2.0.5"
resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-2.0.5.tgz#d61cfe2ce059f414d899e9dd6d4107ee25670c38"
integrity sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==
file-type@^16.1.0:
version "16.3.0"
resolved "https://registry.yarnpkg.com/file-type/-/file-type-16.3.0.tgz#f03af91db30f92cc9a0b335c0644c46101522f6d"
integrity sha512-ZA0hV64611vJT42ltw0T9IDwHApQuxRdrmQZWTeDmeAUtZBBVSQW3nSQqhhW1cAgpXgqcJvm410BYHXJQ9AymA==
version "16.4.0"
resolved "https://registry.yarnpkg.com/file-type/-/file-type-16.4.0.tgz#464197e44bd94a452d77b09085d977ae0dad2df4"
integrity sha512-MDAkwha3wHg11Lp++2T3Gu347eC/DB4r7nYj6iZaf1l7UhGBh2746QKxg0BWC8w2dJsxUEmH8KvLueX+GthN2w==
dependencies:
readable-web-to-node-stream "^3.0.0"
strtok3 "^6.0.3"
@ -4340,7 +4357,7 @@ flatted@^3.1.0:
resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz#c4b489e80096d9df1dfc97c79871aea7c617c469"
integrity sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==
flowchart.js@^1.6.4:
flowchart.js@1.15.0:
version "1.15.0"
resolved "https://registry.yarnpkg.com/flowchart.js/-/flowchart.js-1.15.0.tgz#132ba2df14af0a65e67280026ef05a1ffd16569f"
integrity sha512-IyCVUFfHPLPgKLynw3NCkZ7CvKJdc/bAu0aHm+2AxKhtSBCiUC1kcTX1KautC3HOp1A2JS1IOcYxDTmcMkx5nQ==
@ -4361,9 +4378,9 @@ fn.name@1.x.x:
integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==
follow-redirects@^1.10.0:
version "1.14.0"
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.0.tgz#f5d260f95c5f8c105894491feee5dc8993b402fe"
integrity sha512-0vRwd7RKQBTt+mgu87mtYeofLFZpTas2S9zY+jIeuLJMNvudIgF52nr19q40HOwH5RrhWIPuj9puybzSJiRrVg==
version "1.14.1"
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.1.tgz#d9114ded0a1cfdd334e164e6662ad02bfd91ff43"
integrity sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==
for-in@^1.0.1, for-in@^1.0.2:
version "1.0.2"
@ -4387,7 +4404,7 @@ forever-agent@~0.6.1:
resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
fork-awesome@^1.1.3:
fork-awesome@1.1.7:
version "1.1.7"
resolved "https://registry.yarnpkg.com/fork-awesome/-/fork-awesome-1.1.7.tgz#1427da1cac3d1713046ee88427e5fcecb9501d21"
integrity sha512-IHI7XCSXrKfUIWslse8c/PaaVDT1oBaYge+ju40ihL2ooiQeBpTr4wvIXhgTd2NuhntlvX+M5jYHAPTzNlmv0g==
@ -4588,7 +4605,7 @@ getpass@^0.1.1:
dependencies:
assert-plus "^1.0.0"
gist-embed@^2.6.0:
gist-embed@2.6.0:
version "2.6.0"
resolved "https://registry.yarnpkg.com/gist-embed/-/gist-embed-2.6.0.tgz#1ea95703fa1fc2a1255419f6f06c67e9920649ab"
integrity sha1-HqlXA/ofwqElVBn28Gxn6ZIGSas=
@ -4623,7 +4640,7 @@ glob-parent@^5.0.0, glob-parent@^5.1.0, glob-parent@^5.1.1, glob-parent@~5.1.0:
dependencies:
is-glob "^4.0.1"
glob@7.1.6, glob@^7.0.3, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
glob@7.1.6:
version "7.1.6"
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
@ -4635,6 +4652,18 @@ glob@7.1.6, glob@^7.0.3, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
once "^1.3.0"
path-is-absolute "^1.0.0"
glob@^7.0.3, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
version "7.1.7"
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90"
integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
dependencies:
fs.realpath "^1.0.0"
inflight "^1.0.4"
inherits "2"
minimatch "^3.0.4"
once "^1.3.0"
path-is-absolute "^1.0.0"
globals@^12.1.0:
version "12.4.0"
resolved "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz#a18813576a41b00a24a97e7f815918c2e19925f8"
@ -4834,7 +4863,7 @@ hex-color-regex@^1.1.0:
resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e"
integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==
highlight.js@^10.0.0:
highlight.js@10.7.2:
version "10.7.2"
resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.7.2.tgz#89319b861edc66c48854ed1e6da21ea89f847360"
integrity sha512-oFLl873u4usRM9K63j4ME9u3etNF0PLiJhSQ8rdfuL51Wn3zkD6drf9ZW0dOzjnZI22YYG24z30JcmfCZjMgYg==
@ -4966,9 +4995,9 @@ human-signals@^2.1.0:
integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
i18n@^0.13.0:
version "0.13.2"
resolved "https://registry.yarnpkg.com/i18n/-/i18n-0.13.2.tgz#3886678fe7cbbed45bac2ce53b8144c788a1c1b5"
integrity sha512-PB65bHhQESMBIl/xVNChEAzoxZ5W6FrZ1H9Ma/YcPeSfE7VS9b0sqwBPusa0CfzSKUPSl+uMhRIgyv3jkE7XNw==
version "0.13.3"
resolved "https://registry.yarnpkg.com/i18n/-/i18n-0.13.3.tgz#5820f48d87a77cf14e064719bee9bc682ed550eb"
integrity sha512-QDmY2joBdKxj3wvk2LKyvZkjwGHta882kYHwEvx1WbwiPAet49kEU7cxzGfnrtWrfh4+7I07kBc0ZSjSlhnKyQ==
dependencies:
debug "^4.1.1"
make-plural "^6.2.2"
@ -5019,9 +5048,9 @@ iferr@^0.1.5:
integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
ignore-walk@^3.0.1:
version "3.0.3"
resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37"
integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==
version "3.0.4"
resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.4.tgz#c9a09f69b7c7b479a5d74ac1a3c0d4236d2a6335"
integrity sha512-PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ==
dependencies:
minimatch "^3.0.4"
@ -5144,7 +5173,7 @@ invariant@^2.2.2:
dependencies:
loose-envify "^1.0.0"
ionicons@^2.0.1:
ionicons@2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/ionicons/-/ionicons-2.0.1.tgz#ca398113293ea870244f538f0aabbd4b5b209a3e"
integrity sha1-yjmBEyk+qHAkT1OPCqu9S1sgmj4=
@ -5204,9 +5233,9 @@ is-arrayish@^0.3.1:
integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==
is-bigint@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.1.tgz#6923051dfcbc764278540b9ce0e6b3213aa5ebc2"
integrity sha512-J0ELF4yHFxHy0cmSxZuheDOz2luOdVvqjwmEcj8H/L1JHeuEDSDbeRP+Dk9kFVk5RTFzbucJ2Kb9F7ixY2QaCg==
version "1.0.2"
resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.2.tgz#ffb381442503235ad245ea89e45b3dbff040ee5a"
integrity sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA==
is-binary-path@^1.0.0:
version "1.0.1"
@ -5228,11 +5257,11 @@ is-bluebird@^1.0.2:
integrity sha1-CWQ5Bg9KpBGr7hkUOoTWpVNG1uI=
is-boolean-object@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.0.tgz#e2aaad3a3a8fca34c28f6eee135b156ed2587ff0"
integrity sha512-a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA==
version "1.1.1"
resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.1.tgz#3c0878f035cb821228d350d2e1e36719716a3de8"
integrity sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng==
dependencies:
call-bind "^1.0.0"
call-bind "^1.0.2"
is-buffer@^1.1.5:
version "1.1.6"
@ -5262,9 +5291,9 @@ is-color-stop@^1.0.0:
rgba-regex "^1.0.0"
is-core-module@^2.2.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.3.0.tgz#d341652e3408bca69c4671b79a0954a3d349f887"
integrity sha512-xSphU2KG9867tsYdLD4RWQ1VqdFl4HTO9Thf3I/3dLEfr0dbPTWKsuCKrgqMljg4nPE+Gq0VCnzT3gr0CyBmsw==
version "2.4.0"
resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.4.0.tgz#8e9fc8e15027b011418026e98f0e6f4d86305cc1"
integrity sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A==
dependencies:
has "^1.0.3"
@ -5283,9 +5312,9 @@ is-data-descriptor@^1.0.0:
kind-of "^6.0.0"
is-date-object@^1.0.1, is-date-object@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e"
integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==
version "1.0.4"
resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.4.tgz#550cfcc03afada05eea3dd30981c7b09551f73e5"
integrity sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A==
is-decimal@^1.0.0:
version "1.0.4"
@ -5413,9 +5442,9 @@ is-negative-zero@^2.0.1:
integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==
is-number-object@^1.0.4:
version "1.0.4"
resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.4.tgz#36ac95e741cf18b283fc1ddf5e83da798e3ec197"
integrity sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw==
version "1.0.5"
resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.5.tgz#6edfaeed7950cff19afedce9fbfca9ee6dd289eb"
integrity sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw==
is-number@^2.1.0:
version "2.1.0"
@ -5474,12 +5503,12 @@ is-property@^1.0.2:
integrity sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=
is-regex@^1.1.1, is-regex@^1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.2.tgz#81c8ebde4db142f2cf1c53fc86d6a45788266251"
integrity sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==
version "1.1.3"
resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.3.tgz#d029f9aff6448b93ebbe3f33dac71511fdcbef9f"
integrity sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==
dependencies:
call-bind "^1.0.2"
has-symbols "^1.0.1"
has-symbols "^1.0.2"
is-resolvable@^1.0.0:
version "1.1.0"
@ -5497,9 +5526,9 @@ is-stream@^2.0.0:
integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==
is-string@^1.0.5:
version "1.0.5"
resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6"
integrity sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==
version "1.0.6"
resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.6.tgz#3fe5d5992fb0d93404f32584d4b0179a71b54a5f"
integrity sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w==
is-svg@^4.3.1:
version "4.3.1"
@ -5509,11 +5538,11 @@ is-svg@^4.3.1:
fast-xml-parser "^3.19.0"
is-symbol@^1.0.2, is-symbol@^1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937"
integrity sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==
version "1.0.4"
resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c"
integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==
dependencies:
has-symbols "^1.0.1"
has-symbols "^1.0.2"
is-typed-array@^1.1.3:
version "1.1.5"
@ -5613,22 +5642,27 @@ jmespath@0.15.0:
resolved "https://registry.yarnpkg.com/jmespath/-/jmespath-0.15.0.tgz#a3f222a9aae9f966f5d27c796510e28091764217"
integrity sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc=
jquery-mousewheel@^3.1.13:
joycon@^3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/joycon/-/joycon-3.0.1.tgz#9074c9b08ccf37a6726ff74a18485f85efcaddaf"
integrity sha512-SJcJNBg32dGgxhPtM0wQqxqV0ax9k/9TaUskGDSJkSFSQOEWWvQ3zzWdGQRIUry2j1zA5+ReH13t0Mf3StuVZA==
jquery-mousewheel@3.1.13:
version "3.1.13"
resolved "https://registry.yarnpkg.com/jquery-mousewheel/-/jquery-mousewheel-3.1.13.tgz#06f0335f16e353a695e7206bf50503cb523a6ee5"
integrity sha1-BvAzXxbjU6aV5yBr9QUDy1I6buU=
jquery-ui@^1.12.1:
jquery-ui@1.12.1:
version "1.12.1"
resolved "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.12.1.tgz#bcb4045c8dd0539c134bc1488cdd3e768a7a9e51"
integrity sha1-vLQEXI3QU5wTS8FIjN0+dop6nlE=
jquery@^3.5.1:
jquery@3.6.0:
version "3.6.0"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470"
integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==
js-cookie@^2.1.3:
js-cookie@2.2.1:
version "2.2.1"
resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.2.1.tgz#69e106dc5d5806894562902aa5baec3744e9b2b8"
integrity sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ==
@ -5654,14 +5688,7 @@ js-tokens@^3.0.2:
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
js-yaml@4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.0.0.tgz#f426bc0ff4b4051926cd588c71113183409a121f"
integrity sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q==
dependencies:
argparse "^2.0.1"
js-yaml@^3.13.1, js-yaml@^3.6.1:
js-yaml@3.14.1, js-yaml@^3.13.1, js-yaml@^3.6.1:
version "3.14.1"
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
@ -5669,6 +5696,13 @@ js-yaml@^3.13.1, js-yaml@^3.6.1:
argparse "^1.0.7"
esprima "^4.0.0"
js-yaml@4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.0.0.tgz#f426bc0ff4b4051926cd588c71113183409a121f"
integrity sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q==
dependencies:
argparse "^2.0.1"
js-yaml@~4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
@ -5767,7 +5801,7 @@ json5@^1.0.1:
dependencies:
minimist "^1.2.0"
json5@^2.0.0, json5@^2.1.2:
json5@^2.0.0, json5@^2.1.2, json5@^2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3"
integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==
@ -5814,7 +5848,7 @@ jws@3.x.x:
jwa "^1.4.1"
safe-buffer "^5.0.1"
keymaster@^1.6.2:
keymaster@1.6.2:
version "1.6.2"
resolved "https://registry.yarnpkg.com/keymaster/-/keymaster-1.6.2.tgz#e1ae54d0ea9488f9f60b66b668f02e9a1946c6eb"
integrity sha1-4a5U0OqUiPn2C2a2aPAumhlGxus=
@ -5959,7 +5993,7 @@ linkify-it@^3.0.1:
dependencies:
uc.micro "^1.0.1"
list.js@^2.0.0:
list.js@2.3.1:
version "2.3.1"
resolved "https://registry.yarnpkg.com/list.js/-/list.js-2.3.1.tgz#48961989ffe52b0505e352f7a521f819f51df7e7"
integrity sha512-jnmm7DYpKtH3DxtO1E2VNCC9Gp7Wrp/FWA2JxQrZUhVJ2RCQBd57pCN6W5w6jpsfWZV0PCAbTX2NOPgyFeeZZg==
@ -6374,7 +6408,7 @@ math-random@^1.0.1:
resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c"
integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==
mathjax@^2.7.6:
mathjax@2.7.9:
version "2.7.9"
resolved "https://registry.yarnpkg.com/mathjax/-/mathjax-2.7.9.tgz#d6b67955c173e7d719fcb2fc0288662884eb7d3d"
integrity sha512-NOGEDTIM9+MrsqnjPEjVGNx4q0GQxqm61yQwSK+/5S59i26wId5IC5gNu9/bu8+CCVl5p9G2IHcAl/wJa+5+BQ==
@ -6497,10 +6531,10 @@ merge2@^1.3.0:
resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
mermaid@^8.5.1:
version "8.9.3"
resolved "https://registry.yarnpkg.com/mermaid/-/mermaid-8.9.3.tgz#24f682d26f757ed4cb5812b0a798eddcedcc9658"
integrity sha512-RH8B4+HEKmdpwDieh3hpKS4oUcpfcu8q4hr3nub7Y7okxOLhF9ynEvKKQ7Dx6H1ymNjTLYUHei5/4gTnaPyimA==
mermaid@8.10.1:
version "8.10.1"
resolved "https://registry.yarnpkg.com/mermaid/-/mermaid-8.10.1.tgz#9573f702024e2173f4aa07d9b207d750507cf838"
integrity sha512-KxwKEJDKy303TQdz5TQMFb/4u+gUL21CefUMGOfuigDh9powcYaNmuJ5BkHmO0jB3Y1z2zlsuKvHZ2CusWH5+A==
dependencies:
"@braintree/sanitize-url" "^3.1.0"
d3 "^5.7.0"
@ -6794,10 +6828,10 @@ mkdirp@^1.0.3, mkdirp@^1.0.4:
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
mocha@8.3.2:
version "8.3.2"
resolved "https://registry.yarnpkg.com/mocha/-/mocha-8.3.2.tgz#53406f195fa86fbdebe71f8b1c6fb23221d69fcc"
integrity sha512-UdmISwr/5w+uXLPKspgoV7/RXZwKRTiTjJ2/AC5ZiEztIoOYdfKb19+9jNmEInzx5pBsCyJQzarAxqIGBNYJhg==
mocha@8.4.0:
version "8.4.0"
resolved "https://registry.yarnpkg.com/mocha/-/mocha-8.4.0.tgz#677be88bf15980a3cae03a73e10a0fc3997f0cff"
integrity sha512-hJaO0mwDXmZS4ghXsvPVriOhsxQ7ofcpQdm8dE+jISUOKopitvnXFQmpRR7jd2K6VBG6E26gU3IAbXXGIbu4sQ==
dependencies:
"@ungap/promise-all-settled" "1.1.2"
ansi-colors "4.1.1"
@ -6934,10 +6968,10 @@ nanoid@^2.1.0:
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-2.1.11.tgz#ec24b8a758d591561531b4176a01e3ab4f0f0280"
integrity sha512-s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA==
nanoid@^3.1.22:
version "3.1.22"
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.22.tgz#b35f8fb7d151990a8aebd5aa5015c03cf726f844"
integrity sha512-/2ZUaJX2ANuLtTvqTlgqBQNJoQO398KyJgZloL0PZkC0dpysjncRUPsFe3DUPzz/y3h+u7C46np8RMuvF3jsSQ==
nanoid@^3.1.23:
version "3.1.23"
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.23.tgz#f744086ce7c2bc47ee0a8472574d5c78e4183a81"
integrity sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw==
nanomatch@^1.2.9:
version "1.2.13"
@ -7218,9 +7252,9 @@ object-copy@^0.1.0:
kind-of "^3.0.3"
object-inspect@^1.9.0:
version "1.10.2"
resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.10.2.tgz#b6385a3e2b7cae0b5eafcf90cddf85d128767f30"
integrity sha512-gz58rdPpadwztRrPjZE9DZLOABUpTGdcANUgOwBFO1C+HZZhePoP83M65WGDmbpwFYJSWqavbl4SgDn4k8RYTA==
version "1.10.3"
resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.10.3.tgz#c2aa7d2d09f50c99375704f7a0adf24c5782d369"
integrity sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw==
object-is@^1.1.4:
version "1.1.5"
@ -8171,9 +8205,9 @@ postcss-selector-parser@^3.0.0:
uniq "^1.0.1"
postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4:
version "6.0.5"
resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.5.tgz#042d74e137db83e6f294712096cb413f5aa612c4"
integrity sha512-aFYPoYmXbZ1V6HZaSvat08M97A8HqO6Pjz+PiNpw/DhuRrC72XWAdp3hL6wusDCN31sSmcZyMGa2hZEuX+Xfhg==
version "6.0.6"
resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz#2c5bba8174ac2f6981ab631a42ab0ee54af332ea"
integrity sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==
dependencies:
cssesc "^3.0.0"
util-deprecate "^1.0.2"
@ -8216,12 +8250,12 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.27:
supports-color "^6.1.0"
postcss@^8.2.10:
version "8.2.13"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.13.tgz#dbe043e26e3c068e45113b1ed6375d2d37e2129f"
integrity sha512-FCE5xLH+hjbzRdpbRb1IMCvPv9yZx2QnDarBEYSN0N0HYk+TcXsEhwdFcFb+SRWOKzKGErhIEbBK2ogyLdTtfQ==
version "8.2.15"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.15.tgz#9e66ccf07292817d226fc315cbbf9bc148fbca65"
integrity sha512-2zO3b26eJD/8rb106Qu2o7Qgg52ND5HPjcyQiK2B98O388h43A448LCslC0dI2P97wCAQRJsFvwTRcXxTKds+Q==
dependencies:
colorette "^1.2.2"
nanoid "^3.1.22"
nanoid "^3.1.23"
source-map "^0.6.1"
postgres-array@~2.0.0:
@ -8274,7 +8308,7 @@ printj@~1.1.0:
resolved "https://registry.yarnpkg.com/printj/-/printj-1.1.2.tgz#d90deb2975a8b9f600fb3a1c94e3f4c53c78a222"
integrity sha512-zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ==
prismjs@^1.21.0:
prismjs@1.23.0:
version "1.23.0"
resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.23.0.tgz#d3b3967f7d72440690497652a9d40ff046067f33"
integrity sha512-c29LVsqOaLbBHuIbsTxaKENh1N2EQBOHaWv7gkHN4dgRbxSREqDnDbtFJYdpPauS4YCplMSNCABQ6Eeor69bAA==
@ -8479,7 +8513,7 @@ range-parser@~1.2.1:
resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
raphael@2.3.0, raphael@2.3.x, raphael@^2.3.0:
raphael@2.3.0, raphael@2.3.x:
version "2.3.0"
resolved "https://registry.yarnpkg.com/raphael/-/raphael-2.3.0.tgz#eabeb09dba861a1d4cee077eaafb8c53f3131f89"
integrity sha512-w2yIenZAQnp257XUWGni4bLMVxpUpcIl7qgxEgDIXtmSypYtlNxfXWpOBxs7LBTps5sDwhRnrToJrMUrivqNTQ==
@ -9346,7 +9380,7 @@ reusify@^1.0.4:
resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
reveal.js@^3.9.2:
reveal.js@3.9.2:
version "3.9.2"
resolved "https://registry.yarnpkg.com/reveal.js/-/reveal.js-3.9.2.tgz#7f63d3dfec338b6c313dcabdf006e8cf80e0b358"
integrity sha512-Dvv2oA9FrtOHE2DWj5js8pMRfwq++Wmvsn1EyAdYLC80lBjTphns+tPsB652Bnvep9AVviuVS/b4XoVY9rXHLA==
@ -9474,7 +9508,7 @@ scrypt-kdf@^2.0.1:
resolved "https://registry.yarnpkg.com/scrypt-kdf/-/scrypt-kdf-2.0.1.tgz#3355224c52d398331b2cbf2b70a7be26b52c53e6"
integrity sha512-dMhpgBVJPDWZP5erOCwTjI6oAO9hKhFAjZsdSQ0spaWJYHuA/wFNF2weQQfsyCIk8eNKoLfEDxr3zAtM+gZo0Q==
select2@^3.5.2-browserify:
select2@3.5.2-browserify:
version "3.5.2-browserify"
resolved "https://registry.yarnpkg.com/select2/-/select2-3.5.2-browserify.tgz#dc4dafda38d67a734e8a97a46f0d3529ae05391d"
integrity sha1-3E2v2jjWenNOipekbw01Ka4FOR0=
@ -9736,7 +9770,7 @@ socket.io-adapter@~1.1.0:
resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz#ab3f0d6f66b8fc7fca3959ab5991f82221789be9"
integrity sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g==
socket.io-client@2.4.0, socket.io-client@^2.1.1:
socket.io-client@2.4.0:
version "2.4.0"
resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.4.0.tgz#aafb5d594a3c55a34355562fc8aea22ed9119a35"
integrity sha512-M6xhnKQHuuZd4Ba9vltCLT9oa+YvTsP8j9NcEiLElfIg8KeYPyhWOes6x4t+LTAC8enQbE/995AdTem2uNyKKQ==
@ -9783,7 +9817,7 @@ socket.io@^2.1.1:
socket.io-client "2.4.0"
socket.io-parser "~3.4.0"
source-list-map@^2.0.0:
source-list-map@^2.0.0, source-list-map@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
@ -9860,7 +9894,7 @@ spdx-license-ids@^3.0.0:
resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz#e9c18a410e5ed7e12442a549fbd8afa767038d65"
integrity sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==
spin.js@^4.0.0:
spin.js@4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/spin.js/-/spin.js-4.1.0.tgz#afcf12738fafd5f6aa0a385a5b4cec45c86a3555"
integrity sha512-WI8O1OdJlKjialIhB9Z5RfFFM4pI7Hohik76bB3N4Ep3N/vTDPZiRU8QeefyLbmpI5n2bFQXgticl2g+/KiKYA==
@ -10213,13 +10247,12 @@ svgo@^1.0.0:
util.promisify "~1.0.0"
table@^6.0.4:
version "6.6.0"
resolved "https://registry.yarnpkg.com/table/-/table-6.6.0.tgz#905654b79df98d9e9a973de1dd58682532c40e8e"
integrity sha512-iZMtp5tUvcnAdtHpZTWLPF0M7AgiQsURR2DwmxnJwSy8I3+cY+ozzVvYha3BOLG2TB+L0CqjIz+91htuj6yCXg==
version "6.7.0"
resolved "https://registry.yarnpkg.com/table/-/table-6.7.0.tgz#26274751f0ee099c547f6cb91d3eff0d61d155b2"
integrity sha512-SAM+5p6V99gYiiy2gT5ArdzgM1dLDed0nkrWmG6Fry/bUS/m9x83BwpJUOf1Qj/x2qJd+thL6IkIx7qPGRxqBw==
dependencies:
ajv "^8.0.1"
lodash.clonedeep "^4.5.0"
lodash.flatten "^4.4.0"
lodash.truncate "^4.4.2"
slice-ansi "^4.0.0"
string-width "^4.2.0"
@ -10514,7 +10547,7 @@ tunnel@0.0.6:
resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c"
integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==
turndown@^7.0.0:
turndown@7.0.0:
version "7.0.0"
resolved "https://registry.yarnpkg.com/turndown/-/turndown-7.0.0.tgz#19b2a6a2d1d700387a1e07665414e4af4fec5225"
integrity sha512-G1FfxfR0mUNMeGjszLYl3kxtopC4O9DRRiMlMDDVHvU1jaBkGFg4qxIyjIk2aiKLHyDyZvZyu4qBO2guuYBy3Q==
@ -10543,6 +10576,11 @@ type-fest@^0.8.1:
resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
type-fest@^1.0.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-1.1.1.tgz#210251e7f57357a1457269e6b34837fed067ac2c"
integrity sha512-RPDKc5KrIyKTP7Fk75LruUagqG6b+OTgXlCR2Z0aQDJFeIvL4/mhahSEtHmmVzXu4gmA0srkF/8FCH3WOWxTWA==
type-is@~1.6.17, type-is@~1.6.18:
version "1.6.18"
resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
@ -10569,9 +10607,9 @@ uc.micro@^1.0.1, uc.micro@^1.0.5:
integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==
uglify-js@^3.1.4, uglify-js@^3.5.1:
version "3.13.5"
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.13.5.tgz#5d71d6dbba64cf441f32929b1efce7365bb4f113"
integrity sha512-xtB8yEqIkn7zmOyS2zUNBsYCBRhDkvlNxMMY2smuJ/qA8NCHeQvKCF3i9Z4k8FJH4+PJvZRtMrPynfZ75+CSZw==
version "3.13.6"
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.13.6.tgz#6815ac7fdd155d03c83e2362bb717e5b39b74013"
integrity sha512-rRprLwl8RVaS+Qvx3Wh5hPfPBn9++G6xkGlUupya0s5aDmNjI7z3lnRLB3u7sN4OmbB0pWgzhM9BEJyiWAwtAA==
uid-safe@~2.1.5:
version "2.1.5"
@ -10957,7 +10995,7 @@ vasync@^2.2.0:
dependencies:
verror "1.10.0"
velocity-animate@^1.4.0:
velocity-animate@1.5.2:
version "1.5.2"
resolved "https://registry.yarnpkg.com/velocity-animate/-/velocity-animate-1.5.2.tgz#5a351d75fca2a92756f5c3867548b873f6c32105"
integrity sha512-m6EXlCAMetKztO1ppBhGU1/1MR3IiEevO6ESq6rcrSQ3Q77xYSW13jkfXW88o4xMrkXJhy/U7j4wFR/twMB0Eg==
@ -11021,12 +11059,12 @@ vfile@^4.0.0:
unist-util-stringify-position "^2.0.0"
vfile-message "^2.0.0"
visibilityjs@^2.0.0:
visibilityjs@2.0.2:
version "2.0.2"
resolved "https://registry.yarnpkg.com/visibilityjs/-/visibilityjs-2.0.2.tgz#d7c466e922024bb6c413d2136d5567e71f5fdc2f"
integrity sha512-y5sN5oGvuXXcK6s8WupOymRcqEss7kusojpScRqkT+cTCIFjul+06uSMDPMByN9DIBv/sUUnvV8BplKjqelAfw==
viz.js@^1.7.0:
viz.js@1.8.2:
version "1.8.2"
resolved "https://registry.yarnpkg.com/viz.js/-/viz.js-1.8.2.tgz#d9cc04cd99f98ec986bf9054db76a6cbcdc5d97a"
integrity sha512-W+1+N/hdzLpQZEcvz79n2IgUE9pfx6JLdHh3Kh8RGvLL8P1LdJVQmi2OsDcLdY4QVID4OUy+FPelyerX0nJxIQ==
@ -11059,18 +11097,17 @@ webfontloader@~1.6.x:
resolved "https://registry.yarnpkg.com/webfontloader/-/webfontloader-1.6.28.tgz#db786129253cb6e8eae54c2fb05f870af6675bae"
integrity sha1-23hhKSU8tujq5UwvsF+HCvZnW64=
webpack-cli@4.6.0:
version "4.6.0"
resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.6.0.tgz#27ae86bfaec0cf393fcfd58abdc5a229ad32fd16"
integrity sha512-9YV+qTcGMjQFiY7Nb1kmnupvb1x40lfpj8pwdO/bom+sQiP4OBMKjHq29YQrlDWDPZO9r/qWaRRywKaRDKqBTA==
webpack-cli@4.7.0:
version "4.7.0"
resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.7.0.tgz#3195a777f1f802ecda732f6c95d24c0004bc5a35"
integrity sha512-7bKr9182/sGfjFm+xdZSwgQuFjgEcy0iCTIBxRUeteJ2Kr8/Wz0qNJX+jw60LU36jApt4nmMkep6+W5AKhok6g==
dependencies:
"@discoveryjs/json-ext" "^0.5.0"
"@webpack-cli/configtest" "^1.0.2"
"@webpack-cli/info" "^1.2.3"
"@webpack-cli/serve" "^1.3.1"
"@webpack-cli/configtest" "^1.0.3"
"@webpack-cli/info" "^1.2.4"
"@webpack-cli/serve" "^1.4.0"
colorette "^1.2.1"
commander "^7.0.0"
enquirer "^2.3.6"
execa "^5.0.0"
fastest-levenshtein "^1.0.12"
import-local "^3.0.2"
@ -11095,6 +11132,14 @@ webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1, webpack-
source-list-map "^2.0.0"
source-map "~0.6.1"
webpack-sources@^2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.2.0.tgz#058926f39e3d443193b6c31547229806ffd02bac"
integrity sha512-bQsA24JLwcnWGArOKUxYKhX3Mz/nK1Xf6hxullKERyktjNMC4x8koOeaDNTA2fEJ09BdWLbM/iTW0ithREUP0w==
dependencies:
source-list-map "^2.0.1"
source-map "^0.6.1"
webpack@4.46.0:
version "4.46.0"
resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.46.0.tgz#bf9b4404ea20a073605e0a011d188d77cb6ad542"
@ -11263,7 +11308,7 @@ ws@^7.4.4, ws@~7.4.2:
resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.5.tgz#a484dd851e9beb6fdb420027e3885e8ce48986c1"
integrity sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g==
wurl@^2.5.3:
wurl@2.5.4:
version "2.5.4"
resolved "https://registry.yarnpkg.com/wurl/-/wurl-2.5.4.tgz#6af35a6c623296c4a0c607c4651d01b8f4e3fdec"
integrity sha512-Vuo550m5YbqRcM/69zz3jVNsCUvFTWLRYQcYvnqNWQ4d0Bjg7aoaofbcsPTe4rM9A2/4xjd8uIf9viIUV9EMXQ==
@ -11344,10 +11389,10 @@ xmldom@0.5.x:
resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.6.0.tgz#43a96ecb8beece991cef382c08397d82d4d0c46f"
integrity sha512-iAcin401y58LckRZ0TkI4k0VSM1Qg0KGSc3i8rU+xrxe19A/BN1zHyVSJY7uoutVlaTSzYyk/v5AmkewAP7jtg==
xmlhttprequest-ssl@~1.5.4:
version "1.5.5"
resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e"
integrity sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=
xmlhttprequest-ssl@~1.6.2:
version "1.6.2"
resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.6.2.tgz#dd6899bfbcf684b554e393c30b13b9f3b001a7ee"
integrity sha512-tYOaldF/0BLfKuoA39QMwD4j2m8lq4DIncqj1yuNELX4vz9+z/ieG/vwmctjJce+boFHXstqhWnHSxc4W8f4qg==
xmlhttprequest@>=1.5.0:
version "1.8.0"
@ -11365,9 +11410,9 @@ xpath@0.0.32:
integrity sha512-rxMJhSIoiO8vXcWvSifKqhvV96GjiD5wYb8/QHdoRyQvraTpp4IEv944nhGausZZ3u7dhQXteZuZbaqfpB7uYw==
xss@^1.0.3:
version "1.0.8"
resolved "https://registry.yarnpkg.com/xss/-/xss-1.0.8.tgz#32feb87feb74b3dcd3d404b7a68ababf10700535"
integrity sha512-3MgPdaXV8rfQ/pNn16Eio6VXYPTkqwa0vc7GkiymmY/DqR1SE/7VPAAVZz1GJsJFrllMYO3RHfEaiUGjab6TNw==
version "1.0.9"
resolved "https://registry.yarnpkg.com/xss/-/xss-1.0.9.tgz#3ffd565571ff60d2e40db7f3b80b4677bec770d2"
integrity sha512-2t7FahYnGJys6DpHLhajusId7R0Pm2yTmuL0GV9+mV0ZlaLSnb2toBmppATfg5sWIhZQGlsTLoecSzya+l4EAQ==
dependencies:
commander "^2.20.3"
cssfilter "0.0.10"

View File

@ -98,11 +98,11 @@
};
}
{
name = "_eslint_eslintrc___eslintrc_0.4.0.tgz";
name = "_eslint_eslintrc___eslintrc_0.4.1.tgz";
path = fetchurl {
name = "_eslint_eslintrc___eslintrc_0.4.0.tgz";
url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.0.tgz";
sha1 = "99cc0a0584d72f1df38b900fb062ba995f395547";
name = "_eslint_eslintrc___eslintrc_0.4.1.tgz";
url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.1.tgz";
sha1 = "442763b88cecbe3ee0ec7ca6d6dd6168550cbf14";
};
}
{
@ -330,27 +330,27 @@
};
}
{
name = "_types_node___node_15.0.1.tgz";
name = "_types_node___node_15.0.2.tgz";
path = fetchurl {
name = "_types_node___node_15.0.1.tgz";
url = "https://registry.yarnpkg.com/@types/node/-/node-15.0.1.tgz";
sha1 = "ef34dea0881028d11398be5bf4e856743e3dc35a";
name = "_types_node___node_15.0.2.tgz";
url = "https://registry.yarnpkg.com/@types/node/-/node-15.0.2.tgz";
sha1 = "51e9c0920d1b45936ea04341aa3e2e58d339fb67";
};
}
{
name = "_types_node___node_12.20.11.tgz";
name = "_types_node___node_12.20.12.tgz";
path = fetchurl {
name = "_types_node___node_12.20.11.tgz";
url = "https://registry.yarnpkg.com/@types/node/-/node-12.20.11.tgz";
sha1 = "980832cd56efafff8c18aa148c4085eb02a483f4";
name = "_types_node___node_12.20.12.tgz";
url = "https://registry.yarnpkg.com/@types/node/-/node-12.20.12.tgz";
sha1 = "fd9c1c2cfab536a2383ed1ef70f94adea743a226";
};
}
{
name = "_types_node___node_14.14.43.tgz";
name = "_types_node___node_14.14.44.tgz";
path = fetchurl {
name = "_types_node___node_14.14.43.tgz";
url = "https://registry.yarnpkg.com/@types/node/-/node-14.14.43.tgz";
sha1 = "26bcbb0595b305400e8ceaf9a127a7f905ae49c8";
name = "_types_node___node_14.14.44.tgz";
url = "https://registry.yarnpkg.com/@types/node/-/node-14.14.44.tgz";
sha1 = "df7503e6002847b834371c004b372529f3f85215";
};
}
{
@ -442,11 +442,11 @@
};
}
{
name = "_types_webpack___webpack_4.41.27.tgz";
name = "_types_webpack___webpack_4.41.28.tgz";
path = fetchurl {
name = "_types_webpack___webpack_4.41.27.tgz";
url = "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.27.tgz";
sha1 = "f47da488c8037e7f1b2dbf2714fbbacb61ec0ffc";
name = "_types_webpack___webpack_4.41.28.tgz";
url = "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.28.tgz";
sha1 = "0069a2159b7ad4d83d0b5801942c17d54133897b";
};
}
{
@ -602,27 +602,27 @@
};
}
{
name = "_webpack_cli_configtest___configtest_1.0.2.tgz";
name = "_webpack_cli_configtest___configtest_1.0.3.tgz";
path = fetchurl {
name = "_webpack_cli_configtest___configtest_1.0.2.tgz";
url = "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.0.2.tgz";
sha1 = "2a20812bfb3a2ebb0b27ee26a52eeb3e3f000836";
name = "_webpack_cli_configtest___configtest_1.0.3.tgz";
url = "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.0.3.tgz";
sha1 = "204bcff87cda3ea4810881f7ea96e5f5321b87b9";
};
}
{
name = "_webpack_cli_info___info_1.2.3.tgz";
name = "_webpack_cli_info___info_1.2.4.tgz";
path = fetchurl {
name = "_webpack_cli_info___info_1.2.3.tgz";
url = "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.2.3.tgz";
sha1 = "ef819d10ace2976b6d134c7c823a3e79ee31a92c";
name = "_webpack_cli_info___info_1.2.4.tgz";
url = "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.2.4.tgz";
sha1 = "7381fd41c9577b2d8f6c2594fad397ef49ad5573";
};
}
{
name = "_webpack_cli_serve___serve_1.3.1.tgz";
name = "_webpack_cli_serve___serve_1.4.0.tgz";
path = fetchurl {
name = "_webpack_cli_serve___serve_1.3.1.tgz";
url = "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.3.1.tgz";
sha1 = "911d1b3ff4a843304b9c3bacf67bb34672418441";
name = "_webpack_cli_serve___serve_1.4.0.tgz";
url = "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.4.0.tgz";
sha1 = "f84fd07bcacefe56ce762925798871092f0f228e";
};
}
{
@ -762,11 +762,11 @@
};
}
{
name = "ajv___ajv_8.2.0.tgz";
name = "ajv___ajv_8.3.0.tgz";
path = fetchurl {
name = "ajv___ajv_8.2.0.tgz";
url = "https://registry.yarnpkg.com/ajv/-/ajv-8.2.0.tgz";
sha1 = "c89d3380a784ce81b2085f48811c4c101df4c602";
name = "ajv___ajv_8.3.0.tgz";
url = "https://registry.yarnpkg.com/ajv/-/ajv-8.3.0.tgz";
sha1 = "25ee7348e32cdc4a1dbb38256bf6bdc451dd577c";
};
}
{
@ -1122,11 +1122,11 @@
};
}
{
name = "aws_sdk___aws_sdk_2.898.0.tgz";
name = "aws_sdk___aws_sdk_2.904.0.tgz";
path = fetchurl {
name = "aws_sdk___aws_sdk_2.898.0.tgz";
url = "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.898.0.tgz";
sha1 = "fd07b9748d302fccc2d1e069ae313e911b526578";
name = "aws_sdk___aws_sdk_2.904.0.tgz";
url = "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.904.0.tgz";
sha1 = "45a53e918698e451f762e44005dfce177a50b7e6";
};
}
{
@ -2162,11 +2162,11 @@
};
}
{
name = "caniuse_lite___caniuse_lite_1.0.30001220.tgz";
name = "caniuse_lite___caniuse_lite_1.0.30001228.tgz";
path = fetchurl {
name = "caniuse_lite___caniuse_lite_1.0.30001220.tgz";
url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001220.tgz";
sha1 = "c080e1c8eefb99f6cc9685da6313840bdbaf4c36";
name = "caniuse_lite___caniuse_lite_1.0.30001228.tgz";
url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz";
sha1 = "bfdc5942cd3326fa51ee0b42fbef4da9d492a7fa";
};
}
{
@ -3722,11 +3722,11 @@
};
}
{
name = "electron_to_chromium___electron_to_chromium_1.3.725.tgz";
name = "electron_to_chromium___electron_to_chromium_1.3.727.tgz";
path = fetchurl {
name = "electron_to_chromium___electron_to_chromium_1.3.725.tgz";
url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.725.tgz";
sha1 = "04fc83f9189169aff50f0a00c6b4090b910cba85";
name = "electron_to_chromium___electron_to_chromium_1.3.727.tgz";
url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.727.tgz";
sha1 = "857e310ca00f0b75da4e1db6ff0e073cc4a91ddf";
};
}
{
@ -3786,11 +3786,11 @@
};
}
{
name = "engine.io_client___engine.io_client_3.5.1.tgz";
name = "engine.io_client___engine.io_client_3.5.2.tgz";
path = fetchurl {
name = "engine.io_client___engine.io_client_3.5.1.tgz";
url = "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.5.1.tgz";
sha1 = "b500458a39c0cd197a921e0e759721a746d0bdb9";
name = "engine.io_client___engine.io_client_3.5.2.tgz";
url = "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.5.2.tgz";
sha1 = "0ef473621294004e9ceebe73cef0af9e36f2f5fa";
};
}
{
@ -3913,6 +3913,22 @@
sha1 = "9e3af407459deed47e9a91f9b885a84eb05c561d";
};
}
{
name = "esbuild_loader___esbuild_loader_2.13.0.tgz";
path = fetchurl {
name = "esbuild_loader___esbuild_loader_2.13.0.tgz";
url = "https://registry.yarnpkg.com/esbuild-loader/-/esbuild-loader-2.13.0.tgz";
sha1 = "f5a3602a89a3b728506ae3e1887304fffeef9270";
};
}
{
name = "esbuild___esbuild_0.11.20.tgz";
path = fetchurl {
name = "esbuild___esbuild_0.11.20.tgz";
url = "https://registry.yarnpkg.com/esbuild/-/esbuild-0.11.20.tgz";
sha1 = "7cefa1aee8b372c184e42457885f7ce5d3e62a1e";
};
}
{
name = "escalade___escalade_3.1.1.tgz";
path = fetchurl {
@ -4042,19 +4058,19 @@
};
}
{
name = "eslint_visitor_keys___eslint_visitor_keys_2.0.0.tgz";
name = "eslint_visitor_keys___eslint_visitor_keys_2.1.0.tgz";
path = fetchurl {
name = "eslint_visitor_keys___eslint_visitor_keys_2.0.0.tgz";
url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz";
sha1 = "21fdc8fbcd9c795cc0321f0563702095751511a8";
name = "eslint_visitor_keys___eslint_visitor_keys_2.1.0.tgz";
url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz";
sha1 = "f65328259305927392c938ed44eb0a5c9b2bd303";
};
}
{
name = "eslint___eslint_7.25.0.tgz";
name = "eslint___eslint_7.26.0.tgz";
path = fetchurl {
name = "eslint___eslint_7.25.0.tgz";
url = "https://registry.yarnpkg.com/eslint/-/eslint-7.25.0.tgz";
sha1 = "1309e4404d94e676e3e831b3a3ad2b050031eb67";
name = "eslint___eslint_7.26.0.tgz";
url = "https://registry.yarnpkg.com/eslint/-/eslint-7.26.0.tgz";
sha1 = "d416fdcdcb3236cd8f282065312813f8c13982f6";
};
}
{
@ -4410,11 +4426,11 @@
};
}
{
name = "file_type___file_type_16.3.0.tgz";
name = "file_type___file_type_16.4.0.tgz";
path = fetchurl {
name = "file_type___file_type_16.3.0.tgz";
url = "https://registry.yarnpkg.com/file-type/-/file-type-16.3.0.tgz";
sha1 = "f03af91db30f92cc9a0b335c0644c46101522f6d";
name = "file_type___file_type_16.4.0.tgz";
url = "https://registry.yarnpkg.com/file-type/-/file-type-16.4.0.tgz";
sha1 = "464197e44bd94a452d77b09085d977ae0dad2df4";
};
}
{
@ -4578,11 +4594,11 @@
};
}
{
name = "follow_redirects___follow_redirects_1.14.0.tgz";
name = "follow_redirects___follow_redirects_1.14.1.tgz";
path = fetchurl {
name = "follow_redirects___follow_redirects_1.14.0.tgz";
url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.0.tgz";
sha1 = "f5d260f95c5f8c105894491feee5dc8993b402fe";
name = "follow_redirects___follow_redirects_1.14.1.tgz";
url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.1.tgz";
sha1 = "d9114ded0a1cfdd334e164e6662ad02bfd91ff43";
};
}
{
@ -4905,6 +4921,14 @@
sha1 = "141f33b81a7c2492e125594307480c46679278a6";
};
}
{
name = "glob___glob_7.1.7.tgz";
path = fetchurl {
name = "glob___glob_7.1.7.tgz";
url = "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz";
sha1 = "3b193e9233f01d42d0b3f78294bbeeb418f94a90";
};
}
{
name = "globals___globals_12.4.0.tgz";
path = fetchurl {
@ -5266,11 +5290,11 @@
};
}
{
name = "i18n___i18n_0.13.2.tgz";
name = "i18n___i18n_0.13.3.tgz";
path = fetchurl {
name = "i18n___i18n_0.13.2.tgz";
url = "https://registry.yarnpkg.com/i18n/-/i18n-0.13.2.tgz";
sha1 = "3886678fe7cbbed45bac2ce53b8144c788a1c1b5";
name = "i18n___i18n_0.13.3.tgz";
url = "https://registry.yarnpkg.com/i18n/-/i18n-0.13.3.tgz";
sha1 = "5820f48d87a77cf14e064719bee9bc682ed550eb";
};
}
{
@ -5330,11 +5354,11 @@
};
}
{
name = "ignore_walk___ignore_walk_3.0.3.tgz";
name = "ignore_walk___ignore_walk_3.0.4.tgz";
path = fetchurl {
name = "ignore_walk___ignore_walk_3.0.3.tgz";
url = "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz";
sha1 = "017e2447184bfeade7c238e4aefdd1e8f95b1e37";
name = "ignore_walk___ignore_walk_3.0.4.tgz";
url = "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.4.tgz";
sha1 = "c9a09f69b7c7b479a5d74ac1a3c0d4236d2a6335";
};
}
{
@ -5578,11 +5602,11 @@
};
}
{
name = "is_bigint___is_bigint_1.0.1.tgz";
name = "is_bigint___is_bigint_1.0.2.tgz";
path = fetchurl {
name = "is_bigint___is_bigint_1.0.1.tgz";
url = "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.1.tgz";
sha1 = "6923051dfcbc764278540b9ce0e6b3213aa5ebc2";
name = "is_bigint___is_bigint_1.0.2.tgz";
url = "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.2.tgz";
sha1 = "ffb381442503235ad245ea89e45b3dbff040ee5a";
};
}
{
@ -5610,11 +5634,11 @@
};
}
{
name = "is_boolean_object___is_boolean_object_1.1.0.tgz";
name = "is_boolean_object___is_boolean_object_1.1.1.tgz";
path = fetchurl {
name = "is_boolean_object___is_boolean_object_1.1.0.tgz";
url = "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.0.tgz";
sha1 = "e2aaad3a3a8fca34c28f6eee135b156ed2587ff0";
name = "is_boolean_object___is_boolean_object_1.1.1.tgz";
url = "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.1.tgz";
sha1 = "3c0878f035cb821228d350d2e1e36719716a3de8";
};
}
{
@ -5650,11 +5674,11 @@
};
}
{
name = "is_core_module___is_core_module_2.3.0.tgz";
name = "is_core_module___is_core_module_2.4.0.tgz";
path = fetchurl {
name = "is_core_module___is_core_module_2.3.0.tgz";
url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.3.0.tgz";
sha1 = "d341652e3408bca69c4671b79a0954a3d349f887";
name = "is_core_module___is_core_module_2.4.0.tgz";
url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.4.0.tgz";
sha1 = "8e9fc8e15027b011418026e98f0e6f4d86305cc1";
};
}
{
@ -5674,11 +5698,11 @@
};
}
{
name = "is_date_object___is_date_object_1.0.2.tgz";
name = "is_date_object___is_date_object_1.0.4.tgz";
path = fetchurl {
name = "is_date_object___is_date_object_1.0.2.tgz";
url = "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz";
sha1 = "bda736f2cd8fd06d32844e7743bfa7494c3bfd7e";
name = "is_date_object___is_date_object_1.0.4.tgz";
url = "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.4.tgz";
sha1 = "550cfcc03afada05eea3dd30981c7b09551f73e5";
};
}
{
@ -5850,11 +5874,11 @@
};
}
{
name = "is_number_object___is_number_object_1.0.4.tgz";
name = "is_number_object___is_number_object_1.0.5.tgz";
path = fetchurl {
name = "is_number_object___is_number_object_1.0.4.tgz";
url = "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.4.tgz";
sha1 = "36ac95e741cf18b283fc1ddf5e83da798e3ec197";
name = "is_number_object___is_number_object_1.0.5.tgz";
url = "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.5.tgz";
sha1 = "6edfaeed7950cff19afedce9fbfca9ee6dd289eb";
};
}
{
@ -5938,11 +5962,11 @@
};
}
{
name = "is_regex___is_regex_1.1.2.tgz";
name = "is_regex___is_regex_1.1.3.tgz";
path = fetchurl {
name = "is_regex___is_regex_1.1.2.tgz";
url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.2.tgz";
sha1 = "81c8ebde4db142f2cf1c53fc86d6a45788266251";
name = "is_regex___is_regex_1.1.3.tgz";
url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.3.tgz";
sha1 = "d029f9aff6448b93ebbe3f33dac71511fdcbef9f";
};
}
{
@ -5970,11 +5994,11 @@
};
}
{
name = "is_string___is_string_1.0.5.tgz";
name = "is_string___is_string_1.0.6.tgz";
path = fetchurl {
name = "is_string___is_string_1.0.5.tgz";
url = "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz";
sha1 = "40493ed198ef3ff477b8c7f92f644ec82a5cd3a6";
name = "is_string___is_string_1.0.6.tgz";
url = "https://registry.yarnpkg.com/is-string/-/is-string-1.0.6.tgz";
sha1 = "3fe5d5992fb0d93404f32584d4b0179a71b54a5f";
};
}
{
@ -5986,11 +6010,11 @@
};
}
{
name = "is_symbol___is_symbol_1.0.3.tgz";
name = "is_symbol___is_symbol_1.0.4.tgz";
path = fetchurl {
name = "is_symbol___is_symbol_1.0.3.tgz";
url = "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz";
sha1 = "38e1014b9e6329be0de9d24a414fd7441ec61937";
name = "is_symbol___is_symbol_1.0.4.tgz";
url = "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz";
sha1 = "a6dac93b635b063ca6872236de88910a57af139c";
};
}
{
@ -6129,6 +6153,14 @@
sha1 = "a3f222a9aae9f966f5d27c796510e28091764217";
};
}
{
name = "joycon___joycon_3.0.1.tgz";
path = fetchurl {
name = "joycon___joycon_3.0.1.tgz";
url = "https://registry.yarnpkg.com/joycon/-/joycon-3.0.1.tgz";
sha1 = "9074c9b08ccf37a6726ff74a18485f85efcaddaf";
};
}
{
name = "jquery_mousewheel___jquery_mousewheel_3.1.13.tgz";
path = fetchurl {
@ -6193,14 +6225,6 @@
sha1 = "9866df395102130e38f7f996bceb65443209c25b";
};
}
{
name = "js_yaml___js_yaml_4.0.0.tgz";
path = fetchurl {
name = "js_yaml___js_yaml_4.0.0.tgz";
url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.0.0.tgz";
sha1 = "f426bc0ff4b4051926cd588c71113183409a121f";
};
}
{
name = "js_yaml___js_yaml_3.14.1.tgz";
path = fetchurl {
@ -6209,6 +6233,14 @@
sha1 = "dae812fdb3825fa306609a8717383c50c36a0537";
};
}
{
name = "js_yaml___js_yaml_4.0.0.tgz";
path = fetchurl {
name = "js_yaml___js_yaml_4.0.0.tgz";
url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.0.0.tgz";
sha1 = "f426bc0ff4b4051926cd588c71113183409a121f";
};
}
{
name = "js_yaml___js_yaml_4.1.0.tgz";
path = fetchurl {
@ -7250,11 +7282,11 @@
};
}
{
name = "mermaid___mermaid_8.9.3.tgz";
name = "mermaid___mermaid_8.10.1.tgz";
path = fetchurl {
name = "mermaid___mermaid_8.9.3.tgz";
url = "https://registry.yarnpkg.com/mermaid/-/mermaid-8.9.3.tgz";
sha1 = "24f682d26f757ed4cb5812b0a798eddcedcc9658";
name = "mermaid___mermaid_8.10.1.tgz";
url = "https://registry.yarnpkg.com/mermaid/-/mermaid-8.10.1.tgz";
sha1 = "9573f702024e2173f4aa07d9b207d750507cf838";
};
}
{
@ -7538,11 +7570,11 @@
};
}
{
name = "mocha___mocha_8.3.2.tgz";
name = "mocha___mocha_8.4.0.tgz";
path = fetchurl {
name = "mocha___mocha_8.3.2.tgz";
url = "https://registry.yarnpkg.com/mocha/-/mocha-8.3.2.tgz";
sha1 = "53406f195fa86fbdebe71f8b1c6fb23221d69fcc";
name = "mocha___mocha_8.4.0.tgz";
url = "https://registry.yarnpkg.com/mocha/-/mocha-8.4.0.tgz";
sha1 = "677be88bf15980a3cae03a73e10a0fc3997f0cff";
};
}
{
@ -7674,11 +7706,11 @@
};
}
{
name = "nanoid___nanoid_3.1.22.tgz";
name = "nanoid___nanoid_3.1.23.tgz";
path = fetchurl {
name = "nanoid___nanoid_3.1.22.tgz";
url = "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.22.tgz";
sha1 = "b35f8fb7d151990a8aebd5aa5015c03cf726f844";
name = "nanoid___nanoid_3.1.23.tgz";
url = "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.23.tgz";
sha1 = "f744086ce7c2bc47ee0a8472574d5c78e4183a81";
};
}
{
@ -7962,11 +7994,11 @@
};
}
{
name = "object_inspect___object_inspect_1.10.2.tgz";
name = "object_inspect___object_inspect_1.10.3.tgz";
path = fetchurl {
name = "object_inspect___object_inspect_1.10.2.tgz";
url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.10.2.tgz";
sha1 = "b6385a3e2b7cae0b5eafcf90cddf85d128767f30";
name = "object_inspect___object_inspect_1.10.3.tgz";
url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.10.3.tgz";
sha1 = "c2aa7d2d09f50c99375704f7a0adf24c5782d369";
};
}
{
@ -9002,11 +9034,11 @@
};
}
{
name = "postcss_selector_parser___postcss_selector_parser_6.0.5.tgz";
name = "postcss_selector_parser___postcss_selector_parser_6.0.6.tgz";
path = fetchurl {
name = "postcss_selector_parser___postcss_selector_parser_6.0.5.tgz";
url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.5.tgz";
sha1 = "042d74e137db83e6f294712096cb413f5aa612c4";
name = "postcss_selector_parser___postcss_selector_parser_6.0.6.tgz";
url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz";
sha1 = "2c5bba8174ac2f6981ab631a42ab0ee54af332ea";
};
}
{
@ -9050,11 +9082,11 @@
};
}
{
name = "postcss___postcss_8.2.13.tgz";
name = "postcss___postcss_8.2.15.tgz";
path = fetchurl {
name = "postcss___postcss_8.2.13.tgz";
url = "https://registry.yarnpkg.com/postcss/-/postcss-8.2.13.tgz";
sha1 = "dbe043e26e3c068e45113b1ed6375d2d37e2129f";
name = "postcss___postcss_8.2.15.tgz";
url = "https://registry.yarnpkg.com/postcss/-/postcss-8.2.15.tgz";
sha1 = "9e66ccf07292817d226fc315cbbf9bc148fbca65";
};
}
{
@ -11146,11 +11178,11 @@
};
}
{
name = "table___table_6.6.0.tgz";
name = "table___table_6.7.0.tgz";
path = fetchurl {
name = "table___table_6.6.0.tgz";
url = "https://registry.yarnpkg.com/table/-/table-6.6.0.tgz";
sha1 = "905654b79df98d9e9a973de1dd58682532c40e8e";
name = "table___table_6.7.0.tgz";
url = "https://registry.yarnpkg.com/table/-/table-6.7.0.tgz";
sha1 = "26274751f0ee099c547f6cb91d3eff0d61d155b2";
};
}
{
@ -11513,6 +11545,14 @@
sha1 = "09e249ebde851d3b1e48d27c105444667f17b83d";
};
}
{
name = "type_fest___type_fest_1.1.1.tgz";
path = fetchurl {
name = "type_fest___type_fest_1.1.1.tgz";
url = "https://registry.yarnpkg.com/type-fest/-/type-fest-1.1.1.tgz";
sha1 = "210251e7f57357a1457269e6b34837fed067ac2c";
};
}
{
name = "type_is___type_is_1.6.18.tgz";
path = fetchurl {
@ -11546,11 +11586,11 @@
};
}
{
name = "uglify_js___uglify_js_3.13.5.tgz";
name = "uglify_js___uglify_js_3.13.6.tgz";
path = fetchurl {
name = "uglify_js___uglify_js_3.13.5.tgz";
url = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.13.5.tgz";
sha1 = "5d71d6dbba64cf441f32929b1efce7365bb4f113";
name = "uglify_js___uglify_js_3.13.6.tgz";
url = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.13.6.tgz";
sha1 = "6815ac7fdd155d03c83e2362bb717e5b39b74013";
};
}
{
@ -12122,11 +12162,11 @@
};
}
{
name = "webpack_cli___webpack_cli_4.6.0.tgz";
name = "webpack_cli___webpack_cli_4.7.0.tgz";
path = fetchurl {
name = "webpack_cli___webpack_cli_4.6.0.tgz";
url = "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.6.0.tgz";
sha1 = "27ae86bfaec0cf393fcfd58abdc5a229ad32fd16";
name = "webpack_cli___webpack_cli_4.7.0.tgz";
url = "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.7.0.tgz";
sha1 = "3195a777f1f802ecda732f6c95d24c0004bc5a35";
};
}
{
@ -12145,6 +12185,14 @@
sha1 = "eedd8ec0b928fbf1cbfe994e22d2d890f330a933";
};
}
{
name = "webpack_sources___webpack_sources_2.2.0.tgz";
path = fetchurl {
name = "webpack_sources___webpack_sources_2.2.0.tgz";
url = "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.2.0.tgz";
sha1 = "058926f39e3d443193b6c31547229806ffd02bac";
};
}
{
name = "webpack___webpack_4.46.0.tgz";
path = fetchurl {
@ -12402,11 +12450,11 @@
};
}
{
name = "xmlhttprequest_ssl___xmlhttprequest_ssl_1.5.5.tgz";
name = "xmlhttprequest_ssl___xmlhttprequest_ssl_1.6.2.tgz";
path = fetchurl {
name = "xmlhttprequest_ssl___xmlhttprequest_ssl_1.5.5.tgz";
url = "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz";
sha1 = "c2876b06168aadc40e57d97e81191ac8f4398b3e";
name = "xmlhttprequest_ssl___xmlhttprequest_ssl_1.6.2.tgz";
url = "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.6.2.tgz";
sha1 = "dd6899bfbcf684b554e393c30b13b9f3b001a7ee";
};
}
{
@ -12434,11 +12482,11 @@
};
}
{
name = "xss___xss_1.0.8.tgz";
name = "xss___xss_1.0.9.tgz";
path = fetchurl {
name = "xss___xss_1.0.8.tgz";
url = "https://registry.yarnpkg.com/xss/-/xss-1.0.8.tgz";
sha1 = "32feb87feb74b3dcd3d404b7a68ababf10700535";
name = "xss___xss_1.0.9.tgz";
url = "https://registry.yarnpkg.com/xss/-/xss-1.0.9.tgz";
sha1 = "3ffd565571ff60d2e40db7f3b80b4677bec770d2";
};
}
{

View File

@ -1,14 +0,0 @@
{ stdenv, pkgs, lib
, libXNVCtrl
}:
let
mangohud_64 = pkgs.callPackage ./default.nix { inherit libXNVCtrl; };
mangohud_32 = pkgs.pkgsi686Linux.callPackage ./default.nix { inherit libXNVCtrl; };
in
pkgs.buildEnv rec {
name = "mangohud-${mangohud_64.version}";
paths = [ mangohud_32 ] ++ lib.optionals stdenv.is64bit [ mangohud_64 ];
meta = mangohud_64.meta;
}

View File

@ -1,72 +1,118 @@
{ stdenv
, lib
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, substituteAll
, coreutils
, curl
, gawk
, glxinfo
, gnugrep
, gnused
, pciutils
, xdg-utils
, dbus
, hwdata
, libX11
, mangohud32
, vulkan-headers
, glslang
, makeWrapper
, meson
, ninja
, pkg-config
, python3Packages
, dbus
, glslang
, libglvnd
, libXNVCtrl
, mesa
, vulkan-headers
, vulkan-loader
, xorg
, libXNVCtrl
}:
stdenv.mkDerivation rec {
pname = "mangohud${lib.optionalString stdenv.is32bit "_32"}";
version = "0.4.1";
pname = "mangohud";
version = "0.6.1";
src = fetchFromGitHub {
owner = "flightlessmango";
repo = "MangoHud";
rev = "v${version}";
sha256 = "04v2ps8n15ph2smjgnssax5hq88bszw2kbcff37cnd5c8yysvfi6";
sha256 = "1bzfp37qrx9kk5zaq7sfisgkyccwnxd7i3b1l0blfcy2lrxgx0n6";
fetchSubmodules = true;
};
patches = [
# Adds option to specify Vulkan's datadir when it's not the same as MangoHud's
# See https://github.com/flightlessmango/MangoHud/pull/522
(fetchpatch {
# FIXME obsolete in >=0.5.0
url = "https://patch-diff.githubusercontent.com/raw/flightlessmango/MangoHud/pull/208.patch";
sha256 = "1i6x6sr4az1zv0p6vpw99n947c7awgbbv087fghjlczhry676nmh";
url = "https://github.com/flightlessmango/MangoHud/commit/56682985d8cec711af7ad0841888a44099249b1b.patch";
sha256 = "0l5vb374lfgfh54jiy4097bzsccpv4zsl1fdhn55sxggklymcad8";
})
# Hard code dependencies. Can't use makeWrapper since the Vulkan
# layer can be used without the mangohud executable by setting MANGOHUD=1.
(substituteAll {
src = ./hardcode-dependencies.patch;
path = lib.makeBinPath [
coreutils
curl
gawk
glxinfo
gnugrep
gnused
pciutils
xdg-utils
];
libdbus = dbus.lib;
inherit hwdata libX11;
})
] ++ lib.optional (stdenv.hostPlatform.system == "x86_64-linux") [
# Support 32bit OpenGL applications by appending the mangohud32
# lib path to LD_LIBRARY_PATH.
#
# This workaround is necessary since on Nix's build of ld.so, $LIB
# always expands to lib even when running an 32bit application.
#
# See https://github.com/NixOS/nixpkgs/issues/101597.
(substituteAll {
src = ./opengl32-nix-workaround.patch;
inherit mangohud32;
})
];
mesonFlags = [
"-Dappend_libdir_mangohud=false"
"-Duse_system_vulkan=enabled"
"--libdir=lib${lib.optionalString stdenv.is32bit "32"}"
];
buildInputs = [
dbus
glslang
libglvnd
libXNVCtrl
mesa
python3Packages.Mako
vulkan-headers
vulkan-loader
xorg.libX11
"-Dvulkan_datadir=${vulkan-headers}/share"
];
nativeBuildInputs = [
glslang
makeWrapper
meson
ninja
pkg-config
python3Packages.Mako
python3Packages.python
vulkan-loader
];
preConfigure = ''
mkdir -p "$out/share/vulkan/"
ln -sf "${vulkan-headers}/share/vulkan/registry/" $out/share/vulkan/
ln -sf "${vulkan-headers}/include" $out
buildInputs = [
dbus
libX11
libXNVCtrl
];
# Support 32bit Vulkan applications by linking in 32bit Vulkan layer
# This is needed for the same reason the 32bit OpenGL workaround is needed.
postInstall = lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") ''
ln -s ${mangohud32}/share/vulkan/implicit_layer.d/MangoHud.json \
"$out/share/vulkan/implicit_layer.d/MangoHud.x86.json"
'';
# Support overlaying Vulkan applications without requiring mangohud to be installed
postFixup = ''
wrapProgram "$out/bin/mangohud" \
--prefix VK_LAYER_PATH : "$out/share/vulkan/implicit_layer.d" \
--prefix VK_INSTANCE_LAYERS : VK_LAYER_MANGOHUD_overlay
'';
meta = with lib; {
@ -74,6 +120,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/flightlessmango/MangoHud";
platforms = platforms.linux;
license = licenses.mit;
maintainers = with maintainers; [ zeratax ];
maintainers = with maintainers; [ metadark zeratax ];
};
}

View File

@ -0,0 +1,57 @@
diff --git a/src/dbus.cpp b/src/dbus.cpp
index 0acccc3..7dd7c49 100644
--- a/src/dbus.cpp
+++ b/src/dbus.cpp
@@ -157,7 +157,7 @@ bool dbus_manager::init(const std::string& requested_player) {
m_requested_player = "org.mpris.MediaPlayer2." + requested_player;
}
- if (!m_dbus_ldr.IsLoaded() && !m_dbus_ldr.Load("libdbus-1.so.3")) {
+ if (!m_dbus_ldr.IsLoaded() && !m_dbus_ldr.Load("@libdbus@/lib/libdbus-1.so.3")) {
std::cerr << "MANGOHUD: Could not load libdbus-1.so.3\n";
return false;
}
diff --git a/src/loaders/loader_x11.cpp b/src/loaders/loader_x11.cpp
index 25c65bf..87488d5 100644
--- a/src/loaders/loader_x11.cpp
+++ b/src/loaders/loader_x11.cpp
@@ -88,4 +88,4 @@ void libx11_loader::CleanUp(bool unload) {
}
-std::shared_ptr<libx11_loader> g_x11(new libx11_loader("libX11.so.6"));
+std::shared_ptr<libx11_loader> g_x11(new libx11_loader("@libX11@/lib/libX11.so.6"));
diff --git a/src/logging.cpp b/src/logging.cpp
index f2c4271..d33e793 100644
--- a/src/logging.cpp
+++ b/src/logging.cpp
@@ -17,7 +17,10 @@ string exec(string command) {
string result = "";
// Open pipe to file
+ char* originalPath = getenv("PATH");
+ setenv("PATH", "@path@", 1);
FILE* pipe = popen(command.c_str(), "r");
+ setenv("PATH", originalPath, 1);
if (!pipe) {
return "popen failed!";
}
diff --git a/src/pci_ids.cpp b/src/pci_ids.cpp
index 4e2a6d2..9490869 100644
--- a/src/pci_ids.cpp
+++ b/src/pci_ids.cpp
@@ -22,12 +22,9 @@ std::istream& get_uncommented_line(std::istream& is, std::string &line)
void parse_pciids()
{
- std::ifstream file("/usr/share/hwdata/pci.ids");
+ std::ifstream file("@hwdata@/share/hwdata/pci.ids");
if(file.fail()){
- std::ifstream file("/usr/share/misc/pci.ids");
- if (file.fail())
- printf("MANGOHUD: can't find file pci.ids\n");
-
+ printf("MANGOHUD: can't find file pci.ids\n");
}
std::string line;

View File

@ -0,0 +1,12 @@
diff --git a/bin/mangohud.in b/bin/mangohud.in
index eadce2d..e7b1aa4 100755
--- a/bin/mangohud.in
+++ b/bin/mangohud.in
@@ -23,6 +23,6 @@ fi
# figure out whether the 32 or 64 bit version should be used, and will search
# for it in the correct directory
LD_PRELOAD="${LD_PRELOAD}:${MANGOHUD_LIB_NAME}"
-LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@ld_libdir_mangohud@"
+LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@ld_libdir_mangohud@:@mangohud32@/lib/mangohud"
exec env MANGOHUD=1 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" LD_PRELOAD="${LD_PRELOAD}" "$@"

View File

@ -1,14 +1,23 @@
{ lib, stdenv, fetchFromGitHub, rustPlatform, darwin, installShellFiles }:
{ lib
, stdenv
, fetchFromGitHub
, rustPlatform
, DiskArbitration
, Foundation
, IOKit
, installShellFiles
, libiconv
}:
rustPlatform.buildRustPackage rec {
pname = "bottom";
version = "0.6.0";
version = "0.6.1";
src = fetchFromGitHub {
owner = "ClementTsang";
repo = pname;
rev = version;
sha256 = "sha256-z0WLD6XOlsM5UL9/nUU5Jk1F+UFLm4N42zAlgY3zEbM=";
sha256 = "sha256-/O/VXBpVBgjzYuv1AghzmOBUu0MQXhuF65QswgNwa0k=";
};
prePatch = ''
@ -17,9 +26,14 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ installShellFiles ];
buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.IOKit;
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
DiskArbitration
Foundation
IOKit
libiconv
];
cargoSha256 = "sha256-m2UVpsVTEmf6fgE1CFRE6+3097bKnkrMKtY3fAOjS2E=";
cargoSha256 = "sha256-5AZgOzRg7jEyv/4+IiQplrwt2yQO9yNi6BosdSzh5v8=";
doCheck = false;

View File

@ -6598,8 +6598,9 @@ in
mandoc = callPackage ../tools/misc/mandoc { };
mangohud = callPackage ../tools/graphics/mangohud/combined.nix {
mangohud = callPackage ../tools/graphics/mangohud {
libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl;
mangohud32 = pkgsi686Linux.mangohud;
};
manix = callPackage ../tools/nix/manix {
@ -20170,6 +20171,13 @@ in
];
};
linux_5_12 = callPackage ../os-specific/linux/kernel/linux-5.12.nix {
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
];
};
linux-rt_5_10 = callPackage ../os-specific/linux/kernel/linux-rt-5.10.nix {
kernelPatches = [
kernelPatches.bridge_stp_helper
@ -20474,6 +20482,7 @@ in
linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4);
linuxPackages_5_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_10);
linuxPackages_5_11 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_11);
linuxPackages_5_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_12);
# When adding to the list above:
# - Update linuxPackages_latest to the latest version
@ -31378,7 +31387,9 @@ in
treefmt = callPackage ../development/tools/treefmt { };
bottom = callPackage ../tools/system/bottom {};
bottom = callPackage ../tools/system/bottom {
inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation IOKit;
};
cagebreak = callPackage ../applications/window-managers/cagebreak/default.nix { };