From 7246f3421a72a2efe6fd8f039fb373ebfd82a2b1 Mon Sep 17 00:00:00 2001 From: caiying <2841902102@qq.com> Date: Mon, 11 Nov 2019 11:31:49 +0800 Subject: [PATCH 01/82] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=BC=BA?= =?UTF-8?q?=E5=88=B6=E5=85=89=E7=85=A7=E7=BB=8F=E5=BA=A6=E3=80=81=E7=BA=AC?= =?UTF-8?q?=E5=BA=A6=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MainBarControl/Effect/ForceSunPos.vue | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/Source/components/controls/MainBarControl/Effect/ForceSunPos.vue b/Source/components/controls/MainBarControl/Effect/ForceSunPos.vue index 24dc7d08..7165bee3 100644 --- a/Source/components/controls/MainBarControl/Effect/ForceSunPos.vue +++ b/Source/components/controls/MainBarControl/Effect/ForceSunPos.vue @@ -57,9 +57,7 @@ export default { created() {}, mounted() { this.bind("useCameraPos"); - this.bind("position"); - this.position[0] = (this.position[0] * 180) / Math.PI; - this.position[1] = (this.position[1] * 180) / Math.PI; + this.bindpos("position"); }, methods: { bind(prp) { @@ -67,6 +65,17 @@ export default { this._viewUnbinds.push( XE.MVVM.bind(this, prp, this.$root.$earth.effect.forceSunPos, prp) ); + }, + bindpos(pos) { + this._viewUnbinds = this._viewUnbinds || []; + this._viewUnbinds.push( + XE.MVVM.bindPosition( + this, + pos, + this.$root.$earth.effect.forceSunPos, + pos + ) + ); } }, beforeDestroy() { From 3ffc6e75c12bca0a298fcd312f13a94b1f3cadc0 Mon Sep 17 00:00:00 2001 From: caiying <2841902102@qq.com> Date: Mon, 11 Nov 2019 11:38:37 +0800 Subject: [PATCH 02/82] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGLES.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGLES.md b/CHANGLES.md index 53d74de0..501f3a30 100644 --- a/CHANGLES.md +++ b/CHANGLES.md @@ -1,6 +1,11 @@ Change Log ========== +### 1.2.8 + +##### Fixes :wrench: +* 修复强制光照经度、纬度不对的问题 + ### 1.2.7 - 2019-11-9 ##### Fixes :wrench: From 4b15c304bfba7344c3b98a8dec87fe54f7e58e86 Mon Sep 17 00:00:00 2001 From: caiying <2841902102@qq.com> Date: Tue, 12 Nov 2019 18:34:38 +0800 Subject: [PATCH 03/82] =?UTF-8?q?pin-=E6=A0=B7=E5=BC=8F=E7=A4=BA=E4=BE=8B?= =?UTF-8?q?=E5=92=8C=E6=A0=87=E7=BB=98=E4=B8=AD=E7=9A=84=E5=86=85=E7=BD=AE?= =?UTF-8?q?=E5=9B=BE=E6=A0=87=E6=B7=BB=E5=8A=A0=E4=BA=86extText=E3=80=81ex?= =?UTF-8?q?tTextFont=E3=80=81extTextPixelOffset=E5=B1=9E=E6=80=A7=EF=BC=8C?= =?UTF-8?q?=E5=B9=B6=E6=B7=BB=E5=8A=A0=E4=BA=86=E6=89=87=E5=BD=A2=E6=A0=87?= =?UTF-8?q?=E7=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Apps/Examples/earth-pin-pinBuilder.html | 31 +- Source/components/MainUIComp.vue | 3 + .../components/tools/EntityMoreTool/index.vue | 66 +-- .../components/tools/EntityMoreTool/locale.js | 55 ++ .../components/viztools/GeoSector/index.vue | 552 ++++++++++++++++++ .../viztools/GeoSector/index_locale.js | 32 + Source/components/viztools/PinTool/index.vue | 51 +- .../viztools/PinTool/index_locale.js | 104 ++-- Source/css/common.css | 7 + 9 files changed, 790 insertions(+), 111 deletions(-) create mode 100644 Source/components/tools/EntityMoreTool/locale.js create mode 100644 Source/components/viztools/GeoSector/index.vue create mode 100644 Source/components/viztools/GeoSector/index_locale.js diff --git a/Apps/Examples/earth-pin-pinBuilder.html b/Apps/Examples/earth-pin-pinBuilder.html index f20d303b..7d77cec9 100644 --- a/Apps/Examples/earth-pin-pinBuilder.html +++ b/Apps/Examples/earth-pin-pinBuilder.html @@ -5,7 +5,8 @@ - + + Pin-样式 @@ -20,10 +21,11 @@ } input { - width: 350px; + width: 350px; } - .text, select{ + .text, + select { width: 242px; font-size: 18px; } @@ -48,11 +50,15 @@
pin内容:
- pin图标:
+ pin图标:
pin大小：{{ size }}

pin填充颜色：
- pin边框和文字颜色： + pin边框和文字颜色：
+ pin文本内容:
+ pin文本内容字体样式:
+ pin文本内容左右偏移:
+ pin文本内容上下偏移:
`, @@ -62,7 +68,10 @@ text: '', size: 0, makiIcon: '', - makiIconObj: {} + makiIconObj: {}, + extText: '', + extTextFont: '', + extTextPixelOffset: [0, 0] }; }, // 1.1 资源创建 @@ -95,21 +104,26 @@ var pin1 = earth.sceneTree.$refs.pin1.czmObject; this.makiIconObj = XE.Obj.Pin.MakiIcon; - + // 1.1.5 数据绑定 this._textUnbind = XE.MVVM.bind(this, 'text', pin1.pinBuilder, 'text'); this._sizeUnbind = XE.MVVM.bind(this, 'size', pin1.pinBuilder, 'size'); this._makiIconUnbind = XE.MVVM.bind(this, 'makiIcon', pin1.pinBuilder, 'makiIcon'); + this._extTextUnbind = XE.MVVM.bind(this, 'extText', pin1.pinBuilder, 'extText'); + this._extTextFontUnbind = XE.MVVM.bind(this, 'extTextFont', pin1.pinBuilder, 'extTextFont'); + this._extTextPixelOffsetUnbind = XE.MVVM.bind(this, 'extTextPixelOffset', pin1.pinBuilder, 'extTextPixelOffset'); // 设置初始值 pin1.pinBuilder.text = 'pin'; pin1.pinBuilder.size = 48; + pin1.pinBuilder.extText = '文本'; this._earth = earth; // only for Debug window.earth = earth; window.pin1 = pin1; + window.extTextPixelOffset = this.extTextPixelOffset; }, methods: { colorchangeinner(event) { @@ -127,6 +141,9 @@ this._textUnbind = this._textUnbind && this._textUnbind(); this._sizeUnbind = this._sizeUnbind && this._sizeUnbind(); this._makiIconUnbind = this._makiIconUnbind && this._makiIconUnbind(); + this._extTextUnbind = this._extTextUnbind && this._extTextUnbind(); + this._extTextFontUnbind = this._extTextFontUnbind && this._extTextFontUnbind(); + this._extTextPixelOffsetUnbind = this._extTextPixelOffsetUnbind && this._extTextPixelOffsetUnbind(); this._earth = this._earth && this._earth.destroy(); }, } diff --git a/Source/components/MainUIComp.vue b/Source/components/MainUIComp.vue index f8a571ce..50d73c7d 100644 --- a/Source/components/MainUIComp.vue +++ b/Source/components/MainUIComp.vue @@ -83,6 +83,7 @@ import GeoArc from "./viztools/GeoArc"; import GeoBezier2 from "./viztools/GeoBezier2"; import GeoBezier3 from "./viztools/GeoBezier3"; import GeoTriFlag from "./viztools/GeoTriFlag"; +import GeoSector from "./viztools/GeoSector"; import ScanlineTool from "./viztools/ScanlineTool"; import CamerVideoTool from "./viztools/CamerVideoTool"; @@ -133,6 +134,7 @@ export default { GeoBezier2, GeoBezier3, GeoTriFlag, + GeoSector, ScanlineTool, CamerVideoTool, @@ -185,6 +187,7 @@ export default { GeoCurveFlag: "GeoCurveFlag", GeoRightAngleFlag: "GeoRightAngleFlag", GeoPolygon: "GeoPolygon", + GeoSector: "GeoSector", ["CameraView.View"]: "CameraViewPrp" }, tools: [ diff --git a/Source/components/tools/EntityMoreTool/index.vue b/Source/components/tools/EntityMoreTool/index.vue index aaa0849e..5e4b6ca7 100644 --- a/Source/components/tools/EntityMoreTool/index.vue +++ b/Source/components/tools/EntityMoreTool/index.vue @@ -44,6 +44,7 @@
  • {{lang.rightangleflag}}
  • {{lang.doublearrow}}
  • {{lang.polygon}}
    • +
  • {{lang.sector}}
    • @@ -52,6 +53,8 @@ + + \ No newline at end of file diff --git a/Source/components/viztools/GeoSector/index_locale.js b/Source/components/viztools/GeoSector/index_locale.js new file mode 100644 index 00000000..9852dfe8 --- /dev/null +++ b/Source/components/viztools/GeoSector/index_locale.js @@ -0,0 +1,32 @@ +const zh = { + title: '多边形', + name: '名称', + show:'显示', + creating:'创建', + editing:'编辑', + ground:'贴地', + outlineWidth:'边框宽度', + outlineShow:'边框显示', + outlineColor:'边框颜色', + color:'颜色', + transparency:'透明度' +}; + +const en = { + title: 'GeoPolygon', + name: 'name', + show:'show', + creating:'creating', + editing:'editing', + ground:'ground', + outlineWidth:'width', + outlineShow:'outlineShow', + outlineColor:'outlineColor', + color:'color', + transparency:'transparency' +}; + +export default { + zh, + en +}; \ No newline at end of file diff --git a/Source/components/viztools/PinTool/index.vue b/Source/components/viztools/PinTool/index.vue index 261a13bf..7712bdb0 100644 --- a/Source/components/viztools/PinTool/index.vue +++ b/Source/components/viztools/PinTool/index.vue @@ -123,6 +123,32 @@ + +
    + +
    + + +
    + +
    + + +
    +
    + +
    + +
    + + +
    + +
    + + +
    +
    @@ -130,11 +156,15 @@ From 0ac3205456b14d1252c176d3a9d6c5cf4ae7c952 Mon Sep 17 00:00:00 2001 From: vtxf Date: Wed, 13 Nov 2019 08:25:34 +0800 Subject: [PATCH 06/82] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Apps/Examples/startup-createEarth.html | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Apps/Examples/startup-createEarth.html b/Apps/Examples/startup-createEarth.html index f7d9e426..f58adb1e 100644 --- a/Apps/Examples/startup-createEarth.html +++ b/Apps/Examples/startup-createEarth.html @@ -28,7 +28,12 @@ var bgImagery; function startup() { - earth = new XE.Earth('earthContainer'); + // earth = new XE.Earth('earthContainer'); + earth = new XE.Earth('earthContainer', { + // 这里设置Viewer的配置，和new Viewer(container, options)中的options一致 + homeButton: true, + timeline: true, + }); earth.sceneTree.root = { "children": [ From 2c49f64df9dfde2d95dcdd791b759bacb1756b2b Mon Sep 17 00:00:00 2001 From: vtxf Date: Wed, 13 Nov 2019 11:08:53 +0800 Subject: [PATCH 07/82] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=A4=9A=E9=80=89?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=A4=BA=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Apps/Examples/assets/simplestyles.geojson | 2314 +++++++++++++++++++++ Apps/Examples/scripts/list.js | 9 + Apps/Examples/test-polygonPicking.html | 144 ++ 3 files changed, 2467 insertions(+) create mode 100644 Apps/Examples/assets/simplestyles.geojson create mode 100644 Apps/Examples/test-polygonPicking.html diff --git a/Apps/Examples/assets/simplestyles.geojson b/Apps/Examples/assets/simplestyles.geojson new file mode 100644 index 00000000..b2b942cc --- /dev/null +++ b/Apps/Examples/assets/simplestyles.geojson @@ -0,0 +1,2314 @@ +{ + "type": "FeatureCollection", + "features": [ + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.0, + 0.0 + ] + }, + "properties": { + "title": "Unnamed", + "marker-color": "#B9EB14" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.1, + 0.0 + ] + }, + "properties": { + "title": "0", + "marker-symbol": "0", + "marker-color": "#D13C3C" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.2, + 0.0 + ] + }, + "properties": { + "title": "1", + "marker-symbol": "1", + "marker-color": "#C49D22" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.30000000000000004, + 0.0 + ] + }, + "properties": { + "title": "2", + "marker-symbol": "2", + "marker-color": "#8EE3A6" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.4, + 0.0 + ] + }, + "properties": { + "title": "3", + "marker-symbol": "3", + "marker-color": "#34BE96" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.5, + 0.0 + ] + }, + "properties": { + "title": "4", + "marker-symbol": "4", + "marker-color": "#8F1312" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.60000000000000009, + 0.0 + ] + }, + "properties": { + "title": "5", + "marker-symbol": "5", + "marker-color": "#E7F163" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.70000000000000007, + 0.0 + ] + }, + "properties": { + "title": "6", + "marker-symbol": "6", + "marker-color": "#713291" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.8, + 0.0 + ] + }, + "properties": { + "title": "7", + "marker-symbol": "7", + "marker-color": "#FA40B3" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.9, + 0.0 + ] + }, + "properties": { + "title": "8", + "marker-symbol": "8", + "marker-color": "#46117E" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 1.0, + 0.0 + ] + }, + "properties": { + "title": "9", + "marker-symbol": "9", + "marker-color": "#4ABA5E" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 1.1, + 0.0 + ] + }, + "properties": { + "title": "a", + "marker-symbol": "a", + "marker-color": "#77A1EF" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 1.2000000000000002, + 0.0 + ] + }, + "properties": { + "title": "b", + "marker-symbol": "b", + "marker-color": "#A1F5F1" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 1.3, + 0.0 + ] + }, + "properties": { + "title": "c", + "marker-symbol": "c", + "marker-color": "#7831EE" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 1.4000000000000001, + 0.0 + ] + }, + "properties": { + "title": "d", + "marker-symbol": "d", + "marker-color": "#FB6E43" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.0, + -0.1 + ] + }, + "properties": { + "title": "e", + "marker-symbol": "e", + "marker-color": "#07C621" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.1, + -0.1 + ] + }, + "properties": { + "title": "f", + "marker-symbol": "f", + "marker-color": "#DCC44A" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.2, + -0.1 + ] + }, + "properties": { + "title": "g", + "marker-symbol": "g", + "marker-color": "#FECF10" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.30000000000000004, + -0.1 + ] + }, + "properties": { + "title": "h", + "marker-symbol": "h", + "marker-color": "#AD5BBE" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.4, + -0.1 + ] + }, + "properties": { + "title": "i", + "marker-symbol": "i", + "marker-color": "#508916" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.5, + -0.1 + ] + }, + "properties": { + "title": "j", + "marker-symbol": "j", + "marker-color": "#D120E0" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.60000000000000009, + -0.1 + ] + }, + "properties": { + "title": "k", + "marker-symbol": "k", + "marker-color": "#D919EB" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.70000000000000007, + -0.1 + ] + }, + "properties": { + "title": "l", + "marker-symbol": "l", + "marker-color": "#FDED4D" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.8, + -0.1 + ] + }, + "properties": { + "title": "m", + "marker-symbol": "m", + "marker-color": "#085A20" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.9, + -0.1 + ] + }, + "properties": { + "title": "n", + "marker-symbol": "n", + "marker-color": "#B32F65" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 1.0, + -0.1 + ] + }, + "properties": { + "title": "o", + "marker-symbol": "o", + "marker-color": "#86BA8E" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 1.1, + -0.1 + ] + }, + "properties": { + "title": "p", + "marker-symbol": "p", + "marker-color": "#EF1BD8" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 1.2000000000000002, + -0.1 + ] + }, + "properties": { + "title": "q", + "marker-symbol": "q", + "marker-color": "#B007E2" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 1.3, + -0.1 + ] + }, + "properties": { + "title": "r", + "marker-symbol": "r", + "marker-color": "#8BFC18" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 1.4000000000000001, + -0.1 + ] + }, + "properties": { + "title": "s", + "marker-symbol": "s", + "marker-color": "#14C39F" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.0, + -0.2 + ] + }, + "properties": { + "title": "t", + "marker-symbol": "t", + "marker-color": "#2FE765" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.1, + -0.2 + ] + }, + "properties": { + "title": "u", + "marker-symbol": "u", + "marker-color": "#740D40" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.2, + -0.2 + ] + }, + "properties": { + "title": "v", + "marker-symbol": "v", + "marker-color": "#4C1374" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.30000000000000004, + -0.2 + ] + }, + "properties": { + "title": "w", + "marker-symbol": "w", + "marker-color": "#FD1134" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.4, + -0.2 + ] + }, + "properties": { + "title": "x", + "marker-symbol": "x", + "marker-color": "#A487D2" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.5, + -0.2 + ] + }, + "properties": { + "title": "y", + "marker-symbol": "y", + "marker-color": "#C35194" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.60000000000000009, + -0.2 + ] + }, + "properties": { + "title": "z", + "marker-symbol": "z", + "marker-color": "#07C7EB" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.70000000000000007, + -0.2 + ] + }, + "properties": { + "title": "airfield", + "marker-symbol": "airfield", + "marker-color": "#618982" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.8, + -0.2 + ] + }, + "properties": { + "title": "airport", + "marker-symbol": "airport", + "marker-color": "#57D824" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.9, + -0.2 + ] + }, + "properties": { + "title": "alcohol-shop", + "marker-symbol": "alcohol-shop", + "marker-color": "#F51BC8" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 1.0, + -0.2 + ] + }, + "properties": { + "title": "america-football", + "marker-symbol": "america-football", + "marker-color": "#815025" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 1.1, + -0.2 + ] + }, + "properties": { + "title": "art-gallery", + "marker-symbol": "art-gallery", + "marker-color": "#B749F9" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 1.2000000000000002, + -0.2 + ] + }, + "properties": { + "title": "bakery", + "marker-symbol": "bakery", + "marker-color": "#1E7403" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 1.3, + -0.2 + ] + }, + "properties": { + "title": "bank", + "marker-symbol": "bank", + "marker-color": "#4600EA" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 1.4000000000000001, + -0.2 + ] + }, + "properties": { + "title": "bar", + "marker-symbol": "bar", + "marker-color": "#E83792" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.0, + -0.30000000000000004 + ] + }, + "properties": { + "title": "baseball", + "marker-symbol": "baseball", + "marker-color": "#CB75C2" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.1, + -0.30000000000000004 + ] + }, + "properties": { + "title": "basketball", + "marker-symbol": "basketball", + "marker-color": "#565023" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.2, + -0.30000000000000004 + ] + }, + "properties": { + "title": "beer", + "marker-symbol": "beer", + "marker-color": "#750BA2" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.30000000000000004, + -0.30000000000000004 + ] + }, + "properties": { + "title": "bicycle", + "marker-symbol": "bicycle", + "marker-color": "#259653" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.4, + -0.30000000000000004 + ] + }, + "properties": { + "title": "building", + "marker-symbol": "building", + "marker-color": "#38A815" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.5, + -0.30000000000000004 + ] + }, + "properties": { + "title": "bus", + "marker-symbol": "bus", + "marker-color": "#68FA8F" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.60000000000000009, + -0.30000000000000004 + ] + }, + "properties": { + "title": "cafe", + "marker-symbol": "cafe", + "marker-color": "#B7FE7B" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.70000000000000007, + -0.30000000000000004 + ] + }, + "properties": { + "title": "camera", + "marker-symbol": "camera", + "marker-color": "#9EAD32" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.8, + -0.30000000000000004 + ] + }, + "properties": { + "title": "campsite", + "marker-symbol": "campsite", + "marker-color": "#7CEB79" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.9, + -0.30000000000000004 + ] + }, + "properties": { + "title": "car", + "marker-symbol": "car", + "marker-color": "#31E5D8" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 1.0, + -0.30000000000000004 + ] + }, + "properties": { + "title": "cemetery", + "marker-symbol": "cemetery", + "marker-color": "#E0D128" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 1.1, + -0.30000000000000004 + ] + }, + "properties": { + "title": "cesium", + "marker-symbol": "cesium", + "marker-color": "#D34EEF" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 1.2000000000000002, + -0.30000000000000004 + ] + }, + "properties": { + "title": "chemist", + "marker-symbol": "chemist", + "marker-color": "#BC4302" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 1.3, + -0.30000000000000004 + ] + }, + "properties": { + "title": "cinema", + "marker-symbol": "cinema", + "marker-color": "#DBB441" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 1.4000000000000001, + -0.30000000000000004 + ] + }, + "properties": { + "title": "circle-stroked", + "marker-symbol": "circle-stroked", + "marker-color": "#AE0407" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.0, + -0.4 + ] + }, + "properties": { + "title": "circle", + "marker-symbol": "circle", + "marker-color": "#9FF73A" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.1, + -0.4 + ] + }, + "properties": { + "title": "city", + "marker-symbol": "city", + "marker-color": "#37E981" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.2, + -0.4 + ] + }, + "properties": { + "title": "clothing-store", + "marker-symbol": "clothing-store", + "marker-color": "#E53679" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.30000000000000004, + -0.4 + ] + }, + "properties": { + "title": "college", + "marker-symbol": "college", + "marker-color": "#E57D14" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.4, + -0.4 + ] + }, + "properties": { + "title": "commercial", + "marker-symbol": "commercial", + "marker-color": "#162A19" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.5, + -0.4 + ] + }, + "properties": { + "title": "cricket", + "marker-symbol": "cricket", + "marker-color": "#D6AD1E" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.60000000000000009, + -0.4 + ] + }, + "properties": { + "title": "cross", + "marker-symbol": "cross", + "marker-color": "#2B8E7B" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.70000000000000007, + -0.4 + ] + }, + "properties": { + "title": "dam", + "marker-symbol": "dam", + "marker-color": "#A4E4BD" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.8, + -0.4 + ] + }, + "properties": { + "title": "danger", + "marker-symbol": "danger", + "marker-color": "#D3AA1B" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.9, + -0.4 + ] + }, + "properties": { + "title": "disability", + "marker-symbol": "disability", + "marker-color": "#381CAE" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 1.0, + -0.4 + ] + }, + "properties": { + "title": "dog-park", + "marker-symbol": "dog-park", + "marker-color": "#FFFE35" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 1.1, + -0.4 + ] + }, + "properties": { + "title": "embassy", + "marker-symbol": "embassy", + "marker-color": "#7B3AC7" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 1.2000000000000002, + -0.4 + ] + }, + "properties": { + "title": "emergency-telephone", + "marker-symbol": "emergency-telephone", + "marker-color": "#A6F6EC" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 1.3, + -0.4 + ] + }, + "properties": { + "title": "entrance", + "marker-symbol": "entrance", + "marker-color": "#B83FF6" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 1.4000000000000001, + -0.4 + ] + }, + "properties": { + "title": "farm", + "marker-symbol": "farm", + "marker-color": "#CF38F0" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.0, + -0.5 + ] + }, + "properties": { + "title": "fast-food", + "marker-symbol": "fast-food", + "marker-color": "#19D6E6" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.1, + -0.5 + ] + }, + "properties": { + "title": "ferry", + "marker-symbol": "ferry", + "marker-color": "#BAA5E8" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.2, + -0.5 + ] + }, + "properties": { + "title": "fire-station", + "marker-symbol": "fire-station", + "marker-color": "#B7EC62" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.30000000000000004, + -0.5 + ] + }, + "properties": { + "title": "fuel", + "marker-symbol": "fuel", + "marker-color": "#20228D" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.4, + -0.5 + ] + }, + "properties": { + "title": "garden", + "marker-symbol": "garden", + "marker-color": "#E7B9A3" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.5, + -0.5 + ] + }, + "properties": { + "title": "gift", + "marker-symbol": "gift", + "marker-color": "#306A6A" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.60000000000000009, + -0.5 + ] + }, + "properties": { + "title": "golf", + "marker-symbol": "golf", + "marker-color": "#7A1036" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.70000000000000007, + -0.5 + ] + }, + "properties": { + "title": "grocery", + "marker-symbol": "grocery", + "marker-color": "#8A718E" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.8, + -0.5 + ] + }, + "properties": { + "title": "hairdresser", + "marker-symbol": "hairdresser", + "marker-color": "#535403" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.9, + -0.5 + ] + }, + "properties": { + "title": "harbor", + "marker-symbol": "harbor", + "marker-color": "#ABC90F" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 1.0, + -0.5 + ] + }, + "properties": { + "title": "heart", + "marker-symbol": "heart", + "marker-color": "#77E8EA" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 1.1, + -0.5 + ] + }, + "properties": { + "title": "heliport", + "marker-symbol": "heliport", + "marker-color": "#D5600D" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 1.2000000000000002, + -0.5 + ] + }, + "properties": { + "title": "hospital", + "marker-symbol": "hospital", + "marker-color": "#CF27FB" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 1.3, + -0.5 + ] + }, + "properties": { + "title": "ice-cream", + "marker-symbol": "ice-cream", + "marker-color": "#CB2B5B" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 1.4000000000000001, + -0.5 + ] + }, + "properties": { + "title": "industrial", + "marker-symbol": "industrial", + "marker-color": "#C3B6AA" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.0, + -0.60000000000000009 + ] + }, + "properties": { + "title": "land-use", + "marker-symbol": "land-use", + "marker-color": "#F002A5" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.1, + -0.60000000000000009 + ] + }, + "properties": { + "title": "laundry", + "marker-symbol": "laundry", + "marker-color": "#4B84E9" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.2, + -0.60000000000000009 + ] + }, + "properties": { + "title": "library", + "marker-symbol": "library", + "marker-color": "#85D541" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.30000000000000004, + -0.60000000000000009 + ] + }, + "properties": { + "title": "lighthouse", + "marker-symbol": "lighthouse", + "marker-color": "#A9D41C" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.4, + -0.60000000000000009 + ] + }, + "properties": { + "title": "lodging", + "marker-symbol": "lodging", + "marker-color": "#55248D" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.5, + -0.60000000000000009 + ] + }, + "properties": { + "title": "logging", + "marker-symbol": "logging", + "marker-color": "#4966A4" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.60000000000000009, + -0.60000000000000009 + ] + }, + "properties": { + "title": "london-underground", + "marker-symbol": "london-underground", + "marker-color": "#D21380" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.70000000000000007, + -0.60000000000000009 + ] + }, + "properties": { + "title": "marker-stroked", + "marker-symbol": "marker-stroked", + "marker-color": "#38F6EF" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.8, + -0.60000000000000009 + ] + }, + "properties": { + "title": "marker", + "marker-symbol": "marker", + "marker-color": "#2FD6D1" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.9, + -0.60000000000000009 + ] + }, + "properties": { + "title": "minefield", + "marker-symbol": "minefield", + "marker-color": "#118A73" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 1.0, + -0.60000000000000009 + ] + }, + "properties": { + "title": "mobilephone", + "marker-symbol": "mobilephone", + "marker-color": "#9FE746" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 1.1, + -0.60000000000000009 + ] + }, + "properties": { + "title": "monument", + "marker-symbol": "monument", + "marker-color": "#B16B66" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 1.2000000000000002, + -0.60000000000000009 + ] + }, + "properties": { + "title": "museum", + "marker-symbol": "museum", + "marker-color": "#A16186" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 1.3, + -0.60000000000000009 + ] + }, + "properties": { + "title": "music", + "marker-symbol": "music", + "marker-color": "#ED79A4" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 1.4000000000000001, + -0.60000000000000009 + ] + }, + "properties": { + "title": "oil-well", + "marker-symbol": "oil-well", + "marker-color": "#38A9DF" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.0, + -0.70000000000000007 + ] + }, + "properties": { + "title": "park", + "marker-symbol": "park", + "marker-color": "#EDBFC8" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.1, + -0.70000000000000007 + ] + }, + "properties": { + "title": "park2", + "marker-symbol": "park2", + "marker-color": "#11078F" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.2, + -0.70000000000000007 + ] + }, + "properties": { + "title": "parking-garage", + "marker-symbol": "parking-garage", + "marker-color": "#E66D3C" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.30000000000000004, + -0.70000000000000007 + ] + }, + "properties": { + "title": "parking", + "marker-symbol": "parking", + "marker-color": "#ADB288" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.4, + -0.70000000000000007 + ] + }, + "properties": { + "title": "pharmacy", + "marker-symbol": "pharmacy", + "marker-color": "#180EF1" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.5, + -0.70000000000000007 + ] + }, + "properties": { + "title": "pitch", + "marker-symbol": "pitch", + "marker-color": "#262B3F" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.60000000000000009, + -0.70000000000000007 + ] + }, + "properties": { + "title": "place-of-worship", + "marker-symbol": "place-of-worship", + "marker-color": "#1B628C" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.70000000000000007, + -0.70000000000000007 + ] + }, + "properties": { + "title": "playground", + "marker-symbol": "playground", + "marker-color": "#9C2074" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.8, + -0.70000000000000007 + ] + }, + "properties": { + "title": "police", + "marker-symbol": "police", + "marker-color": "#F3FA9D" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.9, + -0.70000000000000007 + ] + }, + "properties": { + "title": "polling-place", + "marker-symbol": "polling-place", + "marker-color": "#7D999D" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 1.0, + -0.70000000000000007 + ] + }, + "properties": { + "title": "post", + "marker-symbol": "post", + "marker-color": "#25E703" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 1.1, + -0.70000000000000007 + ] + }, + "properties": { + "title": "prison", + "marker-symbol": "prison", + "marker-color": "#AD77F3" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 1.2000000000000002, + -0.70000000000000007 + ] + }, + "properties": { + "title": "rail-above", + "marker-symbol": "rail-above", + "marker-color": "#91E275" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 1.3, + -0.70000000000000007 + ] + }, + "properties": { + "title": "rail-light", + "marker-symbol": "rail-light", + "marker-color": "#39B405" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 1.4000000000000001, + -0.70000000000000007 + ] + }, + "properties": { + "title": "rail-metro", + "marker-symbol": "rail-metro", + "marker-color": "#9E412F" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.0, + -0.8 + ] + }, + "properties": { + "title": "rail-underground", + "marker-symbol": "rail-underground", + "marker-color": "#014D11" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.1, + -0.8 + ] + }, + "properties": { + "title": "rail", + "marker-symbol": "rail", + "marker-color": "#5C667F" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.2, + -0.8 + ] + }, + "properties": { + "title": "religious-christian", + "marker-symbol": "religious-christian", + "marker-color": "#D9B961" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.30000000000000004, + -0.8 + ] + }, + "properties": { + "title": "religious-jewish", + "marker-symbol": "religious-jewish", + "marker-color": "#0FF371" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.4, + -0.8 + ] + }, + "properties": { + "title": "religious-muslim", + "marker-symbol": "religious-muslim", + "marker-color": "#481A08" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.5, + -0.8 + ] + }, + "properties": { + "title": "restaurant", + "marker-symbol": "restaurant", + "marker-color": "#B4794C" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.60000000000000009, + -0.8 + ] + }, + "properties": { + "title": "roadblock", + "marker-symbol": "roadblock", + "marker-color": "#F56585" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.70000000000000007, + -0.8 + ] + }, + "properties": { + "title": "rocket", + "marker-symbol": "rocket", + "marker-color": "#FD22CF" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.8, + -0.8 + ] + }, + "properties": { + "title": "school", + "marker-symbol": "school", + "marker-color": "#631B68" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.9, + -0.8 + ] + }, + "properties": { + "title": "scooter", + "marker-symbol": "scooter", + "marker-color": "#85D24C" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 1.0, + -0.8 + ] + }, + "properties": { + "title": "shop", + "marker-symbol": "shop", + "marker-color": "#47C366" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 1.1, + -0.8 + ] + }, + "properties": { + "title": "skiing", + "marker-symbol": "skiing", + "marker-color": "#81AEF9" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 1.2000000000000002, + -0.8 + ] + }, + "properties": { + "title": "slaughterhouse", + "marker-symbol": "slaughterhouse", + "marker-color": "#881591" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 1.3, + -0.8 + ] + }, + "properties": { + "title": "soccer", + "marker-symbol": "soccer", + "marker-color": "#0E981A" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 1.4000000000000001, + -0.8 + ] + }, + "properties": { + "title": "square-stroked", + "marker-symbol": "square-stroked", + "marker-color": "#47D25C" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.0, + -0.9 + ] + }, + "properties": { + "title": "square", + "marker-symbol": "square", + "marker-color": "#7EFF04" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.1, + -0.9 + ] + }, + "properties": { + "title": "star-stroked", + "marker-symbol": "star-stroked", + "marker-color": "#D8AEAF" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.2, + -0.9 + ] + }, + "properties": { + "title": "star", + "marker-symbol": "star", + "marker-color": "#9CF7E9" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.30000000000000004, + -0.9 + ] + }, + "properties": { + "title": "suitcase", + "marker-symbol": "suitcase", + "marker-color": "#1AAA24" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.4, + -0.9 + ] + }, + "properties": { + "title": "swimming", + "marker-symbol": "swimming", + "marker-color": "#BE0946" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.5, + -0.9 + ] + }, + "properties": { + "title": "telephone", + "marker-symbol": "telephone", + "marker-color": "#66E15A" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.60000000000000009, + -0.9 + ] + }, + "properties": { + "title": "tennis", + "marker-symbol": "tennis", + "marker-color": "#EEF2D1" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.70000000000000007, + -0.9 + ] + }, + "properties": { + "title": "theatre", + "marker-symbol": "theatre", + "marker-color": "#217572" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.8, + -0.9 + ] + }, + "properties": { + "title": "toilets", + "marker-symbol": "toilets", + "marker-color": "#B31C69" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.9, + -0.9 + ] + }, + "properties": { + "title": "town-hall", + "marker-symbol": "town-hall", + "marker-color": "#9D8B6A" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 1.0, + -0.9 + ] + }, + "properties": { + "title": "town", + "marker-symbol": "town", + "marker-color": "#D4A019" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 1.1, + -0.9 + ] + }, + "properties": { + "title": "triangle-stroked", + "marker-symbol": "triangle-stroked", + "marker-color": "#AF6474" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 1.2000000000000002, + -0.9 + ] + }, + "properties": { + "title": "triangle", + "marker-symbol": "triangle", + "marker-color": "#91DAA4" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 1.3, + -0.9 + ] + }, + "properties": { + "title": "village", + "marker-symbol": "village", + "marker-color": "#2C3A7F" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 1.4000000000000001, + -0.9 + ] + }, + "properties": { + "title": "warehouse", + "marker-symbol": "warehouse", + "marker-color": "#2F3D8A" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.0, + -1.0 + ] + }, + "properties": { + "title": "waste-basket", + "marker-symbol": "waste-basket", + "marker-color": "#9BEEB0" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.1, + -1.0 + ] + }, + "properties": { + "title": "water", + "marker-symbol": "water", + "marker-color": "#40310A" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.2, + -1.0 + ] + }, + "properties": { + "title": "wetland", + "marker-symbol": "wetland", + "marker-color": "#FF42EA" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 0.30000000000000004, + -1.0 + ] + }, + "properties": { + "title": "zoo", + "marker-symbol": "zoo", + "marker-color": "#9195A1" + } + } + ] +} \ No newline at end of file diff --git a/Apps/Examples/scripts/list.js b/Apps/Examples/scripts/list.js index 71c7c0c2..fdf6c7d6 100644 --- a/Apps/Examples/scripts/list.js +++ b/Apps/Examples/scripts/list.js @@ -527,5 +527,14 @@ vueApp.examples = [ "url": "./startup-tileset.html" } ] + }, + { + "title": "内部测试", + "list": [ + { + "title": "多选-框选&任意选择", + "url": "./test-polygonPicking.html" + } + ] } ] \ No newline at end of file diff --git a/Apps/Examples/test-polygonPicking.html b/Apps/Examples/test-polygonPicking.html new file mode 100644 index 00000000..db8694e4 --- /dev/null +++ b/Apps/Examples/test-polygonPicking.html @@ -0,0 +1,144 @@ + + + + + + + + + 多选-框选&任意选择 + + + + + + +
    +
    + + + + \ No newline at end of file From fdefc8afbb803baacabc28a2340228b54c609153 Mon Sep 17 00:00:00 2001 From: vtxf Date: Wed, 13 Nov 2019 13:54:09 +0800 Subject: [PATCH 08/82] xbsjEarthRotatingSpeed --- Apps/Examples/scripts/list.js | 4 ++ Apps/Examples/test-earthRotating.html | 67 +++++++++++++++++++++++++++ 2 files changed, 71 insertions(+) create mode 100644 Apps/Examples/test-earthRotating.html diff --git a/Apps/Examples/scripts/list.js b/Apps/Examples/scripts/list.js index fdf6c7d6..bdd9c46c 100644 --- a/Apps/Examples/scripts/list.js +++ b/Apps/Examples/scripts/list.js @@ -531,6 +531,10 @@ vueApp.examples = [ { "title": "内部测试", "list": [ + { + "title": "环绕地球", + "url": "./test-earthRotating.html" + }, { "title": "多选-框选&任意选择", "url": "./test-polygonPicking.html" diff --git a/Apps/Examples/test-earthRotating.html b/Apps/Examples/test-earthRotating.html new file mode 100644 index 00000000..2528e823 --- /dev/null +++ b/Apps/Examples/test-earthRotating.html @@ -0,0 +1,67 @@ + + + + + + + + + 环绕地球 + + + + + + +
    +
    + + + + \ No newline at end of file From 12dd1b73827b22998c405d3207a9bf17b49c9548 Mon Sep 17 00:00:00 2001 From: vtxf Date: Wed, 13 Nov 2019 18:16:12 +0800 Subject: [PATCH 09/82] =?UTF-8?q?=E9=98=B2=E6=AD=A2=E6=BA=A2=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Apps/Examples/earth-digitalCity.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Apps/Examples/earth-digitalCity.html b/Apps/Examples/earth-digitalCity.html index d8670986..17827f4b 100644 --- a/Apps/Examples/earth-digitalCity.html +++ b/Apps/Examples/earth-digitalCity.html @@ -21,7 +21,7 @@ -
    +
    diff --git a/Apps/Examples/earth-heatMap-editing.html b/Apps/Examples/earth-groundImage-editing.html similarity index 99% rename from Apps/Examples/earth-heatMap-editing.html rename to Apps/Examples/earth-groundImage-editing.html index 8d0325cb..d37356a0 100644 --- a/Apps/Examples/earth-heatMap-editing.html +++ b/Apps/Examples/earth-groundImage-editing.html @@ -7,7 +7,7 @@ - 热力图-编辑 + 贴地图像-编辑 diff --git a/Apps/Examples/earth-heatMap-play.html b/Apps/Examples/earth-groundImage-play.html similarity index 99% rename from Apps/Examples/earth-heatMap-play.html rename to Apps/Examples/earth-groundImage-play.html index a6c80822..0c04f36e 100644 --- a/Apps/Examples/earth-heatMap-play.html +++ b/Apps/Examples/earth-groundImage-play.html @@ -7,7 +7,7 @@ - 热力图-播放 + 贴地图像-播放 diff --git a/Apps/Examples/scripts/list.js b/Apps/Examples/scripts/list.js index bdd9c46c..5a99d164 100644 --- a/Apps/Examples/scripts/list.js +++ b/Apps/Examples/scripts/list.js @@ -124,16 +124,16 @@ vueApp.examples = [ "url": "./earth-forceSunPos.html" }, { - "title": "热力图-currentTime", - "url": "./earth-heatMap-currentTime.html" + "title": "贴地图像-currentTime", + "url": "./earth-groundImage-currentTime.html" }, { - "title": "热力图-编辑", - "url": "./earth-heatMap-editing.html" + "title": "贴地图像-编辑", + "url": "./earth-groundImage-editing.html" }, { - "title": "热力图-播放", - "url": "./earth-heatMap-play.html" + "title": "贴地图像-播放", + "url": "./earth-groundImage-play.html" }, { "title": "影像-百度", From 179eace8a22d707d2250d8ad62e8c80c6c820175 Mon Sep 17 00:00:00 2001 From: vtxf Date: Wed, 13 Nov 2019 21:14:07 +0800 Subject: [PATCH 12/82] heatmap->groundImage --- .../earth-groundImage-currentTime.html | 10 +++++----- Apps/Examples/earth-groundImage-editing.html | 16 +++++++-------- Apps/Examples/earth-groundImage-play.html | 20 +++++++++---------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Apps/Examples/earth-groundImage-currentTime.html b/Apps/Examples/earth-groundImage-currentTime.html index 03d618fb..1600563a 100644 --- a/Apps/Examples/earth-groundImage-currentTime.html +++ b/Apps/Examples/earth-groundImage-currentTime.html @@ -87,7 +87,7 @@ }, "ref": 'tileset' }, { - "ref": 'heatMap1', + "ref": 'groundImage1', "czmObject": { "xbsjType": "GroundImage", "position": [ @@ -102,7 +102,7 @@ }; var tileset = earth.sceneTree.$refs.tileset.czmObject; - var heatMap1 = earth.sceneTree.$refs.heatMap1.czmObject; + var groundImage1 = earth.sceneTree.$refs.groundImage1.czmObject; // 设置相机位置 // earth.camera.position.toString()和earth.camera.toAllJSONStr()这两个方法可获取相机位置 @@ -110,16 +110,16 @@ earth.camera.rotation = [0.01840316159516142, -0.9757898491558104, 0.00010288720237294768]; // 设置初始值 - heatMap1.imageUrls = ["./images/baidu.png", "./images/logo.png", "./images/sougou.jpg"]; + groundImage1.imageUrls = ["./images/baidu.png", "./images/logo.png", "./images/sougou.jpg"]; // 1.1.5 数据绑定 - this._currentTimeUnbind = XE.MVVM.bind(this, 'currentTime', heatMap1, 'currentTime'); + this._currentTimeUnbind = XE.MVVM.bind(this, 'currentTime', groundImage1, 'currentTime'); this._earth = earth; // only for Debug window.tileset = tileset; - window.heatMap1 = heatMap1; + window.groundImage1 = groundImage1; window.earth = earth; }, filters: { diff --git a/Apps/Examples/earth-groundImage-editing.html b/Apps/Examples/earth-groundImage-editing.html index d37356a0..d3f7bd8a 100644 --- a/Apps/Examples/earth-groundImage-editing.html +++ b/Apps/Examples/earth-groundImage-editing.html @@ -123,7 +123,7 @@ }, "ref": 'tileset' }, { - "ref": 'heatMap1', + "ref": 'groundImage1', "czmObject": { "xbsjType": "GroundImage", "position": [ @@ -137,7 +137,7 @@ }; var tileset = earth.sceneTree.$refs.tileset.czmObject; - var heatMap1 = earth.sceneTree.$refs.heatMap1.czmObject; + var groundImage1 = earth.sceneTree.$refs.groundImage1.czmObject; // 设置相机位置 // earth.camera.position.toString()和earth.camera.toAllJSONStr()这两个方法可获取相机位置 @@ -145,17 +145,17 @@ earth.camera.rotation = [0.03593315314102252, -0.7634808012756493, 0.00015558788214686814]; // 1.1.5 数据绑定 - this._creatingUnbind = XE.MVVM.bind(this, 'creating', heatMap1, 'creating'); - this._editingUnbind = XE.MVVM.bind(this, 'editing', heatMap1, 'editing'); - this._showUnbind = XE.MVVM.bind(this, 'show', heatMap1, 'show'); - this._widthUnbind = XE.MVVM.bind(this, 'width', heatMap1, 'width'); - this._heightUnbind = XE.MVVM.bind(this, 'height', heatMap1, 'height'); + this._creatingUnbind = XE.MVVM.bind(this, 'creating', groundImage1, 'creating'); + this._editingUnbind = XE.MVVM.bind(this, 'editing', groundImage1, 'editing'); + this._showUnbind = XE.MVVM.bind(this, 'show', groundImage1, 'show'); + this._widthUnbind = XE.MVVM.bind(this, 'width', groundImage1, 'width'); + this._heightUnbind = XE.MVVM.bind(this, 'height', groundImage1, 'height'); this._earth = earth; // only for Debug window.tileset = tileset; - window.heatMap1 = heatMap1; + window.groundImage1 = groundImage1; window.earth = earth; }, // 1.2 资源销毁 diff --git a/Apps/Examples/earth-groundImage-play.html b/Apps/Examples/earth-groundImage-play.html index 0c04f36e..b39f9414 100644 --- a/Apps/Examples/earth-groundImage-play.html +++ b/Apps/Examples/earth-groundImage-play.html @@ -242,7 +242,7 @@ }, "ref": 'tileset' }, { - "ref": 'heatMap1', + "ref": 'groundImage1', "czmObject": { "xbsjType": "GroundImage", "position": [ @@ -257,7 +257,7 @@ }; var tileset = earth.sceneTree.$refs.tileset.czmObject; - var heatMap1 = earth.sceneTree.$refs.heatMap1.czmObject; + var groundImage1 = earth.sceneTree.$refs.groundImage1.czmObject; // 设置相机位置 // earth.camera.position.toString()和earth.camera.toAllJSONStr()这两个方法可获取相机位置 @@ -266,26 +266,26 @@ // 设置初始值 this.labelarr = ["./images/baidu.png", "./images/logo.png", "./images/sougou.jpg"]; - heatMap1.imageUrls = ["./images/baidu.png", "./images/logo.png", "./images/sougou.jpg"]; + groundImage1.imageUrls = ["./images/baidu.png", "./images/logo.png", "./images/sougou.jpg"]; // 1.1.5 数据绑定 - this._playingUnbind = XE.MVVM.bind(this, 'playing', heatMap1, 'playing'); - this._loopPlayUnbind = XE.MVVM.bind(this, 'loopPlay', heatMap1, 'loopPlay'); - this._timeDurationUnbind = XE.MVVM.bind(this, 'timeDuration', heatMap1, 'timeDuration'); - this._currentTimeUnbind = XE.MVVM.bind(this, 'currentTime', heatMap1, 'currentTime'); + this._playingUnbind = XE.MVVM.bind(this, 'playing', groundImage1, 'playing'); + this._loopPlayUnbind = XE.MVVM.bind(this, 'loopPlay', groundImage1, 'loopPlay'); + this._timeDurationUnbind = XE.MVVM.bind(this, 'timeDuration', groundImage1, 'timeDuration'); + this._currentTimeUnbind = XE.MVVM.bind(this, 'currentTime', groundImage1, 'currentTime'); this._earth = earth; // only for Debug window.tileset = tileset; - window.heatMap1 = heatMap1; + window.groundImage1 = groundImage1; window.earth = earth; }, methods: { // 移除标签 removeitem(index, item) { this.labelarr.splice(index, 1); - heatMap1.imageUrls = this.labelarr; + groundImage1.imageUrls = this.labelarr; }, // input回车加入labelarr中 addlabel() { @@ -301,7 +301,7 @@ } } } - heatMap1.imageUrls = this.imageUrls; + groundImage1.imageUrls = this.imageUrls; } }, // 1.2 资源销毁 From 3d182e977a68183adc4415b77735fda49b46b2aa Mon Sep 17 00:00:00 2001 From: caiying <2841902102@qq.com> Date: Thu, 14 Nov 2019 12:03:08 +0800 Subject: [PATCH 13/82] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=96=E7=BD=AE?= =?UTF-8?q?=E5=9B=BE=E6=A0=87=E6=89=93=E5=BC=80=E7=9C=8B=E4=B8=8D=E8=A7=81?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=E5=B9=B6=E5=A2=9E=E5=8A=A0=E4=BA=86?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGLES.md | 4 ++++ Source/components/viztools/PinPictureTool/index.vue | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGLES.md b/CHANGLES.md index 501f3a30..9617c533 100644 --- a/CHANGLES.md +++ b/CHANGLES.md @@ -3,8 +3,12 @@ Change Log ### 1.2.8 +##### Additions :tada: +* EarthUI和EarthSDK增加了pin里面的extText相关属性 + ##### Fixes :wrench: * 修复强制光照经度、纬度不对的问题 +* 修复外置图标打开看不见的问题 ### 1.2.7 - 2019-11-9 diff --git a/Source/components/viztools/PinPictureTool/index.vue b/Source/components/viztools/PinPictureTool/index.vue index be3ff8ee..03b29ef8 100644 --- a/Source/components/viztools/PinPictureTool/index.vue +++ b/Source/components/viztools/PinPictureTool/index.vue @@ -206,8 +206,7 @@ export default { this.makiIconObj = XE.Obj.Pin.MakiIcon; this.makiIconObj.null = ""; if (this._czmObj.isCreating) { - this.pin.imageUrl = - "http://localhost:9530/Apps/Examples/images/earth.png"; + this.pin.imageUrl = "../../Examples/images/earth.png"; } this._czmObj.far = 1073741824; From b2e4b794edd6abe5a9f8feb1e28c1b379caa8518 Mon Sep 17 00:00:00 2001 From: caiying <2841902102@qq.com> Date: Thu, 14 Nov 2019 15:13:50 +0800 Subject: [PATCH 14/82] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E6=8A=98?= =?UTF-8?q?=E7=BA=BF=E7=9B=B8=E5=85=B3=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controls/MainBarControl/Entity/index.vue | 16 +++---- .../components/tools/EntityMoreTool/index.vue | 43 +++++++++++++++++++ .../components/tools/EntityMoreTool/locale.js | 8 ++++ 3 files changed, 59 insertions(+), 8 deletions(-) diff --git a/Source/components/controls/MainBarControl/Entity/index.vue b/Source/components/controls/MainBarControl/Entity/index.vue index 6f6aa5cb..f0968f2e 100644 --- a/Source/components/controls/MainBarControl/Entity/index.vue +++ b/Source/components/controls/MainBarControl/Entity/index.vue @@ -350,14 +350,14 @@ export default { this.$root.$earthUI.showPropertyWindow(PinPictureTool); }, // 打开polyLine折线 - polylinebtn() { - var Polyline = new XE.Obj.Polyline(this.$root.$earth); - Polyline.name = "折线"; - Polyline.positionPicking = true; - Polyline.isCreating = true; - Polyline.creating = true; - this.$root.$earthUI.showPropertyWindow(Polyline); - }, + // polylinebtn() { + // var Polyline = new XE.Obj.Polyline(this.$root.$earth); + // Polyline.name = "折线"; + // Polyline.positionPicking = true; + // Polyline.isCreating = true; + // Polyline.creating = true; + // this.$root.$earthUI.showPropertyWindow(Polyline); + // }, //打开扫描线-动画 scanLineBtn() { var Scanline = new XE.Obj.Scanline(this.$root.$earth); diff --git a/Source/components/tools/EntityMoreTool/index.vue b/Source/components/tools/EntityMoreTool/index.vue index 5e4b6ca7..aaebaddf 100644 --- a/Source/components/tools/EntityMoreTool/index.vue +++ b/Source/components/tools/EntityMoreTool/index.vue @@ -27,6 +27,10 @@
    • {{lang.path}}
    • {{lang.polyline}}
      • +
    • {{lang.solidline}}
      • +
    • {{lang.dotline}}
      • +
    • {{lang.arrowline}}
      • +
    • {{lang.odline}}
    • {{lang.curvearrow}}
    • {{lang.polylinearrow}}
    • {{lang.sectorsearch}}
      • @@ -166,6 +170,45 @@ export default { Polyline.name = "折线"; this.$root.$earthUI.showPropertyWindow(Polyline); }, + // 实线 + SolidLine() { + var Polyline = new XE.Obj.Polyline(this.$root.$earth); + Polyline.name = "实线"; + Polyline.positionPicking = true; + Polyline.isCreating = true; + Polyline.creating = true; + this.$root.$earthUI.showPropertyWindow(Polyline); + }, + // 虚线 + DotLine() { + var Polyline = new XE.Obj.Polyline(this.$root.$earth); + Polyline.name = "虚线"; + Polyline.material.type = "XbsjPolylineDashMaterial"; + Polyline.positionPicking = true; + Polyline.isCreating = true; + Polyline.creating = true; + this.$root.$earthUI.showPropertyWindow(Polyline); + }, + // 箭头线 + ArrowLine() { + var Polyline = new XE.Obj.Polyline(this.$root.$earth); + Polyline.name = "箭头线"; + Polyline.material.type = "XbsjPolylineArrowMaterial"; + Polyline.positionPicking = true; + Polyline.isCreating = true; + Polyline.creating = true; + this.$root.$earthUI.showPropertyWindow(Polyline); + }, + // OD线 + ODLine() { + var Polyline = new XE.Obj.Polyline(this.$root.$earth); + Polyline.name = "OD线"; + Polyline.material.type = "XbsjODLineMaterial"; + Polyline.positionPicking = true; + Polyline.isCreating = true; + Polyline.creating = true; + this.$root.$earthUI.showPropertyWindow(Polyline); + }, // 曲线箭头 CurveArrow() { var GeoCurveArrow = new XE.Obj.Plots.GeoCurveArrow(this.$root.$earth); diff --git a/Source/components/tools/EntityMoreTool/locale.js b/Source/components/tools/EntityMoreTool/locale.js index 3e0424c6..7f9ac33f 100644 --- a/Source/components/tools/EntityMoreTool/locale.js +++ b/Source/components/tools/EntityMoreTool/locale.js @@ -7,6 +7,10 @@ const zh = { pindivbtn: "div图标", path: "路径", polyline: "折线", + solidline: "实线", + dotline: "虚线", + arrowline: "箭头线", + odline: "OD线", curvearrow: "曲线箭头", polylinearrow: "折线箭头", sectorsearch: "扇形搜索", @@ -34,6 +38,10 @@ const en = { pindivbtn: "div icon", path: "path", polyline: "polyline", + solidline: "solidline", + dotline: "dotline", + arrowline: "arrowline", + odline: "ODline", curvearrow: "curvearrow", polylinearrow: "polylinearrow", sectorsearch: "sectorsearch", From 29440be9fcacec59b64e1a2cea9c8536448b7864 Mon Sep 17 00:00:00 2001 From: caiying <2841902102@qq.com> Date: Thu, 14 Nov 2019 15:21:44 +0800 Subject: [PATCH 15/82] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E5=BD=93?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E7=A1=AE=E5=AE=9A=E6=97=B6=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=8F=96=E6=B6=88=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Source/components/viztools/PolylineTool/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/Source/components/viztools/PolylineTool/index.vue b/Source/components/viztools/PolylineTool/index.vue index c728e83b..3b03793e 100644 --- a/Source/components/viztools/PolylineTool/index.vue +++ b/Source/components/viztools/PolylineTool/index.vue @@ -707,6 +707,7 @@ export default { if (!polyLineToolObj) { return; } + polyLineToolObj.editing = false; polyLineToolObj.positionEditing = false; if (polyLineToolObj.isCreating) { polyLineToolObj.isCreating = false; From 4703d7a3768e26fb2cb00f3dd925526d13a9c37e Mon Sep 17 00:00:00 2001 From: lforrrrawx <237895772@qq.com> Date: Fri, 15 Nov 2019 08:59:42 +0800 Subject: [PATCH 16/82] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=91=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=E6=95=B0=E6=8D=AE=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Source/components/MainUIComp.vue | 26 +- .../controls/MainBarControl/Imagery/index.vue | 17 +- .../MainBarControl/Imagery/index_locale.js | 2 + .../MainBarControl/Navigate/index.vue | 3 +- .../controls/MainBarControl/Terrain/index.vue | 46 ++- .../MainBarControl/Terrain/index_locale.js | 2 + .../controls/MainBarControl/Tileset/index.vue | 12 +- .../MainBarControl/Tileset/index_locale.js | 2 + .../controls/MainBarControl/View/index.vue | 9 +- .../MainBarControl/View/index_locale.js | 6 +- .../controls/MainBarControl/index.vue | 10 +- .../tools/ImageryServices/ImageryCloud.vue | 316 ++++++++++++++++ .../tools/ImageryServices/imagery_locale.js | 2 + .../tools/ModelServices/ModelCloud.vue | 340 +++++++++++++++++ .../tools/ModelServices/model_locale.js | 6 + Source/components/tools/SymbolTool/index.vue | 236 ++++++++++++ .../tools/TerrainServices/TerrainCloud.vue | 351 ++++++++++++++++++ .../tools/TerrainServices/terrain_locale.js | 2 + Source/managers/LabServer.js | 145 ++++++-- Source/managers/MainUI.js | 55 ++- Source/managers/controls/MainBar.js | 36 +- Source/managers/tools/ImageryCloud.js | 66 ++++ Source/managers/tools/ModelCloud.js | 49 +++ Source/managers/tools/Symbol.js | 53 +++ Source/managers/tools/TerrainCloud.js | 49 +++ 25 files changed, 1785 insertions(+), 56 deletions(-) create mode 100644 Source/components/tools/ImageryServices/ImageryCloud.vue create mode 100644 Source/components/tools/ModelServices/ModelCloud.vue create mode 100644 Source/components/tools/SymbolTool/index.vue create mode 100644 Source/components/tools/TerrainServices/TerrainCloud.vue create mode 100644 Source/managers/tools/ImageryCloud.js create mode 100644 Source/managers/tools/ModelCloud.js create mode 100644 Source/managers/tools/Symbol.js create mode 100644 Source/managers/tools/TerrainCloud.js diff --git a/Source/components/MainUIComp.vue b/Source/components/MainUIComp.vue index 50d73c7d..bd120efa 100644 --- a/Source/components/MainUIComp.vue +++ b/Source/components/MainUIComp.vue @@ -47,12 +47,15 @@ import ViewportLine from "./controls/ViewportLine"; import SceneTreeTool from "./tools/SceneTreeTool"; import ImageryLab from "./tools/ImageryServices/ImageryLab.vue"; +import ImageryCloud from "./tools/ImageryServices/ImageryCloud.vue"; import ImageryOnline from "./tools/ImageryServices/ImageryOnline.vue"; import ImageryWMTS from "./tools/ImageryServices/ImageryWMTS.vue"; import ModelLab from "./tools/ModelServices/ModelLab.vue"; +import ModelCloud from "./tools/ModelServices/ModelCloud.vue"; import ModelOnline from "./tools/ModelServices/ModelOnline.vue"; import TerrainLab from "./tools/TerrainServices/TerrainLab.vue"; +import TerrainCloud from "./tools/TerrainServices/TerrainCloud.vue"; import TerrainOnline from "./tools/TerrainServices/TerrainOnline.vue"; import CameraViewManager from "./tools/CameraViewManager"; import CutFillComputing from "./tools/CutFillComputing"; @@ -98,6 +101,7 @@ import InformationBox from "./utils/InformationBox"; import ModelTreeTool from "./tools/ModelTreeTool"; import EntityMoreTool from "./tools/EntityMoreTool"; +import SymbolTool from "./tools/SymbolTool" export default { components: { @@ -141,11 +145,14 @@ export default { ViewshedTool, ImageryLab, + ImageryCloud, ImageryOnline, ImageryWMTS, ModelLab, + ModelCloud, ModelOnline, TerrainLab, + TerrainCloud, TerrainOnline, PropertyWindow, CameraViewPrp, @@ -153,7 +160,8 @@ export default { GlobalColorPicker, InformationBox, ModelTreeTool, - EntityMoreTool + EntityMoreTool, + SymbolTool }, data: function() { return { @@ -199,6 +207,10 @@ export default { component: "ImageryLab", ref: "imageryLab" }, + { + component: "ImageryCloud", + ref: "ImageryCloud" + }, { component: "ImageryOnline", ref: "imageryOnline" @@ -211,6 +223,10 @@ export default { component: "ModelLab", ref: "modelLab" }, + { + component: "ModelCloud", + ref: "modelCloud" + }, { component: "ModelOnline", ref: "modelOnline" @@ -219,6 +235,10 @@ export default { component: "TerrainLab", ref: "terrainLab" }, + { + component: "TerrainCloud", + ref: "terrainCloud" + }, { component: "TerrainOnline", ref: "terrainOnline" @@ -242,6 +262,10 @@ export default { { component: "EntityMoreTool", ref: "entitymoreTool" + }, + { + component: "SymbolTool", + ref: "symbolTool" } ], infos: [], diff --git a/Source/components/controls/MainBarControl/Imagery/index.vue b/Source/components/controls/MainBarControl/Imagery/index.vue index 61667c38..5decc9dc 100644 --- a/Source/components/controls/MainBarControl/Imagery/index.vue +++ b/Source/components/controls/MainBarControl/Imagery/index.vue @@ -16,7 +16,7 @@ >
    {{lang.online}} -
    +
    {{lang.localhost}}
    +
    +
    + {{lang.cloud}} +
    +
    import languagejs from "./index_locale"; export default { + props:["labServiceUI","cloudServiceUI"], data() { return { showTip: "never", selectlist: false, lang: {}, imageryLab: false, + imageryCloud: false, imageryOnline: false, imageryWMTS:false, alpha: 1, @@ -187,9 +198,9 @@ export default { //绑定 this.$nextTick(() => { - - //监控树状控件的当前选择节点 + +//监控树状控件的当前选择节点 this.unAutorun = XE.MVVM.watch(() => { const csn = this.$root.$earth.sceneTree.currentSelectedNode; if ( diff --git a/Source/components/controls/MainBarControl/Imagery/index_locale.js b/Source/components/controls/MainBarControl/Imagery/index_locale.js index 67dd6335..8de24d09 100644 --- a/Source/components/controls/MainBarControl/Imagery/index_locale.js +++ b/Source/components/controls/MainBarControl/Imagery/index_locale.js @@ -2,6 +2,7 @@ const zh = { source: "数据源", online: "在线", localhost: "Lab服务", + cloud: "云服务", arcgis: "arcgis", visible: "可视化", transpare: "透明度", @@ -18,6 +19,7 @@ const en = { source: "Services", online: "Online", localhost: "Local", + cloud: "cloud", arcgis: "Arcgis", visible: "Effect", transpare: "Transp", diff --git a/Source/components/controls/MainBarControl/Navigate/index.vue b/Source/components/controls/MainBarControl/Navigate/index.vue index 315335ad..58c9cec3 100644 --- a/Source/components/controls/MainBarControl/Navigate/index.vue +++ b/Source/components/controls/MainBarControl/Navigate/index.vue @@ -8,7 +8,7 @@ @mousemove="onMoving($event)" @mouseup="endMove($event)" > -
    +
    {{lang.scene}}
    @@ -202,6 +202,7 @@ import SceneComp from "./Scene"; import TrackComp from "./Track"; import { addOutterEventListener } from "../../../utils/xbsjUtil"; export default { + props:["labServiceUI"], components: { SearchComp, RotateGlobeComp, diff --git a/Source/components/controls/MainBarControl/Terrain/index.vue b/Source/components/controls/MainBarControl/Terrain/index.vue index 31da6122..5a0f4ae2 100644 --- a/Source/components/controls/MainBarControl/Terrain/index.vue +++ b/Source/components/controls/MainBarControl/Terrain/index.vue @@ -18,7 +18,7 @@ >
    {{lang.online}}
    -
    +
    {{lang.localhost}}
    +
    +
    + {{lang.cloudhost}} +
    {{lang.tocolor}} @@ -189,6 +197,7 @@ import Tailoring from "./Tailoring"; import { addOutterEventListener } from "../../../utils/xbsjUtil"; export default { + props:["labServiceUI","cloudServiceUI"], components: { Elevation, Slope, @@ -196,11 +205,12 @@ export default { Contour, Tailoring }, - data() { + data () { return { showTip: "never", lang: {}, terrainLab: false, + terrainCloud: false, terrainOnline: false, shadeType: "", popup: "", @@ -216,8 +226,8 @@ export default { enableLighting: false }; }, - created() {}, - mounted() { + created () {}, + mounted () { //给所有popup的el上添加外部事件 Object.keys(this.$refs).forEach(key => { addOutterEventListener(this.$refs[key].$el, "mousedown", el => { @@ -317,13 +327,13 @@ export default { }); let tailoringbutton = this.$refs.tailoringbutton; - function handleDragOver(e) { + function handleDragOver (e) { e.stopPropagation(); e.preventDefault(); } var that = this; - function handleFileSelect(e) { + function handleFileSelect (e) { // e.stopPropagation(); e.preventDefault(); let obj = e.dataTransfer.getData("obj"); @@ -335,7 +345,7 @@ export default { arr[j].pop(); } arr = arr.toString().split(","); - arr = arr.map(function(el) { + arr = arr.map(function (el) { return +el; }); @@ -348,11 +358,11 @@ export default { tailoringbutton.addEventListener("drop", handleFileSelect, false); }, methods: { - contoure() { + contoure () { this.$root.$earth.terrainEffect.contour.enabled = !this.$root.$earth .terrainEffect.contour.enabled; }, - elevationRamp() { + elevationRamp () { let te = this.$root.$earth.terrainEffect; if (te.shading && te.shading != te.elevation) { te.shading.enabled = false; @@ -361,7 +371,7 @@ export default { te.elevation.enabled = !te.elevation.enabled; } }, - slopeRamp() { + slopeRamp () { let te = this.$root.$earth.terrainEffect; if (te.shading && te.shading != te.slope) { te.shading.enabled = false; @@ -370,7 +380,7 @@ export default { te.slope.enabled = !te.slope.enabled; } }, - aspectRamp() { + aspectRamp () { let te = this.$root.$earth.terrainEffect; if (te.shading && te.shading != te.aspect) { te.shading.enabled = false; @@ -379,21 +389,21 @@ export default { te.aspect.enabled = !te.aspect.enabled; } }, - getPopupComp() { + getPopupComp () { if (this.$refs.hasOwnProperty(this.popup)) { return this.$refs[this.popup]; } else { return undefined; } }, - showPopup(v) { + showPopup (v) { let comp = this.getPopupComp(); if (comp && typeof comp.show == "function") { comp.show(v); } return comp; }, - togglePopup(p, event) { + togglePopup (p, event) { //调用上一个组件的隐藏 this.showPopup(false); @@ -420,7 +430,7 @@ export default { console.log(ex); } }, - startMove(event) { + startMove (event) { //如果事件的目标不是本el 返回 if (event.target.parentElement !== this.$refs.container) { this.moving = false; @@ -428,7 +438,7 @@ export default { } this.moving = true; }, - onMoving(event) { + onMoving (event) { //获取鼠标和为开始位置的插值，滚动滚动条 if (!this.moving) return; @@ -438,11 +448,11 @@ export default { dom.scrollLeft = wleft; } }, - endMove(envent) { + endMove (envent) { this.moving = false; } }, - beforeDestroy() { + beforeDestroy () { for (let i = 0; i < this.unbind.length; i++) { var ud = this.unbind[i]; ud(); diff --git a/Source/components/controls/MainBarControl/Terrain/index_locale.js b/Source/components/controls/MainBarControl/Terrain/index_locale.js index d3b79a21..86efc927 100644 --- a/Source/components/controls/MainBarControl/Terrain/index_locale.js +++ b/Source/components/controls/MainBarControl/Terrain/index_locale.js @@ -2,6 +2,7 @@ const zh = { source: "数据源", online: "在线", localhost: "Lab服务", + cloudhost: "云服务", select: "选择", faxian: "法线", water: "水面", @@ -30,6 +31,7 @@ const en = { source: "Services", online: "Online", localhost: "Local", + cloudhost: "Cloud", select: "Select", faxian: "Normal", water: "Water", diff --git a/Source/components/controls/MainBarControl/Tileset/index.vue b/Source/components/controls/MainBarControl/Tileset/index.vue index e045ca17..6ca247b2 100644 --- a/Source/components/controls/MainBarControl/Tileset/index.vue +++ b/Source/components/controls/MainBarControl/Tileset/index.vue @@ -18,7 +18,7 @@ >
    {{lang.online}}
    -
    +
    {{lang.localhost}}
    +
    +
    + {{lang.cloudhost}} +
    @@ -226,6 +234,7 @@ import languagejs from "./index_locale"; export default { + props:["labServiceUI","cloudServiceUI"], data() { return { showTip: "never", @@ -245,6 +254,7 @@ export default { xbsjRightTopView: false, xbsjRightBottomView: false, modelLab: false, + modelCloud: false, modelOnline: false, flattings: [], positionEditing: false, diff --git a/Source/components/controls/MainBarControl/Tileset/index_locale.js b/Source/components/controls/MainBarControl/Tileset/index_locale.js index f0a09394..d534feed 100644 --- a/Source/components/controls/MainBarControl/Tileset/index_locale.js +++ b/Source/components/controls/MainBarControl/Tileset/index_locale.js @@ -2,6 +2,7 @@ const zh = { source: "数据源", online: "在线", localhost: "Lab服务", + cloudhost: "云服务", edit: "编辑", fenleimmodel: "分类瓦片", fenleiterrain: "分类地形", @@ -23,6 +24,7 @@ const en = { source: "Services", online: "Online", localhost: "Local", + cloudhost: "Cloud", edit: "Edit", fenleimmodel: "3dtitles", fenleiterrain: "terrain", diff --git a/Source/components/controls/MainBarControl/View/index.vue b/Source/components/controls/MainBarControl/View/index.vue index 5f66d333..8979b6b5 100644 --- a/Source/components/controls/MainBarControl/View/index.vue +++ b/Source/components/controls/MainBarControl/View/index.vue @@ -37,6 +37,12 @@
    {{lang.modelTree}}
    + + +
    +
    + {{lang.symbol}} +
    - + - - - + + + @@ -84,6 +84,8 @@ export default { page: "navigate", //当前显示的页面 lang: {}, visible:false, + labServiceUI: true, + cloudServiceUI: false, langs:languagejs }; }, diff --git a/Source/components/tools/ImageryServices/ImageryCloud.vue b/Source/components/tools/ImageryServices/ImageryCloud.vue new file mode 100644 index 00000000..49f064ff --- /dev/null +++ b/Source/components/tools/ImageryServices/ImageryCloud.vue @@ -0,0 +1,316 @@ + + + + + diff --git a/Source/components/tools/ImageryServices/imagery_locale.js b/Source/components/tools/ImageryServices/imagery_locale.js index 846048ae..044f2caf 100644 --- a/Source/components/tools/ImageryServices/imagery_locale.js +++ b/Source/components/tools/ImageryServices/imagery_locale.js @@ -27,6 +27,7 @@ const zh = { selectinput: "请选择或者输入服务地址", localtitle: "CesiumLab本机服务", + cloudtitle: "云服务", search: "查询", maxzoom: "最大级别", dilifanwei: "地理范围", @@ -52,6 +53,7 @@ const en = { gaodeimage: "gaodeimage", selectinput: "Please select or enter the service address", localtitle: "CesiumLab Local Service", + cloudtitle: "Cloud Service", search: "Search", maxzoom: "MaxZoom", dilifanwei: "Rectangle", diff --git a/Source/components/tools/ModelServices/ModelCloud.vue b/Source/components/tools/ModelServices/ModelCloud.vue new file mode 100644 index 00000000..7fe84100 --- /dev/null +++ b/Source/components/tools/ModelServices/ModelCloud.vue @@ -0,0 +1,340 @@ + + + + + diff --git a/Source/components/tools/ModelServices/model_locale.js b/Source/components/tools/ModelServices/model_locale.js index 2b7b9b42..b0cd8ff2 100644 --- a/Source/components/tools/ModelServices/model_locale.js +++ b/Source/components/tools/ModelServices/model_locale.js @@ -6,6 +6,9 @@ const zh = { bigwild: "大雁塔", selectinput: "请选择或者输入服务地址", localtitle: "CesiumLab本机服务", + cloudtitle: "云服务", + bimlabel: "BIM瓦片", + photolabel: "倾斜瓦片", search: "查询", maxzoom: "最大级别", dilifanwei: "地理范围", @@ -22,6 +25,9 @@ const en = { bigwild: "Big Wild Goose Pagoda", selectinput: "Please select or enter the service address", localtitle: "CesiumLab Local Service", + cloudtitle: "Cloud Service", + bimlabel: "BIM 3DTiles", + photolabel: "Photo 3DTiles", search: "Search", maxzoom: "maxzoom", dilifanwei: "dilifanwei", diff --git a/Source/components/tools/SymbolTool/index.vue b/Source/components/tools/SymbolTool/index.vue new file mode 100644 index 00000000..99b55cbf --- /dev/null +++ b/Source/components/tools/SymbolTool/index.vue @@ -0,0 +1,236 @@ + + + + + diff --git a/Source/components/tools/TerrainServices/TerrainCloud.vue b/Source/components/tools/TerrainServices/TerrainCloud.vue new file mode 100644 index 00000000..ff13bcb9 --- /dev/null +++ b/Source/components/tools/TerrainServices/TerrainCloud.vue @@ -0,0 +1,351 @@ + + + + + diff --git a/Source/components/tools/TerrainServices/terrain_locale.js b/Source/components/tools/TerrainServices/terrain_locale.js index 3a7295a7..2b363297 100644 --- a/Source/components/tools/TerrainServices/terrain_locale.js +++ b/Source/components/tools/TerrainServices/terrain_locale.js @@ -8,6 +8,7 @@ const zh = { mount: "世界12级（测试）", selectinput: "请选择或者输入服务地址", localtitle: "CesiumLab本机服务", + cloudtitle: "云服务", search: "查询", maxzoom: "最大级别", dilifanwei: "地理范围", @@ -26,6 +27,7 @@ const en = { mount: "globe 12 (test)", selectinput: "Please select or enter the service address", localtitle: "CesiumLab Local Service", + cloudtitle: "Cloud Service", search: "Search", maxzoom: "Maxzoom", dilifanwei: "Rectangle", diff --git a/Source/managers/LabServer.js b/Source/managers/LabServer.js index 47d311ba..cc6699e6 100644 --- a/Source/managers/LabServer.js +++ b/Source/managers/LabServer.js @@ -21,22 +21,31 @@ class LabServer { * @memberof LabServer */ server: '//localhost:9000/', - /** - * CesiumLab在线服务服务地址 - * @type {string} - * @default '//lab2.cesiumlab.com/' - * @instance - * @memberof LabServer - */ - serverOnline: '//lab2.cesiumlab.com/', + /** + * CesiumLab在线服务服务地址 + * @type {string} + * @default '//lab2.cesiumlab.com/' + * @instance + * @memberof LabServer + */ + serverOnline: '//lab2.cesiumlab.com/', + + /** + * CesiumLab在线服务服务地址 + * @type {string} + * @default '' + * @instance + * @memberof LabServer + */ + cloudServiceUrl: '', }); } - isDestroyed() { + isDestroyed () { return false; } - destroy() { + destroy () { } /** @@ -44,7 +53,7 @@ class LabServer { * @param {String} key 查询关键字 * @returns {Promise} */ - geocoder(key) { + geocoder (key) { return new Promise((resolve, reject) => { axios @@ -62,7 +71,7 @@ class LabServer { }); } - _layers(type, key, sortfield, sortorder) { + _layers (type, key, sortfield, sortorder) { if (!sortfield) sortfield = 'date'; if (!sortorder) @@ -83,12 +92,57 @@ class LabServer { }); }); } + + cloudlayers (type, page, skip, sortfield, sortorder, minend, maxend) { + if (!sortfield) + sortfield = 'date'; + if (!sortorder) + sortorder = 'desc'; + return new Promise((resolve, reject) => { + axios + .get(this.cloudServiceUrl + "/api/result/datalist?minend=" + (minend ? minend : '') + + "&maxend=" + (maxend ? maxend : '') + "&datatype=" + type) + .then(res => { + if (res.status === 200 && res.data.status === "ok") { + resolve(res.data.result); + } else { + reject(res.data.result); + } + }) + .catch(error => { + reject(error); + }); + }); + } + + cloud3dtiles (type, page, skip, sortfield, sortorder, minend, maxend) { + if (!sortfield) + sortfield = 'date'; + if (!sortorder) + sortorder = 'desc'; + return new Promise((resolve, reject) => { + axios + .get(this.cloudServiceUrl + "/api/3dtiles/" + type + "?st=" + (minend ? minend : '') + + "&et=" + (maxend ? maxend : '') + "&order=" + sortfield) + .then(res => { + if (res.status === 200 && res.data.status === "ok") { + resolve(res.data.result); + } else { + reject(res.data.result); + } + }) + .catch(error => { + reject(error); + }); + }); + } + /** * 查询列出影像服务 * @param {String} key 查询关键字 * @returns {Promise} */ - imageLayers(key) { + imageLayers (key) { return this._layers('image', key); } /** @@ -96,7 +150,7 @@ class LabServer { * @param {String} key 查询关键字 * @returns {Promise} */ - terrainLayers(key) { + terrainLayers (key) { return this._layers('terrain', key); } /** @@ -104,7 +158,7 @@ class LabServer { * @param {String} key 查询关键字 * @returns {Promise} */ - modelLayers(key) { + modelLayers (key) { return this._layers('model', key); } /** @@ -114,7 +168,7 @@ class LabServer { * @param {String} img 缩略图地址 * @returns {Promise} */ - updateLayerThumbnail(type, id, img) { + updateLayerThumbnail (type, id, img) { return new Promise((resolve, reject) => { axios .put(this.server + "other/thumbnail/" + type + "/" + id, QS.stringify({ thumbnail: img })) @@ -137,7 +191,7 @@ class LabServer { * @param {String} key 查询关键字 * @returns {Promise} */ - styles(key) { + styles (key) { return this._layers('style', key, 'date', 'asc'); } /** @@ -147,7 +201,7 @@ class LabServer { * @param {String} thumbnail 样式缩略图 * @returns {Promise} */ - newStyle(name, code, thumbnail) { + newStyle (name, code, thumbnail) { return new Promise((resolve, reject) => { axios .post(this.server + "style", QS.stringify({ name: name, code: code, thumbnail: thumbnail })) @@ -170,7 +224,7 @@ class LabServer { * @param {String} id 样式id * @returns {Promise} */ - deleteStyle(id) { + deleteStyle (id) { return new Promise((resolve, reject) => { axios .delete(this.server + "style/" + id) @@ -196,7 +250,7 @@ class LabServer { * @param {String} name 对象新名称 * @returns {Promise} */ - rename(type, id, name) { + rename (type, id, name) { return new Promise((resolve, reject) => { axios .put(this.server + "other/rename/" + type + "/" + id, QS.stringify({ name: name })) @@ -220,7 +274,7 @@ class LabServer { * @param {String} id 场景id * @returns {Promise} */ - queryScene(id) { + queryScene (id) { return new Promise((resolve, reject) => { axios .get(this.server + "scene/?_id=" + id) @@ -245,7 +299,7 @@ class LabServer { * @param {String} content 场景内容 * @returns {Promise} */ - addScene(name, content) { + addScene (name, content) { return new Promise((resolve, reject) => { axios .post(this.server + "scene", QS.stringify({ name: name, content: content })) @@ -271,7 +325,7 @@ class LabServer { * @param {String} content 场景内容 * @returns {Promise} */ - updateScene(id, content) { + updateScene (id, content) { return new Promise((resolve, reject) => { axios .put(this.server + "scene/" + id, QS.stringify({ content: content })) @@ -290,6 +344,51 @@ class LabServer { }); } + /** + * 获取标绘符号 + * @param {String} id + */ + getSymbol (id) { + return new Promise((resolve, reject) => { + axios + .get(this.server + "symbol/group", { + id: id + }) + .then(res => { + if (res.status === 200) { + resolve(res.data); + } else { + reject(res.data); + } + }) + .catch(error => { + reject(error); + }); + }); + } + + /** + * 获取标绘符号 + * @param {String} ids 符号id列表，用逗号隔开 + */ + getSymbols (ids) { + return new Promise((resolve, reject) => { + axios + .post(this.server + "symbol/list", QS.stringify({ + ids: ids + })) + .then(res => { + if (res.status === 200) { + resolve(res.data); + } else { + reject(res.data); + } + }) + .catch(error => { + reject(error); + }); + }); + } } diff --git a/Source/managers/MainUI.js b/Source/managers/MainUI.js index 734fee8e..1c12e5a1 100644 --- a/Source/managers/MainUI.js +++ b/Source/managers/MainUI.js @@ -46,12 +46,15 @@ import ContextMenu from "./ContextMenu"; import MainBar from "./controls/MainBar"; import ImageryLab from "./tools/ImageryLab"; +import ImageryCloud from "./tools/ImageryCloud"; import ImageryOnline from "./tools/ImageryOnline"; import ImageryWMTS from "./tools/ImageryWMTS"; import LabServer from "./LabServer"; import ModelLab from "./tools/ModelLab"; +import ModelCloud from "./tools/ModelCloud"; import ModelOnline from "./tools/ModelOnline"; import TerrainLab from "./tools/TerrainLab"; +import TerrainCloud from "./tools/TerrainCloud"; import TerrainOnline from "./tools/TerrainOnline"; import CameraViewManager from "./tools/CameraViewManager"; import CutFillComputing from "./tools/CutFillComputing"; @@ -61,6 +64,7 @@ import LabScene from "./LabScene" import ModelTree from "./tools/ModelTree"; import EntityMore from "./tools/EntityMore"; +import Symbol from "./tools/Symbol" /** * EarthUI根管理器 @@ -215,16 +219,20 @@ class MainUI { //模型结构 this._modelTree = new ModelTree(this); this._entitymore = new EntityMore(this); + this._symbol = new Symbol(this); //其他工具 this._imageryLab = new ImageryLab(this); + this._imageryCloud = new ImageryCloud(this); this._imageryOnline = new ImageryOnline(this); this._imageryWMTS = new ImageryWMTS(this); //其他工具 this._modelLab = new ModelLab(this); + this._modelCloud = new ModelCloud(this); this._modelOnline = new ModelOnline(this); //其他工具 this._terrainLab = new TerrainLab(this); + this._terrainCloud = new TerrainCloud(this); this._terrainOnline = new TerrainOnline(this); this._cameraViewManager = new CameraViewManager(this); @@ -267,6 +275,40 @@ class MainUI { get imageryLab() { return mainUI._imageryLab; }, + + /** + * 来自云平台的影像数据源选择器 + * @readonly + * @type {ImageryLabCloud} + * @instance + * @memberof ToolsCollection + */ + get imageryLabCloud() { + return mainUI._imageryCloud; + }, + + /** + * 来自云平台的瓦片数据源选择器 + * @readonly + * @type {ModelCloud} + * @instance + * @memberof ToolsCollection + */ + get modelCloud() { + return mainUI._modelCloud; + }, + + /** + * 来自云平台的地形数据源选择器 + * @readonly + * @type {terrainCloud} + * @instance + * @memberof ToolsCollection + */ + get terrainCloud() { + return mainUI._terrainCloud; + }, + /** * 在线的影像数据源选择器 * @readonly @@ -376,7 +418,18 @@ class MainUI { */ get entitymore() { return mainUI._entitymore; - } + }, + + /** + * 符号标绘 + * @readonly + * @type {Symbol} + * @instance + * @memberof ToolsCollection + */ + get symbol() { + return mainUI._symbol; + } }; } }); diff --git a/Source/managers/controls/MainBar.js b/Source/managers/controls/MainBar.js index b139983f..250f7602 100644 --- a/Source/managers/controls/MainBar.js +++ b/Source/managers/controls/MainBar.js @@ -8,7 +8,7 @@ class MainBar { constructor(root) { this._root = root; this._comp = root._comp.$refs.mainBarControl; - + XE.MVVM.extend(this, { /** @@ -27,6 +27,24 @@ class MainBar { * @memberof MainBar */ page: "navigate", + + /** + * 是否显示加载云服务数据的按钮 + * @type {boolean} + * @default false + * @instance + * @memberof MainBar + */ + cloudServiceUI: false, + + /** + * 是否显示加载cesiumlab数据的按钮 + * @type {boolean} + * @default true + * @instance + * @memberof MainBar + */ + labServiceUI: true, }); this.unbind1 = XE.MVVM.bind( @@ -43,6 +61,20 @@ class MainBar { "page" ); + this.unbind3 = XE.MVVM.bind( + this._comp, + "cloudServiceUI", + this, + "cloudServiceUI" + ); + + this.unbind4 = XE.MVVM.bind( + this._comp, + "labServiceUI", + this, + "labServiceUI" + ); + //监控show的改变 this.unbind3 = XE.MVVM.watch(() => { @@ -66,6 +98,8 @@ class MainBar { destroy() { this.unbind1 = this.unbind1 && this.unbind1(); this.unbind2 = this.unbind2 && this.unbind2(); + this.unbind3 = this.unbind3 && this.unbind3(); + this.unbind4 = this.unbind4 && this.unbind4(); } /** diff --git a/Source/managers/tools/ImageryCloud.js b/Source/managers/tools/ImageryCloud.js new file mode 100644 index 00000000..fa2418d7 --- /dev/null +++ b/Source/managers/tools/ImageryCloud.js @@ -0,0 +1,66 @@ +/** + * 云平台影像源选择 + * @class + */ +class ImageryCloud { + constructor(root) { + this._root = root; + this._comp = root._comp.$refs.ImageryCloud[0]; + + + XE.MVVM.extend(this, { + /** + * 是否可见 + * @type {boolean} + * @default false + * @instance + * @memberof ImageryCloud + */ + show: false, + /** + * 云服务url + * @type {string} + * @default "" + * @instance + * @memberof ImageryCloud + */ + cloudServiceUrl: "" + }); + + var tool = root._comp.$refs.mainBarControl.$refs.imagery; + + this.unbind = XE.MVVM.bind( + tool, + "imageryCloud", + this, + "show" + ); + + this.unbind2 = XE.MVVM.bind( + this._comp, + "show", + this, + "show" + ); + + this.unbind2 = XE.MVVM.bind( + this._comp, + "cloudServiceUrl", + this, + "cloudServiceUrl" + ); + } + + isDestroyed () { + return false; + } + + destroy () { + + this.unbind1 = this.unbind1 && this.unbind1(); + this.unbind2 = this.unbind2 && this.unbind2(); + + } +} + +export default ImageryCloud; \ No newline at end of file diff --git a/Source/managers/tools/ModelCloud.js b/Source/managers/tools/ModelCloud.js new file mode 100644 index 00000000..cca4a20e --- /dev/null +++ b/Source/managers/tools/ModelCloud.js @@ -0,0 +1,49 @@ +/** + * 云平台瓦片服务数据源选择 + * @class + */ +class ModelCloud { + constructor(root) { + this._root = root; + this._comp = root._comp.$refs.modelCloud[0]; + + XE.MVVM.extend(this, { + /** + * 是否可见 + * @type {boolean} + * @default false + * @instance + * @memberof ModelCloud + */ + show: false, + }); + var tool = root._comp.$refs.mainBarControl.$refs.model; + + this.unbind = XE.MVVM.bind( + tool, + "modelCloud", + this, + "show" + ); + + this.unbind2 = XE.MVVM.bind( + this._comp, + "show", + this, + "show" + ); + } + + isDestroyed() { + return false; + } + + destroy() { + + this.unbind1 = this.unbind1 && this.unbind1(); + this.unbind2 = this.unbind2 && this.unbind2(); + + } +} + +export default ModelCloud; \ No newline at end of file diff --git a/Source/managers/tools/Symbol.js b/Source/managers/tools/Symbol.js new file mode 100644 index 00000000..34903d7c --- /dev/null +++ b/Source/managers/tools/Symbol.js @@ -0,0 +1,53 @@ +/** + * 模型结构树面板 + * @class + */ +class Symbol { + constructor(root) { + this._root = root; + this._comp = root._comp.$refs.symbolTool[0]; + + XE.MVVM.extend(this, { + /** + * 是否可见 + * @type {boolean} + * @default false + * @instance + * @memberof Symbol + */ + show: false, + }); + + var toolbar = root._comp.$refs.mainBarControl.$refs.view; + this.unbind1 = XE.MVVM.bind( + toolbar, + "SymbolShow", + this, + "show" + ); + + this.unbind2 = XE.MVVM.bind( + this._comp, + "show", + this, + "show" + ); + + + } + + isDestroyed () { + return false; + } + + destroy () { + this._showListenerDisposer = this._showListenerDisposer && this._showListenerDisposer(); + + this.unbind1 = this.unbind1 && this.unbind1(); + this.unbind2 = this.unbind2 && this.unbind2(); + + } + +} + +export default Symbol; \ No newline at end of file diff --git a/Source/managers/tools/TerrainCloud.js b/Source/managers/tools/TerrainCloud.js new file mode 100644 index 00000000..b7295c1b --- /dev/null +++ b/Source/managers/tools/TerrainCloud.js @@ -0,0 +1,49 @@ +/** + * 云平台地形服务选择面板 + * @class + */ +class TerrainCloud { + constructor(root) { + this._root = root; + this._comp = root._comp.$refs.terrainCloud[0]; + + XE.MVVM.extend(this, { +/** + * 是否可见 + * @type {boolean} + * @default true + * @instance + * @memberof TerrainCloud + */ + show: false, + }); + var tool = root._comp.$refs.mainBarControl.$refs.terrain; + + this.unbind = XE.MVVM.bind( + tool, + "terrainCloud", + this, + "show" + ); + + this.unbind2 = XE.MVVM.bind( + this._comp, + "show", + this, + "show" + ); + } + + isDestroyed() { + return false; + } + + destroy() { + + this.unbind1 = this.unbind1 && this.unbind1(); + this.unbind2 = this.unbind2 && this.unbind2(); + + } +} + +export default TerrainCloud; \ No newline at end of file From 3f22397089afe95a7c431cabef0ef528ca68afdf Mon Sep 17 00:00:00 2001 From: caiying <2841902102@qq.com> Date: Fri, 15 Nov 2019 11:21:38 +0800 Subject: [PATCH 17/82] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E5=9B=BE=E5=B1=82=E6=A0=91checkBox=E6=98=BE=E9=9A=90?= =?UTF-8?q?=E7=9A=84=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/VirtualTree/VirtualTreeItem.vue | 9 +++++++-- Source/components/common/VirtualTree/index.vue | 18 ++++++++++-------- .../components/tools/EntityMoreTool/index.vue | 10 ++++++++-- .../components/tools/ModelTreeTool/index.vue | 9 +++++---- .../components/tools/SceneTreeTool/index.vue | 6 ++++-- 5 files changed, 34 insertions(+), 18 deletions(-) diff --git a/Source/components/common/VirtualTree/VirtualTreeItem.vue b/Source/components/common/VirtualTree/VirtualTreeItem.vue index a139ff1d..8e692aa8 100644 --- a/Source/components/common/VirtualTree/VirtualTreeItem.vue +++ b/Source/components/common/VirtualTree/VirtualTreeItem.vue @@ -22,6 +22,7 @@ :indeterminate="item.checkStatus === 'indeterminate'" :disabled="item.checkStatus === 'ignored'" @on-change="toggleChecked(item, $event)" + v-show="checkBoxShow" > @@ -56,7 +57,8 @@ export default { item: Object, onToggleExpand: Function, onToggleChecked: Function, - canmove: Boolean + canmove: Boolean, + checkBoxShow: Boolean }, mounted() { @@ -95,7 +97,10 @@ export default { source.addEventListener( "dragstart", function(event) { - event.dataTransfer.setData('obj', JSON.stringify(item._inner.sn.czmObject)); //兼容火狐浏览器，拖动时候必须携带数据否则没效果 + event.dataTransfer.setData( + "obj", + JSON.stringify(item._inner.sn.czmObject) + ); //兼容火狐浏览器，拖动时候必须携带数据否则没效果 self.$emit("on-item-move", { item, vueObject: self, $event }); }, false diff --git a/Source/components/common/VirtualTree/index.vue b/Source/components/common/VirtualTree/index.vue index 0d701410..04c1797d 100644 --- a/Source/components/common/VirtualTree/index.vue +++ b/Source/components/common/VirtualTree/index.vue @@ -5,6 +5,7 @@ :index="index" :item="item" :canmove="canmove" + :checkBoxShow="checkBoxShow" :key="typeof item.id !== 'undefined' ? item.id : index" :onToggleExpand="toggleExpand" :onToggleChecked="toggleChecked" @@ -40,18 +41,19 @@ export default { this.updateData(); }, props: { - onToggleExpand:{ - type:Function, - default:(treeItem)=>{ - treeItem.expand = !treeItem.expand; + onToggleExpand: { + type: Function, + default: treeItem => { + treeItem.expand = !treeItem.expand; } }, - onToggleChecked:{ - type:Function, - default:()=>{} + onToggleChecked: { + type: Function, + default: () => {} }, tree: Array, - canmove: Boolean + canmove: Boolean, + checkBoxShow: Boolean }, data() { return { diff --git a/Source/components/tools/EntityMoreTool/index.vue b/Source/components/tools/EntityMoreTool/index.vue index aaebaddf..3e616322 100644 --- a/Source/components/tools/EntityMoreTool/index.vue +++ b/Source/components/tools/EntityMoreTool/index.vue @@ -13,7 +13,12 @@ >
    - +
    @@ -68,7 +73,8 @@ export default { surfaceShow: false, tree: [], lang: {}, - langs: languagejs + langs: languagejs, + checkBoxShow: false }; }, created() {}, diff --git a/Source/components/tools/ModelTreeTool/index.vue b/Source/components/tools/ModelTreeTool/index.vue index 0d7a5aeb..d9a08587 100644 --- a/Source/components/tools/ModelTreeTool/index.vue +++ b/Source/components/tools/ModelTreeTool/index.vue @@ -18,6 +18,7 @@ :tree="tree" :on-toggle-checked="toggleChecked" @on-double-click="itemDoubleClick" + :checkBoxShow="checkBoxShow" >
    @@ -40,11 +41,11 @@ export default { restore: "Restore Style" } }, - lang: undefined + lang: undefined, + checkBoxShow: true }; }, created() { - this._styles = []; this._testedUrl = []; @@ -95,7 +96,7 @@ export default { }, methods: { evaluateShow(feature) { - if(!feature) return true; + if (!feature) return true; if (!feature.hasProperty("id")) return true; var fid = feature.getProperty("id"); //获取tileset @@ -114,7 +115,7 @@ export default { return true; }, evaluateColor(feature, result) { - if(!feature) return ; + if (!feature) return; if (!feature.hasProperty("id")) return; var fid = feature.getProperty("id"); //获取tileset diff --git a/Source/components/tools/SceneTreeTool/index.vue b/Source/components/tools/SceneTreeTool/index.vue index 91bb5a0d..7162cc15 100644 --- a/Source/components/tools/SceneTreeTool/index.vue +++ b/Source/components/tools/SceneTreeTool/index.vue @@ -15,6 +15,7 @@ ref="vtree" :tree="tree" :canmove="canmove" + :checkBoxShow="checkBoxShow" :on-toggle-expand="toggleExpand" :on-toggle-checked="toggleChecked" @on-context-menu="contextMenu" @@ -142,6 +143,7 @@ export default { show: true, tree: [], canmove: true, + checkBoxShow: true, langs: { zh: { confirm: "确认删除图层?", @@ -422,7 +424,7 @@ export default { const tilesetCzmObject = item._inner.sn.czmObject; const code = getCzmCode(tilesetCzmObject); const url = getCodeUrl(code); - this.$root.$earthUI.openURL(url); + this.$root.$earthUI.openURL(url); } } ] @@ -459,7 +461,7 @@ export default { itemDoubleClick({ item, vueObject }) { const czmObject = item._inner.sn.czmObject; if (czmObject) { - console.log(czmObject) + console.log(czmObject); czmObject.flyTo(); let t = czmObject.xbsjType; From bec67a7c61f9f04b10f21ebf11e10d378da74d1f Mon Sep 17 00:00:00 2001 From: caiying <2841902102@qq.com> Date: Fri, 15 Nov 2019 16:30:27 +0800 Subject: [PATCH 18/82] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E4=BA=91?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=9A=84=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/ImageryServices/ImageryCloud.vue | 50 +++++++++----- .../tools/ModelServices/ModelCloud.vue | 66 ++++++++++++------- .../tools/TerrainServices/TerrainCloud.vue | 59 ++++++++++------- 3 files changed, 112 insertions(+), 63 deletions(-) diff --git a/Source/components/tools/ImageryServices/ImageryCloud.vue b/Source/components/tools/ImageryServices/ImageryCloud.vue index 49f064ff..ba1104e9 100644 --- a/Source/components/tools/ImageryServices/ImageryCloud.vue +++ b/Source/components/tools/ImageryServices/ImageryCloud.vue @@ -55,7 +55,7 @@ import languagejs from "./imagery_locale"; export default { components: {}, - data () { + data() { return { show: false, services: [], @@ -70,12 +70,10 @@ export default { langs: languagejs }; }, - created () { - - }, - mounted () { }, + created() {}, + mounted() {}, methods: { - select (s) { + select(s) { this.selected = s; // console.log(this.selected); this.selectedUrl = this.serverUrl(s); @@ -83,19 +81,19 @@ export default { this.contentShow = true; this.error = ""; }, - query () { + query() { var labServer = this.$root.$earthUI.labServer; this.dayItems = []; labServer .cloudlayers("image") .then(services => { - this.services = services + this.services = services; for (var i = 0; i < this.services.length; i++) { - this.services[i].west = this.services[i].west * 180 / Math.PI - this.services[i].east = this.services[i].east * 180 / Math.PI - this.services[i].south = this.services[i].south * 180 / Math.PI - this.services[i].north = this.services[i].north * 180 / Math.PI + this.services[i].west = (this.services[i].west * 180) / Math.PI; + this.services[i].east = (this.services[i].east * 180) / Math.PI; + this.services[i].south = (this.services[i].south * 180) / Math.PI; + this.services[i].north = (this.services[i].north * 180) / Math.PI; } }) .catch(err => { @@ -103,7 +101,7 @@ export default { this.$root.$earthUI.promptInfo(this.error, "error"); }); }, - serverUrl (server) { + serverUrl(server) { return ( this.$root.$earthUI.labServer.cloudServiceUrl + "/api/wmts/gettile/" + @@ -111,7 +109,7 @@ export default { "/{z}/{x}/{y}" ); }, - ok () { + ok() { if (!this.selected) { this.error = this.lang.selectservice; this.$root.$earthUI.promptInfo(this.error, "error"); @@ -153,8 +151,8 @@ export default { }, computed: {}, filters: { - f_day (day) { }, - f_range (item) { + f_day(day) {}, + f_range(item) { return ( item.west.toFixed(5) + ", " + @@ -166,14 +164,14 @@ export default { ); } }, - beforeDestroy () { + beforeDestroy() { if (this.unbind) { this.unbind(); this.unbind = undefined; } }, watch: { - show (v) { + show(v) { if (v) { this.query(); } @@ -313,4 +311,20 @@ export default { .xbsj-localImage .flexul li .localImageName:hover .localImageToolTip { visibility: visible; } +table { + border: solid black; + border-width: 0px 1px 1px 0px; + width: 100%; +} +table td { + border: solid black; + border-width: 1px 0px 0px 1px; + text-align: center; +} +table th { + border: solid black; + border-width: 1px 0px 0px 1px; + text-align: center; + font-size: 14px; +} diff --git a/Source/components/tools/ModelServices/ModelCloud.vue b/Source/components/tools/ModelServices/ModelCloud.vue index 7fe84100..98719180 100644 --- a/Source/components/tools/ModelServices/ModelCloud.vue +++ b/Source/components/tools/ModelServices/ModelCloud.vue @@ -12,7 +12,6 @@ :title="lang.cloudtitle" class="xbsj-localModel" > -
    @@ -64,7 +63,7 @@ import languagejs from "./model_locale"; export default { components: {}, - data () { + data() { return { show: false, bimServices: {}, @@ -79,12 +78,10 @@ export default { langs: languagejs }; }, - created () { - - }, - mounted () { }, + created() {}, + mounted() {}, methods: { - _updateServerThumbnail (server, thumbnail) { + _updateServerThumbnail(server, thumbnail) { var labServer = this.$root.$earthUI.labServer; labServer .updateLayerThumbnail("models", server._id, thumbnail) @@ -96,7 +93,7 @@ export default { this.$root.$earthUI.promptInfo(this.error, "error"); }); }, - onContexMenu (server, event) { + onContexMenu(server, event) { //弹出菜单 this.$root.$earthUI.contextMenu.pop([ { @@ -118,13 +115,13 @@ export default { } ]); }, - select (s) { + select(s) { this.selected = s; this.selectedUrl = this.serverUrl(s); this.contentShow = true; this.error = ""; }, - _addServices (s) { + _addServices(s) { //添加到列表中，并且按照天进行分组 let day = s.date.substr(0, 10); @@ -141,16 +138,16 @@ export default { }; this.dayItems.push(newDays); }, - query () { + query() { this.error = ""; var labServer = this.$root.$earthUI.labServer; labServer .cloud3dtiles("bim") .then(services => { - this.bimServices = services + this.bimServices = services; for (var i = 0; i < this.bimServices.length; i++) { - this.bimServices[i].type = "bim" + this.bimServices[i].type = "bim"; } }) .catch(err => { @@ -161,9 +158,9 @@ export default { labServer .cloud3dtiles("photo") .then(services => { - this.photoServices = services + this.photoServices = services; for (var i = 0; i < this.photoServices.length; i++) { - this.photoServices[i].type = "photo" + this.photoServices[i].type = "photo"; } }) .catch(err => { @@ -171,14 +168,17 @@ export default { this.$root.$earthUI.promptInfo(this.error, "error"); }); }, - serverUrl (server) { + serverUrl(server) { return ( this.$root.$earthUI.labServer.cloudServiceUrl + - "/api/3dtiles/" + server.type +"/" + - server._id + "/tileset.json" + "/api/3dtiles/" + + server.type + + "/" + + server._id + + "/tileset.json" ); }, - ok () { + ok() { if (!this.selected) { this.error = this.lang.selectservice; this.$root.$earthUI.promptInfo(this.error, "error"); @@ -201,8 +201,8 @@ export default { }, computed: {}, filters: { - f_day (day) { }, - f_range (item) { + f_day(day) {}, + f_range(item) { return ( item.west.toFixed(5) + ", " + @@ -214,14 +214,14 @@ export default { ); } }, - beforeDestroy () { + beforeDestroy() { if (this.unbind) { this.unbind(); this.unbind = undefined; } }, watch: { - show (v) { + show(v) { if (v) { this.query(); } @@ -337,4 +337,24 @@ export default { .xbsj-localModel .flexul li .localModelName:hover .localModelToolTip { visibility: visible; } +.xbsj-localModel .dateDiv .dateLabel { + height: 26px; + line-height: 26px; +} +table { + border: solid black; + border-width: 0px 1px 1px 0px; + width: 100%; +} +table td { + border: solid black; + border-width: 1px 0px 0px 1px; + text-align: center; +} +table th { + border: solid black; + border-width: 1px 0px 0px 1px; + text-align: center; + font-size: 14px; +} diff --git a/Source/components/tools/TerrainServices/TerrainCloud.vue b/Source/components/tools/TerrainServices/TerrainCloud.vue index ff13bcb9..5cc610e2 100644 --- a/Source/components/tools/TerrainServices/TerrainCloud.vue +++ b/Source/components/tools/TerrainServices/TerrainCloud.vue @@ -58,7 +58,7 @@ import languagejs from "./terrain_locale"; export default { components: {}, - data () { + data() { return { show: false, services: [], @@ -73,12 +73,10 @@ export default { langs: languagejs }; }, - created () { - - }, - mounted () { }, + created() {}, + mounted() {}, methods: { - _updateServerThumbnail (server, thumbnail) { + _updateServerThumbnail(server, thumbnail) { var labServer = this.$root.$earthUI.labServer; labServer .updateLayerThumbnail("terrains", server._id, thumbnail) @@ -90,7 +88,7 @@ export default { this.$root.$earthUI.promptInfo(this.error, "error"); }); }, - onContexMenu (server, event) { + onContexMenu(server, event) { //弹出菜单 this.$root.$earthUI.contextMenu.pop([ { @@ -112,14 +110,14 @@ export default { } ]); }, - select (s) { + select(s) { this.selected = s; this.selectedUrls = this.serverUrl(s); this.selectedMaxzoom = this.selected.maxzoom; this.contentShow = true; this.error = ""; }, - _addServices (s) { + _addServices(s) { //添加到列表中，并且按照天进行分组 let day = s.date.substr(0, 10); @@ -136,19 +134,19 @@ export default { }; this.dayItems.push(newDays); }, - query () { + query() { var labServer = this.$root.$earthUI.labServer; this.dayItems = []; labServer .cloudlayers("terrain") .then(services => { - this.services = services + this.services = services; for (var i = 0; i < this.services.length; i++) { - this.services[i].west = this.services[i].west * 180 / Math.PI - this.services[i].east = this.services[i].east * 180 / Math.PI - this.services[i].south = this.services[i].south * 180 / Math.PI - this.services[i].north = this.services[i].north * 180 / Math.PI + this.services[i].west = (this.services[i].west * 180) / Math.PI; + this.services[i].east = (this.services[i].east * 180) / Math.PI; + this.services[i].south = (this.services[i].south * 180) / Math.PI; + this.services[i].north = (this.services[i].north * 180) / Math.PI; } }) .catch(err => { @@ -156,14 +154,14 @@ export default { this.$root.$earthUI.promptInfo(this.error, "error"); }); }, - serverUrl (server) { + serverUrl(server) { return ( this.$root.$earthUI.labServer.cloudServiceUrl + "/api/wmts/terrain/" + server._id ); }, - ok () { + ok() { if (!this.selected) { this.error = this.lang.selectservice; this.$root.$earthUI.promptInfo(this.error, "error"); @@ -198,8 +196,8 @@ export default { }, computed: {}, filters: { - f_day (day) { }, - f_range (item) { + f_day(day) {}, + f_range(item) { return ( item.west.toFixed(5) + ", " + @@ -211,14 +209,14 @@ export default { ); } }, - beforeDestroy () { + beforeDestroy() { if (this.unbind) { this.unbind(); this.unbind = undefined; } }, watch: { - show (v) { + show(v) { if (v) { this.query(); } @@ -233,7 +231,8 @@ export default { } .xbsj-localTerrain .contentDiv { overflow: auto; - height: calc(100% - 29px); + height: calc(100% - 39px); + margin-top: 10px; } .xbsj-localTerrain .contentsDiv { height: calc(100% - 142px); @@ -348,4 +347,20 @@ export default { color: #ffffff; cursor: pointer; } +table { + border: solid black; + border-width: 0px 1px 1px 0px; + width: 100%; +} +table td { + border: solid black; + border-width: 1px 0px 0px 1px; + text-align: center; +} +table th { + border: solid black; + border-width: 1px 0px 0px 1px; + text-align: center; + font-size: 14px; +} From 39a42deed8b6dbd4e6e4c1aa9988211b20ffc0fc Mon Sep 17 00:00:00 2001 From: caiying <2841902102@qq.com> Date: Tue, 19 Nov 2019 11:09:15 +0800 Subject: [PATCH 19/82] =?UTF-8?q?=E6=A0=87=E7=BB=98=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=BA=86=E5=B9=B3=E8=A1=8C=E6=90=9C=E5=AF=BB=E5=8C=BA=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGLES.md | 2 + Source/components/MainUIComp.vue | 5 +- .../components/tools/EntityMoreTool/index.vue | 11 + .../components/tools/EntityMoreTool/locale.js | 2 + .../viztools/GeoBezier2/index_locale.js | 4 +- .../viztools/GeoBezier3/index_locale.js | 4 +- .../viztools/GeoParallelSearch/index.vue | 497 ++++++++++++++++++ .../GeoParallelSearch/index_locale.js | 26 + 8 files changed, 546 insertions(+), 5 deletions(-) create mode 100644 Source/components/viztools/GeoParallelSearch/index.vue create mode 100644 Source/components/viztools/GeoParallelSearch/index_locale.js diff --git a/CHANGLES.md b/CHANGLES.md index 9617c533..fccfc07e 100644 --- a/CHANGLES.md +++ b/CHANGLES.md @@ -5,6 +5,8 @@ Change Log ##### Additions :tada: * EarthUI和EarthSDK增加了pin里面的extText相关属性 +* EarthUI增加了控制图层树checkbox显隐的属性 +* EarthUI标绘增加了平行搜寻区功能 ##### Fixes :wrench: * 修复强制光照经度、纬度不对的问题 diff --git a/Source/components/MainUIComp.vue b/Source/components/MainUIComp.vue index bd120efa..1727f066 100644 --- a/Source/components/MainUIComp.vue +++ b/Source/components/MainUIComp.vue @@ -85,6 +85,7 @@ import GeoPolyline from "./viztools/GeoPolyline"; import GeoArc from "./viztools/GeoArc"; import GeoBezier2 from "./viztools/GeoBezier2"; import GeoBezier3 from "./viztools/GeoBezier3"; +import GeoParallelSearch from "./viztools/GeoParallelSearch"; import GeoTriFlag from "./viztools/GeoTriFlag"; import GeoSector from "./viztools/GeoSector"; import ScanlineTool from "./viztools/ScanlineTool"; @@ -101,7 +102,7 @@ import InformationBox from "./utils/InformationBox"; import ModelTreeTool from "./tools/ModelTreeTool"; import EntityMoreTool from "./tools/EntityMoreTool"; -import SymbolTool from "./tools/SymbolTool" +import SymbolTool from "./tools/SymbolTool"; export default { components: { @@ -137,6 +138,7 @@ export default { GeoArc, GeoBezier2, GeoBezier3, + GeoParallelSearch, GeoTriFlag, GeoSector, ScanlineTool, @@ -188,6 +190,7 @@ export default { GeoArc: "GeoArc", GeoBezier2: "GeoBezier2", GeoBezier3: "GeoBezier3", + GeoParallelSearch: "GeoParallelSearch", GeoTriFlag: "GeoTriFlag", GeoDoubleArrow: "GeoDoubleArrow", GeoCircle: "GeoCircle", diff --git a/Source/components/tools/EntityMoreTool/index.vue b/Source/components/tools/EntityMoreTool/index.vue index 3e616322..2e19ba51 100644 --- a/Source/components/tools/EntityMoreTool/index.vue +++ b/Source/components/tools/EntityMoreTool/index.vue @@ -42,6 +42,7 @@
  • {{lang.arc}}
  • {{lang.bezier2}}
  • {{lang.bezier3}}
    • +
  • {{lang.parallelsearch}}
    • @@ -263,6 +264,16 @@ export default { Bezier3.name = "贝塞尔3次曲线"; this.$root.$earthUI.showPropertyWindow(Bezier3); }, + // 平行搜寻区 + ParallelSearch() { + var ParallelSearch = new XE.Obj.Plots.GeoParallelSearch( + this.$root.$earth + ); + ParallelSearch.creating = true; + ParallelSearch.isCreating = true; + ParallelSearch.name = "平行搜寻区"; + this.$root.$earthUI.showPropertyWindow(ParallelSearch); + }, // 圆 Circle() { var Circle = new XE.Obj.Plots.GeoCircle(this.$root.$earth); diff --git a/Source/components/tools/EntityMoreTool/locale.js b/Source/components/tools/EntityMoreTool/locale.js index 7f9ac33f..88203f44 100644 --- a/Source/components/tools/EntityMoreTool/locale.js +++ b/Source/components/tools/EntityMoreTool/locale.js @@ -17,6 +17,7 @@ const zh = { arc: "圆弧", bezier2: "贝塞尔2次曲线", bezier3: "贝塞尔3次曲线", + parallelsearch: "平行搜寻区", circle: "圆", triflag: "三角旗标", curveflag: "曲面旗标", @@ -48,6 +49,7 @@ const en = { arc: "arc", bezier2: "bezier2", bezier3: "bezier3", + parallelsearch: "parallelsearch", circle: "circle", triflag: "triflag", curveflag: "curveflag", diff --git a/Source/components/viztools/GeoBezier2/index_locale.js b/Source/components/viztools/GeoBezier2/index_locale.js index 47adecc7..af340525 100644 --- a/Source/components/viztools/GeoBezier2/index_locale.js +++ b/Source/components/viztools/GeoBezier2/index_locale.js @@ -1,5 +1,5 @@ const zh = { - title: '折线', + title: '贝塞尔2次曲线', name: '名称', show: '显示', creating: '创建', @@ -10,7 +10,7 @@ const zh = { }; const en = { - title: 'GeoPolyline', + title: 'GeoBezier2', name: 'name', show: 'show', creating: 'creating', diff --git a/Source/components/viztools/GeoBezier3/index_locale.js b/Source/components/viztools/GeoBezier3/index_locale.js index 47adecc7..fb65569d 100644 --- a/Source/components/viztools/GeoBezier3/index_locale.js +++ b/Source/components/viztools/GeoBezier3/index_locale.js @@ -1,5 +1,5 @@ const zh = { - title: '折线', + title: '贝塞尔3次曲线', name: '名称', show: '显示', creating: '创建', @@ -10,7 +10,7 @@ const zh = { }; const en = { - title: 'GeoPolyline', + title: 'GeoBezier3', name: 'name', show: 'show', creating: 'creating', diff --git a/Source/components/viztools/GeoParallelSearch/index.vue b/Source/components/viztools/GeoParallelSearch/index.vue new file mode 100644 index 00000000..871200ac --- /dev/null +++ b/Source/components/viztools/GeoParallelSearch/index.vue @@ -0,0 +1,497 @@ + + + + + \ No newline at end of file diff --git a/Source/components/viztools/GeoParallelSearch/index_locale.js b/Source/components/viztools/GeoParallelSearch/index_locale.js new file mode 100644 index 00000000..01827e56 --- /dev/null +++ b/Source/components/viztools/GeoParallelSearch/index_locale.js @@ -0,0 +1,26 @@ +const zh = { + title: '平行搜寻区', + name: '名称', + show: '显示', + creating: '创建', + editing: '编辑', + ground: '贴地', + width: '宽度', + color: '颜色' +}; + +const en = { + title: 'GeoParallelSearch', + name: 'name', + show: 'show', + creating: 'creating', + editing: 'editing', + ground: 'ground', + width: 'width', + color: 'color' +}; + +export default { + zh, + en +}; \ No newline at end of file From c2515986c0ceab29555fd3a5a31fa6fc667e5165 Mon Sep 17 00:00:00 2001 From: lforrrrawx <237895772@qq.com> Date: Tue, 19 Nov 2019 22:30:54 +0800 Subject: [PATCH 20/82] =?UTF-8?q?=E6=A0=87=E7=BB=98=E5=BA=93=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Source/components/MainUIComp.vue | 8 +- .../common/VirtualTree/VirtualTreeItem.vue | 45 +- .../controls/MainBarControl/Entity/index.vue | 2 +- .../controls/MainBarControl/View/index.vue | 5 +- .../MainBarControl/View/index_locale.js | 4 +- .../components/tools/SceneTreeTool/index.vue | 70 +- Source/components/tools/SymbolTool/index.vue | 425 +++++++++--- .../tools/TerrainServices/TerrainCloud.vue | 5 - .../viztools/GroundImageTool/index.vue | 650 ++++++++++++++++++ .../viztools/GroundImageTool/index_locale.js | 67 ++ .../viztools/PinPictureTool/index.vue | 13 +- .../viztools/PinPictureTool/index_locale.js | 2 + Source/css/common.css | 2 +- Source/managers/LabServer.js | 137 ++++ Source/managers/MainUI.js | 94 +-- 15 files changed, 1325 insertions(+), 204 deletions(-) create mode 100644 Source/components/viztools/GroundImageTool/index.vue create mode 100644 Source/components/viztools/GroundImageTool/index_locale.js diff --git a/Source/components/MainUIComp.vue b/Source/components/MainUIComp.vue index bd120efa..8064f67c 100644 --- a/Source/components/MainUIComp.vue +++ b/Source/components/MainUIComp.vue @@ -68,6 +68,7 @@ import ClippingPlaneTool from "./viztools/ClippingPlaneTool"; import WaterTool from "./viztools/WaterTool"; import PinTool from "./viztools/PinTool"; import PinPictureTool from "./viztools/PinPictureTool"; +import GroundImageTool from "./viztools/GroundImageTool"; import PinDivTool from "./viztools/PinDivTool"; import PathTool from "./viztools/PathTool"; import ModelTool from "./viztools/ModelTool"; @@ -120,6 +121,7 @@ export default { WaterTool, PinTool, PinPictureTool, + GroundImageTool, PinDivTool, PathTool, ModelTool, @@ -140,7 +142,6 @@ export default { GeoTriFlag, GeoSector, ScanlineTool, - CamerVideoTool, ViewshedTool, @@ -176,7 +177,7 @@ export default { Water: "WaterTool", PinTool: "PinTool", PinDivTool: "PinDivTool", - PinPictureTool: "PinPictureTool", + Pin: "PinPictureTool", Path: "PathTool", Scanline: "ScanlineTool", Model: "ModelTool", @@ -196,7 +197,8 @@ export default { GeoRightAngleFlag: "GeoRightAngleFlag", GeoPolygon: "GeoPolygon", GeoSector: "GeoSector", - ["CameraView.View"]: "CameraViewPrp" + ["CameraView.View"]: "CameraViewPrp", + GroundImage:"GroundImageTool", }, tools: [ { diff --git a/Source/components/common/VirtualTree/VirtualTreeItem.vue b/Source/components/common/VirtualTree/VirtualTreeItem.vue index 8e692aa8..bba686b3 100644 --- a/Source/components/common/VirtualTree/VirtualTreeItem.vue +++ b/Source/components/common/VirtualTree/VirtualTreeItem.vue @@ -61,61 +61,64 @@ export default { checkBoxShow: Boolean }, - mounted() { + mounted () { this.movetreeitem(this.item); // console.log(this.item) }, - data() { + data () { return { titleEditable: false, // 'static' xbsjitemover: false }; }, methods: { - toggleExpand(item) { + toggleExpand (item) { this.onToggleExpand(item); }, - toggleChecked(item, checked) { + toggleChecked (item, checked) { // item.checkStatus === 'unchecked' 或者'indeterminate'时，应该设置为true // item.checkStatus === 'checked'，应该置为false this.onToggleChecked(item, item.checkStatus !== "checked"); }, - onContexMenu(item, $event) { + onContexMenu (item, $event) { this.$emit("on-context-menu", { item, vueObject: this, $event }); }, - onDoubleClick(item, $event) { + onDoubleClick (item, $event) { this.$emit("on-double-click", { item, vueObject: this, $event }); }, - onClick(item, $event) { + onClick (item, $event) { this.$emit("on-click", { item, vueObject: this, $event }); }, - movetreeitem(item, $event) { + movetreeitem (item, $event) { let self = this; let source = this.$refs.treeitem; // 按下鼠标键并开始移动鼠标时，会在被拖放的元素上触发dragstart事件。 // 此时光标变成“不能放”符号(圆环中有一条反斜线)，表示不能把元素放到自己上面 source.addEventListener( "dragstart", - function(event) { - event.dataTransfer.setData( - "obj", - JSON.stringify(item._inner.sn.czmObject) - ); //兼容火狐浏览器，拖动时候必须携带数据否则没效果 + function (event) { + try { + event.dataTransfer.setData( + "obj", + JSON.stringify(item._inner.sn.czmObject) + ); //兼容火狐浏览器，拖动时候必须携带数据否则没效果 + } catch (e) { + } self.$emit("on-item-move", { item, vueObject: self, $event }); }, false ); // 触发dragstart事件后，随即会触发drag事件，而且在元素被拖动期间会持续触发该事件 - source.addEventListener("drag", function(event) {}, false); + source.addEventListener("drag", function (event) { }, false); // 当拖动停止时(无论是把元素放到了有效的放置目标，还是放到了无效的放置目标上)，会触发dragend事件 - source.addEventListener("dragend", function(event) {}, false); + source.addEventListener("dragend", function (event) { }, false); //只要有元素被拖动到放置目标上，触发dragenter事件 source.addEventListener( "dragenter", - function(event) { + function (event) { event.preventDefault(); self.$emit("on-item-canmove", { item, vueObject: self, $event }); }, @@ -124,7 +127,7 @@ export default { //被拖动的元素在放置目标的范围内移动时，持续触发dragover事件 source.addEventListener( "dragover", - function(event) { + function (event) { if (self.canmove) { event.preventDefault(); self.xbsjitemover = true; @@ -136,7 +139,7 @@ export default { // 如果元素被拖出了放置目标，触发dragleave事件 source.addEventListener( "dragleave", - function(event) { + function (event) { self.xbsjitemover = false; event.preventDefault(); }, @@ -146,7 +149,7 @@ export default { // 如果元素被放到了放置目标中，触发drop事件 source.addEventListener( "drop", - function(event) { + function (event) { self.$emit("on-item-drop", { item, vueObject: self, $event }); self.xbsjitemover = false; event.preventDefault(); @@ -159,13 +162,13 @@ export default { directives: { focus: { // 指令的定义 - inserted: function(el) { + inserted: function (el) { // el.__vue__ && el.__vue__.focus(); } } }, computed: { - itemIconType() { + itemIconType () { if (!this.onItemIconTypeCallback) { if ( this.item.type === "XbsjTerrain" || diff --git a/Source/components/controls/MainBarControl/Entity/index.vue b/Source/components/controls/MainBarControl/Entity/index.vue index f0968f2e..be8aa711 100644 --- a/Source/components/controls/MainBarControl/Entity/index.vue +++ b/Source/components/controls/MainBarControl/Entity/index.vue @@ -342,7 +342,7 @@ export default { }, pinpicturebtn() { var PinPictureTool = new XE.Obj.Pin(this.$root.$earth); - PinPictureTool.ctrtype = "PinPictureTool"; + // PinPictureTool.ctrtype = "PinPictureTool"; PinPictureTool.name = "外置图标"; PinPictureTool.positionPicking = true; PinPictureTool.isCreating = true; diff --git a/Source/components/controls/MainBarControl/View/index.vue b/Source/components/controls/MainBarControl/View/index.vue index 8979b6b5..61a82c90 100644 --- a/Source/components/controls/MainBarControl/View/index.vue +++ b/Source/components/controls/MainBarControl/View/index.vue @@ -39,8 +39,8 @@
    -
    -
    +
    +
    {{lang.symbol}}
    -
    diff --git a/Source/components/viztools/GroundImageTool/index.vue b/Source/components/viztools/GroundImageTool/index.vue new file mode 100644 index 00000000..297d15fc --- /dev/null +++ b/Source/components/viztools/GroundImageTool/index.vue @@ -0,0 +1,650 @@ + + + + + + \ No newline at end of file diff --git a/Source/components/viztools/GroundImageTool/index_locale.js b/Source/components/viztools/GroundImageTool/index_locale.js new file mode 100644 index 00000000..a37216cf --- /dev/null +++ b/Source/components/viztools/GroundImageTool/index_locale.js @@ -0,0 +1,67 @@ +const zh = { + title:'标绘设置', + name:'名称', + creating:'鼠标点选', + editing:'修改位置', + imageUrls:'图标', + width: '宽', + height: '高', + autoWidth: '自动宽度', + autoHeight: '自动高度', + rotation: '角度', + show:'显示', + origin: { + x: "原点X", + y: "原点Y" + }, + position:{ + longitude:'经度', + latitude:'纬度', + height:'高度' + }, + enabled:'是否启用', + pinBuilder:{ + text:'内容', + size:'大小', + fillColor:'背景', + outlineColor:'边框/文字', + pinstyle:'图标' + }, + weizhi:"位置", + eidtbtn:"编辑按钮" +} + +const en = { + title:'Symbol Settings', + name:'Name', + creating:'Creat', + editing:'Edit', + imageUrls:'ImageUrl', + width: 'width', + height: 'height', + autoWidth: 'autoWidth', + autoHeight: 'autoHeight', + rotation: 'rotation', + origin: { + x: "originX", + y: "originY" + }, + show:'Show', + position:{ + longitude:'Longitude', + latitude:'Latitude', + height:'Height' + }, + enabled:'enabled', + pinBuilder:{ + text:'Text', + size:'Size', + fillColor:'FillColor', + outlineColor:'OutlineColor', + pinstyle:'Pinstyle' + }, + weizhi:"weizhi", + eidtbtn:"eidt btn" +} + +export default { zh, en } \ No newline at end of file diff --git a/Source/components/viztools/PinPictureTool/index.vue b/Source/components/viztools/PinPictureTool/index.vue index 03b29ef8..7654c888 100644 --- a/Source/components/viztools/PinPictureTool/index.vue +++ b/Source/components/viztools/PinPictureTool/index.vue @@ -89,6 +89,13 @@
    +
    +
    + + {{lang.isDivImage}} +
    +
    +
    @@ -133,6 +140,7 @@ export default { far: 25000000, near: 100, imageUrl: "", + isDivImage: true, scale: 1, show: true, position: [0, 0, 0], @@ -185,7 +193,8 @@ export default { scale: "pin.scale", enabled: "pin.enabled", pinBuilder: "pin.pinBuilder", - attachedPathGuid: "pin.attachedPathGuid" + attachedPathGuid: "pin.attachedPathGuid", + isDivImage: "pin.isDivImage" }; Object.entries(bindData).forEach(([sm, vm]) => { @@ -205,7 +214,7 @@ export default { this.makiIconObj = XE.Obj.Pin.MakiIcon; this.makiIconObj.null = ""; - if (this._czmObj.isCreating) { + if (this._czmObj.isCreating && !this.pin.imageUrl) { this.pin.imageUrl = "../../Examples/images/earth.png"; } diff --git a/Source/components/viztools/PinPictureTool/index_locale.js b/Source/components/viztools/PinPictureTool/index_locale.js index b331a080..619936f6 100644 --- a/Source/components/viztools/PinPictureTool/index_locale.js +++ b/Source/components/viztools/PinPictureTool/index_locale.js @@ -7,6 +7,7 @@ const zh = { far:'Far', near:'Near', imageUrl:'图标', + isDivImage: 'Div图标', scale:'缩放', show:'显示', pinstyletype:'内置样式', @@ -36,6 +37,7 @@ const en = { far:'Far', near:'Near', imageUrl:'ImageUrl', + isDivImage: 'Div Image', scale:'Scale', show:'Show', pinstyletype:'PinstyleType', diff --git a/Source/css/common.css b/Source/css/common.css index 6756ae4f..85ec8b11 100644 --- a/Source/css/common.css +++ b/Source/css/common.css @@ -598,7 +598,7 @@ overflow: hidden; cursor: default; border-color: rgba(71, 71, 71, 1); - margin-top: 28px; + /* margin-top: 28px; */ } .xbsj-input-number-handler-wrap { diff --git a/Source/managers/LabServer.js b/Source/managers/LabServer.js index cc6699e6..1197af96 100644 --- a/Source/managers/LabServer.js +++ b/Source/managers/LabServer.js @@ -349,6 +349,7 @@ class LabServer { * @param {String} id */ getSymbol (id) { + var self = this return new Promise((resolve, reject) => { axios .get(this.server + "symbol/group", { @@ -356,6 +357,11 @@ class LabServer { }) .then(res => { if (res.status === 200) { + if (res.data.symbols.rows.length === 1) { + var group = res.data.symbols.rows[0] + self.symbolGroupId = group._id + self.symbolContent = JSON.parse(group.content) + } resolve(res.data); } else { reject(res.data); @@ -389,6 +395,137 @@ class LabServer { }); }); } + + /** + * 添加标绘符号 + * @param {String} id groupSymbolId + * @param {String} symbol + */ + addSymbol (symbol) { + return new Promise((resolve, reject) => { + axios + .post(this.server + "symbol", QS.stringify({ + name: symbol.name, + type: symbol.type, + content: symbol.content, + image: symbol.image + })) + .then(res => { + if (res.status === 200) { + resolve(res.data); + } else { + reject(res.data); + } + }) + .catch(error => { + reject(error); + }); + }) + } + + + /** + * 修改符号 + * @param {String} id symbolId + * @param {String} group + */ + updateSymbol (id, options) { + return new Promise((resolve, reject) => { + axios + .post(this.server + "symbol/" + id, QS.stringify({ + name: options.name, + content: options.content + })) + .then(res => { + if (res.status === 200) { + resolve(res.data); + } else { + reject(res.data); + } + }) + .catch(error => { + reject(error); + }); + }); + } + + + /** + * 修改符号组 + * @param {String} id groupSymbolId + * @param {String} group + */ + updateSymbolGroup () { + return new Promise((resolve, reject) => { + axios + .post(this.server + "symbol/group/" + this.symbolGroupId, QS.stringify({ + name: this.symbolContent.name, + content: JSON.stringify(this.symbolContent) + })) + .then(res => { + if (res.status === 200) { + resolve(res.data); + } else { + reject(res.data); + } + }) + .catch(error => { + reject(error); + }); + }); + } + + addToSymbolGroup (symbol) { + var objJson = symbol.toJSON() + if(symbol.imageUrl){ + objJson.image = symbol.imageUrl + } + else if (symbol.imageUrls.length > 0) { + objJson.image = symbol.imageUrls[0] + } + delete objJson.xbsjGuid + var content = JSON.stringify(objJson) + var self = this + this.addSymbol({ name: objJson.name, type: objJson.xbsjType, content: content, image: objJson.image }) + .then(result => { + if (result.status === 'ok') { + self.symbolContent.symbols.push(result.id) + self.updateSymbolGroup() + .then(result => { + if (result.status === 'ok') { + self._root.promptInfo("添加成功！", "info") + self._root._comp.$refs.symbolTool[0].itemClick(); + } + }) + .catch(err => { + this.error = err; + }); + } + }) + .catch(err => { + this.error = err; + }); + } + + /** + * 创建Guid + */ + createGuid () { + return new Promise((resolve, reject) => { + axios + .get(this.server + "other/createGuid") + .then(res => { + if (res.status === 200) { + resolve(res.data); + } else { + reject(res.data); + } + }) + .catch(error => { + reject(error); + }); + }); + } } diff --git a/Source/managers/MainUI.js b/Source/managers/MainUI.js index 1c12e5a1..e67612db 100644 --- a/Source/managers/MainUI.js +++ b/Source/managers/MainUI.js @@ -143,12 +143,12 @@ class MainUI { data: { language: 'zh' }, - created() { + created () { this.$earth = earth; this.$earthUI = mainUI; this.$labServer = labServer; }, - mounted() { + mounted () { }, watch: { @@ -193,7 +193,7 @@ class MainUI { * @instance * @memberof ControlsCollection */ - get statusBar() { + get statusBar () { return mainUI._statusBar; }, // get navigator() { @@ -206,7 +206,7 @@ class MainUI { * @instance * @memberof ControlsCollection */ - get mainBar() { + get mainBar () { return mainUI._mainbar; } }; @@ -262,7 +262,7 @@ class MainUI { * @instance * @memberof ToolsCollection */ - get sceneTree() { + get sceneTree () { return mainUI._sceneTree; }, /** @@ -272,7 +272,7 @@ class MainUI { * @instance * @memberof ToolsCollection */ - get imageryLab() { + get imageryLab () { return mainUI._imageryLab; }, @@ -283,9 +283,9 @@ class MainUI { * @instance * @memberof ToolsCollection */ - get imageryLabCloud() { - return mainUI._imageryCloud; - }, + get imageryLabCloud () { + return mainUI._imageryCloud; + }, /** * 来自云平台的瓦片数据源选择器 @@ -294,20 +294,20 @@ class MainUI { * @instance * @memberof ToolsCollection */ - get modelCloud() { - return mainUI._modelCloud; - }, + get modelCloud () { + return mainUI._modelCloud; + }, - /** - * 来自云平台的地形数据源选择器 - * @readonly - * @type {terrainCloud} - * @instance - * @memberof ToolsCollection - */ - get terrainCloud() { - return mainUI._terrainCloud; - }, + /** + * 来自云平台的地形数据源选择器 + * @readonly + * @type {terrainCloud} + * @instance + * @memberof ToolsCollection + */ + get terrainCloud () { + return mainUI._terrainCloud; + }, /** * 在线的影像数据源选择器 @@ -316,7 +316,7 @@ class MainUI { * @instance * @memberof ToolsCollection */ - get imageryOnline() { + get imageryOnline () { return mainUI._imageryOnline; }, /** @@ -326,7 +326,7 @@ class MainUI { * @instance * @memberof ToolsCollection */ - get imageryWMTS() { + get imageryWMTS () { return mainUI._imageryWMTS; }, /** @@ -336,7 +336,7 @@ class MainUI { * @instance * @memberof ToolsCollection */ - get modelLab() { + get modelLab () { return mainUI._modelLab; }, /** @@ -346,7 +346,7 @@ class MainUI { * @instance * @memberof ToolsCollection */ - get modelOnline() { + get modelOnline () { return mainUI._modelOnline; }, /** @@ -356,7 +356,7 @@ class MainUI { * @instance * @memberof ToolsCollection */ - get terrainLab() { + get terrainLab () { return mainUI._terrainLab; }, /** @@ -366,7 +366,7 @@ class MainUI { * @instance * @memberof ToolsCollection */ - get terrainOnline() { + get terrainOnline () { return mainUI._terrainOnline; }, /** @@ -376,7 +376,7 @@ class MainUI { * @instance * @memberof ToolsCollection */ - get cameraViewManager() { + get cameraViewManager () { return mainUI._cameraViewManager; }, /** @@ -386,7 +386,7 @@ class MainUI { * @instance * @memberof ToolsCollection */ - get cutFillComputing() { + get cutFillComputing () { return mainUI._cutFillComputing; }, /** @@ -396,7 +396,7 @@ class MainUI { * @instance * @memberof ToolsCollection */ - get featureProperty() { + get featureProperty () { return mainUI._featureProperty; }, /** @@ -406,7 +406,7 @@ class MainUI { * @instance * @memberof ToolsCollection */ - get modelTree() { + get modelTree () { return mainUI._modelTree; }, /** @@ -416,7 +416,7 @@ class MainUI { * @instance * @memberof ToolsCollection */ - get entitymore() { + get entitymore () { return mainUI._entitymore; }, @@ -427,9 +427,9 @@ class MainUI { * @instance * @memberof ToolsCollection */ - get symbol() { - return mainUI._symbol; - } + get symbol () { + return mainUI._symbol; + } }; } }); @@ -540,7 +540,7 @@ class MainUI { }); } - get earth() { + get earth () { return this._earth; } @@ -550,7 +550,7 @@ class MainUI { * @param {Function} ok 点击确定按钮后的回调 * @param {Function} cancel 点击取消按钮后的回调 */ - confirm(info, ok, cancel) { + confirm (info, ok, cancel) { this._vm.$refs.mainUI.confirm(info, ok, cancel); } @@ -559,12 +559,12 @@ class MainUI { * @param {Object} czmObject 需要显示属性的对象 * @param {Object} options 其他参数，详细请见示例 */ - showPropertyWindow(czmObject, options) { + showPropertyWindow (czmObject, options) { this._vm.$refs.mainUI.showPropertyWindow(czmObject, options); } - destroy() { + destroy () { this._czmObjectOpsEventDisposer = this._czmObjectOpsEventDisposer && this._czmObjectOpsEventDisposer(); this._vm.$destroy(); @@ -579,7 +579,7 @@ class MainUI { * @param {Number} height 截图高度 * @param {String} filename 需要保存的文件名 */ - saveScreenToFile(width, height, filename) { + saveScreenToFile (width, height, filename) { this._earth .capture(width, height) .then(img => { @@ -599,10 +599,10 @@ class MainUI { * @instance * @type {String} */ - get language() { + get language () { return this._vm.language; } - set language(lang) { + set language (lang) { if (lang == "zh" || lang == "en") { { this._vm.language = lang; @@ -617,7 +617,7 @@ class MainUI { * @param {String} info 需要提示的内容 * @param {String} type 提示类型，分三种 'info','warning','error' */ - promptInfo(info, type) { + promptInfo (info, type) { this._vm.$refs.mainUI.promptInfo(info, type); } @@ -625,7 +625,7 @@ class MainUI { * 打开外部地址 * @param {String} url 地址链接 */ - openURL(url) { + openURL (url) { if (typeof this._openURLCB == 'function') { this._openURLCB(url); } @@ -640,10 +640,10 @@ class MainUI { * @instance * @type {Function} */ - get openURLCB() { + get openURLCB () { return this._openURLCB; } - set openURLCB(cb) { + set openURLCB (cb) { this._openURLCB = cb; } } From e56484d2631ac6d0b65bfc6bffe611f9d607086c Mon Sep 17 00:00:00 2001 From: caiying <2841902102@qq.com> Date: Wed, 20 Nov 2019 14:31:09 +0800 Subject: [PATCH 21/82] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E5=B0=8Fbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/controls/MainBarControl/Entity/index.vue | 2 +- Source/components/tools/EntityMoreTool/index.vue | 8 ++++---- Source/components/viztools/PolylineTool/index.vue | 4 ---- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Source/components/controls/MainBarControl/Entity/index.vue b/Source/components/controls/MainBarControl/Entity/index.vue index be8aa711..ca860f64 100644 --- a/Source/components/controls/MainBarControl/Entity/index.vue +++ b/Source/components/controls/MainBarControl/Entity/index.vue @@ -353,7 +353,7 @@ export default { // polylinebtn() { // var Polyline = new XE.Obj.Polyline(this.$root.$earth); // Polyline.name = "折线"; - // Polyline.positionPicking = true; + // Polyline.allowPicking = true; // Polyline.isCreating = true; // Polyline.creating = true; // this.$root.$earthUI.showPropertyWindow(Polyline); diff --git a/Source/components/tools/EntityMoreTool/index.vue b/Source/components/tools/EntityMoreTool/index.vue index 2e19ba51..f7d0b308 100644 --- a/Source/components/tools/EntityMoreTool/index.vue +++ b/Source/components/tools/EntityMoreTool/index.vue @@ -181,7 +181,7 @@ export default { SolidLine() { var Polyline = new XE.Obj.Polyline(this.$root.$earth); Polyline.name = "实线"; - Polyline.positionPicking = true; + Polyline.allowPicking = true; Polyline.isCreating = true; Polyline.creating = true; this.$root.$earthUI.showPropertyWindow(Polyline); @@ -191,7 +191,7 @@ export default { var Polyline = new XE.Obj.Polyline(this.$root.$earth); Polyline.name = "虚线"; Polyline.material.type = "XbsjPolylineDashMaterial"; - Polyline.positionPicking = true; + Polyline.allowPicking = true; Polyline.isCreating = true; Polyline.creating = true; this.$root.$earthUI.showPropertyWindow(Polyline); @@ -201,7 +201,7 @@ export default { var Polyline = new XE.Obj.Polyline(this.$root.$earth); Polyline.name = "箭头线"; Polyline.material.type = "XbsjPolylineArrowMaterial"; - Polyline.positionPicking = true; + Polyline.allowPicking = true; Polyline.isCreating = true; Polyline.creating = true; this.$root.$earthUI.showPropertyWindow(Polyline); @@ -211,7 +211,7 @@ export default { var Polyline = new XE.Obj.Polyline(this.$root.$earth); Polyline.name = "OD线"; Polyline.material.type = "XbsjODLineMaterial"; - Polyline.positionPicking = true; + Polyline.allowPicking = true; Polyline.isCreating = true; Polyline.creating = true; this.$root.$earthUI.showPropertyWindow(Polyline); diff --git a/Source/components/viztools/PolylineTool/index.vue b/Source/components/viztools/PolylineTool/index.vue index 3b03793e..9b5f766f 100644 --- a/Source/components/viztools/PolylineTool/index.vue +++ b/Source/components/viztools/PolylineTool/index.vue @@ -660,25 +660,21 @@ export default { this.materialName = c.name; this.materialType = c.type; if (c.type === "XbsjColorMaterial") { - this.polyline.width = 2; this.colorMaterialBox = true; this.dashMaterialBox = false; this.arrowMaterialBox = false; this.oDLineMaterialBox = false; } else if (c.type === "XbsjPolylineDashMaterial") { - this.polyline.width = 6; this.colorMaterialBox = false; this.dashMaterialBox = true; this.arrowMaterialBox = false; this.oDLineMaterialBox = false; } else if (c.type === "XbsjPolylineArrowMaterial") { - this.polyline.width = 20; this.colorMaterialBox = false; this.dashMaterialBox = false; this.arrowMaterialBox = true; this.oDLineMaterialBox = false; } else { - this.polyline.width = 2; this.colorMaterialBox = false; this.dashMaterialBox = false; this.arrowMaterialBox = false; From 0b98bf60e0696c1a90d97737b56b6eaf5915d471 Mon Sep 17 00:00:00 2001 From: vtxf Date: Thu, 14 Nov 2019 17:39:43 +0800 Subject: [PATCH 22/82] winPos --- Apps/Examples/earth-pin-div.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Apps/Examples/earth-pin-div.html b/Apps/Examples/earth-pin-div.html index 43ec8cf7..107af209 100644 --- a/Apps/Examples/earth-pin-div.html +++ b/Apps/Examples/earth-pin-div.html @@ -58,7 +58,7 @@ v-show="showInfo" class="dialog" @click = fly - :style="{ left: (winPos[0] - 62) + 'px', bottom: winPos[1] + 'px' }" + :style="{ left: (winPos[0] - 62) + 'px', bottom: winPos[3] + 'px' }" > 点击飞入大雁塔！
    @@ -68,7 +68,7 @@ return { _earth: undefined, // 注意：Earth和Cesium的相关变量放在vue中，必须使用下划线作为前缀！ showInfo: true, - winPos: [0, 0], + winPos: [0, 0, 0, 0], }; }, // 1.1 资源创建 From 1f773505d27a2110f208f0c529043452c2eb8749 Mon Sep 17 00:00:00 2001 From: vtxf Date: Sat, 16 Nov 2019 19:17:47 +0800 Subject: [PATCH 23/82] =?UTF-8?q?=E5=88=86=E8=BE=A8=E7=8E=87=E5=8F=98?= =?UTF-8?q?=E5=8C=96=E4=BB=A5=E5=90=8E=E8=BF=98=E4=BC=9A=E6=9C=89=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Apps/Examples/test-polygonPicking.html | 314 ++++++++++++++++++++++++- 1 file changed, 311 insertions(+), 3 deletions(-) diff --git a/Apps/Examples/test-polygonPicking.html b/Apps/Examples/test-polygonPicking.html index db8694e4..4640997c 100644 --- a/Apps/Examples/test-polygonPicking.html +++ b/Apps/Examples/test-polygonPicking.html @@ -23,6 +23,313 @@
    + From a2486649611e16848b79b06a7b73a81abdea815a Mon Sep 17 00:00:00 2001 From: vtxf Date: Tue, 19 Nov 2019 22:26:45 +0800 Subject: [PATCH 36/82] createCylinder2 --- Apps/Examples/earth-digitalCity.html | 76 +++++++++++++++------------- 1 file changed, 41 insertions(+), 35 deletions(-) diff --git a/Apps/Examples/earth-digitalCity.html b/Apps/Examples/earth-digitalCity.html index 4001337e..c0617b04 100644 --- a/Apps/Examples/earth-digitalCity.html +++ b/Apps/Examples/earth-digitalCity.html @@ -483,7 +483,7 @@ renderState, }; - let p = new XE.Obj.CustomPrimitive(earth); + const p = new XE.Obj.CustomPrimitive(earth); p.xbsjFromJSON(config); } } @@ -531,47 +531,53 @@ } function createCylinder2(earth) { - var p = new XE.Obj.CustomPrimitive(earth) - window.p = p; // 方便调试 - p.position = [2.1206125026580582,0.545178729438238,15]; - p.scale = [500, 500, 100]; - - var cylinder = XE.Obj.CustomPrimitive.Geometry.createCylinder(1.0, 1.0, 1.0, 30); - p.positions = cylinder.positions; - p.sts = cylinder.sts; - p.indices = cylinder.indices; - // p.indices = [0, 1, 2]; - - p.renderState = XE.Obj.CustomPrimitive.getRenderState(true, true); - p.renderState.cull.enabled = false; - - p.canvasWidth = 1; - p.canvasHeight = 256; - p.color = [0.5, 0.8, 1, 2]; - - p.drawCanvas(ctx => { - ctx.clearRect(0, 0, 1, 256); + const cylinder = XE.Obj.CustomPrimitive.Geometry.createCylinder(1.0, 1.0, 1.0, 30); + const renderState = XE.Obj.CustomPrimitive.getRenderState(true, true); + renderState.cull.enabled = false; + const evalString = ` + p.canvasWidth = 1; + p.canvasHeight = 256; + p.drawCanvas(ctx => { + ctx.clearRect(0, 0, 1, 256); - var lingrad2 = ctx.createLinearGradient(0,0,0,256); - lingrad2.addColorStop(0, 'rgba(255,255,255,0)'); - lingrad2.addColorStop(1, 'rgba(255,255,255,1)'); + var lingrad2 = ctx.createLinearGradient(0,0,0,256); + lingrad2.addColorStop(0, 'rgba(255,255,255,0)'); + lingrad2.addColorStop(1, 'rgba(255,255,255,1)'); - ctx.fillStyle = lingrad2; - ctx.fillRect(0, 0, 1, 256); - }); + ctx.fillStyle = lingrad2; + ctx.fillRect(0, 0, 1, 256); + }); + `; - let t = 0.0; - earth.czm.scene.preUpdate.addEventListener(() => { - t += 0.01 * 0.3; - if (t > 1.0) { - t = 0.0; + const preUpdateEvalString = ` + if (typeof p.dt === 'undefined') p.dt = 0.0; + p.dt += 0.01 * 0.3; + if (p.dt > 1.0) { + p.dt = 0.0; } - const b = (1.0-Math.cos(t*Math.PI*2.0))*0.5; - p.scale[0] = p.scale[1] = 1000 * (1.0-Math.cos(t*Math.PI))*0.5; + const b = (1.0-Math.cos(p.dt*Math.PI*2.0))*0.5; + p.scale[0] = p.scale[1] = 1000 * (1.0-Math.cos(p.dt*Math.PI))*0.5; p.scale[2] = 200 * b; p.color[3] = 2.0 * b; - }); + `; + + const config = { + evalString, + preUpdateEvalString, + position: [2.1206125026580582,0.545178729438238,15], + scale: [500, 500, 100], + positions: cylinder.positions, + sts: cylinder.sts, + indices: cylinder.indices, + renderState: renderState, + canvasWidth: 1, + canvasHeight: 256, + color: [0.5, 0.8, 1, 2], + } + + const p = new XE.Obj.CustomPrimitive(earth); + p.xbsjFromJSON(config); return p; } From 8105333c78ef6939e3f3e86f2a1e67bae918d024 Mon Sep 17 00:00:00 2001 From: vtxf Date: Tue, 19 Nov 2019 22:31:46 +0800 Subject: [PATCH 37/82] createCylinder --- Apps/Examples/earth-digitalCity.html | 70 +++++++++++++++------------- 1 file changed, 38 insertions(+), 32 deletions(-) diff --git a/Apps/Examples/earth-digitalCity.html b/Apps/Examples/earth-digitalCity.html index c0617b04..a1202622 100644 --- a/Apps/Examples/earth-digitalCity.html +++ b/Apps/Examples/earth-digitalCity.html @@ -489,43 +489,49 @@ } function createCylinder(earth) { - var p = new XE.Obj.CustomPrimitive(earth) - p.position = [2.120597930315031, 0.5451624300822016, 150]; - p.scale = [100, 100, 314]; - - var cylinder = XE.Obj.CustomPrimitive.Geometry.createCylinder(1.0, 1.0, 1.0, 30); - p.positions = cylinder.positions; - p.sts = cylinder.sts; - p.indices = cylinder.indices; - // p.indices = [0, 1, 2]; - - p.renderState = XE.Obj.CustomPrimitive.getRenderState(true, true); - p.renderState.cull.enabled = false; - - p.canvasWidth = 512; - p.canvasHeight = 512; - - Cesium.Resource.createIfNeeded('./images/city/circular2.png').fetchImage().then(function(image) { - console.log('image loaded!'); + const renderState = XE.Obj.CustomPrimitive.getRenderState(true, true); + renderState.cull.enabled = false; + const cylinder = XE.Obj.CustomPrimitive.Geometry.createCylinder(1.0, 1.0, 1.0, 30); + const evalString = ` p.canvasWidth = 512; - p.canvasHeight = 256; + p.canvasHeight = 512; + Cesium.Resource.createIfNeeded('./images/city/circular2.png').fetchImage().then(function(image) { + console.log('image loaded!'); + p.canvasWidth = 512; + p.canvasHeight = 256; - p.drawCanvas(ctx => { - ctx.clearRect(0, 0, 512, 256); - ctx.drawImage(image, 0, 0); - }); + p.drawCanvas(ctx => { + ctx.clearRect(0, 0, 512, 256); + ctx.drawImage(image, 0, 0); + }); - p.color = [0.5, 0.8, 1, 2]; - }); + p.color = [0.5, 0.8, 1, 2]; + }); + `; - let angle = 0.0; - earth.czm.scene.preUpdate.addEventListener(() => { - angle -= 1.0; - if (angle > 360.0) { - angle = 0.0; + const preUpdateEvalString = ` + if (typeof p.dAngle === 'undefined') p.dAngle = 360.0; + p.dAngle -= 1.0; + if (p.dAngle < 0.0) { + p.dAngle = 360.0; } - p.rotation[0] = angle / 180.0 * Math.PI; - }); + p.rotation[0] = p.dAngle / 180.0 * Math.PI; + `; + + const config = { + evalString, + preUpdateEvalString, + position: [2.120597930315031, 0.5451624300822016, 150], + scale: [100, 100, 314], + positions: cylinder.positions, + sts: cylinder.sts, + indices: cylinder.indices, + renderState, + canvasWidth: 512, + canvasHeight: 512, + }; + const p = new XE.Obj.CustomPrimitive(earth); + p.xbsjFromJSON(config); return p; } From 2f0adac526f473f10bed558820896c95e3099bf9 Mon Sep 17 00:00:00 2001 From: vtxf Date: Wed, 20 Nov 2019 10:09:46 +0800 Subject: [PATCH 38/82] createGroundCircle --- Apps/Examples/earth-digitalCity.html | 50 ++++++++++++++++------------ 1 file changed, 28 insertions(+), 22 deletions(-) diff --git a/Apps/Examples/earth-digitalCity.html b/Apps/Examples/earth-digitalCity.html index a1202622..ee3e2547 100644 --- a/Apps/Examples/earth-digitalCity.html +++ b/Apps/Examples/earth-digitalCity.html @@ -589,27 +589,20 @@ } function createGroundCircle(earth) { - var p = new XE.Obj.CustomGroundRectangle(earth) - p.position = [2.1208980215153845, 0.5450726579947579, 41.369588015024185]; - p.width = 1000; - p.height= 1000; - p.canvasWidth = 512; - p.canvasHeight = 512; - p.color = [0.5, 0.8, 1, 2]; - - let ctx_image = undefined; - Cesium.Resource.createIfNeeded('./images/circle.png').fetchImage().then(function(image) { - console.log('image loaded!'); - ctx_image = image; - }); + const evalString = ` + Cesium.Resource.createIfNeeded('./images/circle.png').fetchImage().then(function(image) { + console.log('image loaded!'); + p._ctx_image = image; + }); + `; - let angle = 0.0; - earth.czm.scene.preUpdate.addEventListener(() => { - angle -= 1.0; - if (angle > 360.0) { - angle = 0.0; + const preUpdateEvalString = ` + if (typeof p.dAngle === 'undefined') p.dAngle = 360.0; + p.dAngle -= 1.0; + if (p.dAngle < 0.0) { + p.dAngle = 360.0; } - const rotation = angle / 180.0 * Math.PI; + const rotation = p.dAngle / 180.0 * Math.PI; p.drawCanvas(ctx => { ctx.clearRect(0, 0, 512, 512); @@ -621,16 +614,29 @@ ctx.arc(256, 256, 250, 0, Math.PI*2, true); ctx.stroke(); - if (ctx_image) { + if (p._ctx_image) { ctx.save(); ctx.translate(256, 256); ctx.rotate(rotation); ctx.translate(-256, -256); - ctx.drawImage(ctx_image, 0, 0); + ctx.drawImage(p._ctx_image, 0, 0); ctx.restore(); } }); - }); + `; + + const config = { + evalString, + preUpdateEvalString, + position: [2.1208980215153845, 0.5450726579947579, 41.369588015024185], + width: 1000, + height: 1000, + canvasWidth: 512, + canvasHeight: 512, + color: [0.5, 0.8, 1, 2], + }; + const p = new XE.Obj.CustomGroundRectangle(earth); + p.xbsjFromJSON(config); return p; } From ed6448b9b3957dabcd49b4d92801f623f9561a43 Mon Sep 17 00:00:00 2001 From: vtxf Date: Wed, 20 Nov 2019 11:21:18 +0800 Subject: [PATCH 39/82] createLabel2 --- Apps/Examples/earth-digitalCity.html | 97 +++++++++++++++++----------- 1 file changed, 58 insertions(+), 39 deletions(-) diff --git a/Apps/Examples/earth-digitalCity.html b/Apps/Examples/earth-digitalCity.html index ee3e2547..0598a52a 100644 --- a/Apps/Examples/earth-digitalCity.html +++ b/Apps/Examples/earth-digitalCity.html @@ -808,6 +808,7 @@ ctx.fillStyle = 'rgb(255, 255, 0)'; ctx.fillText('西部世界总部基地', 110, 90); + // p.winPos 为一个含有4个元素的数组，分别表示[left, top, right, bottom] XE.MVVM.watch(() => [...p.winPos], winPos => { // console.log(`winPos: ${winPos.toString()}`); labelDiv.style.left = `${winPos[0]}px`; @@ -820,59 +821,77 @@ p.position = [2.1204918655649285,0.5452743468087804,209.94294540636682]; p.show = false; - const labelDiv = document.createElement('div'); - labelDiv.style = ` - // background: grey; - width: 300px; - height: 200px; - position: absolute; - pointer-events: none; - `; - earth.czm.viewer.container.appendChild(labelDiv); + function createLabelCanvas(p) { + const labelDiv = document.createElement('div'); + labelDiv.style = ` + // background: grey; + width: 300px; + height: 200px; + position: absolute; + pointer-events: none; + `; + p._earth.czm.viewer.container.appendChild(labelDiv); + p._labelDiv = labelDiv; + // p.disposers是一堆会调用函数的数组，会在对象销毁时按照后进先出的顺序调用。 + p.disposers.push(() => { + if (p._labelDiv) { + p._earth.czm.viewer.container.removeChild(p._labelDiv); + p._labelDiv = undefined; + } + }); - const labelCanvas = document.createElement('canvas'); - labelCanvas.style = ` - width: 100%; - height: 100%; - `; + const labelCanvas = document.createElement('canvas'); + labelCanvas.style = ` + width: 100%; + height: 100%; + `; - labelCanvas.width = 300; - labelCanvas.height = 200; - labelDiv.appendChild(labelCanvas); + labelCanvas.width = 300; + labelCanvas.height = 200; + labelDiv.appendChild(labelCanvas); - const ctx = labelCanvas.getContext('2d'); + return labelCanvas; + } + + function createDrawFunc(p) { + const labelCanvas = createLabelCanvas(p); + const ctx = labelCanvas.getContext('2d'); + function draw(w) { + ctx.clearRect(0, 0, 300, 200); - function draw(w) { - ctx.clearRect(0, 0, 300, 200); - - ctx.save(); - ctx.beginPath(); - ctx.rect((w-1)*300, 0, 300, 200); - ctx.clip(); - - ctx.strokeStyle = 'rgb(255, 255, 0)'; - ctx.beginPath(); - ctx.lineTo(0, 200); - ctx.lineTo(100, 100); - ctx.lineTo(250, 100); - ctx.stroke(); - ctx.font = "16px console"; - // ctx.textBaseline = "middle"; - ctx.fillStyle = 'rgb(255, 255, 0)'; - ctx.fillText('西部世界总部基地', 110, 90); - ctx.restore(); + ctx.save(); + ctx.beginPath(); + ctx.rect((w-1)*300, 0, 300, 200); + ctx.clip(); + + ctx.strokeStyle = 'rgb(255, 255, 0)'; + ctx.beginPath(); + ctx.lineTo(0, 200); + ctx.lineTo(100, 100); + ctx.lineTo(250, 100); + ctx.stroke(); + ctx.font = "16px console"; + // ctx.textBaseline = "middle"; + ctx.fillStyle = 'rgb(255, 255, 0)'; + ctx.fillText('西部世界总部基地', 110, 90); + ctx.restore(); + } + + p._dDraw = draw; } + createDrawFunc(p); + let d = 0; let c = 0; - draw(c); + p._dDraw(c); earth.czm.scene.preUpdate.addEventListener(() => { if (d !== c) { c += (d - c) * 0.1; if (Math.abs(c - d) < 0.1) { c = d; } - draw(c); + p._dDraw(c); } }); From 7dfe205b4ec3a0cd35553d006d17ec5030ddfa2c Mon Sep 17 00:00:00 2001 From: vtxf Date: Wed, 20 Nov 2019 11:48:21 +0800 Subject: [PATCH 40/82] createLabel2 --- Apps/Examples/earth-digitalCity.html | 43 ++++++++++++++++++---------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/Apps/Examples/earth-digitalCity.html b/Apps/Examples/earth-digitalCity.html index 0598a52a..02d274f0 100644 --- a/Apps/Examples/earth-digitalCity.html +++ b/Apps/Examples/earth-digitalCity.html @@ -817,19 +817,16 @@ } function createLabel2(earth) { - let p = new XE.Obj.Pin(earth); - p.position = [2.1204918655649285,0.5452743468087804,209.94294540636682]; - p.show = false; - + const evalString = ` function createLabelCanvas(p) { const labelDiv = document.createElement('div'); - labelDiv.style = ` + labelDiv.style = \` // background: grey; width: 300px; height: 200px; position: absolute; pointer-events: none; - `; + \`; p._earth.czm.viewer.container.appendChild(labelDiv); p._labelDiv = labelDiv; // p.disposers是一堆会调用函数的数组，会在对象销毁时按照后进先出的顺序调用。 @@ -841,10 +838,10 @@ }); const labelCanvas = document.createElement('canvas'); - labelCanvas.style = ` + labelCanvas.style = \` width: 100%; height: 100%; - `; + \`; labelCanvas.width = 300; labelCanvas.height = 200; @@ -885,7 +882,7 @@ let d = 0; let c = 0; p._dDraw(c); - earth.czm.scene.preUpdate.addEventListener(() => { + const preUpdateListener = earth.czm.scene.preUpdate.addEventListener(() => { if (d !== c) { c += (d - c) * 0.1; if (Math.abs(c - d) < 0.1) { @@ -894,13 +891,14 @@ p._dDraw(c); } }); + p.disposers.push(() => preUpdateListener && preUpdateListener()); - const container = earth.czm.viewer.container; - - XE.MVVM.watch(() => [...p.winPos], winPos => { - // console.log(`winPos: ${winPos.toString()}`); - labelDiv.style.left = `${winPos[0]}px`; - labelDiv.style.bottom = `${winPos[3]}px`; + const container = p._earth.czm.viewer.container; + const unwatch = XE.MVVM.watch(() => [...p.winPos], winPos => { + if (p._labelDiv) { + p._labelDiv.style.left = \`\${winPos[0]}px\`; + p._labelDiv.style.bottom = \`\${winPos[3]}px\`; + } // winPos 为一个包含4个元素的数组，分别代表 [left, top, right, bottom] if (winPos[0] > container.offsetWidth * 0.3 && winPos[0] < container.offsetWidth * 0.7 && @@ -910,6 +908,21 @@ d = 0.0; } }); + p.disposers.push(() => { unwatch && unwatch(); }); + `; + + // let p = new XE.Obj.Pin(earth); + // p.position = [2.1204918655649285,0.5452743468087804,209.94294540636682]; + // p.show = false; + // p.evalString = evalString; + + const p = new XE.Obj.Pin(earth); + const config = { + position: [2.1204918655649285,0.5452743468087804,209.94294540636682], + show: false, + evalString: evalString, + }; + p.xbsjFromJSON(config); } // 1 XE.ready()会加载Cesium.js等其他资源，注意ready()返回一个Promise对象。 From 532844fcbd7a0724a1a7d48b3208ed9f7f2eee0d Mon Sep 17 00:00:00 2001 From: vtxf Date: Wed, 20 Nov 2019 14:16:40 +0800 Subject: [PATCH 41/82] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=87=BD=E6=95=B0?= =?UTF-8?q?=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Apps/Examples/earth-digitalCity.html | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Apps/Examples/earth-digitalCity.html b/Apps/Examples/earth-digitalCity.html index 02d274f0..abc021a3 100644 --- a/Apps/Examples/earth-digitalCity.html +++ b/Apps/Examples/earth-digitalCity.html @@ -739,6 +739,13 @@ var positionsCollection = p.map(e => { const toDegree = 180.0 / Math.PI; + // Cesium.xbsjCreateTransmitPolyline 根据 首末端点生成弧线， + // 参数有： + // startPosition, 端点1 + // endPosition, 端点2 + // minDistance, 计算出的线段的最小间隔距离 + // heightRatio=1.0 弧线高度抬升程度，值越大，抬高得越明显 + // 返回值是cartesian类型的坐标数组 const cartesians = Cesium.xbsjCreateTransmitPolyline(e[0], e[1], 50.0, 5.0); const poss = cartesians.map(ee => { const carto = Cesium.Cartographic.fromCartesian(ee); From 72616c0965867b2fbb27128f3ade838a6b4d0289 Mon Sep 17 00:00:00 2001 From: caiying <2841902102@qq.com> Date: Fri, 22 Nov 2019 10:43:45 +0800 Subject: [PATCH 42/82] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86pin=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E9=9D=A2=E6=9D=BF=E4=B8=AD=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Apps/Examples/earth-pin-pinBuilder.html | 2 +- Source/components/viztools/PinTool/index.vue | 4 ++-- Source/components/viztools/PinTool/index_locale.js | 10 +++++++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Apps/Examples/earth-pin-pinBuilder.html b/Apps/Examples/earth-pin-pinBuilder.html index 7d77cec9..cef2fb10 100644 --- a/Apps/Examples/earth-pin-pinBuilder.html +++ b/Apps/Examples/earth-pin-pinBuilder.html @@ -55,7 +55,7 @@
    pin填充颜色：
    pin边框和文字颜色：
    - pin文本内容:
    + pin扩展文本:
    pin文本内容字体样式:
    pin文本内容左右偏移:
    pin文本内容上下偏移:
    diff --git a/Source/components/viztools/PinTool/index.vue b/Source/components/viztools/PinTool/index.vue index 7712bdb0..2cc6495c 100644 --- a/Source/components/viztools/PinTool/index.vue +++ b/Source/components/viztools/PinTool/index.vue @@ -140,12 +140,12 @@
    - +
    - +
    diff --git a/Source/components/viztools/PinTool/index_locale.js b/Source/components/viztools/PinTool/index_locale.js index 361b0e51..85695d8a 100644 --- a/Source/components/viztools/PinTool/index_locale.js +++ b/Source/components/viztools/PinTool/index_locale.js @@ -22,8 +22,10 @@ const zh = { fillColor: '图标背景', outlineColor: '边框/文字', pinstyle: '图标', - exttext: '文本内容', - exttextfont: '字体样式' + exttext: '扩展文本', + exttextfont: '字体样式', + lroffset: '左右偏移', + tboffset: '上下偏移' }, weizhi: "位置", eidtbtn: "编辑按钮", @@ -55,7 +57,9 @@ const en = { outlineColor: 'OutlineColor', pinstyle: 'Pinstyle', exttext: 'extText', - exttextfont: 'extTextFont' + exttextfont: 'extTextFont', + lroffset: 'lroffset', + tboffset: 'tboffset' }, weizhi: "weizhi", eidtbtn: "eidt btn", From 11b2e2092f497efccd3c469742f8fd1c65c25a79 Mon Sep 17 00:00:00 2001 From: caiying <2841902102@qq.com> Date: Fri, 22 Nov 2019 11:58:40 +0800 Subject: [PATCH 43/82] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=A4=96?= =?UTF-8?q?=E7=BD=AE=E5=9B=BE=E6=A0=87=E7=9A=84=E5=9B=BE=E7=89=87=E8=B7=AF?= =?UTF-8?q?=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Apps/assets/earth.png | Bin 0 -> 65796 bytes .../viztools/PinPictureTool/index.vue | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 Apps/assets/earth.png diff --git a/Apps/assets/earth.png b/Apps/assets/earth.png new file mode 100644 index 0000000000000000000000000000000000000000..db93bca6b6c8c47934a18b847f11e747ab12aadc GIT binary patch literal 65796 zcmV)sK$yRYP)lMCN^_OjmVRcUN^cyPH;|M2RauD~*O@Fe7OOyU+|UJHYM&i`icm*nedI zjKyO2mjOnCM&3}4lou&_vdQ-4y?O4M%!pVV6Ooa5^S*lJtGizi#eVO;d-JA=IC0K* zzVjUuV~jW)hvRU3Rx`NA*#^0UyLM zw%E$ohJWAhZ~F~n%+g=W*V4~p?@Qmc>TieR=^Tfk;s|-Df zjlu_K92$hDc#Q4r<$s^XM>q5!4voYIYaE6QPss=&EG?3N2!wc`#UG20ngiMi`pkas z?f!20Z0LM=kwNnGV;%q* zhGYQlwgAcno&K8)!*H?l&n9%Ah1ErU_v=sZ8=lkBIT}YV>Sw}Tk8KQn-s!*2kdPse zN`$4Abp+UL(I5Y@PU$+p)^-~xV7+%&L0I09> zud!InYH0ZUlGj4#>(wk6{yoIu!p3O)KU~DtCcH$#gYH`G;J+z!Fg*j2LWw8oJ$%>< z#GyfWh=Xor2?~yl{lWnmV>@QI!wUeXF0^T3>1QaI=L6MUz-W=ZD(AD zi`GPopjisT#z2i2XDYmADF$BA;1~&ODASw!-`htsK1@d8&>%d7F*F3L;{4(0Es&+% zQIL9`>^Ab`j~a%wZGevfO)HDM2?l#UV0-Rya}jZ?vA8{Jai;~QO@nD`u~V8a3%)?mFdSg$QME8y4!*sL8+)Dh2Z)_A@S z*mS^}vv8F`4Z}azP8YN;}Tx+nM7a<$}s?cUR{W$!2jPo#-%6%N;gKQuU4Z?kn zWCSb>d~7*KZ-ZR|+-Mhvy7mm>k-N>iA;tIdIof@Bu~@^$fbPnz2?)ePfQ63^ix6>Z z=5c8+;POtug;~Ijy@;#35jR_pS(F_)(y^mMh#oB)Doq;(!)q~++h1S=ys&J?F_2*u z)Dwu1GY28EM`Cq%u6Qj6RPflW4Nh&;IJ0SRdOhOQkqWPE8l2j6I6|K>m1Ync7``qt zbXCW*FzTf!{y@K5x?jBTUFR{_iam<4Y0KwJ*8!J3DPT2tyZrfw8+v>Y4a1>9xW`d? z15DH@QfxEFP5D+}k#c)`T$DNT~l6Fiwf(sUH0B$!9XSe5gcPHZP zuE)i_7IzwpnK#&5G-!>%yak5`o)$rrMZv(H?RHCfy^GT+W|#1wi_J4s7&^!>XAKHm zB&6R>gbxuRI>cc4>(;Et5eH0cL|s*wSm0OG9WY(qoj3Q`?Yz9e1MOHfPY!a-qif*2;p0?Q#S@uCJ?L9qmAV0)EsskuUi~nGdNyZJU=mb>DU@x-HiCmF^3n9L{ydF z4?ztrTEH2DHaZYS8hyyPiHVhZ6d`*u9XJWT-&TzW0hbADU~D2Du9?4dC=qhff?acyT*+kEO=;EDH}jP#}>&{dQXP7K^tm5-gE07pMJ*S z?TE!I8^FhoI2_*)Z@>qR1QeGk4RBxs5QE9Tm!6T}Ahmb~Rt$!C44p?YHXe5E#Gyg> z0FN>}z&>d#VFyc55AD31lc#9j09Ewxgu0sw3m+cl}+C*$E4e9y)I%azt7u<6BCagIX=N>o~!VgV--Gj z#Nxz8z|lzsc*=};&aSxF5wLRD5S(}j@^xaQ`FZ+mC@75R>L*rd1dZbi4?3Q9!|;(e z2)&73gau{FYPhqe-)X`nAPoAjofX%#ZCmUG&%huVfv;Ve;va8YoSQCCg^1eK>`v2C zsktb~@HG|{v%*5bFo~iM(ryPFdM1>RU z5yv^T8R2cs1|abkI!bg&Z0f=S2`SRO4MlO)7&ZFPAbg|;17Z4azlT;%9CF{It9WM= zC%t9Ve5WQRiJ`$4!7IiJ6R8<39?Wam!?#Y%*f3$LPPFC>GY+$AF(m5=Ej zSjHFVlnF$PUNba=D-zd&QkoW6HxnGIB7WkO!!N$Dj!!=mu(pz8V6IG6`wfwZf_k!U}AS=iEETrVwrc5qWlf z#P@Fn{PootzI7|&`pjW>-e5sTagKpRiT`ci&Ciq8^%i(Jmft(@1_q42bUo$Y#`5fA z$LZG2YGbhKyGxIuznsR-p-bHYVi3|dn&hcbn9($72z0Op8yhuVx~8z;b5}6pU$z45sRDw z3H*<;6!WHK+~viMh}VwR_`)+5Kl9=`UOwX3n_@O68m3&q8OpB5vl1qDAYF$U$QbUx_lkOt(Wejc`LQrzjIcB26%4(HWe;I+uM2}< zdw;UM^I(=Ig%zB@>}oHjjb~5m^qRqsov866&l~*oNr#t?%f0jqbSh6Kox5Z3(zt*w z7rT6|r5Bet4*Pjp_cIO+!V?@NAlRi6OBb>$@ab+zV6cl^PZCN>5h7vZUB5cl;oaYQIn-zcvCkmSMsw zBhsZS$A?vRW0y(LU3Ub?gyJ1ACjZqYx_8cuEQEwaI18mLiIhYP#Soa&z~|-{mn$s2X^Vaw0m?rg6|k@Rn3^eV$tILZI8dbVel7Mrg&$|ql%6*3(nQ-QM9H(W!J=z z*qC=Sj!kVU6_!fDfMu7yJlFlkL3gRKNteLN@d>F0QnMXnWB6)Ms?98`DJ>Zo)1`Cs zjvNQ2(G;8+uh|vHj86))*q9Rkf@?Ec)rF8uL)!%AH$1x$IVDv*FVuRXa^xws1ygf5@wMq3U%Roum(E3e ze`^MB*HMQSZIvnnmD)?GKql-M0m*DxNMsq5kXLfZ34yz!{3bUtu^y z@#3VyFP?Vz#TO?yb2Q*+EnHEm5@qd(18Px}p2EYVJs%o`Cot&pD8D^iY~wpan(kU0 z6Kl+xfUjPk;`h!q_`xlQJuJ|mVz97|b3|v+#)(t`vW`Ft&sjICprcVKk;CKnp5 zzWw+6_k#k8L#lEaE)2ttC9j|;h)QZn%V|wbJE|ctdXGAc!7O~WVp;;B=3u`9Z%_7Z#gZzW+Pr*Gx*|}P5k^BhZoj`t>{D5k+Sw9pT!P?V4jJq zdsxbYj;GBie5egV3J-eBJdF=it{mtp6_YzCyGO+Pw>^IQ!VG_VHR9UTU>-dt)f%%8 z9i<}4^B`QoOkhkSRe!dq-7jPGgx(jNg9mj#AJibAASw+BNJ9fU1PvT@33_2*q8C(~lDPZMW1SKXpTI7T$7|*Y9fmLG}XE?F$@Y$0U ze);7Ie*9U(s#4y^m1)LqK9p?Lzy_fN7aw#S8idC*=(5^&!Et(*Tkp93BrxJAi+~n$ zH$g?rI5q^p*396~uS9(L!XAFG9k5NA1Jh!yp0M%|&mop8Q_VuVynss8;m7^ZlhHfK zqqQ)jS%sdS=m?%x>kD0Dk^TDa^P z(zB-$Z5z!Bqe;oB%?5#WEHr$$pE)ob zhX&yxk0D+F6jI_L_BsDiexGOx>)joXuUu~N`|rJW6NwzlkdcJfCY+V& zA$WoIIJ5~&EA!L)XA2(Zy%>JyK^EU|n5>sz2FL2&m<`Gb#-T;u!$^i8y*8fV>?$}{ z0e)7`I}S7+@(~g&;T9|{H}}A%v6zPiED6-md)p}*4j(P5(Bk!DoA{MiJbvl)CaOuA zFS^KMqrhkqzzNHM@dFx#Lxb>;#+YYN4yryhzGd2QYb;BcP>uecZ}F9DEq?2VE#8^g7AQc{-z&?i`?B-JHDOiqQ_e&Bys0(?&V?QoK3G5|fP`-cJLlA>t%k*J+ zykhm+B88cowv>%s3%nqE7Qy$)l9=vi92$g&Fz#jy9GA~J zElv^_k9r7Pnmc^y>;k`kb{CiDj;H;)vuq5a^{i|}KtnEwA&oxb57_oDq8d+r><4V+ z7(b^PeSW?CZx<>gcHlD8FmVco$4BWI4BpT)2K4g^gV253{vD^f%tA&v`TKm?Ug zBYpxYQ4@Sf>ed7%Ll~*9ZLw$rS{HE40zZ9f4gc5%*13!0qg4(rc$eZBOSGxWQr>IMUQZG%bbrAQmaU2?idlsOOvCY6?LQSAh9r5+c3;fpE1^(vp9D88{o0FDz3tH)wwVfEL5i!ql7kHRtl!rYI zVuVUw0>{83sYxsmkRn%Prp1>s31c_`3WI^X!25q^_g#4iHh=eO3}ftPGzep(Joly8e_#;GzYl8_OfLJ4qoG32 zBN&7UDMa9BRir9YSWs#%9LxX=LC(ZUFu9UB8v`OFm3*f3_fXW0MDcdo#I~f4ST=DI zJTn4>D4*@>$?r!yX6onuwY3<1LHK5FtPJC zj410^-QPZl24R@_D1T4P#37hC=G=A$L4UU$DG0+Xf>|avS@hpu8ja<`s%7I<5~KD5 zOW9+L$tUTDjY}Q4t&~C2&kYr}d+8_9I=w$$-q(_0pwdaoP*ef`XJM)rVsHn%&leq!)5p-x#nq8Ef*1kO{cq zi8FJ45WB6xSI)Qif8SZ)%7R=~j}1fp5ErQHiZu$N5m8ThXj&Q@2l=%R;n)vnkP(aj zYUL(ke{m=8z;=r*3jt)%}0@t>6Q(%Kdi+O%9H z{W-M!-MQ2U;^4IMCow)S7{an=0H%`0#v@WHDH^U%AQ~~b#7z_NyXWTk^>4>=OiCF>u*75>yCol#Pyu)G5K;r#;d?vmpnoij(u3%G0qJj@caRo*3c&*0 zNX9{G0|Fc3(g0;Qqt%D;;QywtJS-gU6DwA&v?I1CvMFcM}! z#vt8LQ;25f-inkSv_c+QEEf2!a}odT-6^ij8`ydS73GkvVL=nBP~>`ga_ihc2O&+$ zr}?JbWvns?%Q}wB2BG8|Bn-eT^?@u{igx(^?tPs^e7}ceGBCVo^wi1%s{AbMvf)CJ zE=|pLt&tLQI$n@Tor}vdaVbCr*t*w3?9RKdqNOeKbMMZE)v^gxtUd4xFHG=1e|8Pe zuak)DgpJ3-T1=?3HhfNTlLIbN{gU3Sv?wa(@a8aNxTlfgzvLMVvkiutqPmv(>9npF zL_3-<@ayL+e&gL6xV~`AFJOga&OIyfsHIkF0c~P1V!4X$gFIFdb$H>#Wn)mhQ(jLW zPk(0V^zGZ!x#nKU^<+?R>?K^d!3lFRY6?%L(+#m9od zvYr70bcInUgi@qIYd>S7-<-pZF3UijolDF@(Elc+XO6+*(OwEfJ7e~#<)_F>R8C5s z9rbr`sjr2}Y0y64xcm^=V8Ni_6b1PO6RwE>RmQp+enK6$TYUM_6s`jP)9VhWkAZt` zNOWSE)z~VAkne{T&xVYG(K?T(aXhsKfol`A)3NCHw^DykGp%h9Yb`Db;7-UpKH!hf zdi=L{=eWACIO3>0wPN&H`Xma8i7Vh#pbOUZCP^9+Iy~t+@NmX*mLzp8>cR?+-ML4l z$zWi9zwHBwCKfnC;q-RtMI--X3*vcKwt725?nNPsoNPerh!r~J)FJafLc}bBTgkt$ z=5cD%;$+ow`*`y7h;_P%6&BH9Yi@CM9&u#~%woWrqsj#*XGRFWG@9d+q?|&-Dpo`= zYPpUfWmA*bDjQF|SVx`#c{pZ~tLW+PggZIw;ll)9I=9Dj>py*b4bN{**fXhGlGjV& zC+TfE=}1L#{3O^ysZGMVCbqA$FhX#8661+u2xB)O;RaO0o|uEOgoS=euTkAPbIc8} z@W3CPpW*-e;S^WrQmIJw3bb3q-VSBE-iS}Z&41jZzbnh=0K=Fu0}Mz;V`;{I)*u~C zK*Ww~5PF`0Rd+demLg*lsQ;xG&4LJQx`;E!Enb;4czJVyGsnTPI(2WFa5f=e9)Mj_ zhDm5%I#$Piw`ef22LJX|ga7c_aXhmTSr(o> z6}m5`MHM#S%~UN5yG0AMGIuG)3 z$JmF%JoX294AYL?=wk;<}jWE7Y;Q&vs(M!DT+;@g=AMK{A{&UihxwdeISIVP{#?{I^eor z;7=|X99di7mtU^2Nqs!X0FVdZ1pKBDo`SEy001BWNkl;+J3Y zcy)b_BZM+=Q&(!J+i4JZt8!?x%W`B-=Pf9{XEtEP^M$0(tTlLfa}U3AW*0y6qRasT zGlOmTySd>mx_1ASHNE*zdPYXWp|Ip#2KFLIeOs7^Evs=~n0oxd+b#a;@*d`>Fmd2i zCE*B2&40KPSnScq_xARRIsatGV?Be?9UsPJ^ZC3-JQ4*YqrLb#*PqInFU%Z%_v{RR zduzrGIo3!;nFLK}?;sb9Xr=D%(pDcOKyj?9@Lr4ofYCJUGHy^7Lq#>}+9}DB)4veR zA=dcJ$re9%W`N(^Na~`I8<$dSuR2;JH-=Yi-0DSYoyKG$KJsfdjME~x(!Ec_Q z;Yk~X$7T>pZvdG;E;nJh`YX>awxq6-IPzOJ7x>M$7dSs_w9|5(RdZ6CZ%M1gCt>TJ zs{4CQtSg~gFv*g{dBj8XP zudV`~+wgd?o}$KrvjwTwLDni@*YIEqWBEFQo>*Ys3eAQyb%U3V1=Q*d#2_Bc649zS zrs)yaY=1LLgsxJB%30+{7|ADEgFB(d@10-Z>z4y-B``0dkuHBSw5qoS7SBpp{ParFbG-4b&rQfAq00%s;59=5M za`zo0f+ywgV`lyxNSx$n{IO+vHUFY&N^6=kTz`V+k2b7i>)1VCc%H-$`ZW zjjbtu=j|CT&E^c+FhE5NHWx%7l}Dk87&`{reqiE9%}ZE4iB}lLL5sBgj%#|0t6!`W zwCx!kk9Tw9ablfz<{5hoxBq1ZD?%s=V|#=?rsK{x{---C$7>blAj4DeZW->l`;yDmO1riHcgTtoxUEKtA(WU|< zE7g;!$S54>aoOH;M$&CS$96Tgg$)fhvg>cN%voOSgUcTST=U-wMJS^s)h1v4spM3`0g!tu#uZ z9*i)l=}KUI#P8qo_{+-y7xzdnpST4Mu39Joqz@eOE&!9ubE3*?kHvfYo#ThiXk>=L ziV5E}VM&r^`l`Xc9z*P@2QRzUDW6ZBu9#v(9j~lVcPUNmjqTKsIp(%pf0E*A>aJZK z5LN6u|I!zdLJ^})WWX{w#BU{aWFsy3Xg4;Z|4`;hk)JjI-3NRql;e>agc8h4 zAW2=<9gjRZw6r^rx=fhxji8dy-B966@9p8cw`N$M7*rF7ny?4%sZ&XfIi;tR^~S~| zlVdtkQyOD=<+1T$4=;w-$Bj$aMVEHA$#A$RbqF$4#55hl^eN1-xW7?l(-^oj@_dkp zKoO|9Upk`$Y^L|q zckS%#JT^Sxks5@Q0;C)N?z`_U#dti~Tm$1JQ$Q`Zo7m#Z7kBXY*FE-HpmJ+mFYjF= zS_oDu&zRP1#U~)wl;qcW;+ct%l;D@#VH5 zkHyF9Auq-xrJh)dfjRui$Z+ieJv$Sz3rd&tkR+Sm()fl+j~WS5A|#%=^+LiVHz!y)fifJzO(V0{u}L!%Pmc z%=$1FUl`JS8|{*J&@IMuE8`^vJ-N*BOxu3SZ+x2YuZ*X zn9eK76lRmS2K~7tAxX@QSiot(3JU~W*frRji((TOEsYq2dzlj*Jzl>nsv?wnuY7HU z0ib20V2xC3)>Pgd4gU1v3_rNN;1&WCJ3$k*$}>d8(5xDV7B9d2GVa{D^H^r+Bli$! zT)K1#&pr3t5}Ac|2;Yi&r>Py<*)D$P+wbBZzV$8KI{yvae&-*tck2qrSCluVRAc3( zpI&y`XeveVFev5N@eleBytMuwRb#N^A#w3o07o=< zY7T{niUD?g#Cx|}%$pAPX-V=ddM!?pv>X9}wn#yi-a+@eEkXv{{jM%NBlsp@5e&|4 z8Qf_tH*|3knZ1;}BL*^8+_x|^9z{x)YZ#W<7&6x#xNoG5;w7+0t3okXrV)Sne&Bmy zT~Pdi((#5xVI<=q&+FK+W9&gZj`7I-5Q=~3V#=0UC?=IGcCqX~ytaei{Mwt?zWhEW zJLh5VoJE{nN1HecR^l@_FFQ~m{RF`dXd>-QEpA-Djh&q-f~`lxg^zL?aw*@=F|X`! z}V8$+shM@QtrAm-g5NWp#9nowChYNcZ zZu?2r9wg7eXS#FChQlkhxHJUGlNk#gI)iVs$0+H%i0x*=dW%zTrV_9)smV(kC2mo8 zk8!-iQUVnP;8r4);vdnb(8;JOl9jGb+%}++GH5G+;@@3u@SPhi7Su!*Dhtq~kEAxbuZ!v?#Cn_Ij1-S3{oyO*xQlZ&;!0l!!XeL0YN zGWGbcIkQ}ah=wK(YHs){a`zFl=>m7IUc_Q!1GfGIj&5}FRP2&k`=JaM%*sl}<@crc z@XrkD8Lr-Ig2Q4V3j&(Tvt^5OUP~PdF>TzILkRlK_=@UWBJOATqL9DdO{e0O^d*Qb_M zm$;KZ#G5opM{&#;6xU+Puqk#8Tak1gQz#R)nXE)#s0arj>2>R+vou7G-L>GJAlDWV ze{*?(Pd{7XGsh#RWjWgrlcKe3loU2li8O`Yw4Ml>LH6j_D9CM|=p!GjEu_i<^_i~)-uM!rHUdMBDfAA$f{XSuGJpVijwZOj&PcG-znpEw;%$JHJO zMp@!9CIw}Ago!(13QF;sjW~Yl1lBiXQTb?58&S^w&NYuu9a+cm;{jFBlym5wkMnb3 zrD|TEU)R4U{l*x@(935MhLLI&B$;}C8u0Zi0n@MnXPdm(7`M2~qaJ#*{M}@z()~-J z3TGaK6s>jI{4;Mvw&L(d8pjyPs#z)3r@kTocx{FsxnS|BV@D**qSy&lVZd}7m{HN7 zTeog89`~rmLoo>DLP}kfX>4zA}2%>S}`X*YDuZe|Qe( zZ}0IO z&MZSCIs-w&50lx39y43v*yiU^ZJt5!jm!a}<;E6Qc7bnP-@wVq6tAum0Jngl9DH1G z7(uyt1__OLlC<-NN}pF^@L5T1l8k%wf#*s?XXQQWiNn=Jg|FYPacO2b%Tcp8Ss`+V zW}mYJQPZw@=TDUQn2M*YwvK^L))2^X1bNFgq=*$i(#L}p_sdzL=ljD-5UJh)&hTZsZ~IC4jaYbl_74z;K&oZdiCn^F&|PG{J@~%(jwKH zN-pU0FTTJai8D#QT7*n2HO?SPY2|SK#ty#n&NaM$V~@Q2?2d629LJUY8wq74A}#3r z-9CRe#kS-MyTva2mG^Mz!ddK0150pA+9^tE(k_!=#*AF~w-3S?%cqZ>JH^;W)3bcL zQ#{T*f5(eVlm+!4{oOiMK&tZhj8T14eSs`$@$8aX5zI`zq&lZUtg{<#X38z zwA-83X!m3>CDJodLPqMtz>G#(_}s|Hv;AR-vJg3K*G7ZCzdpgAT(sDmgGG58Owf|# zdyp1$A%_~073tk4b=}L?hK8c#G33w4Z%h3@hW9BAQk1Ui3ASe~zHys+O3bCYgY_Ky zDS8GcwJ7lD(W6;|@ot;gy^aSm2&0r$W7spG6W<_U(94cPy7@4gmnN#Fo$!0V`rb8s z`Hc&hXeOen4YSrlw7mzBQ03S^fu(awBp32NSo6N!g1>$aSI?h=-V?0 zql-uI7w0P6m`7A~WJAORW)G&zgEAX}n*-{8~EPs8e0vpt~vb>Yvm_+$7dNm*2u= z>|Hfja|>LWt>e$H?%_Xd);PAtE>~d;x=aIkzOTOeD&usUo149B7z<7AWjr*4kWQS^ zBFB#(&$-g%esWnW_q%Ih>Kc2Ch`)UE3Vv|y7S<}qhM6J7$dl$GHagxKX1>O?slnOp3C?a;To6Y@HQoe_%fcxnsv24+ znJQkWfu-IX6GnLlLky``O__*FdY!`(?cuRP`FdKY<$G+z+^bly512Q=H!ga7@l3?= zNjHCol4|U2TZ{AO&*L+n`OFf=@x%>6I*F(PktruFz>Sqcjo2!p?XU?bL6ARtc>P$xs zj$>{jL2+i8N~}34YBXIKIJFuy`3==dYj{}6x>FE}wVpIkxobm-W)7{%)2~?Vu zw)`d|=fa(@>6q0Trp+FHusgx`Zq9IKbB${tN? zEYC3uEv8|Dyy&%KT5%uD?`?M|G9aGA3( z%v0kb#A#1zl=#RH5y!yzjlI5%W_RQq{;zs$;vMv#UHWV`9$EG*fep56#-f=BX6{+d z3OU<}>)NQ<0;zBeL9`jUNX}N-$RK$}BiFZ|p&$O9&-nmoeg}N7K3@9WadV-H@e%fU zc_VG`gIf*G-kC`~Mvy)ul{H0WrPiM~hZ{F;Jk+`PPz*wvU=xJj?yEe92g_$Z<(Fj;hhj6zL@YQBZ`+Id{M z^e%R03slq}k~#j;baWU>l-K(>@P&u@poe`6yIs1UgWr$r5@SbR>K1qBVy`kFV~cR? z8e=faV4r$?u{^Glir5q6PRw27lk~6a^wfRM7w0jy$dh49RAoL^*&f2KejfW_5z8&( zBvheVD^B5ZKZlq*W#4QKzJD{|`tE{@%1Xrm<|A-}TfuyYu}HNJ4@*Ghp@j^DcoI#y z>^vhD-Kuzmkb-W{8hq)EOW2w2arHyM| zO$Og<$+aRz-6G7)yb%d8Q!ZrF{Y!5BP|>L{24(z>wD5!JpS$V5r+Ze*7{lQ5uD zm7~9bxm+WmAqZ9fTEmr)?~tmJGwfNjP6GEIX|s+a-J{c|Pjlz=1cE>4M)lA)x}HPAuJpJG=PW`J0&T&9O#|tV&`scIiom+r-XN+rHT5y)7bX!yT>H*w+e( zR1p9r%1hi_mi&@t3+YYN|_dpElxgxF=W;5?C#-f?_9z4Z9+`e#03lL z5R!GIMM!EhgMR$?>@oBnbYOsyG8dH<)LgjKhB@J*y8Xg~gLoXtDD>mega5O=d)SGQ z@^^=^@3%cnAT64qtypFJFbFk*@4u(>HcHuip(!orGn6Svi^ZATnJXrPlFnBvUK2DDnWw~iZzMESfjzOZ^8^!NuO_beF($Jz{D`&S4EPIv-m7A6Ki zyzTLWJHpW*u4k&h5knR7#!I0(dF8|JyPxq;JOn~IDW9KHjm6|;f{_(6$Az1B@U8c+ zV;*>O7P_&Uzz1P4_Em5mLNvp%rIjxJ>ZRB+$fU4=Cq&DrwQD2nVi${R@8HUXOPEfl zovW%$zS6*y_h9(nv4000>3axJvT!Ruwd#l|bvnd8R(V>za~t$8TDKlhzI%BaTa9HPB@$`Ks>lQtbGR-~ zEXV2i1G%s%`jOoDAidQiCdh|fX`J+*s=D&~U63w2rqZgvW*6b=4{`q7MQqPyLQo-2 zF3y4!yhIEaU64W;8?#z5(!wo^s0LhzrC~w=o;5jc_PRUq!jkPxUZ*5G;T~QleQTky zz8Dk}Z8i`oPER{+epXf|X5n7vXI#jmr@<&Utfm>$;_;ftkCMhkN<&)C?Q_=02F+A- z?a;V_Lh%|KV)kW1x(cO3gR>mPv$j!Lh~d>v?@eB=(uO5Vrdi#A|A|=6x8F@)xk#g_UUX6{J2yo6&DhUFN=|dS4^UUm~4>J zYw4f0sgELC+b$F2m6*yNRK-819X*sAj%qse?sf58!bmk^@}9~u6nh=>_j>bAH=EpJ zB0V$P&(Z`ngd})-e#hg@JKaL(us4Z@DS%JUk_rlmA^afT0UorLfs6pTDKEYB68}sV zD)Fl2L}?;B%-V=|Z*JrK)-EQLXVw2fTW}9!v?Z7I0Y`6=mTAmbFxhOHd{ThIH`_$4 zH9Oe7{1yXO)l1I_6O&SzMH3RqfqN% zIl3M-@*TS|a(zp!M{ij$bsl7=6W?S1O@g~lY1mOy@e}3jqoyjC9g8fmgW;Sg0mR~S z(I%-m+dEi)eoB$Z&=~aR?uaMa{g!_+s!fp$9QAOxvuJT)JL2{XIKF1My}fuyHn)7^ zkhZGWAl$xv8_z!b?7sJHzwtl@fgT)r2q>&od9zqmha{hF-oiWAZ*kR`akaY2o;%%Q zuzQyeq-+abf&L!PQ4p8s11n_3#+C3lf0MHk#F$UM?0q@+I;S0~N!#JrK5&8U37-$I} zwzjs|AROH5?vDpD2*i*o(PRvE__XuBcXb!YdJL(mm=X zXYU*}G}!jQ{Khqyt8b`8foT0RxD=%EXzE6sVs++(%xN-z9QNerHS=Q!a^_OxCA^=A zSnhtwV;f*O2}sNCy&1-z*T097j000W&$lSOj}OM(N6hK0_iL#lrm$NVt#^e$wGHrqF+{PFlUj{`vLi zP{DT1xKa7u(AC;xX06F#0880hgIjap&D$P7@hlkl=J1SEscpYMC3)w>7+!Tg2N@4! z5a?u1ojSF&19v_L< z)kA#<)u)h+2YoN8l+k*;o42yxIFLaYb3Z6tpnoS$oXC0Iq%f2zzqQbq-@keXmu}8* z{8+-}$x^I$3@|NA7Ehsbr5-AVFlxd3c!f=IzW$w)Wn{sLNW~(dqTKA-g*1nuN;?jF zps2UQEL51@x`f&Jx8TDbb&7!Z4)vK=apDu7pf;mopxOo*9aav9SgHL1i4@(>xG&hAE{aGH=_JZ@W6H-f;1L`y+}gs$TMMZG5Aty7 zVr?9L5z=B&o`BWK`7jcYL+@aCJ^bJF-Pxtr6LZL^FnZlvbdncYeb=$}Kc!XY z6dO-(!%VjjXSadf8)&Fr!g$pYpjwJr7lrAm{7ULG?Z}!Th#jfMB)!6feFSNwLYaT= zR7L`}F?1|NQ-%~pFT_$f)OH553uOj$-6YpuggTi5Y}03buH;M4)9V5f!I9Jl!DuEx zyJ~3{YNK9>SL49L_s=8U2j)7YaEbT{>>+eiWKIF=`E}fZqG2q$<9JO;=I;rn$Qo&% z%G~==t}Wfk)VW3$x|G-_A1G%bQo4g=zm;GvE(wKmd+yxTWY?3Z>l@+zpeKS^Gg317QtK_oX=^T=6}t0N+DsjRzymgfCT zgcw(oS$s*n8P0_saS7UK$#sjb1oC3ib2ObH1oFZ&Dqxd5L-9Jh^Xrv17XY&u6l8BG zRX_I1mJ35rUTc|(Oxc9~=VDKwXLzq{CeDd>ELlYhkvb{ykCf)LIYlcNN5$G3Z2Xua zPhODqjGW@H3X5ng#eJ3WP%^As?&`F=%hVw^nFnYVcJPQWbqE__nsnR=!&KSc|j?swc5sF+TIa`I!7 zj$W%({pIYr|Psd1c^l(z=5xVRIry&iHonE8r!?qv*@&Au6 z^f+KHnqh8j#dGKz;rkug0ajx~u5TZd45sT+lrk$z&y03v4uQhJP#NCs0+jneGa+xq z9X=5ZGKt9~Y$?i4nX?|ncMfwy3E<=1H}Nlu+ZYOvF%GH}0~g%6-flaLRZC2OF$8J{ zr$)$di@1i>z64$tQP^Y2AA$^V{10UGaET+nYJmtp{hs8dr>2%-{_hBD76xHfCUac z(vZVI>7kg=dTG*{?!^eBHGQj<=M^+u;O?WwV8JS3jVQzs$GOS^ zP$6rVO@FdV&5k{7kg#HXSr28f(CJat@8AOttB=(Yf@M)QsI z%)PC-2`YdhuOGE{!QJo2(6f5buq#HB7b22+@-S6v&_n&p^XM6MO)rMbG?Nf31|)d|?DQhvvHqdC$k<-?w#%FU4CpT*mnN?-+wCD*-An)MHPK!^S zpbl4Zv1tQN6_51a_4ReGKz^hKp}Y{HE0c#XOxvZwO(@z0-n(%J+q0SA2dRA6a?(U5 z-#!|3Pt(W~v3DPIw}`d6xPbvB=?vg{`U8SIQQFdRlp)%Y;-*Tea{*e0>~0+B4h$E| z{f?nA$-DH(2szC<&Oa%RQpEGfX~;AZ8&I+W=^ne~^T62Vp^B@~tEQsOySbzsZCZ(| zj~B}G*B0{SoE}h;OHfrP6%x`=3YxNJ)Ocm*#udyjzi}WOh-OQxyqvjjuzCCh;^#h( zDz0%M6Sbaei#{Q(F*vu=Vy}%jvF6}|+`qH|r*orFf!65#jC;lq=t3#OK>7#6(cMf5 z87|(~!PeefyF5E6N}}w#huSpik&F^Uz{sSWw+7Q`gNEEbD>CA9AFj&|?FtdjLPd?_QI8 zR8sDd-{WHfMN_(?e?Eqa+=5p$*@BX8jc+;C?8x&oYsGgDi^(*sA}^7MXA3zF-yJi7 zH;tqyt)!N@w@3)MyxU;bc$oFo#erlX9*IF1eo+}R2w)Mk=Cq3m`BH6#MQCwpYl^*j z!$}y*-B&7fDmU2+8_n6?P3|o^EW4*m=UDul+$-^>x)1i<&1J8~n7(39v>Nx3RzAgY zN~YqLlsd_xci7#TN>l`>g>7n zeU3>3r`j-RB9%|28#o;T{Q=NnS?pV;j2r;HXTS8LENjFweOl)KjC%;=ybn zxVre#L37Q**hxdIHTY_QFj>>*AO%{D5n)ySq!lHP%XXf2#uzONIpP=Vz3s*m<;Y=bv8992|5mov-70F<@U`C#gF?OZr;>$3i zc%3UVQ;R2MjRwZl^Ak{EmM(ppKOf5O)XCtB)4|>vt8E>81JzFx6U!o_(qQ6arhl)=rwD?rBQjTs>sK9wlz-MxG z6WhA%i`i99=3Mzun50M}E>n8-o~Bb_piR69lBa7pM9{^ewH#h)%&rJ?n9q>Xj=4@` z#mM((na!w*ElZ!vAxig~)PKNXx(L|5xsBQGmKKm%)V0HNXI|u%?cS%%MM+OQrqo3s zv_i6>LU9%~i89F$?+HHW!iN4xg)@l`p7IynP>(GWaQt2GXSvhFXtK93e6B%h42d%B z3hyhS^){y@jgo9qIj~;IKE@!Y08QTo&)=_CJAA$T-7~AyhyluK*`{;t8ox5*GM8w6*H`V0LmaU7sEDpWne;nwC;P3)GC4=yy~Um$rxkpiSr(uvBX@p)p&{a$^{zT0b;(txpK3C1E9U%Iu*HZ&M>rUIKk-m zmuYT&ZJ3iUwK+-^WMfMDS7fZjvQM(X3(m7--5i$UdMY$(1AB&E%c)~}Ze^%~B#SVR z0T?^?GIUUA!Sv+qiep3p8Iz$VlACEAS3k}cE!Hci*n#Oi0}9s(^uKfG4*xePY8_7s!52d z7eM+wL^L_Q?(l1`Sp3J2Ih?4a$Z5mX`1q+!{O5o6ar|Gu_EY#@f9ex>;fSPu7F5O8 z1d-JyqEZy;I5wOi=?!-IbJh@4hTy27T7kHiuVs+1sKpOhUa&MOg?y~;(5V2Yq*@HCa^oIxL@)a0!TIIN=V@v7jV({S4BMSl}mG&k(eigD;Gb zA2BK^A>7?_hhS$|(5Ic0aZ!qoytX?hrRQhO(&pK}{zA>U@TTQg z$HFKC!jnMpohD-HLzZ6~J067!Nw4Hyyz+bU5aXrE@-puqvZE+!A5t;#4GRD+;=~-b6o|5Mp9&-eenqXmmfWb zUwL_gV{w6oyr0H!i*j36*j(Sh7hc)GODB)wr$7EY{_wjO@F#Cv!B)G+fKHB#+>^1aoq@z~Ebc{0=MCq@ zShkEm@1^3<5W6sNEvrbNLkjV{6#-i^8g;&xJ>>m5#K`+B3pw1} z*=3@J<^FYDK}p)doVt{E%af-Eok6r^4DG&0nl!!LHFS$?-caxU7C(9B6#lng{3QO> zXJ2Gvun-+3O?w%{xe$+Nah*Q4hF|@$m+^^HNANSRKaVfHaRLAE&UI`rJl1PUwJy+- zrN=s=5hhy_CnbYHuW^MT&+FA(^z6YDN-I`tMY!Qd0Iu#qB-eaUyr2^_5o0J}935+C zM%ahLBrQU-+US&XBF304Yq=Y-XBF15J+)|dsC~IyPmaS{;+Z`z5hEr_xEvl8~*-cqwX`FMvE9@>slWFOiaOIZS(f|uu++?efFwAqIfLE#oF~K2zWx&a_n-e5 z{>A6cU{bG3%R1C~cNdnSXTea~-3dP+H|{g1PvX1>5LJF6i|@X;EO&T7B-m2&K|<@uJ?!$U}gb z>1?4V69*?-l*JAvml+fjQC{CAGK}6>$BV~awx#7Qp9w1$ zMP5LuQ}LRaV|P(uQaSv>>o4Lz|H3Emi=Tc0m33$qErfF^d<4EKZAZ?k%j`K2ph(EI zHsvh{}td^b~vF*@13@C))=ybDS?(m#8Pl)N-gb zV9kjMpaxi%9&+ z3v#C%gGF?>(;6Igz(4)eOZY#3=~MWLSDr;pMrh%gV!Qy9Ktv04(Ua(oIi7{9s*e#`jV0wJ7lcvr3cazyQS zH=~Zwc1;2GgbQqK2Ck zPF4RuckkULM|Rx_{^Es6S5;XaRj>s#e5285v^ONXX*C>5OU;qQr8JryO5z-y-Ltb_ zK_6oO**k~l(*OV<07*naRHL1mj6soc^BVOEh&CeKsTkNb~wq!cO>69XayRf_i*G?sxIRol3P+3_; zeKq7skv5;U5++C}12)F1ie%Z`1oN{?aB4Z$tE4fdM?91q(AQs-du853Y(9g0L3QkJ ztm!xKffx!plQV7?5jC=7g&L$3b+t4y6LoCJ$)eMlVc|}{7^?qFM-gW8)-WUDZ z3aeU$mTbc>yXeAH8e-h3l#^+W$ymv0^Hx|73qUusTCF3RUF0%^j4S9vCMv7MV<#Lw z7FP)>9I#$t8VowXuPy6N&=IltFSr^7rSO|i?8G0xa1i_Y^ZbBBR)WwIWSBIve8$;p z7~e(5WCrO+GHI~#j0QxESPRLElEJOLIeh7f19)a^3tqh&;MJK5CKe-Oj7z6L_-*_K-jO*7dZQcn_kQgve!o;gYBuf&<0H>^xir%b+ zu<7E5ikfbEtx}ZGsFm~|oWzV}jV^>T3_@V-CVs`$=_3{iIT2sMIco6TaqT%ru`yi`w^alaPcm}>I$EVbz_XlV3I@| zc`fim7Lutf&91}6rsP)#@RJ3Ez$BG|CIq_N9KQI}4*ajrjA6LHEC8XnE9o&{Yw>m|Li#Ku0#lu z7@ij(q()^}XPiB~o^?L9*bZeNusTUn+B97s+V+BHFseeG9&E?Gu^Rv~7-BR-?grShJKw?AMq~me@gL^RrkdsI@W8HZ77Cit}1yAJH3dRAxlZ2Z5Zl zs4dFRIUXl3u98Ps)vm(k(5ph-mIe~o(=2Fcj?Pi%(dU>dC;)*5% zjjnZl6_r~jjruZ-nUPEzs9d2kIdVeG4R1pw>|Wzs-TvxH2TsFg>%Ia)`!87AOlo#k z>#@#Qk~tkuDr}It@K4dt*K7PA2LOY)=Z-HQ{!MdGpEs2Vv4qOy4uaEWq1LXimqac@ zkw=ONe&^}E_=9J6VW6kPCt5={Qn_>4Z!&6P$}gQ@+Lal93&%gJY#ec!kZ?yj=97;+ z8bUAR`8P?kQ@||effsfK*xFsfv7RCP zoWhRbGdVodmoiEjbCk_G0iuK~qhZ2BSQRBV)B9<`hHQ|6|HjTxshUWa% znL68*=cSX@Cw$H3$b4Ui@--W>6AP^NyjT`a9)BXw@d5Z5uH zHwiZs>AksaBSzbKXl?MVzf?LAFr!x5Ym2i`Y!&D-1)5(wHui1gxJ?IG|0p6VS2Onr zX*uGg@1Y$haxZJsfRMBSDmLm`W`8x67V^CrIcu!R;5*(-yGWgzl5R?+Jmt#>$n>Q7 zaY!WPCE2WqCLe|p>l!UXp26ELynU!MzpJ8wo#g;udUg-~!{d*jx9lO}G))`Qld()Q zPR_2S?>eC<f5#jS z@9M=bu1w>-8?#uh)R7AU0W)cn0&4*r(}Nr{_$aG*?U?TMT1~)qcu#B|e3jVomzzHE z$vSMu`&rZwQ#KRKM26T@jE;7j54K}Q!Zv$T8{<>#YM)l6vk2=;$&pdYN^RV>xP-Gm z#Myy1_7$!Ph{_;VwYW)}9mhk6L^p$&8T-j-Teme5^@cbS*pWEQp+n72C8cSoOw&Bc z2_Z~}hOu2W)!OzS=W}k0c;8S#=%w`0YqPOX#4JFbtb!Ax>=QuSP?G0Wuqt z86+iEW)3fjfw%}|P**0MjFn1p?<~=k$p5(u3>OVI21!-0n>+hRI0(ZU_KbAl_mAzv zA3nJUrDDJucC4@GG^M}z)MeISRvyeVF{TxZVKGyQ9c`uFeJb;IW3x?~U!zD;qYOYR z92p$K;n6`nwPOO`Ju{6ru1;cnb_vybgq&}{M8p@N_i1zv3C}=16Av=acjQTLl84N7 zcH5${{r6^H1kgFt=nviX_hIRkA-xe}Y)|4zTxmNc?`Hrwo^x!}ozYMQa~GqQ(7 z1w2X_ps7)9V#cot(pDtX%M;NOk5nS1g0>Q7BBjSc#E}fmF$YlE`0S7+Cl(*$G%4bV zYYsHi*kp}J!aiteEH~T&5|ua4qGanLeIK_TKpR}wjiAi;1x&&Qn>nM(A3igN|M~G<@bW&} zhcS4DA;iRicMTZI_))Hb(PlX4?X!MEDQ5Wf*A9dJb*=j; zIkMlo2GnCl){!|l5;MiJ+6h7k5@MY)WhI=o48yF@YzvC>*LqbtFDIQ^SUVXHiC0EF zR9upGn($@UM%a<{)<>vgrc$Ag7U=ONSGpxAm|dWg43#w#XcH$%6EjD*ZhY?hF}5XQ zLXoFDR7u**@o``zkFPv?5Wn^KRx8WLo#G(Lvq}v|`$$Ryo{Df*Vrjm98jZDfT7uqM zB1y(6DJ`9xwC^C`Di7KfzevZavdWUuqBd9X9DH)$2p${l!!IvQ;qOo0#_5T9tki0# zB{2us$c>GrUksm^lzck5toWR$CL9)Rfj4`dH-e&n6zkqIjJ4mJ{yni-Buw*Arc&b8 zL_t8DvDm^*ImRtXiLw=!l55|@X79_My$?El>9jiCgA~?nWm0%5q_8-@fLe6`K$F_+ zSmx?Iz@;}@A4*g4o|f(OXJ@Y#Nt0QfqFi&s+7H{Bo@bW_8JDRfGvC!R(`As9BR)Fy zL_BehZ6ClNy|fpfIxqqsJ{nAP7Yvd-^*SgZXWWS5L)wQWaA$tSyiUma3rRyHzp@tSc6F@FJ7f>P?!d6#>dbL$ zE-n)i$>*WASg; z?7iOO^O{}vogrjVitE1JKy1QPg<0l>9Scz~48?Vx= zSSft^$S(XZ&+NgIV_U>khakd4CsopXq=!!6hdC0{%Anp?l$`OY`#(+***In$2rmO(L5O{@rfU5I{8-k^yQ?3^&y1Dh4<{wgqGTB|N^P zfFEC&!Vk{g!t_dnoGVsd{E(O+{9zvMe@Q{1)3SY{M5C=)DTE=SGb^JlA^po(zOGc7 zNg(6n(CL%vHM#7sXUSBonW|W$TGth2Cu%t6ydHcESp0~h(L*u0kO$Z1Q*MI}y9PzC(PkrDjK3w!a{)&aiO z5tk&QX2h&AKj9G%ccE3poqO%%;4rVi*p}NC4y^@?{RjxK0U30k;Glzp9vLSlQUHDA73;T!5cx4Mw|(v%f1gkWh=yXBF>^-(bpabR@N}#UaYB!WWM3!dIT(jlF{fGdhY} zf($kENK)N#8xjPP20Qmk-yq3=t)xz~uk6ahv?H?M#J-~@r_V5AkBLGQ5IlO&!w4Y)>>BLF&i)=88SBRnP8aa@ z)dhTTX9kPa5XGEYH@MnySxW=gS-+nBm$vMf&}NZz#j24)RCgHjuM*ej7bwHekkWy? z5^FK3S^23>$HQ6oM+Uo>MF$3rz=b~}eFR2NQYL7X{WdvJKeCd+ZV=lzON@}DNYZC4 zz#SQtlw8GgaUKdeg4}aRM_wVN5Nl^G)v3LfO@FU_A3~u-?4nuk6ROiSa^g{fMjWB1 zl*jKpK88PfVIQ{kcs$b6vEU4d>%i0EBx#NhiLPwsxbkdhMyjdE2)j5Uhw8co%*{{Y zwQE1-6X}KGr{NNYAqvxA)pGEf*W%F_X&4atFm_oYjGKQB3A~3g(@yf7K+(j21v6+m zBFuhkHesFwd)r8#LUHMGcz6JZU+KY#N2c+OQ(bs%d=j&Z4VJ+VJTibJz0owIAvJ;>7YigzZ*caDe zZj@Fi1_1;0kWQ^yo89YOyL(ypMQ*Zo(^lSDr*EK{+t6+DTnAnG9M?S|HS1glt(A4@Kvk*y*XiF)FFFms#fAI8940q>5@mLFa$S2_l zB8j+i>b7SiS@0D@jJXVnO*v9P97cF=;w}8>)OYa8;m@`>?56df{cKv4b`oQ0PLNb5 zQtal$NJ_#!AcxraB@p6}u9xemHNA%r?Q^fIce8(0X7#YMH<1_f? z$#J}KV-hP>#lesQQjW+>o^UjY?MTpF`w1dQ5GUqig!Uac4bA&d)9D(4vn>jI+>kW-gw|}SIIz|p8^40EYW*6T8E6O zMB44AF<*Dyt+oFjald#M`jtDxvt0N9n9aL2RsfDxC%Xa53lSS!ed*@ z_{G&(eB;DroV_(qZ3=3aGD4Ap5BpBU4g;Mcb}Vu^04AGkRQ#GUg!LvMEn{hV--O{H zL}^$zs#!h7Vvl^@dfEU5%Yx0siF0{rGps_Mn&-{Q@zL(M(OH z)Z8(R2c5KPGqhjW#L%M&^+zW>c`4kOy@H=z`aZ5qet^Nka7XdVG+oT}>=LuVz&ec; zOs!6^Ja%7kl*gfoF&dQzT=e%DVb=j@V(x^zZfxYowCFKXSr8>e%65_S6-N7u_+pQb zqg%W2lk-#f#;I$#J~hV;C{4~%iJXEl(X?4xLK|!L&L?4~Eb7;_+A|X)lE(d>*u3x1 z4UEOSxH412m^d!9PqfqE9T2&Svj`($D)%eXLCgjmm4O?lpWT!h@p^1nX4zWc+T6I(a{AB(xG{Gf zr*6E3Jp+63;-OEWw=l@5Etz?;gc=KG_}lInPuERY!HQ z*2Z)+RZNy3Mx_x=EQr0?S5SCq|4tkn?8DJ*gZSb3+j#TJBqo+>{PI1XM#w-Oo0X`{ z__Vp{ex0j50A=5YW2nE@%tQoeZEzEil1Efh_7$aoAtI?!)Zm}Xd&c<0+(R8(pGyIp zv6o`f%iS!BPK`Rpa%L(cayj^S(j1~eZ3$O8iX zf*=So($1M&%P7XurzD_UZz+es^^oYA{JR!vay!dyT`Yo$_N4s7nu;1N-$x!1p6}w= zwqAVYg?;$!W7|1uhh&w_oOPGG_1bf|P8I=FmpKbItLc=HWN(JcG|LE=CokbAr~d&H zi#O5Lo#TL~+T4n)Aa?WB6bpIFv*~hEkMInx>tkDa2g*G?ICtX&et2>om+pRm7x%u5 zqdPu{5zELI0h^e@dn3BVG8}rD>eHGmrU76+Q*?yvKppWr_4O(%sKCd8lhmmXI{xkG%!d6KOcInORpL z5*A@XeXfMGJ#(l<4L(($+&;{5byp_m<)HDUIc}TPynhX*#MP~kd81Xr+Wmg9!>z3X~vbHR0`SHxI>MaE*1?z*6=<8wlYYGUqhmiITjO3PMKP##IxDNWd zyIKrkfvhN~wO=c|GI6H9$A3yv#92!23p~9dT z#b_rzv0Ik}WgcNV1Y~LmT%6gIVz(CJqn94VbC1m6JEw0l zu<7c|Dyp?QHzpl7X~|5opR@gIAJyvAxXcD@PUl%yQu9V;K8wxim4}c@KEi9LI(GII zaD00|e&_f;HckEOcdp~Dt23z9YjAxZR>0p$ni6|5%5F{`Bw(1A@8DXtW_18E-K(!i zlIlTPUvF3DDNcgk?jlM-u5;kXh#}LnYRz8nb=}u@(~DCxj813!;hKF|)3v90y6<62 z$!9=Klt`3LoPsF7n5H0mEJTf?n8;d2>>mF#Mfx93xM`S9nlXJ{YmNcyhNy^_cn#3-Y)AmX)}Cn(xH433o)Pee^3c2rZ=%OQql z0otQ8vcaGA$mjs}5BB3@k4)klr>^7mE7O=?ZlFp**EjZJMs$^pRY*LBq+OJFD%fim zLuBxsL^ZAH?_p1E)Sr;alreLmzJQW0l}v#Rek9e}NDz85Ql#vLnzs!{p*NSqq2X@) z&e2`?{G+27DhE7#9_=aMuivxO!Nod&6AWkhVL8lF8r_&hM^e@xB#D}Yh49VURo4p7=21)_Ca)IgP z#ilfNQo24JW~-}JepW4z?jsvJlAG-H>(?p9h zu<4657|jMC6Blh$J%^iVbysZ2Xin%-F93PulLnR(jZ)6V=MRtKKRo*g4sRVs%ojvK z^oL?IwxdiS*pvY#7tv|XZcSf-brYio&fIwmKR^9lELLaGQ_RB;1l%L(f2KGfHKdF~ z&YI>InhHBoRuO}71l`@;(9S%P$YFp|7}Zg!F5;JGzk>^R-^cU&K8F|feHL5Gqk>S= zr0!E^*mYv<>|*f@U`hs$cOgN7wE|R14dzJ?!?k5o!w9x&)j%%iv;Exukuu)9HjTeI zaT9M`oo8Yd-BAXgQ8~d~d*fD31re!XJJvQ%HRTYMgMhINn@^Ll!B~^A{MP$}dIDM+ z+SIv@RLCq(W&BN;!xC#Iypb%Pb_47xfayT++_6Cs*Lvc`!2;ZRHW)DEM zHZ9T82kE@5fNqL?Fqvo01^T;-$mIe)Bm^jEgQ-f>kLBfMlu9K&#P0{7bl({Qr6Eg8 zOZ?_Kr6bhorrNu&;GK#ZH!BISJ8;547&)E&0Z7OlI%6B>740mlqIVhvz%_8wVsGN(S=A+thc{*@& zdK|N>e}Qwi-onQZe3l!J`Fs}wU1WPXc4t%6qcG}Cwtrxx&5>G?+xI~yo&a?cBNfKs zNfUZ8MotCDb@_PZP=Nhgdhz!48T^m;#__?e1=JG6AW}IeEFHZ_|g+Quyd%7kVt4Gb%92^ zo{ZdBB*QiEQ@yDNgs2x8yLv}__+2-_-KA;#=|`?a?*wK$2h6KCI_&?JOhpGZmA5!NPe0NTyQ;hL@Dl87HH(FD{+)4|l7af898 zWDYVm+>62f67~$0@T*Hx_|Dl0T$-9^ySum$ngT3I9iD~XC01?pXAZ^A+9^(_2Y;h1 zA?A!N<|b~)o*beHz~ZOMpgZXSpkPsp5xF6bjSS#(N4DY9hqhwpKsWN9gF0o5^z%kr zfP)}4s}l!9r2;war3#nWc0?_jjI8|6}wouFOUIM^x~The@=`wa%Y zC_4O}@DfO~PK#*NY~0{T{^ck4Gv;;cXN$!{H2-Zq9c-y4E?ce@Ur92>$T zTLy4sv=6Udp2LsF0Fpp$zi;E#)B-$@tZD;eBBL25%;~B!Qg!#V^)_!%x)80%h^@|C zxS?c>ks}iT@~f!mh~>m~_LT6#!BPC%eOvJC-YqER#hNY*69Wa0j83885`0ILujynj z`Wl}+uodNe9$$MahgZ+t#6q2{{$)h1S+rKh7+wU%JRquI?)EsB7S!0KVy;RCL2-nV zidX?$r~9$>Gj{@Zb-V_)-(|`Ndd5cji^%8fo>iGcCpNDwL71k2_d8+0y^5^1|CxRn zburTqVVr91#@7b&Ni4jg=U~?K7hLl|xF(Hp%!ejSxto}D+;G^Vm^|RFSF!W3%?+aWUN9UBu|;NHE~iau6y}xNm2!zBKt1T1N!deH}LcG-^X%&9_3O2 zDzH2Tqu6VHmZEU>;pZ|a^Y`?6B?g~C4-JoD8%(Y$=6cYR8(?q@Dec;y^OW3VI;msY z^|3~-QAVv^$GKbY;l|7bT${a!Cm(qck8OPxgXLikq6CLdjF*8;+j*+O04qoQ1KAYC zGo5miB`9&ba*c3{801hEC~)6$F2E~CcH+>^empi(#t$#uz?s`ixUpDAjz+k?Cn;-U z!D;qj&}%5eo$BU|G6m}7Ga`_B6^S)Ykb@(PA~pjmiBj2D?Vno+;7>8ljPF4v{tr&=d?j z-^b<2Gx*8bZ{h09Wt2;KZs2h6(q^tq#3SE9Ei~%Rsj{+Tf)wI0qS7@QB`<>lr~1`u93qSBPh98%Dee>dGk}nz9Xc(GJ9MTGb?&)fyNrHj&)i?TcoWyASCB6RJi2i?Ws{S`O%j9SNVtI$ zv!`K9;|z=q_TqngWgq^h$HtHkq&qH+G(qu+I#FzzmEup}*m0vtuQu%}I^wcR58HBO z9^ZNIf8bZ+KSWSej0W?4B4|01bvW|iXy(_~k#`Ch8$5!sf&It@dDH35UN4;i^ccvJ z{kjq?`{eRn+*!PiYIPZ|C*5Msyp_zLh@Iz}#unq!X*|_2co8K4z>gR#&kcYDBSVVJc}Ti5{TkL^v&I&h+xH15ueukW)9A z!Ryp=CKa|FA~c^;uQv`VG>68k#zIU?2EFKifW+`2hXfUhxA^SMV5p_o@V zyrmzby+cZ9%)9?{fQ;@6}ogH#yqOcuJE4v1(`3~1eayldD0T2 z9%>YF3cvU4AspN~zaJdQJY$`_%KFh6zB12;kyCqaUDNB_m6n{)-Rz|h+emdfF3@w z|JEW2kvakHOLiy4)Vjt8pZ{ zn`PWsjZ!Bm`G)1_93b!=renKKfKX|cQ>!&JZZ3@D>u>)ToVxN3UOD<{9NG0EdJ5f8 zo)0IEQW*u=qz>j*=J59ApP{E`6wf~LGKP8v5s)T>5tnuNJ|#?*mU*7b#4rsJ8KHRX z2f(8{hOuLygjWu2!Pnm&$Lm+8u^MV5k(QIwmCidq;Mzc;wT$Tq!$I!O5qn))9D|mE z!yy}XjRKVgag5M4c-YY4bbqurkKaAE3!ghOin0E(L5RAX`EZZMlxS&orj6i%X@W{w zYd}{P?F=b1rQCHn3&;l!K6P*uqxk^;=j#FMOH_0NdBcTJ>9kCOeH|VONhs`9dTHJ2 zk&q1r_PL5}zeTU*A@FclOL?4_@~_(~VrPFBd{41^bykrpF-~Um87UypNc+Q-44Y;M zoo1)h?7DO34mTGmIH0ZDZhyuP9Go0qz=g>Lh_R?6(lERDeK^hOmt#ywTv3=4NhL1+awdIMYtM z8m`Tq#pKdexTMx(W>5S8TdYR<{-qpZJ2zJ>-Kcz_4Oj~sm|2;?)v5ECn4Um)p@e}_ zzd(1*$;BgH6`?0TfSJl&{Nn6C;>5LIVWqN&p6*_B`GbNPbxgL$!Zrb1hs0Y#6C5Qw zv-8D5USVr@51!mPh)0Hdu~e;Na;47cw4aDLPHdXH%8UkOoUG*Zqeod=qvYm9h6QIK z{Ul;0)^vno3HZXJyYZhtb^xDwbQ`vm^Xb%z_g<>M`C(wzc0_6skdm%@u7{z%A`Xr8 zu*25P>19-6nR+Cw!XV}4 za#z9J3;SFe4O2sPK6maM_Uzen-xvgJ77#jR2r%Qvsi`UcKcyuiCeb>2V}umJa%Wa? zX<`BMl?HEQ&YVe{MEe}kXw%kfWT=|M^Sid-fB)ouytrpnnugkXe#I;_YBvp?w65cA z$}o3QtF30>5Ca$SL8RB1T)lz6dgIS=ZTbv6KSp=4Ahv0#mH|v1XHaH_wMjxL^e|nW zn?P^(Ft&AVgX+Tg+Qpya z_WUJWo;Z)i+7$A+9`u(681O@$4&rqvlu`!V*7WOufOTl4$w<(h055Z1qVz{<)Be~khHGQI?9L(K$;O0|JAx2ADp zZiyX@sYvk&QN|gYi)xMV3@$!(U<bC~tw>O50d#(YAxdOA=rNZL(NIxS^- z2|_#)_ozfL;eLRH>LR}L{$Jy*@mKkK2=GC*wIIvP@30~ombPsXWX5xHW@QR93%Ai% z9>Hku_Vo89D%lVRL2o_h7jSjzG{zUsBJg}k`;Z=19e&>Q7FeIb;Y~yJFO^mFcS@;g z1UI>G2e%i-F|~LTQ5+#(ETc?i1o1mG^+)m;>fM1#eGaGYyoZT}8@N3?j@ygZF|#-Y zKgeOAG{8+bHxX08#Mb8qj8C2Z*lkD|M#|TYi;=zp4vq9-*FX{7#T=Ha5vG<`_ync* zD2zlU0G}jcD>dm4i1HH=JxTL=HHuJA8aOyy!fzejj;}ns7oR*h%H4k|4K&%asV0&~ zRH_vRgET|CN2iz)0B+i#nt%DdY<=}fB7OK>{sB_uq z*bGOsj5urX4E>l?uam_{2!2t86e-@<1!YB~Xl%3o$u6i@E9qMtinnxN9^uxXmKe))IMK%r4!=t)(ki ztuIJgZN^njR#>%p^-U+)1Sr?gv}rm+<5ySQq$pU@mpl}))L6v1yB}a;{sx1X0$ZR6xLKZY}#b#eC)kLE*cR+M+9C2&8r-xy)?~yJJo8?11Kxo1fVAnta z2ZnmF6gDuqSiy2lbNfTeAS+K{orsA|j*R||gK5ZVJl}uin~wFy zA1+C&jOK_^xjwEfT*41e{yk3Jcn$e{4*9&ppby3ea8pkLj!1E3L|#p>5U@|euSFso zOr(k;OfAe}sWyYH!~4-+>NUQQSQ8Ln>D4qdZmeKp{t9NQcTAlwBoz}f>~~8`G|9qL z4Yiv63pE^9rV_p<-UERv82>=YlwfXk5*KcNfZL1XJjU(z`_WbG!cb`k>d6vjDmPG% zm*DyZHjW{z7w$_)Z=8D!6&C3w#>Nyy=+gAEjYgd#wan@_{=l~JXeG_*A+I!+@ahNO#gET@ z2Yz02lP#ZjdDbf>f}99Cs}r5M2G*5{Ar!7m?O8{~^H9^Pm|UL4%JLj`j~+qED@p0# zw2qY|Ymic?7S*`1cW3cxS}LUbBqh(AQ#mEGH4R}@y2*qvX73G2v%9{Gp$NrED#~?T z#mwR~F5Ehc>E)Z~E)8L*G>XykUd&gnVxcl6!YIl&zq^5k4l%bfi}N?%#l^`JTrU^= z0t!J1#5E?3OTH$NG=Euzh^^=)xM^4VHd}fMIJR{F2eZLpFPedfnU%J}MY z`|;Hm4q|MifV?N@JPI)U8BIH0RJH_>O2f${r5~G~Ro4H*uyeBkVNH`ft;p8-9(zD= zgVh9O9lz5jDdIOC+l?b*eeme;5j!VyIGPenDO4&I+`4s(8;bW52s=JA_cCSZ1SYY41Zpmh zjy8=aTbX_?qt(g<54(qo(s1hUMQ`A9hdgFXfgsRWs*GKh1#m$UW$e=Hm=+d+ah7NC zi%b86Vxb4+?tb&UxTe8kBda+@xH}$;TaWdcbUgg@{15QM(_cq5nnrh?XrvC;WS;A$ z<2GbM%^H@Np~F%$DS|i-Q)nlNb+`el^$O;fr%M_J2g-!vlIdRC`kTv%RrtRSxLl26vbkYTmbnzD(i@39J16L={pcXA* ztZyGi`*ve`^$zA&Zz7i$LlcJ>gvhg=MJ-yv{K^t8O`XHVyQi>RTS8B17^Om&2;nkh z+^1Qx6g?_tOa}EKv;pr>X0oGP!m(|`*ga5SDDo%w4&y(4;!!-aXNYC@L>R~C5`piZ zvVqZ*eU7kFMTy#nfkQI<+Jj^z+6%eALFsnr#0Yg&0u(zqDM8g5l~eHvN!TDq(tR!W zGjVNa7pW|8B9Qgi%AM1(mG|)Ia2ccJ0%j`>+?iWI>=E{+A(DOcv#v6e7AbKQ_d4QK zl*P45%MOgFZ*2Ny5vtV?`$qflrDyhGM}OJu4{Z*PX5gcJN*Oz430t>r{ZPRGAEt+p zUDUjws6-%$th8DRyr9TRAd_5xf?tG7Y&dE_DV7nH)1PUyN)UmDzU=#AoI>dtoqE3K z<{3|t&1>9EZ@PI6oXfyMd^Zp~f8ouv!hPw4L+ z#%iO2N^OCsL3vlO5d`Zd2sdrirRpr^mha;B+$CI_xPaM(S#%fs(aS&>ArVPf^+c{t z8KGH1(omm6fhQ1SgJnE6+J$GvhPi)~XYCB($3zBcD!mb;{U6&8f|>tQHbed#bOv~i zGVPX#Cmw_$xVw5Cub%n`{L{&Av8Dyxi=KS9X^iSrSjBaWqnC2h2bQzSj7V^L&mCnl zG%9CVR-C6~y9NfZtG~#H+_k&2s8g`ermTudP=^aTv89Lf!n6g>Y2#>?7_N*qMnO7Z zsQMGThwTn4)cj6;EdxYq=PSW{MLLGDqy zubip`3^G>HIpin`^1&gUDN+McNx);YD2$;z%~9J|KJLukz&B6+cl`3g_tD=qXvhjq z>ZHsOK7$OjgE78nEb}aXo?o57Vq+T0S11HN@p4lBfnyp7X+tk_(X%U?DKIvk=fMHv z*NFmK%8}Z!i<(|SRabz;y)l8{)G-R61%_p%%#s>D(V zE|60+0?fhpT{P;zd~F(UT${seWeQ^>2iZ4}0-NIs6Oj7*WSOss4(xg;czFgwO;_e{ zcj@Q2GB=KkQ}5&O=o5H+*VEWBydODb{4=ysnj~sAPbA1yOA9>M^RRcYU&w3`L31M+ z55UdJyl{sICCt%0ts>8b5cssO}{>U8Q(kk4gB=tcM<6d0(Tg$uguuah(DM_Kgy8nn4|-V zx|IIW=z3~p5)EBPSFRh1h*Y%cb@Tn+Pf+E~w-cpxqE(%yXiei)f<#wp%Z$GlS}+B! zFjY@d%qzHq+lx05MpbF1Qt%>5ZnAm9bhG8OG(+X01g0Ss^Vrbk5~3azIlaF+e+BcE z38s59L{vI{{AZ7{Ha174v0B1pDL3lj&$iT<#;?Y2;Ow1~I5%+?M|M4dgQJgO=fECr zKC<)~N#{9Msau``a^KdDN>4*>-iZ*_jR`~drRK9EBRS$W(7)v!A5oxj zb@~$Czw#DdyYd5EnY_%RIYqx4v-6Yq+1&SVX6kJ`Ht`&eYxTM3}-nReG6q8oVI7f3f>75Qn?4^cs|C4^7xZa>_cyt%R%AF)EqaabB=39#njh| zkdP90tj$=PKnF(00#eSJ=$aMkHJ8-kkdb=m8| zH7wnu$TU|y2YF_f#;oyJtGnFqA=>bAHHKgCjG>JcQIY$~`VBrY{xnoWzUIbxE-fgi zy)phzICb-vcx=bhcyjm4*f;tZM$03}=ZYe|Pn2Qikr-Jv+Wv{?aK=1_G*g_!lzyt! z99Il!0xl)lbdwJRmxKFaZ2{MBp2d$Ye-H1E{}PM!C6t09t12reM9wWCMu?S_3Vw0+ zhd6Qd4Lq^?1w6IuMeH3uh{4_=c!Usk~%QSxHwwsA6ZIiOhhwMv_cboZ%T*fZ3F$98QI z*}OP5jnpW$fVY94dI$6@(mmRYR=wdf{U968Iyn)iff^cwTFiFRQ-BBwemD^V;%KWC z15AOjX4i}Zhsq)L>ZG2?7kqr?BL4opui^di*Wlz_m zv;-70Dr3SHXvu=8;hUJ?OPO3Dr=dd!F`*;92yxwG5KuV;06ip=`1Uv)9eOrC>n4 zJc}Csu>Au(Xh47wOQ9wP%|9*OGD&5!HWSp-%9M2nTXsE1Vs z<=AGG5SMgn){&i}teG&hE$;Rj2Pl4^)_qh|$srYX&%N|DH54_7u3dGT?_sl$gRH8_NIyAOJ~3K~yQb zWv@tX3d(0;u0Ng3cIrcZl7VJ)pc8or>EWhH3h87-38F>=7jB)zwYwLvW8lYle*eoj zw)+JP7Dh$ekr2_Qmx5TlG)RI?9=6C#6_8N`GLm(KQuJgZ6xVBb_s$8t`oZ7h%*6YM zYE|~?2yz4q4-ohwx~mL^fF$PJ$Pp`nMubY_GY;gP@z-(o#u*&g{wQ8J_&FTjdJLtY zi}#zuJuS@|5=o2qW58uXVnl*j1Qin4v~~qa>qU5WS3d^3j^V%doW(cK+(xYeG+439 zl(Mv6%>LtXx|uu>sqes+GLDXI5!-rK^h&A0PI@60s7u#xZf=gVHNpekD`#Q7^}qpv z$_9EP+Y*mabq*H|m>s2gP=1~h*(UUKV&b{Sdv}pgS7Dt@y zYJbSM;^d}eV$KI;ns^ZlbX4lgX=9LuNFe|ln(be`dkstV8R>9y(^ag+m=@09{77Jc z8?26*N+(DxEZa9pgCp|?LXjBfjLWf%PL;Z4Se0fz)QKErL|zmNo+c?YoYknwPm<*C zJRj94;(D5

    b;*DtAxf?&2-Hap`AxdiM)>a^J@=(6tRd$)V}GoV1D1lX>T>tgDfg z2{VDg5q!$b><#?n><{qE@tAV#cwM6M4n z3=xGcGglXClX&O)5-v`i!+{~nY(B}ELm^)>0Z2ZtPN~W=F=L}$x51L@4wn?7ti{Mm zl4$lc_HQZTPe1V};|c!jo8t^*qU%h=G%D3J%d5u>-F}-*jb1PFAUp$MquO7p(9na&~BhR3>P&TGH zgr8}o&2p;kcuc7z%ZWLwGMEQqb5behN7z;_;P;<8fc|0ufBE`(T$ouwJu#wlS^_cU zWg%g3vJ*8>Lx>oD8j-_Izi zLx&DEJHtFq47sB&kWaDTj#LFv9H8vwQOp$)>l#j6`4xU}`s)~|5NTSpx?r!Hcpwur90ydkSClM=X6>f=LRZ90eTs~yI>re|XG+gmchBx@lrxDSS5 z(}NjllwxUi>4w7G>NIATrdgqCs62`T#UqTzpnF6QJ8gIoV?jz=cM_X}aVHlm)p=Z> zxPYbAC3YDn96+Ar=6sf@;S7dZt!Y09Qp_1Tw_{L*c{=%Bk5h0r4B>iYh?7U77GiSZ z7Vga6#MPPeICJM+9NG3Hj_#(w&>B33Pt4d3PC}c`cLzzL6JPHnIxQ0v9EJ3O zZeQ!wqRk#el4>=y|2sEE84M-W4+-H!VGbcZAVD`)!c|`WEL)l4< z8M#W9WhAwgV{id-$Q1oD%B3#eC*7qY<4H&(!I&WM(hLT(+grE3e~bBaOzuHUQP)F| zXf)~?feH}%E)%kD%wEB@=_{Pkot-#==k~pV16z-x=;k?<*QTe!nS#w`XmqZqEt#;5 zpi3BpMvSUkW4Qh&509WH@X=ok@cj!nFu&A5$<4!wJtl}HvBD=0?8Koh{W2ZOTxE|H z#2Tpp3t@ohFs2OsLH9BqMnIsAVO6tAY@u%ri3tuNum-OJ1?uqGPZ!MAS*dR=17LtRM|pU}ysc(ZaO z$w)@FGF+4NK#(#;`ajIVBym?=gGM(Z)xcYqevX|3hwzDmpXSmkCI#xmz8#%z&%~67 z$}k(LJm@Nx(4AAr0m%Hfu-)Z!PMOsyUy9d5E4*x)^RqQx^}q z9%Fib4nLUt8(g}3246V-B^=-TarF5;Y!pNQGiCfP__I5r&rR3^LeoOk#a%4Sp+Oi% z$HDR4-6(hM$3T~h*UsI-#7czO$||CogV7#^!@CF3*W1McuRO!h!k(pIz$UJajD6`p z8aHN5lOCk8_`m_drj7I_iGzLf=1qn&)8DB!bWJVA@m&kPzQ3o;-U4?Pr!c#6gYoc$ z3kV#IARoY0GK*)=huGXmKaa2xLL0epdCj%9^x2gdm?@Pj^Q+Sc>kR{HGBG!4#T|4^ zk?-O2clsJNpQ;oPG)xc0Gh;_bz$dEduACTJcVZcA`oTKI4{L39EmAdQC#(2nF%;6P zP%i5)BPL!$PQ#7KZ?MWLSu?BG@a~OYU{C*k>=@dKT3Cl`JD?_8ki^RLiVO|DnD0Zr zP)0z#B_mK`t(gX6=%`g?b%?f!wNtY*rIC8>MBwCF8i$>-gZsabA|TrSV>Hnq ztUcS>(4`;~Ikd&)~=nHZBMeU>vq z^P!^?bS#CM*VptDOut8>i6I~Hd|z{BljH-&odt0Tp%bCj$YXNxCjR!lzrbQ;8J~Le zH?gIAgg>X)4$|bS!FrTRM~IRNH;fe*5cB|$MZd6JDSz(reHmOl6HG4N|JbOh6!JBkd)dA*|OBzxSQ|5SAraP^6-AVRm-b%xr~z zY$=+gjc=PGJBN1S=-5Gw^bZPhE>O}%X7Egv)o&%87rQcgU~;MlN47nO{^Fn&Sl&3@ zXNW8LC{(dfokatc7Vm_QZpnjOk1OnZAWbsGNH^clW4LPwU0x3-IF7Z`H`MX;t^YcL zLE^MLG)_hUwtYi&yk7R_6Q||pvrC}U4WaZh1CstB-M9evMIYY zl{x(F$uA~0B`O~gh?JbApxU>kkxrjFer!9+0*qT6pzlR zMur6_x<0n`4&oCBcH*(EL+J5yg8DVtj6Gbf-owiBDo^+5d3zYs1-l+NAY^CrR3>cM zvV}XJM2+S#k4fvr!VH{BF#y9Y;E6FZ8QBY^NUb>HI}}I85{zmlLVP6-lWRP`hy%k< z;ORZTf$q{EBF6u>M#Suazye=hfiLJ{bpo}h!c8Vds#!6jHcPD!6C^C&BGqwCJNO!n zMh&s9a~+*RO_Kz@#UAt&`dMU^{T$3>!3IwI3I4g)X4hk*e{cCW^Nw zk4w`h@rw&TL^Z6XZq?1Djc$Q9(&sV?rRHQY-_3+1mfB02Pk566q_b}*6<=*RMNMBrI5xFZoz*OyZ~Ket^Gw<1g9dhq77jWhNr?PuWUb zCpKk?8{;ru3W9|b@)jL@WM@#T&|YbvzpIFRN$Al8xg>%gAtt#&u7wvv&)JP@S1~X! zz<;*-BiRGx!>$Jo2<^x|tHMm^DHw`xvt+R7LV5F#j2^=y!-vH0(Xom#2AE@RW`iK2 zP}tTxhL`sJHnw(;@!U31h6Zb*00$fr1#w+Qs}Xz96~ zYh0&OI9vOx%YFgZQN zJ-e*b`h$)f@vwRbc3F@T1qI?ZkdjiXz^F=P!07Abfj}div$x*Gou$ica;jW|@N$hN ze^SGa(ilEA_63afKgy{XMOC_3G(zOjq!MN%$)ewxzlCe_m)RKg;@$JOJ$(gXynwFm z0t$sZ&xS>h&oucS($Xytf&{=g3gxpH8b9~HNtwxW&{y7u;!FvPl^H0-usYM=lJ}FI zRR2F(ttT_-$q2Jh>fbt6R~95-xVB;J@dM!)SUQj3luRFrUJr^vHyYIyxn9PB$sRuX z9-3S%mBuoj+Wj#;oX9k{!9LM0oG4)6 zRv1d=8#y75ps9~SbbtB{rF_opX9-5ucLF9efH^BjH<5aD)KGkwRsiP7>7re|}XB*|g8v;#S}m`Q8fYT$qVA;X7S>rNy( zTqhC}alHt|0N6P+hJ8DZ8?lc@8dM$TV2J20v{7qLfI_~^)^&_2ArN0=Jv>aKdE)`p zJ*}3GeMUHkGC7aIPlSZb!3hOMfBN>jSZOSCfOvN2$5F}!-2ZAsI_-xM+K>&4`8kg{ za1kt=KvG@ZMe}?lA{B?sHPh0kBTrT04ei{yGnI&YnCqe75Zd1qMK6Ld+kjvdVcW+c zbPCeg=D@aNIC=FKn5f)>r$wTQ*k7KX$MJ11*wFU>>xt#b4I2t}lw#h6hEmt0r{>X-1cuGQkdhXk(uU7EcV_(9q zp`9EINN8tEX%u^ zVR3QqiBz5|pfbj*xJIu)i$k=*OWu>()JFHN{o30@EIrIpKLiIs-e z%AK5<{#nUQ>yc|HjiEP8c5fu>MB~WzhKCS{d@ds%89s=oc7FmtIP+JGDpY|4kRu}> z$5Ug!iE?QejVd`4ui$QFnHxAKZ@hsEv!_@Xf|O(;CQnJ(Lf&`czT_eB5U=DgBM|ZqL*<0BNr$xL&++SN+9yO_~sjbg_UXrFCF*|3WNX{7ey$|K_UozbQxh2o=926DKtwU`n|*wzJ2>Pm*Vt{*=AyP|NXO*o7$Is^TdFp zXm;hw6%Gj5O^_~QU*209!lPp^;KYqLaC_+r;;@0;LyzOhZJ)tN&lnb0XK;DqJ)FLM z2Ipr_U}<#`wfYJ|A`Ve{9=OQoTn4p}SOwW$xvoqo66+(NtY@BYTyf$}?cz6En?+;l zO4kVn>(p`T>RVW@&*1Y<{71Yr_6mxAA9`|q$Ok2k_?#-oI;~ebHpc!HtR@d5X$pR{ zt;D3mlp${E+lhmt&tjl73LQl$NsS5Dlvk4lJDvW6@szwH@BNrZ2o_;XyIIft30Dat z%v{7`qk*td!KKMlIC0}OT%EXv#gzq~-4^lz{DNZ3Fp?_E1uhCXDif&A5@%#q9%AKO zOY1eu)Rs=`S08A#r@*OevysXpm=y_ldR_tKQAA9?iRC+J)K?I=0hXd^EUnJ)X==Ij zg2a88Tl%A2Eh%eDsk1&mf^No0c|Ts-^9Ahadqm7j9Z_~pAp8VU+VUI^i_6pa(Ffnc z56}D^PThDDwRjb|e1aesu%?0)$0c@SYJq2@_#eh<5B%~O69Xzsn!OJGXQ5qt48qD| zsWy*^h3lAKUO<=MhoSBfv8`iVjF0Y8$&?E!eIAr?khaef?F&LBQpQc5jqL#e521Hp z*Fy;iot7Op(*KE(MUjn8b!3rZj*&ERBpoaTC9dtyU3(7~Cf>&6@*PACm))QIoX-&F zJPAQi0PtOwRAWy=BlT_nOCP1wFjf9bx5oouy|b&mc5A+#h4s4JEd2l4d-LbGt}IRL zd++6j#J-RK34q`(t|BE;3ssV8Q`J;ePgV6S9TVel&EkleaD@L6|LR{H{=s2)^u)M5 zVUMS0re`X8YRc_ex}<8YlthZFxPjnKf*`SF=6lcaoqNyAn-4D&iG?Jn(ov+6NF?5J z-@WIaox74=;|thJs%*zvFj8Qz=M`kFk_ofleSMHw`)-4jj zlEAePXuEv#{FS!K(4MWMg^+sANjbIK*jQ47_Ssq1W?u+|0?f@-aeI0S_aEIsDc_0y zjuAOVN3n>$-W~(BjtqB$Cxow|(8$LQPbn1wQHdHqXqGBntE_tr!4+Z>c=5c6&p!JM zCr+Gb2rl}uX-PtJizaoxP{QFIC-Cvb-{9`!Tf!PcH-Kaofw%`X>Dj<0v8JO_9ro+` zUs(Z`CozC6!8)F;(z8|xV;k%wo3q`OSb2Hw<|TBLO#syQ+-}b+E3kT2((3w53Aaft z=7b9{MBa8HA_8ygzzf(ld<5lUA1XqZO^km91;0}`3hvF^!{?K~$6tT(bDX^PKJtEm zou6tYzkhA#3BunTQ5nwf$8%#LZJ=bM%cmfW)5_B6)-y+;`8gj$IRS4yuJS+ z4sCe_n>G!~8c{Z}*z$--0h3)P3>-3rub@9|0r;fki7Es^UX@B18XA)5sKye6c8Y`) zz8O>kI851UjPBeJ-aPOl+?bxi`8#JoCU4P*xhe|z4xtv47GI)?m)5yw$&;EW%`gb^ zPO7n-NhR`Pi9g8Onye0za#UkO1ux?iAgbBoC@*8zeO`sgzA$Gf_h}3IhODkL$m7_= zcQM+%Q_y;O60B1B7do*}S;UPySMb~Oe}&(D@n3P{(GB<=K8jvmTBZes&;*S=e+f~` zdOzQ+=iTsZ=&D4@%51AGA~pR((=m(W!2GjPgxNU2xjSdExcKMTGrAX@<(&yPC=w14 z)Ll;B7gQp%bxhwgov-P~CpABws6x=-A_IwRFLnO>c^o@-%+z!Hw&q_-L_P5v`91bp zJh1Ieyfk$hcjs@S8ZO9yac31G5e@`PYGc^u9Z1lR%_6TFDYjR&uJ_mKcLwiZdkfeH zT*w*f?ZC7SmE1LRZ4H6RuT0L-xCn&h`*}}_yO`C@5wde~ArO}5>A4wc zrt+7c{29*QJdMSuf^xBdqGxyyh%F=7ED$_E#Rd}NhLp^cTr5j01KYiZ_9Y%^x(&YcrQz!$BFM&$4M-{%vb zc?xG{(Gv@v7*EiKux6LnDnCPTX;rR=V^?i z>z+2wK`$v@VmjUTa+dn9CRFe_FT_~yR{Z$He~aOsEt%JENNjy^8%V8Aa37Js1p2u! z<>%5ua8rdLS?w zIEqb0q^2-EuX(YJ$t+mSx{m&Nv*YL_F)-V(o|A{6TVoxDXW4z!f~bc+p8{LbQxemB z*EcCPA1LKIFgmzTtb;sE6I@~qKDqXL{NnTf3#V_M#LVMI$ai=s1)b8%u#jiG$VpYl z+7?gYz}e~EH9y}B7Ad4-2olGvS8tk_Q6Odh?6(lv3QsStp<1h=ziR-m?|uh|CXS$( zFC|Tl3=&hjY?;z)ZkV5c{<*9ZVtSNO`AI9iCu$+MKApxA_)e{dq?wDQtmZL zZZ=1Dzk*kHe4CB?#5^S1E&Dl;;>ysd!?6q+HMe^Wa2Dx$-=9kQ_@3=*t;$HP7gKw0 zm%e2}_FEk1`4-Ql0?9yKokL&OFkapE9ce>P;MjwQlhU*EU%&T1qd)Y73lVO{6dieSqJb`G4`j zm0#iZ!&~Sob|PQ!&{2q`(8q9J=ET1eJ5p&Y`K*J$R+rXeN3N{t`L@YOEkDEdW`s5; zGVpj|T&9wUjC-@NFpu$pop@{Sk1#Q?+t9gtrV+BI-JfB~qRAW<)*_rdc~aJj@QikJ zEXkNXDNAA96+$`^>s~m`Afguuuwa0Z9iNEnr#lgNb(kxgqDtHNT8N2Fd+?nD{}5C6 zui);ZEAXqnG|Hs4MearRcF0SIor-kKkv@RF1@^>CucuiGX}!g>$jFAVFhAALFTb;& z#*Hk1dS&V8xjPveU_Qy%>G|5AV2cg?n6{1c5=G`xxoHYfVZ2Kt`tG81F(#%RTYze1 z0WWNR9mgi#!R+D;KArpk|LNpk;M~oR5k@KS&E5b2AOJ~3K~z=ru{D3ulhk597fCBN zq5u=0I$?LVRwNVzRFC%SN$ZK*RZ84AKhpQ5_ibK&QY@EnHiU-MSDM_A@F%KBbKzHZ ze;>zozJ<72L&$VwWP^ybcr5#MK4&_LUAb~a+zDC->(P8=C9-ZVL$k@@PGANX`J(2d zav<0uy{iEAYCmz${205p9>m-G{}|=`pwyEaYANz11mdf)fu<%BVoP}8$Boz37yw$i zS^lg{`7Gd*t6-wofo6L)cqs|o%Cg7ytupYfNiI8_Z+RK~)Q+U*XmU+U$HtPpL{*dv zL)ba|5`tU_|K;-msy|i0e~Ul+_5Xw~Z=E#Qf{sp?HnHU)Fo$VQ=@vVS zH_~Rm&hOVMzURW)topIdSYa&`)0ibTR)RF~3MD?m_!#RIqA5M0)T6Rn!>$7(6Z=+=bgjUOIY`o$p z|1HnBL{nUlgSPCNrWHF{8{&`FQzJc&4bR$I8&YNv*DyMG0CS6T_>Uj_FZjMM2>u=&}vhL`jrJ2=gEfJNO{HOc|M)+|j{e;VU_%0l zwYm>R-_1;J&$fD7Itj9rRJ-@~v@L|?&SyFisk>o;GOWzwkhF1s(srFDxmTxeGlZsL zy$xCug{rc|Re;+K%NH)fdox$?+106ohO1`Qs zT9#M|62`Z^J78Fcd^W3P%XkD!6-WzrQ5Sr(dt3SnZEFFO0v9M!EfR}>d=6~KK#1}? zM}C5XW5*I#$M<5(_`KL~T|6c$gJ~fUghXYq-fT$i$hsY_RKYj2^Diibd+-_l?ZKz zG?PsN&z^1b@3lr9x^arccZb~sNIt^XGJ)oH=W6=rSbI9ytb%+NA|Xtbn$5*obb3X6 z^WY!j_^!8*5As;3)lA4PsvpDUSRhk5%bUrQNDz|SiRo!>M(f6ylzvbDUPb@So8}-A zn?On^0+;l&`fig;TFDcj#Awrzi8pY6dJ2E_@&AF_vs38k?3Ae++TRPlT|x|uP)Cjd zxO9>&Hz`_0a-VcQ7)=&p!}Z5VAm6pHhHAW+G{oVA4VDS5#l9ZXmf1?3MP5KOq5vIw z^>iRHIYz1@wr8_GfN6F@w}hrL6+7Fl6$4YwOEMAIu9s2>Mf2JB90+gg#mrYAT5wSm zV%5UM5muy(ItuFxuGukaNkF&Bd7{SnllgZ&s0hNcV`WmVN?2ijei2={UL4x}J$z%& z571HQm(EUsfXvzx&@zWC58`0DQiS^7ujithsnh=hT^lisT|1R{D25qB}xFIl@Es>>%H~j+V z=4Yh)@r~*8QkI>|m6LO4MciFkq9Cnl9K|`Ktc5k%LxF6|Of!4YlDdsJvMvYwhVx`9 zM%ssAB>g%{K?wt$TQS%@j=u6{bQa2zy;8TMo^?Uvah=;}Pztt2CeHX9I10iOa8<~ths2ph_6LYX{-#&@2wH()FK3}V> zNg+^Jc%j(>?)I!~WOOukf+otT7{`W-J_tK05bbg~&2rFcoH=wBm+ol_r&8*-Al8wRRF z<6Hawk+@L;a!D3Ilr)BER}z=Nc)_?fHHn{}`d@MO!Fz~8Q>{rCBT45v$IV=9?hcl+ z$u*_8-1X`G3n9B_;O(rSjH)4eI(l(n@GTtQ`y=cc-VdL!cL6^HYr6l2&l;{H>w8g3 z`D*=)i7_m<-{^+vZc?<4sW|vM(xuUbU_7DOHM+-IkFw}B9YN{UiML*jGJwq{kWGol z(i{Kq!w(b7BEfq*xmvX-_G~?jA0GP??A&ya%O4BXP{Iab7&^r!(lgft+PuIPMJ+WU zpB2ual_b{_87oOxhi%|&Fh7P@xBnD}cf4-y$2NO`^>bIPN0;z>zeC;ZnV-4k~)npg_mmg=N@~# zI1<)$6!rCqs9MV|OACX?;$ScbOUr;M7~Z4_x|oasYaTQ@Ys{|@hlXFrPhS1+u(fLk zH31gFMU(motHi_z?%h;B)^As+&r>}fSBp=0qT(6GVXbwDBa_#Usy+^kypDsTufYog z*%V{jq!fuuv9iVluJtAOBrk{UL)-A;@HZt$rga&nw}2V@l_=3x-xX>DU%40?oOx$g zRMQAJH2O`vw(SS#E0>7^kic`|@2}v#V_(yak#&hui_Oz`LX>kjI3e`(C2U6Vhp z6!}ucKj}AdD8|=d`3FG_|YignU@N&F&=&GFQNP#k*N+}#L@A$GVC*w@bh zT7ZGV81@VwMORlDUSI$)9_mo(c$Jex?^$*(g2*~bIJ)~=7%Gl~L`TFG1o8|5DMio9 z>o<*#+ZSL!TY>9k?1&8Jm1i?KBV`M7a1X2&A1CnalA2&%1I+h z;LQ`Z$(X|F)2A(pvDTmzk^%O7RB2h{3OKg?8~EYze~Hb5L#Ql-s8#Ha8hX-?UjsDB zH6wO@ZlqvKznVR$CoMXu1ZUuT2&oLi91f1Yfr-s~Y-zFC%}ub+*&UZb8fHmWT5+gv z7<)E<1HGjoM3^-xJ=Adyu4S>7amiA`u?=>bdV!jxLCfA|bme=6V^ycG1j-7JCo9j* zQ%pU)jGSL)MU~{IYgI4dqobuDK9}zn0M+y78%3n)oXkJlnK+Elo8N+cTVBCH_hz|D zQxvAfR1REuRgXlAhBV?&65BkE?)(NWKllV^?%hVIXo|2H;9PDhrh~!FzgS;%`qkKM z`2uHVDLh@r%0d-|LJ2wKlMdbz6Y{+J{d$pomRPnOUYzXahS0>YgjbC_8WMtRdVdNb zkMAWue3EF18b?4~TxmFL;rK#!lFKDOr*RuA5#2Od3q&9jgN{s7W?8taU6X542zr4l z(Rj^7|CWQvASK-gYC~n4C92W55Os7H^YHBUlkkq zVTIOwZY_=X<|pwQIhIEXuoAWoj$-$w7jb>&EEeMj2)v@ncDP`#hDE(jV--sn)AU4$ zL!o5nGm9dpnl!2UjBEzkUq58Z{m#l@wDjq$W#ms|gfey3d(&FO0U^7@uX9#=} zA3`>#T%Z{ZIBnPb1_hv{%UZjm^yx0QLHfGdwHj0@XlJza?^i49(#oyb`%1)RndN{{ z2~Yu$KI+VwGh#VVQK&T`=LnIM>T(`b;}B((@%FwS33tMO{P17n{>+s0-_J{4*SA%G zu>e|PPZ?~NDum_k;b|y{NLj|CP;&Db1qXcFnf@uL|gt@EwwCoEaDe<5B&Ff$htt6 zRWcuJo09fHsabiGTi!9<`%X(m^=)_=$qG zx#db!Mc(Vhj-i(^F}TyFv|N+eE(W^>+HLWYRtD*Nm41n~fymY^JFxfmOSpRPH0Hf& z8E*k5$A)=WDi8SzEw!{C!gX(#jKgw`XkxDch!rJ^+}05|Uc%A?)q{gZM=}18OL{iY zt#~{;i(5DD;^LQQapCeMT)uxA({p!G!Cfrm77*ns@O{&znXUsFk2-T*czyf#@W%ev z(N!F@q&{(SU0UqK*WBD=*@$S?lMsmSYUwg7M-ZQOVbYXgt9g?(kCb18(0^{2d^P*~ zcIAmPCbg1Q7tTSVX5}DqfF~y>aq84596EGJ22s00AtR6#+XAXr_I_8|fc?e${~IRn zU%r61T$aWCXWxqDKj*(b66d%cXjn1y|F5x16GY2DgF;Q6{K!3Rp#%D@54E9Aq(AA)_rQ1ssA~!Z>&uD4UCHdluFN8*L@7}!_A0HQ&!gasf zy}#Hg6eNv+#^0Wq%dl2yb>Z&KDi&Oo!r{Y*<>s@Pm1A35&Xj0ADB$?S+tLH_-+%P4 zaN))oEY#*uj!UTKfZQS(fi3QzG%J-Hf`Tc*6_~RPtkq4zl|^*jhqIi&nDu)G46D&1 zin(rV?>&lbgS$+}-*~k_!x|CU#9{@#ZO<5|;N)s_OA=zL%a;?|b} zPOK&8Xl*|SwIZx78XMwCgTl z8S_woFGMfZ3bytgz)KU~M0a;*{k%^>BQyjU`3eH;+Z$-)# zX;_Dsu#~Lo8kWKZSG)r{ifwT*!sLxhI5YJwCTpLIr(<;!xCxo&tbFHrXvUKYjTQg{fZA7q*FkH6FUH0Q+vkE- zHnEl5qq>*eG^uEaPvCjhVj*nUjv%ft&4J=g(|zCo^Tt2<}UAVv7cdk z{{cb%Q89>y7hF7Kckq;wO=;N@r4Thhp3~R45=o;Yky3;~RL1W9m$7T>VfaB&qUG(v za@S34`of&jG@BXd9>B5f-$AE0fQS>&H+1r`rvKJyRyAx283k$Wi_`pu&(U8%6x7&3 zPXeP0wMEQVE2u6+80;9qw+{UjfBfpdz~PD45JkQO34P9qxRBr->Y%3Bx&j`~o;{CC zmo8y=c$1_UX})ve*P98Mdr_-`3Ta|uBC%+*3YV4>cVl7@lZs_6vZ0#@x;LwX%E4#U zR^10G1*RmaWz%_GGlxu1!JKa*!gLRMJ38_01AiBP^49+#i>;9F#lk`jl}d=3xC+z? zjsl44z@0h=f80Z5+q-F8$4f})SV9tf#&gJ#@{Dc( z>CeIfMter^<;8zdM(b4nX1Ot}9v5V*8ar>5KOPr|z6#TC?|7zc-6!LF?@$)slH zBQPi>bDW0tuoQ@+iHJti3f3C@)H^0W>5t>Ob@Pd%FAa`i}46&Z7&s zwQw25qRD>HmLS$ch!fVBdUVr`!qi}Is@=mHAYC<0b18(JYWi^OZ2dAByAyYQ>e{sXSvzl=hG^sR>TFM`Q7u&p=a3%+rzWsw;Ot(kPb&2dSY zu$)FC?hc)}=VmQ@DI>1$!n*U+BxpF2-;IgkLt-6pk@_}%V7L#`O0qGeSK!qO*wnoV-`f9Uj1BC@ zufO12Ykw}HK0-!KrlFkA(%7~Hid zX;0~nYy)=;Y{sF77suYf_RTLqDTPodX!{*@oX={0*)>xPY3sfQ~{*+Mm=GBLi3>yK`vp{JKD;H-Kk?OsWq& z+w0G>uvSx#WBUQd)|K!~NsigcOvj?0{3!NpIf8+%ez7=w7#Ov15zDdd?wulGjU^CT z#p8z$arMR>OkTZ;>vyi={^Ofitj$U)l?%Qj=oT{4EyH7?IJa!wguebkr(sUi5<{S4 z$V$ZBBZn|Cc>uR(ub~zi_e89fczI}2)}(cPZQoe{`id-qbX5~R@{rGa*xa`rZ|wU4 zzJ2ruI5_bd@_t?riF~dILeor^%*gE5Z(}EF;`2po^rMeHLa9`i^r5B|)iQ7wY#N)A zzE>&)S{8I0)B;)VzTDqGe*9RlIhuuQHm>c;bEgoHfdJ%S(r;6xz`p*Yz`u4(!Fd7k`d3*FM98`3Dk|EEkFb&5diJnB9?a zOa z30T^4Sh7!A2Q&BQaQ^ZIe0cUlOx`?)naU*Q<7rfVQ?|A4sJOidHu=x3n+P|1ViCD&VJftM#hep-bL#R$hRGq z<0XH)yf})D#Jl+jd&drAVtgO=ZQC!3xEdK?8Y^PiK*cQTn&48@^jA<31Bcp(wXbg= z32?gK^%fZhAy0^0j;S?uJt6KNt%E8R$SRc0Mp_X^kte zbo%=BYxwPNe~Xu1dPz*=$nq`f-`V6Ig4m`NnNyA`=qPsKwf*m4eCuAk`{{qd$5;M8 zT)BT9bJbboybcs{>^oT#`ZAfIfeE5{NrPD~Je#}s>pNPU5M|U$Y3nkG*$gQy-rjFoLE@@#9xFaT8r}*^b{v^NjDKfjTtkbi$I_pl>!%`;$X7osOxIDiii)wEog!Ku3C zAVES~+{DHkTYARu(-S|#3*!gz>(Bo)zLC6S2wGkHr zOD&GpbE?jfpbiXw?kJbwErgg~Sis_@26&!2tW&F_tF1+RzbMyA_|J2-LTL;~+`cWj!;hO!Wr&5O5D zAjAhqrND>D2TjFr=guuL^LFgmA)NQxbvL%mKs*G&NIvqyT_{b9g-kRMmZld*U%~k1 z7jWw8N&M>6f55q$ClQ8oSdap)m-Y_;03ZNKL_t)n06}Qz$z>ujt?3!+wjgJTN&>xJ zEjf)f#%bhjC>4Tj=ZQH>f(9zJ5c1&#VtE&(=HlF*`ehTT?f1Y3c(! z3a+4|uYf|XLt+~_Nw*qhz_ckVC=nNs&-t>WFZvI0cIp$1Zkmu-LQiiYnHpININ@K= z=itS7Ve}!g=W*K zu}#?)I!u;op~7ZQizo&~Ni~Nihk+d1*jE=NP|bP+3PD7SSGm;a>3Nt|d>YW^^%E;2 z*{vW*@CWI?Z?(JYF<9isib-Y{=o0f->(vMHxpWy+T18^1F_oQ$TAWnYj4SY63!`ea z(3s!0pJ7B;VlFQ$m&$=kf>705kVkL6AIEo}!1$(}_$1_W{1R{t<3^lgM}FP|6of4+CAep;;6rwQqPDiODabfS^0X^}A}D~y4j&NB9HI)XFT-p9@Gg8kFTSV0awoxy9_v|$)IJjR|` z_=urV*?{aso&jnI_^Fmhob$!H$s%{joFmD<8gUg2)E0^z2y&rK&sI@cG-J#8LS7A` z4v8`7?;jK;z~G+-57SD(?TespEI-p$1*!!3x14*+WfD}}?{Thi{_>hQ9>6H#YsEFx0 z(X$)Jc7GS8a;L#L#AwLl*Ue5%E7cdo;%pVS?oQ$iEtlM56iRt0g}GV3>Sh=NID-bAh^c3c#fL|1q6$g*HVViS~Y!!O|QwzqKe{AI)> z8Hr1x2x#Sy%}Qu2Ns{X+>s2k`6fjv9OOr48ACswwZ1Y-LH}Y@KP$il8$=XHZ1n!Q` zIm4f64G>>2GxJ#deZG{eU2iy7% zVdv&UlFcw_zbL7&%$hW+4A@bb+}emg9xZHSJm&JTBY zWz31yik`Q$wYBa8Te2}K<%)&^MzGdvANPfWzLaA>EWvA^5I&oy@G3*)NhrJ_* z@x_(j+|)KHY7Qmtawz&;$^_9i+y@(Dkn zY0Z}1Z5hr)$}Mz@5;OH6Zeu4>R+ML|?+m9MlyKm z?n) z;{Jm_!bewri%&289@nP7#A0O@i;D|bAeMn#j&w~bz_y+P*gyIzI@tZnQjVt?(&`hV zj+%p52NhhMx{R~ePXfhRsn-uB{tzcM{$`;jT}RA9wC)2JqagC)097nVTm6~f9d5lBKc zGNdP=g$&cJSPW}&ALPXx>)M6R!T@&k9T1nygc8~dEVd(A*4T3Ms@Z4D#Ru9o@zdvF zpqv(LJB^Y4pnys3N)|{%13k)-PiukyHjOW)1@`=4`ksJK2K$Fl$mh-O#>ErmtQ%oV zsinvzvi0%>%NoR7b{>QMTk)OVpW?)xcQASXB0l}{*El_O5;q^*L?y1GO7hOo!+|ZY z;)T&8w$8qhk8tVZ^b=E-?++eMsB00We23r>Tw;02R77!dJkNH5@+=O6 zLA{!VD$`OZmh-st=qgT6eu#;QUD7VD4ry+3J)HP{eaG%7_u$wI-^3R;-^0wE2Z%_b z5)=%td<4s_1nVX+d}v5U=!!+w@+o))l>9Dqm&!Oeb`1L`Uc>g@eYkb^4oX1>s&SP` z;gKjV52y_!UZ?n#mHRo3%e=shCE9&oYP-!X9 zYGCSy=GcP=_i*#ZZG3t0GWPD@ja@r;qgd>e)S-dTHrB&eE3s5UnrB|Kfk*>gCLMfV zR}tMEy%-m>TMJRpkdm_m@dwyZa<2HIy9Mm z7a|{hg%L~)@4?~i$FXDN5Qe%((NpM^-EsQfyu=^;s7}(fTBXp=qHHynTE!pQbs3h+ zG`Lm==P5A<+J_-+ku_uF=at(X;?vco@ z_}-x}u7s&U2xa%=wCC3^&xIeP9a~c zp~`+2jK}c&wLoa?qHqB@&&N>D2zG4QkDbGZux)4$275;^Sl(n($E=);e9SM-A&lnX zdj&*3?TY5^Oe@LSv6WzifjcD{aZU5AzghZB>e&a)TBO^%xoN`m+>hI6>rS_U-=T}k zw5S4-(n{fLmtmEn1Eg-Z#yy0>9#{|*cfji8t>S>6@-29= zzw9pDOx(r8g|E$1`JzeAOcb#MF3o?l6k;;hIPhfOp7w%3? z0e%%lzkmuVMp-cDZ#9j{I;eSBPoohVQ1cB%9E*DByjQR&?nr;{2*$@Jq^Cvw+EzHY zKJfCcZ{hmg%lK^S18f=CioWsy2D^tb(m#svzFpWnunmKKn@y0B2}S9_Ve3NUxS=P8 zEXFw3KwX!9hRcb&z*sHF=gN8)!hsEM#6m;6z?E99?!s2Z0PCLe-`dKJ_y#Uyx{F$i z(<;5G;wmWOXt-hV9*Ck`=~!gRAGAVfrj7Z4)Pl z*f;_|FYy9t4C?ubf1G32rCNj_XAp|gmW_m-b0G>HeaMvxQZ5}^)&v&}XtRSYuY3E} zeRy;KJ9sd69akS*L?xUTEf7Ntt<%Z5&iSA-ko@5 z_ct*%Iw6&d=2F~?X_KZah%hm-Ll}%l`}bha=uWX32Kz?knv}4XbsS8MhH=d{@d#k5p!LCx zg&8g7F5r2o2uRb;MNI${=UFpylU86RDitaPrqA8_h}Fs;v_eRmXz9ULf6p|UHOhcy zG|e?W+|#GO!1?nR1T{9id5a~e@C6$$1g$kwXD`S+-&WMsD#H8U*I!04ZvvHm0!L18 zM9W??U!_73uOIk6{6Yc0IQj4JaQ-Hk%Os?@5>||xA`>(;MOR@}ynj}EayOQ6ppE+b zg*?iIZfxn=juZRe!M6_lM2JJ`lW{d%ee|Cr>>AyN9b5J#rNTA3Q4*Al5Z7`BR}fbX zQ4D`45YCF=8=}}vu|)~RT)Gu|mNa{|v;w#&Y3*^L^7(OLYW<7)`)fe~s+FNF2NlxH z7YnAS7+71wSOB>UnCd1Zx*49Jm8C#Mrm1sU9$#k})*#D8cMSoiu^Ku$I?>tLjoH~p z@_P7i77rgX_;^7IVMa%{V#}7T=NG9(NPpo z4Bt&~Xbyve{bDUpJD)%ICC*>CC>3ZE+qa>&rw@ff8D1O+tJ2J)1u-ERlgRmM3L{wr z@&J`KJi}7RjBvAPD#)X=yDW^;ENR(lyufWu`jenG@igxW-2Itmw{_4r{#c0 z$T%mDMTJ1cKsRJH^0h)}Q_Rj}sMGks$fw75E^tmLn!^i~c?s}LP2ChGo6VbsFg~#r z6B9d7%J(3w#S&{MN$fy@LgxI*L$`_`8<><5hc?}_U?~EGa*S!9=vEsnJyv82uEbqP zvYkX?R;8PfD-9DeR%@n>g(xh}EG_rY(bcRX8P+tT7);=i0VG-q%)f6Q z8kV1_96mpJ4kthQLKFtIKYdk6<=KEiQ{akyZ#4-GvTbQ>ZLdZS6lK z`;&~-3V}cT%)rz04ZmCN-c~v{TYXZzD{aNm&~13G6~gnV3{>=iNGD+unpzmNrk!ZQZQeYB zty{<1E|YEdoU8fUmC9O_fqQ)%8!m1}_64pT0E-nvK63NM9bB8dg8BJ51VIiRrCyAW zZcAwJ_;+;E7y~fq&}dmyUzVsvkft1a7M7{IkTtHrjU?T$wV6`Of=F{rI1f3-tC0<5 zA#7xKp^gy@^ zy*Q6ju?yt^=Ko75StC3;RpG`6egnprm-V{S&P zk!LzXvmStA!JpN`S*@gfRb2pdA*lJO7?zWE?m2F=k*tc>q^#F-aQAQ~S2HFc&uK>5 zP5>@_&8`*2iBHnoxrKS5LGS7;qg?7vVlu^IUaSEvI#UG;8>L^1HR*Qp${LerA@1(Z z`(24k)J#^}1^SsPgscdxTdeUsNi!3kQE~cmu658fkk|x#LZ!mpk-jDWtq*%GE>@PJ z@G_{u^qsr9A~>}dq2}wCI}cKp0(X1{S7{|2+<#Q=$t;ANJx5^iA4~fk#7-yhcEug< z^}racr?}U~=c;uID^a*<1&$S{CDN{Z@(U*&!FBectFC>kPFi^@!I2E0y?OOTt?(g&&6P?Gg;m6vOkT?Su z|DSa&E47f)_sR2Ud?&pVuP&3aHgSXLe5P)D_;w`S{*7}+>E2f(8^UGa?n#ga{X+&r zXkI@r7DBV@eS^G}5!lS2!-<8_`>1jc-aVMo>&9OS;VUTvUAggEYGU&kbAt{uT{D#z&ZXd?9w9L;xqxge+UhUb> z1=EfKNKZy8M~($^@Z8C?NeJT+fnl0q4jDq_+y=ESZ8%dVi(ayTq5EcU8Innu|Qn+y8f=oJ^rF13SR_^VjoZ4N0 z>!~=>CM_QdCtkDG;9iT`bv{&<sGH$tXb;p28go>Y*)b{P$pU5IiUl0GyIYsM$3N5Pz+Iq~3 ztOcC)8J{(+V&V|oRA~Adn$4GV>_9mkXu+-KJ~m8Hk&}tfn|s zNRxIUvJ`;(x6Q7{9Z&rpuaTUSR06aVsJ!&KG;@iXO>mmXtUTmoPB$}IFUg9lu!e!p zi18VP4>wcLtC4209CyRuJmIECWsv0}rN^z+b@7gkoQXk$>XFIU;2DHiPu`3lXZ@Ci!wKO#m{Nc@p`EoH1m)p>9~aFq%t{qnT?@a zv>G#ax%)yBg|8e0R1AD(ZokI$6wmflpfzAx2-XsGqT4JseSIsrcPbaULA2axZE@bL zM!9V`=(1-6PTYa095{$@V41qx@tuo?gUfe*j}O+RzEX}nmkKM(2i3*Iy?lbF} zRJqV9mfZJiZ|expE+|z6a)K|(sj#HsO{d%YIw2MRkBPb zq;~R^-qcFOJ-_DL)xT3S)|F;HDTVP3Q-qUk_NL9%*x@(idH8TOAfz?%ttQ3Od_HJ0 zfqDH(7|I=+d*M zv@JaOJ!zHh-@jji*ct~}?e(u&At;CaTFt9wmci4Kv|`eL8F#I$>r8(}bD!^O8fKZd z%_cEFr*%Q=fQyT}Wmd%dX^%--TA8p6fN~)-U(Z6+jOV~JK&TMm^kPomE762rMx@_;80not-?@O8X5@M4Lu-Wic@VXzsL1%D zmBX>)xHVJm&D;r^>s;t`osd$h8dT<_r_$kh+={+ti(sS3a@UhywEE6@$N9lEcKPyU zQ34-+_@M+4X;HoQ+G}DNC{D#?ZcdNQ6OSP<0#1c+_3BkQnZk72J^4nH*g}Rmp-Gxb z3&Blex{|&>=F<6qw6f7H{K58IbG~yvXtqny zi`q?!8jqRKAm}=gy@6O z_FYs4T%i1nAQ|S^ImyzKIK6Wzg*G1|O*;B`#4&I&XpO%Do??q#*9Ab!g2&*478arB z(6WMEten_74pa&pPn{1`3TY&w?uZ-%)=Mz#m5tsaBwfFADYjCy{6vTNHl&(+DbT#*$l!jL8%6{BV+VvD}i(qZ?zJg;Zb za@_H_o6`Jib*_ypdd-~RR0Le8RCXGJQEMr!5Oi1MJHJC_DMe^D%QEPW%Hvb<5Y?(2 z5z2Ad4p+m|l-Ppl)FNcjg5$}JB2eq5odp^@$VrX^7X+0f6$7LO4Vf@95zPes7-cMG|iomWf1)y<=F zAZ(WbNnLmwEwHEoScTIoAu1J^Hi1!6iV;27vQxG2)}-|E<_Rq1v` zZUxSA{cwe->n60GIED2R_xZb3q^@<~IW6Q}s`h5%oi(1%%w&#A z;(pj@W15Avaqr)Ke^%GNE*8Sq^0j;|Uk!P_65fA6^0l7+TAqb`tq{JJXC_}Oy^SYd pD})UyU&WY$E6-zU^(!v`{(t^DW*HvSpUD6K002ovPDHLkV1l0B(Ln$J literal 0 HcmV?d00001 diff --git a/Source/components/viztools/PinPictureTool/index.vue b/Source/components/viztools/PinPictureTool/index.vue index 7654c888..4ee39fba 100644 --- a/Source/components/viztools/PinPictureTool/index.vue +++ b/Source/components/viztools/PinPictureTool/index.vue @@ -215,7 +215,7 @@ export default { this.makiIconObj = XE.Obj.Pin.MakiIcon; this.makiIconObj.null = ""; if (this._czmObj.isCreating && !this.pin.imageUrl) { - this.pin.imageUrl = "../../Examples/images/earth.png"; + this.pin.imageUrl = "../../assets/earth.png"; } this._czmObj.far = 1073741824; From 9d6fdee0bda0939d63a4e74d4f0fad860c0ad108 Mon Sep 17 00:00:00 2001 From: vtxf Date: Wed, 20 Nov 2019 18:04:51 +0800 Subject: [PATCH 44/82] =?UTF-8?q?3dtiles=E7=8E=AF=E5=A2=83=E8=B4=B4?= =?UTF-8?q?=E5=9B=BE=20=E6=A8=A1=E5=9E=8B=E7=8E=AF=E5=A2=83=E8=B4=B4?= =?UTF-8?q?=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Apps/Examples/earth-model-envirement.html | 203 +++++++++++++++++++ Apps/Examples/earth-tileset-envirements.html | 125 ++++++++++++ Apps/Examples/scripts/list.js | 34 ++-- 3 files changed, 349 insertions(+), 13 deletions(-) create mode 100644 Apps/Examples/earth-model-envirement.html create mode 100644 Apps/Examples/earth-tileset-envirements.html diff --git a/Apps/Examples/earth-model-envirement.html b/Apps/Examples/earth-model-envirement.html new file mode 100644 index 00000000..fc0adefb --- /dev/null +++ b/Apps/Examples/earth-model-envirement.html @@ -0,0 +1,203 @@ + + + + + + + + + 模型-环境贴图 + + + + + + + +

    + +
    + + + + + \ No newline at end of file diff --git a/Apps/Examples/earth-tileset-envirements.html b/Apps/Examples/earth-tileset-envirements.html new file mode 100644 index 00000000..640a9aa4 --- /dev/null +++ b/Apps/Examples/earth-tileset-envirements.html @@ -0,0 +1,125 @@ + + + + + + + + + + 3dtiles环境贴图 + + + + + + + +
    + +
    + + + + + + + \ No newline at end of file diff --git a/Apps/Examples/scripts/list.js b/Apps/Examples/scripts/list.js index 5a99d164..44a965b6 100644 --- a/Apps/Examples/scripts/list.js +++ b/Apps/Examples/scripts/list.js @@ -422,6 +422,27 @@ vueApp.examples = [ } ] }, + { + "title": "内部测试", + "list": [ + { + "title": "模型-环境贴图", + "url": "./earth-model-envirement.html" + }, + { + "title": "3dtiles环境贴图", + "url": "./earth-tileset-envirements.html" + }, + { + "title": "环绕地球", + "url": "./test-earthRotating.html" + }, + { + "title": "多选-框选&任意选择", + "url": "./test-polygonPicking.html" + } + ] + }, { "title": "EarthUI示例", "list": [ @@ -527,18 +548,5 @@ vueApp.examples = [ "url": "./startup-tileset.html" } ] - }, - { - "title": "内部测试", - "list": [ - { - "title": "环绕地球", - "url": "./test-earthRotating.html" - }, - { - "title": "多选-框选&任意选择", - "url": "./test-polygonPicking.html" - } - ] } ] \ No newline at end of file From 19ffa6aeac948862065c92a941fdc372fbbfbae9 Mon Sep 17 00:00:00 2001 From: vtxf Date: Thu, 21 Nov 2019 09:09:53 +0800 Subject: [PATCH 45/82] =?UTF-8?q?toggleChecked=E4=BD=BF=E7=94=A8setAllChil?= =?UTF-8?q?drenEnabled=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Source/components/tools/SceneTreeTool/index.vue | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Source/components/tools/SceneTreeTool/index.vue b/Source/components/tools/SceneTreeTool/index.vue index 93b4d771..d428398d 100644 --- a/Source/components/tools/SceneTreeTool/index.vue +++ b/Source/components/tools/SceneTreeTool/index.vue @@ -238,7 +238,13 @@ export default { treeItem._inner.sn.expand = !treeItem.expand; }, toggleChecked (treeItem, checked) { - treeItem._inner.sn.enabled = checked; + if (treeItem._inner.sn instanceof XE.SceneTree.Group) { + treeItem._inner.sn.setAllChildrenEnabled(checked); + } else if (treeItem._inner.sn instanceof XE.SceneTree.Leaf) { + treeItem._inner.sn.enabled = checked; + } else { + console.error('toggleChecked got error!'); + } }, popContextMenu ({ item, vueObject }) { //右键之后设置当前node From 0c4873c956253513eb11b7ead47384fcce0f5d0e Mon Sep 17 00:00:00 2001 From: lforrrrawx <237895772@qq.com> Date: Sat, 23 Nov 2019 13:31:24 +0800 Subject: [PATCH 46/82] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=87=E7=BB=98?= =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E6=98=BE=E7=A4=BA=E5=9B=BE=E6=A0=87=20?= =?UTF-8?q?=E5=B0=86svg=E8=BD=AC=E4=B8=BApng?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controls/MainBarControl/View/index.vue | 13 +++++++- .../tools/ModelServices/ModelCloud.vue | 30 ++++++++++-------- Source/components/tools/SymbolTool/index.vue | 13 ++++++-- .../viztools/PinPictureTool/index.vue | 2 +- Source/images/symbol.png | Bin 0 -> 2241 bytes Source/images/symbol_on.png | Bin 0 -> 2370 bytes webpack.config.js | 14 ++++++-- 7 files changed, 51 insertions(+), 21 deletions(-) create mode 100644 Source/images/symbol.png create mode 100644 Source/images/symbol_on.png diff --git a/Source/components/controls/MainBarControl/View/index.vue b/Source/components/controls/MainBarControl/View/index.vue index 61a82c90..bf629702 100644 --- a/Source/components/controls/MainBarControl/View/index.vue +++ b/Source/components/controls/MainBarControl/View/index.vue @@ -40,7 +40,7 @@
    -
    +
    {{lang.symbol}}
    {{lang.Scanline}}
    + +
    +
    + {{lang.CustomPrimitive}} +
    +
    + + +
    +
    + +
    + +
    + + + +
    +
    +
    + +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + + +
    + +
    + + +
    + +
    +
    + +
    + +
    + + + +
    +
    + {{c}} +
    +
    +
    + +
    + + + +
    +
    + {{c}} +
    +
    +
    +
    + + +
    +
    + + + +
    +
    + +
    +
    +
    +
    + +
    {{lang.editing}}{{topTitle}}
    +
    +
    + +
    +
    + + + + + + + +
    + +
    +
    +
    +
    + + + + + + \ No newline at end of file diff --git a/Source/components/viztools/CustomPrimitiveTool/index_locale.js b/Source/components/viztools/CustomPrimitiveTool/index_locale.js new file mode 100644 index 00000000..b3e98598 --- /dev/null +++ b/Source/components/viztools/CustomPrimitiveTool/index_locale.js @@ -0,0 +1,66 @@ +const zh = { + title: "自定义图元属性", + name: "名称", + weizhi: '位置', + zitai: '姿态', + creating: '创建', + edit: '编辑', + width: '宽度', + height: '高度', + animation: '动画', + loopPlay: '循环', + loopcycle: '循环周期', + color: '颜色', + flyto: '定位', + nowtime: '当前时刻', + primitivetype: '类型', + pass: 'pass', + predefined: '预定义', + geometry: '几何体', + canvastexture: 'canvas纹理', + createcode: '创建代码', + framecode: '帧动画代码', + destorycode: '销毁代码', + render: '渲染', + vertexshader: '顶点shader', + spritsshader: '片元shader', + renderstats: '渲染状态', + editing: '正在编辑', + apply: '应用' +}; + +const en = { + title: "CustomPrimitive Property", + name: "Name", + weizhi: 'position', + zitai: 'rotation', + creating: 'creating', + edit: 'edit', + width: 'width', + height: 'height', + animation: 'animation', + loopPlay: 'loopPlay', + loopcycle: 'loopcycle', + color: 'color', + flyto: 'flyto', + nowtime: 'time', + primitivetype: 'primitiveType', + pass: 'pass', + predefined: 'Predefined', + geometry: 'geometry', + canvastexture: 'canvastexture', + createcode: 'createcode', + framecode: 'framecode', + destorycode: 'destorycode', + render: 'render', + vertexshader: 'vertexshader', + spritsshader: 'spritsshader', + renderstats: 'renderstats', + editing: 'editing', + apply: 'apply' +}; + +export default { + zh, + en +}; \ No newline at end of file diff --git a/Source/css/common.css b/Source/css/common.css index 85ec8b11..a2bd4d7b 100644 --- a/Source/css/common.css +++ b/Source/css/common.css @@ -70,7 +70,7 @@ .xbsj-item-btnbox { height: 72px; - width: 50px; + width: 60px; /* border: 1px solid red; */ float: left; margin-top: 5px; From b510b8a70535866507d65c2930d3862a1988ba5d Mon Sep 17 00:00:00 2001 From: vtxf Date: Sat, 23 Nov 2019 11:01:33 +0800 Subject: [PATCH 48/82] =?UTF-8?q?=E5=AE=8C=E5=96=84wall?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Apps/Examples/earth-digitalFactory.html | 29 ++++++++++++++----------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/Apps/Examples/earth-digitalFactory.html b/Apps/Examples/earth-digitalFactory.html index e246b4ab..641cdbd9 100644 --- a/Apps/Examples/earth-digitalFactory.html +++ b/Apps/Examples/earth-digitalFactory.html @@ -169,19 +169,10 @@ ]; const [localPositions, center] = XE.Obj.CustomPrimitive.Geometry.getLocalPositions(positions); - let p = new XE.Obj.CustomPrimitive(earth) - p.position = center; - p.positions = [...localPositions]; - p.sts = [0.0, 0.0, 0.5, 0.0, 1.0, 0.0, 0.0, 1.0, 0.5, 1.0, 1.0, 1.0]; - p.indices = [0, 1, 4, 0, 4, 3, 1, 2, 5, 1, 5, 4]; - p.color = [0.5, 0.8, 1.0, 1.0]; + const renderState = XE.Obj.CustomPrimitive.getRenderState(true, true); + renderState.cull.enabled = false; - p.renderState = XE.Obj.CustomPrimitive.getRenderState(true, true); - p.renderState.cull.enabled = false; - - p.canvasWidth = 1; - - let vtxfFragmentShader = + const fragmentShaderSource = ` varying vec3 v_positionEC; varying vec3 v_normalEC; @@ -197,7 +188,19 @@ } `; - p.fragmentShaderSource = vtxfFragmentShader; + const config = { + position: center, + positions: [...localPositions], + sts: [0.0, 0.0, 0.5, 0.0, 1.0, 0.0, 0.0, 1.0, 0.5, 1.0, 1.0, 1.0], + indices: [0, 1, 4, 0, 4, 3, 1, 2, 5, 1, 5, 4], + color: [0.5, 0.8, 1.0, 1.0], + renderState, + canvasWidth: 1, + fragmentShaderSource, + }; + + const p = new XE.Obj.CustomPrimitive(earth); + p.xbsjFromJSON(config); } // 1 XE.ready()会加载Cesium.js等其他资源，注意ready()返回一个Promise对象。 From b67697f2dc49388bb3539944ddcd568fe7cdd898 Mon Sep 17 00:00:00 2001 From: vtxf Date: Mon, 25 Nov 2019 11:44:40 +0800 Subject: [PATCH 49/82] createTube --- Apps/Examples/earth-digitalFactory.html | 136 ++++++++++++++++++++++++ 1 file changed, 136 insertions(+) diff --git a/Apps/Examples/earth-digitalFactory.html b/Apps/Examples/earth-digitalFactory.html index 641cdbd9..3ee41f0b 100644 --- a/Apps/Examples/earth-digitalFactory.html +++ b/Apps/Examples/earth-digitalFactory.html @@ -8,6 +8,7 @@ 数字工厂 + + + + +
    +
    + + + + + + \ No newline at end of file diff --git a/Apps/Examples/earth-digitalFactory.html b/Apps/Examples/earth-digitalFactory.html index 2f0020d3..8870e5cc 100644 --- a/Apps/Examples/earth-digitalFactory.html +++ b/Apps/Examples/earth-digitalFactory.html @@ -5,7 +5,8 @@ - + + 数字工厂 @@ -157,9 +158,6 @@ earth.camera.rotation = [3.972507149093452, -0.5205829134298061, 6.28037637077842]; createDynamicWall(); - //debugger; - createTube(); - //debugger; } function createDynamicWall() { @@ -169,7 +167,7 @@ [2.0312082890850296, 0.6964532955295221, 0.0], [2.0315193182543485, 0.6963069713474035, 50.0], [2.031208054060137, 0.6963058641803516, 50.0], - [2.0312082890850296, 0.6964532955295221, 50.0], + [2.0312082890850296, 0.6964532955295221, 50.0], ]; const [localPositions, center] = XE.Obj.CustomPrimitive.Geometry.getLocalPositions(positions); @@ -177,7 +175,7 @@ renderState.cull.enabled = false; const fragmentShaderSource = - ` + ` varying vec3 v_positionEC; varying vec3 v_normalEC; varying vec2 v_st; @@ -207,110 +205,6 @@ p.xbsjFromJSON(config); } - function createTube() { - let path; - let center; - - { - const positions = [ - [2.0315193182543485, 0.6963069713474035, 50.0], - [2.031208054060137, 0.6963058641803516, 50.0], - [2.0312082890850296, 0.6964532955295221, 50.0], - ]; - const [localPositions, centerL] = XE.Obj.CustomPrimitive.Geometry.getLocalPositions(positions); - center = centerL; - - const ll = localPositions.length / 3 | 0; - const vectors = []; - for (let i=0; i { - const va = geometry.vertices[e.a]; - const vb = geometry.vertices[e.b]; - const vc = geometry.vertices[e.c]; - return [va.x, va.y, va.z, vb.x, vb.y, vb.z, vc.x, vc.y, vc.z]; - }); - - var sts = geometry.faceVertexUvs[0].flatMap(e => { - return [e[0].x, e[0].y, e[1].x, e[1].y, e[2].x, e[2].y]; - }); - - var normals = geometry.faces.flatMap(e => { - const va = e.vertexNormals[0]; - const vb = e.vertexNormals[1]; - const vc = e.vertexNormals[2]; - return [va.x, va.y, va.z, vb.x, vb.y, vb.z, vc.x, vc.y, vc.z]; - }); - - var indices = []; - { - const fl = geometry.faces.length; - for (let i=0; i { - ctx.clearRect(0, 0, p.canvasWidth, p.canvasHeight); - ctx.drawImage(image, 0, 0); - }); - }); - `; - - const config = { - position: center, - positions, - sts, - indices, - color: [0.5, 0.8, 1.0, 1.0], - customParams: [1.0, 1.0, 1.0, 1.0], - renderState, - // primitiveType: WebGL2RenderingContext.LINES, - fragmentShaderSource, - pass: Cesium.Pass.TRANSLUCENT, - evalString, - }; - - const p = new XE.Obj.CustomPrimitive(earth); - p.xbsjFromJSON(config); - } - // 1 XE.ready()会加载Cesium.js等其他资源，注意ready()返回一个Promise对象。 XE.ready().then(startup); diff --git a/Apps/Examples/scripts/list.js b/Apps/Examples/scripts/list.js index 44a965b6..8d2cf796 100644 --- a/Apps/Examples/scripts/list.js +++ b/Apps/Examples/scripts/list.js @@ -87,6 +87,10 @@ vueApp.examples = [ "title": "自定义图元-SVG", "url": "./earth-customPrimitive-svg.html" }, + { + "title": "自定义图元-tube", + "url": "./earth-customPrimitive-tube.html" + }, { "title": "圆柱体集群", "url": "./earth-cylinders.html" diff --git a/Apps/Examples/startup-createEarth.html b/Apps/Examples/startup-createEarth.html index f58adb1e..841d2a38 100644 --- a/Apps/Examples/startup-createEarth.html +++ b/Apps/Examples/startup-createEarth.html @@ -7,6 +7,11 @@ 创建地球 + + + + + \ No newline at end of file diff --git a/Source/components/viztools/PinTool/index.vue b/Source/components/viztools/PinTool/index.vue index 2cc6495c..a08d7239 100644 --- a/Source/components/viztools/PinTool/index.vue +++ b/Source/components/viztools/PinTool/index.vue @@ -156,15 +156,11 @@ + + \ No newline at end of file diff --git a/Source/components/viztools/TubeTool/index_locale.js b/Source/components/viztools/TubeTool/index_locale.js new file mode 100644 index 00000000..7c5ce949 --- /dev/null +++ b/Source/components/viztools/TubeTool/index_locale.js @@ -0,0 +1,78 @@ +const zh = { + title: "管道属性", + name: "名称", + weizhi: '位置', + imgurl: '图片地址', + movespeed: '移动速度', + rotatespeed: '旋转速度', + radialsegments: '径向段', + tubularsegments: '管段', + closed: '闭合', + zitai: '姿态', + creating: '创建', + edit: '编辑', + width: '宽度', + height: '高度', + animation: '动画', + loopPlay: '循环', + loopcycle: '循环周期', + color: '颜色', + flyto: '定位', + nowtime: '当前时刻', + primitivetype: '类型', + pass: 'pass', + predefined: '预定义', + geometry: '几何体', + canvastexture: 'canvas纹理', + createcode: '创建代码', + framecode: '帧动画代码', + destorycode: '销毁代码', + render: '渲染', + vertexshader: '顶点shader', + spritsshader: '片元shader', + renderstats: '渲染状态', + editing: '编辑', + apply: '应用' +}; + +const en = { + title: "Tube Property", + name: "Name", + weizhi: 'position', + imgurl: 'imgUrl', + movespeed: 'movespeed', + rotatespeed: 'rotatespeed', + radialsegments: 'radialSegments', + tubularsegments: 'tubularSegments', + closed: 'closed', + zitai: 'rotation', + creating: 'creating', + edit: 'edit', + width: 'width', + height: 'height', + animation: 'animation', + loopPlay: 'loopPlay', + loopcycle: 'loopcycle', + color: 'color', + flyto: 'flyto', + nowtime: 'time', + primitivetype: 'primitiveType', + pass: 'pass', + predefined: 'Predefined', + geometry: 'geometry', + canvastexture: 'canvastexture', + createcode: 'createcode', + framecode: 'framecode', + destorycode: 'destorycode', + render: 'render', + vertexshader: 'vertexshader', + spritsshader: 'spritsshader', + renderstats: 'renderstats', + editing: 'edit', + apply: 'apply' +}; + +export default { + zh, + en +}; \ No newline at end of file diff --git a/Source/managers/MainUI.js b/Source/managers/MainUI.js index e67612db..df4e5808 100644 --- a/Source/managers/MainUI.js +++ b/Source/managers/MainUI.js @@ -8,6 +8,7 @@ import XbsjSelect from "../components/common/Select"; import XbsjInput from "../components/common/Input"; import XbsjSwitch from "../components/common/Switch"; import XbsjSlider from "../components/common/Slider"; +import XbsjInputNumber from "../components/common/Slider/input-number"; import XbsjIcon from "../components/common/Icon"; import XbsjRampSelect from "../components/common/RampSelect"; import XbsjLngLatHeight from "../components/common/LngLatHeight"; @@ -28,6 +29,7 @@ Vue.component("XbsjSelect", XbsjSelect); // 全局注册组件 Vue.component("XbsjInput", XbsjInput); // 全局注册组件 Vue.component("XbsjSwitch", XbsjSwitch); // 全局注册组件 Vue.component("XbsjSlider", XbsjSlider); // 全局注册组件 +Vue.component("XbsjInputNumber", XbsjInputNumber); // 全局注册组件 Vue.component("XbsjIcon", XbsjIcon); // 全局注册组件y Vue.component("XbsjRampSelect", XbsjRampSelect); // 全局注册组件y Vue.component('XbsjLngLatHeight', XbsjLngLatHeight); @@ -143,12 +145,12 @@ class MainUI { data: { language: 'zh' }, - created () { + created() { this.$earth = earth; this.$earthUI = mainUI; this.$labServer = labServer; }, - mounted () { + mounted() { }, watch: { @@ -193,7 +195,7 @@ class MainUI { * @instance * @memberof ControlsCollection */ - get statusBar () { + get statusBar() { return mainUI._statusBar; }, // get navigator() { @@ -206,7 +208,7 @@ class MainUI { * @instance * @memberof ControlsCollection */ - get mainBar () { + get mainBar() { return mainUI._mainbar; } }; @@ -262,7 +264,7 @@ class MainUI { * @instance * @memberof ToolsCollection */ - get sceneTree () { + get sceneTree() { return mainUI._sceneTree; }, /** @@ -272,7 +274,7 @@ class MainUI { * @instance * @memberof ToolsCollection */ - get imageryLab () { + get imageryLab() { return mainUI._imageryLab; }, @@ -283,7 +285,7 @@ class MainUI { * @instance * @memberof ToolsCollection */ - get imageryLabCloud () { + get imageryLabCloud() { return mainUI._imageryCloud; }, @@ -294,7 +296,7 @@ class MainUI { * @instance * @memberof ToolsCollection */ - get modelCloud () { + get modelCloud() { return mainUI._modelCloud; }, @@ -305,7 +307,7 @@ class MainUI { * @instance * @memberof ToolsCollection */ - get terrainCloud () { + get terrainCloud() { return mainUI._terrainCloud; }, @@ -316,7 +318,7 @@ class MainUI { * @instance * @memberof ToolsCollection */ - get imageryOnline () { + get imageryOnline() { return mainUI._imageryOnline; }, /** @@ -326,7 +328,7 @@ class MainUI { * @instance * @memberof ToolsCollection */ - get imageryWMTS () { + get imageryWMTS() { return mainUI._imageryWMTS; }, /** @@ -336,7 +338,7 @@ class MainUI { * @instance * @memberof ToolsCollection */ - get modelLab () { + get modelLab() { return mainUI._modelLab; }, /** @@ -346,7 +348,7 @@ class MainUI { * @instance * @memberof ToolsCollection */ - get modelOnline () { + get modelOnline() { return mainUI._modelOnline; }, /** @@ -356,7 +358,7 @@ class MainUI { * @instance * @memberof ToolsCollection */ - get terrainLab () { + get terrainLab() { return mainUI._terrainLab; }, /** @@ -366,7 +368,7 @@ class MainUI { * @instance * @memberof ToolsCollection */ - get terrainOnline () { + get terrainOnline() { return mainUI._terrainOnline; }, /** @@ -376,7 +378,7 @@ class MainUI { * @instance * @memberof ToolsCollection */ - get cameraViewManager () { + get cameraViewManager() { return mainUI._cameraViewManager; }, /** @@ -386,7 +388,7 @@ class MainUI { * @instance * @memberof ToolsCollection */ - get cutFillComputing () { + get cutFillComputing() { return mainUI._cutFillComputing; }, /** @@ -396,7 +398,7 @@ class MainUI { * @instance * @memberof ToolsCollection */ - get featureProperty () { + get featureProperty() { return mainUI._featureProperty; }, /** @@ -406,7 +408,7 @@ class MainUI { * @instance * @memberof ToolsCollection */ - get modelTree () { + get modelTree() { return mainUI._modelTree; }, /** @@ -416,7 +418,7 @@ class MainUI { * @instance * @memberof ToolsCollection */ - get entitymore () { + get entitymore() { return mainUI._entitymore; }, @@ -427,7 +429,7 @@ class MainUI { * @instance * @memberof ToolsCollection */ - get symbol () { + get symbol() { return mainUI._symbol; } }; @@ -540,7 +542,7 @@ class MainUI { }); } - get earth () { + get earth() { return this._earth; } @@ -550,7 +552,7 @@ class MainUI { * @param {Function} ok 点击确定按钮后的回调 * @param {Function} cancel 点击取消按钮后的回调 */ - confirm (info, ok, cancel) { + confirm(info, ok, cancel) { this._vm.$refs.mainUI.confirm(info, ok, cancel); } @@ -559,12 +561,12 @@ class MainUI { * @param {Object} czmObject 需要显示属性的对象 * @param {Object} options 其他参数，详细请见示例 */ - showPropertyWindow (czmObject, options) { + showPropertyWindow(czmObject, options) { this._vm.$refs.mainUI.showPropertyWindow(czmObject, options); } - destroy () { + destroy() { this._czmObjectOpsEventDisposer = this._czmObjectOpsEventDisposer && this._czmObjectOpsEventDisposer(); this._vm.$destroy(); @@ -579,7 +581,7 @@ class MainUI { * @param {Number} height 截图高度 * @param {String} filename 需要保存的文件名 */ - saveScreenToFile (width, height, filename) { + saveScreenToFile(width, height, filename) { this._earth .capture(width, height) .then(img => { @@ -599,10 +601,10 @@ class MainUI { * @instance * @type {String} */ - get language () { + get language() { return this._vm.language; } - set language (lang) { + set language(lang) { if (lang == "zh" || lang == "en") { { this._vm.language = lang; @@ -617,7 +619,7 @@ class MainUI { * @param {String} info 需要提示的内容 * @param {String} type 提示类型，分三种 'info','warning','error' */ - promptInfo (info, type) { + promptInfo(info, type) { this._vm.$refs.mainUI.promptInfo(info, type); } @@ -625,7 +627,7 @@ class MainUI { * 打开外部地址 * @param {String} url 地址链接 */ - openURL (url) { + openURL(url) { if (typeof this._openURLCB == 'function') { this._openURLCB(url); } @@ -640,10 +642,10 @@ class MainUI { * @instance * @type {Function} */ - get openURLCB () { + get openURLCB() { return this._openURLCB; } - set openURLCB (cb) { + set openURLCB(cb) { this._openURLCB = cb; } } diff --git a/package-lock.json b/package-lock.json index 148ef89d..8fdb3639 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,7 +16,7 @@ "integrity": "sha1-WCu1MfX53GfS/LaCl5iU914lPxI=", "dev": true, "requires": { - "regenerator-runtime": "0.13.2" + "regenerator-runtime": "^0.13.2" }, "dependencies": { "regenerator-runtime": { @@ -34,7 +34,7 @@ "dev": true, "requires": { "@nodelib/fs.stat": "2.0.1", - "run-parallel": "1.1.9" + "run-parallel": "^1.1.9" } }, "@nodelib/fs.stat": { @@ -50,7 +50,7 @@ "dev": true, "requires": { "@nodelib/fs.scandir": "2.1.1", - "fastq": "1.6.0" + "fastq": "^1.6.0" } }, "@types/events": { @@ -65,9 +65,9 @@ "integrity": "sha1-qlmhxuP7xCHgfM0xqUTDDrpSFXU=", "dev": true, "requires": { - "@types/events": "3.0.0", - "@types/minimatch": "3.0.3", - "@types/node": "12.7.0" + "@types/events": "*", + "@types/minimatch": "*", + "@types/node": "*" } }, "@types/minimatch": { @@ -94,7 +94,7 @@ "integrity": "sha1-UxvHJlF6OytB+FACHGzBXqq1B80=", "dev": true, "requires": { - "mime-types": "2.1.24", + "mime-types": "~2.1.24", "negotiator": "0.6.2" } }, @@ -110,7 +110,7 @@ "integrity": "sha1-x1K9IQvvZ5UBtsbLf8hPj0cVjMQ=", "dev": true, "requires": { - "acorn": "4.0.13" + "acorn": "^4.0.3" }, "dependencies": { "acorn": { @@ -127,7 +127,7 @@ "integrity": "sha1-6OQeSOov4MiWdAYQq2pP/YrdIl4=", "dev": true, "requires": { - "acorn": "5.7.3" + "acorn": "^5.0.3" } }, "ajv": { @@ -136,10 +136,10 @@ "integrity": "sha1-kNDVRDnaWHzX6EO/twRfUL0ivfE=", "dev": true, "requires": { - "fast-deep-equal": "2.0.1", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.4.1", - "uri-js": "4.2.2" + "fast-deep-equal": "^2.0.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" } }, "ajv-keywords": { @@ -154,9 +154,9 @@ "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", "dev": true, "requires": { - "kind-of": "3.2.2", - "longest": "1.0.1", - "repeat-string": "1.6.1" + "kind-of": "^3.0.2", + "longest": "^1.0.1", + "repeat-string": "^1.5.2" }, "dependencies": { "kind-of": { @@ -165,7 +165,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -212,8 +212,8 @@ "integrity": "sha1-vLJLTzeTTZqnrBe0ra+J58du8us=", "dev": true, "requires": { - "micromatch": "3.1.10", - "normalize-path": "2.1.1" + "micromatch": "^3.1.4", + "normalize-path": "^2.1.1" }, "dependencies": { "normalize-path": { @@ -222,7 +222,7 @@ "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", "dev": true, "requires": { - "remove-trailing-separator": "1.1.0" + "remove-trailing-separator": "^1.0.1" } } } @@ -239,8 +239,8 @@ "integrity": "sha1-SzXClE8GKov82mZBB2A1D+nd/CE=", "dev": true, "requires": { - "delegates": "1.0.0", - "readable-stream": "2.3.6" + "delegates": "^1.0.0", + "readable-stream": "^2.0.6" } }, "argparse": { @@ -249,7 +249,7 @@ "integrity": "sha1-vNZ5HqWuCXJeF+WtmIE0zUCz2RE=", "dev": true, "requires": { - "sprintf-js": "1.0.3" + "sprintf-js": "~1.0.2" } }, "arr-diff": { @@ -294,8 +294,8 @@ "integrity": "sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=", "dev": true, "requires": { - "define-properties": "1.1.3", - "es-abstract": "1.13.0" + "define-properties": "^1.1.2", + "es-abstract": "^1.7.0" } }, "array-union": { @@ -304,7 +304,7 @@ "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", "dev": true, "requires": { - "array-uniq": "1.0.3" + "array-uniq": "^1.0.1" } }, "array-uniq": { @@ -338,7 +338,7 @@ "integrity": "sha1-jSR136tVO7M+d7VOWeiAu4ziMTY=", "dev": true, "requires": { - "safer-buffer": "2.1.2" + "safer-buffer": "~2.1.0" } }, "asn1.js": { @@ -347,9 +347,9 @@ "integrity": "sha1-ucK/WAXx5kqt7tbfOiv6+1pz9aA=", "dev": true, "requires": { - "bn.js": "4.11.8", - "inherits": "2.0.3", - "minimalistic-assert": "1.0.1" + "bn.js": "^4.0.0", + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0" } }, "assert": { @@ -358,7 +358,7 @@ "integrity": "sha1-VcEJqvbgrv2z3EtxJAxwv1dLGOs=", "dev": true, "requires": { - "object-assign": "4.1.1", + "object-assign": "^4.1.1", "util": "0.10.3" }, "dependencies": { @@ -403,7 +403,7 @@ "integrity": "sha1-GDMOp+bjE4h/XS8qkEusb+TdU4E=", "dev": true, "requires": { - "lodash": "4.17.11" + "lodash": "^4.17.11" } }, "async-each": { @@ -423,7 +423,7 @@ "resolved": "https://registry.npm.taobao.org/async-validator/download/async-validator-1.11.2.tgz", "integrity": "sha1-yl4roxwV6TGcsthzwrE3tnoZjq0=", "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "6.x" } }, "asynckit": { @@ -444,12 +444,12 @@ "integrity": "sha1-Hb0cg1ZY41zj+ZhAmdsAWFx4IBQ=", "dev": true, "requires": { - "browserslist": "1.7.7", - "caniuse-db": "1.0.30000971", - "normalize-range": "0.1.2", - "num2fraction": "1.2.2", - "postcss": "5.2.18", - "postcss-value-parser": "3.3.1" + "browserslist": "^1.7.6", + "caniuse-db": "^1.0.30000634", + "normalize-range": "^0.1.2", + "num2fraction": "^1.2.2", + "postcss": "^5.2.16", + "postcss-value-parser": "^3.2.3" } }, "aws-sign2": { @@ -470,8 +470,8 @@ "integrity": "sha1-MtU+SFHv3AoRmTts0AB4nXDAUQI=", "dev": true, "requires": { - "follow-redirects": "1.7.0", - "is-buffer": "1.1.6" + "follow-redirects": "^1.3.0", + "is-buffer": "^1.1.5" } }, "babel-code-frame": { @@ -480,9 +480,9 @@ "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", "dev": true, "requires": { - "chalk": "1.1.3", - "esutils": "2.0.2", - "js-tokens": "3.0.2" + "chalk": "^1.1.3", + "esutils": "^2.0.2", + "js-tokens": "^3.0.2" } }, "babel-core": { @@ -491,25 +491,25 @@ "integrity": "sha1-suLwnjQtDwyI4vAuBneUEl51wgc=", "dev": true, "requires": { - "babel-code-frame": "6.26.0", - "babel-generator": "6.26.1", - "babel-helpers": "6.24.1", - "babel-messages": "6.23.0", - "babel-register": "6.26.0", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "convert-source-map": "1.6.0", - "debug": "2.6.9", - "json5": "0.5.1", - "lodash": "4.17.11", - "minimatch": "3.0.4", - "path-is-absolute": "1.0.1", - "private": "0.1.8", - "slash": "1.0.0", - "source-map": "0.5.7" + "babel-code-frame": "^6.26.0", + "babel-generator": "^6.26.0", + "babel-helpers": "^6.24.1", + "babel-messages": "^6.23.0", + "babel-register": "^6.26.0", + "babel-runtime": "^6.26.0", + "babel-template": "^6.26.0", + "babel-traverse": "^6.26.0", + "babel-types": "^6.26.0", + "babylon": "^6.18.0", + "convert-source-map": "^1.5.1", + "debug": "^2.6.9", + "json5": "^0.5.1", + "lodash": "^4.17.4", + "minimatch": "^3.0.4", + "path-is-absolute": "^1.0.1", + "private": "^0.1.8", + "slash": "^1.0.0", + "source-map": "^0.5.7" } }, "babel-generator": { @@ -518,14 +518,14 @@ "integrity": "sha1-GERAjTuPDTWkBOp6wYDwh6YBvZA=", "dev": true, "requires": { - "babel-messages": "6.23.0", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "detect-indent": "4.0.0", - "jsesc": "1.3.0", - "lodash": "4.17.11", - "source-map": "0.5.7", - "trim-right": "1.0.1" + "babel-messages": "^6.23.0", + "babel-runtime": "^6.26.0", + "babel-types": "^6.26.0", + "detect-indent": "^4.0.0", + "jsesc": "^1.3.0", + "lodash": "^4.17.4", + "source-map": "^0.5.7", + "trim-right": "^1.0.1" } }, "babel-helper-builder-binary-assignment-operator-visitor": { @@ -534,9 +534,9 @@ "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=", "dev": true, "requires": { - "babel-helper-explode-assignable-expression": "6.24.1", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" + "babel-helper-explode-assignable-expression": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-helper-call-delegate": { @@ -545,10 +545,10 @@ "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=", "dev": true, "requires": { - "babel-helper-hoist-variables": "6.24.1", - "babel-runtime": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" + "babel-helper-hoist-variables": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-helper-define-map": { @@ -557,10 +557,10 @@ "integrity": "sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=", "dev": true, "requires": { - "babel-helper-function-name": "6.24.1", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "lodash": "4.17.11" + "babel-helper-function-name": "^6.24.1", + "babel-runtime": "^6.26.0", + "babel-types": "^6.26.0", + "lodash": "^4.17.4" } }, "babel-helper-explode-assignable-expression": { @@ -569,9 +569,9 @@ "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" + "babel-runtime": "^6.22.0", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-helper-function-name": { @@ -580,11 +580,11 @@ "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=", "dev": true, "requires": { - "babel-helper-get-function-arity": "6.24.1", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" + "babel-helper-get-function-arity": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-helper-get-function-arity": { @@ -593,8 +593,8 @@ "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-helper-hoist-variables": { @@ -603,8 +603,8 @@ "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-helper-optimise-call-expression": { @@ -613,8 +613,8 @@ "integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-helper-regex": { @@ -623,9 +623,9 @@ "integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "lodash": "4.17.11" + "babel-runtime": "^6.26.0", + "babel-types": "^6.26.0", + "lodash": "^4.17.4" } }, "babel-helper-remap-async-to-generator": { @@ -634,11 +634,11 @@ "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=", "dev": true, "requires": { - "babel-helper-function-name": "6.24.1", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" + "babel-helper-function-name": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-helper-replace-supers": { @@ -647,12 +647,12 @@ "integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=", "dev": true, "requires": { - "babel-helper-optimise-call-expression": "6.24.1", - "babel-messages": "6.23.0", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" + "babel-helper-optimise-call-expression": "^6.24.1", + "babel-messages": "^6.23.0", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-helpers": { @@ -661,8 +661,8 @@ "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-template": "6.26.0" + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1" } }, "babel-loader": { @@ -671,9 +671,9 @@ "integrity": "sha1-4+4M1zlKpVfgE7AtPkkr/QeqbWg=", "dev": true, "requires": { - "find-cache-dir": "1.0.0", - "loader-utils": "1.2.3", - "mkdirp": "0.5.1" + "find-cache-dir": "^1.0.0", + "loader-utils": "^1.0.2", + "mkdirp": "^0.5.1" } }, "babel-messages": { @@ -682,7 +682,7 @@ "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=", "dev": true, "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-check-es2015-constants": { @@ -691,7 +691,7 @@ "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=", "dev": true, "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-syntax-async-functions": { @@ -730,9 +730,9 @@ "integrity": "sha1-8FiQAUX9PpkHpt3yjaWfIVJYpds=", "dev": true, "requires": { - "babel-helper-remap-async-to-generator": "6.24.1", - "babel-plugin-syntax-async-generators": "6.13.0", - "babel-runtime": "6.26.0" + "babel-helper-remap-async-to-generator": "^6.24.1", + "babel-plugin-syntax-async-generators": "^6.5.0", + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-async-to-generator": { @@ -741,9 +741,9 @@ "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=", "dev": true, "requires": { - "babel-helper-remap-async-to-generator": "6.24.1", - "babel-plugin-syntax-async-functions": "6.13.0", - "babel-runtime": "6.26.0" + "babel-helper-remap-async-to-generator": "^6.24.1", + "babel-plugin-syntax-async-functions": "^6.8.0", + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-es2015-arrow-functions": { @@ -752,7 +752,7 @@ "integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=", "dev": true, "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-es2015-block-scoped-functions": { @@ -761,7 +761,7 @@ "integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=", "dev": true, "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-es2015-block-scoping": { @@ -770,11 +770,11 @@ "integrity": "sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0", - "lodash": "4.17.11" + "babel-runtime": "^6.26.0", + "babel-template": "^6.26.0", + "babel-traverse": "^6.26.0", + "babel-types": "^6.26.0", + "lodash": "^4.17.4" } }, "babel-plugin-transform-es2015-classes": { @@ -783,15 +783,15 @@ "integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=", "dev": true, "requires": { - "babel-helper-define-map": "6.26.0", - "babel-helper-function-name": "6.24.1", - "babel-helper-optimise-call-expression": "6.24.1", - "babel-helper-replace-supers": "6.24.1", - "babel-messages": "6.23.0", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" + "babel-helper-define-map": "^6.24.1", + "babel-helper-function-name": "^6.24.1", + "babel-helper-optimise-call-expression": "^6.24.1", + "babel-helper-replace-supers": "^6.24.1", + "babel-messages": "^6.23.0", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-plugin-transform-es2015-computed-properties": { @@ -800,8 +800,8 @@ "integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-template": "6.26.0" + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1" } }, "babel-plugin-transform-es2015-destructuring": { @@ -810,7 +810,7 @@ "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=", "dev": true, "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-es2015-duplicate-keys": { @@ -819,8 +819,8 @@ "integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-plugin-transform-es2015-for-of": { @@ -829,7 +829,7 @@ "integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=", "dev": true, "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-es2015-function-name": { @@ -838,9 +838,9 @@ "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=", "dev": true, "requires": { - "babel-helper-function-name": "6.24.1", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" + "babel-helper-function-name": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-plugin-transform-es2015-literals": { @@ -849,7 +849,7 @@ "integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=", "dev": true, "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-es2015-modules-amd": { @@ -858,9 +858,9 @@ "integrity": "sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=", "dev": true, "requires": { - "babel-plugin-transform-es2015-modules-commonjs": "6.26.2", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0" + "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1" } }, "babel-plugin-transform-es2015-modules-commonjs": { @@ -869,10 +869,10 @@ "integrity": "sha1-WKeThjqefKhwvcWogRF/+sJ9tvM=", "dev": true, "requires": { - "babel-plugin-transform-strict-mode": "6.24.1", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-types": "6.26.0" + "babel-plugin-transform-strict-mode": "^6.24.1", + "babel-runtime": "^6.26.0", + "babel-template": "^6.26.0", + "babel-types": "^6.26.0" } }, "babel-plugin-transform-es2015-modules-systemjs": { @@ -881,9 +881,9 @@ "integrity": "sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=", "dev": true, "requires": { - "babel-helper-hoist-variables": "6.24.1", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0" + "babel-helper-hoist-variables": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1" } }, "babel-plugin-transform-es2015-modules-umd": { @@ -892,9 +892,9 @@ "integrity": "sha1-rJl+YoXNGO1hdq22B9YCNErThGg=", "dev": true, "requires": { - "babel-plugin-transform-es2015-modules-amd": "6.24.1", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0" + "babel-plugin-transform-es2015-modules-amd": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1" } }, "babel-plugin-transform-es2015-object-super": { @@ -903,8 +903,8 @@ "integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=", "dev": true, "requires": { - "babel-helper-replace-supers": "6.24.1", - "babel-runtime": "6.26.0" + "babel-helper-replace-supers": "^6.24.1", + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-es2015-parameters": { @@ -913,12 +913,12 @@ "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=", "dev": true, "requires": { - "babel-helper-call-delegate": "6.24.1", - "babel-helper-get-function-arity": "6.24.1", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" + "babel-helper-call-delegate": "^6.24.1", + "babel-helper-get-function-arity": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-plugin-transform-es2015-shorthand-properties": { @@ -927,8 +927,8 @@ "integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-plugin-transform-es2015-spread": { @@ -937,7 +937,7 @@ "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=", "dev": true, "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-es2015-sticky-regex": { @@ -946,9 +946,9 @@ "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=", "dev": true, "requires": { - "babel-helper-regex": "6.26.0", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" + "babel-helper-regex": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-plugin-transform-es2015-template-literals": { @@ -957,7 +957,7 @@ "integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=", "dev": true, "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-es2015-typeof-symbol": { @@ -966,7 +966,7 @@ "integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=", "dev": true, "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-es2015-unicode-regex": { @@ -975,9 +975,9 @@ "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=", "dev": true, "requires": { - "babel-helper-regex": "6.26.0", - "babel-runtime": "6.26.0", - "regexpu-core": "2.0.0" + "babel-helper-regex": "^6.24.1", + "babel-runtime": "^6.22.0", + "regexpu-core": "^2.0.0" } }, "babel-plugin-transform-exponentiation-operator": { @@ -986,9 +986,9 @@ "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=", "dev": true, "requires": { - "babel-helper-builder-binary-assignment-operator-visitor": "6.24.1", - "babel-plugin-syntax-exponentiation-operator": "6.13.0", - "babel-runtime": "6.26.0" + "babel-helper-builder-binary-assignment-operator-visitor": "^6.24.1", + "babel-plugin-syntax-exponentiation-operator": "^6.8.0", + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-object-rest-spread": { @@ -997,8 +997,8 @@ "integrity": "sha1-DzZpLVD+9rfi1LOsFHgTepY7ewY=", "dev": true, "requires": { - "babel-plugin-syntax-object-rest-spread": "6.13.0", - "babel-runtime": "6.26.0" + "babel-plugin-syntax-object-rest-spread": "^6.8.0", + "babel-runtime": "^6.26.0" } }, "babel-plugin-transform-regenerator": { @@ -1007,7 +1007,7 @@ "integrity": "sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=", "dev": true, "requires": { - "regenerator-transform": "0.10.1" + "regenerator-transform": "^0.10.0" } }, "babel-plugin-transform-runtime": { @@ -1016,7 +1016,7 @@ "integrity": "sha1-iEkNRGUC6puOfvsP4J7E2ZR5se4=", "dev": true, "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-strict-mode": { @@ -1025,8 +1025,8 @@ "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-polyfill": { @@ -1035,9 +1035,9 @@ "integrity": "sha1-g2TKYt+Or7gwSZ9pkXdGbDsDSZ0=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "core-js": "2.6.8", - "regenerator-runtime": "0.10.5" + "babel-runtime": "^6.22.0", + "core-js": "^2.4.0", + "regenerator-runtime": "^0.10.0" }, "dependencies": { "regenerator-runtime": { @@ -1054,30 +1054,30 @@ "integrity": "sha1-1EBQ1rwsn+6nAqrzjXJ6AhBTiTk=", "dev": true, "requires": { - "babel-plugin-check-es2015-constants": "6.22.0", - "babel-plugin-transform-es2015-arrow-functions": "6.22.0", - "babel-plugin-transform-es2015-block-scoped-functions": "6.22.0", - "babel-plugin-transform-es2015-block-scoping": "6.26.0", - "babel-plugin-transform-es2015-classes": "6.24.1", - "babel-plugin-transform-es2015-computed-properties": "6.24.1", - "babel-plugin-transform-es2015-destructuring": "6.23.0", - "babel-plugin-transform-es2015-duplicate-keys": "6.24.1", - "babel-plugin-transform-es2015-for-of": "6.23.0", - "babel-plugin-transform-es2015-function-name": "6.24.1", - "babel-plugin-transform-es2015-literals": "6.22.0", - "babel-plugin-transform-es2015-modules-amd": "6.24.1", - "babel-plugin-transform-es2015-modules-commonjs": "6.26.2", - "babel-plugin-transform-es2015-modules-systemjs": "6.24.1", - "babel-plugin-transform-es2015-modules-umd": "6.24.1", - "babel-plugin-transform-es2015-object-super": "6.24.1", - "babel-plugin-transform-es2015-parameters": "6.24.1", - "babel-plugin-transform-es2015-shorthand-properties": "6.24.1", - "babel-plugin-transform-es2015-spread": "6.22.0", - "babel-plugin-transform-es2015-sticky-regex": "6.24.1", - "babel-plugin-transform-es2015-template-literals": "6.22.0", - "babel-plugin-transform-es2015-typeof-symbol": "6.23.0", - "babel-plugin-transform-es2015-unicode-regex": "6.24.1", - "babel-plugin-transform-regenerator": "6.26.0" + "babel-plugin-check-es2015-constants": "^6.22.0", + "babel-plugin-transform-es2015-arrow-functions": "^6.22.0", + "babel-plugin-transform-es2015-block-scoped-functions": "^6.22.0", + "babel-plugin-transform-es2015-block-scoping": "^6.24.1", + "babel-plugin-transform-es2015-classes": "^6.24.1", + "babel-plugin-transform-es2015-computed-properties": "^6.24.1", + "babel-plugin-transform-es2015-destructuring": "^6.22.0", + "babel-plugin-transform-es2015-duplicate-keys": "^6.24.1", + "babel-plugin-transform-es2015-for-of": "^6.22.0", + "babel-plugin-transform-es2015-function-name": "^6.24.1", + "babel-plugin-transform-es2015-literals": "^6.22.0", + "babel-plugin-transform-es2015-modules-amd": "^6.24.1", + "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1", + "babel-plugin-transform-es2015-modules-systemjs": "^6.24.1", + "babel-plugin-transform-es2015-modules-umd": "^6.24.1", + "babel-plugin-transform-es2015-object-super": "^6.24.1", + "babel-plugin-transform-es2015-parameters": "^6.24.1", + "babel-plugin-transform-es2015-shorthand-properties": "^6.24.1", + "babel-plugin-transform-es2015-spread": "^6.22.0", + "babel-plugin-transform-es2015-sticky-regex": "^6.24.1", + "babel-plugin-transform-es2015-template-literals": "^6.22.0", + "babel-plugin-transform-es2015-typeof-symbol": "^6.22.0", + "babel-plugin-transform-es2015-unicode-regex": "^6.24.1", + "babel-plugin-transform-regenerator": "^6.24.1" } }, "babel-preset-stage-3": { @@ -1086,11 +1086,11 @@ "integrity": "sha1-g2raCp56f6N8sTj7kyb4eTSkg5U=", "dev": true, "requires": { - "babel-plugin-syntax-trailing-function-commas": "6.22.0", - "babel-plugin-transform-async-generator-functions": "6.24.1", - "babel-plugin-transform-async-to-generator": "6.24.1", - "babel-plugin-transform-exponentiation-operator": "6.24.1", - "babel-plugin-transform-object-rest-spread": "6.26.0" + "babel-plugin-syntax-trailing-function-commas": "^6.22.0", + "babel-plugin-transform-async-generator-functions": "^6.24.1", + "babel-plugin-transform-async-to-generator": "^6.24.1", + "babel-plugin-transform-exponentiation-operator": "^6.24.1", + "babel-plugin-transform-object-rest-spread": "^6.22.0" } }, "babel-register": { @@ -1099,13 +1099,13 @@ "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=", "dev": true, "requires": { - "babel-core": "6.26.3", - "babel-runtime": "6.26.0", - "core-js": "2.6.8", - "home-or-tmp": "2.0.0", - "lodash": "4.17.11", - "mkdirp": "0.5.1", - "source-map-support": "0.4.18" + "babel-core": "^6.26.0", + "babel-runtime": "^6.26.0", + "core-js": "^2.5.0", + "home-or-tmp": "^2.0.0", + "lodash": "^4.17.4", + "mkdirp": "^0.5.1", + "source-map-support": "^0.4.15" } }, "babel-runtime": { @@ -1113,8 +1113,8 @@ "resolved": "http://registry.npm.taobao.org/babel-runtime/download/babel-runtime-6.26.0.tgz", "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", "requires": { - "core-js": "2.6.8", - "regenerator-runtime": "0.11.1" + "core-js": "^2.4.0", + "regenerator-runtime": "^0.11.0" } }, "babel-template": { @@ -1123,11 +1123,11 @@ "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "lodash": "4.17.11" + "babel-runtime": "^6.26.0", + "babel-traverse": "^6.26.0", + "babel-types": "^6.26.0", + "babylon": "^6.18.0", + "lodash": "^4.17.4" } }, "babel-traverse": { @@ -1136,15 +1136,15 @@ "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=", "dev": true, "requires": { - "babel-code-frame": "6.26.0", - "babel-messages": "6.23.0", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "debug": "2.6.9", - "globals": "9.18.0", - "invariant": "2.2.4", - "lodash": "4.17.11" + "babel-code-frame": "^6.26.0", + "babel-messages": "^6.23.0", + "babel-runtime": "^6.26.0", + "babel-types": "^6.26.0", + "babylon": "^6.18.0", + "debug": "^2.6.8", + "globals": "^9.18.0", + "invariant": "^2.2.2", + "lodash": "^4.17.4" } }, "babel-types": { @@ -1153,10 +1153,10 @@ "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "esutils": "2.0.2", - "lodash": "4.17.11", - "to-fast-properties": "1.0.3" + "babel-runtime": "^6.26.0", + "esutils": "^2.0.2", + "lodash": "^4.17.4", + "to-fast-properties": "^1.0.3" } }, "babylon": { @@ -1177,13 +1177,13 @@ "integrity": "sha1-e95c7RRbbVUakNuH+DxVi060io8=", "dev": true, "requires": { - "cache-base": "1.0.1", - "class-utils": "0.3.6", - "component-emitter": "1.3.0", - "define-property": "1.0.0", - "isobject": "3.0.1", - "mixin-deep": "1.3.1", - "pascalcase": "0.1.1" + "cache-base": "^1.0.1", + "class-utils": "^0.3.5", + "component-emitter": "^1.2.1", + "define-property": "^1.0.0", + "isobject": "^3.0.1", + "mixin-deep": "^1.2.0", + "pascalcase": "^0.1.1" }, "dependencies": { "define-property": { @@ -1192,7 +1192,7 @@ "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "dev": true, "requires": { - "is-descriptor": "1.0.2" + "is-descriptor": "^1.0.0" } }, "is-accessor-descriptor": { @@ -1201,7 +1201,7 @@ "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=", "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { @@ -1210,7 +1210,7 @@ "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=", "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-descriptor": { @@ -1219,9 +1219,9 @@ "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=", "dev": true, "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } } } @@ -1249,7 +1249,7 @@ "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", "dev": true, "requires": { - "tweetnacl": "0.14.5" + "tweetnacl": "^0.14.3" } }, "big.js": { @@ -1270,7 +1270,7 @@ "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=", "dev": true, "requires": { - "inherits": "2.0.3" + "inherits": "~2.0.0" } }, "bluebird": { @@ -1292,15 +1292,15 @@ "dev": true, "requires": { "bytes": "3.1.0", - "content-type": "1.0.4", + "content-type": "~1.0.4", "debug": "2.6.9", - "depd": "1.1.2", + "depd": "~1.1.2", "http-errors": "1.7.2", "iconv-lite": "0.4.24", - "on-finished": "2.3.0", + "on-finished": "~2.3.0", "qs": "6.7.0", "raw-body": "2.4.0", - "type-is": "1.6.18" + "type-is": "~1.6.17" }, "dependencies": { "bytes": { @@ -1323,12 +1323,12 @@ "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=", "dev": true, "requires": { - "array-flatten": "2.1.2", - "deep-equal": "1.0.1", - "dns-equal": "1.0.0", - "dns-txt": "2.0.2", - "multicast-dns": "6.2.3", - "multicast-dns-service-types": "1.1.0" + "array-flatten": "^2.1.0", + "deep-equal": "^1.0.1", + "dns-equal": "^1.0.0", + "dns-txt": "^2.0.2", + "multicast-dns": "^6.0.1", + "multicast-dns-service-types": "^1.1.0" } }, "boolbase": { @@ -1343,7 +1343,7 @@ "integrity": "sha1-PH/L9SnYcibz0vUrlm/1Jx60Qd0=", "dev": true, "requires": { - "balanced-match": "1.0.0", + "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, @@ -1353,16 +1353,16 @@ "integrity": "sha1-WXn9PxTNUxVl5fot8av/8d+u5yk=", "dev": true, "requires": { - "arr-flatten": "1.1.0", - "array-unique": "0.3.2", - "extend-shallow": "2.0.1", - "fill-range": "4.0.0", - "isobject": "3.0.1", - "repeat-element": "1.1.3", - "snapdragon": "0.8.2", - "snapdragon-node": "2.1.1", - "split-string": "3.1.0", - "to-regex": "3.0.2" + "arr-flatten": "^1.1.0", + "array-unique": "^0.3.2", + "extend-shallow": "^2.0.1", + "fill-range": "^4.0.0", + "isobject": "^3.0.1", + "repeat-element": "^1.1.2", + "snapdragon": "^0.8.1", + "snapdragon-node": "^2.0.1", + "split-string": "^3.0.2", + "to-regex": "^3.0.1" }, "dependencies": { "extend-shallow": { @@ -1371,7 +1371,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -1388,12 +1388,12 @@ "integrity": "sha1-Mmc0ZC9APavDADIJhTu3CtQo70g=", "dev": true, "requires": { - "buffer-xor": "1.0.3", - "cipher-base": "1.0.4", - "create-hash": "1.2.0", - "evp_bytestokey": "1.0.3", - "inherits": "2.0.3", - "safe-buffer": "5.1.2" + "buffer-xor": "^1.0.3", + "cipher-base": "^1.0.0", + "create-hash": "^1.1.0", + "evp_bytestokey": "^1.0.3", + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" } }, "browserify-cipher": { @@ -1402,9 +1402,9 @@ "integrity": "sha1-jWR0wbhwv9q807z8wZNKEOlPFfA=", "dev": true, "requires": { - "browserify-aes": "1.2.0", - "browserify-des": "1.0.2", - "evp_bytestokey": "1.0.3" + "browserify-aes": "^1.0.4", + "browserify-des": "^1.0.0", + "evp_bytestokey": "^1.0.0" } }, "browserify-des": { @@ -1413,10 +1413,10 @@ "integrity": "sha1-OvTx9Zg5QDVy8cZiBDdfen9wPpw=", "dev": true, "requires": { - "cipher-base": "1.0.4", - "des.js": "1.0.0", - "inherits": "2.0.3", - "safe-buffer": "5.1.2" + "cipher-base": "^1.0.1", + "des.js": "^1.0.0", + "inherits": "^2.0.1", + "safe-buffer": "^5.1.2" } }, "browserify-rsa": { @@ -1425,8 +1425,8 @@ "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=", "dev": true, "requires": { - "bn.js": "4.11.8", - "randombytes": "2.1.0" + "bn.js": "^4.1.0", + "randombytes": "^2.0.1" } }, "browserify-sign": { @@ -1435,13 +1435,13 @@ "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=", "dev": true, "requires": { - "bn.js": "4.11.8", - "browserify-rsa": "4.0.1", - "create-hash": "1.2.0", - "create-hmac": "1.1.7", - "elliptic": "6.4.1", - "inherits": "2.0.3", - "parse-asn1": "5.1.4" + "bn.js": "^4.1.1", + "browserify-rsa": "^4.0.0", + "create-hash": "^1.1.0", + "create-hmac": "^1.1.2", + "elliptic": "^6.0.0", + "inherits": "^2.0.1", + "parse-asn1": "^5.0.0" } }, "browserify-zlib": { @@ -1450,7 +1450,7 @@ "integrity": "sha1-KGlFnZqjviRf6P4sofRuLn9U1z8=", "dev": true, "requires": { - "pako": "1.0.10" + "pako": "~1.0.5" } }, "browserslist": { @@ -1459,8 +1459,8 @@ "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=", "dev": true, "requires": { - "caniuse-db": "1.0.30000971", - "electron-to-chromium": "1.3.137" + "caniuse-db": "^1.0.30000639", + "electron-to-chromium": "^1.2.7" } }, "buffer": { @@ -1469,9 +1469,9 @@ "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=", "dev": true, "requires": { - "base64-js": "1.3.0", - "ieee754": "1.1.13", - "isarray": "1.0.0" + "base64-js": "^1.0.2", + "ieee754": "^1.1.4", + "isarray": "^1.0.0" } }, "buffer-from": { @@ -1504,7 +1504,7 @@ "integrity": "sha1-bJBC5i8ciZQUWIBaOkedEPNMcf0=", "dev": true, "requires": { - "loader-utils": "1.2.3" + "loader-utils": "^1.1.0" } }, "bytes": { @@ -1519,19 +1519,19 @@ "integrity": "sha1-ZFI2eZnv+dQYiu/ZoU6dfGomNGA=", "dev": true, "requires": { - "bluebird": "3.5.5", - "chownr": "1.1.1", - "glob": "7.1.4", - "graceful-fs": "4.1.15", - "lru-cache": "4.1.5", - "mississippi": "2.0.0", - "mkdirp": "0.5.1", - "move-concurrently": "1.0.1", - "promise-inflight": "1.0.1", - "rimraf": "2.6.3", - "ssri": "5.3.0", - "unique-filename": "1.1.1", - "y18n": "4.0.0" + "bluebird": "^3.5.1", + "chownr": "^1.0.1", + "glob": "^7.1.2", + "graceful-fs": "^4.1.11", + "lru-cache": "^4.1.1", + "mississippi": "^2.0.0", + "mkdirp": "^0.5.1", + "move-concurrently": "^1.0.1", + "promise-inflight": "^1.0.1", + "rimraf": "^2.6.2", + "ssri": "^5.2.4", + "unique-filename": "^1.1.0", + "y18n": "^4.0.0" } }, "cache-base": { @@ -1540,15 +1540,15 @@ "integrity": "sha1-Cn9GQWgxyLZi7jb+TnxZ129marI=", "dev": true, "requires": { - "collection-visit": "1.0.0", - "component-emitter": "1.3.0", - "get-value": "2.0.6", - "has-value": "1.0.0", - "isobject": "3.0.1", - "set-value": "2.0.0", - "to-object-path": "0.3.0", - "union-value": "1.0.0", - "unset-value": "1.0.0" + "collection-visit": "^1.0.0", + "component-emitter": "^1.2.1", + "get-value": "^2.0.6", + "has-value": "^1.0.0", + "isobject": "^3.0.1", + "set-value": "^2.0.0", + "to-object-path": "^0.3.0", + "union-value": "^1.0.0", + "unset-value": "^1.0.0" } }, "camel-case": { @@ -1557,8 +1557,8 @@ "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=", "dev": true, "requires": { - "no-case": "2.3.2", - "upper-case": "1.1.3" + "no-case": "^2.2.0", + "upper-case": "^1.1.1" } }, "camelcase": { @@ -1573,8 +1573,8 @@ "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", "dev": true, "requires": { - "camelcase": "2.1.1", - "map-obj": "1.0.1" + "camelcase": "^2.0.0", + "map-obj": "^1.0.0" } }, "caniuse-api": { @@ -1583,10 +1583,10 @@ "integrity": "sha1-tTTnxzTE+B7F++isoq0kNUuWLGw=", "dev": true, "requires": { - "browserslist": "1.7.7", - "caniuse-db": "1.0.30000971", - "lodash.memoize": "4.1.2", - "lodash.uniq": "4.5.0" + "browserslist": "^1.3.6", + "caniuse-db": "^1.0.30000529", + "lodash.memoize": "^4.1.2", + "lodash.uniq": "^4.5.0" } }, "caniuse-db": { @@ -1607,7 +1607,7 @@ "integrity": "sha1-NkGYwfvwhK4XAo7jPsfbU8qULuY=", "dev": true, "requires": { - "lodash": "4.17.11" + "lodash": "^4.17.11" } }, "center-align": { @@ -1616,8 +1616,8 @@ "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=", "dev": true, "requires": { - "align-text": "0.1.4", - "lazy-cache": "1.0.4" + "align-text": "^0.1.3", + "lazy-cache": "^1.0.3" } }, "chalk": { @@ -1626,11 +1626,11 @@ "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" } }, "chance": { @@ -1645,24 +1645,24 @@ "integrity": "sha1-/Uh0bM4C8D8KZyV30dOo3C7OsDc=", "dev": true, "requires": { - "camel-case": "3.0.0", - "constant-case": "2.0.0", - "dot-case": "2.1.1", - "header-case": "1.0.1", - "is-lower-case": "1.1.3", - "is-upper-case": "1.1.2", - "lower-case": "1.1.4", - "lower-case-first": "1.0.2", - "no-case": "2.3.2", - "param-case": "2.1.1", - "pascal-case": "2.0.1", - "path-case": "2.1.1", - "sentence-case": "2.1.1", - "snake-case": "2.1.0", - "swap-case": "1.1.2", - "title-case": "2.1.1", - "upper-case": "1.1.3", - "upper-case-first": "1.1.2" + "camel-case": "^3.0.0", + "constant-case": "^2.0.0", + "dot-case": "^2.1.0", + "header-case": "^1.0.0", + "is-lower-case": "^1.1.0", + "is-upper-case": "^1.1.0", + "lower-case": "^1.1.1", + "lower-case-first": "^1.0.0", + "no-case": "^2.3.2", + "param-case": "^2.1.0", + "pascal-case": "^2.0.0", + "path-case": "^2.1.0", + "sentence-case": "^2.1.0", + "snake-case": "^2.1.0", + "swap-case": "^1.1.0", + "title-case": "^2.1.0", + "upper-case": "^1.1.1", + "upper-case-first": "^1.1.0" } }, "chardet": { @@ -1683,18 +1683,18 @@ "integrity": "sha1-tsrWU6kp4kTOioNCRBZNJB+pVMU=", "dev": true, "requires": { - "anymatch": "2.0.0", - "async-each": "1.0.3", - "braces": "2.3.2", - "fsevents": "1.2.9", - "glob-parent": "3.1.0", - "inherits": "2.0.3", - "is-binary-path": "1.0.1", - "is-glob": "4.0.1", - "normalize-path": "3.0.0", - "path-is-absolute": "1.0.1", - "readdirp": "2.2.1", - "upath": "1.1.2" + "anymatch": "^2.0.0", + "async-each": "^1.0.1", + "braces": "^2.3.2", + "fsevents": "^1.2.7", + "glob-parent": "^3.1.0", + "inherits": "^2.0.3", + "is-binary-path": "^1.0.0", + "is-glob": "^4.0.0", + "normalize-path": "^3.0.0", + "path-is-absolute": "^1.0.0", + "readdirp": "^2.2.1", + "upath": "^1.1.1" } }, "chownr": { @@ -1709,8 +1709,8 @@ "integrity": "sha1-h2Dk7MJy9MNjUy+SbYdKriwTl94=", "dev": true, "requires": { - "inherits": "2.0.3", - "safe-buffer": "5.1.2" + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" } }, "clap": { @@ -1719,7 +1719,7 @@ "integrity": "sha1-TzZ0WzIAhJJVf0ZBLWbVDLmbzlE=", "dev": true, "requires": { - "chalk": "1.1.3" + "chalk": "^1.1.3" } }, "class-utils": { @@ -1728,10 +1728,10 @@ "integrity": "sha1-+TNprouafOAv1B+q0MqDAzGQxGM=", "dev": true, "requires": { - "arr-union": "3.1.0", - "define-property": "0.2.5", - "isobject": "3.0.1", - "static-extend": "0.1.2" + "arr-union": "^3.1.0", + "define-property": "^0.2.5", + "isobject": "^3.0.0", + "static-extend": "^0.1.1" }, "dependencies": { "define-property": { @@ -1740,7 +1740,7 @@ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } } } @@ -1751,7 +1751,7 @@ "integrity": "sha1-1g5YxdFKvKCkG844z3kq1MRtFTE=", "dev": true, "requires": { - "google-libphonenumber": "3.2.2", + "google-libphonenumber": "^3.1.6", "validator": "10.4.0" } }, @@ -1761,7 +1761,7 @@ "integrity": "sha1-LUEe92uFabbQyEBo2r6FsKpeXBc=", "dev": true, "requires": { - "source-map": "0.6.1" + "source-map": "~0.6.0" }, "dependencies": { "source-map": { @@ -1778,7 +1778,7 @@ "integrity": "sha1-ztqLuWsA/haOmwgCcpYNIP3K3W0=", "dev": true, "requires": { - "rimraf": "2.6.3" + "rimraf": "^2.6.1" } }, "cli-cursor": { @@ -1787,7 +1787,7 @@ "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", "dev": true, "requires": { - "restore-cursor": "2.0.0" + "restore-cursor": "^2.0.0" } }, "cli-width": { @@ -1802,9 +1802,9 @@ "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", "dev": true, "requires": { - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wrap-ansi": "2.1.0" + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wrap-ansi": "^2.0.0" } }, "clone": { @@ -1819,10 +1819,10 @@ "integrity": "sha1-ANs6Hhc2VnMNEYjD1qztbX6pdxM=", "dev": true, "requires": { - "for-own": "1.0.0", - "is-plain-object": "2.0.4", - "kind-of": "6.0.2", - "shallow-clone": "1.0.0" + "for-own": "^1.0.0", + "is-plain-object": "^2.0.4", + "kind-of": "^6.0.0", + "shallow-clone": "^1.0.0" } }, "co": { @@ -1837,7 +1837,7 @@ "integrity": "sha1-qe8VNmDWqGqL3sAomlxoTSF0Mv0=", "dev": true, "requires": { - "q": "1.5.1" + "q": "^1.1.2" } }, "code-point-at": { @@ -1852,8 +1852,8 @@ "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", "dev": true, "requires": { - "map-visit": "1.0.0", - "object-visit": "1.0.1" + "map-visit": "^1.0.0", + "object-visit": "^1.0.0" } }, "color": { @@ -1862,9 +1862,9 @@ "integrity": "sha1-bXtcdPtl6EHNSHkq0e1eB7kE12Q=", "dev": true, "requires": { - "clone": "1.0.4", - "color-convert": "1.9.3", - "color-string": "0.3.0" + "clone": "^1.0.2", + "color-convert": "^1.3.0", + "color-string": "^0.3.0" } }, "color-convert": { @@ -1888,7 +1888,7 @@ "integrity": "sha1-J9RvtnAlxcL6JZk7+/V55HhBuZE=", "dev": true, "requires": { - "color-name": "1.1.3" + "color-name": "^1.0.0" } }, "colormin": { @@ -1897,9 +1897,9 @@ "integrity": "sha1-6i90IKcrlogaOKrlnsEkpvcpgTM=", "dev": true, "requires": { - "color": "0.11.4", + "color": "^0.11.0", "css-color-names": "0.0.4", - "has": "1.0.3" + "has": "^1.0.1" } }, "colors": { @@ -1914,7 +1914,7 @@ "integrity": "sha1-w9RaizT9cwYxoRCoolIGgrMdWn8=", "dev": true, "requires": { - "delayed-stream": "1.0.0" + "delayed-stream": "~1.0.0" } }, "commander": { @@ -1941,7 +1941,7 @@ "integrity": "sha1-bowQihatWDhKl386SCyiC/8vOME=", "dev": true, "requires": { - "mime-db": "1.40.0" + "mime-db": ">= 1.40.0 < 2" } }, "compression": { @@ -1950,13 +1950,13 @@ "integrity": "sha1-lVI+/xcMpXwpoMpB5v4TH0Hlu48=", "dev": true, "requires": { - "accepts": "1.3.7", + "accepts": "~1.3.5", "bytes": "3.0.0", - "compressible": "2.0.17", + "compressible": "~2.0.16", "debug": "2.6.9", - "on-headers": "1.0.2", + "on-headers": "~1.0.2", "safe-buffer": "5.1.2", - "vary": "1.1.2" + "vary": "~1.1.2" } }, "concat-map": { @@ -1971,10 +1971,10 @@ "integrity": "sha1-kEvfGUzTEi/Gdcd/xKw9T/D9GjQ=", "dev": true, "requires": { - "buffer-from": "1.1.1", - "inherits": "2.0.3", - "readable-stream": "2.3.6", - "typedarray": "0.0.6" + "buffer-from": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^2.2.2", + "typedarray": "^0.0.6" } }, "connect-history-api-fallback": { @@ -1989,7 +1989,7 @@ "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=", "dev": true, "requires": { - "date-now": "0.1.4" + "date-now": "^0.1.4" } }, "console-control-strings": { @@ -2004,7 +2004,7 @@ "integrity": "sha1-WiUEe8dvcwcmZ8jLUsmJiI9JTGM=", "dev": true, "requires": { - "bluebird": "3.5.5" + "bluebird": "^3.1.1" } }, "constant-case": { @@ -2013,8 +2013,8 @@ "integrity": "sha1-QXV2TTidP6nI7NKRhu1gBSQ7akY=", "dev": true, "requires": { - "snake-case": "2.1.0", - "upper-case": "1.1.3" + "snake-case": "^2.1.0", + "upper-case": "^1.1.1" } }, "constants-browserify": { @@ -2044,7 +2044,7 @@ "integrity": "sha1-UbU3qMQ+DwTewZk7/83VBOdYrCA=", "dev": true, "requires": { - "safe-buffer": "5.1.2" + "safe-buffer": "~5.1.1" } }, "cookie": { @@ -2065,12 +2065,12 @@ "integrity": "sha1-kilzmMrjSTf8r9bsgTnBgFHwteA=", "dev": true, "requires": { - "aproba": "1.2.0", - "fs-write-stream-atomic": "1.0.10", - "iferr": "0.1.5", - "mkdirp": "0.5.1", - "rimraf": "2.6.3", - "run-queue": "1.0.3" + "aproba": "^1.1.1", + "fs-write-stream-atomic": "^1.0.8", + "iferr": "^0.1.5", + "mkdirp": "^0.5.1", + "rimraf": "^2.5.4", + "run-queue": "^1.0.0" } }, "copy-descriptor": { @@ -2085,14 +2085,14 @@ "integrity": "sha1-5/QN2KaEd9QF3Rt6hUquMksVi64=", "dev": true, "requires": { - "cacache": "10.0.4", - "find-cache-dir": "1.0.0", - "globby": "7.1.1", - "is-glob": "4.0.1", - "loader-utils": "1.2.3", - "minimatch": "3.0.4", - "p-limit": "1.3.0", - "serialize-javascript": "1.7.0" + "cacache": "^10.0.4", + "find-cache-dir": "^1.0.0", + "globby": "^7.1.1", + "is-glob": "^4.0.0", + "loader-utils": "^1.1.0", + "minimatch": "^3.0.4", + "p-limit": "^1.0.0", + "serialize-javascript": "^1.4.0" }, "dependencies": { "dir-glob": { @@ -2101,7 +2101,7 @@ "integrity": "sha1-+gnwaUFTyJGLGLoN6vrpR2n8UMQ=", "dev": true, "requires": { - "path-type": "3.0.0" + "path-type": "^3.0.0" } }, "globby": { @@ -2110,12 +2110,12 @@ "integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=", "dev": true, "requires": { - "array-union": "1.0.2", - "dir-glob": "2.2.2", - "glob": "7.1.4", - "ignore": "3.3.10", - "pify": "3.0.0", - "slash": "1.0.0" + "array-union": "^1.0.1", + "dir-glob": "^2.0.0", + "glob": "^7.1.2", + "ignore": "^3.3.5", + "pify": "^3.0.0", + "slash": "^1.0.0" } }, "ignore": { @@ -2130,7 +2130,7 @@ "integrity": "sha1-zvMdyOCho7sNEFwM2Xzzv0f0428=", "dev": true, "requires": { - "pify": "3.0.0" + "pify": "^3.0.0" } } } @@ -2152,13 +2152,13 @@ "integrity": "sha1-YXPOvVb6wELB9DkO33r2wHx8uJI=", "dev": true, "requires": { - "is-directory": "0.3.1", - "js-yaml": "3.7.0", - "minimist": "1.2.0", - "object-assign": "4.1.1", - "os-homedir": "1.0.2", - "parse-json": "2.2.0", - "require-from-string": "1.2.1" + "is-directory": "^0.3.1", + "js-yaml": "^3.4.3", + "minimist": "^1.2.0", + "object-assign": "^4.1.0", + "os-homedir": "^1.0.1", + "parse-json": "^2.2.0", + "require-from-string": "^1.1.0" }, "dependencies": { "minimist": { @@ -2175,8 +2175,8 @@ "integrity": "sha1-yREbbzMEXEaX8UR4f5JUzcd8Rf8=", "dev": true, "requires": { - "bn.js": "4.11.8", - "elliptic": "6.4.1" + "bn.js": "^4.1.0", + "elliptic": "^6.0.0" } }, "create-hash": { @@ -2185,11 +2185,11 @@ "integrity": "sha1-iJB4rxGmN1a8+1m9IhmWvjqe8ZY=", "dev": true, "requires": { - "cipher-base": "1.0.4", - "inherits": "2.0.3", - "md5.js": "1.3.5", - "ripemd160": "2.0.2", - "sha.js": "2.4.11" + "cipher-base": "^1.0.1", + "inherits": "^2.0.1", + "md5.js": "^1.3.4", + "ripemd160": "^2.0.1", + "sha.js": "^2.4.0" } }, "create-hmac": { @@ -2198,12 +2198,12 @@ "integrity": "sha1-aRcMeLOrlXFHsriwRXLkfq0iQ/8=", "dev": true, "requires": { - "cipher-base": "1.0.4", - "create-hash": "1.2.0", - "inherits": "2.0.3", - "ripemd160": "2.0.2", - "safe-buffer": "5.1.2", - "sha.js": "2.4.11" + "cipher-base": "^1.0.3", + "create-hash": "^1.1.0", + "inherits": "^2.0.1", + "ripemd160": "^2.0.0", + "safe-buffer": "^5.0.1", + "sha.js": "^2.4.8" } }, "cross-env": { @@ -2212,8 +2212,8 @@ "integrity": "sha1-bs1MAV1Xc+YUA57lKQdmabnRJvI=", "dev": true, "requires": { - "cross-spawn": "6.0.5", - "is-windows": "1.0.2" + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" } }, "cross-spawn": { @@ -2222,11 +2222,11 @@ "integrity": "sha1-Sl7Hxk364iw6FBJNus3uhG2Ay8Q=", "dev": true, "requires": { - "nice-try": "1.0.5", - "path-key": "2.0.1", - "semver": "5.7.0", - "shebang-command": "1.2.0", - "which": "1.3.1" + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" } }, "crypt": { @@ -2241,17 +2241,17 @@ "integrity": "sha1-OWz58xN/A+S45TLFj2mCVOAPgOw=", "dev": true, "requires": { - "browserify-cipher": "1.0.1", - "browserify-sign": "4.0.4", - "create-ecdh": "4.0.3", - "create-hash": "1.2.0", - "create-hmac": "1.1.7", - "diffie-hellman": "5.0.3", - "inherits": "2.0.3", - "pbkdf2": "3.0.17", - "public-encrypt": "4.0.3", - "randombytes": "2.1.0", - "randomfill": "1.0.4" + "browserify-cipher": "^1.0.0", + "browserify-sign": "^4.0.0", + "create-ecdh": "^4.0.0", + "create-hash": "^1.1.0", + "create-hmac": "^1.1.0", + "diffie-hellman": "^5.0.0", + "inherits": "^2.0.1", + "pbkdf2": "^3.0.3", + "public-encrypt": "^4.0.0", + "randombytes": "^2.0.0", + "randomfill": "^1.0.3" } }, "css-color-names": { @@ -2266,20 +2266,20 @@ "integrity": "sha1-w/mGSnAL4nEbtaJGKyOJsaOS2rc=", "dev": true, "requires": { - "babel-code-frame": "6.26.0", - "css-selector-tokenizer": "0.7.1", - "cssnano": "3.10.0", - "icss-utils": "2.1.0", - "loader-utils": "1.2.3", - "lodash.camelcase": "4.3.0", - "object-assign": "4.1.1", - "postcss": "5.2.18", - "postcss-modules-extract-imports": "1.2.1", - "postcss-modules-local-by-default": "1.2.0", - "postcss-modules-scope": "1.1.0", - "postcss-modules-values": "1.3.0", - "postcss-value-parser": "3.3.1", - "source-list-map": "2.0.1" + "babel-code-frame": "^6.26.0", + "css-selector-tokenizer": "^0.7.0", + "cssnano": "^3.10.0", + "icss-utils": "^2.1.0", + "loader-utils": "^1.0.2", + "lodash.camelcase": "^4.3.0", + "object-assign": "^4.1.1", + "postcss": "^5.0.6", + "postcss-modules-extract-imports": "^1.2.0", + "postcss-modules-local-by-default": "^1.2.0", + "postcss-modules-scope": "^1.1.0", + "postcss-modules-values": "^1.3.0", + "postcss-value-parser": "^3.3.0", + "source-list-map": "^2.0.0" } }, "css-select": { @@ -2288,10 +2288,10 @@ "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=", "dev": true, "requires": { - "boolbase": "1.0.0", - "css-what": "2.1.3", + "boolbase": "~1.0.0", + "css-what": "2.1", "domutils": "1.5.1", - "nth-check": "1.0.2" + "nth-check": "~1.0.1" } }, "css-selector-tokenizer": { @@ -2300,9 +2300,9 @@ "integrity": "sha1-oXcnGovKUBkXL0+JH8bu2cv2jV0=", "dev": true, "requires": { - "cssesc": "0.1.0", - "fastparse": "1.1.2", - "regexpu-core": "1.0.0" + "cssesc": "^0.1.0", + "fastparse": "^1.1.1", + "regexpu-core": "^1.0.0" }, "dependencies": { "regexpu-core": { @@ -2311,9 +2311,9 @@ "integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=", "dev": true, "requires": { - "regenerate": "1.4.0", - "regjsgen": "0.2.0", - "regjsparser": "0.1.5" + "regenerate": "^1.2.1", + "regjsgen": "^0.2.0", + "regjsparser": "^0.1.4" } } } @@ -2336,38 +2336,38 @@ "integrity": "sha1-Tzj2zqK5sX+gFJDyPx3GjqZcHDg=", "dev": true, "requires": { - "autoprefixer": "6.7.7", - "decamelize": "1.2.0", - "defined": "1.0.0", - "has": "1.0.3", - "object-assign": "4.1.1", - "postcss": "5.2.18", - "postcss-calc": "5.3.1", - "postcss-colormin": "2.2.2", - "postcss-convert-values": "2.6.1", - "postcss-discard-comments": "2.0.4", - "postcss-discard-duplicates": "2.1.0", - "postcss-discard-empty": "2.1.0", - "postcss-discard-overridden": "0.1.1", - "postcss-discard-unused": "2.2.3", - "postcss-filter-plugins": "2.0.3", - "postcss-merge-idents": "2.1.7", - "postcss-merge-longhand": "2.0.2", - "postcss-merge-rules": "2.1.2", - "postcss-minify-font-values": "1.0.5", - "postcss-minify-gradients": "1.0.5", - "postcss-minify-params": "1.2.2", - "postcss-minify-selectors": "2.1.1", - "postcss-normalize-charset": "1.1.1", - "postcss-normalize-url": "3.0.8", - "postcss-ordered-values": "2.2.3", - "postcss-reduce-idents": "2.4.0", - "postcss-reduce-initial": "1.0.1", - "postcss-reduce-transforms": "1.0.4", - "postcss-svgo": "2.1.6", - "postcss-unique-selectors": "2.0.2", - "postcss-value-parser": "3.3.1", - "postcss-zindex": "2.2.0" + "autoprefixer": "^6.3.1", + "decamelize": "^1.1.2", + "defined": "^1.0.0", + "has": "^1.0.1", + "object-assign": "^4.0.1", + "postcss": "^5.0.14", + "postcss-calc": "^5.2.0", + "postcss-colormin": "^2.1.8", + "postcss-convert-values": "^2.3.4", + "postcss-discard-comments": "^2.0.4", + "postcss-discard-duplicates": "^2.0.1", + "postcss-discard-empty": "^2.0.1", + "postcss-discard-overridden": "^0.1.1", + "postcss-discard-unused": "^2.2.1", + "postcss-filter-plugins": "^2.0.0", + "postcss-merge-idents": "^2.1.5", + "postcss-merge-longhand": "^2.0.1", + "postcss-merge-rules": "^2.0.3", + "postcss-minify-font-values": "^1.0.2", + "postcss-minify-gradients": "^1.0.1", + "postcss-minify-params": "^1.0.4", + "postcss-minify-selectors": "^2.0.4", + "postcss-normalize-charset": "^1.1.0", + "postcss-normalize-url": "^3.0.7", + "postcss-ordered-values": "^2.1.0", + "postcss-reduce-idents": "^2.2.2", + "postcss-reduce-initial": "^1.0.0", + "postcss-reduce-transforms": "^1.0.3", + "postcss-svgo": "^2.1.1", + "postcss-unique-selectors": "^2.0.2", + "postcss-value-parser": "^3.2.3", + "postcss-zindex": "^2.0.1" } }, "csso": { @@ -2376,8 +2376,8 @@ "integrity": "sha1-3dUsWHAz9J6Utx/FVWnyUuj/X4U=", "dev": true, "requires": { - "clap": "1.2.3", - "source-map": "0.5.7" + "clap": "^1.0.9", + "source-map": "^0.5.3" } }, "currently-unhandled": { @@ -2386,7 +2386,7 @@ "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", "dev": true, "requires": { - "array-find-index": "1.0.2" + "array-find-index": "^1.0.1" } }, "cyclist": { @@ -2401,7 +2401,7 @@ "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=", "dev": true, "requires": { - "es5-ext": "0.10.50" + "es5-ext": "^0.10.9" } }, "dashdash": { @@ -2410,7 +2410,7 @@ "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", "dev": true, "requires": { - "assert-plus": "1.0.0" + "assert-plus": "^1.0.0" } }, "date-now": { @@ -2469,7 +2469,7 @@ "integrity": "sha1-z4jabL7ib+bbcJT2HYcMvYTO6fE=", "dev": true, "requires": { - "object-keys": "1.1.1" + "object-keys": "^1.0.12" } }, "define-property": { @@ -2478,8 +2478,8 @@ "integrity": "sha1-1Flono1lS6d+AqgX+HENcCyxbp0=", "dev": true, "requires": { - "is-descriptor": "1.0.2", - "isobject": "3.0.1" + "is-descriptor": "^1.0.2", + "isobject": "^3.0.1" }, "dependencies": { "is-accessor-descriptor": { @@ -2488,7 +2488,7 @@ "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=", "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { @@ -2497,7 +2497,7 @@ "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=", "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-descriptor": { @@ -2506,9 +2506,9 @@ "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=", "dev": true, "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } } } @@ -2525,12 +2525,12 @@ "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=", "dev": true, "requires": { - "globby": "6.1.0", - "is-path-cwd": "1.0.0", - "is-path-in-cwd": "1.0.1", - "p-map": "1.2.0", - "pify": "3.0.0", - "rimraf": "2.6.3" + "globby": "^6.1.0", + "is-path-cwd": "^1.0.0", + "is-path-in-cwd": "^1.0.0", + "p-map": "^1.1.1", + "pify": "^3.0.0", + "rimraf": "^2.2.8" }, "dependencies": { "globby": { @@ -2539,11 +2539,11 @@ "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", "dev": true, "requires": { - "array-union": "1.0.2", - "glob": "7.1.4", - "object-assign": "4.1.1", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" + "array-union": "^1.0.1", + "glob": "^7.0.3", + "object-assign": "^4.0.1", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" }, "dependencies": { "pify": { @@ -2580,8 +2580,8 @@ "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=", "dev": true, "requires": { - "inherits": "2.0.3", - "minimalistic-assert": "1.0.1" + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0" } }, "destroy": { @@ -2602,7 +2602,7 @@ "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=", "dev": true, "requires": { - "repeating": "2.0.1" + "repeating": "^2.0.0" } }, "detect-node": { @@ -2617,9 +2617,9 @@ "integrity": "sha1-QOjumPVaIUlgcUaSHGPhrl89KHU=", "dev": true, "requires": { - "bn.js": "4.11.8", - "miller-rabin": "4.0.1", - "randombytes": "2.1.0" + "bn.js": "^4.1.0", + "miller-rabin": "^4.0.0", + "randombytes": "^2.0.0" } }, "dir-glob": { @@ -2628,7 +2628,7 @@ "integrity": "sha1-Vtv3PZkqSpO6FYT0U0Bj/S5BcX8=", "dev": true, "requires": { - "path-type": "4.0.0" + "path-type": "^4.0.0" } }, "dns-equal": { @@ -2643,8 +2643,8 @@ "integrity": "sha1-EqpCaYEHW+UAuRDu3NC0fdfe2lo=", "dev": true, "requires": { - "ip": "1.1.5", - "safe-buffer": "5.1.2" + "ip": "^1.1.0", + "safe-buffer": "^5.0.1" } }, "dns-txt": { @@ -2653,7 +2653,7 @@ "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=", "dev": true, "requires": { - "buffer-indexof": "1.1.1" + "buffer-indexof": "^1.0.0" } }, "dom-converter": { @@ -2662,7 +2662,7 @@ "integrity": "sha1-ZyGp2u4uKTaClVtq/kFncWJ7t2g=", "dev": true, "requires": { - "utila": "0.4.0" + "utila": "~0.4" } }, "dom-serializer": { @@ -2671,8 +2671,8 @@ "integrity": "sha1-HsQFnihLq+027sKUHUqXChic58A=", "dev": true, "requires": { - "domelementtype": "1.3.1", - "entities": "1.1.2" + "domelementtype": "^1.3.0", + "entities": "^1.1.1" } }, "domain-browser": { @@ -2693,7 +2693,7 @@ "integrity": "sha1-iAUJfpM9ZehVRvcm1g9euItE+AM=", "dev": true, "requires": { - "domelementtype": "1.3.1" + "domelementtype": "1" } }, "domutils": { @@ -2702,8 +2702,8 @@ "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=", "dev": true, "requires": { - "dom-serializer": "0.1.1", - "domelementtype": "1.3.1" + "dom-serializer": "0", + "domelementtype": "1" } }, "dot-case": { @@ -2712,7 +2712,7 @@ "integrity": "sha1-NNzzf1Co6TwrO8qLt/uRVcfaO+4=", "dev": true, "requires": { - "no-case": "2.3.2" + "no-case": "^2.2.0" } }, "duplexify": { @@ -2721,10 +2721,10 @@ "integrity": "sha1-Kk31MX9sz9kfhtb9JdjYoQO4gwk=", "dev": true, "requires": { - "end-of-stream": "1.4.1", - "inherits": "2.0.3", - "readable-stream": "2.3.6", - "stream-shift": "1.0.0" + "end-of-stream": "^1.0.0", + "inherits": "^2.0.1", + "readable-stream": "^2.0.0", + "stream-shift": "^1.0.0" } }, "earthsdk": { @@ -2751,8 +2751,8 @@ "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", "dev": true, "requires": { - "jsbn": "0.1.1", - "safer-buffer": "2.1.2" + "jsbn": "~0.1.0", + "safer-buffer": "^2.1.0" } }, "ee-first": { @@ -2781,13 +2781,13 @@ "integrity": "sha1-wtC3d2kRuGcixjLDwGxg8vgZk5o=", "dev": true, "requires": { - "bn.js": "4.11.8", - "brorand": "1.1.0", - "hash.js": "1.1.7", - "hmac-drbg": "1.0.1", - "inherits": "2.0.3", - "minimalistic-assert": "1.0.1", - "minimalistic-crypto-utils": "1.0.1" + "bn.js": "^4.4.0", + "brorand": "^1.0.1", + "hash.js": "^1.0.0", + "hmac-drbg": "^1.0.0", + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0", + "minimalistic-crypto-utils": "^1.0.0" } }, "emojis-list": { @@ -2808,7 +2808,7 @@ "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=", "dev": true, "requires": { - "iconv-lite": "0.4.24" + "iconv-lite": "~0.4.13" } }, "end-of-stream": { @@ -2817,7 +2817,7 @@ "integrity": "sha1-7SljTRm6ukY7bOa4CjchPqtx7EM=", "dev": true, "requires": { - "once": "1.4.0" + "once": "^1.4.0" } }, "enhanced-resolve": { @@ -2826,10 +2826,10 @@ "integrity": "sha1-BCHjOf1xQZs9oT0Smzl5BAIwR24=", "dev": true, "requires": { - "graceful-fs": "4.1.15", - "memory-fs": "0.4.1", - "object-assign": "4.1.1", - "tapable": "0.2.9" + "graceful-fs": "^4.1.2", + "memory-fs": "^0.4.0", + "object-assign": "^4.0.1", + "tapable": "^0.2.7" } }, "entities": { @@ -2844,7 +2844,7 @@ "integrity": "sha1-RoTXF3mtOa8Xfj8AeZb3xnyFJhg=", "dev": true, "requires": { - "prr": "1.0.1" + "prr": "~1.0.1" } }, "error-ex": { @@ -2853,7 +2853,7 @@ "integrity": "sha1-tKxAZIEH/c3PriQvQovqihTU8b8=", "dev": true, "requires": { - "is-arrayish": "0.2.1" + "is-arrayish": "^0.2.1" } }, "es-abstract": { @@ -2862,12 +2862,12 @@ "integrity": "sha1-rIYUX91QmdjdSVWMy6Lq+biOJOk=", "dev": true, "requires": { - "es-to-primitive": "1.2.0", - "function-bind": "1.1.1", - "has": "1.0.3", - "is-callable": "1.1.4", - "is-regex": "1.0.4", - "object-keys": "1.1.1" + "es-to-primitive": "^1.2.0", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "is-callable": "^1.1.4", + "is-regex": "^1.0.4", + "object-keys": "^1.0.12" } }, "es-to-primitive": { @@ -2876,9 +2876,9 @@ "integrity": "sha1-7fckeAM0VujdqO8J4ArZZQcH83c=", "dev": true, "requires": { - "is-callable": "1.1.4", - "is-date-object": "1.0.1", - "is-symbol": "1.0.2" + "is-callable": "^1.1.4", + "is-date-object": "^1.0.1", + "is-symbol": "^1.0.2" } }, "es5-ext": { @@ -2887,9 +2887,9 @@ "integrity": "sha1-bQ4joKvbJwGOWsT9CbQSvFUXp3g=", "dev": true, "requires": { - "es6-iterator": "2.0.3", - "es6-symbol": "3.1.1", - "next-tick": "1.0.0" + "es6-iterator": "~2.0.3", + "es6-symbol": "~3.1.1", + "next-tick": "^1.0.0" } }, "es6-iterator": { @@ -2898,9 +2898,9 @@ "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=", "dev": true, "requires": { - "d": "1.0.0", - "es5-ext": "0.10.50", - "es6-symbol": "3.1.1" + "d": "1", + "es5-ext": "^0.10.35", + "es6-symbol": "^3.1.1" } }, "es6-map": { @@ -2909,12 +2909,12 @@ "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=", "dev": true, "requires": { - "d": "1.0.0", - "es5-ext": "0.10.50", - "es6-iterator": "2.0.3", - "es6-set": "0.1.5", - "es6-symbol": "3.1.1", - "event-emitter": "0.3.5" + "d": "1", + "es5-ext": "~0.10.14", + "es6-iterator": "~2.0.1", + "es6-set": "~0.1.5", + "es6-symbol": "~3.1.1", + "event-emitter": "~0.3.5" } }, "es6-set": { @@ -2923,11 +2923,11 @@ "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=", "dev": true, "requires": { - "d": "1.0.0", - "es5-ext": "0.10.50", - "es6-iterator": "2.0.3", + "d": "1", + "es5-ext": "~0.10.14", + "es6-iterator": "~2.0.1", "es6-symbol": "3.1.1", - "event-emitter": "0.3.5" + "event-emitter": "~0.3.5" } }, "es6-symbol": { @@ -2936,8 +2936,8 @@ "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=", "dev": true, "requires": { - "d": "1.0.0", - "es5-ext": "0.10.50" + "d": "1", + "es5-ext": "~0.10.14" } }, "es6-templates": { @@ -2946,8 +2946,8 @@ "integrity": "sha1-XLmsn7He1usSOTQrgdeSu7QHjuQ=", "dev": true, "requires": { - "recast": "0.11.23", - "through": "2.3.8" + "recast": "~0.11.12", + "through": "~2.3.6" } }, "es6-weak-map": { @@ -2956,10 +2956,10 @@ "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=", "dev": true, "requires": { - "d": "1.0.0", - "es5-ext": "0.10.50", - "es6-iterator": "2.0.3", - "es6-symbol": "3.1.1" + "d": "1", + "es5-ext": "^0.10.14", + "es6-iterator": "^2.0.1", + "es6-symbol": "^3.1.1" } }, "escape-html": { @@ -2980,11 +2980,11 @@ "integrity": "sha1-rNa71z+ScHY+GFcM3BPA1pR1miM=", "dev": true, "requires": { - "esprima": "2.7.3", - "estraverse": "1.9.3", - "esutils": "2.0.2", - "optionator": "0.8.2", - "source-map": "0.2.0" + "esprima": "^2.7.1", + "estraverse": "^1.9.1", + "esutils": "^2.0.2", + "optionator": "^0.8.1", + "source-map": "~0.2.0" }, "dependencies": { "estraverse": { @@ -3000,7 +3000,7 @@ "dev": true, "optional": true, "requires": { - "amdefine": "1.0.1" + "amdefine": ">=0.0.4" } } } @@ -3011,10 +3011,10 @@ "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=", "dev": true, "requires": { - "es6-map": "0.1.5", - "es6-weak-map": "2.0.2", - "esrecurse": "4.2.1", - "estraverse": "4.2.0" + "es6-map": "^0.1.3", + "es6-weak-map": "^2.0.1", + "esrecurse": "^4.1.0", + "estraverse": "^4.1.1" } }, "espree": { @@ -3023,8 +3023,8 @@ "integrity": "sha1-JTmY8goPgttdhmOFeZ2RKoOjZjQ=", "dev": true, "requires": { - "acorn": "5.7.3", - "acorn-jsx": "4.1.1" + "acorn": "^5.6.0", + "acorn-jsx": "^4.1.1" } }, "esprima": { @@ -3039,7 +3039,7 @@ "integrity": "sha1-AHo7n9vCs7uH5IeeoZyS/b05Qs8=", "dev": true, "requires": { - "estraverse": "4.2.0" + "estraverse": "^4.1.0" } }, "estraverse": { @@ -3066,8 +3066,8 @@ "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=", "dev": true, "requires": { - "d": "1.0.0", - "es5-ext": "0.10.50" + "d": "1", + "es5-ext": "~0.10.14" } }, "eventemitter3": { @@ -3088,7 +3088,7 @@ "integrity": "sha1-Cs7ehJ7X3RzMMsgRuxG5RNTykjI=", "dev": true, "requires": { - "original": "1.0.2" + "original": ">=0.0.5" } }, "evp_bytestokey": { @@ -3097,8 +3097,8 @@ "integrity": "sha1-f8vbGY3HGVlDLv4ThCaE4FJaywI=", "dev": true, "requires": { - "md5.js": "1.3.5", - "safe-buffer": "5.1.2" + "md5.js": "^1.3.4", + "safe-buffer": "^5.1.1" } }, "execa": { @@ -3107,13 +3107,13 @@ "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", "dev": true, "requires": { - "cross-spawn": "5.1.0", - "get-stream": "3.0.0", - "is-stream": "1.1.0", - "npm-run-path": "2.0.2", - "p-finally": "1.0.0", - "signal-exit": "3.0.2", - "strip-eof": "1.0.0" + "cross-spawn": "^5.0.1", + "get-stream": "^3.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" }, "dependencies": { "cross-spawn": { @@ -3122,9 +3122,9 @@ "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", "dev": true, "requires": { - "lru-cache": "4.1.5", - "shebang-command": "1.2.0", - "which": "1.3.1" + "lru-cache": "^4.0.1", + "shebang-command": "^1.2.0", + "which": "^1.2.9" } } } @@ -3135,13 +3135,13 @@ "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", "dev": true, "requires": { - "debug": "2.6.9", - "define-property": "0.2.5", - "extend-shallow": "2.0.1", - "posix-character-classes": "0.1.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "debug": "^2.3.3", + "define-property": "^0.2.5", + "extend-shallow": "^2.0.1", + "posix-character-classes": "^0.1.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" }, "dependencies": { "define-property": { @@ -3150,7 +3150,7 @@ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } }, "extend-shallow": { @@ -3159,7 +3159,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -3170,7 +3170,7 @@ "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=", "dev": true, "requires": { - "homedir-polyfill": "1.0.3" + "homedir-polyfill": "^1.0.1" } }, "express": { @@ -3179,36 +3179,36 @@ "integrity": "sha1-RJH8OGBc9R+GKdOcK10Cb5ikwTQ=", "dev": true, "requires": { - "accepts": "1.3.7", + "accepts": "~1.3.7", "array-flatten": "1.1.1", "body-parser": "1.19.0", "content-disposition": "0.5.3", - "content-type": "1.0.4", + "content-type": "~1.0.4", "cookie": "0.4.0", "cookie-signature": "1.0.6", "debug": "2.6.9", - "depd": "1.1.2", - "encodeurl": "1.0.2", - "escape-html": "1.0.3", - "etag": "1.8.1", - "finalhandler": "1.1.2", + "depd": "~1.1.2", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "finalhandler": "~1.1.2", "fresh": "0.5.2", "merge-descriptors": "1.0.1", - "methods": "1.1.2", - "on-finished": "2.3.0", - "parseurl": "1.3.3", + "methods": "~1.1.2", + "on-finished": "~2.3.0", + "parseurl": "~1.3.3", "path-to-regexp": "0.1.7", - "proxy-addr": "2.0.5", + "proxy-addr": "~2.0.5", "qs": "6.7.0", - "range-parser": "1.2.1", + "range-parser": "~1.2.1", "safe-buffer": "5.1.2", "send": "0.17.1", "serve-static": "1.14.1", "setprototypeof": "1.1.1", - "statuses": "1.5.0", - "type-is": "1.6.18", + "statuses": "~1.5.0", + "type-is": "~1.6.18", "utils-merge": "1.0.1", - "vary": "1.1.2" + "vary": "~1.1.2" }, "dependencies": { "array-flatten": { @@ -3237,8 +3237,8 @@ "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", "dev": true, "requires": { - "assign-symbols": "1.0.0", - "is-extendable": "1.0.1" + "assign-symbols": "^1.0.0", + "is-extendable": "^1.0.1" }, "dependencies": { "is-extendable": { @@ -3247,7 +3247,7 @@ "integrity": "sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ=", "dev": true, "requires": { - "is-plain-object": "2.0.4" + "is-plain-object": "^2.0.4" } } } @@ -3258,9 +3258,9 @@ "integrity": "sha1-BFURz9jRM/OEZnPRBHwVTiFK09U=", "dev": true, "requires": { - "chardet": "0.4.2", - "iconv-lite": "0.4.24", - "tmp": "0.0.33" + "chardet": "^0.4.0", + "iconv-lite": "^0.4.17", + "tmp": "^0.0.33" } }, "extglob": { @@ -3269,14 +3269,14 @@ "integrity": "sha1-rQD+TcYSqSMuhxhxHcXLWrAoVUM=", "dev": true, "requires": { - "array-unique": "0.3.2", - "define-property": "1.0.0", - "expand-brackets": "2.1.4", - "extend-shallow": "2.0.1", - "fragment-cache": "0.2.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "array-unique": "^0.3.2", + "define-property": "^1.0.0", + "expand-brackets": "^2.1.4", + "extend-shallow": "^2.0.1", + "fragment-cache": "^0.2.1", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" }, "dependencies": { "define-property": { @@ -3285,7 +3285,7 @@ "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "dev": true, "requires": { - "is-descriptor": "1.0.2" + "is-descriptor": "^1.0.0" } }, "extend-shallow": { @@ -3294,7 +3294,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } }, "is-accessor-descriptor": { @@ -3303,7 +3303,7 @@ "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=", "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { @@ -3312,7 +3312,7 @@ "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=", "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-descriptor": { @@ -3321,9 +3321,9 @@ "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=", "dev": true, "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } } } @@ -3346,12 +3346,12 @@ "integrity": "sha1-1ISkEAXLb66zmblR/RvXDdrrtgI=", "dev": true, "requires": { - "@nodelib/fs.stat": "2.0.1", - "@nodelib/fs.walk": "1.2.2", - "glob-parent": "5.0.0", - "is-glob": "4.0.1", - "merge2": "1.2.4", - "micromatch": "4.0.2" + "@nodelib/fs.stat": "^2.0.1", + "@nodelib/fs.walk": "^1.2.1", + "glob-parent": "^5.0.0", + "is-glob": "^4.0.1", + "merge2": "^1.2.3", + "micromatch": "^4.0.2" }, "dependencies": { "braces": { @@ -3360,7 +3360,7 @@ "integrity": "sha1-NFThpGLujVmeI23zNs2epPiv4Qc=", "dev": true, "requires": { - "fill-range": "7.0.1" + "fill-range": "^7.0.1" } }, "fill-range": { @@ -3369,7 +3369,7 @@ "integrity": "sha1-GRmmp8df44ssfHflGYU12prN2kA=", "dev": true, "requires": { - "to-regex-range": "5.0.1" + "to-regex-range": "^5.0.1" } }, "glob-parent": { @@ -3378,7 +3378,7 @@ "integrity": "sha1-HcmfDzmwBtPpLCwoQGg4Lwwg6VQ=", "dev": true, "requires": { - "is-glob": "4.0.1" + "is-glob": "^4.0.1" } }, "is-number": { @@ -3393,8 +3393,8 @@ "integrity": "sha1-T8sJmb+fvC/L3SEvbWKbmlbDklk=", "dev": true, "requires": { - "braces": "3.0.2", - "picomatch": "2.0.7" + "braces": "^3.0.1", + "picomatch": "^2.0.5" } }, "to-regex-range": { @@ -3403,7 +3403,7 @@ "integrity": "sha1-FkjESq58jZiKMmAY7XL1tN0DkuQ=", "dev": true, "requires": { - "is-number": "7.0.0" + "is-number": "^7.0.0" } } } @@ -3432,7 +3432,7 @@ "integrity": "sha1-Tsijj0rCXyFJJnOtt+rpz+9H0cI=", "dev": true, "requires": { - "reusify": "1.0.4" + "reusify": "^1.0.0" } }, "faye-websocket": { @@ -3441,7 +3441,7 @@ "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=", "dev": true, "requires": { - "websocket-driver": "0.7.0" + "websocket-driver": ">=0.5.1" } }, "figures": { @@ -3450,7 +3450,7 @@ "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", "dev": true, "requires": { - "escape-string-regexp": "1.0.5" + "escape-string-regexp": "^1.0.5" } }, "file-loader": { @@ -3459,8 +3459,8 @@ "integrity": "sha1-b+iGRJsPKpNuQ8q6rAzb+zaVBvg=", "dev": true, "requires": { - "loader-utils": "1.2.3", - "schema-utils": "0.4.7" + "loader-utils": "^1.0.2", + "schema-utils": "^0.4.5" } }, "fill-range": { @@ -3469,10 +3469,10 @@ "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", "dev": true, "requires": { - "extend-shallow": "2.0.1", - "is-number": "3.0.0", - "repeat-string": "1.6.1", - "to-regex-range": "2.1.1" + "extend-shallow": "^2.0.1", + "is-number": "^3.0.0", + "repeat-string": "^1.6.1", + "to-regex-range": "^2.1.0" }, "dependencies": { "extend-shallow": { @@ -3481,7 +3481,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -3493,12 +3493,12 @@ "dev": true, "requires": { "debug": "2.6.9", - "encodeurl": "1.0.2", - "escape-html": "1.0.3", - "on-finished": "2.3.0", - "parseurl": "1.3.3", - "statuses": "1.5.0", - "unpipe": "1.0.0" + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "on-finished": "~2.3.0", + "parseurl": "~1.3.3", + "statuses": "~1.5.0", + "unpipe": "~1.0.0" } }, "find-cache-dir": { @@ -3507,9 +3507,9 @@ "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=", "dev": true, "requires": { - "commondir": "1.0.1", - "make-dir": "1.3.0", - "pkg-dir": "2.0.0" + "commondir": "^1.0.1", + "make-dir": "^1.0.0", + "pkg-dir": "^2.0.0" } }, "find-up": { @@ -3518,7 +3518,7 @@ "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", "dev": true, "requires": { - "locate-path": "2.0.0" + "locate-path": "^2.0.0" } }, "findup-sync": { @@ -3527,10 +3527,10 @@ "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=", "dev": true, "requires": { - "detect-file": "1.0.0", - "is-glob": "3.1.0", - "micromatch": "3.1.10", - "resolve-dir": "1.0.1" + "detect-file": "^1.0.0", + "is-glob": "^3.1.0", + "micromatch": "^3.0.4", + "resolve-dir": "^1.0.1" }, "dependencies": { "is-glob": { @@ -3539,7 +3539,7 @@ "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", "dev": true, "requires": { - "is-extglob": "2.1.1" + "is-extglob": "^2.1.0" } } } @@ -3556,8 +3556,8 @@ "integrity": "sha1-jdfYc6G6vCB9lOrQwuDkQnbr8ug=", "dev": true, "requires": { - "inherits": "2.0.3", - "readable-stream": "2.3.6" + "inherits": "^2.0.3", + "readable-stream": "^2.3.6" } }, "follow-redirects": { @@ -3566,7 +3566,7 @@ "integrity": "sha1-SJ68GY3A5/ZBZ70jsDxMGbV4THY=", "dev": true, "requires": { - "debug": "3.2.6" + "debug": "^3.2.6" }, "dependencies": { "debug": { @@ -3575,7 +3575,7 @@ "integrity": "sha1-6D0X3hbYp++3cX7b5fsQE17uYps=", "dev": true, "requires": { - "ms": "2.1.1" + "ms": "^2.1.1" } }, "ms": { @@ -3598,7 +3598,7 @@ "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=", "dev": true, "requires": { - "for-in": "1.0.2" + "for-in": "^1.0.1" } }, "forever-agent": { @@ -3613,9 +3613,9 @@ "integrity": "sha1-3M5SwF9kTymManq5Nr1yTO/786Y=", "dev": true, "requires": { - "asynckit": "0.4.0", - "combined-stream": "1.0.8", - "mime-types": "2.1.24" + "asynckit": "^0.4.0", + "combined-stream": "^1.0.6", + "mime-types": "^2.1.12" } }, "forwarded": { @@ -3630,7 +3630,7 @@ "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", "dev": true, "requires": { - "map-cache": "0.2.2" + "map-cache": "^0.2.2" } }, "fresh": { @@ -3645,8 +3645,8 @@ "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=", "dev": true, "requires": { - "inherits": "2.0.3", - "readable-stream": "2.3.6" + "inherits": "^2.0.1", + "readable-stream": "^2.0.0" } }, "fs-write-stream-atomic": { @@ -3655,10 +3655,10 @@ "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=", "dev": true, "requires": { - "graceful-fs": "4.1.15", - "iferr": "0.1.5", - "imurmurhash": "0.1.4", - "readable-stream": "2.3.6" + "graceful-fs": "^4.1.2", + "iferr": "^0.1.5", + "imurmurhash": "^0.1.4", + "readable-stream": "1 || 2" } }, "fs.realpath": { @@ -3674,8 +3674,8 @@ "dev": true, "optional": true, "requires": { - "nan": "2.14.0", - "node-pre-gyp": "0.12.0" + "nan": "^2.12.1", + "node-pre-gyp": "^0.12.0" }, "dependencies": { "abbrev": { @@ -3701,8 +3701,8 @@ "dev": true, "optional": true, "requires": { - "delegates": "1.0.0", - "readable-stream": "2.3.6" + "delegates": "^1.0.0", + "readable-stream": "^2.0.6" } }, "balanced-match": { @@ -3715,7 +3715,7 @@ "bundled": true, "dev": true, "requires": { - "balanced-match": "1.0.0", + "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, @@ -3752,7 +3752,7 @@ "dev": true, "optional": true, "requires": { - "ms": "2.1.1" + "ms": "^2.1.1" } }, "deep-extend": { @@ -3779,7 +3779,7 @@ "dev": true, "optional": true, "requires": { - "minipass": "2.3.5" + "minipass": "^2.2.1" } }, "fs.realpath": { @@ -3794,14 +3794,14 @@ "dev": true, "optional": true, "requires": { - "aproba": "1.2.0", - "console-control-strings": "1.1.0", - "has-unicode": "2.0.1", - "object-assign": "4.1.1", - "signal-exit": "3.0.2", - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wide-align": "1.1.3" + "aproba": "^1.0.3", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.0", + "object-assign": "^4.1.0", + "signal-exit": "^3.0.0", + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wide-align": "^1.1.0" } }, "glob": { @@ -3810,12 +3810,12 @@ "dev": true, "optional": true, "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "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" } }, "has-unicode": { @@ -3830,7 +3830,7 @@ "dev": true, "optional": true, "requires": { - "safer-buffer": "2.1.2" + "safer-buffer": ">= 2.1.2 < 3" } }, "ignore-walk": { @@ -3839,7 +3839,7 @@ "dev": true, "optional": true, "requires": { - "minimatch": "3.0.4" + "minimatch": "^3.0.4" } }, "inflight": { @@ -3848,8 +3848,8 @@ "dev": true, "optional": true, "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" + "once": "^1.3.0", + "wrappy": "1" } }, "inherits": { @@ -3868,7 +3868,7 @@ "bundled": true, "dev": true, "requires": { - "number-is-nan": "1.0.1" + "number-is-nan": "^1.0.0" } }, "isarray": { @@ -3882,7 +3882,7 @@ "bundled": true, "dev": true, "requires": { - "brace-expansion": "1.1.11" + "brace-expansion": "^1.1.7" } }, "minimist": { @@ -3895,8 +3895,8 @@ "bundled": true, "dev": true, "requires": { - "safe-buffer": "5.1.2", - "yallist": "3.0.3" + "safe-buffer": "^5.1.2", + "yallist": "^3.0.0" } }, "minizlib": { @@ -3905,7 +3905,7 @@ "dev": true, "optional": true, "requires": { - "minipass": "2.3.5" + "minipass": "^2.2.1" } }, "mkdirp": { @@ -3928,9 +3928,9 @@ "dev": true, "optional": true, "requires": { - "debug": "4.1.1", - "iconv-lite": "0.4.24", - "sax": "1.2.4" + "debug": "^4.1.0", + "iconv-lite": "^0.4.4", + "sax": "^1.2.4" } }, "node-pre-gyp": { @@ -3939,16 +3939,16 @@ "dev": true, "optional": true, "requires": { - "detect-libc": "1.0.3", - "mkdirp": "0.5.1", - "needle": "2.3.0", - "nopt": "4.0.1", - "npm-packlist": "1.4.1", - "npmlog": "4.1.2", - "rc": "1.2.8", - "rimraf": "2.6.3", - "semver": "5.7.0", - "tar": "4.4.8" + "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" } }, "nopt": { @@ -3957,8 +3957,8 @@ "dev": true, "optional": true, "requires": { - "abbrev": "1.1.1", - "osenv": "0.1.5" + "abbrev": "1", + "osenv": "^0.1.4" } }, "npm-bundled": { @@ -3973,8 +3973,8 @@ "dev": true, "optional": true, "requires": { - "ignore-walk": "3.0.1", - "npm-bundled": "1.0.6" + "ignore-walk": "^3.0.1", + "npm-bundled": "^1.0.1" } }, "npmlog": { @@ -3983,10 +3983,10 @@ "dev": true, "optional": true, "requires": { - "are-we-there-yet": "1.1.5", - "console-control-strings": "1.1.0", - "gauge": "2.7.4", - "set-blocking": "2.0.0" + "are-we-there-yet": "~1.1.2", + "console-control-strings": "~1.1.0", + "gauge": "~2.7.3", + "set-blocking": "~2.0.0" } }, "number-is-nan": { @@ -4005,7 +4005,7 @@ "bundled": true, "dev": true, "requires": { - "wrappy": "1.0.2" + "wrappy": "1" } }, "os-homedir": { @@ -4026,8 +4026,8 @@ "dev": true, "optional": true, "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" + "os-homedir": "^1.0.0", + "os-tmpdir": "^1.0.0" } }, "path-is-absolute": { @@ -4048,10 +4048,10 @@ "dev": true, "optional": true, "requires": { - "deep-extend": "0.6.0", - "ini": "1.3.5", - "minimist": "1.2.0", - "strip-json-comments": "2.0.1" + "deep-extend": "^0.6.0", + "ini": "~1.3.0", + "minimist": "^1.2.0", + "strip-json-comments": "~2.0.1" }, "dependencies": { "minimist": { @@ -4068,13 +4068,13 @@ "dev": true, "optional": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "2.0.0", - "safe-buffer": "5.1.2", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } }, "rimraf": { @@ -4083,7 +4083,7 @@ "dev": true, "optional": true, "requires": { - "glob": "7.1.3" + "glob": "^7.1.3" } }, "safe-buffer": { @@ -4126,9 +4126,9 @@ "bundled": true, "dev": true, "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" } }, "string_decoder": { @@ -4137,7 +4137,7 @@ "dev": true, "optional": true, "requires": { - "safe-buffer": "5.1.2" + "safe-buffer": "~5.1.0" } }, "strip-ansi": { @@ -4145,7 +4145,7 @@ "bundled": true, "dev": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "strip-json-comments": { @@ -4160,13 +4160,13 @@ "dev": true, "optional": true, "requires": { - "chownr": "1.1.1", - "fs-minipass": "1.2.5", - "minipass": "2.3.5", - "minizlib": "1.2.1", - "mkdirp": "0.5.1", - "safe-buffer": "5.1.2", - "yallist": "3.0.3" + "chownr": "^1.1.1", + "fs-minipass": "^1.2.5", + "minipass": "^2.3.4", + "minizlib": "^1.1.1", + "mkdirp": "^0.5.0", + "safe-buffer": "^5.1.2", + "yallist": "^3.0.2" } }, "util-deprecate": { @@ -4181,7 +4181,7 @@ "dev": true, "optional": true, "requires": { - "string-width": "1.0.2" + "string-width": "^1.0.2 || 2" } }, "wrappy": { @@ -4202,10 +4202,10 @@ "integrity": "sha1-Touo7i1Ivk99DeUFRVVI6uWTIEU=", "dev": true, "requires": { - "graceful-fs": "4.1.15", - "inherits": "2.0.3", - "mkdirp": "0.5.1", - "rimraf": "2.6.3" + "graceful-fs": "^4.1.2", + "inherits": "~2.0.0", + "mkdirp": ">=0.5 0", + "rimraf": "2" } }, "function-bind": { @@ -4220,14 +4220,14 @@ "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", "dev": true, "requires": { - "aproba": "1.2.0", - "console-control-strings": "1.1.0", - "has-unicode": "2.0.1", - "object-assign": "4.1.1", - "signal-exit": "3.0.2", - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wide-align": "1.1.3" + "aproba": "^1.0.3", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.0", + "object-assign": "^4.1.0", + "signal-exit": "^3.0.0", + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wide-align": "^1.1.0" } }, "gaze": { @@ -4236,7 +4236,7 @@ "integrity": "sha1-xEFzPhO5J6yMD/C0w7Az8ogSkko=", "dev": true, "requires": { - "globule": "1.2.1" + "globule": "^1.0.0" } }, "get-caller-file": { @@ -4269,7 +4269,7 @@ "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", "dev": true, "requires": { - "assert-plus": "1.0.0" + "assert-plus": "^1.0.0" } }, "glob": { @@ -4278,12 +4278,12 @@ "integrity": "sha1-qmCKL2xXetNX4a5aXCbZqNGWklU=", "dev": true, "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "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" } }, "glob-parent": { @@ -4292,8 +4292,8 @@ "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", "dev": true, "requires": { - "is-glob": "3.1.0", - "path-dirname": "1.0.2" + "is-glob": "^3.1.0", + "path-dirname": "^1.0.0" }, "dependencies": { "is-glob": { @@ -4302,7 +4302,7 @@ "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", "dev": true, "requires": { - "is-extglob": "2.1.1" + "is-extglob": "^2.1.0" } } } @@ -4313,9 +4313,9 @@ "integrity": "sha1-bXcPDrUjrHgWTXK15xqIdyZcw+o=", "dev": true, "requires": { - "global-prefix": "1.0.2", - "is-windows": "1.0.2", - "resolve-dir": "1.0.1" + "global-prefix": "^1.0.1", + "is-windows": "^1.0.1", + "resolve-dir": "^1.0.0" } }, "global-prefix": { @@ -4324,11 +4324,11 @@ "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=", "dev": true, "requires": { - "expand-tilde": "2.0.2", - "homedir-polyfill": "1.0.3", - "ini": "1.3.5", - "is-windows": "1.0.2", - "which": "1.3.1" + "expand-tilde": "^2.0.2", + "homedir-polyfill": "^1.0.1", + "ini": "^1.3.4", + "is-windows": "^1.0.1", + "which": "^1.2.14" } }, "globals": { @@ -4343,14 +4343,14 @@ "integrity": "sha1-R4LDTLdd1oM1EzXFgpzDQg5gayI=", "dev": true, "requires": { - "@types/glob": "7.1.1", - "array-union": "2.1.0", - "dir-glob": "3.0.1", - "fast-glob": "3.0.4", - "glob": "7.1.4", - "ignore": "5.1.2", - "merge2": "1.2.4", - "slash": "3.0.0" + "@types/glob": "^7.1.1", + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.0.3", + "glob": "^7.1.3", + "ignore": "^5.1.1", + "merge2": "^1.2.3", + "slash": "^3.0.0" }, "dependencies": { "array-union": { @@ -4373,9 +4373,9 @@ "integrity": "sha1-Xf+xsZHyLSB5epNptJ6rTpg5aW0=", "dev": true, "requires": { - "glob": "7.1.4", - "lodash": "4.17.11", - "minimatch": "3.0.4" + "glob": "~7.1.1", + "lodash": "~4.17.10", + "minimatch": "~3.0.2" } }, "google-libphonenumber": { @@ -4414,8 +4414,8 @@ "integrity": "sha1-HvievT5JllV2de7ZiTEQ3DUPoIA=", "dev": true, "requires": { - "ajv": "6.10.0", - "har-schema": "2.0.0" + "ajv": "^6.5.5", + "har-schema": "^2.0.0" } }, "has": { @@ -4424,7 +4424,7 @@ "integrity": "sha1-ci18v8H2qoJB8W3YFOAR4fQeh5Y=", "dev": true, "requires": { - "function-bind": "1.1.1" + "function-bind": "^1.1.1" } }, "has-ansi": { @@ -4433,7 +4433,7 @@ "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", "dev": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "has-flag": { @@ -4460,9 +4460,9 @@ "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=", "dev": true, "requires": { - "get-value": "2.0.6", - "has-values": "1.0.0", - "isobject": "3.0.1" + "get-value": "^2.0.6", + "has-values": "^1.0.0", + "isobject": "^3.0.0" } }, "has-values": { @@ -4471,8 +4471,8 @@ "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=", "dev": true, "requires": { - "is-number": "3.0.0", - "kind-of": "4.0.0" + "is-number": "^3.0.0", + "kind-of": "^4.0.0" }, "dependencies": { "kind-of": { @@ -4481,7 +4481,7 @@ "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -4492,8 +4492,8 @@ "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=", "dev": true, "requires": { - "inherits": "2.0.3", - "safe-buffer": "5.1.2" + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" } }, "hash-sum": { @@ -4508,8 +4508,8 @@ "integrity": "sha1-C6vKU46NTuSg+JiNaIZlN6ADz0I=", "dev": true, "requires": { - "inherits": "2.0.3", - "minimalistic-assert": "1.0.1" + "inherits": "^2.0.3", + "minimalistic-assert": "^1.0.1" } }, "he": { @@ -4524,8 +4524,8 @@ "integrity": "sha1-lTWXMZfBRLCWE81l0xfvGZY70C0=", "dev": true, "requires": { - "no-case": "2.3.2", - "upper-case": "1.1.3" + "no-case": "^2.2.0", + "upper-case": "^1.1.3" } }, "history": { @@ -4534,12 +4534,12 @@ "integrity": "sha1-hFh8IGgDnq2K92np1qaGChT6G8o=", "dev": true, "requires": { - "@babel/runtime": "7.4.5", - "loose-envify": "1.4.0", - "resolve-pathname": "2.2.0", - "tiny-invariant": "1.0.4", - "tiny-warning": "1.0.2", - "value-equal": "0.4.0" + "@babel/runtime": "^7.1.2", + "loose-envify": "^1.2.0", + "resolve-pathname": "^2.2.0", + "tiny-invariant": "^1.0.2", + "tiny-warning": "^1.0.0", + "value-equal": "^0.4.0" } }, "hmac-drbg": { @@ -4548,9 +4548,9 @@ "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=", "dev": true, "requires": { - "hash.js": "1.1.7", - "minimalistic-assert": "1.0.1", - "minimalistic-crypto-utils": "1.0.1" + "hash.js": "^1.0.3", + "minimalistic-assert": "^1.0.0", + "minimalistic-crypto-utils": "^1.0.1" } }, "home-or-tmp": { @@ -4559,8 +4559,8 @@ "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=", "dev": true, "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" + "os-homedir": "^1.0.0", + "os-tmpdir": "^1.0.1" } }, "homedir-polyfill": { @@ -4569,7 +4569,7 @@ "integrity": "sha1-dDKYzvTlrz4ZQWH7rcwhUdOgWOg=", "dev": true, "requires": { - "parse-passwd": "1.0.0" + "parse-passwd": "^1.0.0" } }, "hosted-git-info": { @@ -4584,10 +4584,10 @@ "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=", "dev": true, "requires": { - "inherits": "2.0.3", - "obuf": "1.1.2", - "readable-stream": "2.3.6", - "wbuf": "1.7.3" + "inherits": "^2.0.1", + "obuf": "^1.0.0", + "readable-stream": "^2.0.1", + "wbuf": "^1.1.0" } }, "html-comment-regex": { @@ -4608,13 +4608,13 @@ "integrity": "sha1-0AQOBUcw41TbAIRjWTGUAVIS0gw=", "dev": true, "requires": { - "camel-case": "3.0.0", - "clean-css": "4.2.1", - "commander": "2.17.1", - "he": "1.2.0", - "param-case": "2.1.1", - "relateurl": "0.2.7", - "uglify-js": "3.4.10" + "camel-case": "3.0.x", + "clean-css": "4.2.x", + "commander": "2.17.x", + "he": "1.2.x", + "param-case": "2.1.x", + "relateurl": "0.2.x", + "uglify-js": "3.4.x" } }, "html-webpack-plugin": { @@ -4623,12 +4623,12 @@ "integrity": "sha1-f5xCG36pHsRg9WUn1430hO51N9U=", "dev": true, "requires": { - "bluebird": "3.5.5", - "html-minifier": "3.5.21", - "loader-utils": "0.2.17", - "lodash": "4.17.11", - "pretty-error": "2.1.1", - "toposort": "1.0.7" + "bluebird": "^3.4.7", + "html-minifier": "^3.2.3", + "loader-utils": "^0.2.16", + "lodash": "^4.17.3", + "pretty-error": "^2.0.2", + "toposort": "^1.0.0" }, "dependencies": { "big.js": { @@ -4643,10 +4643,10 @@ "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=", "dev": true, "requires": { - "big.js": "3.2.0", - "emojis-list": "2.1.0", - "json5": "0.5.1", - "object-assign": "4.1.1" + "big.js": "^3.1.3", + "emojis-list": "^2.0.0", + "json5": "^0.5.0", + "object-assign": "^4.0.1" } } } @@ -4657,12 +4657,12 @@ "integrity": "sha1-vWedw/WYl7ajS7EHSchVu1OpOS8=", "dev": true, "requires": { - "domelementtype": "1.3.1", - "domhandler": "2.4.2", - "domutils": "1.5.1", - "entities": "1.1.2", - "inherits": "2.0.3", - "readable-stream": "3.3.0" + "domelementtype": "^1.3.1", + "domhandler": "^2.3.0", + "domutils": "^1.5.1", + "entities": "^1.1.1", + "inherits": "^2.0.1", + "readable-stream": "^3.1.1" }, "dependencies": { "readable-stream": { @@ -4671,9 +4671,9 @@ "integrity": "sha1-y4ARqtAC63F78EApH+uoVpyYb7k=", "dev": true, "requires": { - "inherits": "2.0.3", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" } } } @@ -4690,10 +4690,10 @@ "integrity": "sha1-T1ApzxMjnzEDblsuVSkrz7zIXI8=", "dev": true, "requires": { - "depd": "1.1.2", + "depd": "~1.1.2", "inherits": "2.0.3", "setprototypeof": "1.1.1", - "statuses": "1.5.0", + "statuses": ">= 1.5.0 < 2", "toidentifier": "1.0.0" } }, @@ -4709,9 +4709,9 @@ "integrity": "sha1-etOElGWPhGBeL220Q230EPTlvpo=", "dev": true, "requires": { - "eventemitter3": "3.1.2", - "follow-redirects": "1.7.0", - "requires-port": "1.0.0" + "eventemitter3": "^3.0.0", + "follow-redirects": "^1.0.0", + "requires-port": "^1.0.0" } }, "http-proxy-middleware": { @@ -4720,10 +4720,10 @@ "integrity": "sha1-GDx9xKoUeRUDBkmMIQza+WCApDo=", "dev": true, "requires": { - "http-proxy": "1.17.0", - "is-glob": "4.0.1", - "lodash": "4.17.11", - "micromatch": "3.1.10" + "http-proxy": "^1.17.0", + "is-glob": "^4.0.0", + "lodash": "^4.17.11", + "micromatch": "^3.1.10" } }, "http-signature": { @@ -4732,9 +4732,9 @@ "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", "dev": true, "requires": { - "assert-plus": "1.0.0", - "jsprim": "1.4.1", - "sshpk": "1.16.1" + "assert-plus": "^1.0.0", + "jsprim": "^1.2.2", + "sshpk": "^1.7.0" } }, "https-browserify": { @@ -4749,7 +4749,7 @@ "integrity": "sha1-ICK0sl+93CHS9SSXSkdKr+czkIs=", "dev": true, "requires": { - "safer-buffer": "2.1.2" + "safer-buffer": ">= 2.1.2 < 3" } }, "icss-replace-symbols": { @@ -4764,7 +4764,7 @@ "integrity": "sha1-g/Cg7DeL8yRheLbCrZE28TWxyWI=", "dev": true, "requires": { - "postcss": "6.0.23" + "postcss": "^6.0.1" }, "dependencies": { "ansi-styles": { @@ -4773,7 +4773,7 @@ "integrity": "sha1-QfuyAkPlCxK+DwS43tvwdSDOhB0=", "dev": true, "requires": { - "color-convert": "1.9.3" + "color-convert": "^1.9.0" } }, "chalk": { @@ -4782,9 +4782,9 @@ "integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.5.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } }, "has-flag": { @@ -4799,9 +4799,9 @@ "integrity": "sha1-YcgswyisYOZ3ZF+XkFTrmLwOMyQ=", "dev": true, "requires": { - "chalk": "2.4.2", - "source-map": "0.6.1", - "supports-color": "5.5.0" + "chalk": "^2.4.1", + "source-map": "^0.6.1", + "supports-color": "^5.4.0" } }, "source-map": { @@ -4816,7 +4816,7 @@ "integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=", "dev": true, "requires": { - "has-flag": "3.0.0" + "has-flag": "^3.0.0" } } } @@ -4852,8 +4852,8 @@ "integrity": "sha1-VQcL44pZk88Y72236WH1vuXFoJ0=", "dev": true, "requires": { - "pkg-dir": "3.0.0", - "resolve-cwd": "2.0.0" + "pkg-dir": "^3.0.0", + "resolve-cwd": "^2.0.0" }, "dependencies": { "find-up": { @@ -4862,7 +4862,7 @@ "integrity": "sha1-SRafHXmTQwZG2mHsxa41XCHJe3M=", "dev": true, "requires": { - "locate-path": "3.0.0" + "locate-path": "^3.0.0" } }, "locate-path": { @@ -4871,8 +4871,8 @@ "integrity": "sha1-2+w7OrdZdYBxtY/ln8QYca8hQA4=", "dev": true, "requires": { - "p-locate": "3.0.0", - "path-exists": "3.0.0" + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" } }, "p-limit": { @@ -4881,7 +4881,7 @@ "integrity": "sha1-QXyZQeYCepq8ulCS3SkE4lW1+8I=", "dev": true, "requires": { - "p-try": "2.2.0" + "p-try": "^2.0.0" } }, "p-locate": { @@ -4890,7 +4890,7 @@ "integrity": "sha1-Mi1poFwCZLJZl9n0DNiokasAZKQ=", "dev": true, "requires": { - "p-limit": "2.2.0" + "p-limit": "^2.0.0" } }, "p-try": { @@ -4905,7 +4905,7 @@ "integrity": "sha1-J0kCDyOe2ZCIGx9xIQ1R62UjvqM=", "dev": true, "requires": { - "find-up": "3.0.0" + "find-up": "^3.0.0" } } } @@ -4928,7 +4928,7 @@ "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", "dev": true, "requires": { - "repeating": "2.0.1" + "repeating": "^2.0.0" } }, "indexes-of": { @@ -4949,8 +4949,8 @@ "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "dev": true, "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" + "once": "^1.3.0", + "wrappy": "1" } }, "inherits": { @@ -4971,19 +4971,19 @@ "integrity": "sha1-4EqqnQW3o8ubD0B9BDdfBEcZA0c=", "dev": true, "requires": { - "ansi-escapes": "1.4.0", - "chalk": "1.1.3", - "cli-cursor": "2.1.0", - "cli-width": "2.2.0", - "external-editor": "2.2.0", - "figures": "2.0.0", - "lodash": "4.17.11", + "ansi-escapes": "^1.1.0", + "chalk": "^1.0.0", + "cli-cursor": "^2.1.0", + "cli-width": "^2.0.0", + "external-editor": "^2.0.1", + "figures": "^2.0.0", + "lodash": "^4.3.0", "mute-stream": "0.0.7", - "run-async": "2.3.0", - "rx": "4.1.0", - "string-width": "2.1.1", - "strip-ansi": "3.0.1", - "through": "2.3.8" + "run-async": "^2.2.0", + "rx": "^4.1.0", + "string-width": "^2.0.0", + "strip-ansi": "^3.0.0", + "through": "^2.3.6" }, "dependencies": { "ansi-regex": { @@ -5004,8 +5004,8 @@ "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=", "dev": true, "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" }, "dependencies": { "strip-ansi": { @@ -5014,7 +5014,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } } } @@ -5027,7 +5027,7 @@ "integrity": "sha1-rp+/k7mEh4eF1QqN4bNWlWBYz1w=", "dev": true, "requires": { - "meow": "3.7.0" + "meow": "^3.3.0" } }, "interpret": { @@ -5042,7 +5042,7 @@ "integrity": "sha1-YQ88ksk1nOHbYW5TgAjSP/NRWOY=", "dev": true, "requires": { - "loose-envify": "1.4.0" + "loose-envify": "^1.0.0" } }, "inversify": { @@ -5081,7 +5081,7 @@ "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -5090,7 +5090,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -5107,7 +5107,7 @@ "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", "dev": true, "requires": { - "binary-extensions": "1.13.1" + "binary-extensions": "^1.0.0" } }, "is-buffer": { @@ -5128,7 +5128,7 @@ "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -5137,7 +5137,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -5154,9 +5154,9 @@ "integrity": "sha1-Nm2CQN3kh8pRgjsaufB6EKeCUco=", "dev": true, "requires": { - "is-accessor-descriptor": "0.1.6", - "is-data-descriptor": "0.1.4", - "kind-of": "5.1.0" + "is-accessor-descriptor": "^0.1.6", + "is-data-descriptor": "^0.1.4", + "kind-of": "^5.0.0" }, "dependencies": { "kind-of": { @@ -5191,7 +5191,7 @@ "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", "dev": true, "requires": { - "number-is-nan": "1.0.1" + "number-is-nan": "^1.0.0" } }, "is-fullwidth-code-point": { @@ -5200,7 +5200,7 @@ "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "dev": true, "requires": { - "number-is-nan": "1.0.1" + "number-is-nan": "^1.0.0" } }, "is-glob": { @@ -5209,7 +5209,7 @@ "integrity": "sha1-dWfb6fL14kZ7x3q4PEopSCQHpdw=", "dev": true, "requires": { - "is-extglob": "2.1.1" + "is-extglob": "^2.1.1" } }, "is-lower-case": { @@ -5218,7 +5218,7 @@ "integrity": "sha1-fhR75HaNxGbbO/shzGCzHmrWk5M=", "dev": true, "requires": { - "lower-case": "1.1.4" + "lower-case": "^1.1.0" } }, "is-number": { @@ -5227,7 +5227,7 @@ "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -5236,7 +5236,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -5253,7 +5253,7 @@ "integrity": "sha1-WsSLNF72dTOb1sekipEhELJBz1I=", "dev": true, "requires": { - "is-path-inside": "1.0.1" + "is-path-inside": "^1.0.0" } }, "is-path-inside": { @@ -5262,7 +5262,7 @@ "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=", "dev": true, "requires": { - "path-is-inside": "1.0.2" + "path-is-inside": "^1.0.1" } }, "is-plain-obj": { @@ -5277,7 +5277,7 @@ "integrity": "sha1-LBY7P6+xtgbZ0Xko8FwqHDjgdnc=", "dev": true, "requires": { - "isobject": "3.0.1" + "isobject": "^3.0.1" } }, "is-promise": { @@ -5292,7 +5292,7 @@ "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=", "dev": true, "requires": { - "has": "1.0.3" + "has": "^1.0.1" } }, "is-stream": { @@ -5307,7 +5307,7 @@ "integrity": "sha1-z2EJDaDZ77yrhyLeum8DIgjbsOk=", "dev": true, "requires": { - "html-comment-regex": "1.1.2" + "html-comment-regex": "^1.1.0" } }, "is-symbol": { @@ -5316,7 +5316,7 @@ "integrity": "sha1-oFX2rlcZLK7jKeeoYBGLSXqVDzg=", "dev": true, "requires": { - "has-symbols": "1.0.0" + "has-symbols": "^1.0.0" } }, "is-typedarray": { @@ -5331,7 +5331,7 @@ "integrity": "sha1-jQsfp+eTOh5YSDYA7H2WYcuvdW8=", "dev": true, "requires": { - "upper-case": "1.1.3" + "upper-case": "^1.1.0" } }, "is-utf8": { @@ -5381,14 +5381,14 @@ "resolved": "https://registry.npm.taobao.org/iview/download/iview-3.4.2.tgz", "integrity": "sha1-Her+gYP+KbmzMXnYX6o3s4E7D3M=", "requires": { - "async-validator": "1.11.2", - "deepmerge": "2.2.1", - "element-resize-detector": "1.2.0", - "js-calendar": "1.2.3", - "lodash.throttle": "4.1.1", - "popper.js": "1.15.0", - "tinycolor2": "1.4.1", - "v-click-outside-x": "3.7.1" + "async-validator": "^1.10.0", + "deepmerge": "^2.2.1", + "element-resize-detector": "^1.2.0", + "js-calendar": "^1.2.3", + "lodash.throttle": "^4.1.1", + "popper.js": "^1.14.6", + "tinycolor2": "^1.4.1", + "v-click-outside-x": "^3.5.6" } }, "iview-loader": { @@ -5397,7 +5397,7 @@ "integrity": "sha1-q99SB03pPILvAaLCk964LIy7veA=", "dev": true, "requires": { - "loader-utils": "1.2.3" + "loader-utils": "^1.1.0" } }, "javascript-obfuscator": { @@ -5432,7 +5432,7 @@ "integrity": "sha1-QvNvxYF5Eciep12iuHQFSSKWdhY=", "dev": true, "requires": { - "regenerator-runtime": "0.12.1" + "regenerator-runtime": "^0.12.0" } }, "ansi-styles": { @@ -5441,7 +5441,7 @@ "integrity": "sha1-QfuyAkPlCxK+DwS43tvwdSDOhB0=", "dev": true, "requires": { - "color-convert": "1.9.3" + "color-convert": "^1.9.0" } }, "chalk": { @@ -5450,9 +5450,9 @@ "integrity": "sha1-GMSasWoDe26wFSzIPjRxM4IVtm4=", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.5.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } }, "has-flag": { @@ -5479,8 +5479,8 @@ "integrity": "sha1-BPVYFxOoplYS0BdfvzoB+AoWJhM=", "dev": true, "requires": { - "buffer-from": "1.1.1", - "source-map": "0.6.1" + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" } }, "supports-color": { @@ -5489,7 +5489,7 @@ "integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=", "dev": true, "requires": { - "has-flag": "3.0.0" + "has-flag": "^3.0.0" } } } @@ -5523,8 +5523,8 @@ "integrity": "sha1-XJZ93YN6m/3KXy3oQlOr6KHAO4A=", "dev": true, "requires": { - "argparse": "1.0.10", - "esprima": "2.7.3" + "argparse": "^1.0.7", + "esprima": "^2.6.0" } }, "js2xmlparser": { @@ -5533,7 +5533,7 @@ "integrity": "sha1-rhTMcRsokgg+7W4hn7yZPYWLw6U=", "dev": true, "requires": { - "xmlcreate": "2.0.1" + "xmlcreate": "^2.0.0" } }, "jsbn": { @@ -5548,20 +5548,20 @@ "integrity": "sha1-7iifxrqSY7fk7OuZkhF5/hwxSJo=", "dev": true, "requires": { - "@babel/parser": "7.4.5", - "bluebird": "3.5.5", - "catharsis": "0.8.10", - "escape-string-regexp": "2.0.0", - "js2xmlparser": "4.0.0", - "klaw": "3.0.0", - "markdown-it": "8.4.2", - "markdown-it-anchor": "5.1.0", - "marked": "0.6.2", - "mkdirp": "0.5.1", - "requizzle": "0.2.2", - "strip-json-comments": "3.0.1", + "@babel/parser": "^7.4.4", + "bluebird": "^3.5.4", + "catharsis": "^0.8.10", + "escape-string-regexp": "^2.0.0", + "js2xmlparser": "^4.0.0", + "klaw": "^3.0.0", + "markdown-it": "^8.4.2", + "markdown-it-anchor": "^5.0.2", + "marked": "^0.6.2", + "mkdirp": "^0.5.1", + "requizzle": "^0.2.2", + "strip-json-comments": "^3.0.1", "taffydb": "2.6.2", - "underscore": "1.9.1" + "underscore": "~1.9.1" }, "dependencies": { "escape-string-regexp": { @@ -5644,7 +5644,7 @@ "integrity": "sha1-sRvsnPJJLwZ1bW6Amrc6KRAlkUY=", "dev": true, "requires": { - "graceful-fs": "4.1.15" + "graceful-fs": "^4.1.9" } }, "lazy-cache": { @@ -5659,7 +5659,7 @@ "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", "dev": true, "requires": { - "invert-kv": "1.0.0" + "invert-kv": "^1.0.0" } }, "less": { @@ -5668,15 +5668,15 @@ "integrity": "sha1-t1EcQ/N89X3Iff/ZiD7BISibFHQ=", "dev": true, "requires": { - "clone": "2.1.2", - "errno": "0.1.7", - "graceful-fs": "4.1.15", - "image-size": "0.5.5", - "mime": "1.6.0", - "mkdirp": "0.5.1", - "promise": "7.3.1", - "request": "2.88.0", - "source-map": "0.6.1" + "clone": "^2.1.2", + "errno": "^0.1.1", + "graceful-fs": "^4.1.2", + "image-size": "~0.5.0", + "mime": "^1.4.1", + "mkdirp": "^0.5.0", + "promise": "^7.1.1", + "request": "^2.83.0", + "source-map": "~0.6.0" }, "dependencies": { "clone": { @@ -5700,9 +5700,9 @@ "integrity": "sha1-LBNSxbCaT4QQFJAnT9UWdN5BNj4=", "dev": true, "requires": { - "clone": "2.1.2", - "loader-utils": "1.2.3", - "pify": "3.0.0" + "clone": "^2.1.1", + "loader-utils": "^1.1.0", + "pify": "^3.0.0" }, "dependencies": { "clone": { @@ -5719,8 +5719,8 @@ "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", "dev": true, "requires": { - "prelude-ls": "1.1.2", - "type-check": "0.3.2" + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2" } }, "linkify-it": { @@ -5729,7 +5729,7 @@ "integrity": "sha1-xMrzimzXrCIS7zx9K94wqRVh+ds=", "dev": true, "requires": { - "uc.micro": "1.0.6" + "uc.micro": "^1.0.1" } }, "load-json-file": { @@ -5738,11 +5738,11 @@ "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", "dev": true, "requires": { - "graceful-fs": "4.1.15", - "parse-json": "2.2.0", - "pify": "2.3.0", - "pinkie-promise": "2.0.1", - "strip-bom": "2.0.0" + "graceful-fs": "^4.1.2", + "parse-json": "^2.2.0", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0", + "strip-bom": "^2.0.0" }, "dependencies": { "pify": { @@ -5765,9 +5765,9 @@ "integrity": "sha1-H/XcaRHJ8KBiUxpMBLYJQGEIwsc=", "dev": true, "requires": { - "big.js": "5.2.2", - "emojis-list": "2.1.0", - "json5": "1.0.1" + "big.js": "^5.2.2", + "emojis-list": "^2.0.0", + "json5": "^1.0.1" }, "dependencies": { "json5": { @@ -5776,7 +5776,7 @@ "integrity": "sha1-d5+wAYYE+oVOrL9iUhgNg1Q+Pb4=", "dev": true, "requires": { - "minimist": "1.2.0" + "minimist": "^1.2.0" } }, "minimist": { @@ -5793,8 +5793,8 @@ "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", "dev": true, "requires": { - "p-locate": "2.0.0", - "path-exists": "3.0.0" + "p-locate": "^2.0.0", + "path-exists": "^3.0.0" } }, "lodash": { @@ -5850,7 +5850,7 @@ "integrity": "sha1-ce5R+nvkyuwaY4OffmgtgTLTDK8=", "dev": true, "requires": { - "js-tokens": "3.0.2" + "js-tokens": "^3.0.0 || ^4.0.0" } }, "loud-rejection": { @@ -5859,8 +5859,8 @@ "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", "dev": true, "requires": { - "currently-unhandled": "0.4.1", - "signal-exit": "3.0.2" + "currently-unhandled": "^0.4.1", + "signal-exit": "^3.0.0" } }, "lower-case": { @@ -5875,7 +5875,7 @@ "integrity": "sha1-5dp8JvKacHO+AtUrrJmA5ZIq36E=", "dev": true, "requires": { - "lower-case": "1.1.4" + "lower-case": "^1.1.2" } }, "lru-cache": { @@ -5884,8 +5884,8 @@ "integrity": "sha1-i75Q6oW+1ZvJ4z3KuCNe6bz0Q80=", "dev": true, "requires": { - "pseudomap": "1.0.2", - "yallist": "2.1.2" + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" } }, "make-dir": { @@ -5894,7 +5894,7 @@ "integrity": "sha1-ecEDO4BRW9bSTsmTPoYMp17ifww=", "dev": true, "requires": { - "pify": "3.0.0" + "pify": "^3.0.0" } }, "map-age-cleaner": { @@ -5903,7 +5903,7 @@ "integrity": "sha1-fVg6cwZDTAVf5HSw9FB45uG0uSo=", "dev": true, "requires": { - "p-defer": "1.0.0" + "p-defer": "^1.0.0" } }, "map-cache": { @@ -5924,7 +5924,7 @@ "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", "dev": true, "requires": { - "object-visit": "1.0.1" + "object-visit": "^1.0.0" } }, "markdown-it": { @@ -5933,11 +5933,11 @@ "integrity": "sha1-OG+YmY3BWjdyKqdyIIT0Agvdm1Q=", "dev": true, "requires": { - "argparse": "1.0.10", - "entities": "1.1.2", - "linkify-it": "2.1.0", - "mdurl": "1.0.1", - "uc.micro": "1.0.6" + "argparse": "^1.0.7", + "entities": "~1.1.1", + "linkify-it": "^2.0.0", + "mdurl": "^1.0.1", + "uc.micro": "^1.0.5" } }, "markdown-it-anchor": { @@ -5964,9 +5964,9 @@ "integrity": "sha1-U6s41f48iJG6RlMp6iP6wFQBJvk=", "dev": true, "requires": { - "charenc": "0.0.2", - "crypt": "0.0.2", - "is-buffer": "1.1.6" + "charenc": "~0.0.1", + "crypt": "~0.0.1", + "is-buffer": "~1.1.1" } }, "md5.js": { @@ -5975,9 +5975,9 @@ "integrity": "sha1-tdB7jjIW4+J81yjXL3DR5qNCAF8=", "dev": true, "requires": { - "hash-base": "3.0.4", - "inherits": "2.0.3", - "safe-buffer": "5.1.2" + "hash-base": "^3.0.0", + "inherits": "^2.0.1", + "safe-buffer": "^5.1.2" } }, "mdurl": { @@ -5998,7 +5998,7 @@ "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", "dev": true, "requires": { - "mimic-fn": "1.2.0" + "mimic-fn": "^1.0.0" } }, "memory-fs": { @@ -6007,8 +6007,8 @@ "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=", "dev": true, "requires": { - "errno": "0.1.7", - "readable-stream": "2.3.6" + "errno": "^0.1.3", + "readable-stream": "^2.0.1" } }, "meow": { @@ -6017,16 +6017,16 @@ "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", "dev": true, "requires": { - "camelcase-keys": "2.1.0", - "decamelize": "1.2.0", - "loud-rejection": "1.6.0", - "map-obj": "1.0.1", - "minimist": "1.2.0", - "normalize-package-data": "2.5.0", - "object-assign": "4.1.1", - "read-pkg-up": "1.0.1", - "redent": "1.0.0", - "trim-newlines": "1.0.0" + "camelcase-keys": "^2.0.0", + "decamelize": "^1.1.2", + "loud-rejection": "^1.0.0", + "map-obj": "^1.0.1", + "minimist": "^1.1.3", + "normalize-package-data": "^2.3.4", + "object-assign": "^4.0.1", + "read-pkg-up": "^1.0.1", + "redent": "^1.0.0", + "trim-newlines": "^1.0.0" }, "dependencies": { "minimist": { @@ -6061,19 +6061,19 @@ "integrity": "sha1-cIWbyVyYQJUvNZoGij/En57PrCM=", "dev": true, "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "braces": "2.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "extglob": "2.0.4", - "fragment-cache": "0.2.1", - "kind-of": "6.0.2", - "nanomatch": "1.2.13", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "braces": "^2.3.1", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "extglob": "^2.0.4", + "fragment-cache": "^0.2.1", + "kind-of": "^6.0.2", + "nanomatch": "^1.2.9", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.2" } }, "miller-rabin": { @@ -6082,8 +6082,8 @@ "integrity": "sha1-8IA1HIZbDcViqEYpZtqlNUPHik0=", "dev": true, "requires": { - "bn.js": "4.11.8", - "brorand": "1.1.0" + "bn.js": "^4.0.0", + "brorand": "^1.0.1" } }, "mime": { @@ -6131,7 +6131,7 @@ "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=", "dev": true, "requires": { - "brace-expansion": "1.1.11" + "brace-expansion": "^1.1.7" } }, "minimist": { @@ -6146,16 +6146,16 @@ "integrity": "sha1-NEKlCPr8KFAEhv7qmUCWduTuWm8=", "dev": true, "requires": { - "concat-stream": "1.6.2", - "duplexify": "3.7.1", - "end-of-stream": "1.4.1", - "flush-write-stream": "1.1.1", - "from2": "2.3.0", - "parallel-transform": "1.1.0", - "pump": "2.0.1", - "pumpify": "1.5.1", - "stream-each": "1.2.3", - "through2": "2.0.5" + "concat-stream": "^1.5.0", + "duplexify": "^3.4.2", + "end-of-stream": "^1.1.0", + "flush-write-stream": "^1.0.0", + "from2": "^2.1.0", + "parallel-transform": "^1.1.0", + "pump": "^2.0.1", + "pumpify": "^1.3.3", + "stream-each": "^1.1.0", + "through2": "^2.0.0" } }, "mixin-deep": { @@ -6164,8 +6164,8 @@ "integrity": "sha1-pJ5yaNzhoNlpjkUybFYm3zVD0P4=", "dev": true, "requires": { - "for-in": "1.0.2", - "is-extendable": "1.0.1" + "for-in": "^1.0.2", + "is-extendable": "^1.0.1" }, "dependencies": { "is-extendable": { @@ -6174,7 +6174,7 @@ "integrity": "sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ=", "dev": true, "requires": { - "is-plain-object": "2.0.4" + "is-plain-object": "^2.0.4" } } } @@ -6185,8 +6185,8 @@ "integrity": "sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=", "dev": true, "requires": { - "for-in": "0.1.8", - "is-extendable": "0.1.1" + "for-in": "^0.1.3", + "is-extendable": "^0.1.1" }, "dependencies": { "for-in": { @@ -6212,12 +6212,12 @@ "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=", "dev": true, "requires": { - "aproba": "1.2.0", - "copy-concurrently": "1.0.5", - "fs-write-stream-atomic": "1.0.10", - "mkdirp": "0.5.1", - "rimraf": "2.6.3", - "run-queue": "1.0.3" + "aproba": "^1.1.1", + "copy-concurrently": "^1.0.0", + "fs-write-stream-atomic": "^1.0.8", + "mkdirp": "^0.5.1", + "rimraf": "^2.5.4", + "run-queue": "^1.0.3" } }, "ms": { @@ -6232,7 +6232,7 @@ "integrity": "sha1-sJ/IWG6qF/gdV1xK0C4Pej9rEQU=", "dev": true, "requires": { - "source-map": "0.1.43" + "source-map": "^0.1.34" }, "dependencies": { "source-map": { @@ -6241,7 +6241,7 @@ "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", "dev": true, "requires": { - "amdefine": "1.0.1" + "amdefine": ">=0.0.4" } } } @@ -6252,8 +6252,8 @@ "integrity": "sha1-oOx72QVcQoL3kMPIL04o2zsxsik=", "dev": true, "requires": { - "dns-packet": "1.3.1", - "thunky": "1.0.3" + "dns-packet": "^1.3.1", + "thunky": "^1.0.2" } }, "multicast-dns-service-types": { @@ -6268,10 +6268,10 @@ "integrity": "sha1-nHkGoi+0wCkZ4vX3UWG0zb1LKis=", "dev": true, "requires": { - "array-differ": "1.0.0", - "array-union": "1.0.2", - "arrify": "1.0.1", - "minimatch": "3.0.4" + "array-differ": "^1.0.0", + "array-union": "^1.0.1", + "arrify": "^1.0.0", + "minimatch": "^3.0.0" } }, "mute-stream": { @@ -6292,17 +6292,17 @@ "integrity": "sha1-uHqKpPwN6P5r6IiVs4mD/yZb0Rk=", "dev": true, "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "fragment-cache": "0.2.1", - "is-windows": "1.0.2", - "kind-of": "6.0.2", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "fragment-cache": "^0.2.1", + "is-windows": "^1.0.2", + "kind-of": "^6.0.2", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" } }, "ncname": { @@ -6311,7 +6311,7 @@ "integrity": "sha1-W1etGLHKCShk72Kwse2BlPODtxw=", "dev": true, "requires": { - "xml-char-classes": "1.0.0" + "xml-char-classes": "^1.0.0" } }, "ncp": { @@ -6350,7 +6350,7 @@ "integrity": "sha1-YLgTOWvjmz8SiKTB7V0efSi0ZKw=", "dev": true, "requires": { - "lower-case": "1.1.4" + "lower-case": "^1.1.1" } }, "node-fetch": { @@ -6359,8 +6359,8 @@ "integrity": "sha1-3CNO3WSJmC1Y6PDbT2lQKavNjAQ=", "dev": true, "requires": { - "encoding": "0.1.12", - "is-stream": "1.1.0" + "encoding": "^0.1.11", + "is-stream": "^1.0.1" } }, "node-forge": { @@ -6375,18 +6375,18 @@ "integrity": "sha1-VAMEJhwzDoDQ1e3OJTpoyzlkIYw=", "dev": true, "requires": { - "fstream": "1.0.12", - "glob": "7.1.4", - "graceful-fs": "4.1.15", - "mkdirp": "0.5.1", - "nopt": "3.0.6", - "npmlog": "4.1.2", - "osenv": "0.1.5", - "request": "2.88.0", - "rimraf": "2.6.3", - "semver": "5.3.0", - "tar": "2.2.2", - "which": "1.3.1" + "fstream": "^1.0.0", + "glob": "^7.0.3", + "graceful-fs": "^4.1.2", + "mkdirp": "^0.5.0", + "nopt": "2 || 3", + "npmlog": "0 || 1 || 2 || 3 || 4", + "osenv": "0", + "request": "^2.87.0", + "rimraf": "2", + "semver": "~5.3.0", + "tar": "^2.0.0", + "which": "1" }, "dependencies": { "semver": { @@ -6403,28 +6403,28 @@ "integrity": "sha1-xy9g2dRt4IqUDe27JfP/ovm7qnc=", "dev": true, "requires": { - "assert": "1.5.0", - "browserify-zlib": "0.2.0", - "buffer": "4.9.1", - "console-browserify": "1.1.0", - "constants-browserify": "1.0.0", - "crypto-browserify": "3.12.0", - "domain-browser": "1.2.0", - "events": "3.0.0", - "https-browserify": "1.0.0", - "os-browserify": "0.3.0", + "assert": "^1.1.1", + "browserify-zlib": "^0.2.0", + "buffer": "^4.3.0", + "console-browserify": "^1.1.0", + "constants-browserify": "^1.0.0", + "crypto-browserify": "^3.11.0", + "domain-browser": "^1.1.1", + "events": "^3.0.0", + "https-browserify": "^1.0.0", + "os-browserify": "^0.3.0", "path-browserify": "0.0.0", - "process": "0.11.10", - "punycode": "1.4.1", - "querystring-es3": "0.2.1", - "readable-stream": "2.3.6", - "stream-browserify": "2.0.2", - "stream-http": "2.8.3", - "string_decoder": "1.1.1", - "timers-browserify": "2.0.10", + "process": "^0.11.10", + "punycode": "^1.2.4", + "querystring-es3": "^0.2.0", + "readable-stream": "^2.3.3", + "stream-browserify": "^2.0.1", + "stream-http": "^2.7.2", + "string_decoder": "^1.0.0", + "timers-browserify": "^2.0.4", "tty-browserify": "0.0.0", - "url": "0.11.0", - "util": "0.11.1", + "url": "^0.11.0", + "util": "^0.11.0", "vm-browserify": "0.0.4" }, "dependencies": { @@ -6448,23 +6448,23 @@ "integrity": "sha1-CRT1MZMjgBFKMMxfpPpjIzol8Bc=", "dev": true, "requires": { - "async-foreach": "0.1.3", - "chalk": "1.1.3", - "cross-spawn": "3.0.1", - "gaze": "1.1.3", - "get-stdin": "4.0.1", - "glob": "7.1.4", - "in-publish": "2.0.0", - "lodash": "4.17.11", - "meow": "3.7.0", - "mkdirp": "0.5.1", - "nan": "2.14.0", - "node-gyp": "3.8.0", - "npmlog": "4.1.2", - "request": "2.88.0", - "sass-graph": "2.2.4", - "stdout-stream": "1.4.1", - "true-case-path": "1.0.3" + "async-foreach": "^0.1.3", + "chalk": "^1.1.1", + "cross-spawn": "^3.0.0", + "gaze": "^1.0.0", + "get-stdin": "^4.0.1", + "glob": "^7.0.3", + "in-publish": "^2.0.0", + "lodash": "^4.17.11", + "meow": "^3.7.0", + "mkdirp": "^0.5.1", + "nan": "^2.13.2", + "node-gyp": "^3.8.0", + "npmlog": "^4.0.0", + "request": "^2.88.0", + "sass-graph": "^2.2.4", + "stdout-stream": "^1.4.0", + "true-case-path": "^1.0.2" }, "dependencies": { "cross-spawn": { @@ -6473,8 +6473,8 @@ "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=", "dev": true, "requires": { - "lru-cache": "4.1.5", - "which": "1.3.1" + "lru-cache": "^4.0.1", + "which": "^1.2.9" } } } @@ -6485,7 +6485,7 @@ "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", "dev": true, "requires": { - "abbrev": "1.1.1" + "abbrev": "1" } }, "normalize-package-data": { @@ -6494,10 +6494,10 @@ "integrity": "sha1-5m2xg4sgDB38IzIl0SyzZSDiNKg=", "dev": true, "requires": { - "hosted-git-info": "2.7.1", - "resolve": "1.11.0", - "semver": "5.7.0", - "validate-npm-package-license": "3.0.4" + "hosted-git-info": "^2.1.4", + "resolve": "^1.10.0", + "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" } }, "normalize-path": { @@ -6518,10 +6518,10 @@ "integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=", "dev": true, "requires": { - "object-assign": "4.1.1", - "prepend-http": "1.0.4", - "query-string": "4.3.4", - "sort-keys": "1.1.2" + "object-assign": "^4.0.1", + "prepend-http": "^1.0.0", + "query-string": "^4.1.0", + "sort-keys": "^1.0.0" } }, "npm-run-path": { @@ -6530,7 +6530,7 @@ "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", "dev": true, "requires": { - "path-key": "2.0.1" + "path-key": "^2.0.0" } }, "npmlog": { @@ -6539,10 +6539,10 @@ "integrity": "sha1-CKfyqL9zRgR3mp76StXMcXq7lUs=", "dev": true, "requires": { - "are-we-there-yet": "1.1.5", - "console-control-strings": "1.1.0", - "gauge": "2.7.4", - "set-blocking": "2.0.0" + "are-we-there-yet": "~1.1.2", + "console-control-strings": "~1.1.0", + "gauge": "~2.7.3", + "set-blocking": "~2.0.0" } }, "nth-check": { @@ -6551,7 +6551,7 @@ "integrity": "sha1-sr0pXDfj3VijvwcAN2Zjuk2c8Fw=", "dev": true, "requires": { - "boolbase": "1.0.0" + "boolbase": "~1.0.0" } }, "num2fraction": { @@ -6584,9 +6584,9 @@ "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=", "dev": true, "requires": { - "copy-descriptor": "0.1.1", - "define-property": "0.2.5", - "kind-of": "3.2.2" + "copy-descriptor": "^0.1.0", + "define-property": "^0.2.5", + "kind-of": "^3.0.3" }, "dependencies": { "define-property": { @@ -6595,7 +6595,7 @@ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } }, "kind-of": { @@ -6604,7 +6604,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -6621,7 +6621,7 @@ "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=", "dev": true, "requires": { - "isobject": "3.0.1" + "isobject": "^3.0.0" } }, "object.pick": { @@ -6630,7 +6630,7 @@ "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", "dev": true, "requires": { - "isobject": "3.0.1" + "isobject": "^3.0.1" } }, "obuf": { @@ -6660,7 +6660,7 @@ "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, "requires": { - "wrappy": "1.0.2" + "wrappy": "1" } }, "onetime": { @@ -6669,7 +6669,7 @@ "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", "dev": true, "requires": { - "mimic-fn": "1.2.0" + "mimic-fn": "^1.0.0" } }, "open": { @@ -6713,8 +6713,8 @@ "integrity": "sha1-erwi5kTf9jsKltWrfyeQwPAavJU=", "dev": true, "requires": { - "object-assign": "4.1.1", - "pinkie-promise": "2.0.1" + "object-assign": "^4.0.1", + "pinkie-promise": "^2.0.0" } } } @@ -6725,7 +6725,7 @@ "integrity": "sha1-/HFk+rVtI1kExRw7J9pnWMo7m/w=", "dev": true, "requires": { - "is-wsl": "1.1.0" + "is-wsl": "^1.1.0" } }, "optionator": { @@ -6734,12 +6734,12 @@ "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", "dev": true, "requires": { - "deep-is": "0.1.3", - "fast-levenshtein": "2.0.6", - "levn": "0.3.0", - "prelude-ls": "1.1.2", - "type-check": "0.3.2", - "wordwrap": "1.0.0" + "deep-is": "~0.1.3", + "fast-levenshtein": "~2.0.4", + "levn": "~0.3.0", + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2", + "wordwrap": "~1.0.0" }, "dependencies": { "wordwrap": { @@ -6756,7 +6756,7 @@ "integrity": "sha1-5EKmHP/hxf0gpl8yYcJmY7MD8l8=", "dev": true, "requires": { - "url-parse": "1.4.7" + "url-parse": "^1.4.3" } }, "os-browserify": { @@ -6777,7 +6777,7 @@ "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", "dev": true, "requires": { - "lcid": "1.0.0" + "lcid": "^1.0.0" } }, "os-tmpdir": { @@ -6792,8 +6792,8 @@ "integrity": "sha1-hc36+uso6Gd/QW4odZK18/SepBA=", "dev": true, "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" + "os-homedir": "^1.0.0", + "os-tmpdir": "^1.0.0" } }, "p-defer": { @@ -6820,7 +6820,7 @@ "integrity": "sha1-uGvV8MJWkJEcdZD8v8IBDVSzzLg=", "dev": true, "requires": { - "p-try": "1.0.0" + "p-try": "^1.0.0" } }, "p-locate": { @@ -6829,7 +6829,7 @@ "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", "dev": true, "requires": { - "p-limit": "1.3.0" + "p-limit": "^1.1.0" } }, "p-map": { @@ -6855,9 +6855,9 @@ "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=", "dev": true, "requires": { - "cyclist": "0.2.2", - "inherits": "2.0.3", - "readable-stream": "2.3.6" + "cyclist": "~0.2.2", + "inherits": "^2.0.3", + "readable-stream": "^2.1.5" } }, "param-case": { @@ -6866,7 +6866,7 @@ "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=", "dev": true, "requires": { - "no-case": "2.3.2" + "no-case": "^2.2.0" } }, "parse-asn1": { @@ -6875,12 +6875,12 @@ "integrity": "sha1-N/Zij4I/vesic7TVQENKIvPvH8w=", "dev": true, "requires": { - "asn1.js": "4.10.1", - "browserify-aes": "1.2.0", - "create-hash": "1.2.0", - "evp_bytestokey": "1.0.3", - "pbkdf2": "3.0.17", - "safe-buffer": "5.1.2" + "asn1.js": "^4.0.0", + "browserify-aes": "^1.0.0", + "create-hash": "^1.1.0", + "evp_bytestokey": "^1.0.0", + "pbkdf2": "^3.0.3", + "safe-buffer": "^5.1.1" } }, "parse-json": { @@ -6889,7 +6889,7 @@ "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", "dev": true, "requires": { - "error-ex": "1.3.2" + "error-ex": "^1.2.0" } }, "parse-passwd": { @@ -6910,8 +6910,8 @@ "integrity": "sha1-LVeNNFX2YNpl7KGO+VtODekSdh4=", "dev": true, "requires": { - "camel-case": "3.0.0", - "upper-case-first": "1.1.2" + "camel-case": "^3.0.0", + "upper-case-first": "^1.1.0" } }, "pascalcase": { @@ -6932,7 +6932,7 @@ "integrity": "sha1-lLgDfDctP+KQbkZbtF4l0ibo7qU=", "dev": true, "requires": { - "no-case": "2.3.2" + "no-case": "^2.2.0" } }, "path-dirname": { @@ -6989,11 +6989,11 @@ "integrity": "sha1-l2wgZTBhexTrsyEUI597CTNuk6Y=", "dev": true, "requires": { - "create-hash": "1.2.0", - "create-hmac": "1.1.7", - "ripemd160": "2.0.2", - "safe-buffer": "5.1.2", - "sha.js": "2.4.11" + "create-hash": "^1.1.2", + "create-hmac": "^1.1.4", + "ripemd160": "^2.0.1", + "safe-buffer": "^5.0.1", + "sha.js": "^2.4.8" } }, "performance-now": { @@ -7026,7 +7026,7 @@ "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", "dev": true, "requires": { - "pinkie": "2.0.4" + "pinkie": "^2.0.0" } }, "pkg-dir": { @@ -7035,7 +7035,7 @@ "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", "dev": true, "requires": { - "find-up": "2.1.0" + "find-up": "^2.1.0" } }, "popper.js": { @@ -7049,9 +7049,9 @@ "integrity": "sha1-vqaGMuVLLhOrewxHdem0G/Jw5Eo=", "dev": true, "requires": { - "async": "1.5.2", - "debug": "2.6.9", - "mkdirp": "0.5.1" + "async": "^1.5.2", + "debug": "^2.2.0", + "mkdirp": "0.5.x" }, "dependencies": { "async": { @@ -7074,10 +7074,10 @@ "integrity": "sha1-ut+hSX1GJE9jkPWLMZgw2RB4U8U=", "dev": true, "requires": { - "chalk": "1.1.3", - "js-base64": "2.5.1", - "source-map": "0.5.7", - "supports-color": "3.2.3" + "chalk": "^1.1.3", + "js-base64": "^2.1.9", + "source-map": "^0.5.6", + "supports-color": "^3.2.3" }, "dependencies": { "supports-color": { @@ -7086,7 +7086,7 @@ "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { - "has-flag": "1.0.0" + "has-flag": "^1.0.0" } } } @@ -7097,9 +7097,9 @@ "integrity": "sha1-d7rnypKK2FcW4v2kLyYb98HWW14=", "dev": true, "requires": { - "postcss": "5.2.18", - "postcss-message-helpers": "2.0.0", - "reduce-css-calc": "1.3.0" + "postcss": "^5.0.2", + "postcss-message-helpers": "^2.0.0", + "reduce-css-calc": "^1.2.6" } }, "postcss-colormin": { @@ -7108,9 +7108,9 @@ "integrity": "sha1-ZjFBfV8OkJo9fsJrJMio0eT5bks=", "dev": true, "requires": { - "colormin": "1.1.2", - "postcss": "5.2.18", - "postcss-value-parser": "3.3.1" + "colormin": "^1.0.5", + "postcss": "^5.0.13", + "postcss-value-parser": "^3.2.3" } }, "postcss-convert-values": { @@ -7119,8 +7119,8 @@ "integrity": "sha1-u9hZPFwf0uPRwyK7kl3K6Nrk1i0=", "dev": true, "requires": { - "postcss": "5.2.18", - "postcss-value-parser": "3.3.1" + "postcss": "^5.0.11", + "postcss-value-parser": "^3.1.2" } }, "postcss-discard-comments": { @@ -7129,7 +7129,7 @@ "integrity": "sha1-vv6J+v1bPazlzM5Rt2uBUUvgDj0=", "dev": true, "requires": { - "postcss": "5.2.18" + "postcss": "^5.0.14" } }, "postcss-discard-duplicates": { @@ -7138,7 +7138,7 @@ "integrity": "sha1-uavye4isGIFYpesSq8riAmO5GTI=", "dev": true, "requires": { - "postcss": "5.2.18" + "postcss": "^5.0.4" } }, "postcss-discard-empty": { @@ -7147,7 +7147,7 @@ "integrity": "sha1-0rS9nVztXr2Nyt52QMfXzX9PkrU=", "dev": true, "requires": { - "postcss": "5.2.18" + "postcss": "^5.0.14" } }, "postcss-discard-overridden": { @@ -7156,7 +7156,7 @@ "integrity": "sha1-ix6vVU9ob7KIzYdMVWZ7CqNmjVg=", "dev": true, "requires": { - "postcss": "5.2.18" + "postcss": "^5.0.16" } }, "postcss-discard-unused": { @@ -7165,8 +7165,8 @@ "integrity": "sha1-vOMLLMWR/8Y0Mitfs0ZLbZNPRDM=", "dev": true, "requires": { - "postcss": "5.2.18", - "uniqs": "2.0.0" + "postcss": "^5.0.14", + "uniqs": "^2.0.0" } }, "postcss-filter-plugins": { @@ -7175,7 +7175,7 @@ "integrity": "sha1-giRf34IzcEFkXkdxFNjlk6oYuOw=", "dev": true, "requires": { - "postcss": "5.2.18" + "postcss": "^5.0.4" } }, "postcss-load-config": { @@ -7184,10 +7184,10 @@ "integrity": "sha1-U56a/J3chiASHr+djDZz4M5Q0oo=", "dev": true, "requires": { - "cosmiconfig": "2.2.2", - "object-assign": "4.1.1", - "postcss-load-options": "1.2.0", - "postcss-load-plugins": "2.3.0" + "cosmiconfig": "^2.1.0", + "object-assign": "^4.1.0", + "postcss-load-options": "^1.2.0", + "postcss-load-plugins": "^2.3.0" } }, "postcss-load-options": { @@ -7196,8 +7196,8 @@ "integrity": "sha1-sJixVZ3awt8EvAuzdfmaXP4rbYw=", "dev": true, "requires": { - "cosmiconfig": "2.2.2", - "object-assign": "4.1.1" + "cosmiconfig": "^2.1.0", + "object-assign": "^4.1.0" } }, "postcss-load-plugins": { @@ -7206,8 +7206,8 @@ "integrity": "sha1-dFdoEWWZrKLwCfrUJrABdQSdjZI=", "dev": true, "requires": { - "cosmiconfig": "2.2.2", - "object-assign": "4.1.1" + "cosmiconfig": "^2.1.1", + "object-assign": "^4.1.0" } }, "postcss-merge-idents": { @@ -7216,9 +7216,9 @@ "integrity": "sha1-TFUwMTwI4dWzu/PSu8dH4njuonA=", "dev": true, "requires": { - "has": "1.0.3", - "postcss": "5.2.18", - "postcss-value-parser": "3.3.1" + "has": "^1.0.1", + "postcss": "^5.0.10", + "postcss-value-parser": "^3.1.1" } }, "postcss-merge-longhand": { @@ -7227,7 +7227,7 @@ "integrity": "sha1-I9kM0Sewp3mUkVMyc5A0oaTz1lg=", "dev": true, "requires": { - "postcss": "5.2.18" + "postcss": "^5.0.4" } }, "postcss-merge-rules": { @@ -7236,11 +7236,11 @@ "integrity": "sha1-0d9d+qexrMO+VT8OnhDofGG19yE=", "dev": true, "requires": { - "browserslist": "1.7.7", - "caniuse-api": "1.6.1", - "postcss": "5.2.18", - "postcss-selector-parser": "2.2.3", - "vendors": "1.0.3" + "browserslist": "^1.5.2", + "caniuse-api": "^1.5.2", + "postcss": "^5.0.4", + "postcss-selector-parser": "^2.2.2", + "vendors": "^1.0.0" } }, "postcss-message-helpers": { @@ -7255,9 +7255,9 @@ "integrity": "sha1-S1jttWZB66fIR0qzUmyv17vey2k=", "dev": true, "requires": { - "object-assign": "4.1.1", - "postcss": "5.2.18", - "postcss-value-parser": "3.3.1" + "object-assign": "^4.0.1", + "postcss": "^5.0.4", + "postcss-value-parser": "^3.0.2" } }, "postcss-minify-gradients": { @@ -7266,8 +7266,8 @@ "integrity": "sha1-Xb2hE3NwP4PPtKPqOIHY11/15uE=", "dev": true, "requires": { - "postcss": "5.2.18", - "postcss-value-parser": "3.3.1" + "postcss": "^5.0.12", + "postcss-value-parser": "^3.3.0" } }, "postcss-minify-params": { @@ -7276,10 +7276,10 @@ "integrity": "sha1-rSzgcTc7lDs9kwo/pZo1jCjW8fM=", "dev": true, "requires": { - "alphanum-sort": "1.0.2", - "postcss": "5.2.18", - "postcss-value-parser": "3.3.1", - "uniqs": "2.0.0" + "alphanum-sort": "^1.0.1", + "postcss": "^5.0.2", + "postcss-value-parser": "^3.0.2", + "uniqs": "^2.0.0" } }, "postcss-minify-selectors": { @@ -7288,10 +7288,10 @@ "integrity": "sha1-ssapjAByz5G5MtGkllCBFDEXNb8=", "dev": true, "requires": { - "alphanum-sort": "1.0.2", - "has": "1.0.3", - "postcss": "5.2.18", - "postcss-selector-parser": "2.2.3" + "alphanum-sort": "^1.0.2", + "has": "^1.0.1", + "postcss": "^5.0.14", + "postcss-selector-parser": "^2.0.0" } }, "postcss-modules-extract-imports": { @@ -7300,7 +7300,7 @@ "integrity": "sha1-3IfjQUjsfqtfeR981YSYMzdbdBo=", "dev": true, "requires": { - "postcss": "6.0.23" + "postcss": "^6.0.1" }, "dependencies": { "ansi-styles": { @@ -7309,7 +7309,7 @@ "integrity": "sha1-QfuyAkPlCxK+DwS43tvwdSDOhB0=", "dev": true, "requires": { - "color-convert": "1.9.3" + "color-convert": "^1.9.0" } }, "chalk": { @@ -7318,9 +7318,9 @@ "integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.5.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } }, "has-flag": { @@ -7335,9 +7335,9 @@ "integrity": "sha1-YcgswyisYOZ3ZF+XkFTrmLwOMyQ=", "dev": true, "requires": { - "chalk": "2.4.2", - "source-map": "0.6.1", - "supports-color": "5.5.0" + "chalk": "^2.4.1", + "source-map": "^0.6.1", + "supports-color": "^5.4.0" } }, "source-map": { @@ -7352,7 +7352,7 @@ "integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=", "dev": true, "requires": { - "has-flag": "3.0.0" + "has-flag": "^3.0.0" } } } @@ -7363,8 +7363,8 @@ "integrity": "sha1-99gMOYxaOT+nlkRmvRlQCn1hwGk=", "dev": true, "requires": { - "css-selector-tokenizer": "0.7.1", - "postcss": "6.0.23" + "css-selector-tokenizer": "^0.7.0", + "postcss": "^6.0.1" }, "dependencies": { "ansi-styles": { @@ -7373,7 +7373,7 @@ "integrity": "sha1-QfuyAkPlCxK+DwS43tvwdSDOhB0=", "dev": true, "requires": { - "color-convert": "1.9.3" + "color-convert": "^1.9.0" } }, "chalk": { @@ -7382,9 +7382,9 @@ "integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.5.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } }, "has-flag": { @@ -7399,9 +7399,9 @@ "integrity": "sha1-YcgswyisYOZ3ZF+XkFTrmLwOMyQ=", "dev": true, "requires": { - "chalk": "2.4.2", - "source-map": "0.6.1", - "supports-color": "5.5.0" + "chalk": "^2.4.1", + "source-map": "^0.6.1", + "supports-color": "^5.4.0" } }, "source-map": { @@ -7416,7 +7416,7 @@ "integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=", "dev": true, "requires": { - "has-flag": "3.0.0" + "has-flag": "^3.0.0" } } } @@ -7427,8 +7427,8 @@ "integrity": "sha1-1upkmUx5+XtipytCb75gVqGUu5A=", "dev": true, "requires": { - "css-selector-tokenizer": "0.7.1", - "postcss": "6.0.23" + "css-selector-tokenizer": "^0.7.0", + "postcss": "^6.0.1" }, "dependencies": { "ansi-styles": { @@ -7437,7 +7437,7 @@ "integrity": "sha1-QfuyAkPlCxK+DwS43tvwdSDOhB0=", "dev": true, "requires": { - "color-convert": "1.9.3" + "color-convert": "^1.9.0" } }, "chalk": { @@ -7446,9 +7446,9 @@ "integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.5.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } }, "has-flag": { @@ -7463,9 +7463,9 @@ "integrity": "sha1-YcgswyisYOZ3ZF+XkFTrmLwOMyQ=", "dev": true, "requires": { - "chalk": "2.4.2", - "source-map": "0.6.1", - "supports-color": "5.5.0" + "chalk": "^2.4.1", + "source-map": "^0.6.1", + "supports-color": "^5.4.0" } }, "source-map": { @@ -7480,7 +7480,7 @@ "integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=", "dev": true, "requires": { - "has-flag": "3.0.0" + "has-flag": "^3.0.0" } } } @@ -7491,8 +7491,8 @@ "integrity": "sha1-7P+p1+GSUYOJ9CrQ6D9yrsRW6iA=", "dev": true, "requires": { - "icss-replace-symbols": "1.1.0", - "postcss": "6.0.23" + "icss-replace-symbols": "^1.1.0", + "postcss": "^6.0.1" }, "dependencies": { "ansi-styles": { @@ -7501,7 +7501,7 @@ "integrity": "sha1-QfuyAkPlCxK+DwS43tvwdSDOhB0=", "dev": true, "requires": { - "color-convert": "1.9.3" + "color-convert": "^1.9.0" } }, "chalk": { @@ -7510,9 +7510,9 @@ "integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.5.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } }, "has-flag": { @@ -7527,9 +7527,9 @@ "integrity": "sha1-YcgswyisYOZ3ZF+XkFTrmLwOMyQ=", "dev": true, "requires": { - "chalk": "2.4.2", - "source-map": "0.6.1", - "supports-color": "5.5.0" + "chalk": "^2.4.1", + "source-map": "^0.6.1", + "supports-color": "^5.4.0" } }, "source-map": { @@ -7544,7 +7544,7 @@ "integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=", "dev": true, "requires": { - "has-flag": "3.0.0" + "has-flag": "^3.0.0" } } } @@ -7555,7 +7555,7 @@ "integrity": "sha1-757nEhLX/nWceO0WL2HtYrXLk/E=", "dev": true, "requires": { - "postcss": "5.2.18" + "postcss": "^5.0.5" } }, "postcss-normalize-url": { @@ -7564,10 +7564,10 @@ "integrity": "sha1-EI90s/L82viRov+j6kWSJ5/HgiI=", "dev": true, "requires": { - "is-absolute-url": "2.1.0", - "normalize-url": "1.9.1", - "postcss": "5.2.18", - "postcss-value-parser": "3.3.1" + "is-absolute-url": "^2.0.0", + "normalize-url": "^1.4.0", + "postcss": "^5.0.14", + "postcss-value-parser": "^3.2.3" } }, "postcss-ordered-values": { @@ -7576,8 +7576,8 @@ "integrity": "sha1-7sbCpntsQSqNsgQud/6NpD+VwR0=", "dev": true, "requires": { - "postcss": "5.2.18", - "postcss-value-parser": "3.3.1" + "postcss": "^5.0.4", + "postcss-value-parser": "^3.0.1" } }, "postcss-reduce-idents": { @@ -7586,8 +7586,8 @@ "integrity": "sha1-wsbSDMlYKE9qv75j92Cb9AkFmtM=", "dev": true, "requires": { - "postcss": "5.2.18", - "postcss-value-parser": "3.3.1" + "postcss": "^5.0.4", + "postcss-value-parser": "^3.0.2" } }, "postcss-reduce-initial": { @@ -7596,7 +7596,7 @@ "integrity": "sha1-aPgGlfBF0IJjqHmtJA343WT2ROo=", "dev": true, "requires": { - "postcss": "5.2.18" + "postcss": "^5.0.4" } }, "postcss-reduce-transforms": { @@ -7605,9 +7605,9 @@ "integrity": "sha1-/3b02CEkN7McKYpC0uFEQCV3GuE=", "dev": true, "requires": { - "has": "1.0.3", - "postcss": "5.2.18", - "postcss-value-parser": "3.3.1" + "has": "^1.0.1", + "postcss": "^5.0.8", + "postcss-value-parser": "^3.0.1" } }, "postcss-selector-parser": { @@ -7616,9 +7616,9 @@ "integrity": "sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A=", "dev": true, "requires": { - "flatten": "1.0.2", - "indexes-of": "1.0.1", - "uniq": "1.0.1" + "flatten": "^1.0.2", + "indexes-of": "^1.0.1", + "uniq": "^1.0.1" } }, "postcss-svgo": { @@ -7627,10 +7627,10 @@ "integrity": "sha1-tt8YqmE7Zm4TPwittSGcJoSsEI0=", "dev": true, "requires": { - "is-svg": "2.1.0", - "postcss": "5.2.18", - "postcss-value-parser": "3.3.1", - "svgo": "0.7.2" + "is-svg": "^2.0.0", + "postcss": "^5.0.14", + "postcss-value-parser": "^3.2.3", + "svgo": "^0.7.0" } }, "postcss-unique-selectors": { @@ -7639,9 +7639,9 @@ "integrity": "sha1-mB1X0p3csz57Hf4f1DuGSfkzyh0=", "dev": true, "requires": { - "alphanum-sort": "1.0.2", - "postcss": "5.2.18", - "uniqs": "2.0.0" + "alphanum-sort": "^1.0.1", + "postcss": "^5.0.4", + "uniqs": "^2.0.0" } }, "postcss-value-parser": { @@ -7656,9 +7656,9 @@ "integrity": "sha1-0hCd3AVbka9n/EyzsCWUZjnSryI=", "dev": true, "requires": { - "has": "1.0.3", - "postcss": "5.2.18", - "uniqs": "2.0.0" + "has": "^1.0.1", + "postcss": "^5.0.4", + "uniqs": "^2.0.0" } }, "prelude-ls": { @@ -7685,8 +7685,8 @@ "integrity": "sha1-X0+HyPkeWuPzuoerTPXgOxoX8aM=", "dev": true, "requires": { - "renderkid": "2.0.3", - "utila": "0.4.0" + "renderkid": "^2.0.1", + "utila": "~0.4" } }, "private": { @@ -7714,7 +7714,7 @@ "dev": true, "optional": true, "requires": { - "asap": "2.0.6" + "asap": "~2.0.3" } }, "promise-inflight": { @@ -7729,7 +7729,7 @@ "integrity": "sha1-NMvWSi2B9LH9IedvnwbIpFKZ7jQ=", "dev": true, "requires": { - "forwarded": "0.1.2", + "forwarded": "~0.1.2", "ipaddr.js": "1.9.0" } }, @@ -7757,12 +7757,12 @@ "integrity": "sha1-T8ydd6B+SLp1J+fL4N4z0HATMeA=", "dev": true, "requires": { - "bn.js": "4.11.8", - "browserify-rsa": "4.0.1", - "create-hash": "1.2.0", - "parse-asn1": "5.1.4", - "randombytes": "2.1.0", - "safe-buffer": "5.1.2" + "bn.js": "^4.1.0", + "browserify-rsa": "^4.0.0", + "create-hash": "^1.1.0", + "parse-asn1": "^5.0.0", + "randombytes": "^2.0.1", + "safe-buffer": "^5.1.2" } }, "pump": { @@ -7771,8 +7771,8 @@ "integrity": "sha1-Ejma3W5M91Jtlzy8i1zi4pCLOQk=", "dev": true, "requires": { - "end-of-stream": "1.4.1", - "once": "1.4.0" + "end-of-stream": "^1.1.0", + "once": "^1.3.1" } }, "pumpify": { @@ -7781,9 +7781,9 @@ "integrity": "sha1-NlE74karJ1cLGjdKXOJ4v9dDcM4=", "dev": true, "requires": { - "duplexify": "3.7.1", - "inherits": "2.0.3", - "pump": "2.0.1" + "duplexify": "^3.6.0", + "inherits": "^2.0.3", + "pump": "^2.0.0" } }, "punycode": { @@ -7810,8 +7810,8 @@ "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=", "dev": true, "requires": { - "object-assign": "4.1.1", - "strict-uri-encode": "1.1.0" + "object-assign": "^4.1.0", + "strict-uri-encode": "^1.0.0" } }, "querystring": { @@ -7838,7 +7838,7 @@ "integrity": "sha1-32+ENy8CcNxlzfYpE0mrekc9Tyo=", "dev": true, "requires": { - "safe-buffer": "5.1.2" + "safe-buffer": "^5.1.0" } }, "randomfill": { @@ -7847,8 +7847,8 @@ "integrity": "sha1-ySGW/IarQr6YPxvzF3giSTHWFFg=", "dev": true, "requires": { - "randombytes": "2.1.0", - "safe-buffer": "5.1.2" + "randombytes": "^2.0.5", + "safe-buffer": "^5.1.0" } }, "range-parser": { @@ -7889,9 +7889,9 @@ "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", "dev": true, "requires": { - "load-json-file": "1.1.0", - "normalize-package-data": "2.5.0", - "path-type": "1.1.0" + "load-json-file": "^1.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^1.0.0" }, "dependencies": { "path-type": { @@ -7900,9 +7900,9 @@ "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", "dev": true, "requires": { - "graceful-fs": "4.1.15", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" + "graceful-fs": "^4.1.2", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" } }, "pify": { @@ -7919,8 +7919,8 @@ "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", "dev": true, "requires": { - "find-up": "1.1.2", - "read-pkg": "1.1.0" + "find-up": "^1.0.0", + "read-pkg": "^1.0.0" }, "dependencies": { "find-up": { @@ -7929,8 +7929,8 @@ "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", "dev": true, "requires": { - "path-exists": "2.1.0", - "pinkie-promise": "2.0.1" + "path-exists": "^2.0.0", + "pinkie-promise": "^2.0.0" } }, "path-exists": { @@ -7939,7 +7939,7 @@ "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", "dev": true, "requires": { - "pinkie-promise": "2.0.1" + "pinkie-promise": "^2.0.0" } } } @@ -7950,13 +7950,13 @@ "integrity": "sha1-sRwn2IuP8fvgcGQ8+UsMea4bCq8=", "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "2.0.0", - "safe-buffer": "5.1.2", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } }, "readdirp": { @@ -7965,9 +7965,9 @@ "integrity": "sha1-DodiKjMlqjPokihcr4tOhGUppSU=", "dev": true, "requires": { - "graceful-fs": "4.1.15", - "micromatch": "3.1.10", - "readable-stream": "2.3.6" + "graceful-fs": "^4.1.11", + "micromatch": "^3.1.10", + "readable-stream": "^2.0.2" } }, "recast": { @@ -7977,9 +7977,9 @@ "dev": true, "requires": { "ast-types": "0.9.6", - "esprima": "3.1.3", - "private": "0.1.8", - "source-map": "0.5.7" + "esprima": "~3.1.0", + "private": "~0.1.5", + "source-map": "~0.5.0" }, "dependencies": { "esprima": { @@ -7996,8 +7996,8 @@ "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", "dev": true, "requires": { - "indent-string": "2.1.0", - "strip-indent": "1.0.1" + "indent-string": "^2.1.0", + "strip-indent": "^1.0.1" } }, "reduce-css-calc": { @@ -8006,9 +8006,9 @@ "integrity": "sha1-dHyRTgSWFKTJz7umKYca0dKSdxY=", "dev": true, "requires": { - "balanced-match": "0.4.2", - "math-expression-evaluator": "1.2.17", - "reduce-function-call": "1.0.2" + "balanced-match": "^0.4.2", + "math-expression-evaluator": "^1.2.14", + "reduce-function-call": "^1.0.1" }, "dependencies": { "balanced-match": { @@ -8025,7 +8025,7 @@ "integrity": "sha1-WiAL+S4ON3UXUv5FsKszD9S2vpk=", "dev": true, "requires": { - "balanced-match": "0.4.2" + "balanced-match": "^0.4.2" }, "dependencies": { "balanced-match": { @@ -8059,9 +8059,9 @@ "integrity": "sha1-HkmWg3Ix2ot/PPQRTXG1aRoGgN0=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "private": "0.1.8" + "babel-runtime": "^6.18.0", + "babel-types": "^6.19.0", + "private": "^0.1.6" } }, "regex-not": { @@ -8070,8 +8070,8 @@ "integrity": "sha1-H07OJ+ALC2XgJHpoEOaoXYOldSw=", "dev": true, "requires": { - "extend-shallow": "3.0.2", - "safe-regex": "1.1.0" + "extend-shallow": "^3.0.2", + "safe-regex": "^1.1.0" } }, "regexpu-core": { @@ -8080,9 +8080,9 @@ "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=", "dev": true, "requires": { - "regenerate": "1.4.0", - "regjsgen": "0.2.0", - "regjsparser": "0.1.5" + "regenerate": "^1.2.1", + "regjsgen": "^0.2.0", + "regjsparser": "^0.1.4" } }, "regjsgen": { @@ -8097,7 +8097,7 @@ "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=", "dev": true, "requires": { - "jsesc": "0.5.0" + "jsesc": "~0.5.0" }, "dependencies": { "jsesc": { @@ -8126,11 +8126,11 @@ "integrity": "sha1-OAF5wv9a4TZcUivy/Pz/AcW3QUk=", "dev": true, "requires": { - "css-select": "1.2.0", - "dom-converter": "0.2.0", - "htmlparser2": "3.10.1", - "strip-ansi": "3.0.1", - "utila": "0.4.0" + "css-select": "^1.1.0", + "dom-converter": "^0.2", + "htmlparser2": "^3.3.0", + "strip-ansi": "^3.0.0", + "utila": "^0.4.0" } }, "repeat-element": { @@ -8151,7 +8151,7 @@ "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", "dev": true, "requires": { - "is-finite": "1.0.2" + "is-finite": "^1.0.0" } }, "request": { @@ -8160,26 +8160,26 @@ "integrity": "sha1-nC/KT301tZLv5Xx/ClXoEFIST+8=", "dev": true, "requires": { - "aws-sign2": "0.7.0", - "aws4": "1.8.0", - "caseless": "0.12.0", - "combined-stream": "1.0.8", - "extend": "3.0.2", - "forever-agent": "0.6.1", - "form-data": "2.3.3", - "har-validator": "5.1.3", - "http-signature": "1.2.0", - "is-typedarray": "1.0.0", - "isstream": "0.1.2", - "json-stringify-safe": "5.0.1", - "mime-types": "2.1.24", - "oauth-sign": "0.9.0", - "performance-now": "2.1.0", - "qs": "6.5.2", - "safe-buffer": "5.1.2", - "tough-cookie": "2.4.3", - "tunnel-agent": "0.6.0", - "uuid": "3.3.2" + "aws-sign2": "~0.7.0", + "aws4": "^1.8.0", + "caseless": "~0.12.0", + "combined-stream": "~1.0.6", + "extend": "~3.0.2", + "forever-agent": "~0.6.1", + "form-data": "~2.3.2", + "har-validator": "~5.1.0", + "http-signature": "~1.2.0", + "is-typedarray": "~1.0.0", + "isstream": "~0.1.2", + "json-stringify-safe": "~5.0.1", + "mime-types": "~2.1.19", + "oauth-sign": "~0.9.0", + "performance-now": "^2.1.0", + "qs": "~6.5.2", + "safe-buffer": "^5.1.2", + "tough-cookie": "~2.4.3", + "tunnel-agent": "^0.6.0", + "uuid": "^3.3.2" } }, "require-directory": { @@ -8212,7 +8212,7 @@ "integrity": "sha1-35kcDP+7vd5yFQTBRV9o9T98e9E=", "dev": true, "requires": { - "lodash": "4.17.11" + "lodash": "^4.17.11" } }, "resolve": { @@ -8221,7 +8221,7 @@ "integrity": "sha1-QBSHC6KWF2uGND1Qtg87UGCc4jI=", "dev": true, "requires": { - "path-parse": "1.0.6" + "path-parse": "^1.0.6" } }, "resolve-cwd": { @@ -8230,7 +8230,7 @@ "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=", "dev": true, "requires": { - "resolve-from": "3.0.0" + "resolve-from": "^3.0.0" } }, "resolve-dir": { @@ -8239,8 +8239,8 @@ "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=", "dev": true, "requires": { - "expand-tilde": "2.0.2", - "global-modules": "1.0.0" + "expand-tilde": "^2.0.0", + "global-modules": "^1.0.0" } }, "resolve-from": { @@ -8267,8 +8267,8 @@ "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", "dev": true, "requires": { - "onetime": "2.0.1", - "signal-exit": "3.0.2" + "onetime": "^2.0.0", + "signal-exit": "^3.0.2" } }, "ret": { @@ -8289,7 +8289,7 @@ "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=", "dev": true, "requires": { - "align-text": "0.1.4" + "align-text": "^0.1.1" } }, "rimraf": { @@ -8298,7 +8298,7 @@ "integrity": "sha1-stEE/g2Psnz54KHNqCYt04M8bKs=", "dev": true, "requires": { - "glob": "7.1.4" + "glob": "^7.1.3" } }, "ripemd160": { @@ -8307,8 +8307,8 @@ "integrity": "sha1-ocGm9iR1FXe6XQeRTLyShQWFiQw=", "dev": true, "requires": { - "hash-base": "3.0.4", - "inherits": "2.0.3" + "hash-base": "^3.0.0", + "inherits": "^2.0.1" } }, "run-async": { @@ -8317,7 +8317,7 @@ "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=", "dev": true, "requires": { - "is-promise": "2.1.0" + "is-promise": "^2.1.0" } }, "run-parallel": { @@ -8332,7 +8332,7 @@ "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=", "dev": true, "requires": { - "aproba": "1.2.0" + "aproba": "^1.1.1" } }, "rx": { @@ -8353,7 +8353,7 @@ "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", "dev": true, "requires": { - "ret": "0.1.15" + "ret": "~0.1.10" } }, "safer-buffer": { @@ -8368,10 +8368,10 @@ "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=", "dev": true, "requires": { - "glob": "7.1.4", - "lodash": "4.17.11", - "scss-tokenizer": "0.2.3", - "yargs": "7.1.0" + "glob": "^7.0.0", + "lodash": "^4.0.0", + "scss-tokenizer": "^0.2.3", + "yargs": "^7.0.0" } }, "sass-loader": { @@ -8380,11 +8380,11 @@ "integrity": "sha1-3S/bPn7v9KU/NbpqxAhxVIg1PQA=", "dev": true, "requires": { - "clone-deep": "2.0.2", - "loader-utils": "1.2.3", - "lodash.tail": "4.1.1", - "neo-async": "2.6.1", - "pify": "3.0.0" + "clone-deep": "^2.0.1", + "loader-utils": "^1.0.1", + "lodash.tail": "^4.1.1", + "neo-async": "^2.5.0", + "pify": "^3.0.0" } }, "sax": { @@ -8399,8 +8399,8 @@ "integrity": "sha1-unT1l9K+LqiAExdG7hfQoJPGgYc=", "dev": true, "requires": { - "ajv": "6.10.0", - "ajv-keywords": "3.4.0" + "ajv": "^6.1.0", + "ajv-keywords": "^3.1.0" } }, "scss-tokenizer": { @@ -8409,8 +8409,8 @@ "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=", "dev": true, "requires": { - "js-base64": "2.5.1", - "source-map": "0.4.4" + "js-base64": "^2.1.8", + "source-map": "^0.4.2" }, "dependencies": { "source-map": { @@ -8419,7 +8419,7 @@ "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", "dev": true, "requires": { - "amdefine": "1.0.1" + "amdefine": ">=0.0.4" } } } @@ -8452,18 +8452,18 @@ "dev": true, "requires": { "debug": "2.6.9", - "depd": "1.1.2", - "destroy": "1.0.4", - "encodeurl": "1.0.2", - "escape-html": "1.0.3", - "etag": "1.8.1", + "depd": "~1.1.2", + "destroy": "~1.0.4", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", "fresh": "0.5.2", - "http-errors": "1.7.2", + "http-errors": "~1.7.2", "mime": "1.6.0", "ms": "2.1.1", - "on-finished": "2.3.0", - "range-parser": "1.2.1", - "statuses": "1.5.0" + "on-finished": "~2.3.0", + "range-parser": "~1.2.1", + "statuses": "~1.5.0" }, "dependencies": { "ms": { @@ -8480,8 +8480,8 @@ "integrity": "sha1-H24t2jnBaL+S0T+G1KkYkz9mftQ=", "dev": true, "requires": { - "no-case": "2.3.2", - "upper-case-first": "1.1.2" + "no-case": "^2.2.0", + "upper-case-first": "^1.1.2" } }, "serialize-javascript": { @@ -8496,13 +8496,13 @@ "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=", "dev": true, "requires": { - "accepts": "1.3.7", + "accepts": "~1.3.4", "batch": "0.6.1", "debug": "2.6.9", - "escape-html": "1.0.3", - "http-errors": "1.6.3", - "mime-types": "2.1.24", - "parseurl": "1.3.3" + "escape-html": "~1.0.3", + "http-errors": "~1.6.2", + "mime-types": "~2.1.17", + "parseurl": "~1.3.2" }, "dependencies": { "http-errors": { @@ -8511,10 +8511,10 @@ "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=", "dev": true, "requires": { - "depd": "1.1.2", + "depd": "~1.1.2", "inherits": "2.0.3", "setprototypeof": "1.1.0", - "statuses": "1.5.0" + "statuses": ">= 1.4.0 < 2" } }, "setprototypeof": { @@ -8531,9 +8531,9 @@ "integrity": "sha1-Zm5jbcTwEPfvKZcKiKZ0MgiYsvk=", "dev": true, "requires": { - "encodeurl": "1.0.2", - "escape-html": "1.0.3", - "parseurl": "1.3.3", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "parseurl": "~1.3.3", "send": "0.17.1" } }, @@ -8549,10 +8549,10 @@ "integrity": "sha1-ca5KiPD+77v1LR6mBPP7MV67YnQ=", "dev": true, "requires": { - "extend-shallow": "2.0.1", - "is-extendable": "0.1.1", - "is-plain-object": "2.0.4", - "split-string": "3.1.0" + "extend-shallow": "^2.0.1", + "is-extendable": "^0.1.1", + "is-plain-object": "^2.0.3", + "split-string": "^3.0.1" }, "dependencies": { "extend-shallow": { @@ -8561,7 +8561,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -8584,8 +8584,8 @@ "integrity": "sha1-N6XPC4HsvGlD3hCbopYNGyZYSuc=", "dev": true, "requires": { - "inherits": "2.0.3", - "safe-buffer": "5.1.2" + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" } }, "shallow-clone": { @@ -8594,9 +8594,9 @@ "integrity": "sha1-RIDNBuiC72iyrYij6lSDLixItXE=", "dev": true, "requires": { - "is-extendable": "0.1.1", - "kind-of": "5.1.0", - "mixin-object": "2.0.1" + "is-extendable": "^0.1.1", + "kind-of": "^5.0.0", + "mixin-object": "^2.0.1" }, "dependencies": { "kind-of": { @@ -8613,7 +8613,7 @@ "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", "dev": true, "requires": { - "shebang-regex": "1.0.0" + "shebang-regex": "^1.0.0" } }, "shebang-regex": { @@ -8640,7 +8640,7 @@ "integrity": "sha1-Qb2xtz8w7GagTU4srRt2OH1NbZ8=", "dev": true, "requires": { - "no-case": "2.3.2" + "no-case": "^2.2.0" } }, "snapdragon": { @@ -8649,14 +8649,14 @@ "integrity": "sha1-ZJIufFZbDhQgS6GqfWlkJ40lGC0=", "dev": true, "requires": { - "base": "0.11.2", - "debug": "2.6.9", - "define-property": "0.2.5", - "extend-shallow": "2.0.1", - "map-cache": "0.2.2", - "source-map": "0.5.7", - "source-map-resolve": "0.5.2", - "use": "3.1.1" + "base": "^0.11.1", + "debug": "^2.2.0", + "define-property": "^0.2.5", + "extend-shallow": "^2.0.1", + "map-cache": "^0.2.2", + "source-map": "^0.5.6", + "source-map-resolve": "^0.5.0", + "use": "^3.1.0" }, "dependencies": { "define-property": { @@ -8665,7 +8665,7 @@ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } }, "extend-shallow": { @@ -8674,7 +8674,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -8685,9 +8685,9 @@ "integrity": "sha1-bBdfhv8UvbByRWPo88GwIaKGhTs=", "dev": true, "requires": { - "define-property": "1.0.0", - "isobject": "3.0.1", - "snapdragon-util": "3.0.1" + "define-property": "^1.0.0", + "isobject": "^3.0.0", + "snapdragon-util": "^3.0.1" }, "dependencies": { "define-property": { @@ -8696,7 +8696,7 @@ "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "dev": true, "requires": { - "is-descriptor": "1.0.2" + "is-descriptor": "^1.0.0" } }, "is-accessor-descriptor": { @@ -8705,7 +8705,7 @@ "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=", "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { @@ -8714,7 +8714,7 @@ "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=", "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-descriptor": { @@ -8723,9 +8723,9 @@ "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=", "dev": true, "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } } } @@ -8736,7 +8736,7 @@ "integrity": "sha1-+VZHlIbyrNeXAGk/b3uAXkWrVuI=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.2.0" }, "dependencies": { "kind-of": { @@ -8745,7 +8745,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -8756,8 +8756,8 @@ "integrity": "sha1-2Xa76ACve9IK4IWY1YI5NQiZPA0=", "dev": true, "requires": { - "faye-websocket": "0.10.0", - "uuid": "3.3.2" + "faye-websocket": "^0.10.0", + "uuid": "^3.0.1" } }, "sockjs-client": { @@ -8766,12 +8766,12 @@ "integrity": "sha1-G7fA9yIsQPQq3xT0RCy9Eml3GoM=", "dev": true, "requires": { - "debug": "2.6.9", + "debug": "^2.6.6", "eventsource": "0.1.6", - "faye-websocket": "0.11.1", - "inherits": "2.0.3", - "json3": "3.3.2", - "url-parse": "1.4.7" + "faye-websocket": "~0.11.0", + "inherits": "^2.0.1", + "json3": "^3.3.2", + "url-parse": "^1.1.8" }, "dependencies": { "faye-websocket": { @@ -8780,7 +8780,7 @@ "integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=", "dev": true, "requires": { - "websocket-driver": "0.7.0" + "websocket-driver": ">=0.5.1" } } } @@ -8791,7 +8791,7 @@ "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=", "dev": true, "requires": { - "is-plain-obj": "1.1.0" + "is-plain-obj": "^1.0.0" } }, "source-list-map": { @@ -8812,11 +8812,11 @@ "integrity": "sha1-cuLMNAlVQ+Q7LGKyxMENSpBU8lk=", "dev": true, "requires": { - "atob": "2.1.2", - "decode-uri-component": "0.2.0", - "resolve-url": "0.2.1", - "source-map-url": "0.4.0", - "urix": "0.1.0" + "atob": "^2.1.1", + "decode-uri-component": "^0.2.0", + "resolve-url": "^0.2.1", + "source-map-url": "^0.4.0", + "urix": "^0.1.0" } }, "source-map-support": { @@ -8825,7 +8825,7 @@ "integrity": "sha1-Aoam3ovkJkEzhZTpfM6nXwosWF8=", "dev": true, "requires": { - "source-map": "0.5.7" + "source-map": "^0.5.6" } }, "source-map-url": { @@ -8840,8 +8840,8 @@ "integrity": "sha1-+4PlBERSaPFUsHTiGMh8ADzTHfQ=", "dev": true, "requires": { - "spdx-expression-parse": "3.0.0", - "spdx-license-ids": "3.0.4" + "spdx-expression-parse": "^3.0.0", + "spdx-license-ids": "^3.0.0" } }, "spdx-exceptions": { @@ -8856,8 +8856,8 @@ "integrity": "sha1-meEZt6XaAOBUkcn6M4t5BII7QdA=", "dev": true, "requires": { - "spdx-exceptions": "2.2.0", - "spdx-license-ids": "3.0.4" + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" } }, "spdx-license-ids": { @@ -8872,11 +8872,11 @@ "integrity": "sha1-gfIitadDoymqEs6mo5DmDpthPFI=", "dev": true, "requires": { - "debug": "4.1.1", - "handle-thing": "2.0.0", - "http-deceiver": "1.2.7", - "select-hose": "2.0.0", - "spdy-transport": "3.0.0" + "debug": "^4.1.0", + "handle-thing": "^2.0.0", + "http-deceiver": "^1.2.7", + "select-hose": "^2.0.0", + "spdy-transport": "^3.0.0" }, "dependencies": { "debug": { @@ -8885,7 +8885,7 @@ "integrity": "sha1-O3ImAlUQnGtYnO4FDx1RYTlmR5E=", "dev": true, "requires": { - "ms": "2.1.1" + "ms": "^2.1.1" } }, "ms": { @@ -8902,12 +8902,12 @@ "integrity": "sha1-ANSGOmQArXXfkzYaFghgXl3NzzE=", "dev": true, "requires": { - "debug": "4.1.1", - "detect-node": "2.0.4", - "hpack.js": "2.1.6", - "obuf": "1.1.2", - "readable-stream": "3.3.0", - "wbuf": "1.7.3" + "debug": "^4.1.0", + "detect-node": "^2.0.4", + "hpack.js": "^2.1.6", + "obuf": "^1.1.2", + "readable-stream": "^3.0.6", + "wbuf": "^1.7.3" }, "dependencies": { "debug": { @@ -8916,7 +8916,7 @@ "integrity": "sha1-O3ImAlUQnGtYnO4FDx1RYTlmR5E=", "dev": true, "requires": { - "ms": "2.1.1" + "ms": "^2.1.1" } }, "ms": { @@ -8931,9 +8931,9 @@ "integrity": "sha1-y4ARqtAC63F78EApH+uoVpyYb7k=", "dev": true, "requires": { - "inherits": "2.0.3", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" } } } @@ -8944,7 +8944,7 @@ "integrity": "sha1-fLCd2jqGWFcFxks5pkZgOGguj+I=", "dev": true, "requires": { - "extend-shallow": "3.0.2" + "extend-shallow": "^3.0.0" } }, "sprintf-js": { @@ -8959,15 +8959,15 @@ "integrity": "sha1-+2YcC+8ps520B2nuOfpwCT1vaHc=", "dev": true, "requires": { - "asn1": "0.2.4", - "assert-plus": "1.0.0", - "bcrypt-pbkdf": "1.0.2", - "dashdash": "1.14.1", - "ecc-jsbn": "0.1.2", - "getpass": "0.1.7", - "jsbn": "0.1.1", - "safer-buffer": "2.1.2", - "tweetnacl": "0.14.5" + "asn1": "~0.2.3", + "assert-plus": "^1.0.0", + "bcrypt-pbkdf": "^1.0.0", + "dashdash": "^1.12.0", + "ecc-jsbn": "~0.1.1", + "getpass": "^0.1.1", + "jsbn": "~0.1.0", + "safer-buffer": "^2.0.2", + "tweetnacl": "~0.14.0" } }, "ssri": { @@ -8976,7 +8976,7 @@ "integrity": "sha1-ujhyycbTOgcEp9cf8EXl7EiZnQY=", "dev": true, "requires": { - "safe-buffer": "5.1.2" + "safe-buffer": "^5.1.1" } }, "static-extend": { @@ -8985,8 +8985,8 @@ "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", "dev": true, "requires": { - "define-property": "0.2.5", - "object-copy": "0.1.0" + "define-property": "^0.2.5", + "object-copy": "^0.1.0" }, "dependencies": { "define-property": { @@ -8995,7 +8995,7 @@ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } } } @@ -9012,7 +9012,7 @@ "integrity": "sha1-WsF0zdXNcmEEqgwLK9g4FdjVNd4=", "dev": true, "requires": { - "readable-stream": "2.3.6" + "readable-stream": "^2.0.1" } }, "stream-browserify": { @@ -9021,8 +9021,8 @@ "integrity": "sha1-h1IdOKRKp+6RzhzSpH3wy0ndZgs=", "dev": true, "requires": { - "inherits": "2.0.3", - "readable-stream": "2.3.6" + "inherits": "~2.0.1", + "readable-stream": "^2.0.2" } }, "stream-each": { @@ -9031,8 +9031,8 @@ "integrity": "sha1-6+J6DDibBPvMIzZClS4Qcxr6m64=", "dev": true, "requires": { - "end-of-stream": "1.4.1", - "stream-shift": "1.0.0" + "end-of-stream": "^1.1.0", + "stream-shift": "^1.0.0" } }, "stream-http": { @@ -9041,11 +9041,11 @@ "integrity": "sha1-stJCRpKIpaJ+xP6JM6z2I95lFPw=", "dev": true, "requires": { - "builtin-status-codes": "3.0.0", - "inherits": "2.0.3", - "readable-stream": "2.3.6", - "to-arraybuffer": "1.0.1", - "xtend": "4.0.1" + "builtin-status-codes": "^3.0.0", + "inherits": "^2.0.1", + "readable-stream": "^2.3.6", + "to-arraybuffer": "^1.0.0", + "xtend": "^4.0.0" } }, "stream-shift": { @@ -9066,8 +9066,8 @@ "integrity": "sha1-ty57V7bvBO/mFa/wrZibXBTKY9E=", "dev": true, "requires": { - "loader-utils": "1.2.3", - "schema-utils": "0.4.7" + "loader-utils": "^1.1.0", + "schema-utils": "^0.4.5" } }, "string-template": { @@ -9082,9 +9082,9 @@ "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" } }, "string_decoder": { @@ -9093,7 +9093,7 @@ "integrity": "sha1-nPFhG6YmhdcDCunkujQUnDrwP8g=", "dev": true, "requires": { - "safe-buffer": "5.1.2" + "safe-buffer": "~5.1.0" } }, "strip-ansi": { @@ -9102,7 +9102,7 @@ "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "strip-bom": { @@ -9111,7 +9111,7 @@ "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", "dev": true, "requires": { - "is-utf8": "0.2.1" + "is-utf8": "^0.2.0" } }, "strip-eof": { @@ -9126,7 +9126,7 @@ "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", "dev": true, "requires": { - "get-stdin": "4.0.1" + "get-stdin": "^4.0.1" } }, "strip-json-comments": { @@ -9141,8 +9141,8 @@ "integrity": "sha1-WR/8gLzv4mi3fF2evAUF13Jhn4U=", "dev": true, "requires": { - "loader-utils": "1.2.3", - "schema-utils": "0.3.0" + "loader-utils": "^1.0.2", + "schema-utils": "^0.3.0" }, "dependencies": { "ajv": { @@ -9151,10 +9151,10 @@ "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", "dev": true, "requires": { - "co": "4.6.0", - "fast-deep-equal": "1.1.0", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.3.1" + "co": "^4.6.0", + "fast-deep-equal": "^1.0.0", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.3.0" } }, "fast-deep-equal": { @@ -9175,7 +9175,7 @@ "integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=", "dev": true, "requires": { - "ajv": "5.5.2" + "ajv": "^5.0.0" } } } @@ -9192,13 +9192,13 @@ "integrity": "sha1-n1dyQTlSE1xv779Ar+ak+qiLS7U=", "dev": true, "requires": { - "coa": "1.0.4", - "colors": "1.1.2", - "csso": "2.3.2", - "js-yaml": "3.7.0", - "mkdirp": "0.5.1", - "sax": "1.2.4", - "whet.extend": "0.9.9" + "coa": "~1.0.1", + "colors": "~1.1.2", + "csso": "~2.3.1", + "js-yaml": "~3.7.0", + "mkdirp": "~0.5.1", + "sax": "~1.2.1", + "whet.extend": "~0.9.9" } }, "swap-case": { @@ -9207,8 +9207,8 @@ "integrity": "sha1-w5IDpFhzhfrTyFCgvRvK+ggZdOM=", "dev": true, "requires": { - "lower-case": "1.1.4", - "upper-case": "1.1.3" + "lower-case": "^1.1.1", + "upper-case": "^1.1.1" } }, "taffydb": { @@ -9229,9 +9229,9 @@ "integrity": "sha1-DKiEhWLHKZuLRG/2pNYM27I+3EA=", "dev": true, "requires": { - "block-stream": "0.0.9", - "fstream": "1.0.12", - "inherits": "2.0.3" + "block-stream": "*", + "fstream": "^1.0.12", + "inherits": "2" } }, "through": { @@ -9246,8 +9246,8 @@ "integrity": "sha1-AcHjnrMdB8t9A6lqcIIyYLIxMs0=", "dev": true, "requires": { - "readable-stream": "2.3.6", - "xtend": "4.0.1" + "readable-stream": "~2.3.6", + "xtend": "~4.0.1" } }, "thunky": { @@ -9268,7 +9268,7 @@ "integrity": "sha1-HSjj0qrfHVpZlsTp+VYBzQU0gK4=", "dev": true, "requires": { - "setimmediate": "1.0.5" + "setimmediate": "^1.0.4" } }, "tiny-invariant": { @@ -9294,8 +9294,8 @@ "integrity": "sha1-PhJyFtpY0rxb7PE3q5Ha46fNj6o=", "dev": true, "requires": { - "no-case": "2.3.2", - "upper-case": "1.1.3" + "no-case": "^2.2.0", + "upper-case": "^1.0.3" } }, "tmp": { @@ -9304,7 +9304,7 @@ "integrity": "sha1-bTQzWIl2jSGyvNoKonfO07G/rfk=", "dev": true, "requires": { - "os-tmpdir": "1.0.2" + "os-tmpdir": "~1.0.2" } }, "to-arraybuffer": { @@ -9325,7 +9325,7 @@ "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -9334,7 +9334,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -9345,10 +9345,10 @@ "integrity": "sha1-E8/dmzNlUvMLUfM6iuG0Knp1mc4=", "dev": true, "requires": { - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "regex-not": "1.0.2", - "safe-regex": "1.1.0" + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "regex-not": "^1.0.2", + "safe-regex": "^1.1.0" } }, "to-regex-range": { @@ -9357,8 +9357,8 @@ "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", "dev": true, "requires": { - "is-number": "3.0.0", - "repeat-string": "1.6.1" + "is-number": "^3.0.0", + "repeat-string": "^1.6.1" } }, "toidentifier": { @@ -9379,8 +9379,8 @@ "integrity": "sha1-U/Nto/R3g7CSWvoG/587FlKA94E=", "dev": true, "requires": { - "psl": "1.1.32", - "punycode": "1.4.1" + "psl": "^1.1.24", + "punycode": "^1.4.1" }, "dependencies": { "punycode": { @@ -9409,7 +9409,7 @@ "integrity": "sha1-+BO1qMhrQNpZYGcisUTjIleZ9H0=", "dev": true, "requires": { - "glob": "7.1.4" + "glob": "^7.1.2" } }, "ts-loader": { @@ -9418,11 +9418,11 @@ "integrity": "sha1-FR0ATc3bTPjjgaO/nWt0wtlXqcA=", "dev": true, "requires": { - "chalk": "2.4.2", - "enhanced-resolve": "3.4.1", - "loader-utils": "1.2.3", - "micromatch": "3.1.10", - "semver": "5.7.0" + "chalk": "^2.3.0", + "enhanced-resolve": "^3.0.0", + "loader-utils": "^1.0.2", + "micromatch": "^3.1.4", + "semver": "^5.0.1" }, "dependencies": { "ansi-styles": { @@ -9431,7 +9431,7 @@ "integrity": "sha1-QfuyAkPlCxK+DwS43tvwdSDOhB0=", "dev": true, "requires": { - "color-convert": "1.9.3" + "color-convert": "^1.9.0" } }, "chalk": { @@ -9440,9 +9440,9 @@ "integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.5.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } }, "has-flag": { @@ -9457,7 +9457,7 @@ "integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=", "dev": true, "requires": { - "has-flag": "3.0.0" + "has-flag": "^3.0.0" } } } @@ -9480,7 +9480,7 @@ "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", "dev": true, "requires": { - "safe-buffer": "5.1.2" + "safe-buffer": "^5.0.1" } }, "tweetnacl": { @@ -9495,7 +9495,7 @@ "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", "dev": true, "requires": { - "prelude-ls": "1.1.2" + "prelude-ls": "~1.1.2" } }, "type-is": { @@ -9505,7 +9505,7 @@ "dev": true, "requires": { "media-typer": "0.3.0", - "mime-types": "2.1.24" + "mime-types": "~2.1.24" } }, "typedarray": { @@ -9532,8 +9532,8 @@ "integrity": "sha1-mtlWPY6zrN+404WX0q8dgV9qdV8=", "dev": true, "requires": { - "commander": "2.19.0", - "source-map": "0.6.1" + "commander": "~2.19.0", + "source-map": "~0.6.1" }, "dependencies": { "commander": { @@ -9562,14 +9562,14 @@ "integrity": "sha1-dfVIFghYFjoIZD4IbV/v4YpdZ94=", "dev": true, "requires": { - "cacache": "10.0.4", - "find-cache-dir": "1.0.0", - "schema-utils": "0.4.7", - "serialize-javascript": "1.7.0", - "source-map": "0.6.1", - "uglify-es": "3.3.9", - "webpack-sources": "1.3.0", - "worker-farm": "1.7.0" + "cacache": "^10.0.4", + "find-cache-dir": "^1.0.0", + "schema-utils": "^0.4.5", + "serialize-javascript": "^1.4.0", + "source-map": "^0.6.1", + "uglify-es": "^3.3.4", + "webpack-sources": "^1.1.0", + "worker-farm": "^1.5.2" }, "dependencies": { "commander": { @@ -9590,8 +9590,8 @@ "integrity": "sha1-DBxPBwC+2NvBJM2zBNJZLKID5nc=", "dev": true, "requires": { - "commander": "2.13.0", - "source-map": "0.6.1" + "commander": "~2.13.0", + "source-map": "~0.6.1" } } } @@ -9608,10 +9608,10 @@ "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=", "dev": true, "requires": { - "arr-union": "3.1.0", - "get-value": "2.0.6", - "is-extendable": "0.1.1", - "set-value": "0.4.3" + "arr-union": "^3.1.0", + "get-value": "^2.0.6", + "is-extendable": "^0.1.1", + "set-value": "^0.4.3" }, "dependencies": { "extend-shallow": { @@ -9620,7 +9620,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } }, "set-value": { @@ -9629,10 +9629,10 @@ "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=", "dev": true, "requires": { - "extend-shallow": "2.0.1", - "is-extendable": "0.1.1", - "is-plain-object": "2.0.4", - "to-object-path": "0.3.0" + "extend-shallow": "^2.0.1", + "is-extendable": "^0.1.1", + "is-plain-object": "^2.0.1", + "to-object-path": "^0.3.0" } } } @@ -9655,7 +9655,7 @@ "integrity": "sha1-HWl2k2mtoFgxA6HmrodoG1ZXMjA=", "dev": true, "requires": { - "unique-slug": "2.0.1" + "unique-slug": "^2.0.0" } }, "unique-slug": { @@ -9664,7 +9664,7 @@ "integrity": "sha1-Xp7cbRzo+yZNsYpQfvm9hURFHKY=", "dev": true, "requires": { - "imurmurhash": "0.1.4" + "imurmurhash": "^0.1.4" } }, "unpipe": { @@ -9679,8 +9679,8 @@ "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", "dev": true, "requires": { - "has-value": "0.3.1", - "isobject": "3.0.1" + "has-value": "^0.3.1", + "isobject": "^3.0.0" }, "dependencies": { "has-value": { @@ -9689,9 +9689,9 @@ "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=", "dev": true, "requires": { - "get-value": "2.0.6", - "has-values": "0.1.4", - "isobject": "2.1.0" + "get-value": "^2.0.3", + "has-values": "^0.1.4", + "isobject": "^2.0.0" }, "dependencies": { "isobject": { @@ -9731,7 +9731,7 @@ "integrity": "sha1-XXm+3P8UQZUY/S7bCgUHybaFkRU=", "dev": true, "requires": { - "upper-case": "1.1.3" + "upper-case": "^1.1.1" } }, "uri-js": { @@ -9740,7 +9740,7 @@ "integrity": "sha1-lMVA4f93KVbiKZUHwBCupsiDjrA=", "dev": true, "requires": { - "punycode": "2.1.1" + "punycode": "^2.1.0" } }, "urix": { @@ -9773,9 +9773,9 @@ "integrity": "sha1-oAenEJYg6dmI0UvOZ3od7Lmpk/c=", "dev": true, "requires": { - "loader-utils": "1.2.3", - "mime": "1.6.0", - "schema-utils": "0.3.0" + "loader-utils": "^1.0.2", + "mime": "^1.4.1", + "schema-utils": "^0.3.0" }, "dependencies": { "ajv": { @@ -9784,10 +9784,10 @@ "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", "dev": true, "requires": { - "co": "4.6.0", - "fast-deep-equal": "1.1.0", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.3.1" + "co": "^4.6.0", + "fast-deep-equal": "^1.0.0", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.3.0" } }, "fast-deep-equal": { @@ -9808,7 +9808,7 @@ "integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=", "dev": true, "requires": { - "ajv": "5.5.2" + "ajv": "^5.0.0" } } } @@ -9819,8 +9819,8 @@ "integrity": "sha1-qKg1NejACjFuQDpdtKwbm4U64ng=", "dev": true, "requires": { - "querystringify": "2.1.1", - "requires-port": "1.0.0" + "querystringify": "^2.1.1", + "requires-port": "^1.0.0" } }, "use": { @@ -9879,8 +9879,8 @@ "integrity": "sha1-/JH2uce6FchX9MssXe/uw51PQQo=", "dev": true, "requires": { - "spdx-correct": "3.1.0", - "spdx-expression-parse": "3.0.0" + "spdx-correct": "^3.0.0", + "spdx-expression-parse": "^3.0.0" } }, "validator": { @@ -9913,9 +9913,9 @@ "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", "dev": true, "requires": { - "assert-plus": "1.0.0", + "assert-plus": "^1.0.0", "core-util-is": "1.0.2", - "extsprintf": "1.3.0" + "extsprintf": "^1.2.0" } }, "vm-browserify": { @@ -9937,7 +9937,7 @@ "resolved": "https://registry.npm.taobao.org/vue-drag-tree/download/vue-drag-tree-1.1.8.tgz", "integrity": "sha1-YFceuPiz+7xoGXkto/ZzTQael7Q=", "requires": { - "vue": "2.6.10" + "vue": "^2.6.10" } }, "vue-hot-reload-api": { @@ -9952,11 +9952,11 @@ "integrity": "sha1-VM5Im+BgZckdwqEXMSLz4ATgolM=", "dev": true, "requires": { - "es6-templates": "0.2.3", - "fastparse": "1.1.2", - "html-minifier": "2.1.7", - "loader-utils": "1.2.3", - "object-assign": "4.1.1" + "es6-templates": "^0.2.2", + "fastparse": "^1.0.0", + "html-minifier": "^2.1.5", + "loader-utils": "^1.0.2", + "object-assign": "^4.1.0" }, "dependencies": { "async": { @@ -9977,8 +9977,8 @@ "integrity": "sha1-vxlF6C/ICPVWlebd6uwBQA79A/8=", "dev": true, "requires": { - "commander": "2.8.1", - "source-map": "0.4.4" + "commander": "2.8.x", + "source-map": "0.4.x" }, "dependencies": { "commander": { @@ -9987,7 +9987,7 @@ "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=", "dev": true, "requires": { - "graceful-readlink": "1.0.1" + "graceful-readlink": ">= 1.0.0" } } } @@ -9998,8 +9998,8 @@ "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", "dev": true, "requires": { - "center-align": "0.1.3", - "right-align": "0.1.3", + "center-align": "^0.1.1", + "right-align": "^0.1.1", "wordwrap": "0.0.2" } }, @@ -10009,7 +10009,7 @@ "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=", "dev": true, "requires": { - "graceful-readlink": "1.0.1" + "graceful-readlink": ">= 1.0.0" } }, "he": { @@ -10024,13 +10024,13 @@ "integrity": "sha1-kFHW/LvPIU7TB+GtdPQyu5rWVcw=", "dev": true, "requires": { - "change-case": "3.0.2", - "clean-css": "3.4.28", - "commander": "2.9.0", - "he": "1.1.1", - "ncname": "1.0.0", - "relateurl": "0.2.7", - "uglify-js": "2.6.4" + "change-case": "3.0.x", + "clean-css": "3.4.x", + "commander": "2.9.x", + "he": "1.1.x", + "ncname": "1.0.x", + "relateurl": "0.2.x", + "uglify-js": "2.6.x" } }, "source-map": { @@ -10039,7 +10039,7 @@ "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", "dev": true, "requires": { - "amdefine": "1.0.1" + "amdefine": ">=0.0.4" } }, "uglify-js": { @@ -10048,10 +10048,10 @@ "integrity": "sha1-ZeovswWck5RpLxX+2HwrNsFrmt8=", "dev": true, "requires": { - "async": "0.2.10", - "source-map": "0.5.7", - "uglify-to-browserify": "1.0.2", - "yargs": "3.10.0" + "async": "~0.2.6", + "source-map": "~0.5.1", + "uglify-to-browserify": "~1.0.0", + "yargs": "~3.10.0" }, "dependencies": { "source-map": { @@ -10068,9 +10068,9 @@ "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", "dev": true, "requires": { - "camelcase": "1.2.1", - "cliui": "2.1.0", - "decamelize": "1.2.0", + "camelcase": "^1.0.2", + "cliui": "^2.1.0", + "decamelize": "^1.0.0", "window-size": "0.1.0" } } @@ -10082,19 +10082,19 @@ "integrity": "sha1-4HRA94IwpjnQCtpNp7ltDp1iA38=", "dev": true, "requires": { - "consolidate": "0.14.5", - "hash-sum": "1.0.2", - "loader-utils": "1.2.3", - "lru-cache": "4.1.5", - "postcss": "6.0.23", - "postcss-load-config": "1.2.0", - "postcss-selector-parser": "2.2.3", - "prettier": "1.17.1", - "resolve": "1.11.0", - "source-map": "0.6.1", - "vue-hot-reload-api": "2.3.3", - "vue-style-loader": "3.1.2", - "vue-template-es2015-compiler": "1.9.1" + "consolidate": "^0.14.0", + "hash-sum": "^1.0.2", + "loader-utils": "^1.1.0", + "lru-cache": "^4.1.1", + "postcss": "^6.0.8", + "postcss-load-config": "^1.1.0", + "postcss-selector-parser": "^2.0.0", + "prettier": "^1.7.0", + "resolve": "^1.4.0", + "source-map": "^0.6.1", + "vue-hot-reload-api": "^2.2.0", + "vue-style-loader": "^3.0.0", + "vue-template-es2015-compiler": "^1.6.0" }, "dependencies": { "ansi-styles": { @@ -10103,7 +10103,7 @@ "integrity": "sha1-QfuyAkPlCxK+DwS43tvwdSDOhB0=", "dev": true, "requires": { - "color-convert": "1.9.3" + "color-convert": "^1.9.0" } }, "chalk": { @@ -10112,9 +10112,9 @@ "integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.5.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } }, "has-flag": { @@ -10129,9 +10129,9 @@ "integrity": "sha1-YcgswyisYOZ3ZF+XkFTrmLwOMyQ=", "dev": true, "requires": { - "chalk": "2.4.2", - "source-map": "0.6.1", - "supports-color": "5.5.0" + "chalk": "^2.4.1", + "source-map": "^0.6.1", + "supports-color": "^5.4.0" } }, "source-map": { @@ -10146,7 +10146,7 @@ "integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=", "dev": true, "requires": { - "has-flag": "3.0.0" + "has-flag": "^3.0.0" } }, "vue-style-loader": { @@ -10155,8 +10155,8 @@ "integrity": "sha1-a2atNJmPyVIMLx5NX6QJFkHBWXo=", "dev": true, "requires": { - "hash-sum": "1.0.2", - "loader-utils": "1.2.3" + "hash-sum": "^1.0.2", + "loader-utils": "^1.0.2" } } } @@ -10167,8 +10167,8 @@ "integrity": "sha1-3t80mAbyXOtOZPOtfApE+6c1/Pg=", "dev": true, "requires": { - "hash-sum": "1.0.2", - "loader-utils": "1.2.3" + "hash-sum": "^1.0.2", + "loader-utils": "^1.0.2" } }, "vue-template-compiler": { @@ -10177,8 +10177,8 @@ "integrity": "sha1-MjtPNJXwT6o1AzN6gvXWUHeZycw=", "dev": true, "requires": { - "de-indent": "1.0.2", - "he": "1.2.0" + "de-indent": "^1.0.2", + "he": "^1.1.0" } }, "vue-template-es2015-compiler": { @@ -10193,9 +10193,9 @@ "integrity": "sha1-S8EsLr6KonenHx0/FNaFx7RGzQA=", "dev": true, "requires": { - "chokidar": "2.1.6", - "graceful-fs": "4.1.15", - "neo-async": "2.6.1" + "chokidar": "^2.0.2", + "graceful-fs": "^4.1.2", + "neo-async": "^2.5.0" } }, "wbuf": { @@ -10204,7 +10204,7 @@ "integrity": "sha1-wdjRSTFtPqhShIiVy2oL/oh7h98=", "dev": true, "requires": { - "minimalistic-assert": "1.0.1" + "minimalistic-assert": "^1.0.0" } }, "webpack": { @@ -10213,28 +10213,28 @@ "integrity": "sha1-P540NgNwYC/PY56Xk520hvTsDXQ=", "dev": true, "requires": { - "acorn": "5.7.3", - "acorn-dynamic-import": "2.0.2", - "ajv": "6.10.0", - "ajv-keywords": "3.4.0", - "async": "2.6.2", - "enhanced-resolve": "3.4.1", - "escope": "3.6.0", - "interpret": "1.2.0", - "json-loader": "0.5.7", - "json5": "0.5.1", - "loader-runner": "2.4.0", - "loader-utils": "1.2.3", - "memory-fs": "0.4.1", - "mkdirp": "0.5.1", - "node-libs-browser": "2.2.0", - "source-map": "0.5.7", - "supports-color": "4.5.0", - "tapable": "0.2.9", - "uglifyjs-webpack-plugin": "0.4.6", - "watchpack": "1.6.0", - "webpack-sources": "1.3.0", - "yargs": "8.0.2" + "acorn": "^5.0.0", + "acorn-dynamic-import": "^2.0.0", + "ajv": "^6.1.0", + "ajv-keywords": "^3.1.0", + "async": "^2.1.2", + "enhanced-resolve": "^3.4.0", + "escope": "^3.6.0", + "interpret": "^1.0.0", + "json-loader": "^0.5.4", + "json5": "^0.5.1", + "loader-runner": "^2.3.0", + "loader-utils": "^1.1.0", + "memory-fs": "~0.4.1", + "mkdirp": "~0.5.0", + "node-libs-browser": "^2.0.0", + "source-map": "^0.5.3", + "supports-color": "^4.2.1", + "tapable": "^0.2.7", + "uglifyjs-webpack-plugin": "^0.4.6", + "watchpack": "^1.4.0", + "webpack-sources": "^1.0.1", + "yargs": "^8.0.2" }, "dependencies": { "ansi-regex": { @@ -10255,8 +10255,8 @@ "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", "dev": true, "requires": { - "center-align": "0.1.3", - "right-align": "0.1.3", + "center-align": "^0.1.1", + "right-align": "^0.1.1", "wordwrap": "0.0.2" } }, @@ -10272,10 +10272,10 @@ "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", "dev": true, "requires": { - "graceful-fs": "4.1.15", - "parse-json": "2.2.0", - "pify": "2.3.0", - "strip-bom": "3.0.0" + "graceful-fs": "^4.1.2", + "parse-json": "^2.2.0", + "pify": "^2.0.0", + "strip-bom": "^3.0.0" } }, "os-locale": { @@ -10284,9 +10284,9 @@ "integrity": "sha1-QrwpAKa1uL0XN2yOiCtlr8zyS/I=", "dev": true, "requires": { - "execa": "0.7.0", - "lcid": "1.0.0", - "mem": "1.1.0" + "execa": "^0.7.0", + "lcid": "^1.0.0", + "mem": "^1.1.0" } }, "path-type": { @@ -10295,7 +10295,7 @@ "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", "dev": true, "requires": { - "pify": "2.3.0" + "pify": "^2.0.0" } }, "pify": { @@ -10310,9 +10310,9 @@ "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", "dev": true, "requires": { - "load-json-file": "2.0.0", - "normalize-package-data": "2.5.0", - "path-type": "2.0.0" + "load-json-file": "^2.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^2.0.0" } }, "read-pkg-up": { @@ -10321,8 +10321,8 @@ "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=", "dev": true, "requires": { - "find-up": "2.1.0", - "read-pkg": "2.0.0" + "find-up": "^2.0.0", + "read-pkg": "^2.0.0" } }, "string-width": { @@ -10331,8 +10331,8 @@ "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=", "dev": true, "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" }, "dependencies": { "is-fullwidth-code-point": { @@ -10347,7 +10347,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } } } @@ -10364,7 +10364,7 @@ "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", "dev": true, "requires": { - "has-flag": "2.0.0" + "has-flag": "^2.0.0" } }, "uglify-js": { @@ -10373,9 +10373,9 @@ "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=", "dev": true, "requires": { - "source-map": "0.5.7", - "uglify-to-browserify": "1.0.2", - "yargs": "3.10.0" + "source-map": "~0.5.1", + "uglify-to-browserify": "~1.0.0", + "yargs": "~3.10.0" }, "dependencies": { "yargs": { @@ -10384,9 +10384,9 @@ "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", "dev": true, "requires": { - "camelcase": "1.2.1", - "cliui": "2.1.0", - "decamelize": "1.2.0", + "camelcase": "^1.0.2", + "cliui": "^2.1.0", + "decamelize": "^1.0.0", "window-size": "0.1.0" } } @@ -10398,9 +10398,9 @@ "integrity": "sha1-uVH0q7a9YX5m9j64kUmOORdj4wk=", "dev": true, "requires": { - "source-map": "0.5.7", - "uglify-js": "2.8.29", - "webpack-sources": "1.3.0" + "source-map": "^0.5.6", + "uglify-js": "^2.8.29", + "webpack-sources": "^1.0.1" } }, "which-module": { @@ -10421,19 +10421,19 @@ "integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=", "dev": true, "requires": { - "camelcase": "4.1.0", - "cliui": "3.2.0", - "decamelize": "1.2.0", - "get-caller-file": "1.0.3", - "os-locale": "2.1.0", - "read-pkg-up": "2.0.0", - "require-directory": "2.1.1", - "require-main-filename": "1.0.1", - "set-blocking": "2.0.0", - "string-width": "2.1.1", - "which-module": "2.0.0", - "y18n": "3.2.1", - "yargs-parser": "7.0.0" + "camelcase": "^4.1.0", + "cliui": "^3.2.0", + "decamelize": "^1.1.1", + "get-caller-file": "^1.0.1", + "os-locale": "^2.0.0", + "read-pkg-up": "^2.0.0", + "require-directory": "^2.1.1", + "require-main-filename": "^1.0.1", + "set-blocking": "^2.0.0", + "string-width": "^2.0.0", + "which-module": "^2.0.0", + "y18n": "^3.2.1", + "yargs-parser": "^7.0.0" }, "dependencies": { "camelcase": { @@ -10448,9 +10448,9 @@ "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", "dev": true, "requires": { - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wrap-ansi": "2.1.0" + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wrap-ansi": "^2.0.0" }, "dependencies": { "string-width": { @@ -10459,9 +10459,9 @@ "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" } } } @@ -10474,7 +10474,7 @@ "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=", "dev": true, "requires": { - "camelcase": "4.1.0" + "camelcase": "^4.1.0" }, "dependencies": { "camelcase": { @@ -10493,17 +10493,17 @@ "integrity": "sha1-rtJDew2wp/qirShIThZqU2ABSpE=", "dev": true, "requires": { - "chalk": "2.4.2", - "cross-spawn": "6.0.5", - "enhanced-resolve": "4.1.0", - "findup-sync": "2.0.0", - "global-modules": "1.0.0", - "import-local": "2.0.0", - "interpret": "1.2.0", - "loader-utils": "1.2.3", - "supports-color": "5.5.0", - "v8-compile-cache": "2.0.3", - "yargs": "12.0.5" + "chalk": "^2.4.1", + "cross-spawn": "^6.0.5", + "enhanced-resolve": "^4.1.0", + "findup-sync": "^2.0.0", + "global-modules": "^1.0.0", + "import-local": "^2.0.0", + "interpret": "^1.1.0", + "loader-utils": "^1.1.0", + "supports-color": "^5.5.0", + "v8-compile-cache": "^2.0.2", + "yargs": "^12.0.5" }, "dependencies": { "ansi-regex": { @@ -10518,7 +10518,7 @@ "integrity": "sha1-QfuyAkPlCxK+DwS43tvwdSDOhB0=", "dev": true, "requires": { - "color-convert": "1.9.3" + "color-convert": "^1.9.0" } }, "camelcase": { @@ -10533,9 +10533,9 @@ "integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.5.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } }, "cliui": { @@ -10544,9 +10544,9 @@ "integrity": "sha1-NIQi2+gtgAswIu709qwQvy5NG0k=", "dev": true, "requires": { - "string-width": "2.1.1", - "strip-ansi": "4.0.0", - "wrap-ansi": "2.1.0" + "string-width": "^2.1.1", + "strip-ansi": "^4.0.0", + "wrap-ansi": "^2.0.0" } }, "enhanced-resolve": { @@ -10555,9 +10555,9 @@ "integrity": "sha1-Qcfgv9/nSsH/4eV61qXGyfN0Kn8=", "dev": true, "requires": { - "graceful-fs": "4.1.15", - "memory-fs": "0.4.1", - "tapable": "1.1.3" + "graceful-fs": "^4.1.2", + "memory-fs": "^0.4.0", + "tapable": "^1.0.0" } }, "execa": { @@ -10566,13 +10566,13 @@ "integrity": "sha1-xiNqW7TfbW8V6I5/AXeYIWdJ3dg=", "dev": true, "requires": { - "cross-spawn": "6.0.5", - "get-stream": "4.1.0", - "is-stream": "1.1.0", - "npm-run-path": "2.0.2", - "p-finally": "1.0.0", - "signal-exit": "3.0.2", - "strip-eof": "1.0.0" + "cross-spawn": "^6.0.0", + "get-stream": "^4.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" } }, "find-up": { @@ -10581,7 +10581,7 @@ "integrity": "sha1-SRafHXmTQwZG2mHsxa41XCHJe3M=", "dev": true, "requires": { - "locate-path": "3.0.0" + "locate-path": "^3.0.0" } }, "get-stream": { @@ -10590,7 +10590,7 @@ "integrity": "sha1-wbJVV189wh1Zv8ec09K0axw6VLU=", "dev": true, "requires": { - "pump": "3.0.0" + "pump": "^3.0.0" } }, "has-flag": { @@ -10617,7 +10617,7 @@ "integrity": "sha1-bvXS32DlL4LrIopMNz6NHzlyU88=", "dev": true, "requires": { - "invert-kv": "2.0.0" + "invert-kv": "^2.0.0" } }, "locate-path": { @@ -10626,8 +10626,8 @@ "integrity": "sha1-2+w7OrdZdYBxtY/ln8QYca8hQA4=", "dev": true, "requires": { - "p-locate": "3.0.0", - "path-exists": "3.0.0" + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" } }, "mem": { @@ -10636,9 +10636,9 @@ "integrity": "sha1-Rhr0l7xK4JYIzbLmDu+2m/90QXg=", "dev": true, "requires": { - "map-age-cleaner": "0.1.3", - "mimic-fn": "2.1.0", - "p-is-promise": "2.1.0" + "map-age-cleaner": "^0.1.1", + "mimic-fn": "^2.0.0", + "p-is-promise": "^2.0.0" } }, "mimic-fn": { @@ -10653,9 +10653,9 @@ "integrity": "sha1-qAKm7hfyTBBIOrmTVxnO9O0Wvxo=", "dev": true, "requires": { - "execa": "1.0.0", - "lcid": "2.0.0", - "mem": "4.3.0" + "execa": "^1.0.0", + "lcid": "^2.0.0", + "mem": "^4.0.0" } }, "p-limit": { @@ -10664,7 +10664,7 @@ "integrity": "sha1-QXyZQeYCepq8ulCS3SkE4lW1+8I=", "dev": true, "requires": { - "p-try": "2.2.0" + "p-try": "^2.0.0" } }, "p-locate": { @@ -10673,7 +10673,7 @@ "integrity": "sha1-Mi1poFwCZLJZl9n0DNiokasAZKQ=", "dev": true, "requires": { - "p-limit": "2.2.0" + "p-limit": "^2.0.0" } }, "p-try": { @@ -10688,8 +10688,8 @@ "integrity": "sha1-tKIRaBW94vTh6mAjVOjHVWUQemQ=", "dev": true, "requires": { - "end-of-stream": "1.4.1", - "once": "1.4.0" + "end-of-stream": "^1.1.0", + "once": "^1.3.1" } }, "string-width": { @@ -10698,8 +10698,8 @@ "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=", "dev": true, "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" } }, "strip-ansi": { @@ -10708,7 +10708,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } }, "supports-color": { @@ -10717,7 +10717,7 @@ "integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=", "dev": true, "requires": { - "has-flag": "3.0.0" + "has-flag": "^3.0.0" } }, "tapable": { @@ -10738,18 +10738,18 @@ "integrity": "sha1-BfWZe2CWR7ZPZrgeO0sQo2jnrRM=", "dev": true, "requires": { - "cliui": "4.1.0", - "decamelize": "1.2.0", - "find-up": "3.0.0", - "get-caller-file": "1.0.3", - "os-locale": "3.1.0", - "require-directory": "2.1.1", - "require-main-filename": "1.0.1", - "set-blocking": "2.0.0", - "string-width": "2.1.1", - "which-module": "2.0.0", - "y18n": "4.0.0", - "yargs-parser": "11.1.1" + "cliui": "^4.0.0", + "decamelize": "^1.2.0", + "find-up": "^3.0.0", + "get-caller-file": "^1.0.1", + "os-locale": "^3.0.0", + "require-directory": "^2.1.1", + "require-main-filename": "^1.0.1", + "set-blocking": "^2.0.0", + "string-width": "^2.0.0", + "which-module": "^2.0.0", + "y18n": "^3.2.1 || ^4.0.0", + "yargs-parser": "^11.1.1" } }, "yargs-parser": { @@ -10758,8 +10758,8 @@ "integrity": "sha1-h5oIZZc7yp9rq1y987HGfsfTvPQ=", "dev": true, "requires": { - "camelcase": "5.3.1", - "decamelize": "1.2.0" + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" } } } @@ -10770,11 +10770,11 @@ "integrity": "sha1-+PwRIM47T8VoDO7LQ9d3lmshEF4=", "dev": true, "requires": { - "memory-fs": "0.4.1", - "mime": "1.6.0", - "path-is-absolute": "1.0.1", - "range-parser": "1.2.1", - "time-stamp": "2.2.0" + "memory-fs": "~0.4.1", + "mime": "^1.5.0", + "path-is-absolute": "^1.0.0", + "range-parser": "^1.0.3", + "time-stamp": "^2.0.0" } }, "webpack-dev-server": { @@ -10784,30 +10784,30 @@ "dev": true, "requires": { "ansi-html": "0.0.7", - "array-includes": "3.0.3", - "bonjour": "3.5.0", - "chokidar": "2.1.6", - "compression": "1.7.4", - "connect-history-api-fallback": "1.6.0", - "debug": "3.2.6", - "del": "3.0.0", - "express": "4.17.1", - "html-entities": "1.2.1", - "http-proxy-middleware": "0.19.1", - "import-local": "1.0.0", + "array-includes": "^3.0.3", + "bonjour": "^3.5.0", + "chokidar": "^2.1.2", + "compression": "^1.7.3", + "connect-history-api-fallback": "^1.3.0", + "debug": "^3.1.0", + "del": "^3.0.0", + "express": "^4.16.2", + "html-entities": "^1.2.0", + "http-proxy-middleware": "^0.19.1", + "import-local": "^1.0.0", "internal-ip": "1.2.0", - "ip": "1.1.5", - "killable": "1.0.1", - "loglevel": "1.6.1", - "opn": "5.5.0", - "portfinder": "1.0.20", - "selfsigned": "1.10.4", - "serve-index": "1.9.1", + "ip": "^1.1.5", + "killable": "^1.0.0", + "loglevel": "^1.4.1", + "opn": "^5.1.0", + "portfinder": "^1.0.9", + "selfsigned": "^1.9.1", + "serve-index": "^1.9.1", "sockjs": "0.3.19", "sockjs-client": "1.1.5", - "spdy": "4.0.0", - "strip-ansi": "3.0.1", - "supports-color": "5.5.0", + "spdy": "^4.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^5.1.0", "webpack-dev-middleware": "1.12.2", "yargs": "6.6.0" }, @@ -10824,7 +10824,7 @@ "integrity": "sha1-6D0X3hbYp++3cX7b5fsQE17uYps=", "dev": true, "requires": { - "ms": "2.1.1" + "ms": "^2.1.1" } }, "has-flag": { @@ -10839,8 +10839,8 @@ "integrity": "sha1-Xk/9wD9P5sAJxnKb6yljHC+CJ7w=", "dev": true, "requires": { - "pkg-dir": "2.0.0", - "resolve-cwd": "2.0.0" + "pkg-dir": "^2.0.0", + "resolve-cwd": "^2.0.0" } }, "ms": { @@ -10855,7 +10855,7 @@ "integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=", "dev": true, "requires": { - "has-flag": "3.0.0" + "has-flag": "^3.0.0" } }, "y18n": { @@ -10870,19 +10870,19 @@ "integrity": "sha1-eC7CHvQDNF+DCoCMo9UTr1YGUgg=", "dev": true, "requires": { - "camelcase": "3.0.0", - "cliui": "3.2.0", - "decamelize": "1.2.0", - "get-caller-file": "1.0.3", - "os-locale": "1.4.0", - "read-pkg-up": "1.0.1", - "require-directory": "2.1.1", - "require-main-filename": "1.0.1", - "set-blocking": "2.0.0", - "string-width": "1.0.2", - "which-module": "1.0.0", - "y18n": "3.2.1", - "yargs-parser": "4.2.1" + "camelcase": "^3.0.0", + "cliui": "^3.2.0", + "decamelize": "^1.1.1", + "get-caller-file": "^1.0.1", + "os-locale": "^1.4.0", + "read-pkg-up": "^1.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^1.0.1", + "set-blocking": "^2.0.0", + "string-width": "^1.0.2", + "which-module": "^1.0.0", + "y18n": "^3.2.1", + "yargs-parser": "^4.2.0" } }, "yargs-parser": { @@ -10891,7 +10891,7 @@ "integrity": "sha1-KczqwNxPA8bIe0qfIX3RjJ90hxw=", "dev": true, "requires": { - "camelcase": "3.0.0" + "camelcase": "^3.0.0" } } } @@ -10913,8 +10913,8 @@ "integrity": "sha1-KijcufH0X+lg2PFJMlK17mUw+oU=", "dev": true, "requires": { - "source-list-map": "2.0.1", - "source-map": "0.6.1" + "source-list-map": "^2.0.0", + "source-map": "~0.6.1" }, "dependencies": { "source-map": { @@ -10931,8 +10931,8 @@ "integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=", "dev": true, "requires": { - "http-parser-js": "0.5.0", - "websocket-extensions": "0.1.3" + "http-parser-js": ">=0.4.0", + "websocket-extensions": ">=0.1.1" } }, "websocket-extensions": { @@ -10953,7 +10953,7 @@ "integrity": "sha1-pFBD1U9YBTFtqNYvn1CRjT2nCwo=", "dev": true, "requires": { - "isexe": "2.0.0" + "isexe": "^2.0.0" } }, "which-module": { @@ -10968,7 +10968,7 @@ "integrity": "sha1-rgdOa9wMFKQx6ATmJFScYzsABFc=", "dev": true, "requires": { - "string-width": "1.0.2" + "string-width": "^1.0.2 || 2" } }, "window-size": { @@ -10989,7 +10989,7 @@ "integrity": "sha1-JqlMU5G7ypJhUgAvabhKS/dy5ag=", "dev": true, "requires": { - "errno": "0.1.7" + "errno": "~0.1.7" } }, "wrap-ansi": { @@ -10998,8 +10998,8 @@ "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", "dev": true, "requires": { - "string-width": "1.0.2", - "strip-ansi": "3.0.1" + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1" } }, "wrappy": { @@ -11013,7 +11013,7 @@ "resolved": "https://registry.npmjs.org/x2js/-/x2js-3.3.1.tgz", "integrity": "sha512-UruP3F9pgFlGbgm/8i28AiNSLN4jlcu8GMBbzuqLqAzV3O49WQDtmJeLefYy8hmBnTEtQEUvPQG8EDFCDDyP6g==", "requires": { - "xmldom": "0.1.27" + "xmldom": "^0.1.19" } }, "xml-char-classes": { @@ -11057,19 +11057,19 @@ "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=", "dev": true, "requires": { - "camelcase": "3.0.0", - "cliui": "3.2.0", - "decamelize": "1.2.0", - "get-caller-file": "1.0.3", - "os-locale": "1.4.0", - "read-pkg-up": "1.0.1", - "require-directory": "2.1.1", - "require-main-filename": "1.0.1", - "set-blocking": "2.0.0", - "string-width": "1.0.2", - "which-module": "1.0.0", - "y18n": "3.2.1", - "yargs-parser": "5.0.0" + "camelcase": "^3.0.0", + "cliui": "^3.2.0", + "decamelize": "^1.1.1", + "get-caller-file": "^1.0.1", + "os-locale": "^1.4.0", + "read-pkg-up": "^1.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^1.0.1", + "set-blocking": "^2.0.0", + "string-width": "^1.0.2", + "which-module": "^1.0.0", + "y18n": "^3.2.1", + "yargs-parser": "^5.0.0" }, "dependencies": { "camelcase": { @@ -11092,7 +11092,7 @@ "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=", "dev": true, "requires": { - "camelcase": "3.0.0" + "camelcase": "^3.0.0" }, "dependencies": { "camelcase": { From e05ae8fb6a3824402826fa6d32e15498568341e8 Mon Sep 17 00:00:00 2001 From: caiying <2841902102@qq.com> Date: Wed, 27 Nov 2019 14:46:48 +0800 Subject: [PATCH 64/82] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E6=9C=89?= =?UTF-8?q?=E4=BF=A9beforeDestory(),=20=E7=AC=AC=E4=BA=8C=E4=B8=AA?= =?UTF-8?q?=E7=A9=BA=E7=9A=84=E8=A6=86=E7=9B=96=E4=BA=86=E4=B8=8A=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controls/MainBarControl/Entity/index.vue | 4 ++-- .../components/tools/EntityMoreTool/index.vue | 20 +++++++++--------- .../viztools/CustomPrimitiveTool/index.vue | 10 ++++----- .../viztools/FlattenningTool/index.vue | 10 ++++----- Source/components/viztools/GeoArc/index.vue | 10 ++++----- .../components/viztools/GeoBezier2/index.vue | 10 ++++----- .../components/viztools/GeoBezier3/index.vue | 10 ++++----- .../components/viztools/GeoCircle/index.vue | 10 ++++----- .../viztools/GeoCurveArrow/index.vue | 10 ++++----- .../viztools/GeoCurveFlag/index.vue | 11 +++++----- .../viztools/GeoDoubleArrow/index.vue | 11 +++++----- .../viztools/GeoParallelSearch/index.vue | 11 +++++----- .../components/viztools/GeoPolygon/index.vue | 11 +++++----- .../components/viztools/GeoPolyline/index.vue | 11 +++++----- .../viztools/GeoPolylineArrow/index.vue | 11 +++++----- .../viztools/GeoRectangle/index.vue | 11 +++++----- .../viztools/GeoRightAngleFlag/index.vue | 11 +++++----- .../components/viztools/GeoSector/index.vue | 11 +++++----- .../viztools/GeoSectorSearch/index.vue | 11 +++++----- .../components/viztools/GeoTriFlag/index.vue | 11 +++++----- .../components/viztools/ModelTool/index.vue | 10 ++++----- Source/components/viztools/PathTool/index.vue | 10 ++++----- .../components/viztools/PinDivTool/index.vue | 10 ++++----- .../viztools/PinPictureTool/index.vue | 10 ++++----- Source/components/viztools/PinTool/index.vue | 11 +++++----- .../viztools/PolylineTool/index.vue | 11 +++++----- .../viztools/ScanlineTool/index.vue | 10 ++++----- Source/components/viztools/TubeTool/index.vue | 21 +++++++++---------- 28 files changed, 135 insertions(+), 173 deletions(-) diff --git a/Source/components/controls/MainBarControl/Entity/index.vue b/Source/components/controls/MainBarControl/Entity/index.vue index ea31bcae..9f6a6ae1 100644 --- a/Source/components/controls/MainBarControl/Entity/index.vue +++ b/Source/components/controls/MainBarControl/Entity/index.vue @@ -376,7 +376,7 @@ export default { Scanline.creating = true; Scanline.isCreating = true; Scanline.playing = true; - console.log(Scanline); + // console.log(Scanline); this.$root.$earthUI.showPropertyWindow(Scanline); }, //打开自定义图元-动画 @@ -394,7 +394,7 @@ export default { Tube.name = "管道"; Tube.isCreating = true; Tube.registerEditing(); - // Tube.creating = true; + Tube.creating = true; console.log(Tube); this.$root.$earthUI.showPropertyWindow(Tube); }, diff --git a/Source/components/tools/EntityMoreTool/index.vue b/Source/components/tools/EntityMoreTool/index.vue index f7d0b308..c0ba9602 100644 --- a/Source/components/tools/EntityMoreTool/index.vue +++ b/Source/components/tools/EntityMoreTool/index.vue @@ -42,7 +42,7 @@
  • {{lang.arc}}
  • {{lang.bezier2}}
  • {{lang.bezier3}}
    • -
  • {{lang.parallelsearch}}
    • +
    @@ -265,15 +265,15 @@ export default { this.$root.$earthUI.showPropertyWindow(Bezier3); }, // 平行搜寻区 - ParallelSearch() { - var ParallelSearch = new XE.Obj.Plots.GeoParallelSearch( - this.$root.$earth - ); - ParallelSearch.creating = true; - ParallelSearch.isCreating = true; - ParallelSearch.name = "平行搜寻区"; - this.$root.$earthUI.showPropertyWindow(ParallelSearch); - }, + // ParallelSearch() { + // var ParallelSearch = new XE.Obj.Plots.GeoParallelSearch( + // this.$root.$earth + // ); + // ParallelSearch.creating = true; + // ParallelSearch.isCreating = true; + // ParallelSearch.name = "平行搜寻区"; + // this.$root.$earthUI.showPropertyWindow(ParallelSearch); + // }, // 圆 Circle() { var Circle = new XE.Obj.Plots.GeoCircle(this.$root.$earth); diff --git a/Source/components/viztools/CustomPrimitiveTool/index.vue b/Source/components/viztools/CustomPrimitiveTool/index.vue index c4970123..c1b4d279 100644 --- a/Source/components/viztools/CustomPrimitiveTool/index.vue +++ b/Source/components/viztools/CustomPrimitiveTool/index.vue @@ -327,10 +327,6 @@ export default { this._disposers.push(XE.MVVM.bind(this, "bgbaseColor", czmObj, "color")); } }, - beforeDestroy() { - this._polygonDisposers = this._polygonDisposers && this._polygonDisposers(); - this._disposers = this._disposers && this._disposers(); - }, computed: { name() { return this.model.name; @@ -515,8 +511,10 @@ export default { } }, beforeDestroy() { - //销毁监控 - // this.disAutorun(); + // 解绑数据关联 + this._polygonDisposers = this._polygonDisposers && this._polygonDisposers(); + this._disposers.forEach(e => e()); + this._disposers.length = 0; } }; diff --git a/Source/components/viztools/FlattenningTool/index.vue b/Source/components/viztools/FlattenningTool/index.vue index 7fab0dd2..66d84824 100644 --- a/Source/components/viztools/FlattenningTool/index.vue +++ b/Source/components/viztools/FlattenningTool/index.vue @@ -218,10 +218,6 @@ export default { flattenning.addEventListener("dragover", handleDragOver, false); flattenning.addEventListener("drop", handleFileSelect, false); }, - beforeDestroy() { - this._polygonDisposers = this._polygonDisposers && this._polygonDisposers(); - this._disposers = this._disposers && this._disposers(); - }, computed: { name() { return this.attribute.name; @@ -338,8 +334,10 @@ export default { } }, beforeDestroy() { - //销毁监控 - // this.disAutorun(); + // 解绑数据关联 + this._polygonDisposers = this._polygonDisposers && this._polygonDisposers(); + this._disposers.forEach(e => e()); + this._disposers.length = 0; } }; diff --git a/Source/components/viztools/GeoArc/index.vue b/Source/components/viztools/GeoArc/index.vue index 871200ac..b40d02a9 100644 --- a/Source/components/viztools/GeoArc/index.vue +++ b/Source/components/viztools/GeoArc/index.vue @@ -129,10 +129,6 @@ export default { this._disposers.push(XE.MVVM.bind(this, "bgbaseColor", czmObj, "color")); } }, - beforeDestroy() { - this._polygonDisposers = this._polygonDisposers && this._polygonDisposers(); - this._disposers = this._disposers && this._disposers(); - }, computed: { name() { return this.model.name; @@ -196,8 +192,10 @@ export default { } }, beforeDestroy() { - //销毁监控 - // this.disAutorun(); + // 解绑数据关联 + this._polygonDisposers = this._polygonDisposers && this._polygonDisposers(); + this._disposers.forEach(e => e()); + this._disposers.length = 0; } }; diff --git a/Source/components/viztools/GeoBezier2/index.vue b/Source/components/viztools/GeoBezier2/index.vue index 871200ac..b40d02a9 100644 --- a/Source/components/viztools/GeoBezier2/index.vue +++ b/Source/components/viztools/GeoBezier2/index.vue @@ -129,10 +129,6 @@ export default { this._disposers.push(XE.MVVM.bind(this, "bgbaseColor", czmObj, "color")); } }, - beforeDestroy() { - this._polygonDisposers = this._polygonDisposers && this._polygonDisposers(); - this._disposers = this._disposers && this._disposers(); - }, computed: { name() { return this.model.name; @@ -196,8 +192,10 @@ export default { } }, beforeDestroy() { - //销毁监控 - // this.disAutorun(); + // 解绑数据关联 + this._polygonDisposers = this._polygonDisposers && this._polygonDisposers(); + this._disposers.forEach(e => e()); + this._disposers.length = 0; } }; diff --git a/Source/components/viztools/GeoBezier3/index.vue b/Source/components/viztools/GeoBezier3/index.vue index 871200ac..b40d02a9 100644 --- a/Source/components/viztools/GeoBezier3/index.vue +++ b/Source/components/viztools/GeoBezier3/index.vue @@ -129,10 +129,6 @@ export default { this._disposers.push(XE.MVVM.bind(this, "bgbaseColor", czmObj, "color")); } }, - beforeDestroy() { - this._polygonDisposers = this._polygonDisposers && this._polygonDisposers(); - this._disposers = this._disposers && this._disposers(); - }, computed: { name() { return this.model.name; @@ -196,8 +192,10 @@ export default { } }, beforeDestroy() { - //销毁监控 - // this.disAutorun(); + // 解绑数据关联 + this._polygonDisposers = this._polygonDisposers && this._polygonDisposers(); + this._disposers.forEach(e => e()); + this._disposers.length = 0; } }; diff --git a/Source/components/viztools/GeoCircle/index.vue b/Source/components/viztools/GeoCircle/index.vue index c2d4ed07..c3dedfcb 100644 --- a/Source/components/viztools/GeoCircle/index.vue +++ b/Source/components/viztools/GeoCircle/index.vue @@ -168,10 +168,6 @@ export default { ); } }, - beforeDestroy() { - this._polygonDisposers = this._polygonDisposers && this._polygonDisposers(); - this._disposers = this._disposers && this._disposers(); - }, computed: { name() { return this.model.name; @@ -253,8 +249,10 @@ export default { } }, beforeDestroy() { - //销毁监控 - // this.disAutorun(); + // 解绑数据关联 + this._polygonDisposers = this._polygonDisposers && this._polygonDisposers(); + this._disposers.forEach(e => e()); + this._disposers.length = 0; } }; diff --git a/Source/components/viztools/GeoCurveArrow/index.vue b/Source/components/viztools/GeoCurveArrow/index.vue index b22694c6..7d0b9d23 100644 --- a/Source/components/viztools/GeoCurveArrow/index.vue +++ b/Source/components/viztools/GeoCurveArrow/index.vue @@ -129,10 +129,6 @@ export default { this._disposers.push(XE.MVVM.bind(this, "bgbaseColor", czmObj, "color")); } }, - beforeDestroy() { - this._polygonDisposers = this._polygonDisposers && this._polygonDisposers(); - this._disposers = this._disposers && this._disposers(); - }, computed: { name() { return this.model.name; @@ -196,8 +192,10 @@ export default { } }, beforeDestroy() { - //销毁监控 - // this.disAutorun(); + // 解绑数据关联 + this._polygonDisposers = this._polygonDisposers && this._polygonDisposers(); + this._disposers.forEach(e => e()); + this._disposers.length = 0; } }; diff --git a/Source/components/viztools/GeoCurveFlag/index.vue b/Source/components/viztools/GeoCurveFlag/index.vue index c2d4ed07..72c0daa7 100644 --- a/Source/components/viztools/GeoCurveFlag/index.vue +++ b/Source/components/viztools/GeoCurveFlag/index.vue @@ -168,10 +168,7 @@ export default { ); } }, - beforeDestroy() { - this._polygonDisposers = this._polygonDisposers && this._polygonDisposers(); - this._disposers = this._disposers && this._disposers(); - }, + computed: { name() { return this.model.name; @@ -253,8 +250,10 @@ export default { } }, beforeDestroy() { - //销毁监控 - // this.disAutorun(); + // 解绑数据关联 + this._polygonDisposers = this._polygonDisposers && this._polygonDisposers(); + this._disposers.forEach(e => e()); + this._disposers.length = 0; } }; diff --git a/Source/components/viztools/GeoDoubleArrow/index.vue b/Source/components/viztools/GeoDoubleArrow/index.vue index 49f4df88..274dbba5 100644 --- a/Source/components/viztools/GeoDoubleArrow/index.vue +++ b/Source/components/viztools/GeoDoubleArrow/index.vue @@ -168,10 +168,7 @@ export default { ); } }, - beforeDestroy() { - this._polygonDisposers = this._polygonDisposers && this._polygonDisposers(); - this._disposers = this._disposers && this._disposers(); - }, + computed: { name() { return this.model.name; @@ -253,8 +250,10 @@ export default { } }, beforeDestroy() { - //销毁监控 - // this.disAutorun(); + // 解绑数据关联 + this._polygonDisposers = this._polygonDisposers && this._polygonDisposers(); + this._disposers.forEach(e => e()); + this._disposers.length = 0; } }; diff --git a/Source/components/viztools/GeoParallelSearch/index.vue b/Source/components/viztools/GeoParallelSearch/index.vue index 871200ac..db3a60a2 100644 --- a/Source/components/viztools/GeoParallelSearch/index.vue +++ b/Source/components/viztools/GeoParallelSearch/index.vue @@ -129,10 +129,7 @@ export default { this._disposers.push(XE.MVVM.bind(this, "bgbaseColor", czmObj, "color")); } }, - beforeDestroy() { - this._polygonDisposers = this._polygonDisposers && this._polygonDisposers(); - this._disposers = this._disposers && this._disposers(); - }, + computed: { name() { return this.model.name; @@ -196,8 +193,10 @@ export default { } }, beforeDestroy() { - //销毁监控 - // this.disAutorun(); + // 解绑数据关联 + this._polygonDisposers = this._polygonDisposers && this._polygonDisposers(); + this._disposers.forEach(e => e()); + this._disposers.length = 0; } }; diff --git a/Source/components/viztools/GeoPolygon/index.vue b/Source/components/viztools/GeoPolygon/index.vue index 49f4df88..274dbba5 100644 --- a/Source/components/viztools/GeoPolygon/index.vue +++ b/Source/components/viztools/GeoPolygon/index.vue @@ -168,10 +168,7 @@ export default { ); } }, - beforeDestroy() { - this._polygonDisposers = this._polygonDisposers && this._polygonDisposers(); - this._disposers = this._disposers && this._disposers(); - }, + computed: { name() { return this.model.name; @@ -253,8 +250,10 @@ export default { } }, beforeDestroy() { - //销毁监控 - // this.disAutorun(); + // 解绑数据关联 + this._polygonDisposers = this._polygonDisposers && this._polygonDisposers(); + this._disposers.forEach(e => e()); + this._disposers.length = 0; } }; diff --git a/Source/components/viztools/GeoPolyline/index.vue b/Source/components/viztools/GeoPolyline/index.vue index 871200ac..db3a60a2 100644 --- a/Source/components/viztools/GeoPolyline/index.vue +++ b/Source/components/viztools/GeoPolyline/index.vue @@ -129,10 +129,7 @@ export default { this._disposers.push(XE.MVVM.bind(this, "bgbaseColor", czmObj, "color")); } }, - beforeDestroy() { - this._polygonDisposers = this._polygonDisposers && this._polygonDisposers(); - this._disposers = this._disposers && this._disposers(); - }, + computed: { name() { return this.model.name; @@ -196,8 +193,10 @@ export default { } }, beforeDestroy() { - //销毁监控 - // this.disAutorun(); + // 解绑数据关联 + this._polygonDisposers = this._polygonDisposers && this._polygonDisposers(); + this._disposers.forEach(e => e()); + this._disposers.length = 0; } }; diff --git a/Source/components/viztools/GeoPolylineArrow/index.vue b/Source/components/viztools/GeoPolylineArrow/index.vue index 871200ac..db3a60a2 100644 --- a/Source/components/viztools/GeoPolylineArrow/index.vue +++ b/Source/components/viztools/GeoPolylineArrow/index.vue @@ -129,10 +129,7 @@ export default { this._disposers.push(XE.MVVM.bind(this, "bgbaseColor", czmObj, "color")); } }, - beforeDestroy() { - this._polygonDisposers = this._polygonDisposers && this._polygonDisposers(); - this._disposers = this._disposers && this._disposers(); - }, + computed: { name() { return this.model.name; @@ -196,8 +193,10 @@ export default { } }, beforeDestroy() { - //销毁监控 - // this.disAutorun(); + // 解绑数据关联 + this._polygonDisposers = this._polygonDisposers && this._polygonDisposers(); + this._disposers.forEach(e => e()); + this._disposers.length = 0; } }; diff --git a/Source/components/viztools/GeoRectangle/index.vue b/Source/components/viztools/GeoRectangle/index.vue index c2d4ed07..72c0daa7 100644 --- a/Source/components/viztools/GeoRectangle/index.vue +++ b/Source/components/viztools/GeoRectangle/index.vue @@ -168,10 +168,7 @@ export default { ); } }, - beforeDestroy() { - this._polygonDisposers = this._polygonDisposers && this._polygonDisposers(); - this._disposers = this._disposers && this._disposers(); - }, + computed: { name() { return this.model.name; @@ -253,8 +250,10 @@ export default { } }, beforeDestroy() { - //销毁监控 - // this.disAutorun(); + // 解绑数据关联 + this._polygonDisposers = this._polygonDisposers && this._polygonDisposers(); + this._disposers.forEach(e => e()); + this._disposers.length = 0; } }; diff --git a/Source/components/viztools/GeoRightAngleFlag/index.vue b/Source/components/viztools/GeoRightAngleFlag/index.vue index c2d4ed07..72c0daa7 100644 --- a/Source/components/viztools/GeoRightAngleFlag/index.vue +++ b/Source/components/viztools/GeoRightAngleFlag/index.vue @@ -168,10 +168,7 @@ export default { ); } }, - beforeDestroy() { - this._polygonDisposers = this._polygonDisposers && this._polygonDisposers(); - this._disposers = this._disposers && this._disposers(); - }, + computed: { name() { return this.model.name; @@ -253,8 +250,10 @@ export default { } }, beforeDestroy() { - //销毁监控 - // this.disAutorun(); + // 解绑数据关联 + this._polygonDisposers = this._polygonDisposers && this._polygonDisposers(); + this._disposers.forEach(e => e()); + this._disposers.length = 0; } }; diff --git a/Source/components/viztools/GeoSector/index.vue b/Source/components/viztools/GeoSector/index.vue index 49f4df88..274dbba5 100644 --- a/Source/components/viztools/GeoSector/index.vue +++ b/Source/components/viztools/GeoSector/index.vue @@ -168,10 +168,7 @@ export default { ); } }, - beforeDestroy() { - this._polygonDisposers = this._polygonDisposers && this._polygonDisposers(); - this._disposers = this._disposers && this._disposers(); - }, + computed: { name() { return this.model.name; @@ -253,8 +250,10 @@ export default { } }, beforeDestroy() { - //销毁监控 - // this.disAutorun(); + // 解绑数据关联 + this._polygonDisposers = this._polygonDisposers && this._polygonDisposers(); + this._disposers.forEach(e => e()); + this._disposers.length = 0; } }; diff --git a/Source/components/viztools/GeoSectorSearch/index.vue b/Source/components/viztools/GeoSectorSearch/index.vue index c100fbcb..9d3b12e7 100644 --- a/Source/components/viztools/GeoSectorSearch/index.vue +++ b/Source/components/viztools/GeoSectorSearch/index.vue @@ -130,10 +130,7 @@ export default { this._disposers.push(XE.MVVM.bind(this, "bgbaseColor", czmObj, "color")); } }, - beforeDestroy() { - this._polygonDisposers = this._polygonDisposers && this._polygonDisposers(); - this._disposers = this._disposers && this._disposers(); - }, + computed: { name() { return this.model.name; @@ -197,8 +194,10 @@ export default { } }, beforeDestroy() { - //销毁监控 - // this.disAutorun(); + // 解绑数据关联 + this._polygonDisposers = this._polygonDisposers && this._polygonDisposers(); + this._disposers.forEach(e => e()); + this._disposers.length = 0; } }; diff --git a/Source/components/viztools/GeoTriFlag/index.vue b/Source/components/viztools/GeoTriFlag/index.vue index 04ab627f..19facbf1 100644 --- a/Source/components/viztools/GeoTriFlag/index.vue +++ b/Source/components/viztools/GeoTriFlag/index.vue @@ -169,10 +169,7 @@ export default { ); } }, - beforeDestroy() { - this._polygonDisposers = this._polygonDisposers && this._polygonDisposers(); - this._disposers = this._disposers && this._disposers(); - }, + computed: { name() { return this.model.name; @@ -254,8 +251,10 @@ export default { } }, beforeDestroy() { - //销毁监控 - // this.disAutorun(); + // 解绑数据关联 + this._polygonDisposers = this._polygonDisposers && this._polygonDisposers(); + this._disposers.forEach(e => e()); + this._disposers.length = 0; } }; diff --git a/Source/components/viztools/ModelTool/index.vue b/Source/components/viztools/ModelTool/index.vue index 3e58554e..7f177998 100644 --- a/Source/components/viztools/ModelTool/index.vue +++ b/Source/components/viztools/ModelTool/index.vue @@ -182,10 +182,6 @@ export default { }); } }, - beforeDestroy() { - this._polygonDisposers = this._polygonDisposers && this._polygonDisposers(); - this._disposers = this._disposers && this._disposers(); - }, computed: { name() { return this.model.name; @@ -255,8 +251,10 @@ export default { } }, beforeDestroy() { - //销毁监控 - // this.disAutorun(); + // 解绑数据关联 + this._polygonDisposers = this._polygonDisposers && this._polygonDisposers(); + this._disposers.forEach(e => e()); + this._disposers.length = 0; } }; diff --git a/Source/components/viztools/PathTool/index.vue b/Source/components/viztools/PathTool/index.vue index e2ef71dd..a92794bb 100644 --- a/Source/components/viztools/PathTool/index.vue +++ b/Source/components/viztools/PathTool/index.vue @@ -260,10 +260,6 @@ export default { btn.addEventListener("dragover", handleDragOver, false); btn.addEventListener("drop", handleFileSelect, false); }, - beforeDestroy() { - this._polygonDisposers = this._polygonDisposers && this._polygonDisposers(); - this._disposers = this._disposers && this._disposers(); - }, computed: { name() { return this.path.name; @@ -358,8 +354,10 @@ export default { } }, beforeDestroy() { - //销毁监控 - // this.disAutorun(); + // 解绑数据关联 + this._polygonDisposers = this._polygonDisposers && this._polygonDisposers(); + this._disposers.forEach(e => e()); + this._disposers.length = 0; } }; diff --git a/Source/components/viztools/PinDivTool/index.vue b/Source/components/viztools/PinDivTool/index.vue index 63414bbd..04712a9d 100644 --- a/Source/components/viztools/PinDivTool/index.vue +++ b/Source/components/viztools/PinDivTool/index.vue @@ -202,10 +202,6 @@ export default { console.log(this._czmObj.defaultImgUrl()); } }, - beforeDestroy() { - this._polygonDisposers = this._polygonDisposers && this._polygonDisposers(); - this._disposers = this._disposers && this._disposers(); - }, computed: { name() { return this.pin.name; @@ -298,8 +294,10 @@ export default { } }, beforeDestroy() { - //销毁监控 - // this.disAutorun(); + // 解绑数据关联 + this._polygonDisposers = this._polygonDisposers && this._polygonDisposers(); + this._disposers.forEach(e => e()); + this._disposers.length = 0; } }; diff --git a/Source/components/viztools/PinPictureTool/index.vue b/Source/components/viztools/PinPictureTool/index.vue index 47a5ae60..08dc4681 100644 --- a/Source/components/viztools/PinPictureTool/index.vue +++ b/Source/components/viztools/PinPictureTool/index.vue @@ -221,10 +221,6 @@ export default { this._czmObj.far = 1073741824; } }, - beforeDestroy() { - this._polygonDisposers = this._polygonDisposers && this._polygonDisposers(); - this._disposers = this._disposers && this._disposers(); - }, computed: { name() { return this.pin.name; @@ -358,8 +354,10 @@ export default { } }, beforeDestroy() { - //销毁监控 - // this.disAutorun(); + // 解绑数据关联 + this._polygonDisposers = this._polygonDisposers && this._polygonDisposers(); + this._disposers.forEach(e => e()); + this._disposers.length = 0; } }; diff --git a/Source/components/viztools/PinTool/index.vue b/Source/components/viztools/PinTool/index.vue index a08d7239..800330e0 100644 --- a/Source/components/viztools/PinTool/index.vue +++ b/Source/components/viztools/PinTool/index.vue @@ -261,10 +261,7 @@ export default { this._czmObj.far = 1073741824; } }, - beforeDestroy() { - this._polygonDisposers = this._polygonDisposers && this._polygonDisposers(); - this._disposers = this._disposers && this._disposers(); - }, + computed: { name() { return this.pin.name; @@ -394,8 +391,10 @@ export default { } }, beforeDestroy() { - //销毁监控 - // this.disAutorun(); + // 解绑数据关联 + this._polygonDisposers = this._polygonDisposers && this._polygonDisposers(); + this._disposers.forEach(e => e()); + this._disposers.length = 0; } }; diff --git a/Source/components/viztools/PolylineTool/index.vue b/Source/components/viztools/PolylineTool/index.vue index 9b5f766f..b72e75bd 100644 --- a/Source/components/viztools/PolylineTool/index.vue +++ b/Source/components/viztools/PolylineTool/index.vue @@ -505,10 +505,7 @@ export default { } } }, - beforeDestroy() { - this._polygonDisposers = this._polygonDisposers && this._polygonDisposers(); - this._disposers = this._disposers && this._disposers(); - }, + computed: { name() { return this.polyline.name; @@ -718,8 +715,10 @@ export default { } }, beforeDestroy() { - //销毁监控 - // this.disAutorun(); + // 解绑数据关联 + this._polygonDisposers = this._polygonDisposers && this._polygonDisposers(); + this._disposers.forEach(e => e()); + this._disposers.length = 0; } }; diff --git a/Source/components/viztools/ScanlineTool/index.vue b/Source/components/viztools/ScanlineTool/index.vue index beb21d1d..49fbfffd 100644 --- a/Source/components/viztools/ScanlineTool/index.vue +++ b/Source/components/viztools/ScanlineTool/index.vue @@ -185,10 +185,6 @@ export default { this._disposers.push(XE.MVVM.bind(this, "bgbaseColor", czmObj, "color")); } }, - beforeDestroy() { - this._polygonDisposers = this._polygonDisposers && this._polygonDisposers(); - this._disposers = this._disposers && this._disposers(); - }, computed: { name() { return this.model.name; @@ -259,8 +255,10 @@ export default { } }, beforeDestroy() { - //销毁监控 - // this.disAutorun(); + // 解绑数据关联 + this._polygonDisposers = this._polygonDisposers && this._polygonDisposers(); + this._disposers.forEach(e => e()); + this._disposers.length = 0; } }; diff --git a/Source/components/viztools/TubeTool/index.vue b/Source/components/viztools/TubeTool/index.vue index 76516aac..bbac222a 100644 --- a/Source/components/viztools/TubeTool/index.vue +++ b/Source/components/viztools/TubeTool/index.vue @@ -158,17 +158,14 @@ export default { if (this._czmObj.isCreating && !this.model.imageUrl) { this.model.imageUrl = "../../assets/ht/meteor_01.png"; } - this._czmObj.positions = [ - [2.0315193182543485, 0.6963069713474035, 50.0], - [2.031208054060137, 0.6963058641803516, 50.0], - [2.0312082890850296, 0.6964532955295221, 50.0] - ]; + // this._czmObj.positions = [ + // [2.0315193182543485, 0.6963069713474035, 50.0], + // [2.031208054060137, 0.6963058641803516, 50.0], + // [2.0312082890850296, 0.6964532955295221, 50.0] + // ]; } }, - beforeDestroy() { - this._polygonDisposers = this._polygonDisposers && this._polygonDisposers(); - this._disposers = this._disposers && this._disposers(); - }, + computed: { name() { return this.model.name; @@ -221,8 +218,10 @@ export default { } }, beforeDestroy() { - //销毁监控 - // this.disAutorun(); + // 解绑数据关联 + this._polygonDisposers = this._polygonDisposers && this._polygonDisposers(); + this._disposers.forEach(e => e()); + this._disposers.length = 0; } }; From 67c335124125c7068981f3e23a9d5601897a5181 Mon Sep 17 00:00:00 2001 From: caiying <2841902102@qq.com> Date: Wed, 27 Nov 2019 15:13:12 +0800 Subject: [PATCH 65/82] =?UTF-8?q?=E7=AE=A1=E9=81=93=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=BA=86=E5=8D=8A=E5=BE=84=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Source/components/viztools/TubeTool/index.vue | 16 ++++-- .../viztools/TubeTool/index_locale.js | 50 ++----------------- 2 files changed, 15 insertions(+), 51 deletions(-) diff --git a/Source/components/viztools/TubeTool/index.vue b/Source/components/viztools/TubeTool/index.vue index bbac222a..73321efc 100644 --- a/Source/components/viztools/TubeTool/index.vue +++ b/Source/components/viztools/TubeTool/index.vue @@ -56,6 +56,14 @@
    + +
    + +
    + +
    +
    +
    @@ -119,6 +127,7 @@ export default { editing: false, enabled: true, imageUrl: "", + radius: 0, speed: [1, 1], radialSegments: 18, tubularSegments: 50, @@ -142,6 +151,7 @@ export default { // show: "model.show", editing: "model.editing", imageUrl: "model.imageUrl", + radius: "model.radius", speed: "model.speed", radialSegments: "model.radialSegments", tubularSegments: "model.tubularSegments", @@ -158,11 +168,7 @@ export default { if (this._czmObj.isCreating && !this.model.imageUrl) { this.model.imageUrl = "../../assets/ht/meteor_01.png"; } - // this._czmObj.positions = [ - // [2.0315193182543485, 0.6963069713474035, 50.0], - // [2.031208054060137, 0.6963058641803516, 50.0], - // [2.0312082890850296, 0.6964532955295221, 50.0] - // ]; + this._czmObj.radius = 30000; } }, diff --git a/Source/components/viztools/TubeTool/index_locale.js b/Source/components/viztools/TubeTool/index_locale.js index 7c5ce949..45b87ac3 100644 --- a/Source/components/viztools/TubeTool/index_locale.js +++ b/Source/components/viztools/TubeTool/index_locale.js @@ -2,37 +2,16 @@ const zh = { title: "管道属性", name: "名称", weizhi: '位置', + radius: '半径', imgurl: '图片地址', movespeed: '移动速度', rotatespeed: '旋转速度', radialsegments: '径向段', tubularsegments: '管段', closed: '闭合', - zitai: '姿态', creating: '创建', - edit: '编辑', - width: '宽度', - height: '高度', - animation: '动画', - loopPlay: '循环', - loopcycle: '循环周期', - color: '颜色', - flyto: '定位', - nowtime: '当前时刻', - primitivetype: '类型', - pass: 'pass', - predefined: '预定义', - geometry: '几何体', - canvastexture: 'canvas纹理', - createcode: '创建代码', - framecode: '帧动画代码', - destorycode: '销毁代码', - render: '渲染', - vertexshader: '顶点shader', - spritsshader: '片元shader', - renderstats: '渲染状态', editing: '编辑', - apply: '应用' + flyto: '定位', }; const en = { @@ -40,36 +19,15 @@ const en = { name: "Name", weizhi: 'position', imgurl: 'imgUrl', + radius: 'radius', movespeed: 'movespeed', rotatespeed: 'rotatespeed', radialsegments: 'radialSegments', tubularsegments: 'tubularSegments', closed: 'closed', - zitai: 'rotation', creating: 'creating', - edit: 'edit', - width: 'width', - height: 'height', - animation: 'animation', - loopPlay: 'loopPlay', - loopcycle: 'loopcycle', - color: 'color', - flyto: 'flyto', - nowtime: 'time', - primitivetype: 'primitiveType', - pass: 'pass', - predefined: 'Predefined', - geometry: 'geometry', - canvastexture: 'canvastexture', - createcode: 'createcode', - framecode: 'framecode', - destorycode: 'destorycode', - render: 'render', - vertexshader: 'vertexshader', - spritsshader: 'spritsshader', - renderstats: 'renderstats', editing: 'edit', - apply: 'apply' + flyto: 'flyto', }; export default { From ac0dfabe5d39b5abdf049dab45ead0e9f2dbb419 Mon Sep 17 00:00:00 2001 From: caiying <2841902102@qq.com> Date: Thu, 28 Nov 2019 09:46:52 +0800 Subject: [PATCH 66/82] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=BA=86=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E5=8D=8A=E5=BE=84=E7=9A=84=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Source/components/viztools/TubeTool/index.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/Source/components/viztools/TubeTool/index.vue b/Source/components/viztools/TubeTool/index.vue index 73321efc..550b81b7 100644 --- a/Source/components/viztools/TubeTool/index.vue +++ b/Source/components/viztools/TubeTool/index.vue @@ -168,7 +168,6 @@ export default { if (this._czmObj.isCreating && !this.model.imageUrl) { this.model.imageUrl = "../../assets/ht/meteor_01.png"; } - this._czmObj.radius = 30000; } }, From cd8d1a397b372195b70378c31e69ce0fab112641 Mon Sep 17 00:00:00 2001 From: caiying <2841902102@qq.com> Date: Thu, 28 Nov 2019 10:28:08 +0800 Subject: [PATCH 67/82] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E5=BD=93?= =?UTF-8?q?=E7=82=B9=E5=87=BBlabel=E6=97=B6slider=E6=81=A2=E5=A4=8D?= =?UTF-8?q?=E4=B8=BA=E9=BB=98=E8=AE=A4=E5=80=BC=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controls/MainBarControl/Effect/Bloom.vue | 20 +++++-------------- .../MainBarControl/Effect/DepthOfField.vue | 19 +++++------------- .../controls/MainBarControl/Effect/Fog.vue | 18 ++++------------- 3 files changed, 14 insertions(+), 43 deletions(-) diff --git a/Source/components/controls/MainBarControl/Effect/Bloom.vue b/Source/components/controls/MainBarControl/Effect/Bloom.vue index 61cc1052..48a19910 100644 --- a/Source/components/controls/MainBarControl/Effect/Bloom.vue +++ b/Source/components/controls/MainBarControl/Effect/Bloom.vue @@ -28,14 +28,14 @@
    - +
    - +
    @@ -44,9 +44,8 @@
    - diff --git a/Apps/Examples/earth-tileset-envirements.html b/Apps/Examples/earth-tileset-envirements.html index 640a9aa4..7879423d 100644 --- a/Apps/Examples/earth-tileset-envirements.html +++ b/Apps/Examples/earth-tileset-envirements.html @@ -7,7 +7,7 @@ - 3dtiles环境贴图 + 3dtiles环境贴图（勿用） diff --git a/Apps/Examples/scripts/list.js b/Apps/Examples/scripts/list.js index 8d2cf796..0cf99ce0 100644 --- a/Apps/Examples/scripts/list.js +++ b/Apps/Examples/scripts/list.js @@ -430,11 +430,11 @@ vueApp.examples = [ "title": "内部测试", "list": [ { - "title": "模型-环境贴图", + "title": "模型-环境贴图（勿用）", "url": "./earth-model-envirement.html" }, { - "title": "3dtiles环境贴图", + "title": "3dtiles环境贴图（勿用）", "url": "./earth-tileset-envirements.html" }, { From 596396d6d3bc2ec2bc274cc26bf878bcfa3e80dd Mon Sep 17 00:00:00 2001 From: caiying <2841902102@qq.com> Date: Fri, 29 Nov 2019 16:30:20 +0800 Subject: [PATCH 77/82] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E8=BE=B9?= =?UTF-8?q?=E6=A1=86=E9=A2=9C=E8=89=B2=E6=9B=B4=E6=94=B9=E6=97=A0=E6=95=88?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/tools/EntityMoreTool/index.vue | 1 - .../components/viztools/GeoCircle/index.vue | 2 +- .../viztools/GeoCurveFlag/index.vue | 2 +- .../viztools/GeoDoubleArrow/index.vue | 2 +- .../components/viztools/GeoPolygon/index.vue | 2 +- .../viztools/GeoRectangle/index.vue | 2 +- .../viztools/GeoRightAngleFlag/index.vue | 2 +- .../components/viztools/GeoSector/index.vue | 2 +- .../viztools/GeoSector/index_locale.js | 40 +++++++++---------- .../components/viztools/GeoTriFlag/index.vue | 2 +- 10 files changed, 28 insertions(+), 29 deletions(-) diff --git a/Source/components/tools/EntityMoreTool/index.vue b/Source/components/tools/EntityMoreTool/index.vue index c0ba9602..abc4fade 100644 --- a/Source/components/tools/EntityMoreTool/index.vue +++ b/Source/components/tools/EntityMoreTool/index.vue @@ -143,7 +143,6 @@ export default { // 外置图标 Pinpicturebtn() { var PinPictureTool = new XE.Obj.Pin(this.$root.$earth); - PinPictureTool.ctrtype = "PinPictureTool"; PinPictureTool.name = "外置图标"; PinPictureTool.positionPicking = true; PinPictureTool.isCreating = true; diff --git a/Source/components/viztools/GeoCircle/index.vue b/Source/components/viztools/GeoCircle/index.vue index c3dedfcb..ba170976 100644 --- a/Source/components/viztools/GeoCircle/index.vue +++ b/Source/components/viztools/GeoCircle/index.vue @@ -202,7 +202,7 @@ export default { this.borderbaseColor = cc; } }, - borderbgbaseColor(c) { + borderbaseColor(c) { this.borderbaseColorUI = { rgba: { r: c[0] * 255, diff --git a/Source/components/viztools/GeoCurveFlag/index.vue b/Source/components/viztools/GeoCurveFlag/index.vue index 72c0daa7..bc631306 100644 --- a/Source/components/viztools/GeoCurveFlag/index.vue +++ b/Source/components/viztools/GeoCurveFlag/index.vue @@ -203,7 +203,7 @@ export default { this.borderbaseColor = cc; } }, - borderbgbaseColor(c) { + borderbaseColor(c) { this.borderbaseColorUI = { rgba: { r: c[0] * 255, diff --git a/Source/components/viztools/GeoDoubleArrow/index.vue b/Source/components/viztools/GeoDoubleArrow/index.vue index 274dbba5..7c642509 100644 --- a/Source/components/viztools/GeoDoubleArrow/index.vue +++ b/Source/components/viztools/GeoDoubleArrow/index.vue @@ -203,7 +203,7 @@ export default { this.borderbaseColor = cc; } }, - borderbgbaseColor(c) { + borderbaseColor(c) { this.borderbaseColorUI = { rgba: { r: c[0] * 255, diff --git a/Source/components/viztools/GeoPolygon/index.vue b/Source/components/viztools/GeoPolygon/index.vue index 274dbba5..7c642509 100644 --- a/Source/components/viztools/GeoPolygon/index.vue +++ b/Source/components/viztools/GeoPolygon/index.vue @@ -203,7 +203,7 @@ export default { this.borderbaseColor = cc; } }, - borderbgbaseColor(c) { + borderbaseColor(c) { this.borderbaseColorUI = { rgba: { r: c[0] * 255, diff --git a/Source/components/viztools/GeoRectangle/index.vue b/Source/components/viztools/GeoRectangle/index.vue index 72c0daa7..bc631306 100644 --- a/Source/components/viztools/GeoRectangle/index.vue +++ b/Source/components/viztools/GeoRectangle/index.vue @@ -203,7 +203,7 @@ export default { this.borderbaseColor = cc; } }, - borderbgbaseColor(c) { + borderbaseColor(c) { this.borderbaseColorUI = { rgba: { r: c[0] * 255, diff --git a/Source/components/viztools/GeoRightAngleFlag/index.vue b/Source/components/viztools/GeoRightAngleFlag/index.vue index 72c0daa7..bc631306 100644 --- a/Source/components/viztools/GeoRightAngleFlag/index.vue +++ b/Source/components/viztools/GeoRightAngleFlag/index.vue @@ -203,7 +203,7 @@ export default { this.borderbaseColor = cc; } }, - borderbgbaseColor(c) { + borderbaseColor(c) { this.borderbaseColorUI = { rgba: { r: c[0] * 255, diff --git a/Source/components/viztools/GeoSector/index.vue b/Source/components/viztools/GeoSector/index.vue index 274dbba5..7c642509 100644 --- a/Source/components/viztools/GeoSector/index.vue +++ b/Source/components/viztools/GeoSector/index.vue @@ -203,7 +203,7 @@ export default { this.borderbaseColor = cc; } }, - borderbgbaseColor(c) { + borderbaseColor(c) { this.borderbaseColorUI = { rgba: { r: c[0] * 255, diff --git a/Source/components/viztools/GeoSector/index_locale.js b/Source/components/viztools/GeoSector/index_locale.js index 9852dfe8..f0833088 100644 --- a/Source/components/viztools/GeoSector/index_locale.js +++ b/Source/components/viztools/GeoSector/index_locale.js @@ -1,29 +1,29 @@ const zh = { - title: '多边形', + title: '扇形', name: '名称', - show:'显示', - creating:'创建', - editing:'编辑', - ground:'贴地', - outlineWidth:'边框宽度', - outlineShow:'边框显示', - outlineColor:'边框颜色', - color:'颜色', - transparency:'透明度' + show: '显示', + creating: '创建', + editing: '编辑', + ground: '贴地', + outlineWidth: '边框宽度', + outlineShow: '边框显示', + outlineColor: '边框颜色', + color: '颜色', + transparency: '透明度' }; const en = { - title: 'GeoPolygon', + title: 'GeoSector', name: 'name', - show:'show', - creating:'creating', - editing:'editing', - ground:'ground', - outlineWidth:'width', - outlineShow:'outlineShow', - outlineColor:'outlineColor', - color:'color', - transparency:'transparency' + show: 'show', + creating: 'creating', + editing: 'editing', + ground: 'ground', + outlineWidth: 'width', + outlineShow: 'outlineShow', + outlineColor: 'outlineColor', + color: 'color', + transparency: 'transparency' }; export default { diff --git a/Source/components/viztools/GeoTriFlag/index.vue b/Source/components/viztools/GeoTriFlag/index.vue index 19facbf1..6caeb6d6 100644 --- a/Source/components/viztools/GeoTriFlag/index.vue +++ b/Source/components/viztools/GeoTriFlag/index.vue @@ -204,7 +204,7 @@ export default { this.borderbaseColor = cc; } }, - borderbgbaseColor(c) { + borderbaseColor(c) { this.borderbaseColorUI = { rgba: { r: c[0] * 255, From 7c8de30d17154913f395d12d73d54076bcf91d3f Mon Sep 17 00:00:00 2001 From: vtxf Date: Fri, 29 Nov 2019 16:30:13 +0800 Subject: [PATCH 78/82] autoRegisterEditing --- Source/components/controls/MainBarControl/Entity/index.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Source/components/controls/MainBarControl/Entity/index.vue b/Source/components/controls/MainBarControl/Entity/index.vue index 06b115c2..c2b085b9 100644 --- a/Source/components/controls/MainBarControl/Entity/index.vue +++ b/Source/components/controls/MainBarControl/Entity/index.vue @@ -384,9 +384,10 @@ export default { customPrimitiveBtn() { var CustomPrimitive = new XE.Obj.CustomPrimitive(this.$root.$earth); CustomPrimitive.name = "自定义图元"; + CustomPrimitive.autoRegisterEditing = true; // CustomPrimitive.creating = true; CustomPrimitive.isCreating = true; - CustomPrimitive.registerEditing(); + // CustomPrimitive.registerEditing(); CustomPrimitive.creating = true; console.log(CustomPrimitive); this.$root.$earthUI.showPropertyWindow(CustomPrimitive); @@ -395,8 +396,9 @@ export default { tubeBtn() { var Tube = new XE.Obj.CustomPrimitiveExt.Tube(this.$root.$earth); Tube.name = "管道"; + Tube.autoRegisterEditing = true; Tube.isCreating = true; - Tube.registerEditing(); + // Tube.registerEditing(); Tube.creating = true; console.log(Tube); this.$root.$earthUI.showPropertyWindow(Tube); From e890454d6a641d82e0faa2401b96062beada2b05 Mon Sep 17 00:00:00 2001 From: vtxf Date: Fri, 29 Nov 2019 16:43:54 +0800 Subject: [PATCH 79/82] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Source/components/controls/MainBarControl/Entity/index.vue | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Source/components/controls/MainBarControl/Entity/index.vue b/Source/components/controls/MainBarControl/Entity/index.vue index c2b085b9..0343852b 100644 --- a/Source/components/controls/MainBarControl/Entity/index.vue +++ b/Source/components/controls/MainBarControl/Entity/index.vue @@ -385,9 +385,8 @@ export default { var CustomPrimitive = new XE.Obj.CustomPrimitive(this.$root.$earth); CustomPrimitive.name = "自定义图元"; CustomPrimitive.autoRegisterEditing = true; - // CustomPrimitive.creating = true; + CustomPrimitive.isCreating = true; - // CustomPrimitive.registerEditing(); CustomPrimitive.creating = true; console.log(CustomPrimitive); this.$root.$earthUI.showPropertyWindow(CustomPrimitive); @@ -396,9 +395,7 @@ export default { tubeBtn() { var Tube = new XE.Obj.CustomPrimitiveExt.Tube(this.$root.$earth); Tube.name = "管道"; - Tube.autoRegisterEditing = true; Tube.isCreating = true; - // Tube.registerEditing(); Tube.creating = true; console.log(Tube); this.$root.$earthUI.showPropertyWindow(Tube); From 701a28aa86fb7871ba5ee100f5925edd749c391a Mon Sep 17 00:00:00 2001 From: vtxf Date: Fri, 29 Nov 2019 16:45:13 +0800 Subject: [PATCH 80/82] 1.2.9 --- CHANGLES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGLES.md b/CHANGLES.md index 83c7599e..c67fe60c 100644 --- a/CHANGLES.md +++ b/CHANGLES.md @@ -1,7 +1,7 @@ Change Log ========== -### 1.2.9 +### 1.2.9 - 2019-11-29 ##### Additions :tada: From 2f081e2bd76c5c1e61078094e73e3a9df11e0844 Mon Sep 17 00:00:00 2001 From: vtxf Date: Fri, 29 Nov 2019 16:57:48 +0800 Subject: [PATCH 81/82] 1.2.9 --- package-lock.json | 3978 ++++++++++++++++++++++----------------------- package.json | 8 +- 2 files changed, 1993 insertions(+), 1993 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8fdb3639..d77930b4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,7 +16,7 @@ "integrity": "sha1-WCu1MfX53GfS/LaCl5iU914lPxI=", "dev": true, "requires": { - "regenerator-runtime": "^0.13.2" + "regenerator-runtime": "0.13.2" }, "dependencies": { "regenerator-runtime": { @@ -34,7 +34,7 @@ "dev": true, "requires": { "@nodelib/fs.stat": "2.0.1", - "run-parallel": "^1.1.9" + "run-parallel": "1.1.9" } }, "@nodelib/fs.stat": { @@ -50,7 +50,7 @@ "dev": true, "requires": { "@nodelib/fs.scandir": "2.1.1", - "fastq": "^1.6.0" + "fastq": "1.6.0" } }, "@types/events": { @@ -65,9 +65,9 @@ "integrity": "sha1-qlmhxuP7xCHgfM0xqUTDDrpSFXU=", "dev": true, "requires": { - "@types/events": "*", - "@types/minimatch": "*", - "@types/node": "*" + "@types/events": "3.0.0", + "@types/minimatch": "3.0.3", + "@types/node": "12.7.0" } }, "@types/minimatch": { @@ -94,7 +94,7 @@ "integrity": "sha1-UxvHJlF6OytB+FACHGzBXqq1B80=", "dev": true, "requires": { - "mime-types": "~2.1.24", + "mime-types": "2.1.24", "negotiator": "0.6.2" } }, @@ -110,7 +110,7 @@ "integrity": "sha1-x1K9IQvvZ5UBtsbLf8hPj0cVjMQ=", "dev": true, "requires": { - "acorn": "^4.0.3" + "acorn": "4.0.13" }, "dependencies": { "acorn": { @@ -127,7 +127,7 @@ "integrity": "sha1-6OQeSOov4MiWdAYQq2pP/YrdIl4=", "dev": true, "requires": { - "acorn": "^5.0.3" + "acorn": "5.7.3" } }, "ajv": { @@ -136,10 +136,10 @@ "integrity": "sha1-kNDVRDnaWHzX6EO/twRfUL0ivfE=", "dev": true, "requires": { - "fast-deep-equal": "^2.0.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" + "fast-deep-equal": "2.0.1", + "fast-json-stable-stringify": "2.0.0", + "json-schema-traverse": "0.4.1", + "uri-js": "4.2.2" } }, "ajv-keywords": { @@ -154,9 +154,9 @@ "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", "dev": true, "requires": { - "kind-of": "^3.0.2", - "longest": "^1.0.1", - "repeat-string": "^1.5.2" + "kind-of": "3.2.2", + "longest": "1.0.1", + "repeat-string": "1.6.1" }, "dependencies": { "kind-of": { @@ -165,7 +165,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -212,8 +212,8 @@ "integrity": "sha1-vLJLTzeTTZqnrBe0ra+J58du8us=", "dev": true, "requires": { - "micromatch": "^3.1.4", - "normalize-path": "^2.1.1" + "micromatch": "3.1.10", + "normalize-path": "2.1.1" }, "dependencies": { "normalize-path": { @@ -222,7 +222,7 @@ "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", "dev": true, "requires": { - "remove-trailing-separator": "^1.0.1" + "remove-trailing-separator": "1.1.0" } } } @@ -239,8 +239,8 @@ "integrity": "sha1-SzXClE8GKov82mZBB2A1D+nd/CE=", "dev": true, "requires": { - "delegates": "^1.0.0", - "readable-stream": "^2.0.6" + "delegates": "1.0.0", + "readable-stream": "2.3.6" } }, "argparse": { @@ -249,7 +249,7 @@ "integrity": "sha1-vNZ5HqWuCXJeF+WtmIE0zUCz2RE=", "dev": true, "requires": { - "sprintf-js": "~1.0.2" + "sprintf-js": "1.0.3" } }, "arr-diff": { @@ -294,8 +294,8 @@ "integrity": "sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=", "dev": true, "requires": { - "define-properties": "^1.1.2", - "es-abstract": "^1.7.0" + "define-properties": "1.1.3", + "es-abstract": "1.13.0" } }, "array-union": { @@ -304,7 +304,7 @@ "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", "dev": true, "requires": { - "array-uniq": "^1.0.1" + "array-uniq": "1.0.3" } }, "array-uniq": { @@ -338,7 +338,7 @@ "integrity": "sha1-jSR136tVO7M+d7VOWeiAu4ziMTY=", "dev": true, "requires": { - "safer-buffer": "~2.1.0" + "safer-buffer": "2.1.2" } }, "asn1.js": { @@ -347,9 +347,9 @@ "integrity": "sha1-ucK/WAXx5kqt7tbfOiv6+1pz9aA=", "dev": true, "requires": { - "bn.js": "^4.0.0", - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0" + "bn.js": "4.11.8", + "inherits": "2.0.3", + "minimalistic-assert": "1.0.1" } }, "assert": { @@ -358,7 +358,7 @@ "integrity": "sha1-VcEJqvbgrv2z3EtxJAxwv1dLGOs=", "dev": true, "requires": { - "object-assign": "^4.1.1", + "object-assign": "4.1.1", "util": "0.10.3" }, "dependencies": { @@ -403,7 +403,7 @@ "integrity": "sha1-GDMOp+bjE4h/XS8qkEusb+TdU4E=", "dev": true, "requires": { - "lodash": "^4.17.11" + "lodash": "4.17.11" } }, "async-each": { @@ -423,7 +423,7 @@ "resolved": "https://registry.npm.taobao.org/async-validator/download/async-validator-1.11.2.tgz", "integrity": "sha1-yl4roxwV6TGcsthzwrE3tnoZjq0=", "requires": { - "babel-runtime": "6.x" + "babel-runtime": "6.26.0" } }, "asynckit": { @@ -444,12 +444,12 @@ "integrity": "sha1-Hb0cg1ZY41zj+ZhAmdsAWFx4IBQ=", "dev": true, "requires": { - "browserslist": "^1.7.6", - "caniuse-db": "^1.0.30000634", - "normalize-range": "^0.1.2", - "num2fraction": "^1.2.2", - "postcss": "^5.2.16", - "postcss-value-parser": "^3.2.3" + "browserslist": "1.7.7", + "caniuse-db": "1.0.30000971", + "normalize-range": "0.1.2", + "num2fraction": "1.2.2", + "postcss": "5.2.18", + "postcss-value-parser": "3.3.1" } }, "aws-sign2": { @@ -470,8 +470,8 @@ "integrity": "sha1-MtU+SFHv3AoRmTts0AB4nXDAUQI=", "dev": true, "requires": { - "follow-redirects": "^1.3.0", - "is-buffer": "^1.1.5" + "follow-redirects": "1.7.0", + "is-buffer": "1.1.6" } }, "babel-code-frame": { @@ -480,9 +480,9 @@ "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", "dev": true, "requires": { - "chalk": "^1.1.3", - "esutils": "^2.0.2", - "js-tokens": "^3.0.2" + "chalk": "1.1.3", + "esutils": "2.0.2", + "js-tokens": "3.0.2" } }, "babel-core": { @@ -491,25 +491,25 @@ "integrity": "sha1-suLwnjQtDwyI4vAuBneUEl51wgc=", "dev": true, "requires": { - "babel-code-frame": "^6.26.0", - "babel-generator": "^6.26.0", - "babel-helpers": "^6.24.1", - "babel-messages": "^6.23.0", - "babel-register": "^6.26.0", - "babel-runtime": "^6.26.0", - "babel-template": "^6.26.0", - "babel-traverse": "^6.26.0", - "babel-types": "^6.26.0", - "babylon": "^6.18.0", - "convert-source-map": "^1.5.1", - "debug": "^2.6.9", - "json5": "^0.5.1", - "lodash": "^4.17.4", - "minimatch": "^3.0.4", - "path-is-absolute": "^1.0.1", - "private": "^0.1.8", - "slash": "^1.0.0", - "source-map": "^0.5.7" + "babel-code-frame": "6.26.0", + "babel-generator": "6.26.1", + "babel-helpers": "6.24.1", + "babel-messages": "6.23.0", + "babel-register": "6.26.0", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "convert-source-map": "1.6.0", + "debug": "2.6.9", + "json5": "0.5.1", + "lodash": "4.17.11", + "minimatch": "3.0.4", + "path-is-absolute": "1.0.1", + "private": "0.1.8", + "slash": "1.0.0", + "source-map": "0.5.7" } }, "babel-generator": { @@ -518,14 +518,14 @@ "integrity": "sha1-GERAjTuPDTWkBOp6wYDwh6YBvZA=", "dev": true, "requires": { - "babel-messages": "^6.23.0", - "babel-runtime": "^6.26.0", - "babel-types": "^6.26.0", - "detect-indent": "^4.0.0", - "jsesc": "^1.3.0", - "lodash": "^4.17.4", - "source-map": "^0.5.7", - "trim-right": "^1.0.1" + "babel-messages": "6.23.0", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "detect-indent": "4.0.0", + "jsesc": "1.3.0", + "lodash": "4.17.11", + "source-map": "0.5.7", + "trim-right": "1.0.1" } }, "babel-helper-builder-binary-assignment-operator-visitor": { @@ -534,9 +534,9 @@ "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=", "dev": true, "requires": { - "babel-helper-explode-assignable-expression": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" + "babel-helper-explode-assignable-expression": "6.24.1", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" } }, "babel-helper-call-delegate": { @@ -545,10 +545,10 @@ "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=", "dev": true, "requires": { - "babel-helper-hoist-variables": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" + "babel-helper-hoist-variables": "6.24.1", + "babel-runtime": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0" } }, "babel-helper-define-map": { @@ -557,10 +557,10 @@ "integrity": "sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=", "dev": true, "requires": { - "babel-helper-function-name": "^6.24.1", - "babel-runtime": "^6.26.0", - "babel-types": "^6.26.0", - "lodash": "^4.17.4" + "babel-helper-function-name": "6.24.1", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "lodash": "4.17.11" } }, "babel-helper-explode-assignable-expression": { @@ -569,9 +569,9 @@ "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=", "dev": true, "requires": { - "babel-runtime": "^6.22.0", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" + "babel-runtime": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0" } }, "babel-helper-function-name": { @@ -580,11 +580,11 @@ "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=", "dev": true, "requires": { - "babel-helper-get-function-arity": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" + "babel-helper-get-function-arity": "6.24.1", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0" } }, "babel-helper-get-function-arity": { @@ -593,8 +593,8 @@ "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=", "dev": true, "requires": { - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" } }, "babel-helper-hoist-variables": { @@ -603,8 +603,8 @@ "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=", "dev": true, "requires": { - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" } }, "babel-helper-optimise-call-expression": { @@ -613,8 +613,8 @@ "integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=", "dev": true, "requires": { - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" } }, "babel-helper-regex": { @@ -623,9 +623,9 @@ "integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=", "dev": true, "requires": { - "babel-runtime": "^6.26.0", - "babel-types": "^6.26.0", - "lodash": "^4.17.4" + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "lodash": "4.17.11" } }, "babel-helper-remap-async-to-generator": { @@ -634,11 +634,11 @@ "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=", "dev": true, "requires": { - "babel-helper-function-name": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" + "babel-helper-function-name": "6.24.1", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0" } }, "babel-helper-replace-supers": { @@ -647,12 +647,12 @@ "integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=", "dev": true, "requires": { - "babel-helper-optimise-call-expression": "^6.24.1", - "babel-messages": "^6.23.0", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" + "babel-helper-optimise-call-expression": "6.24.1", + "babel-messages": "6.23.0", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0" } }, "babel-helpers": { @@ -661,8 +661,8 @@ "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=", "dev": true, "requires": { - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1" + "babel-runtime": "6.26.0", + "babel-template": "6.26.0" } }, "babel-loader": { @@ -671,9 +671,9 @@ "integrity": "sha1-4+4M1zlKpVfgE7AtPkkr/QeqbWg=", "dev": true, "requires": { - "find-cache-dir": "^1.0.0", - "loader-utils": "^1.0.2", - "mkdirp": "^0.5.1" + "find-cache-dir": "1.0.0", + "loader-utils": "1.2.3", + "mkdirp": "0.5.1" } }, "babel-messages": { @@ -682,7 +682,7 @@ "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=", "dev": true, "requires": { - "babel-runtime": "^6.22.0" + "babel-runtime": "6.26.0" } }, "babel-plugin-check-es2015-constants": { @@ -691,7 +691,7 @@ "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=", "dev": true, "requires": { - "babel-runtime": "^6.22.0" + "babel-runtime": "6.26.0" } }, "babel-plugin-syntax-async-functions": { @@ -730,9 +730,9 @@ "integrity": "sha1-8FiQAUX9PpkHpt3yjaWfIVJYpds=", "dev": true, "requires": { - "babel-helper-remap-async-to-generator": "^6.24.1", - "babel-plugin-syntax-async-generators": "^6.5.0", - "babel-runtime": "^6.22.0" + "babel-helper-remap-async-to-generator": "6.24.1", + "babel-plugin-syntax-async-generators": "6.13.0", + "babel-runtime": "6.26.0" } }, "babel-plugin-transform-async-to-generator": { @@ -741,9 +741,9 @@ "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=", "dev": true, "requires": { - "babel-helper-remap-async-to-generator": "^6.24.1", - "babel-plugin-syntax-async-functions": "^6.8.0", - "babel-runtime": "^6.22.0" + "babel-helper-remap-async-to-generator": "6.24.1", + "babel-plugin-syntax-async-functions": "6.13.0", + "babel-runtime": "6.26.0" } }, "babel-plugin-transform-es2015-arrow-functions": { @@ -752,7 +752,7 @@ "integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=", "dev": true, "requires": { - "babel-runtime": "^6.22.0" + "babel-runtime": "6.26.0" } }, "babel-plugin-transform-es2015-block-scoped-functions": { @@ -761,7 +761,7 @@ "integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=", "dev": true, "requires": { - "babel-runtime": "^6.22.0" + "babel-runtime": "6.26.0" } }, "babel-plugin-transform-es2015-block-scoping": { @@ -770,11 +770,11 @@ "integrity": "sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=", "dev": true, "requires": { - "babel-runtime": "^6.26.0", - "babel-template": "^6.26.0", - "babel-traverse": "^6.26.0", - "babel-types": "^6.26.0", - "lodash": "^4.17.4" + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0", + "lodash": "4.17.11" } }, "babel-plugin-transform-es2015-classes": { @@ -783,15 +783,15 @@ "integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=", "dev": true, "requires": { - "babel-helper-define-map": "^6.24.1", - "babel-helper-function-name": "^6.24.1", - "babel-helper-optimise-call-expression": "^6.24.1", - "babel-helper-replace-supers": "^6.24.1", - "babel-messages": "^6.23.0", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" + "babel-helper-define-map": "6.26.0", + "babel-helper-function-name": "6.24.1", + "babel-helper-optimise-call-expression": "6.24.1", + "babel-helper-replace-supers": "6.24.1", + "babel-messages": "6.23.0", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0" } }, "babel-plugin-transform-es2015-computed-properties": { @@ -800,8 +800,8 @@ "integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=", "dev": true, "requires": { - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1" + "babel-runtime": "6.26.0", + "babel-template": "6.26.0" } }, "babel-plugin-transform-es2015-destructuring": { @@ -810,7 +810,7 @@ "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=", "dev": true, "requires": { - "babel-runtime": "^6.22.0" + "babel-runtime": "6.26.0" } }, "babel-plugin-transform-es2015-duplicate-keys": { @@ -819,8 +819,8 @@ "integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=", "dev": true, "requires": { - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" } }, "babel-plugin-transform-es2015-for-of": { @@ -829,7 +829,7 @@ "integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=", "dev": true, "requires": { - "babel-runtime": "^6.22.0" + "babel-runtime": "6.26.0" } }, "babel-plugin-transform-es2015-function-name": { @@ -838,9 +838,9 @@ "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=", "dev": true, "requires": { - "babel-helper-function-name": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" + "babel-helper-function-name": "6.24.1", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" } }, "babel-plugin-transform-es2015-literals": { @@ -849,7 +849,7 @@ "integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=", "dev": true, "requires": { - "babel-runtime": "^6.22.0" + "babel-runtime": "6.26.0" } }, "babel-plugin-transform-es2015-modules-amd": { @@ -858,9 +858,9 @@ "integrity": "sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=", "dev": true, "requires": { - "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1" + "babel-plugin-transform-es2015-modules-commonjs": "6.26.2", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0" } }, "babel-plugin-transform-es2015-modules-commonjs": { @@ -869,10 +869,10 @@ "integrity": "sha1-WKeThjqefKhwvcWogRF/+sJ9tvM=", "dev": true, "requires": { - "babel-plugin-transform-strict-mode": "^6.24.1", - "babel-runtime": "^6.26.0", - "babel-template": "^6.26.0", - "babel-types": "^6.26.0" + "babel-plugin-transform-strict-mode": "6.24.1", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-types": "6.26.0" } }, "babel-plugin-transform-es2015-modules-systemjs": { @@ -881,9 +881,9 @@ "integrity": "sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=", "dev": true, "requires": { - "babel-helper-hoist-variables": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1" + "babel-helper-hoist-variables": "6.24.1", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0" } }, "babel-plugin-transform-es2015-modules-umd": { @@ -892,9 +892,9 @@ "integrity": "sha1-rJl+YoXNGO1hdq22B9YCNErThGg=", "dev": true, "requires": { - "babel-plugin-transform-es2015-modules-amd": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1" + "babel-plugin-transform-es2015-modules-amd": "6.24.1", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0" } }, "babel-plugin-transform-es2015-object-super": { @@ -903,8 +903,8 @@ "integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=", "dev": true, "requires": { - "babel-helper-replace-supers": "^6.24.1", - "babel-runtime": "^6.22.0" + "babel-helper-replace-supers": "6.24.1", + "babel-runtime": "6.26.0" } }, "babel-plugin-transform-es2015-parameters": { @@ -913,12 +913,12 @@ "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=", "dev": true, "requires": { - "babel-helper-call-delegate": "^6.24.1", - "babel-helper-get-function-arity": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" + "babel-helper-call-delegate": "6.24.1", + "babel-helper-get-function-arity": "6.24.1", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0" } }, "babel-plugin-transform-es2015-shorthand-properties": { @@ -927,8 +927,8 @@ "integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=", "dev": true, "requires": { - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" } }, "babel-plugin-transform-es2015-spread": { @@ -937,7 +937,7 @@ "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=", "dev": true, "requires": { - "babel-runtime": "^6.22.0" + "babel-runtime": "6.26.0" } }, "babel-plugin-transform-es2015-sticky-regex": { @@ -946,9 +946,9 @@ "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=", "dev": true, "requires": { - "babel-helper-regex": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" + "babel-helper-regex": "6.26.0", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" } }, "babel-plugin-transform-es2015-template-literals": { @@ -957,7 +957,7 @@ "integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=", "dev": true, "requires": { - "babel-runtime": "^6.22.0" + "babel-runtime": "6.26.0" } }, "babel-plugin-transform-es2015-typeof-symbol": { @@ -966,7 +966,7 @@ "integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=", "dev": true, "requires": { - "babel-runtime": "^6.22.0" + "babel-runtime": "6.26.0" } }, "babel-plugin-transform-es2015-unicode-regex": { @@ -975,9 +975,9 @@ "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=", "dev": true, "requires": { - "babel-helper-regex": "^6.24.1", - "babel-runtime": "^6.22.0", - "regexpu-core": "^2.0.0" + "babel-helper-regex": "6.26.0", + "babel-runtime": "6.26.0", + "regexpu-core": "2.0.0" } }, "babel-plugin-transform-exponentiation-operator": { @@ -986,9 +986,9 @@ "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=", "dev": true, "requires": { - "babel-helper-builder-binary-assignment-operator-visitor": "^6.24.1", - "babel-plugin-syntax-exponentiation-operator": "^6.8.0", - "babel-runtime": "^6.22.0" + "babel-helper-builder-binary-assignment-operator-visitor": "6.24.1", + "babel-plugin-syntax-exponentiation-operator": "6.13.0", + "babel-runtime": "6.26.0" } }, "babel-plugin-transform-object-rest-spread": { @@ -997,8 +997,8 @@ "integrity": "sha1-DzZpLVD+9rfi1LOsFHgTepY7ewY=", "dev": true, "requires": { - "babel-plugin-syntax-object-rest-spread": "^6.8.0", - "babel-runtime": "^6.26.0" + "babel-plugin-syntax-object-rest-spread": "6.13.0", + "babel-runtime": "6.26.0" } }, "babel-plugin-transform-regenerator": { @@ -1007,7 +1007,7 @@ "integrity": "sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=", "dev": true, "requires": { - "regenerator-transform": "^0.10.0" + "regenerator-transform": "0.10.1" } }, "babel-plugin-transform-runtime": { @@ -1016,7 +1016,7 @@ "integrity": "sha1-iEkNRGUC6puOfvsP4J7E2ZR5se4=", "dev": true, "requires": { - "babel-runtime": "^6.22.0" + "babel-runtime": "6.26.0" } }, "babel-plugin-transform-strict-mode": { @@ -1025,8 +1025,8 @@ "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=", "dev": true, "requires": { - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" } }, "babel-polyfill": { @@ -1035,9 +1035,9 @@ "integrity": "sha1-g2TKYt+Or7gwSZ9pkXdGbDsDSZ0=", "dev": true, "requires": { - "babel-runtime": "^6.22.0", - "core-js": "^2.4.0", - "regenerator-runtime": "^0.10.0" + "babel-runtime": "6.26.0", + "core-js": "2.6.8", + "regenerator-runtime": "0.10.5" }, "dependencies": { "regenerator-runtime": { @@ -1054,30 +1054,30 @@ "integrity": "sha1-1EBQ1rwsn+6nAqrzjXJ6AhBTiTk=", "dev": true, "requires": { - "babel-plugin-check-es2015-constants": "^6.22.0", - "babel-plugin-transform-es2015-arrow-functions": "^6.22.0", - "babel-plugin-transform-es2015-block-scoped-functions": "^6.22.0", - "babel-plugin-transform-es2015-block-scoping": "^6.24.1", - "babel-plugin-transform-es2015-classes": "^6.24.1", - "babel-plugin-transform-es2015-computed-properties": "^6.24.1", - "babel-plugin-transform-es2015-destructuring": "^6.22.0", - "babel-plugin-transform-es2015-duplicate-keys": "^6.24.1", - "babel-plugin-transform-es2015-for-of": "^6.22.0", - "babel-plugin-transform-es2015-function-name": "^6.24.1", - "babel-plugin-transform-es2015-literals": "^6.22.0", - "babel-plugin-transform-es2015-modules-amd": "^6.24.1", - "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1", - "babel-plugin-transform-es2015-modules-systemjs": "^6.24.1", - "babel-plugin-transform-es2015-modules-umd": "^6.24.1", - "babel-plugin-transform-es2015-object-super": "^6.24.1", - "babel-plugin-transform-es2015-parameters": "^6.24.1", - "babel-plugin-transform-es2015-shorthand-properties": "^6.24.1", - "babel-plugin-transform-es2015-spread": "^6.22.0", - "babel-plugin-transform-es2015-sticky-regex": "^6.24.1", - "babel-plugin-transform-es2015-template-literals": "^6.22.0", - "babel-plugin-transform-es2015-typeof-symbol": "^6.22.0", - "babel-plugin-transform-es2015-unicode-regex": "^6.24.1", - "babel-plugin-transform-regenerator": "^6.24.1" + "babel-plugin-check-es2015-constants": "6.22.0", + "babel-plugin-transform-es2015-arrow-functions": "6.22.0", + "babel-plugin-transform-es2015-block-scoped-functions": "6.22.0", + "babel-plugin-transform-es2015-block-scoping": "6.26.0", + "babel-plugin-transform-es2015-classes": "6.24.1", + "babel-plugin-transform-es2015-computed-properties": "6.24.1", + "babel-plugin-transform-es2015-destructuring": "6.23.0", + "babel-plugin-transform-es2015-duplicate-keys": "6.24.1", + "babel-plugin-transform-es2015-for-of": "6.23.0", + "babel-plugin-transform-es2015-function-name": "6.24.1", + "babel-plugin-transform-es2015-literals": "6.22.0", + "babel-plugin-transform-es2015-modules-amd": "6.24.1", + "babel-plugin-transform-es2015-modules-commonjs": "6.26.2", + "babel-plugin-transform-es2015-modules-systemjs": "6.24.1", + "babel-plugin-transform-es2015-modules-umd": "6.24.1", + "babel-plugin-transform-es2015-object-super": "6.24.1", + "babel-plugin-transform-es2015-parameters": "6.24.1", + "babel-plugin-transform-es2015-shorthand-properties": "6.24.1", + "babel-plugin-transform-es2015-spread": "6.22.0", + "babel-plugin-transform-es2015-sticky-regex": "6.24.1", + "babel-plugin-transform-es2015-template-literals": "6.22.0", + "babel-plugin-transform-es2015-typeof-symbol": "6.23.0", + "babel-plugin-transform-es2015-unicode-regex": "6.24.1", + "babel-plugin-transform-regenerator": "6.26.0" } }, "babel-preset-stage-3": { @@ -1086,11 +1086,11 @@ "integrity": "sha1-g2raCp56f6N8sTj7kyb4eTSkg5U=", "dev": true, "requires": { - "babel-plugin-syntax-trailing-function-commas": "^6.22.0", - "babel-plugin-transform-async-generator-functions": "^6.24.1", - "babel-plugin-transform-async-to-generator": "^6.24.1", - "babel-plugin-transform-exponentiation-operator": "^6.24.1", - "babel-plugin-transform-object-rest-spread": "^6.22.0" + "babel-plugin-syntax-trailing-function-commas": "6.22.0", + "babel-plugin-transform-async-generator-functions": "6.24.1", + "babel-plugin-transform-async-to-generator": "6.24.1", + "babel-plugin-transform-exponentiation-operator": "6.24.1", + "babel-plugin-transform-object-rest-spread": "6.26.0" } }, "babel-register": { @@ -1099,13 +1099,13 @@ "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=", "dev": true, "requires": { - "babel-core": "^6.26.0", - "babel-runtime": "^6.26.0", - "core-js": "^2.5.0", - "home-or-tmp": "^2.0.0", - "lodash": "^4.17.4", - "mkdirp": "^0.5.1", - "source-map-support": "^0.4.15" + "babel-core": "6.26.3", + "babel-runtime": "6.26.0", + "core-js": "2.6.8", + "home-or-tmp": "2.0.0", + "lodash": "4.17.11", + "mkdirp": "0.5.1", + "source-map-support": "0.4.18" } }, "babel-runtime": { @@ -1113,8 +1113,8 @@ "resolved": "http://registry.npm.taobao.org/babel-runtime/download/babel-runtime-6.26.0.tgz", "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", "requires": { - "core-js": "^2.4.0", - "regenerator-runtime": "^0.11.0" + "core-js": "2.6.8", + "regenerator-runtime": "0.11.1" } }, "babel-template": { @@ -1123,11 +1123,11 @@ "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=", "dev": true, "requires": { - "babel-runtime": "^6.26.0", - "babel-traverse": "^6.26.0", - "babel-types": "^6.26.0", - "babylon": "^6.18.0", - "lodash": "^4.17.4" + "babel-runtime": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "lodash": "4.17.11" } }, "babel-traverse": { @@ -1136,15 +1136,15 @@ "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=", "dev": true, "requires": { - "babel-code-frame": "^6.26.0", - "babel-messages": "^6.23.0", - "babel-runtime": "^6.26.0", - "babel-types": "^6.26.0", - "babylon": "^6.18.0", - "debug": "^2.6.8", - "globals": "^9.18.0", - "invariant": "^2.2.2", - "lodash": "^4.17.4" + "babel-code-frame": "6.26.0", + "babel-messages": "6.23.0", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "debug": "2.6.9", + "globals": "9.18.0", + "invariant": "2.2.4", + "lodash": "4.17.11" } }, "babel-types": { @@ -1153,10 +1153,10 @@ "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", "dev": true, "requires": { - "babel-runtime": "^6.26.0", - "esutils": "^2.0.2", - "lodash": "^4.17.4", - "to-fast-properties": "^1.0.3" + "babel-runtime": "6.26.0", + "esutils": "2.0.2", + "lodash": "4.17.11", + "to-fast-properties": "1.0.3" } }, "babylon": { @@ -1177,13 +1177,13 @@ "integrity": "sha1-e95c7RRbbVUakNuH+DxVi060io8=", "dev": true, "requires": { - "cache-base": "^1.0.1", - "class-utils": "^0.3.5", - "component-emitter": "^1.2.1", - "define-property": "^1.0.0", - "isobject": "^3.0.1", - "mixin-deep": "^1.2.0", - "pascalcase": "^0.1.1" + "cache-base": "1.0.1", + "class-utils": "0.3.6", + "component-emitter": "1.3.0", + "define-property": "1.0.0", + "isobject": "3.0.1", + "mixin-deep": "1.3.1", + "pascalcase": "0.1.1" }, "dependencies": { "define-property": { @@ -1192,7 +1192,7 @@ "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "dev": true, "requires": { - "is-descriptor": "^1.0.0" + "is-descriptor": "1.0.2" } }, "is-accessor-descriptor": { @@ -1201,7 +1201,7 @@ "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=", "dev": true, "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.2" } }, "is-data-descriptor": { @@ -1210,7 +1210,7 @@ "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=", "dev": true, "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.2" } }, "is-descriptor": { @@ -1219,9 +1219,9 @@ "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=", "dev": true, "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" } } } @@ -1249,7 +1249,7 @@ "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", "dev": true, "requires": { - "tweetnacl": "^0.14.3" + "tweetnacl": "0.14.5" } }, "big.js": { @@ -1270,7 +1270,7 @@ "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=", "dev": true, "requires": { - "inherits": "~2.0.0" + "inherits": "2.0.3" } }, "bluebird": { @@ -1292,15 +1292,15 @@ "dev": true, "requires": { "bytes": "3.1.0", - "content-type": "~1.0.4", + "content-type": "1.0.4", "debug": "2.6.9", - "depd": "~1.1.2", + "depd": "1.1.2", "http-errors": "1.7.2", "iconv-lite": "0.4.24", - "on-finished": "~2.3.0", + "on-finished": "2.3.0", "qs": "6.7.0", "raw-body": "2.4.0", - "type-is": "~1.6.17" + "type-is": "1.6.18" }, "dependencies": { "bytes": { @@ -1323,12 +1323,12 @@ "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=", "dev": true, "requires": { - "array-flatten": "^2.1.0", - "deep-equal": "^1.0.1", - "dns-equal": "^1.0.0", - "dns-txt": "^2.0.2", - "multicast-dns": "^6.0.1", - "multicast-dns-service-types": "^1.1.0" + "array-flatten": "2.1.2", + "deep-equal": "1.0.1", + "dns-equal": "1.0.0", + "dns-txt": "2.0.2", + "multicast-dns": "6.2.3", + "multicast-dns-service-types": "1.1.0" } }, "boolbase": { @@ -1343,7 +1343,7 @@ "integrity": "sha1-PH/L9SnYcibz0vUrlm/1Jx60Qd0=", "dev": true, "requires": { - "balanced-match": "^1.0.0", + "balanced-match": "1.0.0", "concat-map": "0.0.1" } }, @@ -1353,16 +1353,16 @@ "integrity": "sha1-WXn9PxTNUxVl5fot8av/8d+u5yk=", "dev": true, "requires": { - "arr-flatten": "^1.1.0", - "array-unique": "^0.3.2", - "extend-shallow": "^2.0.1", - "fill-range": "^4.0.0", - "isobject": "^3.0.1", - "repeat-element": "^1.1.2", - "snapdragon": "^0.8.1", - "snapdragon-node": "^2.0.1", - "split-string": "^3.0.2", - "to-regex": "^3.0.1" + "arr-flatten": "1.1.0", + "array-unique": "0.3.2", + "extend-shallow": "2.0.1", + "fill-range": "4.0.0", + "isobject": "3.0.1", + "repeat-element": "1.1.3", + "snapdragon": "0.8.2", + "snapdragon-node": "2.1.1", + "split-string": "3.1.0", + "to-regex": "3.0.2" }, "dependencies": { "extend-shallow": { @@ -1371,7 +1371,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } } } @@ -1388,12 +1388,12 @@ "integrity": "sha1-Mmc0ZC9APavDADIJhTu3CtQo70g=", "dev": true, "requires": { - "buffer-xor": "^1.0.3", - "cipher-base": "^1.0.0", - "create-hash": "^1.1.0", - "evp_bytestokey": "^1.0.3", - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" + "buffer-xor": "1.0.3", + "cipher-base": "1.0.4", + "create-hash": "1.2.0", + "evp_bytestokey": "1.0.3", + "inherits": "2.0.3", + "safe-buffer": "5.1.2" } }, "browserify-cipher": { @@ -1402,9 +1402,9 @@ "integrity": "sha1-jWR0wbhwv9q807z8wZNKEOlPFfA=", "dev": true, "requires": { - "browserify-aes": "^1.0.4", - "browserify-des": "^1.0.0", - "evp_bytestokey": "^1.0.0" + "browserify-aes": "1.2.0", + "browserify-des": "1.0.2", + "evp_bytestokey": "1.0.3" } }, "browserify-des": { @@ -1413,10 +1413,10 @@ "integrity": "sha1-OvTx9Zg5QDVy8cZiBDdfen9wPpw=", "dev": true, "requires": { - "cipher-base": "^1.0.1", - "des.js": "^1.0.0", - "inherits": "^2.0.1", - "safe-buffer": "^5.1.2" + "cipher-base": "1.0.4", + "des.js": "1.0.0", + "inherits": "2.0.3", + "safe-buffer": "5.1.2" } }, "browserify-rsa": { @@ -1425,8 +1425,8 @@ "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=", "dev": true, "requires": { - "bn.js": "^4.1.0", - "randombytes": "^2.0.1" + "bn.js": "4.11.8", + "randombytes": "2.1.0" } }, "browserify-sign": { @@ -1435,13 +1435,13 @@ "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=", "dev": true, "requires": { - "bn.js": "^4.1.1", - "browserify-rsa": "^4.0.0", - "create-hash": "^1.1.0", - "create-hmac": "^1.1.2", - "elliptic": "^6.0.0", - "inherits": "^2.0.1", - "parse-asn1": "^5.0.0" + "bn.js": "4.11.8", + "browserify-rsa": "4.0.1", + "create-hash": "1.2.0", + "create-hmac": "1.1.7", + "elliptic": "6.4.1", + "inherits": "2.0.3", + "parse-asn1": "5.1.4" } }, "browserify-zlib": { @@ -1450,7 +1450,7 @@ "integrity": "sha1-KGlFnZqjviRf6P4sofRuLn9U1z8=", "dev": true, "requires": { - "pako": "~1.0.5" + "pako": "1.0.10" } }, "browserslist": { @@ -1459,8 +1459,8 @@ "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=", "dev": true, "requires": { - "caniuse-db": "^1.0.30000639", - "electron-to-chromium": "^1.2.7" + "caniuse-db": "1.0.30000971", + "electron-to-chromium": "1.3.137" } }, "buffer": { @@ -1469,9 +1469,9 @@ "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=", "dev": true, "requires": { - "base64-js": "^1.0.2", - "ieee754": "^1.1.4", - "isarray": "^1.0.0" + "base64-js": "1.3.0", + "ieee754": "1.1.13", + "isarray": "1.0.0" } }, "buffer-from": { @@ -1504,7 +1504,7 @@ "integrity": "sha1-bJBC5i8ciZQUWIBaOkedEPNMcf0=", "dev": true, "requires": { - "loader-utils": "^1.1.0" + "loader-utils": "1.2.3" } }, "bytes": { @@ -1519,19 +1519,19 @@ "integrity": "sha1-ZFI2eZnv+dQYiu/ZoU6dfGomNGA=", "dev": true, "requires": { - "bluebird": "^3.5.1", - "chownr": "^1.0.1", - "glob": "^7.1.2", - "graceful-fs": "^4.1.11", - "lru-cache": "^4.1.1", - "mississippi": "^2.0.0", - "mkdirp": "^0.5.1", - "move-concurrently": "^1.0.1", - "promise-inflight": "^1.0.1", - "rimraf": "^2.6.2", - "ssri": "^5.2.4", - "unique-filename": "^1.1.0", - "y18n": "^4.0.0" + "bluebird": "3.5.5", + "chownr": "1.1.1", + "glob": "7.1.4", + "graceful-fs": "4.1.15", + "lru-cache": "4.1.5", + "mississippi": "2.0.0", + "mkdirp": "0.5.1", + "move-concurrently": "1.0.1", + "promise-inflight": "1.0.1", + "rimraf": "2.6.3", + "ssri": "5.3.0", + "unique-filename": "1.1.1", + "y18n": "4.0.0" } }, "cache-base": { @@ -1540,15 +1540,15 @@ "integrity": "sha1-Cn9GQWgxyLZi7jb+TnxZ129marI=", "dev": true, "requires": { - "collection-visit": "^1.0.0", - "component-emitter": "^1.2.1", - "get-value": "^2.0.6", - "has-value": "^1.0.0", - "isobject": "^3.0.1", - "set-value": "^2.0.0", - "to-object-path": "^0.3.0", - "union-value": "^1.0.0", - "unset-value": "^1.0.0" + "collection-visit": "1.0.0", + "component-emitter": "1.3.0", + "get-value": "2.0.6", + "has-value": "1.0.0", + "isobject": "3.0.1", + "set-value": "2.0.0", + "to-object-path": "0.3.0", + "union-value": "1.0.0", + "unset-value": "1.0.0" } }, "camel-case": { @@ -1557,8 +1557,8 @@ "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=", "dev": true, "requires": { - "no-case": "^2.2.0", - "upper-case": "^1.1.1" + "no-case": "2.3.2", + "upper-case": "1.1.3" } }, "camelcase": { @@ -1573,8 +1573,8 @@ "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", "dev": true, "requires": { - "camelcase": "^2.0.0", - "map-obj": "^1.0.0" + "camelcase": "2.1.1", + "map-obj": "1.0.1" } }, "caniuse-api": { @@ -1583,10 +1583,10 @@ "integrity": "sha1-tTTnxzTE+B7F++isoq0kNUuWLGw=", "dev": true, "requires": { - "browserslist": "^1.3.6", - "caniuse-db": "^1.0.30000529", - "lodash.memoize": "^4.1.2", - "lodash.uniq": "^4.5.0" + "browserslist": "1.7.7", + "caniuse-db": "1.0.30000971", + "lodash.memoize": "4.1.2", + "lodash.uniq": "4.5.0" } }, "caniuse-db": { @@ -1607,7 +1607,7 @@ "integrity": "sha1-NkGYwfvwhK4XAo7jPsfbU8qULuY=", "dev": true, "requires": { - "lodash": "^4.17.11" + "lodash": "4.17.11" } }, "center-align": { @@ -1616,8 +1616,8 @@ "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=", "dev": true, "requires": { - "align-text": "^0.1.3", - "lazy-cache": "^1.0.3" + "align-text": "0.1.4", + "lazy-cache": "1.0.4" } }, "chalk": { @@ -1626,11 +1626,11 @@ "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" + "ansi-styles": "2.2.1", + "escape-string-regexp": "1.0.5", + "has-ansi": "2.0.0", + "strip-ansi": "3.0.1", + "supports-color": "2.0.0" } }, "chance": { @@ -1645,24 +1645,24 @@ "integrity": "sha1-/Uh0bM4C8D8KZyV30dOo3C7OsDc=", "dev": true, "requires": { - "camel-case": "^3.0.0", - "constant-case": "^2.0.0", - "dot-case": "^2.1.0", - "header-case": "^1.0.0", - "is-lower-case": "^1.1.0", - "is-upper-case": "^1.1.0", - "lower-case": "^1.1.1", - "lower-case-first": "^1.0.0", - "no-case": "^2.3.2", - "param-case": "^2.1.0", - "pascal-case": "^2.0.0", - "path-case": "^2.1.0", - "sentence-case": "^2.1.0", - "snake-case": "^2.1.0", - "swap-case": "^1.1.0", - "title-case": "^2.1.0", - "upper-case": "^1.1.1", - "upper-case-first": "^1.1.0" + "camel-case": "3.0.0", + "constant-case": "2.0.0", + "dot-case": "2.1.1", + "header-case": "1.0.1", + "is-lower-case": "1.1.3", + "is-upper-case": "1.1.2", + "lower-case": "1.1.4", + "lower-case-first": "1.0.2", + "no-case": "2.3.2", + "param-case": "2.1.1", + "pascal-case": "2.0.1", + "path-case": "2.1.1", + "sentence-case": "2.1.1", + "snake-case": "2.1.0", + "swap-case": "1.1.2", + "title-case": "2.1.1", + "upper-case": "1.1.3", + "upper-case-first": "1.1.2" } }, "chardet": { @@ -1683,18 +1683,18 @@ "integrity": "sha1-tsrWU6kp4kTOioNCRBZNJB+pVMU=", "dev": true, "requires": { - "anymatch": "^2.0.0", - "async-each": "^1.0.1", - "braces": "^2.3.2", - "fsevents": "^1.2.7", - "glob-parent": "^3.1.0", - "inherits": "^2.0.3", - "is-binary-path": "^1.0.0", - "is-glob": "^4.0.0", - "normalize-path": "^3.0.0", - "path-is-absolute": "^1.0.0", - "readdirp": "^2.2.1", - "upath": "^1.1.1" + "anymatch": "2.0.0", + "async-each": "1.0.3", + "braces": "2.3.2", + "fsevents": "1.2.9", + "glob-parent": "3.1.0", + "inherits": "2.0.3", + "is-binary-path": "1.0.1", + "is-glob": "4.0.1", + "normalize-path": "3.0.0", + "path-is-absolute": "1.0.1", + "readdirp": "2.2.1", + "upath": "1.1.2" } }, "chownr": { @@ -1709,8 +1709,8 @@ "integrity": "sha1-h2Dk7MJy9MNjUy+SbYdKriwTl94=", "dev": true, "requires": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" + "inherits": "2.0.3", + "safe-buffer": "5.1.2" } }, "clap": { @@ -1719,7 +1719,7 @@ "integrity": "sha1-TzZ0WzIAhJJVf0ZBLWbVDLmbzlE=", "dev": true, "requires": { - "chalk": "^1.1.3" + "chalk": "1.1.3" } }, "class-utils": { @@ -1728,10 +1728,10 @@ "integrity": "sha1-+TNprouafOAv1B+q0MqDAzGQxGM=", "dev": true, "requires": { - "arr-union": "^3.1.0", - "define-property": "^0.2.5", - "isobject": "^3.0.0", - "static-extend": "^0.1.1" + "arr-union": "3.1.0", + "define-property": "0.2.5", + "isobject": "3.0.1", + "static-extend": "0.1.2" }, "dependencies": { "define-property": { @@ -1740,7 +1740,7 @@ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "is-descriptor": "^0.1.0" + "is-descriptor": "0.1.6" } } } @@ -1751,7 +1751,7 @@ "integrity": "sha1-1g5YxdFKvKCkG844z3kq1MRtFTE=", "dev": true, "requires": { - "google-libphonenumber": "^3.1.6", + "google-libphonenumber": "3.2.2", "validator": "10.4.0" } }, @@ -1761,7 +1761,7 @@ "integrity": "sha1-LUEe92uFabbQyEBo2r6FsKpeXBc=", "dev": true, "requires": { - "source-map": "~0.6.0" + "source-map": "0.6.1" }, "dependencies": { "source-map": { @@ -1778,7 +1778,7 @@ "integrity": "sha1-ztqLuWsA/haOmwgCcpYNIP3K3W0=", "dev": true, "requires": { - "rimraf": "^2.6.1" + "rimraf": "2.6.3" } }, "cli-cursor": { @@ -1787,7 +1787,7 @@ "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", "dev": true, "requires": { - "restore-cursor": "^2.0.0" + "restore-cursor": "2.0.0" } }, "cli-width": { @@ -1802,9 +1802,9 @@ "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", "dev": true, "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wrap-ansi": "^2.0.0" + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wrap-ansi": "2.1.0" } }, "clone": { @@ -1819,10 +1819,10 @@ "integrity": "sha1-ANs6Hhc2VnMNEYjD1qztbX6pdxM=", "dev": true, "requires": { - "for-own": "^1.0.0", - "is-plain-object": "^2.0.4", - "kind-of": "^6.0.0", - "shallow-clone": "^1.0.0" + "for-own": "1.0.0", + "is-plain-object": "2.0.4", + "kind-of": "6.0.2", + "shallow-clone": "1.0.0" } }, "co": { @@ -1837,7 +1837,7 @@ "integrity": "sha1-qe8VNmDWqGqL3sAomlxoTSF0Mv0=", "dev": true, "requires": { - "q": "^1.1.2" + "q": "1.5.1" } }, "code-point-at": { @@ -1852,8 +1852,8 @@ "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", "dev": true, "requires": { - "map-visit": "^1.0.0", - "object-visit": "^1.0.0" + "map-visit": "1.0.0", + "object-visit": "1.0.1" } }, "color": { @@ -1862,9 +1862,9 @@ "integrity": "sha1-bXtcdPtl6EHNSHkq0e1eB7kE12Q=", "dev": true, "requires": { - "clone": "^1.0.2", - "color-convert": "^1.3.0", - "color-string": "^0.3.0" + "clone": "1.0.4", + "color-convert": "1.9.3", + "color-string": "0.3.0" } }, "color-convert": { @@ -1888,7 +1888,7 @@ "integrity": "sha1-J9RvtnAlxcL6JZk7+/V55HhBuZE=", "dev": true, "requires": { - "color-name": "^1.0.0" + "color-name": "1.1.3" } }, "colormin": { @@ -1897,9 +1897,9 @@ "integrity": "sha1-6i90IKcrlogaOKrlnsEkpvcpgTM=", "dev": true, "requires": { - "color": "^0.11.0", + "color": "0.11.4", "css-color-names": "0.0.4", - "has": "^1.0.1" + "has": "1.0.3" } }, "colors": { @@ -1914,7 +1914,7 @@ "integrity": "sha1-w9RaizT9cwYxoRCoolIGgrMdWn8=", "dev": true, "requires": { - "delayed-stream": "~1.0.0" + "delayed-stream": "1.0.0" } }, "commander": { @@ -1941,7 +1941,7 @@ "integrity": "sha1-bowQihatWDhKl386SCyiC/8vOME=", "dev": true, "requires": { - "mime-db": ">= 1.40.0 < 2" + "mime-db": "1.40.0" } }, "compression": { @@ -1950,13 +1950,13 @@ "integrity": "sha1-lVI+/xcMpXwpoMpB5v4TH0Hlu48=", "dev": true, "requires": { - "accepts": "~1.3.5", + "accepts": "1.3.7", "bytes": "3.0.0", - "compressible": "~2.0.16", + "compressible": "2.0.17", "debug": "2.6.9", - "on-headers": "~1.0.2", + "on-headers": "1.0.2", "safe-buffer": "5.1.2", - "vary": "~1.1.2" + "vary": "1.1.2" } }, "concat-map": { @@ -1971,10 +1971,10 @@ "integrity": "sha1-kEvfGUzTEi/Gdcd/xKw9T/D9GjQ=", "dev": true, "requires": { - "buffer-from": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^2.2.2", - "typedarray": "^0.0.6" + "buffer-from": "1.1.1", + "inherits": "2.0.3", + "readable-stream": "2.3.6", + "typedarray": "0.0.6" } }, "connect-history-api-fallback": { @@ -1989,7 +1989,7 @@ "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=", "dev": true, "requires": { - "date-now": "^0.1.4" + "date-now": "0.1.4" } }, "console-control-strings": { @@ -2004,7 +2004,7 @@ "integrity": "sha1-WiUEe8dvcwcmZ8jLUsmJiI9JTGM=", "dev": true, "requires": { - "bluebird": "^3.1.1" + "bluebird": "3.5.5" } }, "constant-case": { @@ -2013,8 +2013,8 @@ "integrity": "sha1-QXV2TTidP6nI7NKRhu1gBSQ7akY=", "dev": true, "requires": { - "snake-case": "^2.1.0", - "upper-case": "^1.1.1" + "snake-case": "2.1.0", + "upper-case": "1.1.3" } }, "constants-browserify": { @@ -2044,7 +2044,7 @@ "integrity": "sha1-UbU3qMQ+DwTewZk7/83VBOdYrCA=", "dev": true, "requires": { - "safe-buffer": "~5.1.1" + "safe-buffer": "5.1.2" } }, "cookie": { @@ -2065,12 +2065,12 @@ "integrity": "sha1-kilzmMrjSTf8r9bsgTnBgFHwteA=", "dev": true, "requires": { - "aproba": "^1.1.1", - "fs-write-stream-atomic": "^1.0.8", - "iferr": "^0.1.5", - "mkdirp": "^0.5.1", - "rimraf": "^2.5.4", - "run-queue": "^1.0.0" + "aproba": "1.2.0", + "fs-write-stream-atomic": "1.0.10", + "iferr": "0.1.5", + "mkdirp": "0.5.1", + "rimraf": "2.6.3", + "run-queue": "1.0.3" } }, "copy-descriptor": { @@ -2085,14 +2085,14 @@ "integrity": "sha1-5/QN2KaEd9QF3Rt6hUquMksVi64=", "dev": true, "requires": { - "cacache": "^10.0.4", - "find-cache-dir": "^1.0.0", - "globby": "^7.1.1", - "is-glob": "^4.0.0", - "loader-utils": "^1.1.0", - "minimatch": "^3.0.4", - "p-limit": "^1.0.0", - "serialize-javascript": "^1.4.0" + "cacache": "10.0.4", + "find-cache-dir": "1.0.0", + "globby": "7.1.1", + "is-glob": "4.0.1", + "loader-utils": "1.2.3", + "minimatch": "3.0.4", + "p-limit": "1.3.0", + "serialize-javascript": "1.7.0" }, "dependencies": { "dir-glob": { @@ -2101,7 +2101,7 @@ "integrity": "sha1-+gnwaUFTyJGLGLoN6vrpR2n8UMQ=", "dev": true, "requires": { - "path-type": "^3.0.0" + "path-type": "3.0.0" } }, "globby": { @@ -2110,12 +2110,12 @@ "integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=", "dev": true, "requires": { - "array-union": "^1.0.1", - "dir-glob": "^2.0.0", - "glob": "^7.1.2", - "ignore": "^3.3.5", - "pify": "^3.0.0", - "slash": "^1.0.0" + "array-union": "1.0.2", + "dir-glob": "2.2.2", + "glob": "7.1.4", + "ignore": "3.3.10", + "pify": "3.0.0", + "slash": "1.0.0" } }, "ignore": { @@ -2130,7 +2130,7 @@ "integrity": "sha1-zvMdyOCho7sNEFwM2Xzzv0f0428=", "dev": true, "requires": { - "pify": "^3.0.0" + "pify": "3.0.0" } } } @@ -2152,13 +2152,13 @@ "integrity": "sha1-YXPOvVb6wELB9DkO33r2wHx8uJI=", "dev": true, "requires": { - "is-directory": "^0.3.1", - "js-yaml": "^3.4.3", - "minimist": "^1.2.0", - "object-assign": "^4.1.0", - "os-homedir": "^1.0.1", - "parse-json": "^2.2.0", - "require-from-string": "^1.1.0" + "is-directory": "0.3.1", + "js-yaml": "3.7.0", + "minimist": "1.2.0", + "object-assign": "4.1.1", + "os-homedir": "1.0.2", + "parse-json": "2.2.0", + "require-from-string": "1.2.1" }, "dependencies": { "minimist": { @@ -2175,8 +2175,8 @@ "integrity": "sha1-yREbbzMEXEaX8UR4f5JUzcd8Rf8=", "dev": true, "requires": { - "bn.js": "^4.1.0", - "elliptic": "^6.0.0" + "bn.js": "4.11.8", + "elliptic": "6.4.1" } }, "create-hash": { @@ -2185,11 +2185,11 @@ "integrity": "sha1-iJB4rxGmN1a8+1m9IhmWvjqe8ZY=", "dev": true, "requires": { - "cipher-base": "^1.0.1", - "inherits": "^2.0.1", - "md5.js": "^1.3.4", - "ripemd160": "^2.0.1", - "sha.js": "^2.4.0" + "cipher-base": "1.0.4", + "inherits": "2.0.3", + "md5.js": "1.3.5", + "ripemd160": "2.0.2", + "sha.js": "2.4.11" } }, "create-hmac": { @@ -2198,12 +2198,12 @@ "integrity": "sha1-aRcMeLOrlXFHsriwRXLkfq0iQ/8=", "dev": true, "requires": { - "cipher-base": "^1.0.3", - "create-hash": "^1.1.0", - "inherits": "^2.0.1", - "ripemd160": "^2.0.0", - "safe-buffer": "^5.0.1", - "sha.js": "^2.4.8" + "cipher-base": "1.0.4", + "create-hash": "1.2.0", + "inherits": "2.0.3", + "ripemd160": "2.0.2", + "safe-buffer": "5.1.2", + "sha.js": "2.4.11" } }, "cross-env": { @@ -2212,8 +2212,8 @@ "integrity": "sha1-bs1MAV1Xc+YUA57lKQdmabnRJvI=", "dev": true, "requires": { - "cross-spawn": "^6.0.5", - "is-windows": "^1.0.0" + "cross-spawn": "6.0.5", + "is-windows": "1.0.2" } }, "cross-spawn": { @@ -2222,11 +2222,11 @@ "integrity": "sha1-Sl7Hxk364iw6FBJNus3uhG2Ay8Q=", "dev": true, "requires": { - "nice-try": "^1.0.4", - "path-key": "^2.0.1", - "semver": "^5.5.0", - "shebang-command": "^1.2.0", - "which": "^1.2.9" + "nice-try": "1.0.5", + "path-key": "2.0.1", + "semver": "5.7.0", + "shebang-command": "1.2.0", + "which": "1.3.1" } }, "crypt": { @@ -2241,17 +2241,17 @@ "integrity": "sha1-OWz58xN/A+S45TLFj2mCVOAPgOw=", "dev": true, "requires": { - "browserify-cipher": "^1.0.0", - "browserify-sign": "^4.0.0", - "create-ecdh": "^4.0.0", - "create-hash": "^1.1.0", - "create-hmac": "^1.1.0", - "diffie-hellman": "^5.0.0", - "inherits": "^2.0.1", - "pbkdf2": "^3.0.3", - "public-encrypt": "^4.0.0", - "randombytes": "^2.0.0", - "randomfill": "^1.0.3" + "browserify-cipher": "1.0.1", + "browserify-sign": "4.0.4", + "create-ecdh": "4.0.3", + "create-hash": "1.2.0", + "create-hmac": "1.1.7", + "diffie-hellman": "5.0.3", + "inherits": "2.0.3", + "pbkdf2": "3.0.17", + "public-encrypt": "4.0.3", + "randombytes": "2.1.0", + "randomfill": "1.0.4" } }, "css-color-names": { @@ -2266,20 +2266,20 @@ "integrity": "sha1-w/mGSnAL4nEbtaJGKyOJsaOS2rc=", "dev": true, "requires": { - "babel-code-frame": "^6.26.0", - "css-selector-tokenizer": "^0.7.0", - "cssnano": "^3.10.0", - "icss-utils": "^2.1.0", - "loader-utils": "^1.0.2", - "lodash.camelcase": "^4.3.0", - "object-assign": "^4.1.1", - "postcss": "^5.0.6", - "postcss-modules-extract-imports": "^1.2.0", - "postcss-modules-local-by-default": "^1.2.0", - "postcss-modules-scope": "^1.1.0", - "postcss-modules-values": "^1.3.0", - "postcss-value-parser": "^3.3.0", - "source-list-map": "^2.0.0" + "babel-code-frame": "6.26.0", + "css-selector-tokenizer": "0.7.1", + "cssnano": "3.10.0", + "icss-utils": "2.1.0", + "loader-utils": "1.2.3", + "lodash.camelcase": "4.3.0", + "object-assign": "4.1.1", + "postcss": "5.2.18", + "postcss-modules-extract-imports": "1.2.1", + "postcss-modules-local-by-default": "1.2.0", + "postcss-modules-scope": "1.1.0", + "postcss-modules-values": "1.3.0", + "postcss-value-parser": "3.3.1", + "source-list-map": "2.0.1" } }, "css-select": { @@ -2288,10 +2288,10 @@ "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=", "dev": true, "requires": { - "boolbase": "~1.0.0", - "css-what": "2.1", + "boolbase": "1.0.0", + "css-what": "2.1.3", "domutils": "1.5.1", - "nth-check": "~1.0.1" + "nth-check": "1.0.2" } }, "css-selector-tokenizer": { @@ -2300,9 +2300,9 @@ "integrity": "sha1-oXcnGovKUBkXL0+JH8bu2cv2jV0=", "dev": true, "requires": { - "cssesc": "^0.1.0", - "fastparse": "^1.1.1", - "regexpu-core": "^1.0.0" + "cssesc": "0.1.0", + "fastparse": "1.1.2", + "regexpu-core": "1.0.0" }, "dependencies": { "regexpu-core": { @@ -2311,9 +2311,9 @@ "integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=", "dev": true, "requires": { - "regenerate": "^1.2.1", - "regjsgen": "^0.2.0", - "regjsparser": "^0.1.4" + "regenerate": "1.4.0", + "regjsgen": "0.2.0", + "regjsparser": "0.1.5" } } } @@ -2336,38 +2336,38 @@ "integrity": "sha1-Tzj2zqK5sX+gFJDyPx3GjqZcHDg=", "dev": true, "requires": { - "autoprefixer": "^6.3.1", - "decamelize": "^1.1.2", - "defined": "^1.0.0", - "has": "^1.0.1", - "object-assign": "^4.0.1", - "postcss": "^5.0.14", - "postcss-calc": "^5.2.0", - "postcss-colormin": "^2.1.8", - "postcss-convert-values": "^2.3.4", - "postcss-discard-comments": "^2.0.4", - "postcss-discard-duplicates": "^2.0.1", - "postcss-discard-empty": "^2.0.1", - "postcss-discard-overridden": "^0.1.1", - "postcss-discard-unused": "^2.2.1", - "postcss-filter-plugins": "^2.0.0", - "postcss-merge-idents": "^2.1.5", - "postcss-merge-longhand": "^2.0.1", - "postcss-merge-rules": "^2.0.3", - "postcss-minify-font-values": "^1.0.2", - "postcss-minify-gradients": "^1.0.1", - "postcss-minify-params": "^1.0.4", - "postcss-minify-selectors": "^2.0.4", - "postcss-normalize-charset": "^1.1.0", - "postcss-normalize-url": "^3.0.7", - "postcss-ordered-values": "^2.1.0", - "postcss-reduce-idents": "^2.2.2", - "postcss-reduce-initial": "^1.0.0", - "postcss-reduce-transforms": "^1.0.3", - "postcss-svgo": "^2.1.1", - "postcss-unique-selectors": "^2.0.2", - "postcss-value-parser": "^3.2.3", - "postcss-zindex": "^2.0.1" + "autoprefixer": "6.7.7", + "decamelize": "1.2.0", + "defined": "1.0.0", + "has": "1.0.3", + "object-assign": "4.1.1", + "postcss": "5.2.18", + "postcss-calc": "5.3.1", + "postcss-colormin": "2.2.2", + "postcss-convert-values": "2.6.1", + "postcss-discard-comments": "2.0.4", + "postcss-discard-duplicates": "2.1.0", + "postcss-discard-empty": "2.1.0", + "postcss-discard-overridden": "0.1.1", + "postcss-discard-unused": "2.2.3", + "postcss-filter-plugins": "2.0.3", + "postcss-merge-idents": "2.1.7", + "postcss-merge-longhand": "2.0.2", + "postcss-merge-rules": "2.1.2", + "postcss-minify-font-values": "1.0.5", + "postcss-minify-gradients": "1.0.5", + "postcss-minify-params": "1.2.2", + "postcss-minify-selectors": "2.1.1", + "postcss-normalize-charset": "1.1.1", + "postcss-normalize-url": "3.0.8", + "postcss-ordered-values": "2.2.3", + "postcss-reduce-idents": "2.4.0", + "postcss-reduce-initial": "1.0.1", + "postcss-reduce-transforms": "1.0.4", + "postcss-svgo": "2.1.6", + "postcss-unique-selectors": "2.0.2", + "postcss-value-parser": "3.3.1", + "postcss-zindex": "2.2.0" } }, "csso": { @@ -2376,8 +2376,8 @@ "integrity": "sha1-3dUsWHAz9J6Utx/FVWnyUuj/X4U=", "dev": true, "requires": { - "clap": "^1.0.9", - "source-map": "^0.5.3" + "clap": "1.2.3", + "source-map": "0.5.7" } }, "currently-unhandled": { @@ -2386,7 +2386,7 @@ "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", "dev": true, "requires": { - "array-find-index": "^1.0.1" + "array-find-index": "1.0.2" } }, "cyclist": { @@ -2401,7 +2401,7 @@ "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=", "dev": true, "requires": { - "es5-ext": "^0.10.9" + "es5-ext": "0.10.50" } }, "dashdash": { @@ -2410,7 +2410,7 @@ "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", "dev": true, "requires": { - "assert-plus": "^1.0.0" + "assert-plus": "1.0.0" } }, "date-now": { @@ -2469,7 +2469,7 @@ "integrity": "sha1-z4jabL7ib+bbcJT2HYcMvYTO6fE=", "dev": true, "requires": { - "object-keys": "^1.0.12" + "object-keys": "1.1.1" } }, "define-property": { @@ -2478,8 +2478,8 @@ "integrity": "sha1-1Flono1lS6d+AqgX+HENcCyxbp0=", "dev": true, "requires": { - "is-descriptor": "^1.0.2", - "isobject": "^3.0.1" + "is-descriptor": "1.0.2", + "isobject": "3.0.1" }, "dependencies": { "is-accessor-descriptor": { @@ -2488,7 +2488,7 @@ "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=", "dev": true, "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.2" } }, "is-data-descriptor": { @@ -2497,7 +2497,7 @@ "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=", "dev": true, "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.2" } }, "is-descriptor": { @@ -2506,9 +2506,9 @@ "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=", "dev": true, "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" } } } @@ -2525,12 +2525,12 @@ "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=", "dev": true, "requires": { - "globby": "^6.1.0", - "is-path-cwd": "^1.0.0", - "is-path-in-cwd": "^1.0.0", - "p-map": "^1.1.1", - "pify": "^3.0.0", - "rimraf": "^2.2.8" + "globby": "6.1.0", + "is-path-cwd": "1.0.0", + "is-path-in-cwd": "1.0.1", + "p-map": "1.2.0", + "pify": "3.0.0", + "rimraf": "2.6.3" }, "dependencies": { "globby": { @@ -2539,11 +2539,11 @@ "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", "dev": true, "requires": { - "array-union": "^1.0.1", - "glob": "^7.0.3", - "object-assign": "^4.0.1", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" + "array-union": "1.0.2", + "glob": "7.1.4", + "object-assign": "4.1.1", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" }, "dependencies": { "pify": { @@ -2580,8 +2580,8 @@ "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=", "dev": true, "requires": { - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0" + "inherits": "2.0.3", + "minimalistic-assert": "1.0.1" } }, "destroy": { @@ -2602,7 +2602,7 @@ "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=", "dev": true, "requires": { - "repeating": "^2.0.0" + "repeating": "2.0.1" } }, "detect-node": { @@ -2617,9 +2617,9 @@ "integrity": "sha1-QOjumPVaIUlgcUaSHGPhrl89KHU=", "dev": true, "requires": { - "bn.js": "^4.1.0", - "miller-rabin": "^4.0.0", - "randombytes": "^2.0.0" + "bn.js": "4.11.8", + "miller-rabin": "4.0.1", + "randombytes": "2.1.0" } }, "dir-glob": { @@ -2628,7 +2628,7 @@ "integrity": "sha1-Vtv3PZkqSpO6FYT0U0Bj/S5BcX8=", "dev": true, "requires": { - "path-type": "^4.0.0" + "path-type": "4.0.0" } }, "dns-equal": { @@ -2643,8 +2643,8 @@ "integrity": "sha1-EqpCaYEHW+UAuRDu3NC0fdfe2lo=", "dev": true, "requires": { - "ip": "^1.1.0", - "safe-buffer": "^5.0.1" + "ip": "1.1.5", + "safe-buffer": "5.1.2" } }, "dns-txt": { @@ -2653,7 +2653,7 @@ "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=", "dev": true, "requires": { - "buffer-indexof": "^1.0.0" + "buffer-indexof": "1.1.1" } }, "dom-converter": { @@ -2662,7 +2662,7 @@ "integrity": "sha1-ZyGp2u4uKTaClVtq/kFncWJ7t2g=", "dev": true, "requires": { - "utila": "~0.4" + "utila": "0.4.0" } }, "dom-serializer": { @@ -2671,8 +2671,8 @@ "integrity": "sha1-HsQFnihLq+027sKUHUqXChic58A=", "dev": true, "requires": { - "domelementtype": "^1.3.0", - "entities": "^1.1.1" + "domelementtype": "1.3.1", + "entities": "1.1.2" } }, "domain-browser": { @@ -2693,7 +2693,7 @@ "integrity": "sha1-iAUJfpM9ZehVRvcm1g9euItE+AM=", "dev": true, "requires": { - "domelementtype": "1" + "domelementtype": "1.3.1" } }, "domutils": { @@ -2702,8 +2702,8 @@ "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=", "dev": true, "requires": { - "dom-serializer": "0", - "domelementtype": "1" + "dom-serializer": "0.1.1", + "domelementtype": "1.3.1" } }, "dot-case": { @@ -2712,7 +2712,7 @@ "integrity": "sha1-NNzzf1Co6TwrO8qLt/uRVcfaO+4=", "dev": true, "requires": { - "no-case": "^2.2.0" + "no-case": "2.3.2" } }, "duplexify": { @@ -2721,28 +2721,28 @@ "integrity": "sha1-Kk31MX9sz9kfhtb9JdjYoQO4gwk=", "dev": true, "requires": { - "end-of-stream": "^1.0.0", - "inherits": "^2.0.1", - "readable-stream": "^2.0.0", - "stream-shift": "^1.0.0" + "end-of-stream": "1.4.1", + "inherits": "2.0.3", + "readable-stream": "2.3.6", + "stream-shift": "1.0.0" } }, "earthsdk": { - "version": "1.2.8", - "resolved": "https://registry.npm.taobao.org/earthsdk/download/earthsdk-1.2.8.tgz?cache=0&sync_timestamp=1574750967549&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fearthsdk%2Fdownload%2Fearthsdk-1.2.8.tgz", - "integrity": "sha1-E3IWwllk6Eky4xfGFgJffl6g1BE=", + "version": "1.2.9", + "resolved": "https://registry.npm.taobao.org/earthsdk/download/earthsdk-1.2.9.tgz", + "integrity": "sha1-zMxAfmtmd1c1ZAuJW5jpaDc84aM=", "dev": true }, "earthsdk-custom-primitive": { - "version": "1.0.1", - "resolved": "https://registry.npm.taobao.org/earthsdk-custom-primitive/download/earthsdk-custom-primitive-1.0.1.tgz?cache=0&sync_timestamp=1574755565892&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fearthsdk-custom-primitive%2Fdownload%2Fearthsdk-custom-primitive-1.0.1.tgz", - "integrity": "sha1-hYFI1iCGKdyb27m3Rfwa1MpdGhI=", + "version": "1.0.2", + "resolved": "https://registry.npm.taobao.org/earthsdk-custom-primitive/download/earthsdk-custom-primitive-1.0.2.tgz?cache=0&sync_timestamp=1575017745154&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fearthsdk-custom-primitive%2Fdownload%2Fearthsdk-custom-primitive-1.0.2.tgz", + "integrity": "sha1-Nbyy0ac64lygk+wh8lu8joH2upM=", "dev": true }, "earthsdk-plotting-symbol": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/earthsdk-plotting-symbol/-/earthsdk-plotting-symbol-1.0.11.tgz", - "integrity": "sha512-TXbVCkEIdHgbIa2mBTeyAOQ3NSaUMbYG6EsCPBEze4oz/99rbCqw982CQoGagknNo8bsfhQgZ0gH7aoVou53Mw==", + "version": "1.0.12", + "resolved": "https://registry.npm.taobao.org/earthsdk-plotting-symbol/download/earthsdk-plotting-symbol-1.0.12.tgz", + "integrity": "sha1-Jq/VGoFoWyTin4GCE08Wq3B+Sho=", "dev": true }, "ecc-jsbn": { @@ -2751,8 +2751,8 @@ "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", "dev": true, "requires": { - "jsbn": "~0.1.0", - "safer-buffer": "^2.1.0" + "jsbn": "0.1.1", + "safer-buffer": "2.1.2" } }, "ee-first": { @@ -2781,13 +2781,13 @@ "integrity": "sha1-wtC3d2kRuGcixjLDwGxg8vgZk5o=", "dev": true, "requires": { - "bn.js": "^4.4.0", - "brorand": "^1.0.1", - "hash.js": "^1.0.0", - "hmac-drbg": "^1.0.0", - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0", - "minimalistic-crypto-utils": "^1.0.0" + "bn.js": "4.11.8", + "brorand": "1.1.0", + "hash.js": "1.1.7", + "hmac-drbg": "1.0.1", + "inherits": "2.0.3", + "minimalistic-assert": "1.0.1", + "minimalistic-crypto-utils": "1.0.1" } }, "emojis-list": { @@ -2808,7 +2808,7 @@ "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=", "dev": true, "requires": { - "iconv-lite": "~0.4.13" + "iconv-lite": "0.4.24" } }, "end-of-stream": { @@ -2817,7 +2817,7 @@ "integrity": "sha1-7SljTRm6ukY7bOa4CjchPqtx7EM=", "dev": true, "requires": { - "once": "^1.4.0" + "once": "1.4.0" } }, "enhanced-resolve": { @@ -2826,10 +2826,10 @@ "integrity": "sha1-BCHjOf1xQZs9oT0Smzl5BAIwR24=", "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "memory-fs": "^0.4.0", - "object-assign": "^4.0.1", - "tapable": "^0.2.7" + "graceful-fs": "4.1.15", + "memory-fs": "0.4.1", + "object-assign": "4.1.1", + "tapable": "0.2.9" } }, "entities": { @@ -2844,7 +2844,7 @@ "integrity": "sha1-RoTXF3mtOa8Xfj8AeZb3xnyFJhg=", "dev": true, "requires": { - "prr": "~1.0.1" + "prr": "1.0.1" } }, "error-ex": { @@ -2853,7 +2853,7 @@ "integrity": "sha1-tKxAZIEH/c3PriQvQovqihTU8b8=", "dev": true, "requires": { - "is-arrayish": "^0.2.1" + "is-arrayish": "0.2.1" } }, "es-abstract": { @@ -2862,12 +2862,12 @@ "integrity": "sha1-rIYUX91QmdjdSVWMy6Lq+biOJOk=", "dev": true, "requires": { - "es-to-primitive": "^1.2.0", - "function-bind": "^1.1.1", - "has": "^1.0.3", - "is-callable": "^1.1.4", - "is-regex": "^1.0.4", - "object-keys": "^1.0.12" + "es-to-primitive": "1.2.0", + "function-bind": "1.1.1", + "has": "1.0.3", + "is-callable": "1.1.4", + "is-regex": "1.0.4", + "object-keys": "1.1.1" } }, "es-to-primitive": { @@ -2876,9 +2876,9 @@ "integrity": "sha1-7fckeAM0VujdqO8J4ArZZQcH83c=", "dev": true, "requires": { - "is-callable": "^1.1.4", - "is-date-object": "^1.0.1", - "is-symbol": "^1.0.2" + "is-callable": "1.1.4", + "is-date-object": "1.0.1", + "is-symbol": "1.0.2" } }, "es5-ext": { @@ -2887,9 +2887,9 @@ "integrity": "sha1-bQ4joKvbJwGOWsT9CbQSvFUXp3g=", "dev": true, "requires": { - "es6-iterator": "~2.0.3", - "es6-symbol": "~3.1.1", - "next-tick": "^1.0.0" + "es6-iterator": "2.0.3", + "es6-symbol": "3.1.1", + "next-tick": "1.0.0" } }, "es6-iterator": { @@ -2898,9 +2898,9 @@ "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=", "dev": true, "requires": { - "d": "1", - "es5-ext": "^0.10.35", - "es6-symbol": "^3.1.1" + "d": "1.0.0", + "es5-ext": "0.10.50", + "es6-symbol": "3.1.1" } }, "es6-map": { @@ -2909,12 +2909,12 @@ "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=", "dev": true, "requires": { - "d": "1", - "es5-ext": "~0.10.14", - "es6-iterator": "~2.0.1", - "es6-set": "~0.1.5", - "es6-symbol": "~3.1.1", - "event-emitter": "~0.3.5" + "d": "1.0.0", + "es5-ext": "0.10.50", + "es6-iterator": "2.0.3", + "es6-set": "0.1.5", + "es6-symbol": "3.1.1", + "event-emitter": "0.3.5" } }, "es6-set": { @@ -2923,11 +2923,11 @@ "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=", "dev": true, "requires": { - "d": "1", - "es5-ext": "~0.10.14", - "es6-iterator": "~2.0.1", + "d": "1.0.0", + "es5-ext": "0.10.50", + "es6-iterator": "2.0.3", "es6-symbol": "3.1.1", - "event-emitter": "~0.3.5" + "event-emitter": "0.3.5" } }, "es6-symbol": { @@ -2936,8 +2936,8 @@ "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=", "dev": true, "requires": { - "d": "1", - "es5-ext": "~0.10.14" + "d": "1.0.0", + "es5-ext": "0.10.50" } }, "es6-templates": { @@ -2946,8 +2946,8 @@ "integrity": "sha1-XLmsn7He1usSOTQrgdeSu7QHjuQ=", "dev": true, "requires": { - "recast": "~0.11.12", - "through": "~2.3.6" + "recast": "0.11.23", + "through": "2.3.8" } }, "es6-weak-map": { @@ -2956,10 +2956,10 @@ "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=", "dev": true, "requires": { - "d": "1", - "es5-ext": "^0.10.14", - "es6-iterator": "^2.0.1", - "es6-symbol": "^3.1.1" + "d": "1.0.0", + "es5-ext": "0.10.50", + "es6-iterator": "2.0.3", + "es6-symbol": "3.1.1" } }, "escape-html": { @@ -2980,11 +2980,11 @@ "integrity": "sha1-rNa71z+ScHY+GFcM3BPA1pR1miM=", "dev": true, "requires": { - "esprima": "^2.7.1", - "estraverse": "^1.9.1", - "esutils": "^2.0.2", - "optionator": "^0.8.1", - "source-map": "~0.2.0" + "esprima": "2.7.3", + "estraverse": "1.9.3", + "esutils": "2.0.2", + "optionator": "0.8.2", + "source-map": "0.2.0" }, "dependencies": { "estraverse": { @@ -3000,7 +3000,7 @@ "dev": true, "optional": true, "requires": { - "amdefine": ">=0.0.4" + "amdefine": "1.0.1" } } } @@ -3011,10 +3011,10 @@ "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=", "dev": true, "requires": { - "es6-map": "^0.1.3", - "es6-weak-map": "^2.0.1", - "esrecurse": "^4.1.0", - "estraverse": "^4.1.1" + "es6-map": "0.1.5", + "es6-weak-map": "2.0.2", + "esrecurse": "4.2.1", + "estraverse": "4.2.0" } }, "espree": { @@ -3023,8 +3023,8 @@ "integrity": "sha1-JTmY8goPgttdhmOFeZ2RKoOjZjQ=", "dev": true, "requires": { - "acorn": "^5.6.0", - "acorn-jsx": "^4.1.1" + "acorn": "5.7.3", + "acorn-jsx": "4.1.1" } }, "esprima": { @@ -3039,7 +3039,7 @@ "integrity": "sha1-AHo7n9vCs7uH5IeeoZyS/b05Qs8=", "dev": true, "requires": { - "estraverse": "^4.1.0" + "estraverse": "4.2.0" } }, "estraverse": { @@ -3066,8 +3066,8 @@ "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=", "dev": true, "requires": { - "d": "1", - "es5-ext": "~0.10.14" + "d": "1.0.0", + "es5-ext": "0.10.50" } }, "eventemitter3": { @@ -3088,7 +3088,7 @@ "integrity": "sha1-Cs7ehJ7X3RzMMsgRuxG5RNTykjI=", "dev": true, "requires": { - "original": ">=0.0.5" + "original": "1.0.2" } }, "evp_bytestokey": { @@ -3097,8 +3097,8 @@ "integrity": "sha1-f8vbGY3HGVlDLv4ThCaE4FJaywI=", "dev": true, "requires": { - "md5.js": "^1.3.4", - "safe-buffer": "^5.1.1" + "md5.js": "1.3.5", + "safe-buffer": "5.1.2" } }, "execa": { @@ -3107,13 +3107,13 @@ "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", "dev": true, "requires": { - "cross-spawn": "^5.0.1", - "get-stream": "^3.0.0", - "is-stream": "^1.1.0", - "npm-run-path": "^2.0.0", - "p-finally": "^1.0.0", - "signal-exit": "^3.0.0", - "strip-eof": "^1.0.0" + "cross-spawn": "5.1.0", + "get-stream": "3.0.0", + "is-stream": "1.1.0", + "npm-run-path": "2.0.2", + "p-finally": "1.0.0", + "signal-exit": "3.0.2", + "strip-eof": "1.0.0" }, "dependencies": { "cross-spawn": { @@ -3122,9 +3122,9 @@ "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", "dev": true, "requires": { - "lru-cache": "^4.0.1", - "shebang-command": "^1.2.0", - "which": "^1.2.9" + "lru-cache": "4.1.5", + "shebang-command": "1.2.0", + "which": "1.3.1" } } } @@ -3135,13 +3135,13 @@ "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", "dev": true, "requires": { - "debug": "^2.3.3", - "define-property": "^0.2.5", - "extend-shallow": "^2.0.1", - "posix-character-classes": "^0.1.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" + "debug": "2.6.9", + "define-property": "0.2.5", + "extend-shallow": "2.0.1", + "posix-character-classes": "0.1.1", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" }, "dependencies": { "define-property": { @@ -3150,7 +3150,7 @@ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "is-descriptor": "^0.1.0" + "is-descriptor": "0.1.6" } }, "extend-shallow": { @@ -3159,7 +3159,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } } } @@ -3170,7 +3170,7 @@ "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=", "dev": true, "requires": { - "homedir-polyfill": "^1.0.1" + "homedir-polyfill": "1.0.3" } }, "express": { @@ -3179,36 +3179,36 @@ "integrity": "sha1-RJH8OGBc9R+GKdOcK10Cb5ikwTQ=", "dev": true, "requires": { - "accepts": "~1.3.7", + "accepts": "1.3.7", "array-flatten": "1.1.1", "body-parser": "1.19.0", "content-disposition": "0.5.3", - "content-type": "~1.0.4", + "content-type": "1.0.4", "cookie": "0.4.0", "cookie-signature": "1.0.6", "debug": "2.6.9", - "depd": "~1.1.2", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "finalhandler": "~1.1.2", + "depd": "1.1.2", + "encodeurl": "1.0.2", + "escape-html": "1.0.3", + "etag": "1.8.1", + "finalhandler": "1.1.2", "fresh": "0.5.2", "merge-descriptors": "1.0.1", - "methods": "~1.1.2", - "on-finished": "~2.3.0", - "parseurl": "~1.3.3", + "methods": "1.1.2", + "on-finished": "2.3.0", + "parseurl": "1.3.3", "path-to-regexp": "0.1.7", - "proxy-addr": "~2.0.5", + "proxy-addr": "2.0.5", "qs": "6.7.0", - "range-parser": "~1.2.1", + "range-parser": "1.2.1", "safe-buffer": "5.1.2", "send": "0.17.1", "serve-static": "1.14.1", "setprototypeof": "1.1.1", - "statuses": "~1.5.0", - "type-is": "~1.6.18", + "statuses": "1.5.0", + "type-is": "1.6.18", "utils-merge": "1.0.1", - "vary": "~1.1.2" + "vary": "1.1.2" }, "dependencies": { "array-flatten": { @@ -3237,8 +3237,8 @@ "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", "dev": true, "requires": { - "assign-symbols": "^1.0.0", - "is-extendable": "^1.0.1" + "assign-symbols": "1.0.0", + "is-extendable": "1.0.1" }, "dependencies": { "is-extendable": { @@ -3247,7 +3247,7 @@ "integrity": "sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ=", "dev": true, "requires": { - "is-plain-object": "^2.0.4" + "is-plain-object": "2.0.4" } } } @@ -3258,9 +3258,9 @@ "integrity": "sha1-BFURz9jRM/OEZnPRBHwVTiFK09U=", "dev": true, "requires": { - "chardet": "^0.4.0", - "iconv-lite": "^0.4.17", - "tmp": "^0.0.33" + "chardet": "0.4.2", + "iconv-lite": "0.4.24", + "tmp": "0.0.33" } }, "extglob": { @@ -3269,14 +3269,14 @@ "integrity": "sha1-rQD+TcYSqSMuhxhxHcXLWrAoVUM=", "dev": true, "requires": { - "array-unique": "^0.3.2", - "define-property": "^1.0.0", - "expand-brackets": "^2.1.4", - "extend-shallow": "^2.0.1", - "fragment-cache": "^0.2.1", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" + "array-unique": "0.3.2", + "define-property": "1.0.0", + "expand-brackets": "2.1.4", + "extend-shallow": "2.0.1", + "fragment-cache": "0.2.1", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" }, "dependencies": { "define-property": { @@ -3285,7 +3285,7 @@ "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "dev": true, "requires": { - "is-descriptor": "^1.0.0" + "is-descriptor": "1.0.2" } }, "extend-shallow": { @@ -3294,7 +3294,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } }, "is-accessor-descriptor": { @@ -3303,7 +3303,7 @@ "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=", "dev": true, "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.2" } }, "is-data-descriptor": { @@ -3312,7 +3312,7 @@ "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=", "dev": true, "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.2" } }, "is-descriptor": { @@ -3321,9 +3321,9 @@ "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=", "dev": true, "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" } } } @@ -3346,12 +3346,12 @@ "integrity": "sha1-1ISkEAXLb66zmblR/RvXDdrrtgI=", "dev": true, "requires": { - "@nodelib/fs.stat": "^2.0.1", - "@nodelib/fs.walk": "^1.2.1", - "glob-parent": "^5.0.0", - "is-glob": "^4.0.1", - "merge2": "^1.2.3", - "micromatch": "^4.0.2" + "@nodelib/fs.stat": "2.0.1", + "@nodelib/fs.walk": "1.2.2", + "glob-parent": "5.0.0", + "is-glob": "4.0.1", + "merge2": "1.2.4", + "micromatch": "4.0.2" }, "dependencies": { "braces": { @@ -3360,7 +3360,7 @@ "integrity": "sha1-NFThpGLujVmeI23zNs2epPiv4Qc=", "dev": true, "requires": { - "fill-range": "^7.0.1" + "fill-range": "7.0.1" } }, "fill-range": { @@ -3369,7 +3369,7 @@ "integrity": "sha1-GRmmp8df44ssfHflGYU12prN2kA=", "dev": true, "requires": { - "to-regex-range": "^5.0.1" + "to-regex-range": "5.0.1" } }, "glob-parent": { @@ -3378,7 +3378,7 @@ "integrity": "sha1-HcmfDzmwBtPpLCwoQGg4Lwwg6VQ=", "dev": true, "requires": { - "is-glob": "^4.0.1" + "is-glob": "4.0.1" } }, "is-number": { @@ -3393,8 +3393,8 @@ "integrity": "sha1-T8sJmb+fvC/L3SEvbWKbmlbDklk=", "dev": true, "requires": { - "braces": "^3.0.1", - "picomatch": "^2.0.5" + "braces": "3.0.2", + "picomatch": "2.0.7" } }, "to-regex-range": { @@ -3403,7 +3403,7 @@ "integrity": "sha1-FkjESq58jZiKMmAY7XL1tN0DkuQ=", "dev": true, "requires": { - "is-number": "^7.0.0" + "is-number": "7.0.0" } } } @@ -3432,7 +3432,7 @@ "integrity": "sha1-Tsijj0rCXyFJJnOtt+rpz+9H0cI=", "dev": true, "requires": { - "reusify": "^1.0.0" + "reusify": "1.0.4" } }, "faye-websocket": { @@ -3441,7 +3441,7 @@ "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=", "dev": true, "requires": { - "websocket-driver": ">=0.5.1" + "websocket-driver": "0.7.0" } }, "figures": { @@ -3450,7 +3450,7 @@ "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", "dev": true, "requires": { - "escape-string-regexp": "^1.0.5" + "escape-string-regexp": "1.0.5" } }, "file-loader": { @@ -3459,8 +3459,8 @@ "integrity": "sha1-b+iGRJsPKpNuQ8q6rAzb+zaVBvg=", "dev": true, "requires": { - "loader-utils": "^1.0.2", - "schema-utils": "^0.4.5" + "loader-utils": "1.2.3", + "schema-utils": "0.4.7" } }, "fill-range": { @@ -3469,10 +3469,10 @@ "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", "dev": true, "requires": { - "extend-shallow": "^2.0.1", - "is-number": "^3.0.0", - "repeat-string": "^1.6.1", - "to-regex-range": "^2.1.0" + "extend-shallow": "2.0.1", + "is-number": "3.0.0", + "repeat-string": "1.6.1", + "to-regex-range": "2.1.1" }, "dependencies": { "extend-shallow": { @@ -3481,7 +3481,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } } } @@ -3493,12 +3493,12 @@ "dev": true, "requires": { "debug": "2.6.9", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "on-finished": "~2.3.0", - "parseurl": "~1.3.3", - "statuses": "~1.5.0", - "unpipe": "~1.0.0" + "encodeurl": "1.0.2", + "escape-html": "1.0.3", + "on-finished": "2.3.0", + "parseurl": "1.3.3", + "statuses": "1.5.0", + "unpipe": "1.0.0" } }, "find-cache-dir": { @@ -3507,9 +3507,9 @@ "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=", "dev": true, "requires": { - "commondir": "^1.0.1", - "make-dir": "^1.0.0", - "pkg-dir": "^2.0.0" + "commondir": "1.0.1", + "make-dir": "1.3.0", + "pkg-dir": "2.0.0" } }, "find-up": { @@ -3518,7 +3518,7 @@ "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", "dev": true, "requires": { - "locate-path": "^2.0.0" + "locate-path": "2.0.0" } }, "findup-sync": { @@ -3527,10 +3527,10 @@ "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=", "dev": true, "requires": { - "detect-file": "^1.0.0", - "is-glob": "^3.1.0", - "micromatch": "^3.0.4", - "resolve-dir": "^1.0.1" + "detect-file": "1.0.0", + "is-glob": "3.1.0", + "micromatch": "3.1.10", + "resolve-dir": "1.0.1" }, "dependencies": { "is-glob": { @@ -3539,7 +3539,7 @@ "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", "dev": true, "requires": { - "is-extglob": "^2.1.0" + "is-extglob": "2.1.1" } } } @@ -3556,8 +3556,8 @@ "integrity": "sha1-jdfYc6G6vCB9lOrQwuDkQnbr8ug=", "dev": true, "requires": { - "inherits": "^2.0.3", - "readable-stream": "^2.3.6" + "inherits": "2.0.3", + "readable-stream": "2.3.6" } }, "follow-redirects": { @@ -3566,7 +3566,7 @@ "integrity": "sha1-SJ68GY3A5/ZBZ70jsDxMGbV4THY=", "dev": true, "requires": { - "debug": "^3.2.6" + "debug": "3.2.6" }, "dependencies": { "debug": { @@ -3575,7 +3575,7 @@ "integrity": "sha1-6D0X3hbYp++3cX7b5fsQE17uYps=", "dev": true, "requires": { - "ms": "^2.1.1" + "ms": "2.1.1" } }, "ms": { @@ -3598,7 +3598,7 @@ "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=", "dev": true, "requires": { - "for-in": "^1.0.1" + "for-in": "1.0.2" } }, "forever-agent": { @@ -3613,9 +3613,9 @@ "integrity": "sha1-3M5SwF9kTymManq5Nr1yTO/786Y=", "dev": true, "requires": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.6", - "mime-types": "^2.1.12" + "asynckit": "0.4.0", + "combined-stream": "1.0.8", + "mime-types": "2.1.24" } }, "forwarded": { @@ -3630,7 +3630,7 @@ "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", "dev": true, "requires": { - "map-cache": "^0.2.2" + "map-cache": "0.2.2" } }, "fresh": { @@ -3645,8 +3645,8 @@ "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=", "dev": true, "requires": { - "inherits": "^2.0.1", - "readable-stream": "^2.0.0" + "inherits": "2.0.3", + "readable-stream": "2.3.6" } }, "fs-write-stream-atomic": { @@ -3655,10 +3655,10 @@ "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=", "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "iferr": "^0.1.5", - "imurmurhash": "^0.1.4", - "readable-stream": "1 || 2" + "graceful-fs": "4.1.15", + "iferr": "0.1.5", + "imurmurhash": "0.1.4", + "readable-stream": "2.3.6" } }, "fs.realpath": { @@ -3674,8 +3674,8 @@ "dev": true, "optional": true, "requires": { - "nan": "^2.12.1", - "node-pre-gyp": "^0.12.0" + "nan": "2.14.0", + "node-pre-gyp": "0.12.0" }, "dependencies": { "abbrev": { @@ -3701,8 +3701,8 @@ "dev": true, "optional": true, "requires": { - "delegates": "^1.0.0", - "readable-stream": "^2.0.6" + "delegates": "1.0.0", + "readable-stream": "2.3.6" } }, "balanced-match": { @@ -3715,7 +3715,7 @@ "bundled": true, "dev": true, "requires": { - "balanced-match": "^1.0.0", + "balanced-match": "1.0.0", "concat-map": "0.0.1" } }, @@ -3752,7 +3752,7 @@ "dev": true, "optional": true, "requires": { - "ms": "^2.1.1" + "ms": "2.1.1" } }, "deep-extend": { @@ -3779,7 +3779,7 @@ "dev": true, "optional": true, "requires": { - "minipass": "^2.2.1" + "minipass": "2.3.5" } }, "fs.realpath": { @@ -3794,14 +3794,14 @@ "dev": true, "optional": true, "requires": { - "aproba": "^1.0.3", - "console-control-strings": "^1.0.0", - "has-unicode": "^2.0.0", - "object-assign": "^4.1.0", - "signal-exit": "^3.0.0", - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wide-align": "^1.1.0" + "aproba": "1.2.0", + "console-control-strings": "1.1.0", + "has-unicode": "2.0.1", + "object-assign": "4.1.1", + "signal-exit": "3.0.2", + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wide-align": "1.1.3" } }, "glob": { @@ -3810,12 +3810,12 @@ "dev": true, "optional": true, "requires": { - "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" + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" } }, "has-unicode": { @@ -3830,7 +3830,7 @@ "dev": true, "optional": true, "requires": { - "safer-buffer": ">= 2.1.2 < 3" + "safer-buffer": "2.1.2" } }, "ignore-walk": { @@ -3839,7 +3839,7 @@ "dev": true, "optional": true, "requires": { - "minimatch": "^3.0.4" + "minimatch": "3.0.4" } }, "inflight": { @@ -3848,8 +3848,8 @@ "dev": true, "optional": true, "requires": { - "once": "^1.3.0", - "wrappy": "1" + "once": "1.4.0", + "wrappy": "1.0.2" } }, "inherits": { @@ -3868,7 +3868,7 @@ "bundled": true, "dev": true, "requires": { - "number-is-nan": "^1.0.0" + "number-is-nan": "1.0.1" } }, "isarray": { @@ -3882,7 +3882,7 @@ "bundled": true, "dev": true, "requires": { - "brace-expansion": "^1.1.7" + "brace-expansion": "1.1.11" } }, "minimist": { @@ -3895,8 +3895,8 @@ "bundled": true, "dev": true, "requires": { - "safe-buffer": "^5.1.2", - "yallist": "^3.0.0" + "safe-buffer": "5.1.2", + "yallist": "3.0.3" } }, "minizlib": { @@ -3905,7 +3905,7 @@ "dev": true, "optional": true, "requires": { - "minipass": "^2.2.1" + "minipass": "2.3.5" } }, "mkdirp": { @@ -3928,9 +3928,9 @@ "dev": true, "optional": true, "requires": { - "debug": "^4.1.0", - "iconv-lite": "^0.4.4", - "sax": "^1.2.4" + "debug": "4.1.1", + "iconv-lite": "0.4.24", + "sax": "1.2.4" } }, "node-pre-gyp": { @@ -3939,16 +3939,16 @@ "dev": true, "optional": true, "requires": { - "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" + "detect-libc": "1.0.3", + "mkdirp": "0.5.1", + "needle": "2.3.0", + "nopt": "4.0.1", + "npm-packlist": "1.4.1", + "npmlog": "4.1.2", + "rc": "1.2.8", + "rimraf": "2.6.3", + "semver": "5.7.0", + "tar": "4.4.8" } }, "nopt": { @@ -3957,8 +3957,8 @@ "dev": true, "optional": true, "requires": { - "abbrev": "1", - "osenv": "^0.1.4" + "abbrev": "1.1.1", + "osenv": "0.1.5" } }, "npm-bundled": { @@ -3973,8 +3973,8 @@ "dev": true, "optional": true, "requires": { - "ignore-walk": "^3.0.1", - "npm-bundled": "^1.0.1" + "ignore-walk": "3.0.1", + "npm-bundled": "1.0.6" } }, "npmlog": { @@ -3983,10 +3983,10 @@ "dev": true, "optional": true, "requires": { - "are-we-there-yet": "~1.1.2", - "console-control-strings": "~1.1.0", - "gauge": "~2.7.3", - "set-blocking": "~2.0.0" + "are-we-there-yet": "1.1.5", + "console-control-strings": "1.1.0", + "gauge": "2.7.4", + "set-blocking": "2.0.0" } }, "number-is-nan": { @@ -4005,7 +4005,7 @@ "bundled": true, "dev": true, "requires": { - "wrappy": "1" + "wrappy": "1.0.2" } }, "os-homedir": { @@ -4026,8 +4026,8 @@ "dev": true, "optional": true, "requires": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.0" + "os-homedir": "1.0.2", + "os-tmpdir": "1.0.2" } }, "path-is-absolute": { @@ -4048,10 +4048,10 @@ "dev": true, "optional": true, "requires": { - "deep-extend": "^0.6.0", - "ini": "~1.3.0", - "minimist": "^1.2.0", - "strip-json-comments": "~2.0.1" + "deep-extend": "0.6.0", + "ini": "1.3.5", + "minimist": "1.2.0", + "strip-json-comments": "2.0.1" }, "dependencies": { "minimist": { @@ -4068,13 +4068,13 @@ "dev": true, "optional": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } }, "rimraf": { @@ -4083,7 +4083,7 @@ "dev": true, "optional": true, "requires": { - "glob": "^7.1.3" + "glob": "7.1.3" } }, "safe-buffer": { @@ -4126,9 +4126,9 @@ "bundled": true, "dev": true, "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" } }, "string_decoder": { @@ -4137,7 +4137,7 @@ "dev": true, "optional": true, "requires": { - "safe-buffer": "~5.1.0" + "safe-buffer": "5.1.2" } }, "strip-ansi": { @@ -4145,7 +4145,7 @@ "bundled": true, "dev": true, "requires": { - "ansi-regex": "^2.0.0" + "ansi-regex": "2.1.1" } }, "strip-json-comments": { @@ -4160,13 +4160,13 @@ "dev": true, "optional": true, "requires": { - "chownr": "^1.1.1", - "fs-minipass": "^1.2.5", - "minipass": "^2.3.4", - "minizlib": "^1.1.1", - "mkdirp": "^0.5.0", - "safe-buffer": "^5.1.2", - "yallist": "^3.0.2" + "chownr": "1.1.1", + "fs-minipass": "1.2.5", + "minipass": "2.3.5", + "minizlib": "1.2.1", + "mkdirp": "0.5.1", + "safe-buffer": "5.1.2", + "yallist": "3.0.3" } }, "util-deprecate": { @@ -4181,7 +4181,7 @@ "dev": true, "optional": true, "requires": { - "string-width": "^1.0.2 || 2" + "string-width": "1.0.2" } }, "wrappy": { @@ -4202,10 +4202,10 @@ "integrity": "sha1-Touo7i1Ivk99DeUFRVVI6uWTIEU=", "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "inherits": "~2.0.0", - "mkdirp": ">=0.5 0", - "rimraf": "2" + "graceful-fs": "4.1.15", + "inherits": "2.0.3", + "mkdirp": "0.5.1", + "rimraf": "2.6.3" } }, "function-bind": { @@ -4220,14 +4220,14 @@ "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", "dev": true, "requires": { - "aproba": "^1.0.3", - "console-control-strings": "^1.0.0", - "has-unicode": "^2.0.0", - "object-assign": "^4.1.0", - "signal-exit": "^3.0.0", - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wide-align": "^1.1.0" + "aproba": "1.2.0", + "console-control-strings": "1.1.0", + "has-unicode": "2.0.1", + "object-assign": "4.1.1", + "signal-exit": "3.0.2", + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wide-align": "1.1.3" } }, "gaze": { @@ -4236,7 +4236,7 @@ "integrity": "sha1-xEFzPhO5J6yMD/C0w7Az8ogSkko=", "dev": true, "requires": { - "globule": "^1.0.0" + "globule": "1.2.1" } }, "get-caller-file": { @@ -4269,7 +4269,7 @@ "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", "dev": true, "requires": { - "assert-plus": "^1.0.0" + "assert-plus": "1.0.0" } }, "glob": { @@ -4278,12 +4278,12 @@ "integrity": "sha1-qmCKL2xXetNX4a5aXCbZqNGWklU=", "dev": true, "requires": { - "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" + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" } }, "glob-parent": { @@ -4292,8 +4292,8 @@ "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", "dev": true, "requires": { - "is-glob": "^3.1.0", - "path-dirname": "^1.0.0" + "is-glob": "3.1.0", + "path-dirname": "1.0.2" }, "dependencies": { "is-glob": { @@ -4302,7 +4302,7 @@ "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", "dev": true, "requires": { - "is-extglob": "^2.1.0" + "is-extglob": "2.1.1" } } } @@ -4313,9 +4313,9 @@ "integrity": "sha1-bXcPDrUjrHgWTXK15xqIdyZcw+o=", "dev": true, "requires": { - "global-prefix": "^1.0.1", - "is-windows": "^1.0.1", - "resolve-dir": "^1.0.0" + "global-prefix": "1.0.2", + "is-windows": "1.0.2", + "resolve-dir": "1.0.1" } }, "global-prefix": { @@ -4324,11 +4324,11 @@ "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=", "dev": true, "requires": { - "expand-tilde": "^2.0.2", - "homedir-polyfill": "^1.0.1", - "ini": "^1.3.4", - "is-windows": "^1.0.1", - "which": "^1.2.14" + "expand-tilde": "2.0.2", + "homedir-polyfill": "1.0.3", + "ini": "1.3.5", + "is-windows": "1.0.2", + "which": "1.3.1" } }, "globals": { @@ -4343,14 +4343,14 @@ "integrity": "sha1-R4LDTLdd1oM1EzXFgpzDQg5gayI=", "dev": true, "requires": { - "@types/glob": "^7.1.1", - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.0.3", - "glob": "^7.1.3", - "ignore": "^5.1.1", - "merge2": "^1.2.3", - "slash": "^3.0.0" + "@types/glob": "7.1.1", + "array-union": "2.1.0", + "dir-glob": "3.0.1", + "fast-glob": "3.0.4", + "glob": "7.1.4", + "ignore": "5.1.2", + "merge2": "1.2.4", + "slash": "3.0.0" }, "dependencies": { "array-union": { @@ -4373,9 +4373,9 @@ "integrity": "sha1-Xf+xsZHyLSB5epNptJ6rTpg5aW0=", "dev": true, "requires": { - "glob": "~7.1.1", - "lodash": "~4.17.10", - "minimatch": "~3.0.2" + "glob": "7.1.4", + "lodash": "4.17.11", + "minimatch": "3.0.4" } }, "google-libphonenumber": { @@ -4414,8 +4414,8 @@ "integrity": "sha1-HvievT5JllV2de7ZiTEQ3DUPoIA=", "dev": true, "requires": { - "ajv": "^6.5.5", - "har-schema": "^2.0.0" + "ajv": "6.10.0", + "har-schema": "2.0.0" } }, "has": { @@ -4424,7 +4424,7 @@ "integrity": "sha1-ci18v8H2qoJB8W3YFOAR4fQeh5Y=", "dev": true, "requires": { - "function-bind": "^1.1.1" + "function-bind": "1.1.1" } }, "has-ansi": { @@ -4433,7 +4433,7 @@ "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", "dev": true, "requires": { - "ansi-regex": "^2.0.0" + "ansi-regex": "2.1.1" } }, "has-flag": { @@ -4460,9 +4460,9 @@ "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=", "dev": true, "requires": { - "get-value": "^2.0.6", - "has-values": "^1.0.0", - "isobject": "^3.0.0" + "get-value": "2.0.6", + "has-values": "1.0.0", + "isobject": "3.0.1" } }, "has-values": { @@ -4471,8 +4471,8 @@ "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=", "dev": true, "requires": { - "is-number": "^3.0.0", - "kind-of": "^4.0.0" + "is-number": "3.0.0", + "kind-of": "4.0.0" }, "dependencies": { "kind-of": { @@ -4481,7 +4481,7 @@ "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", "dev": true, "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -4492,8 +4492,8 @@ "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=", "dev": true, "requires": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" + "inherits": "2.0.3", + "safe-buffer": "5.1.2" } }, "hash-sum": { @@ -4508,8 +4508,8 @@ "integrity": "sha1-C6vKU46NTuSg+JiNaIZlN6ADz0I=", "dev": true, "requires": { - "inherits": "^2.0.3", - "minimalistic-assert": "^1.0.1" + "inherits": "2.0.3", + "minimalistic-assert": "1.0.1" } }, "he": { @@ -4524,8 +4524,8 @@ "integrity": "sha1-lTWXMZfBRLCWE81l0xfvGZY70C0=", "dev": true, "requires": { - "no-case": "^2.2.0", - "upper-case": "^1.1.3" + "no-case": "2.3.2", + "upper-case": "1.1.3" } }, "history": { @@ -4534,12 +4534,12 @@ "integrity": "sha1-hFh8IGgDnq2K92np1qaGChT6G8o=", "dev": true, "requires": { - "@babel/runtime": "^7.1.2", - "loose-envify": "^1.2.0", - "resolve-pathname": "^2.2.0", - "tiny-invariant": "^1.0.2", - "tiny-warning": "^1.0.0", - "value-equal": "^0.4.0" + "@babel/runtime": "7.4.5", + "loose-envify": "1.4.0", + "resolve-pathname": "2.2.0", + "tiny-invariant": "1.0.4", + "tiny-warning": "1.0.2", + "value-equal": "0.4.0" } }, "hmac-drbg": { @@ -4548,9 +4548,9 @@ "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=", "dev": true, "requires": { - "hash.js": "^1.0.3", - "minimalistic-assert": "^1.0.0", - "minimalistic-crypto-utils": "^1.0.1" + "hash.js": "1.1.7", + "minimalistic-assert": "1.0.1", + "minimalistic-crypto-utils": "1.0.1" } }, "home-or-tmp": { @@ -4559,8 +4559,8 @@ "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=", "dev": true, "requires": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.1" + "os-homedir": "1.0.2", + "os-tmpdir": "1.0.2" } }, "homedir-polyfill": { @@ -4569,7 +4569,7 @@ "integrity": "sha1-dDKYzvTlrz4ZQWH7rcwhUdOgWOg=", "dev": true, "requires": { - "parse-passwd": "^1.0.0" + "parse-passwd": "1.0.0" } }, "hosted-git-info": { @@ -4584,10 +4584,10 @@ "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=", "dev": true, "requires": { - "inherits": "^2.0.1", - "obuf": "^1.0.0", - "readable-stream": "^2.0.1", - "wbuf": "^1.1.0" + "inherits": "2.0.3", + "obuf": "1.1.2", + "readable-stream": "2.3.6", + "wbuf": "1.7.3" } }, "html-comment-regex": { @@ -4608,13 +4608,13 @@ "integrity": "sha1-0AQOBUcw41TbAIRjWTGUAVIS0gw=", "dev": true, "requires": { - "camel-case": "3.0.x", - "clean-css": "4.2.x", - "commander": "2.17.x", - "he": "1.2.x", - "param-case": "2.1.x", - "relateurl": "0.2.x", - "uglify-js": "3.4.x" + "camel-case": "3.0.0", + "clean-css": "4.2.1", + "commander": "2.17.1", + "he": "1.2.0", + "param-case": "2.1.1", + "relateurl": "0.2.7", + "uglify-js": "3.4.10" } }, "html-webpack-plugin": { @@ -4623,12 +4623,12 @@ "integrity": "sha1-f5xCG36pHsRg9WUn1430hO51N9U=", "dev": true, "requires": { - "bluebird": "^3.4.7", - "html-minifier": "^3.2.3", - "loader-utils": "^0.2.16", - "lodash": "^4.17.3", - "pretty-error": "^2.0.2", - "toposort": "^1.0.0" + "bluebird": "3.5.5", + "html-minifier": "3.5.21", + "loader-utils": "0.2.17", + "lodash": "4.17.11", + "pretty-error": "2.1.1", + "toposort": "1.0.7" }, "dependencies": { "big.js": { @@ -4643,10 +4643,10 @@ "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=", "dev": true, "requires": { - "big.js": "^3.1.3", - "emojis-list": "^2.0.0", - "json5": "^0.5.0", - "object-assign": "^4.0.1" + "big.js": "3.2.0", + "emojis-list": "2.1.0", + "json5": "0.5.1", + "object-assign": "4.1.1" } } } @@ -4657,12 +4657,12 @@ "integrity": "sha1-vWedw/WYl7ajS7EHSchVu1OpOS8=", "dev": true, "requires": { - "domelementtype": "^1.3.1", - "domhandler": "^2.3.0", - "domutils": "^1.5.1", - "entities": "^1.1.1", - "inherits": "^2.0.1", - "readable-stream": "^3.1.1" + "domelementtype": "1.3.1", + "domhandler": "2.4.2", + "domutils": "1.5.1", + "entities": "1.1.2", + "inherits": "2.0.3", + "readable-stream": "3.3.0" }, "dependencies": { "readable-stream": { @@ -4671,9 +4671,9 @@ "integrity": "sha1-y4ARqtAC63F78EApH+uoVpyYb7k=", "dev": true, "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" + "inherits": "2.0.3", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } } } @@ -4690,10 +4690,10 @@ "integrity": "sha1-T1ApzxMjnzEDblsuVSkrz7zIXI8=", "dev": true, "requires": { - "depd": "~1.1.2", + "depd": "1.1.2", "inherits": "2.0.3", "setprototypeof": "1.1.1", - "statuses": ">= 1.5.0 < 2", + "statuses": "1.5.0", "toidentifier": "1.0.0" } }, @@ -4709,9 +4709,9 @@ "integrity": "sha1-etOElGWPhGBeL220Q230EPTlvpo=", "dev": true, "requires": { - "eventemitter3": "^3.0.0", - "follow-redirects": "^1.0.0", - "requires-port": "^1.0.0" + "eventemitter3": "3.1.2", + "follow-redirects": "1.7.0", + "requires-port": "1.0.0" } }, "http-proxy-middleware": { @@ -4720,10 +4720,10 @@ "integrity": "sha1-GDx9xKoUeRUDBkmMIQza+WCApDo=", "dev": true, "requires": { - "http-proxy": "^1.17.0", - "is-glob": "^4.0.0", - "lodash": "^4.17.11", - "micromatch": "^3.1.10" + "http-proxy": "1.17.0", + "is-glob": "4.0.1", + "lodash": "4.17.11", + "micromatch": "3.1.10" } }, "http-signature": { @@ -4732,9 +4732,9 @@ "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", "dev": true, "requires": { - "assert-plus": "^1.0.0", - "jsprim": "^1.2.2", - "sshpk": "^1.7.0" + "assert-plus": "1.0.0", + "jsprim": "1.4.1", + "sshpk": "1.16.1" } }, "https-browserify": { @@ -4749,7 +4749,7 @@ "integrity": "sha1-ICK0sl+93CHS9SSXSkdKr+czkIs=", "dev": true, "requires": { - "safer-buffer": ">= 2.1.2 < 3" + "safer-buffer": "2.1.2" } }, "icss-replace-symbols": { @@ -4764,7 +4764,7 @@ "integrity": "sha1-g/Cg7DeL8yRheLbCrZE28TWxyWI=", "dev": true, "requires": { - "postcss": "^6.0.1" + "postcss": "6.0.23" }, "dependencies": { "ansi-styles": { @@ -4773,7 +4773,7 @@ "integrity": "sha1-QfuyAkPlCxK+DwS43tvwdSDOhB0=", "dev": true, "requires": { - "color-convert": "^1.9.0" + "color-convert": "1.9.3" } }, "chalk": { @@ -4782,9 +4782,9 @@ "integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=", "dev": true, "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.5.0" } }, "has-flag": { @@ -4799,9 +4799,9 @@ "integrity": "sha1-YcgswyisYOZ3ZF+XkFTrmLwOMyQ=", "dev": true, "requires": { - "chalk": "^2.4.1", - "source-map": "^0.6.1", - "supports-color": "^5.4.0" + "chalk": "2.4.2", + "source-map": "0.6.1", + "supports-color": "5.5.0" } }, "source-map": { @@ -4816,7 +4816,7 @@ "integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=", "dev": true, "requires": { - "has-flag": "^3.0.0" + "has-flag": "3.0.0" } } } @@ -4852,8 +4852,8 @@ "integrity": "sha1-VQcL44pZk88Y72236WH1vuXFoJ0=", "dev": true, "requires": { - "pkg-dir": "^3.0.0", - "resolve-cwd": "^2.0.0" + "pkg-dir": "3.0.0", + "resolve-cwd": "2.0.0" }, "dependencies": { "find-up": { @@ -4862,7 +4862,7 @@ "integrity": "sha1-SRafHXmTQwZG2mHsxa41XCHJe3M=", "dev": true, "requires": { - "locate-path": "^3.0.0" + "locate-path": "3.0.0" } }, "locate-path": { @@ -4871,8 +4871,8 @@ "integrity": "sha1-2+w7OrdZdYBxtY/ln8QYca8hQA4=", "dev": true, "requires": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" + "p-locate": "3.0.0", + "path-exists": "3.0.0" } }, "p-limit": { @@ -4881,7 +4881,7 @@ "integrity": "sha1-QXyZQeYCepq8ulCS3SkE4lW1+8I=", "dev": true, "requires": { - "p-try": "^2.0.0" + "p-try": "2.2.0" } }, "p-locate": { @@ -4890,7 +4890,7 @@ "integrity": "sha1-Mi1poFwCZLJZl9n0DNiokasAZKQ=", "dev": true, "requires": { - "p-limit": "^2.0.0" + "p-limit": "2.2.0" } }, "p-try": { @@ -4905,7 +4905,7 @@ "integrity": "sha1-J0kCDyOe2ZCIGx9xIQ1R62UjvqM=", "dev": true, "requires": { - "find-up": "^3.0.0" + "find-up": "3.0.0" } } } @@ -4928,7 +4928,7 @@ "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", "dev": true, "requires": { - "repeating": "^2.0.0" + "repeating": "2.0.1" } }, "indexes-of": { @@ -4949,8 +4949,8 @@ "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "dev": true, "requires": { - "once": "^1.3.0", - "wrappy": "1" + "once": "1.4.0", + "wrappy": "1.0.2" } }, "inherits": { @@ -4971,19 +4971,19 @@ "integrity": "sha1-4EqqnQW3o8ubD0B9BDdfBEcZA0c=", "dev": true, "requires": { - "ansi-escapes": "^1.1.0", - "chalk": "^1.0.0", - "cli-cursor": "^2.1.0", - "cli-width": "^2.0.0", - "external-editor": "^2.0.1", - "figures": "^2.0.0", - "lodash": "^4.3.0", + "ansi-escapes": "1.4.0", + "chalk": "1.1.3", + "cli-cursor": "2.1.0", + "cli-width": "2.2.0", + "external-editor": "2.2.0", + "figures": "2.0.0", + "lodash": "4.17.11", "mute-stream": "0.0.7", - "run-async": "^2.2.0", - "rx": "^4.1.0", - "string-width": "^2.0.0", - "strip-ansi": "^3.0.0", - "through": "^2.3.6" + "run-async": "2.3.0", + "rx": "4.1.0", + "string-width": "2.1.1", + "strip-ansi": "3.0.1", + "through": "2.3.8" }, "dependencies": { "ansi-regex": { @@ -5004,8 +5004,8 @@ "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=", "dev": true, "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" }, "dependencies": { "strip-ansi": { @@ -5014,7 +5014,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "^3.0.0" + "ansi-regex": "3.0.0" } } } @@ -5027,7 +5027,7 @@ "integrity": "sha1-rp+/k7mEh4eF1QqN4bNWlWBYz1w=", "dev": true, "requires": { - "meow": "^3.3.0" + "meow": "3.7.0" } }, "interpret": { @@ -5042,7 +5042,7 @@ "integrity": "sha1-YQ88ksk1nOHbYW5TgAjSP/NRWOY=", "dev": true, "requires": { - "loose-envify": "^1.0.0" + "loose-envify": "1.4.0" } }, "inversify": { @@ -5081,7 +5081,7 @@ "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", "dev": true, "requires": { - "kind-of": "^3.0.2" + "kind-of": "3.2.2" }, "dependencies": { "kind-of": { @@ -5090,7 +5090,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -5107,7 +5107,7 @@ "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", "dev": true, "requires": { - "binary-extensions": "^1.0.0" + "binary-extensions": "1.13.1" } }, "is-buffer": { @@ -5128,7 +5128,7 @@ "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", "dev": true, "requires": { - "kind-of": "^3.0.2" + "kind-of": "3.2.2" }, "dependencies": { "kind-of": { @@ -5137,7 +5137,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -5154,9 +5154,9 @@ "integrity": "sha1-Nm2CQN3kh8pRgjsaufB6EKeCUco=", "dev": true, "requires": { - "is-accessor-descriptor": "^0.1.6", - "is-data-descriptor": "^0.1.4", - "kind-of": "^5.0.0" + "is-accessor-descriptor": "0.1.6", + "is-data-descriptor": "0.1.4", + "kind-of": "5.1.0" }, "dependencies": { "kind-of": { @@ -5191,7 +5191,7 @@ "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", "dev": true, "requires": { - "number-is-nan": "^1.0.0" + "number-is-nan": "1.0.1" } }, "is-fullwidth-code-point": { @@ -5200,7 +5200,7 @@ "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "dev": true, "requires": { - "number-is-nan": "^1.0.0" + "number-is-nan": "1.0.1" } }, "is-glob": { @@ -5209,7 +5209,7 @@ "integrity": "sha1-dWfb6fL14kZ7x3q4PEopSCQHpdw=", "dev": true, "requires": { - "is-extglob": "^2.1.1" + "is-extglob": "2.1.1" } }, "is-lower-case": { @@ -5218,7 +5218,7 @@ "integrity": "sha1-fhR75HaNxGbbO/shzGCzHmrWk5M=", "dev": true, "requires": { - "lower-case": "^1.1.0" + "lower-case": "1.1.4" } }, "is-number": { @@ -5227,7 +5227,7 @@ "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, "requires": { - "kind-of": "^3.0.2" + "kind-of": "3.2.2" }, "dependencies": { "kind-of": { @@ -5236,7 +5236,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -5253,7 +5253,7 @@ "integrity": "sha1-WsSLNF72dTOb1sekipEhELJBz1I=", "dev": true, "requires": { - "is-path-inside": "^1.0.0" + "is-path-inside": "1.0.1" } }, "is-path-inside": { @@ -5262,7 +5262,7 @@ "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=", "dev": true, "requires": { - "path-is-inside": "^1.0.1" + "path-is-inside": "1.0.2" } }, "is-plain-obj": { @@ -5277,7 +5277,7 @@ "integrity": "sha1-LBY7P6+xtgbZ0Xko8FwqHDjgdnc=", "dev": true, "requires": { - "isobject": "^3.0.1" + "isobject": "3.0.1" } }, "is-promise": { @@ -5292,7 +5292,7 @@ "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=", "dev": true, "requires": { - "has": "^1.0.1" + "has": "1.0.3" } }, "is-stream": { @@ -5307,7 +5307,7 @@ "integrity": "sha1-z2EJDaDZ77yrhyLeum8DIgjbsOk=", "dev": true, "requires": { - "html-comment-regex": "^1.1.0" + "html-comment-regex": "1.1.2" } }, "is-symbol": { @@ -5316,7 +5316,7 @@ "integrity": "sha1-oFX2rlcZLK7jKeeoYBGLSXqVDzg=", "dev": true, "requires": { - "has-symbols": "^1.0.0" + "has-symbols": "1.0.0" } }, "is-typedarray": { @@ -5331,7 +5331,7 @@ "integrity": "sha1-jQsfp+eTOh5YSDYA7H2WYcuvdW8=", "dev": true, "requires": { - "upper-case": "^1.1.0" + "upper-case": "1.1.3" } }, "is-utf8": { @@ -5381,14 +5381,14 @@ "resolved": "https://registry.npm.taobao.org/iview/download/iview-3.4.2.tgz", "integrity": "sha1-Her+gYP+KbmzMXnYX6o3s4E7D3M=", "requires": { - "async-validator": "^1.10.0", - "deepmerge": "^2.2.1", - "element-resize-detector": "^1.2.0", - "js-calendar": "^1.2.3", - "lodash.throttle": "^4.1.1", - "popper.js": "^1.14.6", - "tinycolor2": "^1.4.1", - "v-click-outside-x": "^3.5.6" + "async-validator": "1.11.2", + "deepmerge": "2.2.1", + "element-resize-detector": "1.2.0", + "js-calendar": "1.2.3", + "lodash.throttle": "4.1.1", + "popper.js": "1.15.0", + "tinycolor2": "1.4.1", + "v-click-outside-x": "3.7.1" } }, "iview-loader": { @@ -5397,7 +5397,7 @@ "integrity": "sha1-q99SB03pPILvAaLCk964LIy7veA=", "dev": true, "requires": { - "loader-utils": "^1.1.0" + "loader-utils": "1.2.3" } }, "javascript-obfuscator": { @@ -5432,7 +5432,7 @@ "integrity": "sha1-QvNvxYF5Eciep12iuHQFSSKWdhY=", "dev": true, "requires": { - "regenerator-runtime": "^0.12.0" + "regenerator-runtime": "0.12.1" } }, "ansi-styles": { @@ -5441,7 +5441,7 @@ "integrity": "sha1-QfuyAkPlCxK+DwS43tvwdSDOhB0=", "dev": true, "requires": { - "color-convert": "^1.9.0" + "color-convert": "1.9.3" } }, "chalk": { @@ -5450,9 +5450,9 @@ "integrity": "sha1-GMSasWoDe26wFSzIPjRxM4IVtm4=", "dev": true, "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.5.0" } }, "has-flag": { @@ -5479,8 +5479,8 @@ "integrity": "sha1-BPVYFxOoplYS0BdfvzoB+AoWJhM=", "dev": true, "requires": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" + "buffer-from": "1.1.1", + "source-map": "0.6.1" } }, "supports-color": { @@ -5489,7 +5489,7 @@ "integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=", "dev": true, "requires": { - "has-flag": "^3.0.0" + "has-flag": "3.0.0" } } } @@ -5523,8 +5523,8 @@ "integrity": "sha1-XJZ93YN6m/3KXy3oQlOr6KHAO4A=", "dev": true, "requires": { - "argparse": "^1.0.7", - "esprima": "^2.6.0" + "argparse": "1.0.10", + "esprima": "2.7.3" } }, "js2xmlparser": { @@ -5533,7 +5533,7 @@ "integrity": "sha1-rhTMcRsokgg+7W4hn7yZPYWLw6U=", "dev": true, "requires": { - "xmlcreate": "^2.0.0" + "xmlcreate": "2.0.1" } }, "jsbn": { @@ -5548,20 +5548,20 @@ "integrity": "sha1-7iifxrqSY7fk7OuZkhF5/hwxSJo=", "dev": true, "requires": { - "@babel/parser": "^7.4.4", - "bluebird": "^3.5.4", - "catharsis": "^0.8.10", - "escape-string-regexp": "^2.0.0", - "js2xmlparser": "^4.0.0", - "klaw": "^3.0.0", - "markdown-it": "^8.4.2", - "markdown-it-anchor": "^5.0.2", - "marked": "^0.6.2", - "mkdirp": "^0.5.1", - "requizzle": "^0.2.2", - "strip-json-comments": "^3.0.1", + "@babel/parser": "7.4.5", + "bluebird": "3.5.5", + "catharsis": "0.8.10", + "escape-string-regexp": "2.0.0", + "js2xmlparser": "4.0.0", + "klaw": "3.0.0", + "markdown-it": "8.4.2", + "markdown-it-anchor": "5.1.0", + "marked": "0.6.2", + "mkdirp": "0.5.1", + "requizzle": "0.2.2", + "strip-json-comments": "3.0.1", "taffydb": "2.6.2", - "underscore": "~1.9.1" + "underscore": "1.9.1" }, "dependencies": { "escape-string-regexp": { @@ -5644,7 +5644,7 @@ "integrity": "sha1-sRvsnPJJLwZ1bW6Amrc6KRAlkUY=", "dev": true, "requires": { - "graceful-fs": "^4.1.9" + "graceful-fs": "4.1.15" } }, "lazy-cache": { @@ -5659,7 +5659,7 @@ "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", "dev": true, "requires": { - "invert-kv": "^1.0.0" + "invert-kv": "1.0.0" } }, "less": { @@ -5668,15 +5668,15 @@ "integrity": "sha1-t1EcQ/N89X3Iff/ZiD7BISibFHQ=", "dev": true, "requires": { - "clone": "^2.1.2", - "errno": "^0.1.1", - "graceful-fs": "^4.1.2", - "image-size": "~0.5.0", - "mime": "^1.4.1", - "mkdirp": "^0.5.0", - "promise": "^7.1.1", - "request": "^2.83.0", - "source-map": "~0.6.0" + "clone": "2.1.2", + "errno": "0.1.7", + "graceful-fs": "4.1.15", + "image-size": "0.5.5", + "mime": "1.6.0", + "mkdirp": "0.5.1", + "promise": "7.3.1", + "request": "2.88.0", + "source-map": "0.6.1" }, "dependencies": { "clone": { @@ -5700,9 +5700,9 @@ "integrity": "sha1-LBNSxbCaT4QQFJAnT9UWdN5BNj4=", "dev": true, "requires": { - "clone": "^2.1.1", - "loader-utils": "^1.1.0", - "pify": "^3.0.0" + "clone": "2.1.2", + "loader-utils": "1.2.3", + "pify": "3.0.0" }, "dependencies": { "clone": { @@ -5719,8 +5719,8 @@ "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", "dev": true, "requires": { - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2" + "prelude-ls": "1.1.2", + "type-check": "0.3.2" } }, "linkify-it": { @@ -5729,7 +5729,7 @@ "integrity": "sha1-xMrzimzXrCIS7zx9K94wqRVh+ds=", "dev": true, "requires": { - "uc.micro": "^1.0.1" + "uc.micro": "1.0.6" } }, "load-json-file": { @@ -5738,11 +5738,11 @@ "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "parse-json": "^2.2.0", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0", - "strip-bom": "^2.0.0" + "graceful-fs": "4.1.15", + "parse-json": "2.2.0", + "pify": "2.3.0", + "pinkie-promise": "2.0.1", + "strip-bom": "2.0.0" }, "dependencies": { "pify": { @@ -5765,9 +5765,9 @@ "integrity": "sha1-H/XcaRHJ8KBiUxpMBLYJQGEIwsc=", "dev": true, "requires": { - "big.js": "^5.2.2", - "emojis-list": "^2.0.0", - "json5": "^1.0.1" + "big.js": "5.2.2", + "emojis-list": "2.1.0", + "json5": "1.0.1" }, "dependencies": { "json5": { @@ -5776,7 +5776,7 @@ "integrity": "sha1-d5+wAYYE+oVOrL9iUhgNg1Q+Pb4=", "dev": true, "requires": { - "minimist": "^1.2.0" + "minimist": "1.2.0" } }, "minimist": { @@ -5793,8 +5793,8 @@ "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", "dev": true, "requires": { - "p-locate": "^2.0.0", - "path-exists": "^3.0.0" + "p-locate": "2.0.0", + "path-exists": "3.0.0" } }, "lodash": { @@ -5850,7 +5850,7 @@ "integrity": "sha1-ce5R+nvkyuwaY4OffmgtgTLTDK8=", "dev": true, "requires": { - "js-tokens": "^3.0.0 || ^4.0.0" + "js-tokens": "3.0.2" } }, "loud-rejection": { @@ -5859,8 +5859,8 @@ "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", "dev": true, "requires": { - "currently-unhandled": "^0.4.1", - "signal-exit": "^3.0.0" + "currently-unhandled": "0.4.1", + "signal-exit": "3.0.2" } }, "lower-case": { @@ -5875,7 +5875,7 @@ "integrity": "sha1-5dp8JvKacHO+AtUrrJmA5ZIq36E=", "dev": true, "requires": { - "lower-case": "^1.1.2" + "lower-case": "1.1.4" } }, "lru-cache": { @@ -5884,8 +5884,8 @@ "integrity": "sha1-i75Q6oW+1ZvJ4z3KuCNe6bz0Q80=", "dev": true, "requires": { - "pseudomap": "^1.0.2", - "yallist": "^2.1.2" + "pseudomap": "1.0.2", + "yallist": "2.1.2" } }, "make-dir": { @@ -5894,7 +5894,7 @@ "integrity": "sha1-ecEDO4BRW9bSTsmTPoYMp17ifww=", "dev": true, "requires": { - "pify": "^3.0.0" + "pify": "3.0.0" } }, "map-age-cleaner": { @@ -5903,7 +5903,7 @@ "integrity": "sha1-fVg6cwZDTAVf5HSw9FB45uG0uSo=", "dev": true, "requires": { - "p-defer": "^1.0.0" + "p-defer": "1.0.0" } }, "map-cache": { @@ -5924,7 +5924,7 @@ "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", "dev": true, "requires": { - "object-visit": "^1.0.0" + "object-visit": "1.0.1" } }, "markdown-it": { @@ -5933,11 +5933,11 @@ "integrity": "sha1-OG+YmY3BWjdyKqdyIIT0Agvdm1Q=", "dev": true, "requires": { - "argparse": "^1.0.7", - "entities": "~1.1.1", - "linkify-it": "^2.0.0", - "mdurl": "^1.0.1", - "uc.micro": "^1.0.5" + "argparse": "1.0.10", + "entities": "1.1.2", + "linkify-it": "2.1.0", + "mdurl": "1.0.1", + "uc.micro": "1.0.6" } }, "markdown-it-anchor": { @@ -5964,9 +5964,9 @@ "integrity": "sha1-U6s41f48iJG6RlMp6iP6wFQBJvk=", "dev": true, "requires": { - "charenc": "~0.0.1", - "crypt": "~0.0.1", - "is-buffer": "~1.1.1" + "charenc": "0.0.2", + "crypt": "0.0.2", + "is-buffer": "1.1.6" } }, "md5.js": { @@ -5975,9 +5975,9 @@ "integrity": "sha1-tdB7jjIW4+J81yjXL3DR5qNCAF8=", "dev": true, "requires": { - "hash-base": "^3.0.0", - "inherits": "^2.0.1", - "safe-buffer": "^5.1.2" + "hash-base": "3.0.4", + "inherits": "2.0.3", + "safe-buffer": "5.1.2" } }, "mdurl": { @@ -5998,7 +5998,7 @@ "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", "dev": true, "requires": { - "mimic-fn": "^1.0.0" + "mimic-fn": "1.2.0" } }, "memory-fs": { @@ -6007,8 +6007,8 @@ "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=", "dev": true, "requires": { - "errno": "^0.1.3", - "readable-stream": "^2.0.1" + "errno": "0.1.7", + "readable-stream": "2.3.6" } }, "meow": { @@ -6017,16 +6017,16 @@ "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", "dev": true, "requires": { - "camelcase-keys": "^2.0.0", - "decamelize": "^1.1.2", - "loud-rejection": "^1.0.0", - "map-obj": "^1.0.1", - "minimist": "^1.1.3", - "normalize-package-data": "^2.3.4", - "object-assign": "^4.0.1", - "read-pkg-up": "^1.0.1", - "redent": "^1.0.0", - "trim-newlines": "^1.0.0" + "camelcase-keys": "2.1.0", + "decamelize": "1.2.0", + "loud-rejection": "1.6.0", + "map-obj": "1.0.1", + "minimist": "1.2.0", + "normalize-package-data": "2.5.0", + "object-assign": "4.1.1", + "read-pkg-up": "1.0.1", + "redent": "1.0.0", + "trim-newlines": "1.0.0" }, "dependencies": { "minimist": { @@ -6061,19 +6061,19 @@ "integrity": "sha1-cIWbyVyYQJUvNZoGij/En57PrCM=", "dev": true, "requires": { - "arr-diff": "^4.0.0", - "array-unique": "^0.3.2", - "braces": "^2.3.1", - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "extglob": "^2.0.4", - "fragment-cache": "^0.2.1", - "kind-of": "^6.0.2", - "nanomatch": "^1.2.9", - "object.pick": "^1.3.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.2" + "arr-diff": "4.0.0", + "array-unique": "0.3.2", + "braces": "2.3.2", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "extglob": "2.0.4", + "fragment-cache": "0.2.1", + "kind-of": "6.0.2", + "nanomatch": "1.2.13", + "object.pick": "1.3.0", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" } }, "miller-rabin": { @@ -6082,8 +6082,8 @@ "integrity": "sha1-8IA1HIZbDcViqEYpZtqlNUPHik0=", "dev": true, "requires": { - "bn.js": "^4.0.0", - "brorand": "^1.0.1" + "bn.js": "4.11.8", + "brorand": "1.1.0" } }, "mime": { @@ -6131,7 +6131,7 @@ "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=", "dev": true, "requires": { - "brace-expansion": "^1.1.7" + "brace-expansion": "1.1.11" } }, "minimist": { @@ -6146,16 +6146,16 @@ "integrity": "sha1-NEKlCPr8KFAEhv7qmUCWduTuWm8=", "dev": true, "requires": { - "concat-stream": "^1.5.0", - "duplexify": "^3.4.2", - "end-of-stream": "^1.1.0", - "flush-write-stream": "^1.0.0", - "from2": "^2.1.0", - "parallel-transform": "^1.1.0", - "pump": "^2.0.1", - "pumpify": "^1.3.3", - "stream-each": "^1.1.0", - "through2": "^2.0.0" + "concat-stream": "1.6.2", + "duplexify": "3.7.1", + "end-of-stream": "1.4.1", + "flush-write-stream": "1.1.1", + "from2": "2.3.0", + "parallel-transform": "1.1.0", + "pump": "2.0.1", + "pumpify": "1.5.1", + "stream-each": "1.2.3", + "through2": "2.0.5" } }, "mixin-deep": { @@ -6164,8 +6164,8 @@ "integrity": "sha1-pJ5yaNzhoNlpjkUybFYm3zVD0P4=", "dev": true, "requires": { - "for-in": "^1.0.2", - "is-extendable": "^1.0.1" + "for-in": "1.0.2", + "is-extendable": "1.0.1" }, "dependencies": { "is-extendable": { @@ -6174,7 +6174,7 @@ "integrity": "sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ=", "dev": true, "requires": { - "is-plain-object": "^2.0.4" + "is-plain-object": "2.0.4" } } } @@ -6185,8 +6185,8 @@ "integrity": "sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=", "dev": true, "requires": { - "for-in": "^0.1.3", - "is-extendable": "^0.1.1" + "for-in": "0.1.8", + "is-extendable": "0.1.1" }, "dependencies": { "for-in": { @@ -6212,12 +6212,12 @@ "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=", "dev": true, "requires": { - "aproba": "^1.1.1", - "copy-concurrently": "^1.0.0", - "fs-write-stream-atomic": "^1.0.8", - "mkdirp": "^0.5.1", - "rimraf": "^2.5.4", - "run-queue": "^1.0.3" + "aproba": "1.2.0", + "copy-concurrently": "1.0.5", + "fs-write-stream-atomic": "1.0.10", + "mkdirp": "0.5.1", + "rimraf": "2.6.3", + "run-queue": "1.0.3" } }, "ms": { @@ -6232,7 +6232,7 @@ "integrity": "sha1-sJ/IWG6qF/gdV1xK0C4Pej9rEQU=", "dev": true, "requires": { - "source-map": "^0.1.34" + "source-map": "0.1.43" }, "dependencies": { "source-map": { @@ -6241,7 +6241,7 @@ "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", "dev": true, "requires": { - "amdefine": ">=0.0.4" + "amdefine": "1.0.1" } } } @@ -6252,8 +6252,8 @@ "integrity": "sha1-oOx72QVcQoL3kMPIL04o2zsxsik=", "dev": true, "requires": { - "dns-packet": "^1.3.1", - "thunky": "^1.0.2" + "dns-packet": "1.3.1", + "thunky": "1.0.3" } }, "multicast-dns-service-types": { @@ -6268,10 +6268,10 @@ "integrity": "sha1-nHkGoi+0wCkZ4vX3UWG0zb1LKis=", "dev": true, "requires": { - "array-differ": "^1.0.0", - "array-union": "^1.0.1", - "arrify": "^1.0.0", - "minimatch": "^3.0.0" + "array-differ": "1.0.0", + "array-union": "1.0.2", + "arrify": "1.0.1", + "minimatch": "3.0.4" } }, "mute-stream": { @@ -6292,17 +6292,17 @@ "integrity": "sha1-uHqKpPwN6P5r6IiVs4mD/yZb0Rk=", "dev": true, "requires": { - "arr-diff": "^4.0.0", - "array-unique": "^0.3.2", - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "fragment-cache": "^0.2.1", - "is-windows": "^1.0.2", - "kind-of": "^6.0.2", - "object.pick": "^1.3.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" + "arr-diff": "4.0.0", + "array-unique": "0.3.2", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "fragment-cache": "0.2.1", + "is-windows": "1.0.2", + "kind-of": "6.0.2", + "object.pick": "1.3.0", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" } }, "ncname": { @@ -6311,7 +6311,7 @@ "integrity": "sha1-W1etGLHKCShk72Kwse2BlPODtxw=", "dev": true, "requires": { - "xml-char-classes": "^1.0.0" + "xml-char-classes": "1.0.0" } }, "ncp": { @@ -6350,7 +6350,7 @@ "integrity": "sha1-YLgTOWvjmz8SiKTB7V0efSi0ZKw=", "dev": true, "requires": { - "lower-case": "^1.1.1" + "lower-case": "1.1.4" } }, "node-fetch": { @@ -6359,8 +6359,8 @@ "integrity": "sha1-3CNO3WSJmC1Y6PDbT2lQKavNjAQ=", "dev": true, "requires": { - "encoding": "^0.1.11", - "is-stream": "^1.0.1" + "encoding": "0.1.12", + "is-stream": "1.1.0" } }, "node-forge": { @@ -6375,18 +6375,18 @@ "integrity": "sha1-VAMEJhwzDoDQ1e3OJTpoyzlkIYw=", "dev": true, "requires": { - "fstream": "^1.0.0", - "glob": "^7.0.3", - "graceful-fs": "^4.1.2", - "mkdirp": "^0.5.0", - "nopt": "2 || 3", - "npmlog": "0 || 1 || 2 || 3 || 4", - "osenv": "0", - "request": "^2.87.0", - "rimraf": "2", - "semver": "~5.3.0", - "tar": "^2.0.0", - "which": "1" + "fstream": "1.0.12", + "glob": "7.1.4", + "graceful-fs": "4.1.15", + "mkdirp": "0.5.1", + "nopt": "3.0.6", + "npmlog": "4.1.2", + "osenv": "0.1.5", + "request": "2.88.0", + "rimraf": "2.6.3", + "semver": "5.3.0", + "tar": "2.2.2", + "which": "1.3.1" }, "dependencies": { "semver": { @@ -6403,28 +6403,28 @@ "integrity": "sha1-xy9g2dRt4IqUDe27JfP/ovm7qnc=", "dev": true, "requires": { - "assert": "^1.1.1", - "browserify-zlib": "^0.2.0", - "buffer": "^4.3.0", - "console-browserify": "^1.1.0", - "constants-browserify": "^1.0.0", - "crypto-browserify": "^3.11.0", - "domain-browser": "^1.1.1", - "events": "^3.0.0", - "https-browserify": "^1.0.0", - "os-browserify": "^0.3.0", + "assert": "1.5.0", + "browserify-zlib": "0.2.0", + "buffer": "4.9.1", + "console-browserify": "1.1.0", + "constants-browserify": "1.0.0", + "crypto-browserify": "3.12.0", + "domain-browser": "1.2.0", + "events": "3.0.0", + "https-browserify": "1.0.0", + "os-browserify": "0.3.0", "path-browserify": "0.0.0", - "process": "^0.11.10", - "punycode": "^1.2.4", - "querystring-es3": "^0.2.0", - "readable-stream": "^2.3.3", - "stream-browserify": "^2.0.1", - "stream-http": "^2.7.2", - "string_decoder": "^1.0.0", - "timers-browserify": "^2.0.4", + "process": "0.11.10", + "punycode": "1.4.1", + "querystring-es3": "0.2.1", + "readable-stream": "2.3.6", + "stream-browserify": "2.0.2", + "stream-http": "2.8.3", + "string_decoder": "1.1.1", + "timers-browserify": "2.0.10", "tty-browserify": "0.0.0", - "url": "^0.11.0", - "util": "^0.11.0", + "url": "0.11.0", + "util": "0.11.1", "vm-browserify": "0.0.4" }, "dependencies": { @@ -6448,23 +6448,23 @@ "integrity": "sha1-CRT1MZMjgBFKMMxfpPpjIzol8Bc=", "dev": true, "requires": { - "async-foreach": "^0.1.3", - "chalk": "^1.1.1", - "cross-spawn": "^3.0.0", - "gaze": "^1.0.0", - "get-stdin": "^4.0.1", - "glob": "^7.0.3", - "in-publish": "^2.0.0", - "lodash": "^4.17.11", - "meow": "^3.7.0", - "mkdirp": "^0.5.1", - "nan": "^2.13.2", - "node-gyp": "^3.8.0", - "npmlog": "^4.0.0", - "request": "^2.88.0", - "sass-graph": "^2.2.4", - "stdout-stream": "^1.4.0", - "true-case-path": "^1.0.2" + "async-foreach": "0.1.3", + "chalk": "1.1.3", + "cross-spawn": "3.0.1", + "gaze": "1.1.3", + "get-stdin": "4.0.1", + "glob": "7.1.4", + "in-publish": "2.0.0", + "lodash": "4.17.11", + "meow": "3.7.0", + "mkdirp": "0.5.1", + "nan": "2.14.0", + "node-gyp": "3.8.0", + "npmlog": "4.1.2", + "request": "2.88.0", + "sass-graph": "2.2.4", + "stdout-stream": "1.4.1", + "true-case-path": "1.0.3" }, "dependencies": { "cross-spawn": { @@ -6473,8 +6473,8 @@ "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=", "dev": true, "requires": { - "lru-cache": "^4.0.1", - "which": "^1.2.9" + "lru-cache": "4.1.5", + "which": "1.3.1" } } } @@ -6485,7 +6485,7 @@ "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", "dev": true, "requires": { - "abbrev": "1" + "abbrev": "1.1.1" } }, "normalize-package-data": { @@ -6494,10 +6494,10 @@ "integrity": "sha1-5m2xg4sgDB38IzIl0SyzZSDiNKg=", "dev": true, "requires": { - "hosted-git-info": "^2.1.4", - "resolve": "^1.10.0", - "semver": "2 || 3 || 4 || 5", - "validate-npm-package-license": "^3.0.1" + "hosted-git-info": "2.7.1", + "resolve": "1.11.0", + "semver": "5.7.0", + "validate-npm-package-license": "3.0.4" } }, "normalize-path": { @@ -6518,10 +6518,10 @@ "integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=", "dev": true, "requires": { - "object-assign": "^4.0.1", - "prepend-http": "^1.0.0", - "query-string": "^4.1.0", - "sort-keys": "^1.0.0" + "object-assign": "4.1.1", + "prepend-http": "1.0.4", + "query-string": "4.3.4", + "sort-keys": "1.1.2" } }, "npm-run-path": { @@ -6530,7 +6530,7 @@ "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", "dev": true, "requires": { - "path-key": "^2.0.0" + "path-key": "2.0.1" } }, "npmlog": { @@ -6539,10 +6539,10 @@ "integrity": "sha1-CKfyqL9zRgR3mp76StXMcXq7lUs=", "dev": true, "requires": { - "are-we-there-yet": "~1.1.2", - "console-control-strings": "~1.1.0", - "gauge": "~2.7.3", - "set-blocking": "~2.0.0" + "are-we-there-yet": "1.1.5", + "console-control-strings": "1.1.0", + "gauge": "2.7.4", + "set-blocking": "2.0.0" } }, "nth-check": { @@ -6551,7 +6551,7 @@ "integrity": "sha1-sr0pXDfj3VijvwcAN2Zjuk2c8Fw=", "dev": true, "requires": { - "boolbase": "~1.0.0" + "boolbase": "1.0.0" } }, "num2fraction": { @@ -6584,9 +6584,9 @@ "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=", "dev": true, "requires": { - "copy-descriptor": "^0.1.0", - "define-property": "^0.2.5", - "kind-of": "^3.0.3" + "copy-descriptor": "0.1.1", + "define-property": "0.2.5", + "kind-of": "3.2.2" }, "dependencies": { "define-property": { @@ -6595,7 +6595,7 @@ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "is-descriptor": "^0.1.0" + "is-descriptor": "0.1.6" } }, "kind-of": { @@ -6604,7 +6604,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -6621,7 +6621,7 @@ "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=", "dev": true, "requires": { - "isobject": "^3.0.0" + "isobject": "3.0.1" } }, "object.pick": { @@ -6630,7 +6630,7 @@ "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", "dev": true, "requires": { - "isobject": "^3.0.1" + "isobject": "3.0.1" } }, "obuf": { @@ -6660,7 +6660,7 @@ "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, "requires": { - "wrappy": "1" + "wrappy": "1.0.2" } }, "onetime": { @@ -6669,7 +6669,7 @@ "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", "dev": true, "requires": { - "mimic-fn": "^1.0.0" + "mimic-fn": "1.2.0" } }, "open": { @@ -6713,8 +6713,8 @@ "integrity": "sha1-erwi5kTf9jsKltWrfyeQwPAavJU=", "dev": true, "requires": { - "object-assign": "^4.0.1", - "pinkie-promise": "^2.0.0" + "object-assign": "4.1.1", + "pinkie-promise": "2.0.1" } } } @@ -6725,7 +6725,7 @@ "integrity": "sha1-/HFk+rVtI1kExRw7J9pnWMo7m/w=", "dev": true, "requires": { - "is-wsl": "^1.1.0" + "is-wsl": "1.1.0" } }, "optionator": { @@ -6734,12 +6734,12 @@ "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", "dev": true, "requires": { - "deep-is": "~0.1.3", - "fast-levenshtein": "~2.0.4", - "levn": "~0.3.0", - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2", - "wordwrap": "~1.0.0" + "deep-is": "0.1.3", + "fast-levenshtein": "2.0.6", + "levn": "0.3.0", + "prelude-ls": "1.1.2", + "type-check": "0.3.2", + "wordwrap": "1.0.0" }, "dependencies": { "wordwrap": { @@ -6756,7 +6756,7 @@ "integrity": "sha1-5EKmHP/hxf0gpl8yYcJmY7MD8l8=", "dev": true, "requires": { - "url-parse": "^1.4.3" + "url-parse": "1.4.7" } }, "os-browserify": { @@ -6777,7 +6777,7 @@ "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", "dev": true, "requires": { - "lcid": "^1.0.0" + "lcid": "1.0.0" } }, "os-tmpdir": { @@ -6792,8 +6792,8 @@ "integrity": "sha1-hc36+uso6Gd/QW4odZK18/SepBA=", "dev": true, "requires": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.0" + "os-homedir": "1.0.2", + "os-tmpdir": "1.0.2" } }, "p-defer": { @@ -6820,7 +6820,7 @@ "integrity": "sha1-uGvV8MJWkJEcdZD8v8IBDVSzzLg=", "dev": true, "requires": { - "p-try": "^1.0.0" + "p-try": "1.0.0" } }, "p-locate": { @@ -6829,7 +6829,7 @@ "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", "dev": true, "requires": { - "p-limit": "^1.1.0" + "p-limit": "1.3.0" } }, "p-map": { @@ -6855,9 +6855,9 @@ "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=", "dev": true, "requires": { - "cyclist": "~0.2.2", - "inherits": "^2.0.3", - "readable-stream": "^2.1.5" + "cyclist": "0.2.2", + "inherits": "2.0.3", + "readable-stream": "2.3.6" } }, "param-case": { @@ -6866,7 +6866,7 @@ "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=", "dev": true, "requires": { - "no-case": "^2.2.0" + "no-case": "2.3.2" } }, "parse-asn1": { @@ -6875,12 +6875,12 @@ "integrity": "sha1-N/Zij4I/vesic7TVQENKIvPvH8w=", "dev": true, "requires": { - "asn1.js": "^4.0.0", - "browserify-aes": "^1.0.0", - "create-hash": "^1.1.0", - "evp_bytestokey": "^1.0.0", - "pbkdf2": "^3.0.3", - "safe-buffer": "^5.1.1" + "asn1.js": "4.10.1", + "browserify-aes": "1.2.0", + "create-hash": "1.2.0", + "evp_bytestokey": "1.0.3", + "pbkdf2": "3.0.17", + "safe-buffer": "5.1.2" } }, "parse-json": { @@ -6889,7 +6889,7 @@ "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", "dev": true, "requires": { - "error-ex": "^1.2.0" + "error-ex": "1.3.2" } }, "parse-passwd": { @@ -6910,8 +6910,8 @@ "integrity": "sha1-LVeNNFX2YNpl7KGO+VtODekSdh4=", "dev": true, "requires": { - "camel-case": "^3.0.0", - "upper-case-first": "^1.1.0" + "camel-case": "3.0.0", + "upper-case-first": "1.1.2" } }, "pascalcase": { @@ -6932,7 +6932,7 @@ "integrity": "sha1-lLgDfDctP+KQbkZbtF4l0ibo7qU=", "dev": true, "requires": { - "no-case": "^2.2.0" + "no-case": "2.3.2" } }, "path-dirname": { @@ -6989,11 +6989,11 @@ "integrity": "sha1-l2wgZTBhexTrsyEUI597CTNuk6Y=", "dev": true, "requires": { - "create-hash": "^1.1.2", - "create-hmac": "^1.1.4", - "ripemd160": "^2.0.1", - "safe-buffer": "^5.0.1", - "sha.js": "^2.4.8" + "create-hash": "1.2.0", + "create-hmac": "1.1.7", + "ripemd160": "2.0.2", + "safe-buffer": "5.1.2", + "sha.js": "2.4.11" } }, "performance-now": { @@ -7026,7 +7026,7 @@ "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", "dev": true, "requires": { - "pinkie": "^2.0.0" + "pinkie": "2.0.4" } }, "pkg-dir": { @@ -7035,7 +7035,7 @@ "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", "dev": true, "requires": { - "find-up": "^2.1.0" + "find-up": "2.1.0" } }, "popper.js": { @@ -7049,9 +7049,9 @@ "integrity": "sha1-vqaGMuVLLhOrewxHdem0G/Jw5Eo=", "dev": true, "requires": { - "async": "^1.5.2", - "debug": "^2.2.0", - "mkdirp": "0.5.x" + "async": "1.5.2", + "debug": "2.6.9", + "mkdirp": "0.5.1" }, "dependencies": { "async": { @@ -7074,10 +7074,10 @@ "integrity": "sha1-ut+hSX1GJE9jkPWLMZgw2RB4U8U=", "dev": true, "requires": { - "chalk": "^1.1.3", - "js-base64": "^2.1.9", - "source-map": "^0.5.6", - "supports-color": "^3.2.3" + "chalk": "1.1.3", + "js-base64": "2.5.1", + "source-map": "0.5.7", + "supports-color": "3.2.3" }, "dependencies": { "supports-color": { @@ -7086,7 +7086,7 @@ "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { - "has-flag": "^1.0.0" + "has-flag": "1.0.0" } } } @@ -7097,9 +7097,9 @@ "integrity": "sha1-d7rnypKK2FcW4v2kLyYb98HWW14=", "dev": true, "requires": { - "postcss": "^5.0.2", - "postcss-message-helpers": "^2.0.0", - "reduce-css-calc": "^1.2.6" + "postcss": "5.2.18", + "postcss-message-helpers": "2.0.0", + "reduce-css-calc": "1.3.0" } }, "postcss-colormin": { @@ -7108,9 +7108,9 @@ "integrity": "sha1-ZjFBfV8OkJo9fsJrJMio0eT5bks=", "dev": true, "requires": { - "colormin": "^1.0.5", - "postcss": "^5.0.13", - "postcss-value-parser": "^3.2.3" + "colormin": "1.1.2", + "postcss": "5.2.18", + "postcss-value-parser": "3.3.1" } }, "postcss-convert-values": { @@ -7119,8 +7119,8 @@ "integrity": "sha1-u9hZPFwf0uPRwyK7kl3K6Nrk1i0=", "dev": true, "requires": { - "postcss": "^5.0.11", - "postcss-value-parser": "^3.1.2" + "postcss": "5.2.18", + "postcss-value-parser": "3.3.1" } }, "postcss-discard-comments": { @@ -7129,7 +7129,7 @@ "integrity": "sha1-vv6J+v1bPazlzM5Rt2uBUUvgDj0=", "dev": true, "requires": { - "postcss": "^5.0.14" + "postcss": "5.2.18" } }, "postcss-discard-duplicates": { @@ -7138,7 +7138,7 @@ "integrity": "sha1-uavye4isGIFYpesSq8riAmO5GTI=", "dev": true, "requires": { - "postcss": "^5.0.4" + "postcss": "5.2.18" } }, "postcss-discard-empty": { @@ -7147,7 +7147,7 @@ "integrity": "sha1-0rS9nVztXr2Nyt52QMfXzX9PkrU=", "dev": true, "requires": { - "postcss": "^5.0.14" + "postcss": "5.2.18" } }, "postcss-discard-overridden": { @@ -7156,7 +7156,7 @@ "integrity": "sha1-ix6vVU9ob7KIzYdMVWZ7CqNmjVg=", "dev": true, "requires": { - "postcss": "^5.0.16" + "postcss": "5.2.18" } }, "postcss-discard-unused": { @@ -7165,8 +7165,8 @@ "integrity": "sha1-vOMLLMWR/8Y0Mitfs0ZLbZNPRDM=", "dev": true, "requires": { - "postcss": "^5.0.14", - "uniqs": "^2.0.0" + "postcss": "5.2.18", + "uniqs": "2.0.0" } }, "postcss-filter-plugins": { @@ -7175,7 +7175,7 @@ "integrity": "sha1-giRf34IzcEFkXkdxFNjlk6oYuOw=", "dev": true, "requires": { - "postcss": "^5.0.4" + "postcss": "5.2.18" } }, "postcss-load-config": { @@ -7184,10 +7184,10 @@ "integrity": "sha1-U56a/J3chiASHr+djDZz4M5Q0oo=", "dev": true, "requires": { - "cosmiconfig": "^2.1.0", - "object-assign": "^4.1.0", - "postcss-load-options": "^1.2.0", - "postcss-load-plugins": "^2.3.0" + "cosmiconfig": "2.2.2", + "object-assign": "4.1.1", + "postcss-load-options": "1.2.0", + "postcss-load-plugins": "2.3.0" } }, "postcss-load-options": { @@ -7196,8 +7196,8 @@ "integrity": "sha1-sJixVZ3awt8EvAuzdfmaXP4rbYw=", "dev": true, "requires": { - "cosmiconfig": "^2.1.0", - "object-assign": "^4.1.0" + "cosmiconfig": "2.2.2", + "object-assign": "4.1.1" } }, "postcss-load-plugins": { @@ -7206,8 +7206,8 @@ "integrity": "sha1-dFdoEWWZrKLwCfrUJrABdQSdjZI=", "dev": true, "requires": { - "cosmiconfig": "^2.1.1", - "object-assign": "^4.1.0" + "cosmiconfig": "2.2.2", + "object-assign": "4.1.1" } }, "postcss-merge-idents": { @@ -7216,9 +7216,9 @@ "integrity": "sha1-TFUwMTwI4dWzu/PSu8dH4njuonA=", "dev": true, "requires": { - "has": "^1.0.1", - "postcss": "^5.0.10", - "postcss-value-parser": "^3.1.1" + "has": "1.0.3", + "postcss": "5.2.18", + "postcss-value-parser": "3.3.1" } }, "postcss-merge-longhand": { @@ -7227,7 +7227,7 @@ "integrity": "sha1-I9kM0Sewp3mUkVMyc5A0oaTz1lg=", "dev": true, "requires": { - "postcss": "^5.0.4" + "postcss": "5.2.18" } }, "postcss-merge-rules": { @@ -7236,11 +7236,11 @@ "integrity": "sha1-0d9d+qexrMO+VT8OnhDofGG19yE=", "dev": true, "requires": { - "browserslist": "^1.5.2", - "caniuse-api": "^1.5.2", - "postcss": "^5.0.4", - "postcss-selector-parser": "^2.2.2", - "vendors": "^1.0.0" + "browserslist": "1.7.7", + "caniuse-api": "1.6.1", + "postcss": "5.2.18", + "postcss-selector-parser": "2.2.3", + "vendors": "1.0.3" } }, "postcss-message-helpers": { @@ -7255,9 +7255,9 @@ "integrity": "sha1-S1jttWZB66fIR0qzUmyv17vey2k=", "dev": true, "requires": { - "object-assign": "^4.0.1", - "postcss": "^5.0.4", - "postcss-value-parser": "^3.0.2" + "object-assign": "4.1.1", + "postcss": "5.2.18", + "postcss-value-parser": "3.3.1" } }, "postcss-minify-gradients": { @@ -7266,8 +7266,8 @@ "integrity": "sha1-Xb2hE3NwP4PPtKPqOIHY11/15uE=", "dev": true, "requires": { - "postcss": "^5.0.12", - "postcss-value-parser": "^3.3.0" + "postcss": "5.2.18", + "postcss-value-parser": "3.3.1" } }, "postcss-minify-params": { @@ -7276,10 +7276,10 @@ "integrity": "sha1-rSzgcTc7lDs9kwo/pZo1jCjW8fM=", "dev": true, "requires": { - "alphanum-sort": "^1.0.1", - "postcss": "^5.0.2", - "postcss-value-parser": "^3.0.2", - "uniqs": "^2.0.0" + "alphanum-sort": "1.0.2", + "postcss": "5.2.18", + "postcss-value-parser": "3.3.1", + "uniqs": "2.0.0" } }, "postcss-minify-selectors": { @@ -7288,10 +7288,10 @@ "integrity": "sha1-ssapjAByz5G5MtGkllCBFDEXNb8=", "dev": true, "requires": { - "alphanum-sort": "^1.0.2", - "has": "^1.0.1", - "postcss": "^5.0.14", - "postcss-selector-parser": "^2.0.0" + "alphanum-sort": "1.0.2", + "has": "1.0.3", + "postcss": "5.2.18", + "postcss-selector-parser": "2.2.3" } }, "postcss-modules-extract-imports": { @@ -7300,7 +7300,7 @@ "integrity": "sha1-3IfjQUjsfqtfeR981YSYMzdbdBo=", "dev": true, "requires": { - "postcss": "^6.0.1" + "postcss": "6.0.23" }, "dependencies": { "ansi-styles": { @@ -7309,7 +7309,7 @@ "integrity": "sha1-QfuyAkPlCxK+DwS43tvwdSDOhB0=", "dev": true, "requires": { - "color-convert": "^1.9.0" + "color-convert": "1.9.3" } }, "chalk": { @@ -7318,9 +7318,9 @@ "integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=", "dev": true, "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.5.0" } }, "has-flag": { @@ -7335,9 +7335,9 @@ "integrity": "sha1-YcgswyisYOZ3ZF+XkFTrmLwOMyQ=", "dev": true, "requires": { - "chalk": "^2.4.1", - "source-map": "^0.6.1", - "supports-color": "^5.4.0" + "chalk": "2.4.2", + "source-map": "0.6.1", + "supports-color": "5.5.0" } }, "source-map": { @@ -7352,7 +7352,7 @@ "integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=", "dev": true, "requires": { - "has-flag": "^3.0.0" + "has-flag": "3.0.0" } } } @@ -7363,8 +7363,8 @@ "integrity": "sha1-99gMOYxaOT+nlkRmvRlQCn1hwGk=", "dev": true, "requires": { - "css-selector-tokenizer": "^0.7.0", - "postcss": "^6.0.1" + "css-selector-tokenizer": "0.7.1", + "postcss": "6.0.23" }, "dependencies": { "ansi-styles": { @@ -7373,7 +7373,7 @@ "integrity": "sha1-QfuyAkPlCxK+DwS43tvwdSDOhB0=", "dev": true, "requires": { - "color-convert": "^1.9.0" + "color-convert": "1.9.3" } }, "chalk": { @@ -7382,9 +7382,9 @@ "integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=", "dev": true, "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.5.0" } }, "has-flag": { @@ -7399,9 +7399,9 @@ "integrity": "sha1-YcgswyisYOZ3ZF+XkFTrmLwOMyQ=", "dev": true, "requires": { - "chalk": "^2.4.1", - "source-map": "^0.6.1", - "supports-color": "^5.4.0" + "chalk": "2.4.2", + "source-map": "0.6.1", + "supports-color": "5.5.0" } }, "source-map": { @@ -7416,7 +7416,7 @@ "integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=", "dev": true, "requires": { - "has-flag": "^3.0.0" + "has-flag": "3.0.0" } } } @@ -7427,8 +7427,8 @@ "integrity": "sha1-1upkmUx5+XtipytCb75gVqGUu5A=", "dev": true, "requires": { - "css-selector-tokenizer": "^0.7.0", - "postcss": "^6.0.1" + "css-selector-tokenizer": "0.7.1", + "postcss": "6.0.23" }, "dependencies": { "ansi-styles": { @@ -7437,7 +7437,7 @@ "integrity": "sha1-QfuyAkPlCxK+DwS43tvwdSDOhB0=", "dev": true, "requires": { - "color-convert": "^1.9.0" + "color-convert": "1.9.3" } }, "chalk": { @@ -7446,9 +7446,9 @@ "integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=", "dev": true, "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.5.0" } }, "has-flag": { @@ -7463,9 +7463,9 @@ "integrity": "sha1-YcgswyisYOZ3ZF+XkFTrmLwOMyQ=", "dev": true, "requires": { - "chalk": "^2.4.1", - "source-map": "^0.6.1", - "supports-color": "^5.4.0" + "chalk": "2.4.2", + "source-map": "0.6.1", + "supports-color": "5.5.0" } }, "source-map": { @@ -7480,7 +7480,7 @@ "integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=", "dev": true, "requires": { - "has-flag": "^3.0.0" + "has-flag": "3.0.0" } } } @@ -7491,8 +7491,8 @@ "integrity": "sha1-7P+p1+GSUYOJ9CrQ6D9yrsRW6iA=", "dev": true, "requires": { - "icss-replace-symbols": "^1.1.0", - "postcss": "^6.0.1" + "icss-replace-symbols": "1.1.0", + "postcss": "6.0.23" }, "dependencies": { "ansi-styles": { @@ -7501,7 +7501,7 @@ "integrity": "sha1-QfuyAkPlCxK+DwS43tvwdSDOhB0=", "dev": true, "requires": { - "color-convert": "^1.9.0" + "color-convert": "1.9.3" } }, "chalk": { @@ -7510,9 +7510,9 @@ "integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=", "dev": true, "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.5.0" } }, "has-flag": { @@ -7527,9 +7527,9 @@ "integrity": "sha1-YcgswyisYOZ3ZF+XkFTrmLwOMyQ=", "dev": true, "requires": { - "chalk": "^2.4.1", - "source-map": "^0.6.1", - "supports-color": "^5.4.0" + "chalk": "2.4.2", + "source-map": "0.6.1", + "supports-color": "5.5.0" } }, "source-map": { @@ -7544,7 +7544,7 @@ "integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=", "dev": true, "requires": { - "has-flag": "^3.0.0" + "has-flag": "3.0.0" } } } @@ -7555,7 +7555,7 @@ "integrity": "sha1-757nEhLX/nWceO0WL2HtYrXLk/E=", "dev": true, "requires": { - "postcss": "^5.0.5" + "postcss": "5.2.18" } }, "postcss-normalize-url": { @@ -7564,10 +7564,10 @@ "integrity": "sha1-EI90s/L82viRov+j6kWSJ5/HgiI=", "dev": true, "requires": { - "is-absolute-url": "^2.0.0", - "normalize-url": "^1.4.0", - "postcss": "^5.0.14", - "postcss-value-parser": "^3.2.3" + "is-absolute-url": "2.1.0", + "normalize-url": "1.9.1", + "postcss": "5.2.18", + "postcss-value-parser": "3.3.1" } }, "postcss-ordered-values": { @@ -7576,8 +7576,8 @@ "integrity": "sha1-7sbCpntsQSqNsgQud/6NpD+VwR0=", "dev": true, "requires": { - "postcss": "^5.0.4", - "postcss-value-parser": "^3.0.1" + "postcss": "5.2.18", + "postcss-value-parser": "3.3.1" } }, "postcss-reduce-idents": { @@ -7586,8 +7586,8 @@ "integrity": "sha1-wsbSDMlYKE9qv75j92Cb9AkFmtM=", "dev": true, "requires": { - "postcss": "^5.0.4", - "postcss-value-parser": "^3.0.2" + "postcss": "5.2.18", + "postcss-value-parser": "3.3.1" } }, "postcss-reduce-initial": { @@ -7596,7 +7596,7 @@ "integrity": "sha1-aPgGlfBF0IJjqHmtJA343WT2ROo=", "dev": true, "requires": { - "postcss": "^5.0.4" + "postcss": "5.2.18" } }, "postcss-reduce-transforms": { @@ -7605,9 +7605,9 @@ "integrity": "sha1-/3b02CEkN7McKYpC0uFEQCV3GuE=", "dev": true, "requires": { - "has": "^1.0.1", - "postcss": "^5.0.8", - "postcss-value-parser": "^3.0.1" + "has": "1.0.3", + "postcss": "5.2.18", + "postcss-value-parser": "3.3.1" } }, "postcss-selector-parser": { @@ -7616,9 +7616,9 @@ "integrity": "sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A=", "dev": true, "requires": { - "flatten": "^1.0.2", - "indexes-of": "^1.0.1", - "uniq": "^1.0.1" + "flatten": "1.0.2", + "indexes-of": "1.0.1", + "uniq": "1.0.1" } }, "postcss-svgo": { @@ -7627,10 +7627,10 @@ "integrity": "sha1-tt8YqmE7Zm4TPwittSGcJoSsEI0=", "dev": true, "requires": { - "is-svg": "^2.0.0", - "postcss": "^5.0.14", - "postcss-value-parser": "^3.2.3", - "svgo": "^0.7.0" + "is-svg": "2.1.0", + "postcss": "5.2.18", + "postcss-value-parser": "3.3.1", + "svgo": "0.7.2" } }, "postcss-unique-selectors": { @@ -7639,9 +7639,9 @@ "integrity": "sha1-mB1X0p3csz57Hf4f1DuGSfkzyh0=", "dev": true, "requires": { - "alphanum-sort": "^1.0.1", - "postcss": "^5.0.4", - "uniqs": "^2.0.0" + "alphanum-sort": "1.0.2", + "postcss": "5.2.18", + "uniqs": "2.0.0" } }, "postcss-value-parser": { @@ -7656,9 +7656,9 @@ "integrity": "sha1-0hCd3AVbka9n/EyzsCWUZjnSryI=", "dev": true, "requires": { - "has": "^1.0.1", - "postcss": "^5.0.4", - "uniqs": "^2.0.0" + "has": "1.0.3", + "postcss": "5.2.18", + "uniqs": "2.0.0" } }, "prelude-ls": { @@ -7685,8 +7685,8 @@ "integrity": "sha1-X0+HyPkeWuPzuoerTPXgOxoX8aM=", "dev": true, "requires": { - "renderkid": "^2.0.1", - "utila": "~0.4" + "renderkid": "2.0.3", + "utila": "0.4.0" } }, "private": { @@ -7714,7 +7714,7 @@ "dev": true, "optional": true, "requires": { - "asap": "~2.0.3" + "asap": "2.0.6" } }, "promise-inflight": { @@ -7729,7 +7729,7 @@ "integrity": "sha1-NMvWSi2B9LH9IedvnwbIpFKZ7jQ=", "dev": true, "requires": { - "forwarded": "~0.1.2", + "forwarded": "0.1.2", "ipaddr.js": "1.9.0" } }, @@ -7757,12 +7757,12 @@ "integrity": "sha1-T8ydd6B+SLp1J+fL4N4z0HATMeA=", "dev": true, "requires": { - "bn.js": "^4.1.0", - "browserify-rsa": "^4.0.0", - "create-hash": "^1.1.0", - "parse-asn1": "^5.0.0", - "randombytes": "^2.0.1", - "safe-buffer": "^5.1.2" + "bn.js": "4.11.8", + "browserify-rsa": "4.0.1", + "create-hash": "1.2.0", + "parse-asn1": "5.1.4", + "randombytes": "2.1.0", + "safe-buffer": "5.1.2" } }, "pump": { @@ -7771,8 +7771,8 @@ "integrity": "sha1-Ejma3W5M91Jtlzy8i1zi4pCLOQk=", "dev": true, "requires": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" + "end-of-stream": "1.4.1", + "once": "1.4.0" } }, "pumpify": { @@ -7781,9 +7781,9 @@ "integrity": "sha1-NlE74karJ1cLGjdKXOJ4v9dDcM4=", "dev": true, "requires": { - "duplexify": "^3.6.0", - "inherits": "^2.0.3", - "pump": "^2.0.0" + "duplexify": "3.7.1", + "inherits": "2.0.3", + "pump": "2.0.1" } }, "punycode": { @@ -7810,8 +7810,8 @@ "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=", "dev": true, "requires": { - "object-assign": "^4.1.0", - "strict-uri-encode": "^1.0.0" + "object-assign": "4.1.1", + "strict-uri-encode": "1.1.0" } }, "querystring": { @@ -7838,7 +7838,7 @@ "integrity": "sha1-32+ENy8CcNxlzfYpE0mrekc9Tyo=", "dev": true, "requires": { - "safe-buffer": "^5.1.0" + "safe-buffer": "5.1.2" } }, "randomfill": { @@ -7847,8 +7847,8 @@ "integrity": "sha1-ySGW/IarQr6YPxvzF3giSTHWFFg=", "dev": true, "requires": { - "randombytes": "^2.0.5", - "safe-buffer": "^5.1.0" + "randombytes": "2.1.0", + "safe-buffer": "5.1.2" } }, "range-parser": { @@ -7889,9 +7889,9 @@ "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", "dev": true, "requires": { - "load-json-file": "^1.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^1.0.0" + "load-json-file": "1.1.0", + "normalize-package-data": "2.5.0", + "path-type": "1.1.0" }, "dependencies": { "path-type": { @@ -7900,9 +7900,9 @@ "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" + "graceful-fs": "4.1.15", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" } }, "pify": { @@ -7919,8 +7919,8 @@ "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", "dev": true, "requires": { - "find-up": "^1.0.0", - "read-pkg": "^1.0.0" + "find-up": "1.1.2", + "read-pkg": "1.1.0" }, "dependencies": { "find-up": { @@ -7929,8 +7929,8 @@ "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", "dev": true, "requires": { - "path-exists": "^2.0.0", - "pinkie-promise": "^2.0.0" + "path-exists": "2.1.0", + "pinkie-promise": "2.0.1" } }, "path-exists": { @@ -7939,7 +7939,7 @@ "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", "dev": true, "requires": { - "pinkie-promise": "^2.0.0" + "pinkie-promise": "2.0.1" } } } @@ -7950,13 +7950,13 @@ "integrity": "sha1-sRwn2IuP8fvgcGQ8+UsMea4bCq8=", "dev": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } }, "readdirp": { @@ -7965,9 +7965,9 @@ "integrity": "sha1-DodiKjMlqjPokihcr4tOhGUppSU=", "dev": true, "requires": { - "graceful-fs": "^4.1.11", - "micromatch": "^3.1.10", - "readable-stream": "^2.0.2" + "graceful-fs": "4.1.15", + "micromatch": "3.1.10", + "readable-stream": "2.3.6" } }, "recast": { @@ -7977,9 +7977,9 @@ "dev": true, "requires": { "ast-types": "0.9.6", - "esprima": "~3.1.0", - "private": "~0.1.5", - "source-map": "~0.5.0" + "esprima": "3.1.3", + "private": "0.1.8", + "source-map": "0.5.7" }, "dependencies": { "esprima": { @@ -7996,8 +7996,8 @@ "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", "dev": true, "requires": { - "indent-string": "^2.1.0", - "strip-indent": "^1.0.1" + "indent-string": "2.1.0", + "strip-indent": "1.0.1" } }, "reduce-css-calc": { @@ -8006,9 +8006,9 @@ "integrity": "sha1-dHyRTgSWFKTJz7umKYca0dKSdxY=", "dev": true, "requires": { - "balanced-match": "^0.4.2", - "math-expression-evaluator": "^1.2.14", - "reduce-function-call": "^1.0.1" + "balanced-match": "0.4.2", + "math-expression-evaluator": "1.2.17", + "reduce-function-call": "1.0.2" }, "dependencies": { "balanced-match": { @@ -8025,7 +8025,7 @@ "integrity": "sha1-WiAL+S4ON3UXUv5FsKszD9S2vpk=", "dev": true, "requires": { - "balanced-match": "^0.4.2" + "balanced-match": "0.4.2" }, "dependencies": { "balanced-match": { @@ -8059,9 +8059,9 @@ "integrity": "sha1-HkmWg3Ix2ot/PPQRTXG1aRoGgN0=", "dev": true, "requires": { - "babel-runtime": "^6.18.0", - "babel-types": "^6.19.0", - "private": "^0.1.6" + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "private": "0.1.8" } }, "regex-not": { @@ -8070,8 +8070,8 @@ "integrity": "sha1-H07OJ+ALC2XgJHpoEOaoXYOldSw=", "dev": true, "requires": { - "extend-shallow": "^3.0.2", - "safe-regex": "^1.1.0" + "extend-shallow": "3.0.2", + "safe-regex": "1.1.0" } }, "regexpu-core": { @@ -8080,9 +8080,9 @@ "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=", "dev": true, "requires": { - "regenerate": "^1.2.1", - "regjsgen": "^0.2.0", - "regjsparser": "^0.1.4" + "regenerate": "1.4.0", + "regjsgen": "0.2.0", + "regjsparser": "0.1.5" } }, "regjsgen": { @@ -8097,7 +8097,7 @@ "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=", "dev": true, "requires": { - "jsesc": "~0.5.0" + "jsesc": "0.5.0" }, "dependencies": { "jsesc": { @@ -8126,11 +8126,11 @@ "integrity": "sha1-OAF5wv9a4TZcUivy/Pz/AcW3QUk=", "dev": true, "requires": { - "css-select": "^1.1.0", - "dom-converter": "^0.2", - "htmlparser2": "^3.3.0", - "strip-ansi": "^3.0.0", - "utila": "^0.4.0" + "css-select": "1.2.0", + "dom-converter": "0.2.0", + "htmlparser2": "3.10.1", + "strip-ansi": "3.0.1", + "utila": "0.4.0" } }, "repeat-element": { @@ -8151,7 +8151,7 @@ "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", "dev": true, "requires": { - "is-finite": "^1.0.0" + "is-finite": "1.0.2" } }, "request": { @@ -8160,26 +8160,26 @@ "integrity": "sha1-nC/KT301tZLv5Xx/ClXoEFIST+8=", "dev": true, "requires": { - "aws-sign2": "~0.7.0", - "aws4": "^1.8.0", - "caseless": "~0.12.0", - "combined-stream": "~1.0.6", - "extend": "~3.0.2", - "forever-agent": "~0.6.1", - "form-data": "~2.3.2", - "har-validator": "~5.1.0", - "http-signature": "~1.2.0", - "is-typedarray": "~1.0.0", - "isstream": "~0.1.2", - "json-stringify-safe": "~5.0.1", - "mime-types": "~2.1.19", - "oauth-sign": "~0.9.0", - "performance-now": "^2.1.0", - "qs": "~6.5.2", - "safe-buffer": "^5.1.2", - "tough-cookie": "~2.4.3", - "tunnel-agent": "^0.6.0", - "uuid": "^3.3.2" + "aws-sign2": "0.7.0", + "aws4": "1.8.0", + "caseless": "0.12.0", + "combined-stream": "1.0.8", + "extend": "3.0.2", + "forever-agent": "0.6.1", + "form-data": "2.3.3", + "har-validator": "5.1.3", + "http-signature": "1.2.0", + "is-typedarray": "1.0.0", + "isstream": "0.1.2", + "json-stringify-safe": "5.0.1", + "mime-types": "2.1.24", + "oauth-sign": "0.9.0", + "performance-now": "2.1.0", + "qs": "6.5.2", + "safe-buffer": "5.1.2", + "tough-cookie": "2.4.3", + "tunnel-agent": "0.6.0", + "uuid": "3.3.2" } }, "require-directory": { @@ -8212,7 +8212,7 @@ "integrity": "sha1-35kcDP+7vd5yFQTBRV9o9T98e9E=", "dev": true, "requires": { - "lodash": "^4.17.11" + "lodash": "4.17.11" } }, "resolve": { @@ -8221,7 +8221,7 @@ "integrity": "sha1-QBSHC6KWF2uGND1Qtg87UGCc4jI=", "dev": true, "requires": { - "path-parse": "^1.0.6" + "path-parse": "1.0.6" } }, "resolve-cwd": { @@ -8230,7 +8230,7 @@ "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=", "dev": true, "requires": { - "resolve-from": "^3.0.0" + "resolve-from": "3.0.0" } }, "resolve-dir": { @@ -8239,8 +8239,8 @@ "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=", "dev": true, "requires": { - "expand-tilde": "^2.0.0", - "global-modules": "^1.0.0" + "expand-tilde": "2.0.2", + "global-modules": "1.0.0" } }, "resolve-from": { @@ -8267,8 +8267,8 @@ "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", "dev": true, "requires": { - "onetime": "^2.0.0", - "signal-exit": "^3.0.2" + "onetime": "2.0.1", + "signal-exit": "3.0.2" } }, "ret": { @@ -8289,7 +8289,7 @@ "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=", "dev": true, "requires": { - "align-text": "^0.1.1" + "align-text": "0.1.4" } }, "rimraf": { @@ -8298,7 +8298,7 @@ "integrity": "sha1-stEE/g2Psnz54KHNqCYt04M8bKs=", "dev": true, "requires": { - "glob": "^7.1.3" + "glob": "7.1.4" } }, "ripemd160": { @@ -8307,8 +8307,8 @@ "integrity": "sha1-ocGm9iR1FXe6XQeRTLyShQWFiQw=", "dev": true, "requires": { - "hash-base": "^3.0.0", - "inherits": "^2.0.1" + "hash-base": "3.0.4", + "inherits": "2.0.3" } }, "run-async": { @@ -8317,7 +8317,7 @@ "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=", "dev": true, "requires": { - "is-promise": "^2.1.0" + "is-promise": "2.1.0" } }, "run-parallel": { @@ -8332,7 +8332,7 @@ "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=", "dev": true, "requires": { - "aproba": "^1.1.1" + "aproba": "1.2.0" } }, "rx": { @@ -8353,7 +8353,7 @@ "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", "dev": true, "requires": { - "ret": "~0.1.10" + "ret": "0.1.15" } }, "safer-buffer": { @@ -8368,10 +8368,10 @@ "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=", "dev": true, "requires": { - "glob": "^7.0.0", - "lodash": "^4.0.0", - "scss-tokenizer": "^0.2.3", - "yargs": "^7.0.0" + "glob": "7.1.4", + "lodash": "4.17.11", + "scss-tokenizer": "0.2.3", + "yargs": "7.1.0" } }, "sass-loader": { @@ -8380,11 +8380,11 @@ "integrity": "sha1-3S/bPn7v9KU/NbpqxAhxVIg1PQA=", "dev": true, "requires": { - "clone-deep": "^2.0.1", - "loader-utils": "^1.0.1", - "lodash.tail": "^4.1.1", - "neo-async": "^2.5.0", - "pify": "^3.0.0" + "clone-deep": "2.0.2", + "loader-utils": "1.2.3", + "lodash.tail": "4.1.1", + "neo-async": "2.6.1", + "pify": "3.0.0" } }, "sax": { @@ -8399,8 +8399,8 @@ "integrity": "sha1-unT1l9K+LqiAExdG7hfQoJPGgYc=", "dev": true, "requires": { - "ajv": "^6.1.0", - "ajv-keywords": "^3.1.0" + "ajv": "6.10.0", + "ajv-keywords": "3.4.0" } }, "scss-tokenizer": { @@ -8409,8 +8409,8 @@ "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=", "dev": true, "requires": { - "js-base64": "^2.1.8", - "source-map": "^0.4.2" + "js-base64": "2.5.1", + "source-map": "0.4.4" }, "dependencies": { "source-map": { @@ -8419,7 +8419,7 @@ "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", "dev": true, "requires": { - "amdefine": ">=0.0.4" + "amdefine": "1.0.1" } } } @@ -8452,18 +8452,18 @@ "dev": true, "requires": { "debug": "2.6.9", - "depd": "~1.1.2", - "destroy": "~1.0.4", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", + "depd": "1.1.2", + "destroy": "1.0.4", + "encodeurl": "1.0.2", + "escape-html": "1.0.3", + "etag": "1.8.1", "fresh": "0.5.2", - "http-errors": "~1.7.2", + "http-errors": "1.7.2", "mime": "1.6.0", "ms": "2.1.1", - "on-finished": "~2.3.0", - "range-parser": "~1.2.1", - "statuses": "~1.5.0" + "on-finished": "2.3.0", + "range-parser": "1.2.1", + "statuses": "1.5.0" }, "dependencies": { "ms": { @@ -8480,8 +8480,8 @@ "integrity": "sha1-H24t2jnBaL+S0T+G1KkYkz9mftQ=", "dev": true, "requires": { - "no-case": "^2.2.0", - "upper-case-first": "^1.1.2" + "no-case": "2.3.2", + "upper-case-first": "1.1.2" } }, "serialize-javascript": { @@ -8496,13 +8496,13 @@ "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=", "dev": true, "requires": { - "accepts": "~1.3.4", + "accepts": "1.3.7", "batch": "0.6.1", "debug": "2.6.9", - "escape-html": "~1.0.3", - "http-errors": "~1.6.2", - "mime-types": "~2.1.17", - "parseurl": "~1.3.2" + "escape-html": "1.0.3", + "http-errors": "1.6.3", + "mime-types": "2.1.24", + "parseurl": "1.3.3" }, "dependencies": { "http-errors": { @@ -8511,10 +8511,10 @@ "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=", "dev": true, "requires": { - "depd": "~1.1.2", + "depd": "1.1.2", "inherits": "2.0.3", "setprototypeof": "1.1.0", - "statuses": ">= 1.4.0 < 2" + "statuses": "1.5.0" } }, "setprototypeof": { @@ -8531,9 +8531,9 @@ "integrity": "sha1-Zm5jbcTwEPfvKZcKiKZ0MgiYsvk=", "dev": true, "requires": { - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "parseurl": "~1.3.3", + "encodeurl": "1.0.2", + "escape-html": "1.0.3", + "parseurl": "1.3.3", "send": "0.17.1" } }, @@ -8549,10 +8549,10 @@ "integrity": "sha1-ca5KiPD+77v1LR6mBPP7MV67YnQ=", "dev": true, "requires": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.3", - "split-string": "^3.0.1" + "extend-shallow": "2.0.1", + "is-extendable": "0.1.1", + "is-plain-object": "2.0.4", + "split-string": "3.1.0" }, "dependencies": { "extend-shallow": { @@ -8561,7 +8561,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } } } @@ -8584,8 +8584,8 @@ "integrity": "sha1-N6XPC4HsvGlD3hCbopYNGyZYSuc=", "dev": true, "requires": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" + "inherits": "2.0.3", + "safe-buffer": "5.1.2" } }, "shallow-clone": { @@ -8594,9 +8594,9 @@ "integrity": "sha1-RIDNBuiC72iyrYij6lSDLixItXE=", "dev": true, "requires": { - "is-extendable": "^0.1.1", - "kind-of": "^5.0.0", - "mixin-object": "^2.0.1" + "is-extendable": "0.1.1", + "kind-of": "5.1.0", + "mixin-object": "2.0.1" }, "dependencies": { "kind-of": { @@ -8613,7 +8613,7 @@ "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", "dev": true, "requires": { - "shebang-regex": "^1.0.0" + "shebang-regex": "1.0.0" } }, "shebang-regex": { @@ -8640,7 +8640,7 @@ "integrity": "sha1-Qb2xtz8w7GagTU4srRt2OH1NbZ8=", "dev": true, "requires": { - "no-case": "^2.2.0" + "no-case": "2.3.2" } }, "snapdragon": { @@ -8649,14 +8649,14 @@ "integrity": "sha1-ZJIufFZbDhQgS6GqfWlkJ40lGC0=", "dev": true, "requires": { - "base": "^0.11.1", - "debug": "^2.2.0", - "define-property": "^0.2.5", - "extend-shallow": "^2.0.1", - "map-cache": "^0.2.2", - "source-map": "^0.5.6", - "source-map-resolve": "^0.5.0", - "use": "^3.1.0" + "base": "0.11.2", + "debug": "2.6.9", + "define-property": "0.2.5", + "extend-shallow": "2.0.1", + "map-cache": "0.2.2", + "source-map": "0.5.7", + "source-map-resolve": "0.5.2", + "use": "3.1.1" }, "dependencies": { "define-property": { @@ -8665,7 +8665,7 @@ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "is-descriptor": "^0.1.0" + "is-descriptor": "0.1.6" } }, "extend-shallow": { @@ -8674,7 +8674,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } } } @@ -8685,9 +8685,9 @@ "integrity": "sha1-bBdfhv8UvbByRWPo88GwIaKGhTs=", "dev": true, "requires": { - "define-property": "^1.0.0", - "isobject": "^3.0.0", - "snapdragon-util": "^3.0.1" + "define-property": "1.0.0", + "isobject": "3.0.1", + "snapdragon-util": "3.0.1" }, "dependencies": { "define-property": { @@ -8696,7 +8696,7 @@ "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "dev": true, "requires": { - "is-descriptor": "^1.0.0" + "is-descriptor": "1.0.2" } }, "is-accessor-descriptor": { @@ -8705,7 +8705,7 @@ "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=", "dev": true, "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.2" } }, "is-data-descriptor": { @@ -8714,7 +8714,7 @@ "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=", "dev": true, "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.2" } }, "is-descriptor": { @@ -8723,9 +8723,9 @@ "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=", "dev": true, "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" } } } @@ -8736,7 +8736,7 @@ "integrity": "sha1-+VZHlIbyrNeXAGk/b3uAXkWrVuI=", "dev": true, "requires": { - "kind-of": "^3.2.0" + "kind-of": "3.2.2" }, "dependencies": { "kind-of": { @@ -8745,7 +8745,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -8756,8 +8756,8 @@ "integrity": "sha1-2Xa76ACve9IK4IWY1YI5NQiZPA0=", "dev": true, "requires": { - "faye-websocket": "^0.10.0", - "uuid": "^3.0.1" + "faye-websocket": "0.10.0", + "uuid": "3.3.2" } }, "sockjs-client": { @@ -8766,12 +8766,12 @@ "integrity": "sha1-G7fA9yIsQPQq3xT0RCy9Eml3GoM=", "dev": true, "requires": { - "debug": "^2.6.6", + "debug": "2.6.9", "eventsource": "0.1.6", - "faye-websocket": "~0.11.0", - "inherits": "^2.0.1", - "json3": "^3.3.2", - "url-parse": "^1.1.8" + "faye-websocket": "0.11.1", + "inherits": "2.0.3", + "json3": "3.3.2", + "url-parse": "1.4.7" }, "dependencies": { "faye-websocket": { @@ -8780,7 +8780,7 @@ "integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=", "dev": true, "requires": { - "websocket-driver": ">=0.5.1" + "websocket-driver": "0.7.0" } } } @@ -8791,7 +8791,7 @@ "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=", "dev": true, "requires": { - "is-plain-obj": "^1.0.0" + "is-plain-obj": "1.1.0" } }, "source-list-map": { @@ -8812,11 +8812,11 @@ "integrity": "sha1-cuLMNAlVQ+Q7LGKyxMENSpBU8lk=", "dev": true, "requires": { - "atob": "^2.1.1", - "decode-uri-component": "^0.2.0", - "resolve-url": "^0.2.1", - "source-map-url": "^0.4.0", - "urix": "^0.1.0" + "atob": "2.1.2", + "decode-uri-component": "0.2.0", + "resolve-url": "0.2.1", + "source-map-url": "0.4.0", + "urix": "0.1.0" } }, "source-map-support": { @@ -8825,7 +8825,7 @@ "integrity": "sha1-Aoam3ovkJkEzhZTpfM6nXwosWF8=", "dev": true, "requires": { - "source-map": "^0.5.6" + "source-map": "0.5.7" } }, "source-map-url": { @@ -8840,8 +8840,8 @@ "integrity": "sha1-+4PlBERSaPFUsHTiGMh8ADzTHfQ=", "dev": true, "requires": { - "spdx-expression-parse": "^3.0.0", - "spdx-license-ids": "^3.0.0" + "spdx-expression-parse": "3.0.0", + "spdx-license-ids": "3.0.4" } }, "spdx-exceptions": { @@ -8856,8 +8856,8 @@ "integrity": "sha1-meEZt6XaAOBUkcn6M4t5BII7QdA=", "dev": true, "requires": { - "spdx-exceptions": "^2.1.0", - "spdx-license-ids": "^3.0.0" + "spdx-exceptions": "2.2.0", + "spdx-license-ids": "3.0.4" } }, "spdx-license-ids": { @@ -8872,11 +8872,11 @@ "integrity": "sha1-gfIitadDoymqEs6mo5DmDpthPFI=", "dev": true, "requires": { - "debug": "^4.1.0", - "handle-thing": "^2.0.0", - "http-deceiver": "^1.2.7", - "select-hose": "^2.0.0", - "spdy-transport": "^3.0.0" + "debug": "4.1.1", + "handle-thing": "2.0.0", + "http-deceiver": "1.2.7", + "select-hose": "2.0.0", + "spdy-transport": "3.0.0" }, "dependencies": { "debug": { @@ -8885,7 +8885,7 @@ "integrity": "sha1-O3ImAlUQnGtYnO4FDx1RYTlmR5E=", "dev": true, "requires": { - "ms": "^2.1.1" + "ms": "2.1.1" } }, "ms": { @@ -8902,12 +8902,12 @@ "integrity": "sha1-ANSGOmQArXXfkzYaFghgXl3NzzE=", "dev": true, "requires": { - "debug": "^4.1.0", - "detect-node": "^2.0.4", - "hpack.js": "^2.1.6", - "obuf": "^1.1.2", - "readable-stream": "^3.0.6", - "wbuf": "^1.7.3" + "debug": "4.1.1", + "detect-node": "2.0.4", + "hpack.js": "2.1.6", + "obuf": "1.1.2", + "readable-stream": "3.3.0", + "wbuf": "1.7.3" }, "dependencies": { "debug": { @@ -8916,7 +8916,7 @@ "integrity": "sha1-O3ImAlUQnGtYnO4FDx1RYTlmR5E=", "dev": true, "requires": { - "ms": "^2.1.1" + "ms": "2.1.1" } }, "ms": { @@ -8931,9 +8931,9 @@ "integrity": "sha1-y4ARqtAC63F78EApH+uoVpyYb7k=", "dev": true, "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" + "inherits": "2.0.3", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } } } @@ -8944,7 +8944,7 @@ "integrity": "sha1-fLCd2jqGWFcFxks5pkZgOGguj+I=", "dev": true, "requires": { - "extend-shallow": "^3.0.0" + "extend-shallow": "3.0.2" } }, "sprintf-js": { @@ -8959,15 +8959,15 @@ "integrity": "sha1-+2YcC+8ps520B2nuOfpwCT1vaHc=", "dev": true, "requires": { - "asn1": "~0.2.3", - "assert-plus": "^1.0.0", - "bcrypt-pbkdf": "^1.0.0", - "dashdash": "^1.12.0", - "ecc-jsbn": "~0.1.1", - "getpass": "^0.1.1", - "jsbn": "~0.1.0", - "safer-buffer": "^2.0.2", - "tweetnacl": "~0.14.0" + "asn1": "0.2.4", + "assert-plus": "1.0.0", + "bcrypt-pbkdf": "1.0.2", + "dashdash": "1.14.1", + "ecc-jsbn": "0.1.2", + "getpass": "0.1.7", + "jsbn": "0.1.1", + "safer-buffer": "2.1.2", + "tweetnacl": "0.14.5" } }, "ssri": { @@ -8976,7 +8976,7 @@ "integrity": "sha1-ujhyycbTOgcEp9cf8EXl7EiZnQY=", "dev": true, "requires": { - "safe-buffer": "^5.1.1" + "safe-buffer": "5.1.2" } }, "static-extend": { @@ -8985,8 +8985,8 @@ "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", "dev": true, "requires": { - "define-property": "^0.2.5", - "object-copy": "^0.1.0" + "define-property": "0.2.5", + "object-copy": "0.1.0" }, "dependencies": { "define-property": { @@ -8995,7 +8995,7 @@ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "is-descriptor": "^0.1.0" + "is-descriptor": "0.1.6" } } } @@ -9012,7 +9012,7 @@ "integrity": "sha1-WsF0zdXNcmEEqgwLK9g4FdjVNd4=", "dev": true, "requires": { - "readable-stream": "^2.0.1" + "readable-stream": "2.3.6" } }, "stream-browserify": { @@ -9021,8 +9021,8 @@ "integrity": "sha1-h1IdOKRKp+6RzhzSpH3wy0ndZgs=", "dev": true, "requires": { - "inherits": "~2.0.1", - "readable-stream": "^2.0.2" + "inherits": "2.0.3", + "readable-stream": "2.3.6" } }, "stream-each": { @@ -9031,8 +9031,8 @@ "integrity": "sha1-6+J6DDibBPvMIzZClS4Qcxr6m64=", "dev": true, "requires": { - "end-of-stream": "^1.1.0", - "stream-shift": "^1.0.0" + "end-of-stream": "1.4.1", + "stream-shift": "1.0.0" } }, "stream-http": { @@ -9041,11 +9041,11 @@ "integrity": "sha1-stJCRpKIpaJ+xP6JM6z2I95lFPw=", "dev": true, "requires": { - "builtin-status-codes": "^3.0.0", - "inherits": "^2.0.1", - "readable-stream": "^2.3.6", - "to-arraybuffer": "^1.0.0", - "xtend": "^4.0.0" + "builtin-status-codes": "3.0.0", + "inherits": "2.0.3", + "readable-stream": "2.3.6", + "to-arraybuffer": "1.0.1", + "xtend": "4.0.1" } }, "stream-shift": { @@ -9066,8 +9066,8 @@ "integrity": "sha1-ty57V7bvBO/mFa/wrZibXBTKY9E=", "dev": true, "requires": { - "loader-utils": "^1.1.0", - "schema-utils": "^0.4.5" + "loader-utils": "1.2.3", + "schema-utils": "0.4.7" } }, "string-template": { @@ -9082,9 +9082,9 @@ "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" } }, "string_decoder": { @@ -9093,7 +9093,7 @@ "integrity": "sha1-nPFhG6YmhdcDCunkujQUnDrwP8g=", "dev": true, "requires": { - "safe-buffer": "~5.1.0" + "safe-buffer": "5.1.2" } }, "strip-ansi": { @@ -9102,7 +9102,7 @@ "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "requires": { - "ansi-regex": "^2.0.0" + "ansi-regex": "2.1.1" } }, "strip-bom": { @@ -9111,7 +9111,7 @@ "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", "dev": true, "requires": { - "is-utf8": "^0.2.0" + "is-utf8": "0.2.1" } }, "strip-eof": { @@ -9126,7 +9126,7 @@ "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", "dev": true, "requires": { - "get-stdin": "^4.0.1" + "get-stdin": "4.0.1" } }, "strip-json-comments": { @@ -9141,8 +9141,8 @@ "integrity": "sha1-WR/8gLzv4mi3fF2evAUF13Jhn4U=", "dev": true, "requires": { - "loader-utils": "^1.0.2", - "schema-utils": "^0.3.0" + "loader-utils": "1.2.3", + "schema-utils": "0.3.0" }, "dependencies": { "ajv": { @@ -9151,10 +9151,10 @@ "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", "dev": true, "requires": { - "co": "^4.6.0", - "fast-deep-equal": "^1.0.0", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.3.0" + "co": "4.6.0", + "fast-deep-equal": "1.1.0", + "fast-json-stable-stringify": "2.0.0", + "json-schema-traverse": "0.3.1" } }, "fast-deep-equal": { @@ -9175,7 +9175,7 @@ "integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=", "dev": true, "requires": { - "ajv": "^5.0.0" + "ajv": "5.5.2" } } } @@ -9192,13 +9192,13 @@ "integrity": "sha1-n1dyQTlSE1xv779Ar+ak+qiLS7U=", "dev": true, "requires": { - "coa": "~1.0.1", - "colors": "~1.1.2", - "csso": "~2.3.1", - "js-yaml": "~3.7.0", - "mkdirp": "~0.5.1", - "sax": "~1.2.1", - "whet.extend": "~0.9.9" + "coa": "1.0.4", + "colors": "1.1.2", + "csso": "2.3.2", + "js-yaml": "3.7.0", + "mkdirp": "0.5.1", + "sax": "1.2.4", + "whet.extend": "0.9.9" } }, "swap-case": { @@ -9207,8 +9207,8 @@ "integrity": "sha1-w5IDpFhzhfrTyFCgvRvK+ggZdOM=", "dev": true, "requires": { - "lower-case": "^1.1.1", - "upper-case": "^1.1.1" + "lower-case": "1.1.4", + "upper-case": "1.1.3" } }, "taffydb": { @@ -9229,9 +9229,9 @@ "integrity": "sha1-DKiEhWLHKZuLRG/2pNYM27I+3EA=", "dev": true, "requires": { - "block-stream": "*", - "fstream": "^1.0.12", - "inherits": "2" + "block-stream": "0.0.9", + "fstream": "1.0.12", + "inherits": "2.0.3" } }, "through": { @@ -9246,8 +9246,8 @@ "integrity": "sha1-AcHjnrMdB8t9A6lqcIIyYLIxMs0=", "dev": true, "requires": { - "readable-stream": "~2.3.6", - "xtend": "~4.0.1" + "readable-stream": "2.3.6", + "xtend": "4.0.1" } }, "thunky": { @@ -9268,7 +9268,7 @@ "integrity": "sha1-HSjj0qrfHVpZlsTp+VYBzQU0gK4=", "dev": true, "requires": { - "setimmediate": "^1.0.4" + "setimmediate": "1.0.5" } }, "tiny-invariant": { @@ -9294,8 +9294,8 @@ "integrity": "sha1-PhJyFtpY0rxb7PE3q5Ha46fNj6o=", "dev": true, "requires": { - "no-case": "^2.2.0", - "upper-case": "^1.0.3" + "no-case": "2.3.2", + "upper-case": "1.1.3" } }, "tmp": { @@ -9304,7 +9304,7 @@ "integrity": "sha1-bTQzWIl2jSGyvNoKonfO07G/rfk=", "dev": true, "requires": { - "os-tmpdir": "~1.0.2" + "os-tmpdir": "1.0.2" } }, "to-arraybuffer": { @@ -9325,7 +9325,7 @@ "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", "dev": true, "requires": { - "kind-of": "^3.0.2" + "kind-of": "3.2.2" }, "dependencies": { "kind-of": { @@ -9334,7 +9334,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -9345,10 +9345,10 @@ "integrity": "sha1-E8/dmzNlUvMLUfM6iuG0Knp1mc4=", "dev": true, "requires": { - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "regex-not": "^1.0.2", - "safe-regex": "^1.1.0" + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "regex-not": "1.0.2", + "safe-regex": "1.1.0" } }, "to-regex-range": { @@ -9357,8 +9357,8 @@ "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", "dev": true, "requires": { - "is-number": "^3.0.0", - "repeat-string": "^1.6.1" + "is-number": "3.0.0", + "repeat-string": "1.6.1" } }, "toidentifier": { @@ -9379,8 +9379,8 @@ "integrity": "sha1-U/Nto/R3g7CSWvoG/587FlKA94E=", "dev": true, "requires": { - "psl": "^1.1.24", - "punycode": "^1.4.1" + "psl": "1.1.32", + "punycode": "1.4.1" }, "dependencies": { "punycode": { @@ -9409,7 +9409,7 @@ "integrity": "sha1-+BO1qMhrQNpZYGcisUTjIleZ9H0=", "dev": true, "requires": { - "glob": "^7.1.2" + "glob": "7.1.4" } }, "ts-loader": { @@ -9418,11 +9418,11 @@ "integrity": "sha1-FR0ATc3bTPjjgaO/nWt0wtlXqcA=", "dev": true, "requires": { - "chalk": "^2.3.0", - "enhanced-resolve": "^3.0.0", - "loader-utils": "^1.0.2", - "micromatch": "^3.1.4", - "semver": "^5.0.1" + "chalk": "2.4.2", + "enhanced-resolve": "3.4.1", + "loader-utils": "1.2.3", + "micromatch": "3.1.10", + "semver": "5.7.0" }, "dependencies": { "ansi-styles": { @@ -9431,7 +9431,7 @@ "integrity": "sha1-QfuyAkPlCxK+DwS43tvwdSDOhB0=", "dev": true, "requires": { - "color-convert": "^1.9.0" + "color-convert": "1.9.3" } }, "chalk": { @@ -9440,9 +9440,9 @@ "integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=", "dev": true, "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.5.0" } }, "has-flag": { @@ -9457,7 +9457,7 @@ "integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=", "dev": true, "requires": { - "has-flag": "^3.0.0" + "has-flag": "3.0.0" } } } @@ -9480,7 +9480,7 @@ "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", "dev": true, "requires": { - "safe-buffer": "^5.0.1" + "safe-buffer": "5.1.2" } }, "tweetnacl": { @@ -9495,7 +9495,7 @@ "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", "dev": true, "requires": { - "prelude-ls": "~1.1.2" + "prelude-ls": "1.1.2" } }, "type-is": { @@ -9505,7 +9505,7 @@ "dev": true, "requires": { "media-typer": "0.3.0", - "mime-types": "~2.1.24" + "mime-types": "2.1.24" } }, "typedarray": { @@ -9532,8 +9532,8 @@ "integrity": "sha1-mtlWPY6zrN+404WX0q8dgV9qdV8=", "dev": true, "requires": { - "commander": "~2.19.0", - "source-map": "~0.6.1" + "commander": "2.19.0", + "source-map": "0.6.1" }, "dependencies": { "commander": { @@ -9562,14 +9562,14 @@ "integrity": "sha1-dfVIFghYFjoIZD4IbV/v4YpdZ94=", "dev": true, "requires": { - "cacache": "^10.0.4", - "find-cache-dir": "^1.0.0", - "schema-utils": "^0.4.5", - "serialize-javascript": "^1.4.0", - "source-map": "^0.6.1", - "uglify-es": "^3.3.4", - "webpack-sources": "^1.1.0", - "worker-farm": "^1.5.2" + "cacache": "10.0.4", + "find-cache-dir": "1.0.0", + "schema-utils": "0.4.7", + "serialize-javascript": "1.7.0", + "source-map": "0.6.1", + "uglify-es": "3.3.9", + "webpack-sources": "1.3.0", + "worker-farm": "1.7.0" }, "dependencies": { "commander": { @@ -9590,8 +9590,8 @@ "integrity": "sha1-DBxPBwC+2NvBJM2zBNJZLKID5nc=", "dev": true, "requires": { - "commander": "~2.13.0", - "source-map": "~0.6.1" + "commander": "2.13.0", + "source-map": "0.6.1" } } } @@ -9608,10 +9608,10 @@ "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=", "dev": true, "requires": { - "arr-union": "^3.1.0", - "get-value": "^2.0.6", - "is-extendable": "^0.1.1", - "set-value": "^0.4.3" + "arr-union": "3.1.0", + "get-value": "2.0.6", + "is-extendable": "0.1.1", + "set-value": "0.4.3" }, "dependencies": { "extend-shallow": { @@ -9620,7 +9620,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } }, "set-value": { @@ -9629,10 +9629,10 @@ "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=", "dev": true, "requires": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.1", - "to-object-path": "^0.3.0" + "extend-shallow": "2.0.1", + "is-extendable": "0.1.1", + "is-plain-object": "2.0.4", + "to-object-path": "0.3.0" } } } @@ -9655,7 +9655,7 @@ "integrity": "sha1-HWl2k2mtoFgxA6HmrodoG1ZXMjA=", "dev": true, "requires": { - "unique-slug": "^2.0.0" + "unique-slug": "2.0.1" } }, "unique-slug": { @@ -9664,7 +9664,7 @@ "integrity": "sha1-Xp7cbRzo+yZNsYpQfvm9hURFHKY=", "dev": true, "requires": { - "imurmurhash": "^0.1.4" + "imurmurhash": "0.1.4" } }, "unpipe": { @@ -9679,8 +9679,8 @@ "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", "dev": true, "requires": { - "has-value": "^0.3.1", - "isobject": "^3.0.0" + "has-value": "0.3.1", + "isobject": "3.0.1" }, "dependencies": { "has-value": { @@ -9689,9 +9689,9 @@ "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=", "dev": true, "requires": { - "get-value": "^2.0.3", - "has-values": "^0.1.4", - "isobject": "^2.0.0" + "get-value": "2.0.6", + "has-values": "0.1.4", + "isobject": "2.1.0" }, "dependencies": { "isobject": { @@ -9731,7 +9731,7 @@ "integrity": "sha1-XXm+3P8UQZUY/S7bCgUHybaFkRU=", "dev": true, "requires": { - "upper-case": "^1.1.1" + "upper-case": "1.1.3" } }, "uri-js": { @@ -9740,7 +9740,7 @@ "integrity": "sha1-lMVA4f93KVbiKZUHwBCupsiDjrA=", "dev": true, "requires": { - "punycode": "^2.1.0" + "punycode": "2.1.1" } }, "urix": { @@ -9773,9 +9773,9 @@ "integrity": "sha1-oAenEJYg6dmI0UvOZ3od7Lmpk/c=", "dev": true, "requires": { - "loader-utils": "^1.0.2", - "mime": "^1.4.1", - "schema-utils": "^0.3.0" + "loader-utils": "1.2.3", + "mime": "1.6.0", + "schema-utils": "0.3.0" }, "dependencies": { "ajv": { @@ -9784,10 +9784,10 @@ "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", "dev": true, "requires": { - "co": "^4.6.0", - "fast-deep-equal": "^1.0.0", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.3.0" + "co": "4.6.0", + "fast-deep-equal": "1.1.0", + "fast-json-stable-stringify": "2.0.0", + "json-schema-traverse": "0.3.1" } }, "fast-deep-equal": { @@ -9808,7 +9808,7 @@ "integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=", "dev": true, "requires": { - "ajv": "^5.0.0" + "ajv": "5.5.2" } } } @@ -9819,8 +9819,8 @@ "integrity": "sha1-qKg1NejACjFuQDpdtKwbm4U64ng=", "dev": true, "requires": { - "querystringify": "^2.1.1", - "requires-port": "^1.0.0" + "querystringify": "2.1.1", + "requires-port": "1.0.0" } }, "use": { @@ -9879,8 +9879,8 @@ "integrity": "sha1-/JH2uce6FchX9MssXe/uw51PQQo=", "dev": true, "requires": { - "spdx-correct": "^3.0.0", - "spdx-expression-parse": "^3.0.0" + "spdx-correct": "3.1.0", + "spdx-expression-parse": "3.0.0" } }, "validator": { @@ -9913,9 +9913,9 @@ "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", "dev": true, "requires": { - "assert-plus": "^1.0.0", + "assert-plus": "1.0.0", "core-util-is": "1.0.2", - "extsprintf": "^1.2.0" + "extsprintf": "1.3.0" } }, "vm-browserify": { @@ -9937,7 +9937,7 @@ "resolved": "https://registry.npm.taobao.org/vue-drag-tree/download/vue-drag-tree-1.1.8.tgz", "integrity": "sha1-YFceuPiz+7xoGXkto/ZzTQael7Q=", "requires": { - "vue": "^2.6.10" + "vue": "2.6.10" } }, "vue-hot-reload-api": { @@ -9952,11 +9952,11 @@ "integrity": "sha1-VM5Im+BgZckdwqEXMSLz4ATgolM=", "dev": true, "requires": { - "es6-templates": "^0.2.2", - "fastparse": "^1.0.0", - "html-minifier": "^2.1.5", - "loader-utils": "^1.0.2", - "object-assign": "^4.1.0" + "es6-templates": "0.2.3", + "fastparse": "1.1.2", + "html-minifier": "2.1.7", + "loader-utils": "1.2.3", + "object-assign": "4.1.1" }, "dependencies": { "async": { @@ -9977,8 +9977,8 @@ "integrity": "sha1-vxlF6C/ICPVWlebd6uwBQA79A/8=", "dev": true, "requires": { - "commander": "2.8.x", - "source-map": "0.4.x" + "commander": "2.8.1", + "source-map": "0.4.4" }, "dependencies": { "commander": { @@ -9987,7 +9987,7 @@ "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=", "dev": true, "requires": { - "graceful-readlink": ">= 1.0.0" + "graceful-readlink": "1.0.1" } } } @@ -9998,8 +9998,8 @@ "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", "dev": true, "requires": { - "center-align": "^0.1.1", - "right-align": "^0.1.1", + "center-align": "0.1.3", + "right-align": "0.1.3", "wordwrap": "0.0.2" } }, @@ -10009,7 +10009,7 @@ "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=", "dev": true, "requires": { - "graceful-readlink": ">= 1.0.0" + "graceful-readlink": "1.0.1" } }, "he": { @@ -10024,13 +10024,13 @@ "integrity": "sha1-kFHW/LvPIU7TB+GtdPQyu5rWVcw=", "dev": true, "requires": { - "change-case": "3.0.x", - "clean-css": "3.4.x", - "commander": "2.9.x", - "he": "1.1.x", - "ncname": "1.0.x", - "relateurl": "0.2.x", - "uglify-js": "2.6.x" + "change-case": "3.0.2", + "clean-css": "3.4.28", + "commander": "2.9.0", + "he": "1.1.1", + "ncname": "1.0.0", + "relateurl": "0.2.7", + "uglify-js": "2.6.4" } }, "source-map": { @@ -10039,7 +10039,7 @@ "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", "dev": true, "requires": { - "amdefine": ">=0.0.4" + "amdefine": "1.0.1" } }, "uglify-js": { @@ -10048,10 +10048,10 @@ "integrity": "sha1-ZeovswWck5RpLxX+2HwrNsFrmt8=", "dev": true, "requires": { - "async": "~0.2.6", - "source-map": "~0.5.1", - "uglify-to-browserify": "~1.0.0", - "yargs": "~3.10.0" + "async": "0.2.10", + "source-map": "0.5.7", + "uglify-to-browserify": "1.0.2", + "yargs": "3.10.0" }, "dependencies": { "source-map": { @@ -10068,9 +10068,9 @@ "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", "dev": true, "requires": { - "camelcase": "^1.0.2", - "cliui": "^2.1.0", - "decamelize": "^1.0.0", + "camelcase": "1.2.1", + "cliui": "2.1.0", + "decamelize": "1.2.0", "window-size": "0.1.0" } } @@ -10082,19 +10082,19 @@ "integrity": "sha1-4HRA94IwpjnQCtpNp7ltDp1iA38=", "dev": true, "requires": { - "consolidate": "^0.14.0", - "hash-sum": "^1.0.2", - "loader-utils": "^1.1.0", - "lru-cache": "^4.1.1", - "postcss": "^6.0.8", - "postcss-load-config": "^1.1.0", - "postcss-selector-parser": "^2.0.0", - "prettier": "^1.7.0", - "resolve": "^1.4.0", - "source-map": "^0.6.1", - "vue-hot-reload-api": "^2.2.0", - "vue-style-loader": "^3.0.0", - "vue-template-es2015-compiler": "^1.6.0" + "consolidate": "0.14.5", + "hash-sum": "1.0.2", + "loader-utils": "1.2.3", + "lru-cache": "4.1.5", + "postcss": "6.0.23", + "postcss-load-config": "1.2.0", + "postcss-selector-parser": "2.2.3", + "prettier": "1.17.1", + "resolve": "1.11.0", + "source-map": "0.6.1", + "vue-hot-reload-api": "2.3.3", + "vue-style-loader": "3.1.2", + "vue-template-es2015-compiler": "1.9.1" }, "dependencies": { "ansi-styles": { @@ -10103,7 +10103,7 @@ "integrity": "sha1-QfuyAkPlCxK+DwS43tvwdSDOhB0=", "dev": true, "requires": { - "color-convert": "^1.9.0" + "color-convert": "1.9.3" } }, "chalk": { @@ -10112,9 +10112,9 @@ "integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=", "dev": true, "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.5.0" } }, "has-flag": { @@ -10129,9 +10129,9 @@ "integrity": "sha1-YcgswyisYOZ3ZF+XkFTrmLwOMyQ=", "dev": true, "requires": { - "chalk": "^2.4.1", - "source-map": "^0.6.1", - "supports-color": "^5.4.0" + "chalk": "2.4.2", + "source-map": "0.6.1", + "supports-color": "5.5.0" } }, "source-map": { @@ -10146,7 +10146,7 @@ "integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=", "dev": true, "requires": { - "has-flag": "^3.0.0" + "has-flag": "3.0.0" } }, "vue-style-loader": { @@ -10155,8 +10155,8 @@ "integrity": "sha1-a2atNJmPyVIMLx5NX6QJFkHBWXo=", "dev": true, "requires": { - "hash-sum": "^1.0.2", - "loader-utils": "^1.0.2" + "hash-sum": "1.0.2", + "loader-utils": "1.2.3" } } } @@ -10167,8 +10167,8 @@ "integrity": "sha1-3t80mAbyXOtOZPOtfApE+6c1/Pg=", "dev": true, "requires": { - "hash-sum": "^1.0.2", - "loader-utils": "^1.0.2" + "hash-sum": "1.0.2", + "loader-utils": "1.2.3" } }, "vue-template-compiler": { @@ -10177,8 +10177,8 @@ "integrity": "sha1-MjtPNJXwT6o1AzN6gvXWUHeZycw=", "dev": true, "requires": { - "de-indent": "^1.0.2", - "he": "^1.1.0" + "de-indent": "1.0.2", + "he": "1.2.0" } }, "vue-template-es2015-compiler": { @@ -10193,9 +10193,9 @@ "integrity": "sha1-S8EsLr6KonenHx0/FNaFx7RGzQA=", "dev": true, "requires": { - "chokidar": "^2.0.2", - "graceful-fs": "^4.1.2", - "neo-async": "^2.5.0" + "chokidar": "2.1.6", + "graceful-fs": "4.1.15", + "neo-async": "2.6.1" } }, "wbuf": { @@ -10204,7 +10204,7 @@ "integrity": "sha1-wdjRSTFtPqhShIiVy2oL/oh7h98=", "dev": true, "requires": { - "minimalistic-assert": "^1.0.0" + "minimalistic-assert": "1.0.1" } }, "webpack": { @@ -10213,28 +10213,28 @@ "integrity": "sha1-P540NgNwYC/PY56Xk520hvTsDXQ=", "dev": true, "requires": { - "acorn": "^5.0.0", - "acorn-dynamic-import": "^2.0.0", - "ajv": "^6.1.0", - "ajv-keywords": "^3.1.0", - "async": "^2.1.2", - "enhanced-resolve": "^3.4.0", - "escope": "^3.6.0", - "interpret": "^1.0.0", - "json-loader": "^0.5.4", - "json5": "^0.5.1", - "loader-runner": "^2.3.0", - "loader-utils": "^1.1.0", - "memory-fs": "~0.4.1", - "mkdirp": "~0.5.0", - "node-libs-browser": "^2.0.0", - "source-map": "^0.5.3", - "supports-color": "^4.2.1", - "tapable": "^0.2.7", - "uglifyjs-webpack-plugin": "^0.4.6", - "watchpack": "^1.4.0", - "webpack-sources": "^1.0.1", - "yargs": "^8.0.2" + "acorn": "5.7.3", + "acorn-dynamic-import": "2.0.2", + "ajv": "6.10.0", + "ajv-keywords": "3.4.0", + "async": "2.6.2", + "enhanced-resolve": "3.4.1", + "escope": "3.6.0", + "interpret": "1.2.0", + "json-loader": "0.5.7", + "json5": "0.5.1", + "loader-runner": "2.4.0", + "loader-utils": "1.2.3", + "memory-fs": "0.4.1", + "mkdirp": "0.5.1", + "node-libs-browser": "2.2.0", + "source-map": "0.5.7", + "supports-color": "4.5.0", + "tapable": "0.2.9", + "uglifyjs-webpack-plugin": "0.4.6", + "watchpack": "1.6.0", + "webpack-sources": "1.3.0", + "yargs": "8.0.2" }, "dependencies": { "ansi-regex": { @@ -10255,8 +10255,8 @@ "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", "dev": true, "requires": { - "center-align": "^0.1.1", - "right-align": "^0.1.1", + "center-align": "0.1.3", + "right-align": "0.1.3", "wordwrap": "0.0.2" } }, @@ -10272,10 +10272,10 @@ "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "parse-json": "^2.2.0", - "pify": "^2.0.0", - "strip-bom": "^3.0.0" + "graceful-fs": "4.1.15", + "parse-json": "2.2.0", + "pify": "2.3.0", + "strip-bom": "3.0.0" } }, "os-locale": { @@ -10284,9 +10284,9 @@ "integrity": "sha1-QrwpAKa1uL0XN2yOiCtlr8zyS/I=", "dev": true, "requires": { - "execa": "^0.7.0", - "lcid": "^1.0.0", - "mem": "^1.1.0" + "execa": "0.7.0", + "lcid": "1.0.0", + "mem": "1.1.0" } }, "path-type": { @@ -10295,7 +10295,7 @@ "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", "dev": true, "requires": { - "pify": "^2.0.0" + "pify": "2.3.0" } }, "pify": { @@ -10310,9 +10310,9 @@ "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", "dev": true, "requires": { - "load-json-file": "^2.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^2.0.0" + "load-json-file": "2.0.0", + "normalize-package-data": "2.5.0", + "path-type": "2.0.0" } }, "read-pkg-up": { @@ -10321,8 +10321,8 @@ "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=", "dev": true, "requires": { - "find-up": "^2.0.0", - "read-pkg": "^2.0.0" + "find-up": "2.1.0", + "read-pkg": "2.0.0" } }, "string-width": { @@ -10331,8 +10331,8 @@ "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=", "dev": true, "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" }, "dependencies": { "is-fullwidth-code-point": { @@ -10347,7 +10347,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "^3.0.0" + "ansi-regex": "3.0.0" } } } @@ -10364,7 +10364,7 @@ "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", "dev": true, "requires": { - "has-flag": "^2.0.0" + "has-flag": "2.0.0" } }, "uglify-js": { @@ -10373,9 +10373,9 @@ "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=", "dev": true, "requires": { - "source-map": "~0.5.1", - "uglify-to-browserify": "~1.0.0", - "yargs": "~3.10.0" + "source-map": "0.5.7", + "uglify-to-browserify": "1.0.2", + "yargs": "3.10.0" }, "dependencies": { "yargs": { @@ -10384,9 +10384,9 @@ "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", "dev": true, "requires": { - "camelcase": "^1.0.2", - "cliui": "^2.1.0", - "decamelize": "^1.0.0", + "camelcase": "1.2.1", + "cliui": "2.1.0", + "decamelize": "1.2.0", "window-size": "0.1.0" } } @@ -10398,9 +10398,9 @@ "integrity": "sha1-uVH0q7a9YX5m9j64kUmOORdj4wk=", "dev": true, "requires": { - "source-map": "^0.5.6", - "uglify-js": "^2.8.29", - "webpack-sources": "^1.0.1" + "source-map": "0.5.7", + "uglify-js": "2.8.29", + "webpack-sources": "1.3.0" } }, "which-module": { @@ -10421,19 +10421,19 @@ "integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=", "dev": true, "requires": { - "camelcase": "^4.1.0", - "cliui": "^3.2.0", - "decamelize": "^1.1.1", - "get-caller-file": "^1.0.1", - "os-locale": "^2.0.0", - "read-pkg-up": "^2.0.0", - "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", - "set-blocking": "^2.0.0", - "string-width": "^2.0.0", - "which-module": "^2.0.0", - "y18n": "^3.2.1", - "yargs-parser": "^7.0.0" + "camelcase": "4.1.0", + "cliui": "3.2.0", + "decamelize": "1.2.0", + "get-caller-file": "1.0.3", + "os-locale": "2.1.0", + "read-pkg-up": "2.0.0", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "2.1.1", + "which-module": "2.0.0", + "y18n": "3.2.1", + "yargs-parser": "7.0.0" }, "dependencies": { "camelcase": { @@ -10448,9 +10448,9 @@ "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", "dev": true, "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wrap-ansi": "^2.0.0" + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wrap-ansi": "2.1.0" }, "dependencies": { "string-width": { @@ -10459,9 +10459,9 @@ "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" } } } @@ -10474,7 +10474,7 @@ "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=", "dev": true, "requires": { - "camelcase": "^4.1.0" + "camelcase": "4.1.0" }, "dependencies": { "camelcase": { @@ -10493,17 +10493,17 @@ "integrity": "sha1-rtJDew2wp/qirShIThZqU2ABSpE=", "dev": true, "requires": { - "chalk": "^2.4.1", - "cross-spawn": "^6.0.5", - "enhanced-resolve": "^4.1.0", - "findup-sync": "^2.0.0", - "global-modules": "^1.0.0", - "import-local": "^2.0.0", - "interpret": "^1.1.0", - "loader-utils": "^1.1.0", - "supports-color": "^5.5.0", - "v8-compile-cache": "^2.0.2", - "yargs": "^12.0.5" + "chalk": "2.4.2", + "cross-spawn": "6.0.5", + "enhanced-resolve": "4.1.0", + "findup-sync": "2.0.0", + "global-modules": "1.0.0", + "import-local": "2.0.0", + "interpret": "1.2.0", + "loader-utils": "1.2.3", + "supports-color": "5.5.0", + "v8-compile-cache": "2.0.3", + "yargs": "12.0.5" }, "dependencies": { "ansi-regex": { @@ -10518,7 +10518,7 @@ "integrity": "sha1-QfuyAkPlCxK+DwS43tvwdSDOhB0=", "dev": true, "requires": { - "color-convert": "^1.9.0" + "color-convert": "1.9.3" } }, "camelcase": { @@ -10533,9 +10533,9 @@ "integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=", "dev": true, "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.5.0" } }, "cliui": { @@ -10544,9 +10544,9 @@ "integrity": "sha1-NIQi2+gtgAswIu709qwQvy5NG0k=", "dev": true, "requires": { - "string-width": "^2.1.1", - "strip-ansi": "^4.0.0", - "wrap-ansi": "^2.0.0" + "string-width": "2.1.1", + "strip-ansi": "4.0.0", + "wrap-ansi": "2.1.0" } }, "enhanced-resolve": { @@ -10555,9 +10555,9 @@ "integrity": "sha1-Qcfgv9/nSsH/4eV61qXGyfN0Kn8=", "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "memory-fs": "^0.4.0", - "tapable": "^1.0.0" + "graceful-fs": "4.1.15", + "memory-fs": "0.4.1", + "tapable": "1.1.3" } }, "execa": { @@ -10566,13 +10566,13 @@ "integrity": "sha1-xiNqW7TfbW8V6I5/AXeYIWdJ3dg=", "dev": true, "requires": { - "cross-spawn": "^6.0.0", - "get-stream": "^4.0.0", - "is-stream": "^1.1.0", - "npm-run-path": "^2.0.0", - "p-finally": "^1.0.0", - "signal-exit": "^3.0.0", - "strip-eof": "^1.0.0" + "cross-spawn": "6.0.5", + "get-stream": "4.1.0", + "is-stream": "1.1.0", + "npm-run-path": "2.0.2", + "p-finally": "1.0.0", + "signal-exit": "3.0.2", + "strip-eof": "1.0.0" } }, "find-up": { @@ -10581,7 +10581,7 @@ "integrity": "sha1-SRafHXmTQwZG2mHsxa41XCHJe3M=", "dev": true, "requires": { - "locate-path": "^3.0.0" + "locate-path": "3.0.0" } }, "get-stream": { @@ -10590,7 +10590,7 @@ "integrity": "sha1-wbJVV189wh1Zv8ec09K0axw6VLU=", "dev": true, "requires": { - "pump": "^3.0.0" + "pump": "3.0.0" } }, "has-flag": { @@ -10617,7 +10617,7 @@ "integrity": "sha1-bvXS32DlL4LrIopMNz6NHzlyU88=", "dev": true, "requires": { - "invert-kv": "^2.0.0" + "invert-kv": "2.0.0" } }, "locate-path": { @@ -10626,8 +10626,8 @@ "integrity": "sha1-2+w7OrdZdYBxtY/ln8QYca8hQA4=", "dev": true, "requires": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" + "p-locate": "3.0.0", + "path-exists": "3.0.0" } }, "mem": { @@ -10636,9 +10636,9 @@ "integrity": "sha1-Rhr0l7xK4JYIzbLmDu+2m/90QXg=", "dev": true, "requires": { - "map-age-cleaner": "^0.1.1", - "mimic-fn": "^2.0.0", - "p-is-promise": "^2.0.0" + "map-age-cleaner": "0.1.3", + "mimic-fn": "2.1.0", + "p-is-promise": "2.1.0" } }, "mimic-fn": { @@ -10653,9 +10653,9 @@ "integrity": "sha1-qAKm7hfyTBBIOrmTVxnO9O0Wvxo=", "dev": true, "requires": { - "execa": "^1.0.0", - "lcid": "^2.0.0", - "mem": "^4.0.0" + "execa": "1.0.0", + "lcid": "2.0.0", + "mem": "4.3.0" } }, "p-limit": { @@ -10664,7 +10664,7 @@ "integrity": "sha1-QXyZQeYCepq8ulCS3SkE4lW1+8I=", "dev": true, "requires": { - "p-try": "^2.0.0" + "p-try": "2.2.0" } }, "p-locate": { @@ -10673,7 +10673,7 @@ "integrity": "sha1-Mi1poFwCZLJZl9n0DNiokasAZKQ=", "dev": true, "requires": { - "p-limit": "^2.0.0" + "p-limit": "2.2.0" } }, "p-try": { @@ -10688,8 +10688,8 @@ "integrity": "sha1-tKIRaBW94vTh6mAjVOjHVWUQemQ=", "dev": true, "requires": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" + "end-of-stream": "1.4.1", + "once": "1.4.0" } }, "string-width": { @@ -10698,8 +10698,8 @@ "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=", "dev": true, "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" } }, "strip-ansi": { @@ -10708,7 +10708,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "^3.0.0" + "ansi-regex": "3.0.0" } }, "supports-color": { @@ -10717,7 +10717,7 @@ "integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=", "dev": true, "requires": { - "has-flag": "^3.0.0" + "has-flag": "3.0.0" } }, "tapable": { @@ -10738,18 +10738,18 @@ "integrity": "sha1-BfWZe2CWR7ZPZrgeO0sQo2jnrRM=", "dev": true, "requires": { - "cliui": "^4.0.0", - "decamelize": "^1.2.0", - "find-up": "^3.0.0", - "get-caller-file": "^1.0.1", - "os-locale": "^3.0.0", - "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", - "set-blocking": "^2.0.0", - "string-width": "^2.0.0", - "which-module": "^2.0.0", - "y18n": "^3.2.1 || ^4.0.0", - "yargs-parser": "^11.1.1" + "cliui": "4.1.0", + "decamelize": "1.2.0", + "find-up": "3.0.0", + "get-caller-file": "1.0.3", + "os-locale": "3.1.0", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "2.1.1", + "which-module": "2.0.0", + "y18n": "4.0.0", + "yargs-parser": "11.1.1" } }, "yargs-parser": { @@ -10758,8 +10758,8 @@ "integrity": "sha1-h5oIZZc7yp9rq1y987HGfsfTvPQ=", "dev": true, "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" + "camelcase": "5.3.1", + "decamelize": "1.2.0" } } } @@ -10770,11 +10770,11 @@ "integrity": "sha1-+PwRIM47T8VoDO7LQ9d3lmshEF4=", "dev": true, "requires": { - "memory-fs": "~0.4.1", - "mime": "^1.5.0", - "path-is-absolute": "^1.0.0", - "range-parser": "^1.0.3", - "time-stamp": "^2.0.0" + "memory-fs": "0.4.1", + "mime": "1.6.0", + "path-is-absolute": "1.0.1", + "range-parser": "1.2.1", + "time-stamp": "2.2.0" } }, "webpack-dev-server": { @@ -10784,30 +10784,30 @@ "dev": true, "requires": { "ansi-html": "0.0.7", - "array-includes": "^3.0.3", - "bonjour": "^3.5.0", - "chokidar": "^2.1.2", - "compression": "^1.7.3", - "connect-history-api-fallback": "^1.3.0", - "debug": "^3.1.0", - "del": "^3.0.0", - "express": "^4.16.2", - "html-entities": "^1.2.0", - "http-proxy-middleware": "^0.19.1", - "import-local": "^1.0.0", + "array-includes": "3.0.3", + "bonjour": "3.5.0", + "chokidar": "2.1.6", + "compression": "1.7.4", + "connect-history-api-fallback": "1.6.0", + "debug": "3.2.6", + "del": "3.0.0", + "express": "4.17.1", + "html-entities": "1.2.1", + "http-proxy-middleware": "0.19.1", + "import-local": "1.0.0", "internal-ip": "1.2.0", - "ip": "^1.1.5", - "killable": "^1.0.0", - "loglevel": "^1.4.1", - "opn": "^5.1.0", - "portfinder": "^1.0.9", - "selfsigned": "^1.9.1", - "serve-index": "^1.9.1", + "ip": "1.1.5", + "killable": "1.0.1", + "loglevel": "1.6.1", + "opn": "5.5.0", + "portfinder": "1.0.20", + "selfsigned": "1.10.4", + "serve-index": "1.9.1", "sockjs": "0.3.19", "sockjs-client": "1.1.5", - "spdy": "^4.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^5.1.0", + "spdy": "4.0.0", + "strip-ansi": "3.0.1", + "supports-color": "5.5.0", "webpack-dev-middleware": "1.12.2", "yargs": "6.6.0" }, @@ -10824,7 +10824,7 @@ "integrity": "sha1-6D0X3hbYp++3cX7b5fsQE17uYps=", "dev": true, "requires": { - "ms": "^2.1.1" + "ms": "2.1.1" } }, "has-flag": { @@ -10839,8 +10839,8 @@ "integrity": "sha1-Xk/9wD9P5sAJxnKb6yljHC+CJ7w=", "dev": true, "requires": { - "pkg-dir": "^2.0.0", - "resolve-cwd": "^2.0.0" + "pkg-dir": "2.0.0", + "resolve-cwd": "2.0.0" } }, "ms": { @@ -10855,7 +10855,7 @@ "integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=", "dev": true, "requires": { - "has-flag": "^3.0.0" + "has-flag": "3.0.0" } }, "y18n": { @@ -10870,19 +10870,19 @@ "integrity": "sha1-eC7CHvQDNF+DCoCMo9UTr1YGUgg=", "dev": true, "requires": { - "camelcase": "^3.0.0", - "cliui": "^3.2.0", - "decamelize": "^1.1.1", - "get-caller-file": "^1.0.1", - "os-locale": "^1.4.0", - "read-pkg-up": "^1.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", - "set-blocking": "^2.0.0", - "string-width": "^1.0.2", - "which-module": "^1.0.0", - "y18n": "^3.2.1", - "yargs-parser": "^4.2.0" + "camelcase": "3.0.0", + "cliui": "3.2.0", + "decamelize": "1.2.0", + "get-caller-file": "1.0.3", + "os-locale": "1.4.0", + "read-pkg-up": "1.0.1", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "1.0.2", + "which-module": "1.0.0", + "y18n": "3.2.1", + "yargs-parser": "4.2.1" } }, "yargs-parser": { @@ -10891,7 +10891,7 @@ "integrity": "sha1-KczqwNxPA8bIe0qfIX3RjJ90hxw=", "dev": true, "requires": { - "camelcase": "^3.0.0" + "camelcase": "3.0.0" } } } @@ -10913,8 +10913,8 @@ "integrity": "sha1-KijcufH0X+lg2PFJMlK17mUw+oU=", "dev": true, "requires": { - "source-list-map": "^2.0.0", - "source-map": "~0.6.1" + "source-list-map": "2.0.1", + "source-map": "0.6.1" }, "dependencies": { "source-map": { @@ -10931,8 +10931,8 @@ "integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=", "dev": true, "requires": { - "http-parser-js": ">=0.4.0", - "websocket-extensions": ">=0.1.1" + "http-parser-js": "0.5.0", + "websocket-extensions": "0.1.3" } }, "websocket-extensions": { @@ -10953,7 +10953,7 @@ "integrity": "sha1-pFBD1U9YBTFtqNYvn1CRjT2nCwo=", "dev": true, "requires": { - "isexe": "^2.0.0" + "isexe": "2.0.0" } }, "which-module": { @@ -10968,7 +10968,7 @@ "integrity": "sha1-rgdOa9wMFKQx6ATmJFScYzsABFc=", "dev": true, "requires": { - "string-width": "^1.0.2 || 2" + "string-width": "1.0.2" } }, "window-size": { @@ -10989,7 +10989,7 @@ "integrity": "sha1-JqlMU5G7ypJhUgAvabhKS/dy5ag=", "dev": true, "requires": { - "errno": "~0.1.7" + "errno": "0.1.7" } }, "wrap-ansi": { @@ -10998,8 +10998,8 @@ "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", "dev": true, "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1" + "string-width": "1.0.2", + "strip-ansi": "3.0.1" } }, "wrappy": { @@ -11013,7 +11013,7 @@ "resolved": "https://registry.npmjs.org/x2js/-/x2js-3.3.1.tgz", "integrity": "sha512-UruP3F9pgFlGbgm/8i28AiNSLN4jlcu8GMBbzuqLqAzV3O49WQDtmJeLefYy8hmBnTEtQEUvPQG8EDFCDDyP6g==", "requires": { - "xmldom": "^0.1.19" + "xmldom": "0.1.27" } }, "xml-char-classes": { @@ -11057,19 +11057,19 @@ "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=", "dev": true, "requires": { - "camelcase": "^3.0.0", - "cliui": "^3.2.0", - "decamelize": "^1.1.1", - "get-caller-file": "^1.0.1", - "os-locale": "^1.4.0", - "read-pkg-up": "^1.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", - "set-blocking": "^2.0.0", - "string-width": "^1.0.2", - "which-module": "^1.0.0", - "y18n": "^3.2.1", - "yargs-parser": "^5.0.0" + "camelcase": "3.0.0", + "cliui": "3.2.0", + "decamelize": "1.2.0", + "get-caller-file": "1.0.3", + "os-locale": "1.4.0", + "read-pkg-up": "1.0.1", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "1.0.2", + "which-module": "1.0.0", + "y18n": "3.2.1", + "yargs-parser": "5.0.0" }, "dependencies": { "camelcase": { @@ -11092,7 +11092,7 @@ "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=", "dev": true, "requires": { - "camelcase": "^3.0.0" + "camelcase": "3.0.0" }, "dependencies": { "camelcase": { diff --git a/package.json b/package.json index 9cd82604..8bc68ef5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "xbsj-earthui", - "version": "1.2.7", + "version": "1.2.9", "description": "xbsj-earthui", "main": "index.js", "keywords": [ @@ -50,9 +50,9 @@ "copy-webpack-plugin": "^4.5.2", "cross-env": "^5.1.3", "css-loader": "^0.28.11", - "earthsdk": "1.2.8", - "earthsdk-custom-primitive": "^1.0.1", - "earthsdk-plotting-symbol": "1.0.11", + "earthsdk": "1.2.9", + "earthsdk-custom-primitive": "1.0.2", + "earthsdk-plotting-symbol": "1.0.12", "file-loader": "^1.1.6", "globby": "^10.0.1", "history": "^4.7.2", From 00453d2e56dfbdda3aa5c0a55096ba11c334e9b3 Mon Sep 17 00:00:00 2001 From: vtxf Date: Fri, 29 Nov 2019 16:58:21 +0800 Subject: [PATCH 82/82] 1.2.9 --- package-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index d77930b4..04b4d33b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "xbsj-earthui", - "version": "1.2.7", + "version": "1.2.9", "lockfileVersion": 1, "requires": true, "dependencies": {