fix: getlayer & getlayerByName

This commit is contained in:
thinkinggis 2020-02-08 01:51:17 +08:00
parent 26c9927e23
commit 48bea6e346
10 changed files with 291 additions and 67 deletions

View File

@ -36,7 +36,7 @@ scene.addLayer(layer);
### zIndex
图层绘制顺序,数值越小优先绘制,可以控制图层绘制的上下层级 {int}   default 0
图层绘制顺序,数值大绘制在上层,可以控制图层绘制的上下层级 {int}   default 0
### minZoom
@ -344,8 +344,28 @@ layer.fitBounds();
### setMinZoom
设置图层最小缩放等级
参数
- zoom {number}
```javascript
layer.setMinZoom(zoom);
```
### setMaxZoom
设置图层最大缩放等级
参数
- zoom {number}
```javascript
layer.setMinZoom(zoom);
```
## 图层交互方法
### active

View File

@ -36,7 +36,7 @@ scene.addLayer(layer);
### zIndex
图层绘制顺序,数值越小优先绘制,可以控制图层绘制的上下层级 {int}   default 0
图层绘制顺序,数值大绘制在上层,可以控制图层绘制的上下层级 {int}   default 0
### minZoom
@ -344,8 +344,28 @@ layer.fitBounds();
### setMinZoom
设置图层最小缩放等级
参数
- zoom {number}
```javascript
layer.setMinZoom(zoom);
```
### setMaxZoom
设置图层最大缩放等级
参数
- zoom {number}
```javascript
layer.setMinZoom(zoom);
```
## 图层交互方法
### active

View File

@ -1,5 +1,5 @@
---
title: Scene
title: 场景 Scene
order: 2
---
@ -108,6 +108,7 @@ L7 Logo 的显示位置 默认左下角
- dark
- light
- normal
- blank 无底图
除了内置的样式,你也可以传入自定义的其他属性。
@ -151,7 +152,21 @@ return {float}   当前缩放等级
scene.getLayers();
```
return 图层数组 {Array}
### getLayerByName(name)
根据图层名称获取图层
参数
-name {string}
layer 初始化可配置图层 name
```javascript
scene.getLayerByName(name);
```
return Layer 图层对象
### getCenter()
@ -266,7 +281,9 @@ scene.ZoomOUt();
scene.panTo(LngLat);
```
参数:`center` LngLat 中心位置坐标
参数:
- `center` LngLat 中心位置坐标
### panBy
@ -279,6 +296,7 @@ scene.panBy(x, y);
参数:
- `x` {number} 水平方向移动像素 向右为正方向
- `y` {number} 垂直方向移动像素 向下为正方向
### setPitch
@ -291,11 +309,12 @@ scene.setPitch(pitch);
参数 :
`pitch` {number}
- `pitch` {number}
### fitBounds
地图缩放到某个范围内
参数 :
- `extent` { array} 经纬度范围 [minlng,minlat,maxlng,maxlat]
@ -312,7 +331,9 @@ scene.fitBounds([112, 32, 114, 35]);
scene.removeLayer(layer);
```
参数 `layer` {Layer}
参数
- `layer` {Layer}
## 事件
@ -322,15 +343,32 @@ scene.removeLayer(layer);
#### 参数
- `eventName` {string} 事件名
- `handler` {function } 事件回调函数
`eventName` {string} 事件名
`handler` {function } 事件回调函数
### off
移除事件监听
`eventName` {string} 事件名
`handler` {function } 事件回调函数
- `eventName` {string} 事件名
- `handler` {function } 事件回调函数
### 场景事件
#### loaded
scene 初始化完成事件scene 初始化完成添加 Layer
```javascript
scene.on('loaded', () => {});
```
#### resize
地图容器变化事件
```javascript
scene.on('resize', () => {}); // 地图容器大小改变事件
```
### 地图事件
@ -355,14 +393,8 @@ scene.on('mouseover', (ev) => {}); // 鼠标移入地图容器内时触发
scene.on('mouseout', (ev) => {}); // 鼠标移出地图容器时触发
scene.on('mouseup', (ev) => {}); // 鼠标在地图上单击抬起时触发
scene.on('mousedown', (ev) => {}); // 鼠标在地图上单击按下时触发
scene.on('rightclick', (ev) => {}); // 鼠标右键单击事件
scene.on('contextmenu', (ev) => {}); // 鼠标右键单击事件
scene.on('dragstart', (ev) => {}); //开始拖拽地图时触发
scene.on('dragging', (ev) => {}); // 拖拽地图过程中触发
scene.on('dragend', (ev) => {}); //停止拖拽地图时触发。如地图有拖拽缓动效果,则在拽停止,缓动开始前触发
```
### 其它事件
```javascript
scene.on('resize', () => {}); // 地图容器大小改变事件
```

View File

@ -152,7 +152,21 @@ return {float}   当前缩放等级
scene.getLayers();
```
return 图层数组 {Array}
### getLayerByName(name)
根据图层名称获取图层
参数
-name {string}
layer 初始化可配置图层 name
```javascript
scene.getLayerByName(name);
```
return Layer 图层对象
### getCenter()

View File

@ -267,7 +267,8 @@ export interface ILayerService {
startAnimate(): void;
stopAnimate(): void;
getLayers(): ILayer[];
getLayer(name: string): ILayer | undefined;
getLayer(id: string): ILayer | undefined;
getLayerByName(name: string): ILayer | undefined;
remove(layer: ILayer): void;
removeAllLayers(): void;
updateRenderOrder(): void;

View File

@ -46,7 +46,11 @@ export default class LayerService implements ILayerService {
return this.layers;
}
public getLayer(name: string): ILayer | undefined {
public getLayer(id: string): ILayer | undefined {
return this.layers.find((layer) => layer.id === id);
}
public getLayerByName(name: string): ILayer | undefined {
return this.layers.find((layer) => layer.name === name);
}

View File

@ -1,11 +1,24 @@
// @ts-ignore
import { Mapbox } from '@antv/l7-maps';
import { Scene } from '../src/';
describe('template', () => {
const el = document.createElement('div');
el.id = 'test-div-id';
el.innerHTML = 'hello L7';
el.style.width = '500px';
el.style.height = '500px';
document.querySelector('body')?.appendChild(el);
const scene = new Scene({
id: 'test-div-id',
map: new Mapbox({
style: 'dark',
center: [110.19382669582967, 30.258134],
pitch: 0,
zoom: 3,
}),
});
it('div content', () => {
expect(document.querySelector('#test-div-id')?.innerHTML).toBe('hello L7');
it('scene map method', () => {
expect(scene.getZoom()).toEqual(3);
expect(scene.getPitch()).toEqual(0);
});
});

View File

@ -126,6 +126,10 @@ class Scene
return this.layerService.getLayer(id);
}
public getLayerByName(name: string): ILayer | undefined {
return this.layerService.getLayerByName(name);
}
public removeLayer(layer: ILayer): void {
this.layerService.remove(layer);
}

View File

@ -29,7 +29,9 @@ export default class ScaleComponent extends React.Component {
}),
});
this.scene = scene;
const layer = new PolygonLayer({});
const layer = new PolygonLayer({
name: '01',
});
layer
.source(data)
@ -48,8 +50,9 @@ export default class ScaleComponent extends React.Component {
opacity: 1.0,
});
scene.addLayer(layer);
const pointLayer = new PointLayer()
const pointLayer = new PointLayer({
name: '02',
})
.source(pointsData, {
cluster: true,
})

193
yarn.lock
View File

@ -5276,7 +5276,7 @@ babel-plugin-react-docgen@^4.0.0:
react-docgen "^5.0.0"
recast "^0.14.7"
babel-plugin-remove-graphql-queries@^2.7.23:
babel-plugin-remove-graphql-queries@^2.7.22, babel-plugin-remove-graphql-queries@^2.7.23:
version "2.7.23"
resolved "https://registry.npmjs.org/babel-plugin-remove-graphql-queries/-/babel-plugin-remove-graphql-queries-2.7.23.tgz#7cecb19b6057eb4de92d147dfd4d51c885cc356a"
integrity sha512-SvWLivXtbeExS0eUPrRpg8EYiDPcOlzaO/vePcdmW2X8GBC1miezXS+RYPYyt4r9Z0Cg0ZQe58ggssF/8ym3rg==
@ -5396,7 +5396,7 @@ babel-polyfill@6.26.0:
core-js "^2.5.0"
regenerator-runtime "^0.10.5"
babel-preset-gatsby@^0.2.13, babel-preset-gatsby@^0.2.22, babel-preset-gatsby@^0.2.28:
babel-preset-gatsby@^0.2.13, babel-preset-gatsby@^0.2.22, babel-preset-gatsby@^0.2.27, babel-preset-gatsby@^0.2.28:
version "0.2.28"
resolved "https://registry.npmjs.org/babel-preset-gatsby/-/babel-preset-gatsby-0.2.28.tgz#6bd421e1a18115889e608b2a8fa5076205bacd1a"
integrity sha512-PnQgmGHTgGHgMmTeK1raV5rFk4puUX2bX0L7Ayqomi5xMQqQXLYOeE5bsaB1YIBpdFMdCUgbf9skX7vfqyy7hw==
@ -8384,7 +8384,7 @@ detect-indent@^5.0.0:
resolved "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"
integrity sha1-OHHMCmoALow+Wzz38zYmRnXwa50=
detect-libc@^1.0.2, detect-libc@^1.0.3:
detect-libc@^1.0.3:
version "1.0.3"
resolved "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
@ -10627,7 +10627,7 @@ fuse.js@^3.4.6:
resolved "https://registry.npmjs.org/fuse.js/-/fuse.js-3.4.6.tgz#545c3411fed88bf2e27c457cab6e73e7af697a45"
integrity sha512-H6aJY4UpLFwxj1+5nAvufom5b2BT2v45P1MkPvdGIK8fWjQx/7o6tTT1+ALV0yawQvbmvCF0ufl2et8eJ7v7Cg==
gatsby-cli@^2.8.29:
gatsby-cli@^2.8.27, gatsby-cli@^2.8.29:
version "2.8.29"
resolved "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-2.8.29.tgz#53dd79d2ff01d555570cd2a81a51c95be585bd7e"
integrity sha512-HVZmb22D+Qf24rceY37MEzaPOk7v3ffw/tzu8pFkG1IoHLIJumbo2LMSJRvnd2+SUMQf1ZIVQCmbdEuaJ9Fn1A==
@ -10675,7 +10675,7 @@ gatsby-cli@^2.8.29:
ink "^2.6.0"
ink-spinner "^3.0.1"
gatsby-core-utils@^1.0.28:
gatsby-core-utils@^1.0.26, gatsby-core-utils@^1.0.28:
version "1.0.28"
resolved "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.0.28.tgz#aa66e49cdcc1892e7817a32fdd806cf5e16ea309"
integrity sha512-XWKR9Rk2v6iQkmBsTLCdI3adyC9PCh1s5BQ85nlGitlgcVVQq98jZlQdcy0v9mJOrTuce0uf5RqkeGDWFLekoA==
@ -10683,7 +10683,7 @@ gatsby-core-utils@^1.0.28:
ci-info "2.0.0"
node-object-hash "^2.0.0"
gatsby-graphiql-explorer@^0.2.33:
gatsby-graphiql-explorer@^0.2.32, gatsby-graphiql-explorer@^0.2.33:
version "0.2.33"
resolved "https://registry.npmjs.org/gatsby-graphiql-explorer/-/gatsby-graphiql-explorer-0.2.33.tgz#0414f50369c82f3b156fbb1b0968d81ca8bc8bc3"
integrity sha512-prc/OU9dcrQQDRswguLuRqlBLGNZO/oadRR0rhmxVPrTVps3RyX4VDYvGBzaMhSfr4tMNAVDYP5iPjaaQz+D8A==
@ -10699,7 +10699,7 @@ gatsby-image@^2.2.19:
object-fit-images "^3.2.4"
prop-types "^15.7.2"
gatsby-link@^2.2.29:
gatsby-link@^2.2.28, gatsby-link@^2.2.29:
version "2.2.29"
resolved "https://registry.npmjs.org/gatsby-link/-/gatsby-link-2.2.29.tgz#adde4f8d548728282f375affffa34d2c10bc5327"
integrity sha512-Yl6CIseRSaF9oLgcaLc4e95al2IQ4fHxMjKQtKRZEH4sFk0BIcLaVfqPwwWBdUK0rGkyNXqNs5lATBWqmg1FwA==
@ -10819,7 +10819,7 @@ gatsby-plugin-offline@^3.0.22:
lodash "^4.17.15"
workbox-build "^4.3.1"
gatsby-plugin-page-creator@^2.1.25, gatsby-plugin-page-creator@^2.1.40:
gatsby-plugin-page-creator@^2.1.25, gatsby-plugin-page-creator@^2.1.38, gatsby-plugin-page-creator@^2.1.40:
version "2.1.40"
resolved "https://registry.npmjs.org/gatsby-plugin-page-creator/-/gatsby-plugin-page-creator-2.1.40.tgz#96c817781dfb1f191570c69d2e9af114a3cd23df"
integrity sha512-jwY8LTOOobrKUr1ph+/IHAHDuzjSrXsAu2YBqZg7wc/J6gre0YAgOU2yAxY34CadE34jieISO3FDIyHMii3vPg==
@ -10906,7 +10906,7 @@ gatsby-plugin-typescript@^2.1.8:
"@babel/runtime" "^7.7.6"
babel-plugin-remove-graphql-queries "^2.7.23"
gatsby-react-router-scroll@^2.1.21:
gatsby-react-router-scroll@^2.1.20, gatsby-react-router-scroll@^2.1.21:
version "2.1.21"
resolved "https://registry.npmjs.org/gatsby-react-router-scroll/-/gatsby-react-router-scroll-2.1.21.tgz#bc4aeee424da034287b6fe64d6b08f47d6cb6881"
integrity sha512-aEjj8baFlWOfgU/HGiqxKHtfEtYMnU2qDWPxbYK07xxvXqk3reUu3cluCSaO0EqNUALwJkaz2QsYLzo9MszbeA==
@ -10995,7 +10995,7 @@ gatsby-source-github@^0.0.2:
lodash "~4.17.5"
yup "~0.24.1"
gatsby-telemetry@^1.1.49:
gatsby-telemetry@^1.1.47, gatsby-telemetry@^1.1.49:
version "1.1.49"
resolved "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-1.1.49.tgz#f577738fe03a4aeef4bb5b481969e91fd52ca22d"
integrity sha512-NLT843FVp3pt1gjJ/vsclgw6h7pIKDF9l8sWBFiIrJUjiwGqCVC+emylbuK8MFE8Js989SP40piqvgo+orEl3g==
@ -11058,7 +11058,145 @@ gatsby-transformer-sharp@^2.2.14:
semver "^5.7.1"
sharp "^0.23.4"
gatsby@^2.15.16, gatsby@^2.17.7:
gatsby@2.19.5:
version "2.19.5"
resolved "https://registry.npmjs.org/gatsby/-/gatsby-2.19.5.tgz#41dfc896ad8654d3372581fa17edf5a981625cee"
integrity sha512-KdZBFJtTT1XHVHQVXwqpd93Dn/HHkBE7cCBg7n9dLRYGIkywtcw52xpEoBtzSuSeJGJy0Nc97Fvdl2VJXou8Fw==
dependencies:
"@babel/code-frame" "^7.5.5"
"@babel/core" "^7.7.5"
"@babel/parser" "^7.7.5"
"@babel/polyfill" "^7.7.0"
"@babel/runtime" "^7.7.6"
"@babel/traverse" "^7.7.4"
"@hapi/joi" "^15.1.1"
"@mikaelkristiansson/domready" "^1.0.10"
"@pieh/friendly-errors-webpack-plugin" "1.7.0-chalk-2"
"@reach/router" "^1.2.1"
"@typescript-eslint/eslint-plugin" "^2.11.0"
"@typescript-eslint/parser" "^2.11.0"
address "1.1.2"
autoprefixer "^9.7.3"
axios "^0.19.0"
babel-core "7.0.0-bridge.0"
babel-eslint "^10.0.3"
babel-loader "^8.0.6"
babel-plugin-add-module-exports "^0.3.3"
babel-plugin-dynamic-import-node "^2.3.0"
babel-plugin-remove-graphql-queries "^2.7.22"
babel-preset-gatsby "^0.2.27"
better-opn "1.0.0"
better-queue "^3.8.10"
bluebird "^3.7.2"
browserslist "3.2.8"
cache-manager "^2.10.1"
cache-manager-fs-hash "^0.0.7"
chalk "^2.4.2"
chokidar "3.3.0"
common-tags "^1.8.0"
compression "^1.7.4"
convert-hrtime "^3.0.0"
copyfiles "^2.1.1"
core-js "^2.6.11"
cors "^2.8.5"
css-loader "^1.0.1"
debug "^3.2.6"
del "^5.1.0"
detect-port "^1.3.0"
devcert-san "^0.3.3"
dotenv "^8.2.0"
eslint "^6.7.2"
eslint-config-react-app "^5.1.0"
eslint-loader "^2.2.1"
eslint-plugin-flowtype "^3.13.0"
eslint-plugin-graphql "^3.1.0"
eslint-plugin-import "^2.19.1"
eslint-plugin-jsx-a11y "^6.2.3"
eslint-plugin-react "^7.17.0"
eslint-plugin-react-hooks "^1.7.0"
event-source-polyfill "^1.0.11"
express "^4.17.1"
express-graphql "^0.9.0"
fast-levenshtein "^2.0.6"
file-loader "^1.1.11"
flat "^4.1.0"
fs-exists-cached "1.0.0"
fs-extra "^8.1.0"
gatsby-cli "^2.8.27"
gatsby-core-utils "^1.0.26"
gatsby-graphiql-explorer "^0.2.32"
gatsby-link "^2.2.28"
gatsby-plugin-page-creator "^2.1.38"
gatsby-react-router-scroll "^2.1.20"
gatsby-telemetry "^1.1.47"
glob "^7.1.6"
got "8.3.2"
graphql "^14.5.8"
graphql-compose "^6.3.7"
graphql-playground-middleware-express "^1.7.12"
hasha "^5.1.0"
invariant "^2.2.4"
is-relative "^1.0.0"
is-relative-url "^3.0.0"
is-wsl "^2.1.1"
jest-worker "^24.9.0"
json-loader "^0.5.7"
json-stringify-safe "^5.0.1"
lodash "^4.17.15"
lokijs "^1.5.8"
md5 "^2.2.1"
md5-file "^3.2.3"
micromatch "^3.1.10"
mime "^2.4.4"
mini-css-extract-plugin "^0.8.0"
mitt "^1.2.0"
mkdirp "^0.5.1"
moment "^2.24.0"
name-all-modules-plugin "^1.0.1"
normalize-path "^2.1.1"
null-loader "^0.1.1"
opentracing "^0.14.4"
optimize-css-assets-webpack-plugin "^5.0.3"
p-defer "^3.0.0"
parseurl "^1.3.3"
physical-cpu-count "^2.0.0"
pnp-webpack-plugin "^1.5.0"
postcss-flexbugs-fixes "^3.3.1"
postcss-loader "^2.1.6"
prompts "^2.3.0"
prop-types "^15.7.2"
raw-loader "^0.5.1"
react-dev-utils "^4.2.3"
react-error-overlay "^3.0.0"
react-hot-loader "^4.12.18"
redux "^4.0.4"
redux-thunk "^2.3.0"
semver "^5.7.1"
shallow-compare "^1.2.2"
sift "^5.1.0"
signal-exit "^3.0.2"
slugify "^1.3.6"
socket.io "^2.3.0"
stack-trace "^0.0.10"
string-similarity "^1.2.2"
style-loader "^0.23.1"
terser-webpack-plugin "^1.4.2"
"true-case-path" "^2.2.1"
type-of "^2.0.1"
url-loader "^1.1.2"
util.promisify "^1.0.0"
uuid "^3.3.3"
v8-compile-cache "^1.1.2"
webpack "~4.41.2"
webpack-dev-middleware "^3.7.2"
webpack-dev-server "^3.9.0"
webpack-hot-middleware "^2.25.0"
webpack-merge "^4.2.2"
webpack-stats-plugin "^0.3.0"
xstate "^4.7.2"
yaml-loader "^0.5.0"
gatsby@^2.15.16:
version "2.19.12"
resolved "https://registry.npmjs.org/gatsby/-/gatsby-2.19.12.tgz#9819d47407386912ad89f8067d69cec4ef7aec23"
integrity sha512-oI76KUEIebmaVOwtHuRINBspLvKHCIOdVPiNdgT/ly05iJLg9OsKd6/eYZ/rO+YYWew8t+MmoMVmRLpaWE2RBQ==
@ -12606,7 +12744,7 @@ i18next@^19.0.0:
dependencies:
"@babel/runtime" "^7.3.1"
iconv-lite@0.4, iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
iconv-lite@0.4, iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@~0.4.13:
version "0.4.24"
resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
@ -16192,15 +16330,6 @@ nearley@^2.7.10:
randexp "0.4.6"
semver "^5.4.1"
needle@^2.2.1:
version "2.3.2"
resolved "https://registry.npmjs.org/needle/-/needle-2.3.2.tgz#3342dea100b7160960a450dc8c22160ac712a528"
integrity sha512-DUzITvPVDUy6vczKKYTnWc/pBZ0EnjMJnQ3y+Jo5zfKFimJs7S3HFCxCRZYB9FUZcrzUQr3WsmvZgddMEIZv6w==
dependencies:
debug "^3.2.6"
iconv-lite "^0.4.4"
sax "^1.2.4"
negotiator@0.6.2:
version "0.6.2"
resolved "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
@ -16403,22 +16532,6 @@ node-object-hash@^2.0.0:
resolved "https://registry.npmjs.org/node-object-hash/-/node-object-hash-2.0.0.tgz#9971fcdb7d254f05016bd9ccf508352bee11116b"
integrity sha512-VZR0zroAusy1ETZMZiGeLkdu50LGjG5U1KHZqTruqtTyQ2wfWhHG2Ow4nsUbfTFGlaREgNHcCWoM/OzEm6p+NQ==
node-pre-gyp@*:
version "0.14.0"
resolved "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83"
integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA==
dependencies:
detect-libc "^1.0.2"
mkdirp "^0.5.1"
needle "^2.2.1"
nopt "^4.0.1"
npm-packlist "^1.1.6"
npmlog "^4.0.2"
rc "^1.2.7"
rimraf "^2.6.1"
semver "^5.3.0"
tar "^4.4.2"
node-releases@^1.1.29, node-releases@^1.1.47:
version "1.1.48"
resolved "https://registry.npmjs.org/node-releases/-/node-releases-1.1.48.tgz#7f647f0c453a0495bcd64cbd4778c26035c2f03a"
@ -16604,7 +16717,7 @@ npm-package-arg@^5.1.2:
semver "^5.1.0"
validate-npm-package-name "^3.0.0"
npm-packlist@^1.1.6, npm-packlist@^1.4.4:
npm-packlist@^1.4.4:
version "1.4.8"
resolved "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e"
integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==
@ -16666,7 +16779,7 @@ npm-run-path@^4.0.0:
dependencies:
path-key "^3.0.0"
"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.1, npmlog@^4.0.2, npmlog@^4.1.2:
"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.1, npmlog@^4.1.2:
version "4.1.2"
resolved "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
@ -22542,7 +22655,7 @@ tar@^2.0.0:
fstream "^1.0.12"
inherits "2"
tar@^4.4.10, tar@^4.4.12, tar@^4.4.2, tar@^4.4.8:
tar@^4.4.10, tar@^4.4.12, tar@^4.4.8:
version "4.4.13"
resolved "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==