diff --git a/package.json b/package.json index 077fa40a5..e1934f541 100644 --- a/package.json +++ b/package.json @@ -42,21 +42,21 @@ "@types/node": "12.12.37" }, "devDependencies": { - "@angular-devkit/architect": "^0.1001.0", - "@angular-devkit/build-angular": "^0.1001.0", - "@angular-devkit/core": "^10.1.0", - "@angular-devkit/schematics": "^10.1.0", - "@angular/animations": "^10.1.0", - "@angular/bazel": "^10.1.0", - "@angular/cli": "^10.1.0", - "@angular/common": "^10.1.0", - "@angular/compiler": "^10.1.0", - "@angular/compiler-cli": "^10.1.0", - "@angular/core": "^10.1.0", - "@angular/platform-browser": "^10.1.0", - "@angular/platform-browser-dynamic": "^10.1.0", - "@angular/platform-server": "^10.1.0", - "@angular/router": "^10.1.0", + "@angular-devkit/architect": "^0.1100.0-next.0", + "@angular-devkit/build-angular": "^0.1100.0-next.0", + "@angular-devkit/core": "^11.0.0-next.0", + "@angular-devkit/schematics": "^11.0.0-next.0", + "@angular/animations": "^11.0.0-next.0", + "@angular/bazel": "^11.0.0-next.0", + "@angular/cli": "^11.0.0-next.0", + "@angular/common": "^11.0.0-next.0", + "@angular/compiler": "^11.0.0-next.0", + "@angular/compiler-cli": "^11.0.0-next.0", + "@angular/core": "^11.0.0-next.0", + "@angular/platform-browser": "^11.0.0-next.0", + "@angular/platform-browser-dynamic": "^11.0.0-next.0", + "@angular/platform-server": "^11.0.0-next.0", + "@angular/router": "^11.0.0-next.0", "@bazel/bazelisk": "1.5.0", "@bazel/buildifier": "^3.0.0", "@bazel/hide-bazel-files": "~1.7.0", @@ -64,7 +64,7 @@ "@bazel/jasmine": "~1.7.0", "@bazel/typescript": "~1.7.0", "@hapi/hapi": "^18.4.0", - "@schematics/angular": "^10.1.0", + "@schematics/angular": "^11.0.0-next.0", "@types/browser-sync": "^2.26.1", "@types/express": "~4.17.6", "@types/fs-extra": "^9.0.0", diff --git a/tools/defaults.bzl b/tools/defaults.bzl index a573d0dba..7a7924af6 100644 --- a/tools/defaults.bzl +++ b/tools/defaults.bzl @@ -31,13 +31,13 @@ def ts_library(tsconfig = None, deps = [], testonly = False, **kwargs): **kwargs ) -NG_VERSION = "^10.1.0" +NG_VERSION = "^11.0.0-next.0" RXJS_VERSION = "^6.5.5" HAPI_VERSION = "^18.4.0" EXPRESS_VERSION = "^4.15.2" EXPRESS_TYPES_VERSION = "^4.17.0" -DEVKIT_CORE_VERSION = "^10.1.0" -DEVKIT_ARCHITECT_VERSION = "^0.1001.0" +DEVKIT_CORE_VERSION = "^11.0.0-next.0" +DEVKIT_ARCHITECT_VERSION = "^0.1100.0-next.0" TSLIB_VERSION = "^2.0.0" NGUNIVERSAL_SCOPED_PACKAGES = ["@nguniversal/%s" % p for p in [ diff --git a/yarn.lock b/yarn.lock index 20710c709..db78ae4ca 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,23 +2,23 @@ # yarn lockfile v1 -"@angular-devkit/architect@0.1001.0", "@angular-devkit/architect@^0.1001.0": - version "0.1001.0" - resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1001.0.tgz#39250758d749b88a3867f5ef529d52ad16b6c5fd" - integrity sha512-mJYy9tqy7ZfqAJYlQPgcHVUiaAxWnxEEpiTAftsKz/yqdO45YFkzehYXJfCqbAXYr4r7hYY3KqKMgj41ixkS8Q== +"@angular-devkit/architect@0.1100.0-next.0", "@angular-devkit/architect@^0.1100.0-next.0": + version "0.1100.0-next.0" + resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1100.0-next.0.tgz#23ab7188334da9ebb820ccc02723172f274dce95" + integrity sha512-Zxs54uXVDnftbaZc9Eb3crd1NNqP6Pu+JrERaOB0gv20gW6wUFMRsig5KP1pNG33aFd+Q8I3sCOtPf7mEWcRgw== dependencies: - "@angular-devkit/core" "10.1.0" + "@angular-devkit/core" "11.0.0-next.0" rxjs "6.6.2" -"@angular-devkit/build-angular@^0.1001.0": - version "0.1001.0" - resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.1001.0.tgz#8257c1ce9ed4f2e31ea59cbd6939efa127e9d35c" - integrity sha512-aWAWhZd3xompC2qPiIzXOkbq8vGIb8PixMLuGUU37myRhgArCTQl+v2lu/FoETyfY15ThfeFK7EzadLmKgokAg== +"@angular-devkit/build-angular@^0.1100.0-next.0": + version "0.1100.0-next.0" + resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.1100.0-next.0.tgz#ae3ca06638bf5dc6f73d9bdc55a35c37bd38b8cf" + integrity sha512-zrnmhmpLM3+Uro80CKf9mVNp+JMY0tq/k7DyFrM9mW06KdjLxbABFcRYhuLZFBnPfhv3SWo4Zq6bXIKmzgMDvw== dependencies: - "@angular-devkit/architect" "0.1001.0" - "@angular-devkit/build-optimizer" "0.1001.0" - "@angular-devkit/build-webpack" "0.1001.0" - "@angular-devkit/core" "10.1.0" + "@angular-devkit/architect" "0.1100.0-next.0" + "@angular-devkit/build-optimizer" "0.1100.0-next.0" + "@angular-devkit/build-webpack" "0.1100.0-next.0" + "@angular-devkit/core" "11.0.0-next.0" "@babel/core" "7.11.1" "@babel/generator" "7.11.0" "@babel/plugin-transform-runtime" "7.11.0" @@ -26,28 +26,30 @@ "@babel/runtime" "7.11.2" "@babel/template" "7.10.4" "@jsdevtools/coverage-istanbul-loader" "3.0.5" - "@ngtools/webpack" "10.1.0" + "@ngtools/webpack" "11.0.0-next.0" autoprefixer "9.8.6" babel-loader "8.1.0" browserslist "^4.9.1" cacache "15.0.5" caniuse-lite "^1.0.30001032" circular-dependency-plugin "5.2.0" - copy-webpack-plugin "6.0.3" + copy-webpack-plugin "6.1.0" core-js "3.6.4" css-loader "4.2.2" cssnano "4.1.10" - file-loader "6.0.0" + file-loader "6.1.0" find-cache-dir "3.3.1" glob "7.1.6" + inquirer "7.3.3" jest-worker "26.3.0" karma-source-map-support "1.4.0" - less-loader "6.2.0" + less "3.12.2" + less-loader "7.0.0" license-webpack-plugin "2.3.0" loader-utils "2.0.0" - mini-css-extract-plugin "0.10.0" + mini-css-extract-plugin "0.11.0" minimatch "3.0.4" - open "7.2.0" + open "7.2.1" parse5 "6.0.1" parse5-htmlparser2-tree-adapter "6.0.1" pnp-webpack-plugin "1.6.4" @@ -58,13 +60,13 @@ regenerator-runtime "0.13.7" resolve-url-loader "3.1.1" rimraf "3.0.2" - rollup "2.26.5" + rollup "2.26.9" rxjs "6.6.2" sass "1.26.10" sass-loader "10.0.1" semver "7.3.2" source-map "0.7.3" - source-map-loader "1.0.2" + source-map-loader "1.1.0" source-map-support "0.5.19" speed-measure-webpack-plugin "1.3.3" style-loader "1.2.1" @@ -76,15 +78,15 @@ webpack "4.44.1" webpack-dev-middleware "3.7.2" webpack-dev-server "3.11.0" - webpack-merge "4.2.2" + webpack-merge "5.1.3" webpack-sources "1.4.3" webpack-subresource-integrity "1.4.1" worker-plugin "5.0.0" -"@angular-devkit/build-optimizer@0.1001.0": - version "0.1001.0" - resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.1001.0.tgz#0e018138ec33e47b9cfbceb67ae0a5fbd5a26f08" - integrity sha512-yFHjaUAh9lphLtDLI1UojKS/Szzj9zCq8RHsDv+GWB+2WRWrXB9MID5L/CuZsUdvsu0O6ALfXkNjoWtgOL18Fw== +"@angular-devkit/build-optimizer@0.1100.0-next.0": + version "0.1100.0-next.0" + resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.1100.0-next.0.tgz#4c67eaf0c0120c39d8171032a5923550099427b2" + integrity sha512-A17okwQLMr5R8jruTCqgwgIvnYQ9i2ijunswgJFv+Vp3a0julU1tgEJrg4BhsmjMLdqk2zD2McFL8VXQ6HE95A== dependencies: loader-utils "2.0.0" source-map "0.7.3" @@ -92,19 +94,19 @@ typescript "4.0.2" webpack-sources "1.4.3" -"@angular-devkit/build-webpack@0.1001.0": - version "0.1001.0" - resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.1001.0.tgz#8ef6604ea384ffc53193e8b74b60b13c845dadd3" - integrity sha512-s/8QTlPNBH80Xg7Q2fW+GbPXyJIwW4TQx1ni8Linoxe08L4mKTp8cKo5fWaODglR/Er0X0javDFQ3gces9AIdQ== +"@angular-devkit/build-webpack@0.1100.0-next.0": + version "0.1100.0-next.0" + resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.1100.0-next.0.tgz#7066caa30f5e291e00f942ff34eb8b70515f547a" + integrity sha512-r/CToAvryjvNdUMCYOEF89UMRwRG3STNkptJ69F4TrAObxmPPPW1jak5iAlqW4bRHsHpb4jbhKj2u+j909leiQ== dependencies: - "@angular-devkit/architect" "0.1001.0" - "@angular-devkit/core" "10.1.0" + "@angular-devkit/architect" "0.1100.0-next.0" + "@angular-devkit/core" "11.0.0-next.0" rxjs "6.6.2" -"@angular-devkit/core@10.1.0", "@angular-devkit/core@^10.1.0": - version "10.1.0" - resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-10.1.0.tgz#3e4d6abc0b949f4e2fba94077d17c132eb0a673f" - integrity sha512-oNRwAX+5uEwgheS3UUc1W+AerbimqGojCOTdWWcq5XtSviZnBCp1FeMZV+eB6XgUWfbmbWBu39S3sCYmXVHLwg== +"@angular-devkit/core@11.0.0-next.0", "@angular-devkit/core@^11.0.0-next.0": + version "11.0.0-next.0" + resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-11.0.0-next.0.tgz#a5a472d7f717e78da3f100d8990968b2e236b6f5" + integrity sha512-N1Ez1BCmvz+rz3MRzoFDOxmiFCAYeCNwAHBewzfVyllKsB3DtrinyOubbwZDNZDARUBV63UCAKPudV2XdxkHYQ== dependencies: ajv "6.12.4" fast-json-stable-stringify "2.1.0" @@ -112,41 +114,41 @@ rxjs "6.6.2" source-map "0.7.3" -"@angular-devkit/schematics@10.1.0", "@angular-devkit/schematics@^10.1.0": - version "10.1.0" - resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-10.1.0.tgz#11f12174585966984f823e1740331115f4f2958c" - integrity sha512-5Vl32bHpcB/oj0oNR8nPLXF7DwPVuzrJjosch8G+sPG2gAG6OpwjUhQjY1U6E4xJGDR6j7fX8jw+TwC2cMgUbQ== +"@angular-devkit/schematics@11.0.0-next.0", "@angular-devkit/schematics@^11.0.0-next.0": + version "11.0.0-next.0" + resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-11.0.0-next.0.tgz#05cc680cbbbdf68a955ad65546c38fb79dff466d" + integrity sha512-StpkrtOZYjPjtewOnUP180ZU+8f0HGA5DeqMXytHcUTx7fB/G7seZXYJ27dkNDanaMxYCou/BwZlL6vKWtYT9g== dependencies: - "@angular-devkit/core" "10.1.0" + "@angular-devkit/core" "11.0.0-next.0" ora "5.0.0" rxjs "6.6.2" -"@angular/animations@^10.1.0": - version "10.1.0" - resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-10.1.0.tgz#6c56ff473c3163667ff98e9e3ee333097af803c9" - integrity sha512-0S2UKHDwIw/ZEISDrzhDhn4eVTNwjJW+msOYSaIm6ASRArtSVrwBz1ckD92HhurnnkHVwgTQsnU7yDYKfheaow== +"@angular/animations@^11.0.0-next.0": + version "11.0.0-next.0" + resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-11.0.0-next.0.tgz#726151e75268d700928c87b814faa549d38d76ef" + integrity sha512-BZlGPI/BBh2QhC/naY+UMyJuUqQoGFB3iMSmGHfszqHvuh7s8Xs32URY7jJFTBj+z1FamPPWG40Jj7LuY75ykA== dependencies: tslib "^2.0.0" -"@angular/bazel@^10.1.0": - version "10.1.0" - resolved "https://registry.yarnpkg.com/@angular/bazel/-/bazel-10.1.0.tgz#23d79644a8d4cc139cdbf920737b8d967e8ea756" - integrity sha512-cJih88nnv0N0BhmCgTXeMDcHeYEw2Jr/kuj/vFcEelVDP+/QPekdSynJOQ6FzHbr+zqYRe9Bu5jfreSqPANC8A== +"@angular/bazel@^11.0.0-next.0": + version "11.0.0-next.0" + resolved "https://registry.yarnpkg.com/@angular/bazel/-/bazel-11.0.0-next.0.tgz#63f7490181136b0e5f6daf56f58d99cae1cf0b93" + integrity sha512-X0R+g8G5YQCGdZUsWGrtV0FfzfG8ef3/u5puYBlePsN4/s3lIrsjBierRsd6g8V+tZuPhFmC18mL4YtEnUFilg== dependencies: "@microsoft/api-extractor" "^7.7.13" shelljs "0.8.2" tsickle "^0.38.0" -"@angular/cli@^10.1.0": - version "10.1.0" - resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-10.1.0.tgz#f99df22ad832f58456089c98c7684fb5757be951" - integrity sha512-sWGEVeQQ5PXKuu517fRFEQQ5qopzoWeW+8qBUTrmJt8FztiL2ASyu412iJse56wyGxZvqwUmtzpti5kWHR9XIw== - dependencies: - "@angular-devkit/architect" "0.1001.0" - "@angular-devkit/core" "10.1.0" - "@angular-devkit/schematics" "10.1.0" - "@schematics/angular" "10.1.0" - "@schematics/update" "0.1001.0" +"@angular/cli@^11.0.0-next.0": + version "11.0.0-next.0" + resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-11.0.0-next.0.tgz#7f28c865be3c4f5e40417199342e33ea4ec569c6" + integrity sha512-sSJXR0gPhJ15Qgx1BWE2sBqftfoV1m0j/mJzVLJ2pUwj3DPs3wLI7BJyrUCttYvIu8IZgizi3Anrw4t0MkgMWQ== + dependencies: + "@angular-devkit/architect" "0.1100.0-next.0" + "@angular-devkit/core" "11.0.0-next.0" + "@angular-devkit/schematics" "11.0.0-next.0" + "@schematics/angular" "11.0.0-next.0" + "@schematics/update" "0.1100.0-next.0" "@yarnpkg/lockfile" "1.1.0" ansi-colors "4.1.1" debug "4.1.1" @@ -154,26 +156,26 @@ inquirer "7.3.3" npm-package-arg "8.0.1" npm-pick-manifest "6.1.0" - open "7.2.0" + open "7.2.1" pacote "9.5.12" read-package-tree "5.3.1" rimraf "3.0.2" semver "7.3.2" - symbol-observable "1.2.0" + symbol-observable "2.0.0" universal-analytics "0.4.23" uuid "8.3.0" -"@angular/common@^10.1.0": - version "10.1.0" - resolved "https://registry.yarnpkg.com/@angular/common/-/common-10.1.0.tgz#5d2428d9e6a25b50600186d1a87ee04f9ba25924" - integrity sha512-LdDa6adSv9b+uCSyYuH8I7LS40CdJCVMOv8Y44p/JBr9b54Datslf8nygG1RhU+HkIMzdtw6qjcHbwF+27cLZw== +"@angular/common@^11.0.0-next.0": + version "11.0.0-next.0" + resolved "https://registry.yarnpkg.com/@angular/common/-/common-11.0.0-next.0.tgz#641b7e5c802cc888d3579dfd0624c3549713fa2e" + integrity sha512-XDqqomIYf7jYCLuGyXaeUySPuCW1CtimoNdgdk3Nrb5KCYetKL4WuWoRkNq3dedZFfs9iHG/1V/KYvuMZla0jA== dependencies: tslib "^2.0.0" -"@angular/compiler-cli@^10.1.0": - version "10.1.0" - resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-10.1.0.tgz#da79982e5b3085eb5f8fd626f5f54aae33b89122" - integrity sha512-4AvjGNNvGcBakI4djt6W8GhmuKGf3eySthVQCh0GRYErYLvXYSW+69Yi0FzbjieHZht2P3LFVbunWFksBwp+rw== +"@angular/compiler-cli@^11.0.0-next.0": + version "11.0.0-next.0" + resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-11.0.0-next.0.tgz#49faa5b2c62c1fa1be877e7ebe30c1be9b9640f5" + integrity sha512-BB48TrWLqrWi4XBCTSoDSSB+g09/4yikk0HNJbKey4qKs/kuTx3zYL2CCyWM7KXatNmgmmTRbmfBZa+UM/0fKA== dependencies: canonical-path "1.0.0" chokidar "^3.0.0" @@ -189,47 +191,47 @@ tslib "^2.0.0" yargs "15.3.0" -"@angular/compiler@^10.1.0": - version "10.1.0" - resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-10.1.0.tgz#e485b7ea30c827f9ff14cb77d3a7299db6963e02" - integrity sha512-PBHH59B2yTT/h2HxrlGGm8W5taHkcEk39FXiycSBrbt3T5QiExUXMJoUERviPQCUeHCWWsi1Fpu9wK2fgnP/Qw== +"@angular/compiler@^11.0.0-next.0": + version "11.0.0-next.0" + resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-11.0.0-next.0.tgz#2aba86a902271ae9307e49ed3fa24177cc3713d0" + integrity sha512-sm6QKf3OolLR3sAnQzKcsuIe8A5w+169vc18tCHNn0dyXKCnObvHO4g1NLJI+O+GgDAbAuI9GghAPxbKxVW2ag== dependencies: tslib "^2.0.0" -"@angular/core@^10.1.0": - version "10.1.0" - resolved "https://registry.yarnpkg.com/@angular/core/-/core-10.1.0.tgz#000b78432be63247199d0f385c116b7f4db803bc" - integrity sha512-lENt8Wk1vVsIiHeZVzXCZoHY13BxkqmulEw/AdUOh4VQxoU5K3z1o7fC1cvPHBvBEUnhbD2pDC1UHcY1G9yLRw== +"@angular/core@^11.0.0-next.0": + version "11.0.0-next.0" + resolved "https://registry.yarnpkg.com/@angular/core/-/core-11.0.0-next.0.tgz#c3cc930336273a44178eda8e2d94b52a8d95a3f2" + integrity sha512-gYV1hBFh0K4xqfMFSsg8BgPOjJOlRW714LY1k3zrOxqpCBn7szxdbk1Ypsa2abP5uSDtbBCrnxQLyVKOGmAoVw== dependencies: tslib "^2.0.0" -"@angular/platform-browser-dynamic@^10.1.0": - version "10.1.0" - resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-10.1.0.tgz#9f23e6867cdf4930789587dbb8d2be8d8a5ecc64" - integrity sha512-JzGYFiv6F6upbEv3KyoktZ8UaO/3kQRrqsXmUGbl+k12aG1Lg9WeTIfpWV8eqDCEAQb7BqyqoFbbZGZfnxp/TQ== +"@angular/platform-browser-dynamic@^11.0.0-next.0": + version "11.0.0-next.0" + resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-11.0.0-next.0.tgz#67fea7fb1f3aaf5ab4aad17c82f8eef3038d9c7a" + integrity sha512-qKwS466rcV47CGoGntOr6ZnR469w2W1AGitW5r1sjqmdyy3cTrBdWiONrtR/gOsFK2QF9AwyciBWsX03OP7G3A== dependencies: tslib "^2.0.0" -"@angular/platform-browser@^10.1.0": - version "10.1.0" - resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-10.1.0.tgz#edc5640adb77151f3f40176cb92b4e252ab58e1a" - integrity sha512-bYG02qt36lzCBIV6mbAuYPDKU18x9Xd3S3jwJddvoHjRupxwZtTPGWKQ/4qhv1QrLwZnvXbCavIZlrHe68XJbw== +"@angular/platform-browser@^11.0.0-next.0": + version "11.0.0-next.0" + resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-11.0.0-next.0.tgz#ddd35119fac50e048c1d6f4f6bc365f601fc72b3" + integrity sha512-xEZQwKiyOBdx7/K+q5xQ11UhPuvS5k6IQoleR2ttZGH1+/oAUzKHRrolOCmF3PVw9KXrdVgGn2tO0adIlpMrYg== dependencies: tslib "^2.0.0" -"@angular/platform-server@^10.1.0": - version "10.1.0" - resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-10.1.0.tgz#05d9a76b95992c271e59d62d82fb23a49508f831" - integrity sha512-crO6SubPgupiXLegDoJyYegnhlnGaTSk3K8q7hi8Qg6EXv+9EzxDe63sqVBd6jJ7Lv7UJ2RN5cdRHDSKOl3dSw== +"@angular/platform-server@^11.0.0-next.0": + version "11.0.0-next.0" + resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-11.0.0-next.0.tgz#a5982fffa8c95476c34bf97d8132cf8944bb201c" + integrity sha512-GO643ZbMuSo7HU60CgdM2bvOVhBWApo1Ibkv0BozKxj3+dmbu4h48o0gmXKPFiu5xgWycyfj9nWohJHYwG4vxg== dependencies: domino "^2.1.2" tslib "^2.0.0" xhr2 "^0.2.0" -"@angular/router@^10.1.0": - version "10.1.0" - resolved "https://registry.yarnpkg.com/@angular/router/-/router-10.1.0.tgz#02bbbcf0b20aad8a6679bfab82efe6a19f738805" - integrity sha512-20xidByYytcg46pBxZtraNHFCLDg75mTYAB8cTZ5qEZghrECzECyDbSKCwaW2zsv51Tlrcpi03/0CAaw7EgZiw== +"@angular/router@^11.0.0-next.0": + version "11.0.0-next.0" + resolved "https://registry.yarnpkg.com/@angular/router/-/router-11.0.0-next.0.tgz#e455b78f6c4a17e46d80bd34858569a1fa2a0adf" + integrity sha512-AX6BBRAzmqa+tVPwqnWV0Lzabhx1BuE+8kX9y4MPtI+jnf7dVbrz6CpI6EHWr1dHUL+zDs5gB/EfU0KfSytn3Q== dependencies: tslib "^2.0.0" @@ -1587,12 +1589,12 @@ resolved "https://registry.yarnpkg.com/@microsoft/tsdoc/-/tsdoc-0.12.19.tgz#2173ccb92469aaf62031fa9499d21b16d07f9b57" integrity sha512-IpgPxHrNxZiMNUSXqR1l/gePKPkfAmIKoDRP9hp7OwjU29ZR8WCJsOJ8iBKgw0Qk+pFwR+8Y1cy8ImLY6e9m4A== -"@ngtools/webpack@10.1.0": - version "10.1.0" - resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-10.1.0.tgz#70059658d4ec1966026b48ba8bc91634c0ef1381" - integrity sha512-WnWkNBrY7XgP2xc7oJEAMSIzlHyikPky9y1G6tIkSVuDZ3hM3e662C99xJxt2ZOUY9LOuxuGJ03t/phlnDafJQ== +"@ngtools/webpack@11.0.0-next.0": + version "11.0.0-next.0" + resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-11.0.0-next.0.tgz#ff9cf54f3f8ad9e7ed5e7b1194f886acf0ebdcbe" + integrity sha512-JP6QOgTx6pqclFx+80T0EcjEcJRPIbdJpYnVaB1Pl/gcBM44JFvioCJ0jQ5TbbSqwq14VvMN9fq5UetPPLicvg== dependencies: - "@angular-devkit/core" "10.1.0" + "@angular-devkit/core" "11.0.0-next.0" enhanced-resolve "4.3.0" webpack-sources "1.4.3" @@ -1708,22 +1710,22 @@ argparse "~1.0.9" colors "~1.2.1" -"@schematics/angular@10.1.0", "@schematics/angular@^10.1.0": - version "10.1.0" - resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-10.1.0.tgz#ca1282853c16c318cdee2f2b0ca63222ef84f220" - integrity sha512-kQ925yMmOwiSITY+FhuTvrl3HuEIEUrdByBNB0NlvY+DyJwPlngEOo6Iu0cYWaJcoxM1JscOWL59ZR6W7YCFIg== +"@schematics/angular@11.0.0-next.0", "@schematics/angular@^11.0.0-next.0": + version "11.0.0-next.0" + resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-11.0.0-next.0.tgz#b569b2a6f992c05d46bd02205209423aa372fd00" + integrity sha512-5nFIikJ9ZkcbB+jQnKQohwOK4Q6lzkspj6LP8XjB/mZ59j+ynISR8V+D4c6WrBgmmVhoSGhrQivqc7dFSWv0Xw== dependencies: - "@angular-devkit/core" "10.1.0" - "@angular-devkit/schematics" "10.1.0" + "@angular-devkit/core" "11.0.0-next.0" + "@angular-devkit/schematics" "11.0.0-next.0" jsonc-parser "2.3.0" -"@schematics/update@0.1001.0": - version "0.1001.0" - resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.1001.0.tgz#9b3fcc8001d1ade4cec8294ce526be3411ea39dc" - integrity sha512-LRGwo37akHe/BUl5FHj74mJ/xhM0Z7W8pWMWJ6zGihs+HNXjTgfYVgGA1TgN0amqQODa3AxxLL6aLj+hVYZi+g== +"@schematics/update@0.1100.0-next.0": + version "0.1100.0-next.0" + resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.1100.0-next.0.tgz#f70e52bc251215e04e09cc700dd5d7ae1e044139" + integrity sha512-r/CC0h/N5cWxZ00EP+qUaOLyPEO9PtGKq0y15OuqP5d2Lq/9EvC9nG6VGLSSZd09kYRmzyWyS6SF/MOsRzlKpA== dependencies: - "@angular-devkit/core" "10.1.0" - "@angular-devkit/schematics" "10.1.0" + "@angular-devkit/core" "11.0.0-next.0" + "@angular-devkit/schematics" "11.0.0-next.0" "@yarnpkg/lockfile" "1.1.0" ini "1.3.5" npm-package-arg "^8.0.0" @@ -1917,6 +1919,11 @@ resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.5.tgz#dcce4430e64b443ba8945f0290fb564ad5bac6dd" integrity sha512-7+2BITlgjgDhH0vvwZU/HZJVyk+2XUlvxXe8dFMedNX/aMkaOq++rMAFXc0tM7ij15QaWlbdQASBR9dihi+bDQ== +"@types/json-schema@^7.0.5": + version "7.0.6" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0" + integrity sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw== + "@types/long@^4.0.0": version "4.0.1" resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.1.tgz#459c65fa1867dafe6a8f322c4c51695663cc55e9" @@ -2225,6 +2232,11 @@ abab@^2.0.3: resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.3.tgz#623e2075e02eb2d3f2475e49f99c91846467907a" integrity sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg== +abab@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.4.tgz#6dfa57b417ca06d21b2478f0e638302f99c2405c" + integrity sha512-Eu9ELJWCz/c1e9gTiCY+FceWxcqzjYEbqMgtndnuSqZSUCOL73TWNK2mHfIj4Cw2E/ongOp+JISVNCmovt2KYQ== + accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7: version "1.3.7" resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd" @@ -2321,7 +2333,12 @@ ajv-keywords@^3.1.0, ajv-keywords@^3.4.1: resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.1.tgz#b83ca89c5d42d69031f424cad49aada0236c6957" integrity sha512-KWcq3xN8fDjSB+IMoh2VaXVhRI0BBGxoYp3rx7Pkb6z0cFjYR9Q9l4yZqqals0/zsioCmocC5H6UvsGD4MoIBA== -ajv@6.12.4: +ajv-keywords@^3.5.2: + version "3.5.2" + resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" + integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== + +ajv@6.12.4, ajv@^6.12.4: version "6.12.4" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.4.tgz#0614facc4522127fa713445c6bfd3ebd376e2234" integrity sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ== @@ -3037,7 +3054,7 @@ bytes@3.1.0: resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== -cacache@15.0.5, cacache@^15.0.4, cacache@^15.0.5: +cacache@15.0.5, cacache@^15.0.5: version "15.0.5" resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.0.5.tgz#69162833da29170d6732334643c60e005f5f17d0" integrity sha512-lloiL22n7sOjEEXdL8NAjTgv9a1u43xICE9/203qonkZUCj5X1UEWIdf2/Y0d6QcCtMzbKQyhrcDbdvlZTs/+A== @@ -3334,16 +3351,20 @@ cliui@^6.0.0: strip-ansi "^6.0.0" wrap-ansi "^6.2.0" +clone-deep@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387" + integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ== + dependencies: + is-plain-object "^2.0.4" + kind-of "^6.0.2" + shallow-clone "^3.0.0" + clone@^1.0.2: version "1.0.4" resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4= -clone@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f" - integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18= - coa@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/coa/-/coa-2.0.2.tgz#43f6c21151b4ef2bf57187db0d73de229e3e7ec3" @@ -3576,20 +3597,20 @@ copy-descriptor@^0.1.0: resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= -copy-webpack-plugin@6.0.3: - version "6.0.3" - resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-6.0.3.tgz#2b3d2bfc6861b96432a65f0149720adbd902040b" - integrity sha512-q5m6Vz4elsuyVEIUXr7wJdIdePWTubsqVbEMvf1WQnHGv0Q+9yPRu7MtYFPt+GBOXRav9lvIINifTQ1vSCs+eA== +copy-webpack-plugin@6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-6.1.0.tgz#5bde7f826d87e716d8d5e761ddd34bb675448458" + integrity sha512-aWjIuLt1OVQxaDVffnt3bnGmLA8zGgAJaFwPA+a+QYVPh1vhIKjVfh3SbOFLV0kRPvGBITbw17n5CsmiBS4LQQ== dependencies: - cacache "^15.0.4" + cacache "^15.0.5" fast-glob "^3.2.4" find-cache-dir "^3.3.1" glob-parent "^5.1.1" globby "^11.0.1" loader-utils "^2.0.0" normalize-path "^3.0.0" - p-limit "^3.0.1" - schema-utils "^2.7.0" + p-limit "^3.0.2" + schema-utils "^2.7.1" serialize-javascript "^4.0.0" webpack-sources "^1.4.3" @@ -4736,13 +4757,13 @@ figures@^3.0.0: dependencies: escape-string-regexp "^1.0.5" -file-loader@6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.0.0.tgz#97bbfaab7a2460c07bcbd72d3a6922407f67649f" - integrity sha512-/aMOAYEFXDdjG0wytpTL5YQLfZnnTmLNjn+AIrJ/6HVnTfDqLsVKUUwkDf4I4kgex36BvjuXEn/TX9B/1ESyqQ== +file-loader@6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.1.0.tgz#65b9fcfb0ea7f65a234a1f10cdd7f1ab9a33f253" + integrity sha512-26qPdHyTsArQ6gU4P1HJbAbnFTyT2r0pG7czh1GFAd9TZbj0n94wWbupgixZH/ET/meqi2/5+F7DhW4OAXD+Lg== dependencies: loader-utils "^2.0.0" - schema-utils "^2.6.5" + schema-utils "^2.7.1" file-uri-to-path@1.0.0: version "1.0.0" @@ -6255,17 +6276,16 @@ lcid@^2.0.0: dependencies: invert-kv "^2.0.0" -less-loader@6.2.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-6.2.0.tgz#8b26f621c155b342eefc24f5bd6e9dc40c42a719" - integrity sha512-Cl5h95/Pz/PWub/tCBgT1oNMFeH1WTD33piG80jn5jr12T4XbxZcjThwNXDQ7AG649WEynuIzO4b0+2Tn9Qolg== +less-loader@7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-7.0.0.tgz#d2a66f4fbbb4911e587f691579ee0ae79e21cfe5" + integrity sha512-fAgAaZHQJdX/woSMyNhvJt6bQUhpOtKODfuhk5AqgVPo6FVD3PezwHIZEtNPr4aumYoNQ1KBLnhynGX2XE/Lrg== dependencies: - clone "^2.1.2" - less "^3.11.3" + klona "^2.0.3" loader-utils "^2.0.0" schema-utils "^2.7.0" -less@^3.11.3: +less@3.12.2: version "3.12.2" resolved "https://registry.yarnpkg.com/less/-/less-3.12.2.tgz#157e6dd32a68869df8859314ad38e70211af3ab4" integrity sha512-+1V2PCMFkL+OIj2/HrtrvZw0BC0sYLMICJfbQjuj/K8CEnlrFX6R5cKKgzzttsZDHyxQNL1jqMREjKN3ja/E3Q== @@ -6687,10 +6707,10 @@ mimic-fn@^2.0.0, mimic-fn@^2.1.0: resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== -mini-css-extract-plugin@0.10.0: - version "0.10.0" - resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.10.0.tgz#a0e6bfcad22a9c73f6c882a3c7557a98e2d3d27d" - integrity sha512-QgKgJBjaJhxVPwrLNqqwNS0AGkuQQ31Hp4xGXEK/P7wehEg6qmNtReHKai3zRXqY60wGVWLYcOMJK2b98aGc3A== +mini-css-extract-plugin@0.11.0: + version "0.11.0" + resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.11.0.tgz#3918953075109d4ca204bf1e8a393a78d3cc821f" + integrity sha512-dVWGuWJlQw2lZxsxBI3hOsoxg1k3DruLR0foHQLSkQMfk+qLJbv9dUk8fjmjWQKN9ef2n54ehA2FjClAsQhrWQ== dependencies: loader-utils "^1.1.0" normalize-url "1.9.1" @@ -7235,10 +7255,10 @@ onetime@^5.1.0: dependencies: mimic-fn "^2.1.0" -open@7.2.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/open/-/open-7.2.0.tgz#212959bd7b0ce2e8e3676adc76e3cf2f0a2498b4" - integrity sha512-4HeyhxCvBTI5uBePsAdi55C5fmqnWZ2e2MlmvWi5KW5tdH5rxoiv/aMtbeVxKZc3eWkT1GymMnLG8XC4Rq4TDQ== +open@7.2.1: + version "7.2.1" + resolved "https://registry.yarnpkg.com/open/-/open-7.2.1.tgz#07b0ade11a43f2a8ce718480bdf3d7563a095195" + integrity sha512-xbYCJib4spUdmcs0g/2mK1nKo/jO2T7INClWd/beL7PFkXRWgr8B23ssDHX/USPn2M2IjDR5UdpYs6I67SnTSA== dependencies: is-docker "^2.0.0" is-wsl "^2.1.1" @@ -7356,7 +7376,7 @@ p-limit@^2.0.0, p-limit@^2.2.0: dependencies: p-try "^2.0.0" -p-limit@^3.0.1, p-limit@^3.0.2: +p-limit@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.0.2.tgz#1664e010af3cadc681baafd3e2a437be7b0fb5fe" integrity sha512-iwqZSOoWIW+Ew4kAGUlN16J4M7OB3ysMLSZtnhmqx7njIHFPlxWBX8xo3lVTyFVq6mI/lL9qt2IsN1sHwaxJkg== @@ -8724,10 +8744,10 @@ rollup-pluginutils@^2.8.1: dependencies: estree-walker "^0.6.1" -rollup@2.26.5: - version "2.26.5" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.26.5.tgz#5562ec36fcba3eed65cfd630bd78e037ad0e0307" - integrity sha512-rCyFG3ZtQdnn9YwfuAVH0l/Om34BdO5lwCA0W6Hq+bNB21dVEBbCRxhaHOmu1G7OBFDWytbzAC104u7rxHwGjA== +rollup@2.26.9: + version "2.26.9" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.26.9.tgz#4b6ce4e9044dd257d7314d8ed9b4d4d8a7d166c9" + integrity sha512-XIiWYLayLqV+oY4S2Lub/shJq4uk/QQLwWToYCL4LjZbYHbFK3czea4UDVRUJu+zNmKmxq5Zb/OG7c5HSvH2TQ== optionalDependencies: fsevents "~2.1.2" @@ -8858,6 +8878,15 @@ schema-utils@^2.6.5, schema-utils@^2.6.6, schema-utils@^2.7.0: ajv "^6.12.2" ajv-keywords "^3.4.1" +schema-utils@^2.7.1: + version "2.7.1" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7" + integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg== + dependencies: + "@types/json-schema" "^7.0.5" + ajv "^6.12.4" + ajv-keywords "^3.5.2" + select-hose@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" @@ -9045,6 +9074,13 @@ sha.js@^2.4.0, sha.js@^2.4.8: inherits "^2.0.1" safe-buffer "^5.0.1" +shallow-clone@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3" + integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA== + dependencies: + kind-of "^6.0.2" + shebang-command@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" @@ -9251,16 +9287,17 @@ source-list-map@^2.0.0: resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== -source-map-loader@1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-1.0.2.tgz#b0a6582b2eaa387ede1ecf8061ae0b93c23f9eb0" - integrity sha512-oX8d6ndRjN+tVyjj6PlXSyFPhDdVAPsZA30nD3/II8g4uOv8fCz0DMn5sy8KtVbDfKQxOpGwGJnK3xIW3tauDw== +source-map-loader@1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-1.1.0.tgz#f0fcc88106137793a89ec00f118196b601f111ae" + integrity sha512-Kj7rXntLhAsEjZlqGz85Mbnu8N4gcxj5qZI1XyLQjqAI/p92ckRXwErb3jVYL5JxlFJnD4VgwybpB1h6NlETRg== dependencies: - data-urls "^2.0.0" + abab "^2.0.4" iconv-lite "^0.6.2" loader-utils "^2.0.0" schema-utils "^2.7.0" source-map "^0.6.1" + whatwg-mimetype "^2.3.0" source-map-resolve@^0.5.0, source-map-resolve@^0.5.2: version "0.5.3" @@ -9716,10 +9753,10 @@ symbol-observable@1.0.1: resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4" integrity sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ= -symbol-observable@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" - integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ== +symbol-observable@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-2.0.0.tgz#08d9e7d0f4298bf25c917907aeea39fa131065ec" + integrity sha512-E56rCtH6Of77kyoXEv+lwHqRNGLoEsxoEuvyAZflOUkg9BJ2y/qXfdhEBqAtUngCSZZyDkuGaF4FsmO5paGaqA== symbol-tree@^3.2.4: version "3.2.4" @@ -10523,12 +10560,13 @@ webpack-log@^2.0.0: ansi-colors "^3.0.0" uuid "^3.3.2" -webpack-merge@4.2.2: - version "4.2.2" - resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.2.2.tgz#a27c52ea783d1398afd2087f547d7b9d2f43634d" - integrity sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g== +webpack-merge@5.1.3: + version "5.1.3" + resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.1.3.tgz#e5570b0bfa654915340f1e348c93a6fd16d7a820" + integrity sha512-fz/xHgfHyxq3uzGGrMryPnpPZ6x3vF1tHtws6vYwYX+8e6Dw+4U4r6rXuEPCqtSwmUIeD8hniWwFem+5FVLjzg== dependencies: - lodash "^4.17.15" + clone-deep "^4.0.1" + wildcard "^2.0.0" webpack-sources@1.4.3, webpack-sources@^1.1.0, webpack-sources@^1.2.0, webpack-sources@^1.3.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1, webpack-sources@^1.4.3: version "1.4.3" @@ -10633,6 +10671,11 @@ which@^1.2.9, which@^1.3.0, which@^1.3.1: dependencies: isexe "^2.0.0" +wildcard@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec" + integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw== + word-wrap@~1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"