diff --git a/.gitignore b/.gitignore index 07e6e47..8225baa 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /node_modules +/dist diff --git a/config/webpack.common.ts b/config/webpack.common.ts index 1c0476e..70aeeda 100644 --- a/config/webpack.common.ts +++ b/config/webpack.common.ts @@ -1,7 +1,6 @@ -import * as path from 'path'; +import * as HardSourceWebpackPlugin from 'hard-source-webpack-plugin'; import * as webpack from 'webpack'; import ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin'); -import * as HardSourceWebpackPlugin from 'hard-source-webpack-plugin'; const config: webpack.Configuration = { devtool: "source-map", diff --git a/config/webpack.umd.ts b/config/webpack.umd.ts index 3e50ef7..865d20e 100644 --- a/config/webpack.umd.ts +++ b/config/webpack.umd.ts @@ -7,11 +7,11 @@ const config: webpack.Configuration = merge( common, { mode: "production", - entry: "../src/index.ts", + entry: "./src/index.ts", //输出设置 output: { filename: "cad.js", - path: path.resolve(__dirname, '../umd'), + path: path.resolve(__dirname, './umd'), library: "cad", libraryTarget: "umd" }, diff --git a/config/webpack.view.ts b/config/webpack.view.ts index 9601215..b610fa4 100644 --- a/config/webpack.view.ts +++ b/config/webpack.view.ts @@ -1,13 +1,7 @@ import * as webpack from 'webpack'; import * as merge from 'webpack-merge'; -import common from './webpack.umd'; +import common from './webpack.common'; import * as HtmlWebPackPlugin from "html-webpack-plugin"; -import * as path from 'path'; - -function getpath(fileName) -{ - return path.resolve(__dirname, fileName); -} const config: webpack.Configuration = merge( common, @@ -19,17 +13,19 @@ const config: webpack.Configuration = merge( devServer: { contentBase: "./dist/", port: 7776, - hot: true + hot: true, }, plugins: [ - // new webpack.NamedModulesPlugin(),//Hot - // new webpack.HotModuleReplacementPlugin(),//Hot + new webpack.NamedModulesPlugin(),//Hot + new webpack.HotModuleReplacementPlugin(),//Hot new HtmlWebPackPlugin({ title: "webCAD", - // template: getpath('../src/index.html') + // template: './src/index.html' }), ] } ); +config.externals = {}; + export default config; diff --git a/dist/CameraControls.d.ts b/dist/CameraControls.d.ts deleted file mode 100644 index 82731d1..0000000 --- a/dist/CameraControls.d.ts +++ /dev/null @@ -1,46 +0,0 @@ -import * as THREE from 'three'; -import { KeyBoard, MouseKey } from './KeyEnum'; -import { Viewer } from './Viewer'; -export declare enum CameraControlState { - Null = 0, - Pan = 1, - Rotate = 2, - Scale = 3, -} -export declare class CameraControls { - m_TouthTypeList: CameraControlState[]; - m_domElement: HTMLElement; - m_StartClickPoint: THREE.Vector3; - m_EndClickPoint: THREE.Vector3; - m_DollyStart: THREE.Vector2; - m_DollyEnd: THREE.Vector2; - m_KeyDown: Map; - m_MouseDown: Map; - m_State: CameraControlState; - m_Viewer: Viewer; - m_LeftUseRotate: boolean; - constructor(viewer: Viewer); - RegisterEvent(): void; - /** - * 窗体失去焦点时. - * - * @memberof CameraControls - */ - onBlur: () => void; - onTouchStart: (event: TouchEvent) => void; - onTouchEnd: (event: TouchEvent) => void; - onTouchMove: (event: TouchEvent) => void; - beginRotate(): void; - lastMiddleClickTime: number; - onMouseDown: (event: MouseEvent) => void; - onMouseUp: (event: MouseEvent) => void; - onMouseMove: (event: MouseEvent) => void; - /** - * 鼠标滚轮事件 - * - * @memberof CameraControls - */ - onMouseWheel: (event: WheelEvent) => void; - onKeyDown: (event: KeyboardEvent) => void; - onKeyUp: (event: KeyboardEvent) => void; -} diff --git a/dist/CameraControls.js b/dist/CameraControls.js deleted file mode 100644 index b1d46b1..0000000 --- a/dist/CameraControls.js +++ /dev/null @@ -1,216 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -var THREE = require("three"); -var KeyEnum_1 = require("./KeyEnum"); -var three_1 = require("three"); -//控制类型 -var CameraControlsEnabled; -(function (CameraControlsEnabled) { - CameraControlsEnabled[CameraControlsEnabled["Rotate"] = 1] = "Rotate"; - CameraControlsEnabled[CameraControlsEnabled["Zoom"] = 2] = "Zoom"; - CameraControlsEnabled[CameraControlsEnabled["Pan"] = 4] = "Pan"; -})(CameraControlsEnabled || (CameraControlsEnabled = {})); -//相机控制状态 -var CameraControlState; -(function (CameraControlState) { - CameraControlState[CameraControlState["Null"] = 0] = "Null"; - CameraControlState[CameraControlState["Pan"] = 1] = "Pan"; - CameraControlState[CameraControlState["Rotate"] = 2] = "Rotate"; - CameraControlState[CameraControlState["Scale"] = 3] = "Scale"; -})(CameraControlState = exports.CameraControlState || (exports.CameraControlState = {})); -var CameraControls = /** @class */ (function () { - function CameraControls(viewer) { - var _this = this; - this.m_TouthTypeList = [CameraControlState.Rotate, CameraControlState.Scale, CameraControlState.Pan]; - //起始点击 - this.m_StartClickPoint = new THREE.Vector3(); - this.m_EndClickPoint = new THREE.Vector3(); - this.m_DollyStart = new THREE.Vector2(); - this.m_DollyEnd = new THREE.Vector2(); - this.m_KeyDown = new Map(); - this.m_MouseDown = new Map(); - //状态 - this.m_State = CameraControlState.Null; - //左键使用旋转 - this.m_LeftUseRotate = true; - /** - * 窗体失去焦点时. - * - * @memberof CameraControls - */ - this.onBlur = function () { - _this.m_KeyDown.clear(); - _this.m_MouseDown.clear(); - }; - //触屏开始事件 - this.onTouchStart = function (event) { - _this.m_Viewer.UpdateLockTarget(); - _this.m_StartClickPoint.set(event.touches[0].pageX, event.touches[0].pageY, 0); - if (event.touches.length < 4) { - if (event.touches.length == 2) { - var dx = event.touches[0].pageX - event.touches[1].pageX; - var dy = event.touches[0].pageY - event.touches[1].pageY; - var distance = Math.sqrt(dx * dx + dy * dy); - _this.m_DollyStart.set(0, distance); - } - _this.m_State = _this.m_TouthTypeList[event.touches.length - 1]; - } - }; - this.onTouchEnd = function (event) { - _this.m_State = CameraControlState.Null; - }; - this.onTouchMove = function (event) { - event.preventDefault(); - event.stopPropagation(); - _this.m_EndClickPoint.set(event.touches[0].pageX, event.touches[0].pageY, 0); - var vec = _this.m_EndClickPoint.clone().sub(_this.m_StartClickPoint); - switch (_this.m_State) { - case CameraControlState.Pan: - { - _this.m_Viewer.Pan(vec); - break; - } - case CameraControlState.Scale: - { - var dx = event.touches[0].pageX - event.touches[1].pageX; - var dy = event.touches[0].pageY - event.touches[1].pageY; - var distance = Math.sqrt(dx * dx + dy * dy); - _this.m_DollyEnd.set(0, distance); - if (distance > _this.m_DollyStart.y) { - _this.m_Viewer.Zoom(0.95); - } - else { - _this.m_Viewer.Zoom(1.05); - } - _this.m_DollyStart.copy(_this.m_DollyEnd); - break; - } - case CameraControlState.Rotate: - { - _this.m_Viewer.Rotate(vec.multiplyScalar(2)); - break; - } - } - _this.m_StartClickPoint.copy(_this.m_EndClickPoint); - _this.m_Viewer.m_bNeedUpdate = true; - }; - //最后一次按中键的时间 - this.lastMiddleClickTime = 0; - //鼠标 - this.onMouseDown = function (event) { - event.preventDefault(); - var key = event.button; - _this.m_MouseDown.set(key, true); - _this.m_StartClickPoint.set(event.offsetX, event.offsetY, 0); - switch (key) { - case KeyEnum_1.MouseKey.Left: - { - if (_this.m_LeftUseRotate) { - _this.beginRotate(); - } - break; - } - case KeyEnum_1.MouseKey.Middle: - { - var curTime = Date.now(); - var t = curTime - _this.lastMiddleClickTime; - _this.lastMiddleClickTime = curTime; - if (t < 350) { - _this.m_Viewer.ZoomAll(); - return; - } - if (_this.m_KeyDown.get(KeyEnum_1.KeyBoard.Control)) { - _this.beginRotate(); - } - else { - _this.m_State = CameraControlState.Pan; - } - break; - } - case KeyEnum_1.MouseKey.Right: - { - break; - } - } - }; - this.onMouseUp = function (event) { - event.preventDefault(); - _this.m_State = CameraControlState.Null; - _this.m_MouseDown.set(event.button, false); - }; - this.onMouseMove = function (event) { - event.preventDefault(); - _this.m_EndClickPoint.set(event.offsetX, event.offsetY, 0); - var changeVec = _this.m_EndClickPoint.clone().sub(_this.m_StartClickPoint); - _this.m_StartClickPoint.copy(_this.m_EndClickPoint); - if ((_this.m_LeftUseRotate || - (_this.m_KeyDown.get(KeyEnum_1.KeyBoard.Control))) - && _this.m_State == CameraControlState.Rotate) { - _this.m_Viewer.Rotate(changeVec); - } - switch (_this.m_State) { - case CameraControlState.Pan: - { - _this.m_Viewer.Pan(changeVec); - break; - } - case CameraControlState.Rotate: - { - break; - } - case CameraControlState.Scale: - { - break; - } - } - }; - /** - * 鼠标滚轮事件 - * - * @memberof CameraControls - */ - this.onMouseWheel = function (event) { - event.preventDefault(); - event.stopPropagation(); - var pt = new THREE.Vector3(event.offsetX, event.offsetY, 0); - _this.m_Viewer.ScreenToWorld(pt, new three_1.Vector3().setFromMatrixColumn(_this.m_Viewer.m_Camera.Camera.matrixWorld, 2)); - if (event.deltaY < 0) { - _this.m_Viewer.Zoom(0.6, pt); - } - else if (event.deltaY > 0) { - _this.m_Viewer.Zoom(1.4, pt); - } - }; - //按键 - this.onKeyDown = function (event) { - _this.m_KeyDown.set(event.keyCode, true); - }; - this.onKeyUp = function (event) { - _this.m_KeyDown.set(event.keyCode, false); - }; - this.m_Viewer = viewer; - this.m_domElement = viewer.m_Render.domElement.parentElement; - this.RegisterEvent(); - } - CameraControls.prototype.RegisterEvent = function () { - if (this.m_domElement) { - this.m_domElement.addEventListener("mousedown", this.onMouseDown, false); - this.m_domElement.addEventListener("mousemove", this.onMouseMove, false); - this.m_domElement.addEventListener("mouseup", this.onMouseUp, false); - window.addEventListener("keydown", this.onKeyDown, false); - window.addEventListener("keyup", this.onKeyUp, false); - this.m_domElement.addEventListener('wheel', this.onMouseWheel, false); - this.m_domElement.addEventListener('touchstart', this.onTouchStart, false); - this.m_domElement.addEventListener('touchend', this.onTouchEnd, false); - this.m_domElement.addEventListener('touchmove', this.onTouchMove, false); - window.addEventListener("blur", this.onBlur, false); - } - }; - CameraControls.prototype.beginRotate = function () { - this.m_State = CameraControlState.Rotate; - this.m_Viewer.UpdateLockTarget(); - }; - return CameraControls; -}()); -exports.CameraControls = CameraControls; -//# sourceMappingURL=CameraControls.js.map \ No newline at end of file diff --git a/dist/CameraControls.js.map b/dist/CameraControls.js.map deleted file mode 100644 index 31a96cb..0000000 --- a/dist/CameraControls.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"CameraControls.js","sourceRoot":"","sources":["../src/CameraControls.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/CameraUpdate.d.ts b/dist/CameraUpdate.d.ts deleted file mode 100644 index 070566b..0000000 --- a/dist/CameraUpdate.d.ts +++ /dev/null @@ -1,48 +0,0 @@ -import * as THREE from 'three'; -/** - * - * 相机的控制. - * ->切换相机 - * ->设置视口大小 - * ->旋转和移动相机. - * - * @export - * @class ViewCameraManage - */ -export declare class CameraUpdate { - private m_CurCamera; - private m_CameraArray; - private m_Width; - private m_Height; - private m_ViewHeight; - private m_Target; - private m_Direction; - private m_Orbit; - m_MinViewHeight: number; - m_MaxViewHeight: number; - constructor(); - readonly Aspect: number; - readonly Camera: THREE.Camera; - ViewHeight: number; - SetSize(width: number, height: number): void; - /** - * 平移相机. - * - * @param {THREE.Vector3} mouseMove - * @memberof CameraControl - */ - Pan(mouseMove: THREE.Vector3): void; - Rotate(mouseMove: THREE.Vector3, target: THREE.Vector3): void; - Zoom(scale: number, scaleCenter?: THREE.Vector3): void; - ZoomExtensBox3(box3: THREE.Box3): void; - LookAt(dir: THREE.Vector3): void; - UpdateUp(): void; - /** - * 根据视口大小,设置相机视口范围. - * - * @returns - * @memberof CameraControl - */ - Update(): void; - SwitchCamera(): void; -} diff --git a/dist/CameraUpdate.js b/dist/CameraUpdate.js deleted file mode 100644 index 5511309..0000000 --- a/dist/CameraUpdate.js +++ /dev/null @@ -1,187 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -var THREE = require("three"); -var three_1 = require("three"); -var Orbit_1 = require("./Orbit"); -/** - * - * 相机的控制. - * ->切换相机 - * ->设置视口大小 - * ->旋转和移动相机. - * - * @export - * @class ViewCameraManage - */ -var CameraUpdate = /** @class */ (function () { - function CameraUpdate() { - this.m_CameraArray = new Map(); - //视口显示的高度 - this.m_ViewHeight = 10; - //观察的位置 - this.m_Target = new THREE.Vector3(); - //观察向量 - this.m_Direction = new THREE.Vector3(0, 0, -1); - //观察的轨道. - this.m_Orbit = new Orbit_1.Orbit(); - this.m_MinViewHeight = 10; - this.m_MaxViewHeight = 3e4; - this.m_CameraArray.set(THREE.OrthographicCamera, new THREE.OrthographicCamera(-2, 2, 2, -2, -1e6, 1e6)); - this.m_CameraArray.set(THREE.PerspectiveCamera, new THREE.PerspectiveCamera(50, 1, 0.01, 10000)); - this.m_CurCamera = this.m_CameraArray.get(THREE.OrthographicCamera); - this.m_Orbit.UpdateRoValue(this.m_Direction); - this.UpdateUp(); - this.Update(); - } - Object.defineProperty(CameraUpdate.prototype, "Aspect", { - get: function () { - return this.m_Width / this.m_Height; - }, - enumerable: true, - configurable: true - }); - Object.defineProperty(CameraUpdate.prototype, "Camera", { - get: function () { - return this.m_CurCamera; - }, - enumerable: true, - configurable: true - }); - Object.defineProperty(CameraUpdate.prototype, "ViewHeight", { - get: function () { - return this.m_ViewHeight; - }, - set: function (height) { - this.m_ViewHeight = THREE.Math.clamp(height, this.m_MinViewHeight, this.m_MaxViewHeight); - }, - enumerable: true, - configurable: true - }); - CameraUpdate.prototype.SetSize = function (width, height) { - this.m_Width = width; - this.m_Height = height; - }; - /** - * 平移相机. - * - * @param {THREE.Vector3} mouseMove - * @memberof CameraControl - */ - CameraUpdate.prototype.Pan = function (mouseMove) { - mouseMove.y *= -1; - mouseMove.multiplyScalar(-this.m_ViewHeight / this.m_Height); - mouseMove.applyQuaternion(this.Camera.quaternion); - this.m_Target.add(mouseMove); - this.Update(); - }; - CameraUpdate.prototype.Rotate = function (mouseMove, target) { - this.m_Orbit.RoX -= mouseMove.y * 0.003; - this.m_Orbit.RoZ -= mouseMove.x * 0.003; - //缓存观察点 - var oldTargetFormCameraSpace = target.clone().applyMatrix4(this.Camera.matrixWorldInverse); - this.m_Orbit.UpdateDirection(this.m_Direction); - this.UpdateUp(); - this.Update(); - //-----还原观察点 - //得到新的观察点相对于相机的位置 - var newTargetFormCameraSpace = target.clone().applyMatrix4(this.Camera.matrixWorldInverse); - //减去原先的位置. 得到观测点在相机内移动的向量 - newTargetFormCameraSpace.sub(oldTargetFormCameraSpace); - //乘以相机的矩阵. 得到向量在世界坐标系的位置 - newTargetFormCameraSpace.applyMatrix4(this.Camera.matrix); - //因为使用的是点变换,所以减去基点,得到向量 - newTargetFormCameraSpace.sub(this.Camera.position); - //加上移动的向量. 使得观察点时钟在相机的某个位置 - this.m_Target.add(newTargetFormCameraSpace); - this.Update(); - }; - CameraUpdate.prototype.Zoom = function (scale, scaleCenter) { - if (this.Camera instanceof THREE.OrthographicCamera) { - this.ViewHeight *= scale; - if (scaleCenter && this.m_ViewHeight < this.m_MaxViewHeight) { - this.m_Target.sub(scaleCenter); - this.m_Target.multiplyScalar(scale); - this.m_Target.add(scaleCenter); - } - } - else if (this.Camera instanceof THREE.PerspectiveCamera) { - var add = scale > 1 ? 1 : -1; - add *= this.Camera.position.distanceTo(this.m_Target) / 10; - this.m_Target.add(this.m_Direction.clone().multiplyScalar(-add)); - } - this.Update(); - }; - CameraUpdate.prototype.ZoomExtensBox3 = function (box3) { - if (!box3 || box3.isEmpty()) - return; - this.Camera.updateMatrixWorld(false); - //变换到相机坐标系 - box3.applyMatrix4(this.Camera.matrixWorldInverse); - // - box3.getCenter(this.m_Target); - //世界坐标系 - this.m_Target.applyMatrix4(this.Camera.matrix); - //size - var size = box3.getSize(new three_1.Vector3()); - //宽高比 - var aspectRatio = size.x / size.y; - var viewAspectRatio = this.Aspect; - // - if (aspectRatio > viewAspectRatio) { - this.m_ViewHeight = size.x / viewAspectRatio; - } - else { - this.m_ViewHeight = size.y; - } - this.Update(); - }; - CameraUpdate.prototype.LookAt = function (dir) { - this.m_Orbit.UpdateRoValue(dir); - this.m_Direction.copy(dir); - this.UpdateUp(); - this.Update(); - }; - CameraUpdate.prototype.UpdateUp = function () { - Orbit_1.Orbit.ComputUpDirection(this.m_Direction, this.Camera.up); - }; - /** - * 根据视口大小,设置相机视口范围. - * - * @returns - * @memberof CameraControl - */ - CameraUpdate.prototype.Update = function () { - this.Camera.position.copy(this.m_Target); - if (this.Camera instanceof THREE.OrthographicCamera) { - this.Camera.left = this.Aspect * this.m_ViewHeight / -2; - this.Camera.right = this.Aspect * this.m_ViewHeight / 2; - this.Camera.bottom = this.m_ViewHeight / -2; - this.Camera.top = this.m_ViewHeight / 2; - this.Camera.position.sub(this.m_Direction); - } - else if (this.Camera instanceof THREE.PerspectiveCamera) { - this.Camera.aspect = this.Aspect; - var distens = (this.m_ViewHeight / 2) / (Math.tan(THREE.Math.degToRad(this.Camera.fov) / 2)); - this.Camera.position.sub(this.m_Direction.clone().multiplyScalar(distens)); - } - else { - return; - } - this.Camera.lookAt(this.m_Target); - this.Camera.updateProjectionMatrix(); - this.Camera.updateMatrixWorld(false); - }; - CameraUpdate.prototype.SwitchCamera = function () { - if (this.Camera instanceof THREE.OrthographicCamera) { - this.m_CurCamera = this.m_CameraArray.get(THREE.PerspectiveCamera); - } - else { - this.m_CurCamera = this.m_CameraArray.get(THREE.OrthographicCamera); - } - this.UpdateUp(); - this.Update(); - }; - return CameraUpdate; -}()); -exports.CameraUpdate = CameraUpdate; -//# sourceMappingURL=CameraUpdate.js.map \ No newline at end of file diff --git a/dist/CameraUpdate.js.map b/dist/CameraUpdate.js.map deleted file mode 100644 index 2bc499a..0000000 --- a/dist/CameraUpdate.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"CameraUpdate.js","sourceRoot":"","sources":["../src/CameraUpdate.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/ColorPalette.d.ts b/dist/ColorPalette.d.ts deleted file mode 100644 index f7a1136..0000000 --- a/dist/ColorPalette.d.ts +++ /dev/null @@ -1,7 +0,0 @@ -import * as THREE from 'three'; -export declare class ColorMaterial { - private constructor(); - private static m_LineMaterialMap; - static GetLineMaterial(index: any): THREE.LineBasicMaterial; - static GetColor(index: number): THREE.Color; -} diff --git a/dist/ColorPalette.js b/dist/ColorPalette.js deleted file mode 100644 index 929fa62..0000000 --- a/dist/ColorPalette.js +++ /dev/null @@ -1,35 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -var THREE = require("three"); -var ColorPalette = [ - [255, 0, 0, 255], - //[255, 255, 255, 255],//----- 0 - ByBlock - White - [255, 0, 0, 255], - // [255, 0, 0, 255], //----- 1 - Red - [255, 255, 0, 255], - [0, 255, 0, 255], - [0, 255, 255, 255], - [0, 0, 255, 255], - [255, 0, 255, 255], -]; -//颜色材质,对于二维图像来说可能有用,应该不对三维对象使用该材质 -var ColorMaterial = /** @class */ (function () { - function ColorMaterial() { - } - ColorMaterial.GetLineMaterial = function (index) { - if (this.m_LineMaterialMap.has(index)) - return this.m_LineMaterialMap.get(index); - var mat = new THREE.LineBasicMaterial({ color: this.GetColor(index) }); - this.m_LineMaterialMap.set(index, mat); - return mat; - }; - ColorMaterial.GetColor = function (index) { - var rgb = ColorPalette[index]; - if (rgb) - return new THREE.Color(rgb[0] / 255, rgb[1] / 255, rgb[2] / 255); - }; - ColorMaterial.m_LineMaterialMap = new Map(); - return ColorMaterial; -}()); -exports.ColorMaterial = ColorMaterial; -//# sourceMappingURL=ColorPalette.js.map \ No newline at end of file diff --git a/dist/ColorPalette.js.map b/dist/ColorPalette.js.map deleted file mode 100644 index f0db785..0000000 --- a/dist/ColorPalette.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"ColorPalette.js","sourceRoot":"","sources":["../src/ColorPalette.ts"],"names":[],"mappings":";;AAAA,6BAA+B;AAC/B,IAAM,YAAY,GAAG;IACjB,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC;IAChB,kDAAkD;IAClD,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC;IAChB,uCAAuC;IACvC,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,CAAC;IAClB,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,CAAC;IAChB,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;IAClB,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC;IAChB,CAAC,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC;CA8PrB,CAAC;AAGF,iCAAiC;AACjC;IAEI;IAAwB,CAAC;IAElB,6BAAe,GAAtB,UAAuB,KAAK;QAExB,IAAI,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,KAAK,CAAC;YACjC,OAAO,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAC7C,IAAI,GAAG,GAAG,IAAI,KAAK,CAAC,iBAAiB,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACvE,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QACvC,OAAO,GAAG,CAAC;IACf,CAAC;IAEM,sBAAQ,GAAf,UAAgB,KAAa;QAEzB,IAAI,GAAG,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;QAC9B,IAAI,GAAG;YACH,OAAO,IAAI,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC;IACzE,CAAC;IAfc,+BAAiB,GAAG,IAAI,GAAG,EAAmC,CAAC;IAgBlF,oBAAC;CAAA,AAnBD,IAmBC;AAnBY,sCAAa"} \ No newline at end of file diff --git a/dist/Dimension.d.ts b/dist/Dimension.d.ts deleted file mode 100644 index 1e282f9..0000000 --- a/dist/Dimension.d.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { Group } from "three"; -/** - * 标注实体 - * - * @export - * @class Dimension - * @extends {Group} - */ -export declare class Dimension extends Group { - constructor(length: number, textHeight?: number, mirror?: boolean, mirrorFoot?: boolean); -} diff --git a/dist/Dimension.js b/dist/Dimension.js deleted file mode 100644 index 725d39d..0000000 --- a/dist/Dimension.js +++ /dev/null @@ -1,62 +0,0 @@ -"use strict"; -var __extends = (this && this.__extends) || (function () { - var extendStatics = Object.setPrototypeOf || - ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || - function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; }; - return function (d, b) { - extendStatics(d, b); - function __() { this.constructor = d; } - d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); - }; -})(); -Object.defineProperty(exports, "__esModule", { value: true }); -var three_1 = require("three"); -var ColorPalette_1 = require("./ColorPalette"); -var Text_1 = require("./Text"); -var GeUtils_1 = require("./GeUtils"); -/** - * 标注实体 - * - * @export - * @class Dimension - * @extends {Group} - */ -var Dimension = /** @class */ (function (_super) { - __extends(Dimension, _super); - function Dimension(length, textHeight, mirror, mirrorFoot) { - if (textHeight === void 0) { textHeight = 25; } - if (mirror === void 0) { mirror = false; } - if (mirrorFoot === void 0) { mirrorFoot = false; } - var _this = _super.call(this) || this; - var footLength = 60; - if (mirrorFoot) { - footLength = -footLength; - } - //针脚几何体 - var lineGeo = new three_1.Geometry(); - lineGeo.vertices.push(new three_1.Vector3(), new three_1.Vector3(0, footLength, 0)); - //托盘几何体 - var lineGeo2 = new three_1.Geometry(); - lineGeo2.vertices.push(new three_1.Vector3(0, footLength), new three_1.Vector3(length, footLength, 0)); - var material = ColorPalette_1.ColorMaterial.GetLineMaterial(5); - var line1 = new three_1.Line(lineGeo, material); - var line2 = new three_1.Line(lineGeo, material); - line2.position.x = length; - var line3 = new three_1.Line(lineGeo2, material); - var text = new Text_1.DbText(parseFloat(length.toFixed(2)).toString(), textHeight); - if (mirror) { - var roMat = new three_1.Matrix4().makeRotationZ(Math.PI); - text.applyMatrix(roMat); - text.applyMatrix(GeUtils_1.MoveMatrix(new three_1.Vector3(length * 0.5, footLength - textHeight * 0.1))); - } - else { - text.applyMatrix(GeUtils_1.MoveMatrix(new three_1.Vector3(length * 0.5, footLength * 1.1))); - } - _this.add(text); - _this.add(line1, line2, line3); - return _this; - } - return Dimension; -}(three_1.Group)); -exports.Dimension = Dimension; -//# sourceMappingURL=Dimension.js.map \ No newline at end of file diff --git a/dist/Dimension.js.map b/dist/Dimension.js.map deleted file mode 100644 index e36d55e..0000000 --- a/dist/Dimension.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"Dimension.js","sourceRoot":"","sources":["../src/Dimension.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+BAAgE;AAChE,+CAA+C;AAC/C,+BAAgC;AAChC,qCAAuC;AAEvC;;;;;;GAMG;AACH;IAA+B,6BAAK;IAGhC,mBAAY,MAAc,EAAE,UAAuB,EAAE,MAAuB,EAAE,UAA2B;QAA7E,2BAAA,EAAA,eAAuB;QAAE,uBAAA,EAAA,cAAuB;QAAE,2BAAA,EAAA,kBAA2B;QAAzG,YAEI,iBAAO,SAuCV;QAtCG,IAAI,UAAU,GAAG,EAAE,CAAC;QACpB,IAAI,UAAU,EACd;YACI,UAAU,GAAG,CAAC,UAAU,CAAC;SAC5B;QAED,OAAO;QACP,IAAI,OAAO,GAAG,IAAI,gBAAQ,EAAE,CAAC;QAC7B,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,eAAO,EAAE,EAAE,IAAI,eAAO,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC;QAEpE,OAAO;QACP,IAAI,QAAQ,GAAG,IAAI,gBAAQ,EAAE,CAAC;QAC9B,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,eAAO,CAAC,CAAC,EAAE,UAAU,CAAC,EAAE,IAAI,eAAO,CAAC,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC;QAEvF,IAAI,QAAQ,GAAG,4BAAa,CAAC,eAAe,CAAC,CAAC,CAAC,CAAA;QAE/C,IAAI,KAAK,GAAG,IAAI,YAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QACxC,IAAI,KAAK,GAAG,IAAI,YAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QACxC,KAAK,CAAC,QAAQ,CAAC,CAAC,GAAG,MAAM,CAAC;QAE1B,IAAI,KAAK,GAAG,IAAI,YAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAEzC,IAAI,IAAI,GAAG,IAAI,aAAM,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,EAAE,UAAU,CAAC,CAAC;QAC5E,IAAI,MAAM,EACV;YACI,IAAI,KAAK,GAAG,IAAI,eAAO,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACjD,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;YACxB,IAAI,CAAC,WAAW,CAAC,oBAAU,CAAC,IAAI,eAAO,CAAC,MAAM,GAAG,GAAG,EAAE,UAAU,GAAG,UAAU,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;SAC1F;aAED;YACI,IAAI,CAAC,WAAW,CAAC,oBAAU,CAAC,IAAI,eAAO,CAAC,MAAM,GAAG,GAAG,EAAE,UAAU,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;SAC7E;QAGD,KAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAEf,KAAI,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;;IAClC,CAAC;IACL,gBAAC;AAAD,CAAC,AA7CD,CAA+B,aAAK,GA6CnC;AA7CY,8BAAS"} \ No newline at end of file diff --git a/dist/DrawDimension.d.ts b/dist/DrawDimension.d.ts deleted file mode 100644 index 485a664..0000000 --- a/dist/DrawDimension.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { Mesh } from "three"; -import { Dimension } from "."; -/** - * 绘制标注实体 - * - * @export - * @param {Box3} box - * @returns 标注实体列表 - */ -export declare function DrawDimension(brList: Mesh[]): Dimension[]; diff --git a/dist/DrawDimension.js b/dist/DrawDimension.js deleted file mode 100644 index 40bc624..0000000 --- a/dist/DrawDimension.js +++ /dev/null @@ -1,32 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -var three_1 = require("three"); -var _1 = require("."); -/** - * 绘制标注实体 - * - * @export - * @param {Box3} box - * @returns 标注实体列表 - */ -function DrawDimension(brList) { - var box = _1.GetBoxArr(brList); - var size = box.getSize(new three_1.Vector3()); - var mat4 = new three_1.Matrix4(); - mat4.makeBasis(new three_1.Vector3(-1, 0, 0), new three_1.Vector3(0, -1, 0), new three_1.Vector3(0, 0, 1)); - mat4.setPosition(box.min.clone().add(new three_1.Vector3(size.x, -30))); - var textHeight = 45; - var dimx = new _1.Dimension(size.x, textHeight, true); - dimx.applyMatrix(mat4); - var dimz = new _1.Dimension(size.z, textHeight); - mat4.makeBasis(new three_1.Vector3(0, 0, -1), new three_1.Vector3(1, 0, 0), new three_1.Vector3(0, -1, 0)); - mat4.setPosition(box.max.clone().add(new three_1.Vector3(30, -size.y))); - dimz.applyMatrix(mat4); - var dimy = new _1.Dimension(size.y, textHeight, true, true); - mat4.makeBasis(new three_1.Vector3(0, 1, 0), new three_1.Vector3(-1, 0, 0), new three_1.Vector3(0, 0, 1)); - mat4.setPosition(box.max.clone().add(new three_1.Vector3(30, -size.y))); - dimy.applyMatrix(mat4); - return [dimx, dimy, dimz]; -} -exports.DrawDimension = DrawDimension; -//# sourceMappingURL=DrawDimension.js.map \ No newline at end of file diff --git a/dist/DrawDimension.js.map b/dist/DrawDimension.js.map deleted file mode 100644 index 3aac962..0000000 --- a/dist/DrawDimension.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"DrawDimension.js","sourceRoot":"","sources":["../src/DrawDimension.ts"],"names":[],"mappings":";;AAAA,+BAAqD;AACrD,sBAAyC;AAGzC;;;;;;GAMG;AACH,uBAA8B,MAAc;IAExC,IAAI,GAAG,GAAG,YAAS,CAAC,MAAM,CAAC,CAAC;IAC5B,IAAI,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,eAAO,EAAE,CAAC,CAAC;IAEtC,IAAI,IAAI,GAAG,IAAI,eAAO,EAAE,CAAC;IACzB,IAAI,CAAC,SAAS,CACV,IAAI,eAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EACrB,IAAI,eAAO,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EACrB,IAAI,eAAO,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CACvB,CAAA;IACD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,IAAI,eAAO,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAEhE,IAAI,UAAU,GAAG,EAAE,CAAC;IACpB,IAAI,IAAI,GAAG,IAAI,YAAS,CAAC,IAAI,CAAC,CAAC,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;IACnD,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IAEvB,IAAI,IAAI,GAAG,IAAI,YAAS,CAAC,IAAI,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC;IAC7C,IAAI,CAAC,SAAS,CACV,IAAI,eAAO,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EACrB,IAAI,eAAO,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EACpB,IAAI,eAAO,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CACxB,CAAA;IACD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,IAAI,eAAO,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAChE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IAEvB,IAAI,IAAI,GAAG,IAAI,YAAS,CAAC,IAAI,CAAC,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IACzD,IAAI,CAAC,SAAS,CACV,IAAI,eAAO,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EACpB,IAAI,eAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EACrB,IAAI,eAAO,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CACvB,CAAA;IACD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,IAAI,eAAO,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAChE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IAGvB,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AAC9B,CAAC;AArCD,sCAqCC"} \ No newline at end of file diff --git a/dist/GeUtils.d.ts b/dist/GeUtils.d.ts deleted file mode 100644 index df1f68e..0000000 --- a/dist/GeUtils.d.ts +++ /dev/null @@ -1,66 +0,0 @@ -import * as THREE from 'three'; -import { Geometry, Vector, Vector2, Vector3 } from 'three'; -export declare const cZeroVec: THREE.Vector3; -export declare const cXAxis: THREE.Vector3; -export declare const cYAxis: THREE.Vector3; -export declare const cZAxis: THREE.Vector3; -/** - * 旋转一个点,旋转中心在原点 - * - * @export - * @param {Vector3} pt 点 - * @param {number} ang 角度. - * @returns {Vector3} 返回pt不拷贝. - */ -export declare function rotatePoint(pt: Vector3, ang: number): Vector3; -export declare function equaln(v1: number, v2: number, fuzz?: number): boolean; -export declare function equal(v1: T, v2: T): boolean; -export declare function fixAngle(an: number, fixAngle: number, fuzz?: number): number; -/** - * 按照极坐标的方式移动一个点 - * - * @export - * @template - * @param {T} v 向量(2d,3d) - * @param {number} an 角度 - * @param {number} dis 距离 - * @returns {T} - */ -export declare function polar(v: T, an: number, dis: number): T; -export declare function angle(v: Vector3 | Vector2): number; -/** - * 求两个向量的夹角,顺时针为负,逆时针为正 - * - * @param {THREE.Vector3} v1 - * @param {THREE.Vector3} v2 - * @param {THREE.Vector3} [ref] 参考向量,如果为世界坐标系则为0,0,1 - * @returns - */ -export declare function angleTo(v1: THREE.Vector3, v2: THREE.Vector3, ref?: THREE.Vector3): number; -export declare function getLoocAtUpVec(dir: THREE.Vector3): THREE.Vector3; -export declare function createLookAtMat4(dir: THREE.Vector3): THREE.Matrix4; -export declare function isParallelTo(v1: THREE.Vector3, v2: THREE.Vector3): boolean; -export declare function ptToString(v: THREE.Vector3, fractionDigits?: number): string; -export declare function midPoint(v1: THREE.Vector3, v2: THREE.Vector3): THREE.Vector3; -export declare function midPoint2(v1: THREE.Vector2, v2: THREE.Vector2): THREE.Vector2; -export declare function midPtCir(v1: THREE.Vector3, v2: THREE.Vector3): THREE.Vector3; -export declare function GetBox(obj: THREE.Object3D, updateMatrix?: boolean): THREE.Box3; -export declare function GetBoxArr(arr: Array): THREE.Box3; -export declare function MoveMatrix(v: THREE.Vector3): THREE.Matrix4; -export declare function getProjectDist(v1: Vector3, v2: Vector3): { - h: number; - v: number; -}; -export declare function getPtPostion(sp: Vector3, ep: Vector3, c: Vector3, inPt: Vector3): { - sp: THREE.Vector3; - ep: THREE.Vector3; -}; -export declare function angleAndX(v: Vector3 | Vector2): number; -/** - * 将角度调整为0-2pi之间 - * - * @export - * @param {number} an - */ -export declare function angleTo2Pi(an: number): number; -export declare function updateGeometry(l: THREE.Line | THREE.Mesh, geometry: Geometry): void; diff --git a/dist/GeUtils.js b/dist/GeUtils.js deleted file mode 100644 index 82028ae..0000000 --- a/dist/GeUtils.js +++ /dev/null @@ -1,262 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -var THREE = require("three"); -var three_1 = require("three"); -var Matrix2_1 = require("./Matrix2"); -exports.cZeroVec = new THREE.Vector3(); -exports.cXAxis = new THREE.Vector3(1, 0, 0); -exports.cYAxis = new THREE.Vector3(0, 1, 0); -exports.cZAxis = new THREE.Vector3(0, 0, 1); -/** - * 旋转一个点,旋转中心在原点 - * - * @export - * @param {Vector3} pt 点 - * @param {number} ang 角度. - * @returns {Vector3} 返回pt不拷贝. - */ -function rotatePoint(pt, ang) { - new Matrix2_1.Matrix2().setRotate(ang).applyVector(pt); - return pt; -} -exports.rotatePoint = rotatePoint; -function equaln(v1, v2, fuzz) { - if (fuzz === void 0) { fuzz = 1e-3; } - return Math.abs(v1 - v2) < fuzz; -} -exports.equaln = equaln; -function equal(v1, v2) { - return v1.distanceToSquared(v2) < 1e-8; -} -exports.equal = equal; -function fixAngle(an, fixAngle, fuzz) { - if (fuzz === void 0) { fuzz = 0.1; } - if (an < 0) - an += Math.PI * 2; - an += fuzz; - var rem = an % fixAngle; - if (rem < fuzz * 2) { - an -= rem; - } - else { - an -= fuzz; - } - return an; -} -exports.fixAngle = fixAngle; -/** - * 按照极坐标的方式移动一个点 - * - * @export - * @template - * @param {T} v 向量(2d,3d) - * @param {number} an 角度 - * @param {number} dis 距离 - * @returns {T} - */ -function polar(v, an, dis) { - v.x += Math.cos(an) * dis; - v.y += Math.sin(an) * dis; - return v; -} -exports.polar = polar; -function angle(v) { - if (equaln(v.y, 0) && v.x > 0) - return 0; - var angle = Math.atan2(v.y, v.x); - if (angle < 0) - angle += Math.PI * 2; - return angle; -} -exports.angle = angle; -/** - * 求两个向量的夹角,顺时针为负,逆时针为正 - * - * @param {THREE.Vector3} v1 - * @param {THREE.Vector3} v2 - * @param {THREE.Vector3} [ref] 参考向量,如果为世界坐标系则为0,0,1 - * @returns - */ -function angleTo(v1, v2, ref) { - if (ref === void 0) { ref = new THREE.Vector3(0, 0, 1); } - if (!ref.equals(new three_1.Vector3(0, 0, 1))) { - //任意轴坐标系. 使用相机的构造矩阵. - ref.multiplyScalar(-1); - var up = getLoocAtUpVec(ref); - var refOcs = new THREE.Matrix4(); - refOcs.lookAt(exports.cZeroVec, ref, up); - var refOcsInv = new THREE.Matrix4().getInverse(refOcs); - v1.applyMatrix4(refOcsInv); - v2.applyMatrix4(refOcsInv); - v1.z = 0; - v2.z = 0; - } - if (v1.equals(exports.cZeroVec) || v2.equals(exports.cZeroVec)) - return 0; - var cv = new three_1.Vector3().crossVectors(v1, v2).normalize(); - return cv.z === 0 ? v1.angleTo(v2) : v1.angleTo(v2) * cv.z; -} -exports.angleTo = angleTo; -function getLoocAtUpVec(dir) { - if (dir.equals(exports.cZeroVec)) { - throw ("zero vector"); - } - var norm = dir.clone().normalize(); - if (norm.equals(exports.cZAxis)) { - return new THREE.Vector3(0, 1, 0); - } - else if (norm.equals(exports.cZAxis.clone().negate())) { - return new THREE.Vector3(0, -1, 0); - } - else { - var xv = new THREE.Vector3(); - xv.crossVectors(exports.cZAxis, norm); - var up = new THREE.Vector3(); - up.crossVectors(norm, xv); - return up; - } -} -exports.getLoocAtUpVec = getLoocAtUpVec; -function createLookAtMat4(dir) { - var up = getLoocAtUpVec(dir); - var mat = new THREE.Matrix4(); - mat.lookAt(exports.cZeroVec, dir, up); - return mat; -} -exports.createLookAtMat4 = createLookAtMat4; -function isParallelTo(v1, v2) { - return v1.clone().cross(v2).lengthSq() < 1e-9; -} -exports.isParallelTo = isParallelTo; -function ptToString(v, fractionDigits) { - if (fractionDigits === void 0) { fractionDigits = 3; } - return v.toArray().map(function (o) { - return o.toFixed(fractionDigits); - }).join(","); -} -exports.ptToString = ptToString; -function midPoint(v1, v2) { - return v1.clone().add(v2).multiplyScalar(0.5); -} -exports.midPoint = midPoint; -function midPoint2(v1, v2) { - return v1.clone().add(v2).multiplyScalar(0.5); -} -exports.midPoint2 = midPoint2; -function midPtCir(v1, v2) { - var baseline = new three_1.Vector3(1, 0, 0); - var outLine = v2.clone().sub(v1); - var ang = angleTo(baseline, outLine) / 2; - var midLine = rotatePoint(outLine, -ang); - return v1.clone().add(midLine); -} -exports.midPtCir = midPtCir; -function GetBox(obj, updateMatrix) { - if (updateMatrix) - obj.updateMatrixWorld(false); - if (obj.hasOwnProperty("geometry")) { - var geo = obj["geometry"]; - if (geo instanceof THREE.Geometry || geo instanceof THREE.BufferGeometry) { - if (!geo.boundingBox) - geo.computeBoundingBox(); - return geo.boundingBox.clone().applyMatrix4(obj.matrixWorld); - } - } - else if (obj.children.length > 0) { - var box = obj.children.reduce(function (sumBox, itemObj) { - var itemBox = GetBox(itemObj); - if (itemBox) - sumBox.union(itemBox); - return sumBox; - }, new THREE.Box3()); - // if (box) box.applyMatrix4(obj.matrixWorld); - return box; - } - else - return null; -} -exports.GetBox = GetBox; -function GetBoxArr(arr) { - if (arr.length == 0) { - return null; - } - return arr.map(function (o) { - return GetBox(o); - }).filter(function (o) { - return o; - }).reduce(function (sumBox, objBox) { - return sumBox.union(objBox); - }, new THREE.Box3()); -} -exports.GetBoxArr = GetBoxArr; -function MoveMatrix(v) { - var mat = new THREE.Matrix4(); - mat.makeTranslation(v.x, v.y, v.z); - return mat; -} -exports.MoveMatrix = MoveMatrix; -function getProjectDist(v1, v2) { - var ang = v1.angleTo(v2); - var dist = v1.length(); - return { - h: dist * Math.cos(ang), - v: dist * Math.sin(ang) - }; -} -exports.getProjectDist = getProjectDist; -//获得输入点在2线组成的4个区间的位置 -function getPtPostion(sp, ep, c, inPt) { - var l1 = sp.clone().sub(c); - var l2 = ep.clone().sub(c); - var l3 = l1.clone().negate(); - var l4 = l2.clone().negate(); - var inputLine = inPt.clone().sub(c); - var ang1 = angleTo(l1, l2); - var ang2 = Math.PI; - var ang3 = ang2 + Math.abs(ang1); - var inputAng = angleTo(l1, inputLine); - if (ang1 * inputAng < 0) { - inputAng = (Math.PI * 2 - Math.abs(inputAng)); - } - ang1 = Math.abs(ang1); - inputAng = Math.abs(inputAng); - if (inputAng <= ang1) { - return { sp: sp, ep: ep }; - } - else if (inputAng > ang1 && inputAng <= ang2) { - return { sp: c.clone().add(l3), ep: ep }; - } - else if (inputAng > ang2 && inputAng <= ang3) { - return { sp: c.clone().add(l3), ep: c.clone().add(l4) }; - } - else { - return { sp: sp, ep: c.clone().add(l4) }; - } -} -exports.getPtPostion = getPtPostion; -function angleAndX(v) { - return v.x ? Math.atan(v.y / v.x) : Math.PI / 2; -} -exports.angleAndX = angleAndX; -/** - * 将角度调整为0-2pi之间 - * - * @export - * @param {number} an - */ -function angleTo2Pi(an) { - an = an % (Math.PI * 2); - if (an < 0) - an += Math.PI * 2; - return an; -} -exports.angleTo2Pi = angleTo2Pi; -function updateGeometry(l, geometry) { - var geo = l.geometry; - geo.dispose(); - l.geometry = geometry; - geometry.verticesNeedUpdate = true; - geometry.computeBoundingSphere(); -} -exports.updateGeometry = updateGeometry; -//# sourceMappingURL=GeUtils.js.map \ No newline at end of file diff --git a/dist/GeUtils.js.map b/dist/GeUtils.js.map deleted file mode 100644 index 91c58f2..0000000 --- a/dist/GeUtils.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"GeUtils.js","sourceRoot":"","sources":["../src/GeUtils.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/KeyEnum.d.ts b/dist/KeyEnum.d.ts deleted file mode 100644 index 61fac59..0000000 --- a/dist/KeyEnum.d.ts +++ /dev/null @@ -1,149 +0,0 @@ -export declare enum MouseKey { - Left = 0, - Middle = 1, - Right = 2, -} -export declare enum KeyBoard { - Digit1 = 49, - Digit2 = 50, - Digit3 = 51, - Digit4 = 52, - Digit5 = 53, - Digit6 = 54, - Digit7 = 55, - Digit8 = 56, - Digit9 = 57, - Digit0 = 58, - KeyA = 65, - KeyB = 66, - KeyC = 67, - KeyD = 68, - KeyE = 69, - KeyF = 70, - KeyG = 71, - KeyH = 72, - KeyI = 73, - KeyJ = 74, - KeyK = 75, - KeyL = 76, - KeyM = 77, - KeyN = 78, - KeyO = 79, - KeyP = 80, - KeyQ = 81, - KeyR = 82, - KeyS = 83, - KeyT = 84, - KeyU = 85, - KeyV = 86, - KeyW = 87, - KeyX = 88, - KeyY = 89, - KeyZ = 90, - /** - * 逗号 - */ - Comma = 188, - CommaChrome = 229, - /** - * 句号 - */ - Period = 190, - /** - * 分号 - */ - Semicolon = 186, - /** - * 引号 - */ - Quote = 222, - /** - * 左括号 - */ - BracketLeft = 219, - /** - * 右括号 - */ - BracketRight = 220, - /** - * 反引号 - */ - Backquote = 192, - /** - * 反斜杠 - */ - Backslash = 220, - /** - * 减号 - */ - Minus = 189, - /** - * 等号 - */ - Equal = 187, - IntlRo = 193, - IntlYen = 255, - Alt = 18, - /** - * 大写锁定 - */ - CapsLock = 20, - Control = 17, - /** - * win左键 - */ - OSLeft = 91, - /** - * win右键 - */ - OSRight = 92, - Shift = 16, - ContextMenu = 93, - Enter = 13, - Space = 32, - Backspace = 8, - Tab = 9, - Delete = 46, - End = 35, - Home = 36, - Insert = 45, - PageDown = 34, - PageUp = 33, - ArrowDown = 40, - ArrowLeft = 37, - ArrowRight = 39, - ArrowUp = 38, - Escape = 27, - PrintScreen = 44, - ScrollLock = 145, - Pause = 19, - F1 = 112, - F2 = 113, - F3 = 114, - F5 = 116, - F6 = 117, - F7 = 118, - F8 = 119, - F9 = 120, - F10 = 121, - F11 = 122, - F12 = 123, - NumLock = 114, - Numpad0 = 96, - Numpad1 = 97, - Numpad2 = 98, - Numpad3 = 99, - Numpad4 = 100, - Numpad5 = 101, - Numpad6 = 102, - Numpad7 = 103, - Numpad8 = 104, - Numpad9 = 105, - NumpadAdd = 107, - NumpadDivide = 111, - NumpadEqual = 12, - NumpadMultiply = 106, - NumpadSubtract = 109, - NumpadDot = 110, - NumpadDot1 = 190, -} diff --git a/dist/KeyEnum.js b/dist/KeyEnum.js deleted file mode 100644 index 2141ed1..0000000 --- a/dist/KeyEnum.js +++ /dev/null @@ -1,161 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -//鼠标类型 -var MouseKey; -(function (MouseKey) { - MouseKey[MouseKey["Left"] = 0] = "Left"; - MouseKey[MouseKey["Middle"] = 1] = "Middle"; - MouseKey[MouseKey["Right"] = 2] = "Right"; -})(MouseKey = exports.MouseKey || (exports.MouseKey = {})); -var KeyBoard; -(function (KeyBoard) { - // 数字 - KeyBoard[KeyBoard["Digit1"] = 49] = "Digit1"; - KeyBoard[KeyBoard["Digit2"] = 50] = "Digit2"; - KeyBoard[KeyBoard["Digit3"] = 51] = "Digit3"; - KeyBoard[KeyBoard["Digit4"] = 52] = "Digit4"; - KeyBoard[KeyBoard["Digit5"] = 53] = "Digit5"; - KeyBoard[KeyBoard["Digit6"] = 54] = "Digit6"; - KeyBoard[KeyBoard["Digit7"] = 55] = "Digit7"; - KeyBoard[KeyBoard["Digit8"] = 56] = "Digit8"; - KeyBoard[KeyBoard["Digit9"] = 57] = "Digit9"; - KeyBoard[KeyBoard["Digit0"] = 58] = "Digit0"; - // 字母 - KeyBoard[KeyBoard["KeyA"] = 65] = "KeyA"; - KeyBoard[KeyBoard["KeyB"] = 66] = "KeyB"; - KeyBoard[KeyBoard["KeyC"] = 67] = "KeyC"; - KeyBoard[KeyBoard["KeyD"] = 68] = "KeyD"; - KeyBoard[KeyBoard["KeyE"] = 69] = "KeyE"; - KeyBoard[KeyBoard["KeyF"] = 70] = "KeyF"; - KeyBoard[KeyBoard["KeyG"] = 71] = "KeyG"; - KeyBoard[KeyBoard["KeyH"] = 72] = "KeyH"; - KeyBoard[KeyBoard["KeyI"] = 73] = "KeyI"; - KeyBoard[KeyBoard["KeyJ"] = 74] = "KeyJ"; - KeyBoard[KeyBoard["KeyK"] = 75] = "KeyK"; - KeyBoard[KeyBoard["KeyL"] = 76] = "KeyL"; - KeyBoard[KeyBoard["KeyM"] = 77] = "KeyM"; - KeyBoard[KeyBoard["KeyN"] = 78] = "KeyN"; - KeyBoard[KeyBoard["KeyO"] = 79] = "KeyO"; - KeyBoard[KeyBoard["KeyP"] = 80] = "KeyP"; - KeyBoard[KeyBoard["KeyQ"] = 81] = "KeyQ"; - KeyBoard[KeyBoard["KeyR"] = 82] = "KeyR"; - KeyBoard[KeyBoard["KeyS"] = 83] = "KeyS"; - KeyBoard[KeyBoard["KeyT"] = 84] = "KeyT"; - KeyBoard[KeyBoard["KeyU"] = 85] = "KeyU"; - KeyBoard[KeyBoard["KeyV"] = 86] = "KeyV"; - KeyBoard[KeyBoard["KeyW"] = 87] = "KeyW"; - KeyBoard[KeyBoard["KeyX"] = 88] = "KeyX"; - KeyBoard[KeyBoard["KeyY"] = 89] = "KeyY"; - KeyBoard[KeyBoard["KeyZ"] = 90] = "KeyZ"; - // 符号 - /** - * 逗号 - */ - KeyBoard[KeyBoard["Comma"] = 188] = "Comma"; - KeyBoard[KeyBoard["CommaChrome"] = 229] = "CommaChrome"; - /** - * 句号 - */ - KeyBoard[KeyBoard["Period"] = 190] = "Period"; - /** - * 分号 - */ - KeyBoard[KeyBoard["Semicolon"] = 186] = "Semicolon"; - /** - * 引号 - */ - KeyBoard[KeyBoard["Quote"] = 222] = "Quote"; - /** - * 左括号 - */ - KeyBoard[KeyBoard["BracketLeft"] = 219] = "BracketLeft"; - /** - * 右括号 - */ - KeyBoard[KeyBoard["BracketRight"] = 220] = "BracketRight"; - /** - * 反引号 - */ - KeyBoard[KeyBoard["Backquote"] = 192] = "Backquote"; - /** - * 反斜杠 - */ - KeyBoard[KeyBoard["Backslash"] = 220] = "Backslash"; - /** - * 减号 - */ - KeyBoard[KeyBoard["Minus"] = 189] = "Minus"; - /** - * 等号 - */ - KeyBoard[KeyBoard["Equal"] = 187] = "Equal"; - KeyBoard[KeyBoard["IntlRo"] = 193] = "IntlRo"; - KeyBoard[KeyBoard["IntlYen"] = 255] = "IntlYen"; - // 功能键 - KeyBoard[KeyBoard["Alt"] = 18] = "Alt"; - /** - * 大写锁定 - */ - KeyBoard[KeyBoard["CapsLock"] = 20] = "CapsLock"; - KeyBoard[KeyBoard["Control"] = 17] = "Control"; - /** - * win左键 - */ - KeyBoard[KeyBoard["OSLeft"] = 91] = "OSLeft"; - /** - * win右键 - */ - KeyBoard[KeyBoard["OSRight"] = 92] = "OSRight"; - KeyBoard[KeyBoard["Shift"] = 16] = "Shift"; - KeyBoard[KeyBoard["ContextMenu"] = 93] = "ContextMenu"; - KeyBoard[KeyBoard["Enter"] = 13] = "Enter"; - KeyBoard[KeyBoard["Space"] = 32] = "Space"; - KeyBoard[KeyBoard["Backspace"] = 8] = "Backspace"; - KeyBoard[KeyBoard["Tab"] = 9] = "Tab"; - KeyBoard[KeyBoard["Delete"] = 46] = "Delete"; - KeyBoard[KeyBoard["End"] = 35] = "End"; - KeyBoard[KeyBoard["Home"] = 36] = "Home"; - KeyBoard[KeyBoard["Insert"] = 45] = "Insert"; - KeyBoard[KeyBoard["PageDown"] = 34] = "PageDown"; - KeyBoard[KeyBoard["PageUp"] = 33] = "PageUp"; - KeyBoard[KeyBoard["ArrowDown"] = 40] = "ArrowDown"; - KeyBoard[KeyBoard["ArrowLeft"] = 37] = "ArrowLeft"; - KeyBoard[KeyBoard["ArrowRight"] = 39] = "ArrowRight"; - KeyBoard[KeyBoard["ArrowUp"] = 38] = "ArrowUp"; - KeyBoard[KeyBoard["Escape"] = 27] = "Escape"; - KeyBoard[KeyBoard["PrintScreen"] = 44] = "PrintScreen"; - KeyBoard[KeyBoard["ScrollLock"] = 145] = "ScrollLock"; - KeyBoard[KeyBoard["Pause"] = 19] = "Pause"; - // F数字 - KeyBoard[KeyBoard["F1"] = 112] = "F1"; - KeyBoard[KeyBoard["F2"] = 113] = "F2"; - KeyBoard[KeyBoard["F3"] = 114] = "F3"; - KeyBoard[KeyBoard["F5"] = 116] = "F5"; - KeyBoard[KeyBoard["F6"] = 117] = "F6"; - KeyBoard[KeyBoard["F7"] = 118] = "F7"; - KeyBoard[KeyBoard["F8"] = 119] = "F8"; - KeyBoard[KeyBoard["F9"] = 120] = "F9"; - KeyBoard[KeyBoard["F10"] = 121] = "F10"; - KeyBoard[KeyBoard["F11"] = 122] = "F11"; - KeyBoard[KeyBoard["F12"] = 123] = "F12"; - //数字键盘 - KeyBoard[KeyBoard["NumLock"] = 114] = "NumLock"; - KeyBoard[KeyBoard["Numpad0"] = 96] = "Numpad0"; - KeyBoard[KeyBoard["Numpad1"] = 97] = "Numpad1"; - KeyBoard[KeyBoard["Numpad2"] = 98] = "Numpad2"; - KeyBoard[KeyBoard["Numpad3"] = 99] = "Numpad3"; - KeyBoard[KeyBoard["Numpad4"] = 100] = "Numpad4"; - KeyBoard[KeyBoard["Numpad5"] = 101] = "Numpad5"; - KeyBoard[KeyBoard["Numpad6"] = 102] = "Numpad6"; - KeyBoard[KeyBoard["Numpad7"] = 103] = "Numpad7"; - KeyBoard[KeyBoard["Numpad8"] = 104] = "Numpad8"; - KeyBoard[KeyBoard["Numpad9"] = 105] = "Numpad9"; - KeyBoard[KeyBoard["NumpadAdd"] = 107] = "NumpadAdd"; - KeyBoard[KeyBoard["NumpadDivide"] = 111] = "NumpadDivide"; - KeyBoard[KeyBoard["NumpadEqual"] = 12] = "NumpadEqual"; - KeyBoard[KeyBoard["NumpadMultiply"] = 106] = "NumpadMultiply"; - KeyBoard[KeyBoard["NumpadSubtract"] = 109] = "NumpadSubtract"; - KeyBoard[KeyBoard["NumpadDot"] = 110] = "NumpadDot"; - KeyBoard[KeyBoard["NumpadDot1"] = 190] = "NumpadDot1"; -})(KeyBoard = exports.KeyBoard || (exports.KeyBoard = {})); -//# sourceMappingURL=KeyEnum.js.map \ No newline at end of file diff --git a/dist/KeyEnum.js.map b/dist/KeyEnum.js.map deleted file mode 100644 index af7ce92..0000000 --- a/dist/KeyEnum.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"KeyEnum.js","sourceRoot":"","sources":["../src/KeyEnum.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/Material.d.ts b/dist/Material.d.ts deleted file mode 100644 index 3ed908e..0000000 --- a/dist/Material.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -import { MeshBasicMaterial, LineBasicMaterial } from "three"; -export declare let boardMaterial: MeshBasicMaterial; -export declare let selectMaterial: MeshBasicMaterial; -export declare let edgeMaterial: LineBasicMaterial; diff --git a/dist/Material.js b/dist/Material.js deleted file mode 100644 index f661ce8..0000000 --- a/dist/Material.js +++ /dev/null @@ -1,19 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -var three_1 = require("three"); -//板件的材质,使用这个材质避免板件将线覆盖. -exports.boardMaterial = new three_1.MeshBasicMaterial({ - color: new three_1.Color(0.8, 0.8, 0.8), - polygonOffset: true, - polygonOffsetFactor: 1, - polygonOffsetUnits: 1 -}); -exports.selectMaterial = new three_1.MeshBasicMaterial({ - color: new three_1.Color(0.1, 0.5, 0.5), - polygonOffset: true, - polygonOffsetFactor: 1, - polygonOffsetUnits: 1 -}); -//线框的材质 -exports.edgeMaterial = new three_1.LineBasicMaterial({ linewidth: 2, color: new three_1.Color(0, 0, 0) }); -//# sourceMappingURL=Material.js.map \ No newline at end of file diff --git a/dist/Material.js.map b/dist/Material.js.map deleted file mode 100644 index 3a861a7..0000000 --- a/dist/Material.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"Material.js","sourceRoot":"","sources":["../src/Material.ts"],"names":[],"mappings":";;AAAA,+BAAoE;AAEpE,uBAAuB;AACZ,QAAA,aAAa,GAAG,IAAI,yBAAiB,CAAC;IAC7C,KAAK,EAAE,IAAI,aAAK,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;IAC/B,aAAa,EAAE,IAAI;IACnB,mBAAmB,EAAE,CAAC;IACtB,kBAAkB,EAAE,CAAC;CACxB,CAAC,CAAC;AAEQ,QAAA,cAAc,GAAG,IAAI,yBAAiB,CAAC;IAC9C,KAAK,EAAE,IAAI,aAAK,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;IAC/B,aAAa,EAAE,IAAI;IACnB,mBAAmB,EAAE,CAAC;IACtB,kBAAkB,EAAE,CAAC;CACxB,CAAC,CAAC;AAEH,OAAO;AACI,QAAA,YAAY,GAAG,IAAI,yBAAiB,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,KAAK,EAAE,IAAI,aAAK,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC"} \ No newline at end of file diff --git a/dist/Matrix2.d.ts b/dist/Matrix2.d.ts deleted file mode 100644 index 4d417d7..0000000 --- a/dist/Matrix2.d.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { Vector2, Vector3 } from "three"; -export declare class Matrix2 { - private el; - set(n11: number, n12: number, n21: number, n22: number): this; - applyVector(vec: Vector2 | Vector3): this; - setRotate(theta: number): Matrix2; -} diff --git a/dist/Matrix2.js b/dist/Matrix2.js deleted file mode 100644 index 939e8a2..0000000 --- a/dist/Matrix2.js +++ /dev/null @@ -1,31 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -var Matrix2 = /** @class */ (function () { - function Matrix2() { - this.el = [1, 0, 0, 1]; - } - Matrix2.prototype.set = function (n11, n12, n21, n22) { - var te = this.el; - te[0] = n11; - te[1] = n21; - te[2] = n12; - te[3] = n22; - return this; - }; - Matrix2.prototype.applyVector = function (vec) { - var x = vec.x, y = vec.y; - var e = this.el; - vec.x = e[0] * x + e[2] * y; - vec.y = e[1] * x + e[3] * y; - return this; - }; - Matrix2.prototype.setRotate = function (theta) { - var el = this.el; - var c = Math.cos(theta), s = Math.sin(theta); - this.set(c, -s, s, c); - return this; - }; - return Matrix2; -}()); -exports.Matrix2 = Matrix2; -//# sourceMappingURL=Matrix2.js.map \ No newline at end of file diff --git a/dist/Matrix2.js.map b/dist/Matrix2.js.map deleted file mode 100644 index 3dff33b..0000000 --- a/dist/Matrix2.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"Matrix2.js","sourceRoot":"","sources":["../src/Matrix2.ts"],"names":[],"mappings":";;AAEA;IAAA;QAEY,OAAE,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IA4B9B,CAAC;IA3BG,qBAAG,GAAH,UAAI,GAAW,EAAE,GAAW,EAAE,GAAW,EAAE,GAAW;QAElD,IAAI,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC;QAEjB,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;QAAC,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;QACzB,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;QAAC,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;QACzB,OAAO,IAAI,CAAC;IAChB,CAAC;IACD,6BAAW,GAAX,UAAY,GAAsB;QAE9B,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC;QACzB,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC;QAChB,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QAC5B,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QAE5B,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,2BAAS,GAAT,UAAU,KAAa;QAEnB,IAAI,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC;QACjB,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAE7C,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,EACV,CAAC,EAAE,CAAC,CAAC,CAAC;QACV,OAAO,IAAI,CAAC;IAChB,CAAC;IACL,cAAC;AAAD,CAAC,AA9BD,IA8BC;AA9BY,0BAAO"} \ No newline at end of file diff --git a/dist/Orbit.d.ts b/dist/Orbit.d.ts deleted file mode 100644 index a2e0c3a..0000000 --- a/dist/Orbit.d.ts +++ /dev/null @@ -1,38 +0,0 @@ -import * as THREE from "three"; -/** - * 轨道控制的数学类,观察向量和角度的互相转换 - * 当x当抬头或者低头到90度时,触发万向锁. - * - * @class Orbit - */ -export declare class Orbit { - private m_RoX; - RoZ: number; - RoX: number; - /** - * 使用旋转角度 计算观察向量 - * - * @param {THREE.Vector3} [dir] 引用传入,如果传入,那么就不构造新的向量 - * @returns {THREE.Vector3} 返回观察向量 - * @memberof Orbit - */ - UpdateDirection(dir?: THREE.Vector3): THREE.Vector3; - /** - * 使用观察向量,计算旋转角度 - * - * @param {THREE.Vector3} dir - * @memberof Orbit - */ - UpdateRoValue(dir: THREE.Vector3): void; - /** - * - * 根据观察向量 求头部的向量. - * - * @static - * @param {THREE.Vector3} dir - * @param {THREE.Vector3} [up] - * @returns {THREE.Vector3} - * @memberof Orbit - */ - static ComputUpDirection(dir: THREE.Vector3, up?: THREE.Vector3): THREE.Vector3; -} diff --git a/dist/Orbit.js b/dist/Orbit.js deleted file mode 100644 index fc5522f..0000000 --- a/dist/Orbit.js +++ /dev/null @@ -1,86 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -var THREE = require("three"); -/** - * 轨道控制的数学类,观察向量和角度的互相转换 - * 当x当抬头或者低头到90度时,触发万向锁. - * - * @class Orbit - */ -var Orbit = /** @class */ (function () { - function Orbit() { - //抬头低头 正数抬头 负数低头 - this.m_RoX = 0; - //身体旋转 0为正右边 逆时针旋转 - this.RoZ = 0; - } - Object.defineProperty(Orbit.prototype, "RoX", { - get: function () { - return this.m_RoX; - }, - set: function (v) { - this.m_RoX = THREE.Math.clamp(v, Math.PI * -0.5, Math.PI * 0.5); - }, - enumerable: true, - configurable: true - }); - /** - * 使用旋转角度 计算观察向量 - * - * @param {THREE.Vector3} [dir] 引用传入,如果传入,那么就不构造新的向量 - * @returns {THREE.Vector3} 返回观察向量 - * @memberof Orbit - */ - Orbit.prototype.UpdateDirection = function (dir) { - var rtDir = dir ? dir : new THREE.Vector3(); - rtDir.z = Math.sin(this.m_RoX); - //归一化专用. - var d = Math.abs(Math.cos(this.m_RoX)); - rtDir.x = Math.cos(this.RoZ) * d; - rtDir.y = Math.sin(this.RoZ) * d; - return rtDir; - }; - /** - * 使用观察向量,计算旋转角度 - * - * @param {THREE.Vector3} dir - * @memberof Orbit - */ - Orbit.prototype.UpdateRoValue = function (dir) { - dir.normalize(); - this.m_RoX = Math.asin(dir.z); - if (dir.x < 1e-4 && dir.y < 1e-4) - this.RoZ = Math.PI * 0.5; - else - this.RoZ = Math.atan2(dir.y, dir.x); - }; - /** - * - * 根据观察向量 求头部的向量. - * - * @static - * @param {THREE.Vector3} dir - * @param {THREE.Vector3} [up] - * @returns {THREE.Vector3} - * @memberof Orbit - */ - Orbit.ComputUpDirection = function (dir, up) { - var upRes = up ? up : new THREE.Vector3(); - if (dir.equals(new THREE.Vector3(0, 0, -1))) { - upRes.set(0, 1, 0); - } - else if (dir.equals(new THREE.Vector3(0, 0, 1))) { - upRes.set(0, -1, 0); - } - else { - var xv = new THREE.Vector3(); - xv.crossVectors(new THREE.Vector3(0, 0, 1), dir); - upRes.crossVectors(dir, xv); - upRes.normalize(); - } - return upRes; - }; - return Orbit; -}()); -exports.Orbit = Orbit; -//# sourceMappingURL=Orbit.js.map \ No newline at end of file diff --git a/dist/Orbit.js.map b/dist/Orbit.js.map deleted file mode 100644 index 844bf0f..0000000 --- a/dist/Orbit.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"Orbit.js","sourceRoot":"","sources":["../src/Orbit.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/PlaneExt.d.ts b/dist/PlaneExt.d.ts deleted file mode 100644 index a94d5f8..0000000 --- a/dist/PlaneExt.d.ts +++ /dev/null @@ -1,7 +0,0 @@ -import * as THREE from 'three'; -import { Vector3, Line3 } from "three"; -export declare class PlaneExt extends THREE.Plane { - constructor(normal?: THREE.Vector3, constant?: number); - intersectLine(line: Line3, optionalTarget?: Vector3, extendLine?: boolean): Vector3; - intersectRay(ray: THREE.Ray, optionalTarget?: Vector3, extendLine?: boolean): Vector3; -} diff --git a/dist/PlaneExt.js b/dist/PlaneExt.js deleted file mode 100644 index 2b78bb4..0000000 --- a/dist/PlaneExt.js +++ /dev/null @@ -1,48 +0,0 @@ -"use strict"; -var __extends = (this && this.__extends) || (function () { - var extendStatics = Object.setPrototypeOf || - ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || - function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; }; - return function (d, b) { - extendStatics(d, b); - function __() { this.constructor = d; } - d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); - }; -})(); -Object.defineProperty(exports, "__esModule", { value: true }); -var THREE = require("three"); -var three_1 = require("three"); -var PlaneExt = /** @class */ (function (_super) { - __extends(PlaneExt, _super); - function PlaneExt(normal, constant) { - return _super.call(this, normal, constant) || this; - } - PlaneExt.prototype.intersectLine = function (line, optionalTarget, extendLine) { - var v1 = new three_1.Vector3(); - var result = optionalTarget || new three_1.Vector3(); - var direction = line.delta(v1); - var denominator = this.normal.dot(direction); - if (denominator === 0) { - // line is coplanar, return origin - if (this.distanceToPoint(line.start) === 0) { - return result.copy(line.start); - } - // Unsure if this is the correct method to handle this case. - return undefined; - } - var t = -(line.start.dot(this.normal) + this.constant) / denominator; - //If you not extendLine,check intersect point in Line - if (!extendLine && (t < 0 || t > 1)) { - return undefined; - } - return result.copy(direction).multiplyScalar(t).add(line.start); - }; - PlaneExt.prototype.intersectRay = function (ray, optionalTarget, extendLine) { - // 从射线初始位置 - var line = new THREE.Line3(ray.origin.clone(), ray.origin.clone().add(ray.direction)); - return this.intersectLine(line, optionalTarget, extendLine); - }; - return PlaneExt; -}(THREE.Plane)); -exports.PlaneExt = PlaneExt; -//# sourceMappingURL=PlaneExt.js.map \ No newline at end of file diff --git a/dist/PlaneExt.js.map b/dist/PlaneExt.js.map deleted file mode 100644 index 1a1ea0b..0000000 --- a/dist/PlaneExt.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"PlaneExt.js","sourceRoot":"","sources":["../src/PlaneExt.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6BAA+B;AAC/B,+BAAuC;AAEvC;IAA8B,4BAAW;IAErC,kBAAY,MAAsB,EAAE,QAAiB;eAEjD,kBAAM,MAAM,EAAE,QAAQ,CAAC;IAC3B,CAAC;IACD,gCAAa,GAAb,UAAc,IAAW,EAAE,cAAwB,EAAE,UAAoB;QAErE,IAAI,EAAE,GAAG,IAAI,eAAO,EAAE,CAAC;QAEvB,IAAI,MAAM,GAAG,cAAc,IAAI,IAAI,eAAO,EAAE,CAAC;QAE7C,IAAI,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAE/B,IAAI,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAE7C,IAAI,WAAW,KAAK,CAAC,EACrB;YACI,kCAAkC;YAClC,IAAI,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,EAC1C;gBACI,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;aAClC;YACD,4DAA4D;YAC5D,OAAO,SAAS,CAAC;SACpB;QAED,IAAI,CAAC,GAAG,CAAE,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,WAAW,CAAC;QACtE,qDAAqD;QACrD,IAAI,CAAC,UAAU,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EACnC;YACI,OAAO,SAAS,CAAC;SACpB;QAED,OAAO,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACpE,CAAC;IACD,+BAAY,GAAZ,UAAa,GAAc,EAAE,cAAwB,EAAE,UAAoB;QAEvE,UAAU;QACV,IAAI,IAAI,GAAG,IAAI,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC;QACtF,OAAO,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,cAAc,EAAE,UAAU,CAAC,CAAC;IAChE,CAAC;IACL,eAAC;AAAD,CAAC,AA1CD,CAA8B,KAAK,CAAC,KAAK,GA0CxC;AA1CY,4BAAQ"} \ No newline at end of file diff --git a/dist/PointPick.d.ts b/dist/PointPick.d.ts deleted file mode 100644 index e62c6f7..0000000 --- a/dist/PointPick.d.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { Mesh } from "three"; -import { Viewer } from "."; -/** - * 点选 - * - * @export - * @param {Viewer} view - * @param {number} ptx - * @param {number} pty - * @returns {(Mesh | undefined)} - */ -export declare function PointPick(view: Viewer, ptx: number, pty: number): Mesh | undefined; diff --git a/dist/PointPick.js b/dist/PointPick.js deleted file mode 100644 index 55afc42..0000000 --- a/dist/PointPick.js +++ /dev/null @@ -1,39 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -var three_1 = require("three"); -/** - * 点选 - * - * @export - * @param {Viewer} view - * @param {number} ptx - * @param {number} pty - * @returns {(Mesh | undefined)} - */ -function PointPick(view, ptx, pty) { - var raycaster = new three_1.Raycaster(); - raycaster.setFromCamera({ - x: (ptx / view._Width) * 2 - 1, - y: -(pty / view._Height) * 2 + 1 //y轴相反 - }, view.m_Camera.Camera); - //https://github.com/mrdoob/three.js/issues/14128 - raycaster.ray.origin.set((ptx / view._Width) * 2 - 1, -(pty / view._Height) * 2 + 1, -1).unproject(view.m_Camera.Camera); - var minDis = Infinity; - var minObj = undefined; - view.m_Scene.children.forEach(function (obj) { - if (obj instanceof three_1.Mesh) { - var intersects = []; - obj.raycast(raycaster, intersects); - for (var _i = 0, intersects_1 = intersects; _i < intersects_1.length; _i++) { - var i = intersects_1[_i]; - if (i.distance < minDis) { - minObj = obj; - minDis = i.distance; - } - } - } - }); - return minObj; -} -exports.PointPick = PointPick; -//# sourceMappingURL=PointPick.js.map \ No newline at end of file diff --git a/dist/PointPick.js.map b/dist/PointPick.js.map deleted file mode 100644 index 2c3a977..0000000 --- a/dist/PointPick.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"PointPick.js","sourceRoot":"","sources":["../src/PointPick.ts"],"names":[],"mappings":";;AAAA,+BAA2E;AAc3E;;;;;;;;GAQG;AACH,mBAA0B,IAAY,EAAE,GAAW,EAAE,GAAW;IAE5D,IAAI,SAAS,GAAG,IAAI,iBAAS,EAAE,CAAC;IAChC,SAAS,CAAC,aAAa,CAAC;QACpB,CAAC,EAAE,CAAC,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC;QAC9B,CAAC,EAAE,CAAE,CAAC,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,MAAM;KAC3C,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAEzB,iDAAiD;IACjD,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAE,CAAC,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAG1H,IAAI,MAAM,GAAG,QAAQ,CAAC;IACtB,IAAI,MAAM,GAAG,SAAS,CAAC;IAEvB,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,UAAA,GAAG;QAE7B,IAAI,GAAG,YAAY,YAAI,EACvB;YACI,IAAI,UAAU,GAAgB,EAAE,CAAC;YACjC,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;YAEnC,KAAc,UAAU,EAAV,yBAAU,EAAV,wBAAU,EAAV,IAAU;gBAAnB,IAAI,CAAC,mBAAA;gBAEN,IAAI,CAAC,CAAC,QAAQ,GAAG,MAAM,EACvB;oBACI,MAAM,GAAG,GAAG,CAAC;oBACb,MAAM,GAAG,CAAC,CAAC,QAAQ,CAAC;iBACvB;aACJ;SACJ;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAClB,CAAC;AAlCD,8BAkCC"} \ No newline at end of file diff --git a/dist/RotateUV.d.ts b/dist/RotateUV.d.ts deleted file mode 100644 index f56ed4e..0000000 --- a/dist/RotateUV.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -import { Geometry } from 'three'; -export declare function RotateUVs(geo: Geometry): void; diff --git a/dist/RotateUV.js b/dist/RotateUV.js deleted file mode 100644 index fcdef39..0000000 --- a/dist/RotateUV.js +++ /dev/null @@ -1,23 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -var Matrix2_1 = require("./Matrix2"); -var three_1 = require("three"); -function RotateUVs(geo) { - var roMat = new Matrix2_1.Matrix2(); - roMat.set(0, -1, 1, 0); - var addV = new three_1.Vector2(1, 0); - for (var _i = 0, _a = geo.faceVertexUvs; _i < _a.length; _i++) { - var uvs = _a[_i]; - for (var _b = 0, uvs_1 = uvs; _b < uvs_1.length; _b++) { - var uv = uvs_1[_b]; - for (var _c = 0, uv_1 = uv; _c < uv_1.length; _c++) { - var v = uv_1[_c]; - roMat.applyVector(v); - v.add(addV); - } - } - } - geo.uvsNeedUpdate = true; -} -exports.RotateUVs = RotateUVs; -//# sourceMappingURL=RotateUV.js.map \ No newline at end of file diff --git a/dist/RotateUV.js.map b/dist/RotateUV.js.map deleted file mode 100644 index 65b71aa..0000000 --- a/dist/RotateUV.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"RotateUV.js","sourceRoot":"","sources":["../src/RotateUV.ts"],"names":[],"mappings":";;AAAA,qCAAoC;AACpC,+BAA0C;AAG1C,mBAA0B,GAAa;IAEnC,IAAI,KAAK,GAAG,IAAI,iBAAO,EAAE,CAAC;IAC1B,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,EACX,CAAC,EAAE,CAAC,CAAC,CAAC;IAEV,IAAI,IAAI,GAAG,IAAI,eAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAE7B,KAAgB,UAAiB,EAAjB,KAAA,GAAG,CAAC,aAAa,EAAjB,cAAiB,EAAjB,IAAiB;QAA5B,IAAI,GAAG,SAAA;QAER,KAAe,UAAG,EAAH,WAAG,EAAH,iBAAG,EAAH,IAAG;YAAb,IAAI,EAAE,YAAA;YAEP,KAAc,UAAE,EAAF,SAAE,EAAF,gBAAE,EAAF,IAAE;gBAAX,IAAI,CAAC,WAAA;gBAEN,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;gBACrB,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;aACf;SACJ;KACJ;IACD,GAAG,CAAC,aAAa,GAAG,IAAI,CAAC;AAC7B,CAAC;AApBD,8BAoBC"} \ No newline at end of file diff --git a/dist/Text.d.ts b/dist/Text.d.ts deleted file mode 100644 index 2004644..0000000 --- a/dist/Text.d.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { Mesh } from "three"; -export declare class DbText extends Mesh { - /** - * - * 构造一个文本对象,8位点(中心点下面)在0点 - * @param {string} str 数字字符串 - * @param {number} height 文本高度 - * @memberof DbText - */ - constructor(str: string, height?: number); -} diff --git a/dist/Text.js b/dist/Text.js deleted file mode 100644 index 752844e..0000000 --- a/dist/Text.js +++ /dev/null @@ -1,53 +0,0 @@ -"use strict"; -var __extends = (this && this.__extends) || (function () { - var extendStatics = Object.setPrototypeOf || - ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || - function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; }; - return function (d, b) { - extendStatics(d, b); - function __() { this.constructor = d; } - d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); - }; -})(); -Object.defineProperty(exports, "__esModule", { value: true }); -var three_1 = require("three"); -var ColorPalette_1 = require("./ColorPalette"); -var GeUtils_1 = require("./GeUtils"); -var FontLoaderUtil = /** @class */ (function () { - function FontLoaderUtil() { - } - FontLoaderUtil.Load = function () { - if (!this.defFont) { - var f = require("../resources/fonts/helvetiker_regular.typeface.json"); - var loader = new three_1.FontLoader(); - this.defFont = loader.parse(f); - } - return this.defFont; - }; - return FontLoaderUtil; -}()); -var DbText = /** @class */ (function (_super) { - __extends(DbText, _super); - /** - * - * 构造一个文本对象,8位点(中心点下面)在0点 - * @param {string} str 数字字符串 - * @param {number} height 文本高度 - * @memberof DbText - */ - function DbText(str, height) { - if (height === void 0) { height = 5; } - var _this = this; - var font = FontLoaderUtil.Load(); - var shapes = font.generateShapes(str, height, 0.1); - var geometry = new three_1.ShapeGeometry(shapes); - geometry.computeBoundingBox(); - _this = _super.call(this, geometry, ColorPalette_1.ColorMaterial.GetLineMaterial(5)) || this; - var center = geometry.boundingBox.getCenter(new three_1.Vector3()); - _this.applyMatrix(GeUtils_1.MoveMatrix(new three_1.Vector3(-center.x, 0, 0))); - return _this; - } - return DbText; -}(three_1.Mesh)); -exports.DbText = DbText; -//# sourceMappingURL=Text.js.map \ No newline at end of file diff --git a/dist/Text.js.map b/dist/Text.js.map deleted file mode 100644 index 405ec57..0000000 --- a/dist/Text.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"Text.js","sourceRoot":"","sources":["../src/Text.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+BAAuE;AACvE,+CAA+C;AAC/C,qCAAuC;AAEvC;IAAA;IAaA,CAAC;IAVQ,mBAAI,GAAX;QAEE,IAAI,CAAC,IAAI,CAAC,OAAO,EACjB;YACE,IAAM,CAAC,GAAG,OAAO,CAAC,qDAAqD,CAAC,CAAC;YACzE,IAAI,MAAM,GAAG,IAAI,kBAAU,EAAE,CAAC;YAC9B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SAChC;QACD,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IACH,qBAAC;AAAD,CAAC,AAbD,IAaC;AAED;IAA4B,0BAAI;IAE9B;;;;;;OAMG;IACH,gBAAY,GAAW,EAAE,MAAkB;QAAlB,uBAAA,EAAA,UAAkB;QAA3C,iBAaC;QAXC,IAAI,IAAI,GAAG,cAAc,CAAC,IAAI,EAAE,CAAC;QAEjC,IAAI,MAAM,GAAkB,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;QAClE,IAAI,QAAQ,GAAG,IAAI,qBAAa,CAAC,MAAM,CAAC,CAAC;QAEzC,QAAQ,CAAC,kBAAkB,EAAE,CAAC;QAE9B,QAAA,kBAAM,QAAQ,EAAE,4BAAa,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,SAAC;QAElD,IAAI,MAAM,GAAG,QAAQ,CAAC,WAAW,CAAC,SAAS,CAAC,IAAI,eAAO,EAAE,CAAC,CAAC;QAC3D,KAAI,CAAC,WAAW,CAAC,oBAAU,CAAC,IAAI,eAAO,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;;IAC7D,CAAC;IACH,aAAC;AAAD,CAAC,AAvBD,CAA4B,YAAI,GAuB/B;AAvBY,wBAAM"} \ No newline at end of file diff --git a/dist/ThreeCSG.d.ts b/dist/ThreeCSG.d.ts deleted file mode 100644 index d6691bf..0000000 --- a/dist/ThreeCSG.d.ts +++ /dev/null @@ -1,58 +0,0 @@ -import * as THREE from "three"; -export declare class ThreeBSP { - tree: Node; - matrix: THREE.Matrix4; - Node: typeof Node; - Vertex: typeof Vertex; - Polygon: typeof Polygon; - constructor(geometry: any); - subtract(other_tree: any): ThreeBSP; - union(other_tree: any): ThreeBSP; - intersect(other_tree: any): ThreeBSP; - toGeometry(): THREE.Geometry; - toMesh(material: any): THREE.Mesh; -} -export declare class Polygon { - w: any; - normal: any; - vertices: any; - constructor(vertices?: any, normal?: any, w?: any); - calculateProperties(): this; - clone(): Polygon; - flip(): this; - classifyVertex(vertex: any): 1 | 0 | 2; - classifySide(polygon: any): 1 | 0 | 2 | 3; - splitPolygon(polygon: any, coplanar_front: any, coplanar_back: any, front: any, back: any): void; -} -export declare class Vertex { - uv: any; - normal: any; - z: any; - y: any; - x: any; - constructor(x: number, y: number, z: number, normal: THREE.Vector3, uv: THREE.Vector2); - clone(): Vertex; - add(vertex: any): this; - subtract(vertex: any): this; - multiplyScalar(scalar: any): this; - cross(vertex: any): this; - normalize(): this; - dot(vertex: any): number; - lerp(a: any, t: any): this; - interpolate(other: any, t: any): Vertex; - applyMatrix4(m: any): this; -} -export declare class Node { - divider: any; - back: any; - front: any; - polygons: any[]; - constructor(polygons?: any); - isConvex(polygons: any): boolean; - build(polygons: any): void; - allPolygons(): any[]; - clone(): Node; - invert(): this; - clipPolygons(polygons: any): any; - clipTo(node: any): void; -} diff --git a/dist/ThreeCSG.js b/dist/ThreeCSG.js deleted file mode 100644 index b0fe206..0000000 --- a/dist/ThreeCSG.js +++ /dev/null @@ -1,480 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -var THREE = require("three"); -/*jshint esversion: 6 */ -var EPSILON = 1e-5, COPLANAR = 0, //共面 -FRONT = 1, //前 -BACK = 2, SPANNING = 3; -var ThreeBSP = /** @class */ (function () { - function ThreeBSP(geometry) { - // Convert THREE.Geometry to ThreeBSP - var i, _length_i, face, vertex, faceVertexUvs, uvs, polygon, polygons = [], tree; - this.Polygon = Polygon; - this.Vertex = Vertex; - this.Node = Node; - if (geometry instanceof THREE.Geometry) { - this.matrix = new THREE.Matrix4(); - } - else if (geometry instanceof THREE.Mesh) { - // #todo: add hierarchy support - geometry.updateMatrix(); - this.matrix = geometry.matrix.clone(); - geometry = geometry.geometry; - } - else if (geometry instanceof Node) { - this.tree = geometry; - this.matrix = new THREE.Matrix4(); - return this; - } - else { - throw 'ThreeBSP: Given geometry is unsupported'; - } - for (i = 0, _length_i = geometry.faces.length; i < _length_i; i++) { - face = geometry.faces[i]; - faceVertexUvs = geometry.faceVertexUvs[0][i]; - polygon = new Polygon(); - if (face instanceof THREE.Face3) { - vertex = geometry.vertices[face.a]; - uvs = faceVertexUvs ? new THREE.Vector2(faceVertexUvs[0].x, faceVertexUvs[0].y) : null; - vertex = new Vertex(vertex.x, vertex.y, vertex.z, face.vertexNormals[0], uvs); - vertex.applyMatrix4(this.matrix); - polygon.vertices.push(vertex); - vertex = geometry.vertices[face.b]; - uvs = faceVertexUvs ? new THREE.Vector2(faceVertexUvs[1].x, faceVertexUvs[1].y) : null; - vertex = new Vertex(vertex.x, vertex.y, vertex.z, face.vertexNormals[1], uvs); - vertex.applyMatrix4(this.matrix); - polygon.vertices.push(vertex); - vertex = geometry.vertices[face.c]; - uvs = faceVertexUvs ? new THREE.Vector2(faceVertexUvs[2].x, faceVertexUvs[2].y) : null; - vertex = new Vertex(vertex.x, vertex.y, vertex.z, face.vertexNormals[2], uvs); - vertex.applyMatrix4(this.matrix); - polygon.vertices.push(vertex); - } - else if (typeof THREE.Face4) { - vertex = geometry.vertices[face.a]; - uvs = faceVertexUvs ? new THREE.Vector2(faceVertexUvs[0].x, faceVertexUvs[0].y) : null; - vertex = new Vertex(vertex.x, vertex.y, vertex.z, face.vertexNormals[0], uvs); - vertex.applyMatrix4(this.matrix); - polygon.vertices.push(vertex); - vertex = geometry.vertices[face.b]; - uvs = faceVertexUvs ? new THREE.Vector2(faceVertexUvs[1].x, faceVertexUvs[1].y) : null; - vertex = new Vertex(vertex.x, vertex.y, vertex.z, face.vertexNormals[1], uvs); - vertex.applyMatrix4(this.matrix); - polygon.vertices.push(vertex); - vertex = geometry.vertices[face.c]; - uvs = faceVertexUvs ? new THREE.Vector2(faceVertexUvs[2].x, faceVertexUvs[2].y) : null; - vertex = new Vertex(vertex.x, vertex.y, vertex.z, face.vertexNormals[2], uvs); - vertex.applyMatrix4(this.matrix); - polygon.vertices.push(vertex); - vertex = geometry.vertices[face.d]; - uvs = faceVertexUvs ? new THREE.Vector2(faceVertexUvs[3].x, faceVertexUvs[3].y) : null; - vertex = new Vertex(vertex.x, vertex.y, vertex.z, face.vertexNormals[3], uvs); - vertex.applyMatrix4(this.matrix); - polygon.vertices.push(vertex); - } - else { - throw 'Invalid face type at index ' + i; - } - polygon.calculateProperties(); - polygons.push(polygon); - } - this.tree = new Node(polygons); - } - //减 - ThreeBSP.prototype.subtract = function (other_tree) { - var a = this.tree.clone(), b = other_tree.tree.clone(); - a.invert(); - a.clipTo(b); - b.clipTo(a); - b.invert(); - b.clipTo(a); - b.invert(); - a.build(b.allPolygons()); - a.invert(); - var bsp = new ThreeBSP(a); - bsp.matrix = this.matrix; - return bsp; - }; - //结合 - ThreeBSP.prototype.union = function (other_tree) { - var a = this.tree.clone(), b = other_tree.tree.clone(); - a.clipTo(b); - b.clipTo(a); - b.invert(); - b.clipTo(a); - b.invert(); - a.build(b.allPolygons()); - var bsp = new ThreeBSP(a); - bsp.matrix = this.matrix; - return bsp; - }; - //相交 - ThreeBSP.prototype.intersect = function (other_tree) { - var a = this.tree.clone(), b = other_tree.tree.clone(); - a.invert(); - b.clipTo(a); - b.invert(); - a.clipTo(b); - b.clipTo(a); - a.build(b.allPolygons()); - a.invert(); - var bsp = new ThreeBSP(a); - bsp.matrix = this.matrix; - return bsp; - }; - ThreeBSP.prototype.toGeometry = function () { - var i, j, matrix = new THREE.Matrix4().getInverse(this.matrix), geometry = new THREE.Geometry(), polygons = this.tree.allPolygons(), polygon_count = polygons.length, polygon, polygon_vertice_count, vertice_dict = {}, vertex_idx_a, vertex_idx_b, vertex_idx_c, vertex, face, verticeUvs; - for (i = 0; i < polygon_count; i++) { - polygon = polygons[i]; - polygon_vertice_count = polygon.vertices.length; - for (j = 2; j < polygon_vertice_count; j++) { - verticeUvs = []; - vertex = polygon.vertices[0]; - verticeUvs.push(new THREE.Vector2(vertex.uv.x, vertex.uv.y)); - vertex = new THREE.Vector3(vertex.x, vertex.y, vertex.z); - vertex.applyMatrix4(matrix); - if (typeof vertice_dict[vertex.x + ',' + vertex.y + ',' + vertex.z] !== 'undefined') { - vertex_idx_a = vertice_dict[vertex.x + ',' + vertex.y + ',' + vertex.z]; - } - else { - geometry.vertices.push(vertex); - vertex_idx_a = vertice_dict[vertex.x + ',' + vertex.y + ',' + vertex.z] = geometry.vertices.length - 1; - } - vertex = polygon.vertices[j - 1]; - verticeUvs.push(new THREE.Vector2(vertex.uv.x, vertex.uv.y)); - vertex = new THREE.Vector3(vertex.x, vertex.y, vertex.z); - vertex.applyMatrix4(matrix); - if (typeof vertice_dict[vertex.x + ',' + vertex.y + ',' + vertex.z] !== 'undefined') { - vertex_idx_b = vertice_dict[vertex.x + ',' + vertex.y + ',' + vertex.z]; - } - else { - geometry.vertices.push(vertex); - vertex_idx_b = vertice_dict[vertex.x + ',' + vertex.y + ',' + vertex.z] = geometry.vertices.length - 1; - } - vertex = polygon.vertices[j]; - verticeUvs.push(new THREE.Vector2(vertex.uv.x, vertex.uv.y)); - vertex = new THREE.Vector3(vertex.x, vertex.y, vertex.z); - vertex.applyMatrix4(matrix); - if (typeof vertice_dict[vertex.x + ',' + vertex.y + ',' + vertex.z] !== 'undefined') { - vertex_idx_c = vertice_dict[vertex.x + ',' + vertex.y + ',' + vertex.z]; - } - else { - geometry.vertices.push(vertex); - vertex_idx_c = vertice_dict[vertex.x + ',' + vertex.y + ',' + vertex.z] = geometry.vertices.length - 1; - } - face = new THREE.Face3(vertex_idx_a, vertex_idx_b, vertex_idx_c, new THREE.Vector3(polygon.normal.x, polygon.normal.y, polygon.normal.z)); - geometry.faces.push(face); - geometry.faceVertexUvs[0].push(verticeUvs); - } - } - return geometry; - }; - ThreeBSP.prototype.toMesh = function (material) { - var geometry = this.toGeometry(), mesh = new THREE.Mesh(geometry, material); - mesh.position.setFromMatrixPosition(this.matrix); - mesh.rotation.setFromRotationMatrix(this.matrix); - return mesh; - }; - return ThreeBSP; -}()); -exports.ThreeBSP = ThreeBSP; -//多边形 -var Polygon = /** @class */ (function () { - function Polygon(vertices, normal, w) { - if (!(vertices instanceof Array)) { - vertices = []; - } - this.vertices = vertices; - if (vertices.length > 0) { - this.calculateProperties(); - } - else { - this.normal = this.w = undefined; - } - } - Polygon.prototype.calculateProperties = function () { - var a = this.vertices[0], b = this.vertices[1], c = this.vertices[2]; - this.normal = b.clone().subtract(a).cross(c.clone().subtract(a)).normalize(); - this.w = this.normal.clone().dot(a); - return this; - }; - Polygon.prototype.clone = function () { - var i, vertice_count, polygon = new Polygon(); - for (i = 0, vertice_count = this.vertices.length; i < vertice_count; i++) { - polygon.vertices.push(this.vertices[i].clone()); - } - polygon.calculateProperties(); - return polygon; - }; - Polygon.prototype.flip = function () { - var i, vertices = []; - this.normal.multiplyScalar(-1); - this.w *= -1; - for (i = this.vertices.length - 1; i >= 0; i--) { - vertices.push(this.vertices[i]); - } - this.vertices = vertices; - return this; - }; - //划分? - Polygon.prototype.classifyVertex = function (vertex) { - var side_value = this.normal.dot(vertex) - this.w; - if (side_value < -EPSILON) { - return BACK; - } - else if (side_value > EPSILON) { - return FRONT; - } - else { - return COPLANAR; - } - }; - //划分边? - Polygon.prototype.classifySide = function (polygon) { - var i, vertex, classification, num_positive = 0, num_negative = 0, vertice_count = polygon.vertices.length; - for (i = 0; i < vertice_count; i++) { - vertex = polygon.vertices[i]; - classification = this.classifyVertex(vertex); - if (classification === FRONT) { - num_positive++; - } - else if (classification === BACK) { - num_negative++; - } - } - if (num_positive > 0 && num_negative === 0) { - return FRONT; - } - else if (num_positive === 0 && num_negative > 0) { - return BACK; - } - else if (num_positive === 0 && num_negative === 0) { - return COPLANAR; - } - else { - return SPANNING; - } - }; - //分解 分离 区域? - Polygon.prototype.splitPolygon = function (polygon, coplanar_front, coplanar_back, front, back) { - var classification = this.classifySide(polygon); - if (classification === COPLANAR) { - (this.normal.dot(polygon.normal) > 0 ? coplanar_front : coplanar_back).push(polygon); - } - else if (classification === FRONT) { - front.push(polygon); - } - else if (classification === BACK) { - back.push(polygon); - } - else { - var vertice_count = void 0, i = void 0, j = void 0, ti = void 0, tj = void 0, vi = void 0, vj = void 0, t = void 0, v = void 0, f = [], b = []; - for (i = 0, vertice_count = polygon.vertices.length; i < vertice_count; i++) { - j = (i + 1) % vertice_count; - vi = polygon.vertices[i]; - vj = polygon.vertices[j]; - ti = this.classifyVertex(vi); - tj = this.classifyVertex(vj); - if (ti != BACK) - f.push(vi); - if (ti != FRONT) - b.push(vi); - if ((ti | tj) === SPANNING) { - t = (this.w - this.normal.dot(vi)) / this.normal.dot(vj.clone().subtract(vi)); - v = vi.interpolate(vj, t); - f.push(v); - b.push(v); - } - } - if (f.length >= 3) - front.push(new Polygon(f).calculateProperties()); - if (b.length >= 3) - back.push(new Polygon(b).calculateProperties()); - } - }; - return Polygon; -}()); -exports.Polygon = Polygon; -var Vertex = /** @class */ (function () { - function Vertex(x, y, z, normal, uv) { - this.x = x; - this.y = y; - this.z = z; - this.normal = normal || new THREE.Vector3(); - this.uv = uv || new THREE.Vector2(); - } - Vertex.prototype.clone = function () { - return new Vertex(this.x, this.y, this.z, this.normal.clone(), this.uv.clone()); - }; - Vertex.prototype.add = function (vertex) { - this.x += vertex.x; - this.y += vertex.y; - this.z += vertex.z; - return this; - }; - Vertex.prototype.subtract = function (vertex) { - this.x -= vertex.x; - this.y -= vertex.y; - this.z -= vertex.z; - return this; - }; - Vertex.prototype.multiplyScalar = function (scalar) { - this.x *= scalar; - this.y *= scalar; - this.z *= scalar; - return this; - }; - //×乘 - Vertex.prototype.cross = function (vertex) { - var x = this.x, y = this.y, z = this.z; - this.x = y * vertex.z - z * vertex.y; - this.y = z * vertex.x - x * vertex.z; - this.z = x * vertex.y - y * vertex.x; - return this; - }; - Vertex.prototype.normalize = function () { - var length = Math.sqrt(this.x * this.x + this.y * this.y + this.z * this.z); - this.x /= length; - this.y /= length; - this.z /= length; - return this; - }; - //点乘 - Vertex.prototype.dot = function (vertex) { - return this.x * vertex.x + this.y * vertex.y + this.z * vertex.z; - }; - //线性插值 - Vertex.prototype.lerp = function (a, t) { - this.add(a.clone().subtract(this).multiplyScalar(t)); - this.normal.add(a.normal.clone().sub(this.normal).multiplyScalar(t)); - this.uv.add(a.uv.clone().sub(this.uv).multiplyScalar(t)); - return this; - }; - //插值 - Vertex.prototype.interpolate = function (other, t) { - return this.clone().lerp(other, t); - }; - Vertex.prototype.applyMatrix4 = function (m) { - // input: THREE.Matrix4 affine matrix - var x = this.x, y = this.y, z = this.z; - var e = m.elements; - this.x = e[0] * x + e[4] * y + e[8] * z + e[12]; - this.y = e[1] * x + e[5] * y + e[9] * z + e[13]; - this.z = e[2] * x + e[6] * y + e[10] * z + e[14]; - return this; - }; - return Vertex; -}()); -exports.Vertex = Vertex; -var Node = /** @class */ (function () { - function Node(polygons) { - var i, polygon_count, front = [], back = []; - this.polygons = []; - this.front = this.back = undefined; - if (!(polygons instanceof Array) || polygons.length === 0) - return; - this.divider = polygons[0].clone(); - for (i = 0, polygon_count = polygons.length; i < polygon_count; i++) { - this.divider.splitPolygon(polygons[i], this.polygons, this.polygons, front, back); - } - if (front.length > 0) { - this.front = new Node(front); - } - if (back.length > 0) { - this.back = new Node(back); - } - } - //是凸的? 凸包? - Node.prototype.isConvex = function (polygons) { - var i, j; - for (i = 0; i < polygons.length; i++) { - for (j = 0; j < polygons.length; j++) { - if (i !== j && polygons[i].classifySide(polygons[j]) !== BACK) { - return false; - } - } - } - return true; - }; - Node.prototype.build = function (polygons) { - var i, polygon_count, front = [], back = []; - if (!this.divider) { - this.divider = polygons[0].clone(); - } - for (i = 0, polygon_count = polygons.length; i < polygon_count; i++) { - this.divider.splitPolygon(polygons[i], this.polygons, this.polygons, front, back); - } - if (front.length > 0) { - if (!this.front) - this.front = new Node(); - this.front.build(front); - } - if (back.length > 0) { - if (!this.back) - this.back = new Node(); - this.back.build(back); - } - }; - Node.prototype.allPolygons = function () { - var polygons = this.polygons.slice(); - if (this.front) - polygons = polygons.concat(this.front.allPolygons()); - if (this.back) - polygons = polygons.concat(this.back.allPolygons()); - return polygons; - }; - Node.prototype.clone = function () { - var node = new Node(); - node.divider = this.divider.clone(); - node.polygons = this.polygons.map(function (polygon) { - return polygon.clone(); - }); - node.front = this.front && this.front.clone(); - node.back = this.back && this.back.clone(); - return node; - }; - //反转 - Node.prototype.invert = function () { - var i, polygon_count, temp; - for (i = 0, polygon_count = this.polygons.length; i < polygon_count; i++) { - this.polygons[i].flip(); - } - this.divider.flip(); - if (this.front) - this.front.invert(); - if (this.back) - this.back.invert(); - temp = this.front; - this.front = this.back; - this.back = temp; - return this; - }; - // - Node.prototype.clipPolygons = function (polygons) { - var i, polygon_count, front, back; - if (!this.divider) - return polygons.slice(); - front = []; - back = []; - for (i = 0, polygon_count = polygons.length; i < polygon_count; i++) { - this.divider.splitPolygon(polygons[i], front, back, front, back); - } - if (this.front) - front = this.front.clipPolygons(front); - if (this.back) - back = this.back.clipPolygons(back); - else - back = []; - return front.concat(back); - }; - Node.prototype.clipTo = function (node) { - this.polygons = node.clipPolygons(this.polygons); - if (this.front) - this.front.clipTo(node); - if (this.back) - this.back.clipTo(node); - }; - return Node; -}()); -exports.Node = Node; -//# sourceMappingURL=ThreeCSG.js.map \ No newline at end of file diff --git a/dist/ThreeCSG.js.map b/dist/ThreeCSG.js.map deleted file mode 100644 index cbbfb86..0000000 --- a/dist/ThreeCSG.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"ThreeCSG.js","sourceRoot":"","sources":["../src/ThreeCSG.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/Utils.d.ts b/dist/Utils.d.ts deleted file mode 100644 index ca1d808..0000000 --- a/dist/Utils.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -import { Viewer } from "."; -export declare function LoadBoard(view: Viewer, data: any[], clear?: boolean): void; diff --git a/dist/Utils.js b/dist/Utils.js deleted file mode 100644 index a467aa7..0000000 --- a/dist/Utils.js +++ /dev/null @@ -1,32 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -var _1 = require("."); -function dispose(m) { - //@ts-ignore - if (m.geometry) - //@ts-ignore - m.geometry.dispose(); - m.children.forEach(function (o) { return dispose(o); }); -} -function LoadBoard(view, data, clear) { - if (clear === void 0) { clear = true; } - if (clear) { - dispose(view.m_Scene); - view.m_Scene.children.length = 0; - } - if (data.length === 0) - return; - //加板 - var _a = _1.createTemplateBoard(data), meshs = _a.meshs, edgesa = _a.edgesa; - //加标注 - var dims = _1.DrawDimension(meshs); - (_b = view.m_Scene).add.apply(_b, meshs); - (_c = view.m_Scene).add.apply(_c, edgesa); - (_d = view.m_Scene).add.apply(_d, dims); - view.ViewToSwiso(); - view.ZoomAll(); - view.Zoom(1.1); - var _b, _c, _d; -} -exports.LoadBoard = LoadBoard; -//# sourceMappingURL=Utils.js.map \ No newline at end of file diff --git a/dist/Utils.js.map b/dist/Utils.js.map deleted file mode 100644 index 1acdd06..0000000 --- a/dist/Utils.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"Utils.js","sourceRoot":"","sources":["../src/Utils.ts"],"names":[],"mappings":";;AACA,sBAA+D;AAE/D,iBAAiB,CAAW;IAExB,YAAY;IACZ,IAAI,CAAC,CAAC,QAAQ;QACV,YAAY;QACZ,CAAC,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;IAEzB,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,UAAA,CAAC,IAAI,OAAA,OAAO,CAAC,CAAC,CAAC,EAAV,CAAU,CAAC,CAAC;AACxC,CAAC;AAED,mBAA0B,IAAY,EAAE,IAAW,EAAE,KAAqB;IAArB,sBAAA,EAAA,YAAqB;IAEtE,IAAI,KAAK,EACT;QACI,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACtB,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;KACpC;IAED,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO;IAC9B,IAAI;IACA,IAAA,iCAA6C,EAA3C,gBAAK,EAAE,kBAAM,CAA+B;IAClD,KAAK;IACL,IAAI,IAAI,GAAG,gBAAa,CAAC,KAAK,CAAC,CAAC;IAEhC,CAAA,KAAA,IAAI,CAAC,OAAO,CAAA,CAAC,GAAG,WAAI,KAAK,EAAE;IAC3B,CAAA,KAAA,IAAI,CAAC,OAAO,CAAA,CAAC,GAAG,WAAI,MAAM,EAAE;IAC5B,CAAA,KAAA,IAAI,CAAC,OAAO,CAAA,CAAC,GAAG,WAAI,IAAI,EAAE;IAE1B,IAAI,CAAC,WAAW,EAAE,CAAC;IACnB,IAAI,CAAC,OAAO,EAAE,CAAC;IACf,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;;AACnB,CAAC;AArBD,8BAqBC"} \ No newline at end of file diff --git a/dist/Viewer.d.ts b/dist/Viewer.d.ts deleted file mode 100644 index a499d63..0000000 --- a/dist/Viewer.d.ts +++ /dev/null @@ -1,39 +0,0 @@ -import { Scene, Vector3, WebGLRenderer } from "three"; -import { CameraControls } from "."; -import { CameraUpdate } from "./CameraUpdate"; -export declare class Viewer { - m_LookTarget: any; - m_Camera: CameraUpdate; - m_CameraCtrl: CameraControls; - m_bNeedUpdate: boolean; - m_Render: WebGLRenderer; - m_DomEl: HTMLElement; - _Height: number; - _Width: number; - m_Scene: Scene; - /** - * - * @param {HTMLElement} canvasContainer 可以传入一个div或者一个画布 - * @memberof Viewer - */ - constructor(canvasContainer: HTMLElement); - initRender(canvasContainer: HTMLElement): void; - OnSize: (width?: any, height?: any) => void; - StartRender: () => void; - Render(): void; - ScreenToWorld(pt: Vector3, planVec?: Vector3): void; - WorldToScreen(pt: Vector3): void; - /** - * 更新视角观测目标(物体中心) - * - * @memberof Viewer - */ - UpdateLockTarget(): void; - Rotate(mouseMove: Vector3): void; - Pan(mouseMove: Vector3): void; - Zoom(scale: number, center?: Vector3): void; - ZoomAll(): void; - ViewToTop(): void; - ViewToFront(): void; - ViewToSwiso(): void; -} diff --git a/dist/Viewer.js b/dist/Viewer.js deleted file mode 100644 index 43973fd..0000000 --- a/dist/Viewer.js +++ /dev/null @@ -1,153 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -var three_1 = require("three"); -var _1 = require("."); -var CameraUpdate_1 = require("./CameraUpdate"); -var ColorPalette_1 = require("./ColorPalette"); -var GeUtils_1 = require("./GeUtils"); -var PlaneExt_1 = require("./PlaneExt"); -var Viewer = /** @class */ (function () { - /** - * - * @param {HTMLElement} canvasContainer 可以传入一个div或者一个画布 - * @memberof Viewer - */ - function Viewer(canvasContainer) { - var _this = this; - this.m_Camera = new CameraUpdate_1.CameraUpdate(); - this.m_bNeedUpdate = true; - this.m_Scene = new three_1.Scene(); - this.OnSize = function (width, height) { - _this._Width = width ? width : _this.m_DomEl.clientWidth; - _this._Height = height ? height : _this.m_DomEl.clientHeight; - //校验.成为2的倍数 避免外轮廓错误. - if (_this._Width % 2 == 1) - _this._Width -= 1; - if (_this._Height % 2 == 1) - _this._Height -= 1; - _this.m_Render.setSize(_this._Width, _this._Height); - _this.m_Camera.SetSize(_this._Width, _this._Height); - }; - this.StartRender = function () { - requestAnimationFrame(_this.StartRender); - if (_this.m_Scene != null && _this.m_bNeedUpdate) { - _this.Render(); - _this.m_bNeedUpdate = false; - } - }; - this.m_DomEl = canvasContainer; - this.initRender(canvasContainer); - this.OnSize(); - this.StartRender(); - this.m_CameraCtrl = new _1.CameraControls(this); - window.addEventListener("resize", function () { - _this.OnSize(); - }); - var oldMesh; - this.m_Render.domElement.addEventListener("mousemove", function (e) { - var mesh = _1.PointPick(_this, e.offsetX, e.offsetY); - if (oldMesh) - oldMesh.material = _1.boardMaterial; - if (mesh && mesh.material !== ColorPalette_1.ColorMaterial.GetLineMaterial(1)) { - oldMesh = mesh; - mesh.material = _1.selectMaterial; - } - _this.m_bNeedUpdate = true; - }); - } - //初始化render - Viewer.prototype.initRender = function (canvasContainer) { - var params = { - antialias: true, - precision: "highp", - alpha: true //alpha:true/false是否可以设置背景色透明 - }; - if (canvasContainer instanceof HTMLCanvasElement) { - params.canvas = canvasContainer; - this.m_Render = new three_1.WebGLRenderer(params); - } - else { - this.m_Render = new three_1.WebGLRenderer(params); - //加到画布 - canvasContainer.appendChild(this.m_Render.domElement); - } - this.m_Render.autoClear = true; - //如果设置，那么它希望所有的纹理和颜色都是预乘的伽玛。默认值为false。 - // this.m_Render.gammaInput = true; - // this.m_Render.gammaOutput = true; - // this.m_Render.shadowMap.enabled = true; - // this.m_Render.toneMapping = ReinhardToneMapping; - //设置设备像素比。 这通常用于HiDPI设备，以防止模糊输出画布。 - this.m_Render.setPixelRatio(window.devicePixelRatio); - this.m_Render.physicallyCorrectLights = true; - //this.m_Render.toneMappingExposure = Math.pow(1, 5.0); // to allow for very bright scenes. - //设置它的背景色为黑色 - this.m_Render.setClearColor(0xffffff, 1); - this.OnSize(); - }; - Viewer.prototype.Render = function () { - this.m_Render.render(this.m_Scene, this.m_Camera.Camera); - }; - Viewer.prototype.ScreenToWorld = function (pt, planVec) { - //变换和求交点 - var plan = new PlaneExt_1.PlaneExt(planVec || new three_1.Vector3(0, 0, 1)); - var raycaster = new three_1.Raycaster(); - // 射线从相机射线向屏幕点位置 - raycaster.setFromCamera({ - x: (pt.x / this._Width) * 2 - 1, - y: -(pt.y / this._Height) * 2 + 1 - }, this.m_Camera.Camera); - plan.intersectRay(raycaster.ray, pt, true); - }; - Viewer.prototype.WorldToScreen = function (pt) { - var widthHalf = this._Width * 0.5; - var heightHalf = this._Height * 0.5; - pt.project(this.m_Camera.Camera); - pt.x = (pt.x * widthHalf) + widthHalf; - pt.y = -(pt.y * heightHalf) + heightHalf; - }; - /** - * 更新视角观测目标(物体中心) - * - * @memberof Viewer - */ - Viewer.prototype.UpdateLockTarget = function () { - var renderList = this.m_Render.renderLists.get(this.m_Scene, this.m_Camera.Camera); - var box = GeUtils_1.GetBoxArr(renderList.opaque.map(function (o) { return o.object; })); - if (box) - this.m_LookTarget = box.getCenter(new three_1.Vector3()); - else - this.m_LookTarget = GeUtils_1.cZeroVec; - }; - Viewer.prototype.Rotate = function (mouseMove) { - this.m_Camera.Rotate(mouseMove, this.m_LookTarget); - this.m_bNeedUpdate = true; - }; - Viewer.prototype.Pan = function (mouseMove) { - this.m_Camera.Pan(mouseMove); - this.m_bNeedUpdate = true; - }; - Viewer.prototype.Zoom = function (scale, center) { - this.m_Camera.Zoom(scale, center); - this.m_bNeedUpdate = true; - }; - Viewer.prototype.ZoomAll = function () { - this.m_Camera.ZoomExtensBox3(GeUtils_1.GetBox(this.m_Scene, true)); - this.m_bNeedUpdate = true; - }; - Viewer.prototype.ViewToTop = function () { - this.m_Camera.LookAt(new three_1.Vector3(0, 0, -1)); - this.m_bNeedUpdate = true; - }; - Viewer.prototype.ViewToFront = function () { - this.m_Camera.LookAt(new three_1.Vector3(0, 1, 0)); - this.m_bNeedUpdate = true; - }; - Viewer.prototype.ViewToSwiso = function () { - this.m_Camera.LookAt(new three_1.Vector3(1, 1, -1)); - this.m_bNeedUpdate = true; - }; - return Viewer; -}()); -exports.Viewer = Viewer; -//# sourceMappingURL=Viewer.js.map \ No newline at end of file diff --git a/dist/Viewer.js.map b/dist/Viewer.js.map deleted file mode 100644 index c43c1a0..0000000 --- a/dist/Viewer.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"Viewer.js","sourceRoot":"","sources":["../src/Viewer.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/createBoard.d.ts b/dist/createBoard.d.ts deleted file mode 100644 index 04c9a36..0000000 --- a/dist/createBoard.d.ts +++ /dev/null @@ -1,22 +0,0 @@ -import * as THREE from 'three'; -import { Geometry, LineSegments, Shape, Vector2 } from 'three'; -export declare class Arc2d { - m_StartAn: number; - m_EndAn: number; - m_StartPoint: THREE.Vector2; - m_EndPoint: THREE.Vector2; - m_Center: THREE.Vector2; - m_Radius: number; - constructor(p1: THREE.Vector2, p2: THREE.Vector2, bul: number); -} -export declare function createPath(pts: Vector2[], buls: number[], shapeOut?: Shape): Shape; -export declare function getVec(data: object): THREE.Vector3; -export declare function createBoard(boardData: object): { - mesh: THREE.Mesh; - edges: (THREE.Mesh | THREE.LineSegments)[]; -}; -export declare function createTemplateBoard(brDataList: any[]): { - meshs: any[]; - edgesa: any[]; -}; -export declare function createEdge(geo: Geometry): LineSegments; diff --git a/dist/createBoard.js b/dist/createBoard.js deleted file mode 100644 index eb8cbb1..0000000 --- a/dist/createBoard.js +++ /dev/null @@ -1,169 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -var THREE = require("three"); -var three_1 = require("three"); -var ColorPalette_1 = require("./ColorPalette"); -var GeUtils_1 = require("./GeUtils"); -var Material_1 = require("./Material"); -var RotateUV_1 = require("./RotateUV"); -var ThreeCSG_1 = require("./ThreeCSG"); -//解析二维圆弧类. -var Arc2d = /** @class */ (function () { - function Arc2d(p1, p2, bul) { - this.m_StartPoint = p1.clone(); - this.m_EndPoint = p2.clone(); - var vec = p2.clone().sub(p1); - var len = vec.length(); - var an = vec.angle(); - this.m_Radius = len / Math.sin(2 * Math.atan(bul)) / 2; - var allAngle = Math.atan(bul) * 4; - var delDis = bul * len / 2; - var toDis = this.m_Radius - delDis; - an += Math.PI * 0.5; - this.m_Center = p1.clone().add(p2); - this.m_Center.multiplyScalar(0.5); - GeUtils_1.polar(this.m_Center, an, toDis); - this.m_StartAn = p1.clone().sub(this.m_Center).angle(); - this.m_EndAn = p2.clone().sub(this.m_Center).angle(); - if (bul < 0) { - //一个神奇的特性 它需要这么做 - this.m_StartAn -= Math.PI; - this.m_EndAn -= Math.PI; - } - } - return Arc2d; -}()); -exports.Arc2d = Arc2d; -//创建轮廓 通过点表和凸度 -function createPath(pts, buls, shapeOut) { - var shape = shapeOut || new three_1.Shape(); - if (pts.length === 0) - return shape; - var firstPt = pts[0]; - shape.moveTo(firstPt.x, firstPt.y); - for (var i = 0; i < pts.length - 1; i++) { - var nextPt = pts[i + 1]; - if (buls[i] == 0) { - shape.lineTo(nextPt.x, nextPt.y); - } - else { - var pt = pts[i]; - //参考 - //http://www.dorodnic.com/blog/tag/three-js/ 绘制一个齿轮 - //https://www.kirupa.com/html5/drawing_circles_canvas.htm //html5 - var arc2 = new Arc2d(pt, nextPt, buls[i]); - var cen = arc2.m_Center; - shape.absarc(cen.x, cen.y, arc2.m_Radius, arc2.m_StartAn, arc2.m_EndAn, buls[i] < 0); - } - } - return shape; -} -exports.createPath = createPath; -function getVec(data) { - return new THREE.Vector3(data["x"], data["y"], data["z"]); -} -exports.getVec = getVec; -//创建板件 暂时这么写 -function createBoard(boardData) { - var pts = []; - var buls = []; - var boardPts = boardData["Pts"]; - var boardBuls = boardData["Buls"]; - var boardHeight = boardData["H"]; - var boardMat = new THREE.Matrix4(); - var matInv = new THREE.Matrix4(); - //InitBoardMat - { - var xD = getVec(boardData["XVec"]); - var yD = getVec(boardData["YVec"]); - var ZD = getVec(boardData["ZVec"]); - var pBase = getVec(boardData["BasePoint"]); - boardMat.makeBasis(xD, yD, ZD); - boardMat.setPosition(pBase); - matInv.getInverse(boardMat, true); - } - if (boardPts && boardPts.length !== 0) - for (var i = 0; i < boardPts.length; i++) { - var pt = getVec(boardPts[i]); - if (boardPts[i].z !== undefined) - pt.applyMatrix4(matInv); - pts.push(new THREE.Vector2(pt.x, pt.y)); - buls.push(boardBuls[i]); - } - else { - var length_1 = boardData["L"]; - var width = boardData["W"]; - var height = boardData["H"]; - pts.push(new three_1.Vector2(0, 0), new three_1.Vector2(width, 0), new three_1.Vector2(width, length_1), new three_1.Vector2(0, length_1), new three_1.Vector2(0, 0)); - buls.push(0, 0, 0, 0, 0); - } - var sp = createPath(pts, buls); - var extrudeSettings = { - steps: 1, - bevelEnabled: false, - amount: boardHeight - }; - var ext = new THREE.ExtrudeGeometry(sp, extrudeSettings); - ext.computeBoundingSphere(); - ext.computeBoundingBox(); - ext.translate(0, 0, -boardHeight); - ext.applyMatrix(boardMat); - //外边. - var edges = [createEdge(ext)]; - //差集 - if (checkObjectArray(boardData, "SubBoardLocal") - || checkObjectArray(boardData, "Drillings")) { - var thisCsg = new ThreeCSG_1.ThreeBSP(ext); - if (boardData["SubBoardLocal"]) { - var subBoardList = boardData["SubBoardLocal"].map(function (d) { return createBoard(d); }); - for (var _i = 0, subBoardList_1 = subBoardList; _i < subBoardList_1.length; _i++) { - var br = subBoardList_1[_i]; - edges.push.apply(edges, br.edges); - var subCsg = new ThreeCSG_1.ThreeBSP(br.mesh); - thisCsg = thisCsg.subtract(subCsg); - } - } - if (boardData["Drillings"]) { - var dris = boardData["Drillings"]; - for (var _a = 0, dris_1 = dris; _a < dris_1.length; _a++) { - var dri = dris_1[_a]; - var geo = new three_1.CylinderGeometry(dri.r, dri.r, dri.h, 8); - geo.rotateX(Math.PI * 0.5); - if (dri.f === 0) //0正 - geo.translate(dri.x, dri.y, -dri.h * 0.5); - else //1反 - geo.translate(dri.x, dri.y, dri.h * 0.5 - boardData["H"]); - geo.applyMatrix(boardMat); - var mesh_1 = new three_1.Mesh(geo, ColorPalette_1.ColorMaterial.GetLineMaterial(1)); - edges.push(mesh_1); - } - } - ext = thisCsg.toGeometry(); - } - if (boardData["BoardName"] === "地脚线") - RotateUV_1.RotateUVs(ext); - var mesh = new THREE.Mesh(ext, Material_1.boardMaterial); - return { mesh: mesh, edges: edges }; -} -exports.createBoard = createBoard; -function checkObjectArray(obj, key) { - return obj[key] && obj[key].length > 0; -} -function createTemplateBoard(brDataList) { - var meshs = []; - var edgesa = []; - for (var _i = 0, brDataList_1 = brDataList; _i < brDataList_1.length; _i++) { - var d = brDataList_1[_i]; - var _a = createBoard(d), mesh = _a.mesh, edges = _a.edges; - meshs.push(mesh); - edgesa.push.apply(edgesa, edges); - } - return { meshs: meshs, edgesa: edgesa }; -} -exports.createTemplateBoard = createTemplateBoard; -function createEdge(geo) { - var edge = new THREE.EdgesGeometry(geo, 1); - return new three_1.LineSegments(edge, Material_1.edgeMaterial); -} -exports.createEdge = createEdge; -//# sourceMappingURL=createBoard.js.map \ No newline at end of file diff --git a/dist/createBoard.js.map b/dist/createBoard.js.map deleted file mode 100644 index d136ea1..0000000 --- a/dist/createBoard.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"createBoard.js","sourceRoot":"","sources":["../src/createBoard.ts"],"names":[],"mappings":";;AAAA,6BAA+B;AAC/B,+BAAuF;AACvF,+CAA+C;AAC/C,qCAAkC;AAClC,uCAAyD;AACzD,uCAAuC;AACvC,uCAAsC;AACtC,UAAU;AACV;IAQI,eAAY,EAAiB,EAAE,EAAiB,EAAE,GAAW;QAEzD,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC,KAAK,EAAE,CAAC;QAC/B,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC,KAAK,EAAE,CAAC;QAE7B,IAAI,GAAG,GAAkB,EAAE,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC5C,IAAI,GAAG,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC;QACvB,IAAI,EAAE,GAAG,GAAG,CAAC,KAAK,EAAE,CAAC;QACrB,IAAI,CAAC,QAAQ,GAAG,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;QACvD,IAAI,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAClC,IAAI,MAAM,GAAG,GAAG,GAAG,GAAG,GAAG,CAAC,CAAC;QAC3B,IAAI,KAAK,GAAG,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC;QACnC,EAAE,IAAI,IAAI,CAAC,EAAE,GAAG,GAAG,CAAC;QAEpB,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACnC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;QAElC,eAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;QAEhC,IAAI,CAAC,SAAS,GAAG,EAAE,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,CAAC;QACvD,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,CAAC;QACrD,IAAI,GAAG,GAAG,CAAC,EACX;YACI,gBAAgB;YAChB,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,EAAE,CAAC;YAC1B,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,EAAE,CAAC;SAC3B;IACL,CAAC;IACL,YAAC;AAAD,CAAC,AApCD,IAoCC;AApCY,sBAAK;AAsClB,kBAAkB;AAClB,oBAA2B,GAAc,EAAE,IAAc,EAAE,QAAgB;IAEvE,IAAI,KAAK,GAAG,QAAQ,IAAI,IAAI,aAAK,EAAE,CAAC;IACpC,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IACnC,IAAI,OAAO,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;IAErB,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IACnC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,EAAE,EACvC;QACI,IAAI,MAAM,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QACxB,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,EAChB;YACI,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAA;SACnC;aAED;YACI,IAAI,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;YAChB,IAAI;YACJ,mDAAmD;YACnD,iEAAiE;YACjE,IAAI,IAAI,GAAG,IAAI,KAAK,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;YAC1C,IAAI,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC;YACxB,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;SACxF;KACJ;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AA1BD,gCA0BC;AACD,gBAAuB,IAAY;IAE/B,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAC9D,CAAC;AAHD,wBAGC;AAED,YAAY;AACZ,qBAA4B,SAAiB;IAEzC,IAAI,GAAG,GAAoB,EAAE,CAAC;IAC9B,IAAI,IAAI,GAAa,EAAE,CAAC;IACxB,IAAI,QAAQ,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;IAChC,IAAI,SAAS,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;IAElC,IAAI,WAAW,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;IAEjC,IAAI,QAAQ,GAAG,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;IACnC,IAAI,MAAM,GAAkB,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;IAChD,cAAc;IACd;QACI,IAAI,EAAE,GAAG,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;QACnC,IAAI,EAAE,GAAG,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;QACnC,IAAI,EAAE,GAAG,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;QACnC,IAAI,KAAK,GAAG,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC;QAE3C,QAAQ,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QAC/B,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAC5B,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;KACrC;IAED,IAAI,QAAQ,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;QACjC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EACxC;YACI,IAAI,EAAE,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;YAC7B,IAAI,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,SAAS;gBAC3B,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;YAC5B,GAAG,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;YACxC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;SAC3B;SAEL;QACI,IAAI,QAAM,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;QAC5B,IAAI,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;QAC3B,IAAI,MAAM,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;QAC5B,GAAG,CAAC,IAAI,CAAC,IAAI,eAAO,CAAC,CAAC,EAAE,CAAC,CAAC,EACtB,IAAI,eAAO,CAAC,KAAK,EAAE,CAAC,CAAC,EACrB,IAAI,eAAO,CAAC,KAAK,EAAE,QAAM,CAAC,EAC1B,IAAI,eAAO,CAAC,CAAC,EAAE,QAAM,CAAC,EACtB,IAAI,eAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CACpB,CAAC;QACF,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;KAC5B;IAED,IAAI,EAAE,GAAG,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAC/B,IAAI,eAAe,GAAG;QAClB,KAAK,EAAE,CAAC;QACR,YAAY,EAAE,KAAK;QACnB,MAAM,EAAE,WAAW;KACtB,CAAC;IAEF,IAAI,GAAG,GAAG,IAAI,KAAK,CAAC,eAAe,CAAC,EAAE,EAAE,eAAe,CAAa,CAAC;IACrE,GAAG,CAAC,qBAAqB,EAAE,CAAC;IAC5B,GAAG,CAAC,kBAAkB,EAAE,CAAC;IACzB,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,WAAW,CAAC,CAAA;IACjC,GAAG,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IAE1B,KAAK;IACL,IAAI,KAAK,GAA4B,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;IAEvD,IAAI;IACJ,IAAI,gBAAgB,CAAC,SAAS,EAAE,eAAe,CAAC;WACzC,gBAAgB,CAAC,SAAS,EAAE,WAAW,CAAC,EAC/C;QACI,IAAI,OAAO,GAAG,IAAI,mBAAQ,CAAC,GAAG,CAAC,CAAC;QAEhC,IAAI,SAAS,CAAC,eAAe,CAAC,EAC9B;YACI,IAAI,YAAY,GAAG,SAAS,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,UAAA,CAAC,IAAI,OAAA,WAAW,CAAC,CAAC,CAAC,EAAd,CAAc,CAAC,CAAC;YACvE,KAAe,UAAY,EAAZ,6BAAY,EAAZ,0BAAY,EAAZ,IAAY;gBAAtB,IAAI,EAAE,qBAAA;gBAEP,KAAK,CAAC,IAAI,OAAV,KAAK,EAAS,EAAE,CAAC,KAAK,EAAE;gBACxB,IAAI,MAAM,GAAG,IAAI,mBAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;gBACnC,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;aACtC;SACJ;QACD,IAAI,SAAS,CAAC,WAAW,CAAC,EAC1B;YACI,IAAI,IAAI,GAAG,SAAS,CAAC,WAAW,CAAC,CAAC;YAClC,KAAgB,UAAI,EAAJ,aAAI,EAAJ,kBAAI,EAAJ,IAAI;gBAAf,IAAI,GAAG,aAAA;gBAER,IAAI,GAAG,GAAG,IAAI,wBAAgB,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBACvD,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,GAAG,CAAC,CAAC;gBAE3B,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,EAAE,IAAI;oBACjB,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC;qBAC7B,IAAI;oBACjB,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,GAAG,GAAG,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;gBAE9D,GAAG,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;gBAE1B,IAAI,MAAI,GAAG,IAAI,YAAI,CAAC,GAAG,EAAE,4BAAa,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC3D,KAAK,CAAC,IAAI,CAAC,MAAI,CAAC,CAAC;aAOpB;SACJ;QACD,GAAG,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;KAC9B;IAED,IAAI,SAAS,CAAC,WAAW,CAAC,KAAK,KAAK;QAChC,oBAAS,CAAC,GAAG,CAAC,CAAC;IAEnB,IAAI,IAAI,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,wBAAa,CAAC,CAAC;IAC9C,OAAO,EAAE,IAAI,MAAA,EAAE,KAAK,OAAA,EAAE,CAAC;AAC3B,CAAC;AA/GD,kCA+GC;AAED,0BAA0B,GAAQ,EAAE,GAAW;IAE3C,OAAO,GAAG,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;AAC3C,CAAC;AAED,6BAAoC,UAAiB;IAEjD,IAAI,KAAK,GAAG,EAAE,CAAC;IACf,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,KAAc,UAAU,EAAV,yBAAU,EAAV,wBAAU,EAAV,IAAU;QAAnB,IAAI,CAAC,mBAAA;QAEF,IAAA,mBAAgC,EAA9B,cAAI,EAAE,gBAAK,CAAoB;QACrC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjB,MAAM,CAAC,IAAI,OAAX,MAAM,EAAS,KAAK,EAAE;KACzB;IACD,OAAO,EAAE,KAAK,OAAA,EAAE,MAAM,QAAA,EAAE,CAAC;AAC7B,CAAC;AAXD,kDAWC;AAED,oBAA2B,GAAa;IAEpC,IAAI,IAAI,GAAG,IAAI,KAAK,CAAC,aAAa,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;IAC3C,OAAO,IAAI,oBAAY,CAAC,IAAI,EAAE,uBAAY,CAAC,CAAC;AAChD,CAAC;AAJD,gCAIC"} \ No newline at end of file diff --git a/dist/data.d.ts b/dist/data.d.ts deleted file mode 100644 index 3419937..0000000 --- a/dist/data.d.ts +++ /dev/null @@ -1,75 +0,0 @@ -export declare var data: ({ - "L": number; - "W": number; - "H": number; - "BasePoint": { - "x": number; - "y": number; - "z": number; - }; - "XVec": { - "x": number; - "y": number; - "z": number; - }; - "YVec": { - "x": number; - "y": number; - "z": number; - }; - "ZVec": { - "x": number; - "y": number; - "z": number; - }; - "Pts": { - "x": number; - "y": number; - "z": number; - }[]; - "Buls": number[]; - "SubBoardLocal": any[]; - "SubBoardAssoc": any[]; - MaterialId?: undefined; - Handle?: undefined; - CabName?: undefined; - BoardName?: undefined; - Grain?: undefined; -} | { - "L": number; - "W": number; - "H": number; - "MaterialId": string; - "BasePoint": { - "x": number; - "y": number; - "z": number; - }; - "XVec": { - "x": number; - "y": number; - "z": number; - }; - "YVec": { - "x": number; - "y": number; - "z": number; - }; - "ZVec": { - "x": number; - "y": number; - "z": number; - }; - "Handle": string; - "CabName": string; - "BoardName": string; - "Grain": number; - "Pts": { - "x": number; - "y": number; - "z": number; - }[]; - "Buls": number[]; - "SubBoardLocal": any[]; - "SubBoardAssoc": any[]; -})[]; diff --git a/dist/data.js b/dist/data.js deleted file mode 100644 index 1f4853d..0000000 --- a/dist/data.js +++ /dev/null @@ -1,552 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.data = [ - { - "L": 100.0, - "W": 800.0, - "H": 18.0, - "BasePoint": { - "x": 2076.407626150509, - "y": 1942.2104819571228, - "z": 1882.0 - }, - "XVec": { - "x": 1.0, - "y": 4.930380657631324e-32, - "z": -2.220446049250313e-16 - }, - "YVec": { - "x": 2.220446049250313e-16, - "y": 2.220446049250313e-16, - "z": 1.0 - }, - "ZVec": { - "x": 9.860761315262648e-32, - "y": -1.0, - "z": 2.220446049250313e-16 - }, - "Pts": [ - { - "x": 2076.407626150509, - "y": 1942.2104819571228, - "z": 1882.0 - }, - { - "x": 2876.407626150509, - "y": 1942.2104819571228, - "z": 1881.9999999999998 - }, - { - "x": 2876.407626150509, - "y": 1942.2104819571228, - "z": 1981.9999999999998 - }, - { - "x": 2076.407626150509, - "y": 1942.2104819571228, - "z": 1982.0 - }, - { - "x": 2076.407626150509, - "y": 1942.2104819571228, - "z": 1882.0 - } - ], - "Buls": [ - 0.0, - 0.0, - 0.0, - 0.0, - 0.0 - ], - "SubBoardLocal": [], - "SubBoardAssoc": [] - }, - { - "L": 800.0, - "W": 100.00000000000068, - "H": 18.0, - "MaterialId": "EE", - "BasePoint": { - "x": 2876.407626150509, - "y": 1960.2104819571226, - "z": 1900.0000000000005 - }, - "XVec": { - "x": 4.440892098500626e-16, - "y": 1.0, - "z": 2.2204460492503124e-16 - }, - "YVec": { - "x": -1.0, - "y": 4.440892098500626e-16, - "z": 2.220446049250314e-16 - }, - "ZVec": { - "x": 2.220446049250313e-16, - "y": -2.220446049250313e-16, - "z": 1.0 - }, - "Handle": "293", - "CabName": "1.标准柜上梁1", - "BoardName": "", - "Grain": 0, - "Pts": [ - { - "x": 2876.407626150509, - "y": 1960.2104819571228, - "z": 1900.0000000000005 - }, - { - "x": 2876.407626150509, - "y": 2060.210481957123, - "z": 1900.0000000000005 - }, - { - "x": 2076.407626150509, - "y": 2060.210481957123, - "z": 1900.0000000000005 - }, - { - "x": 2076.407626150509, - "y": 1960.210481957123, - "z": 1900.0000000000005 - }, - { - "x": 2876.407626150509, - "y": 1960.2104819571228, - "z": 1900.0000000000005 - } - ], - "Buls": [ - 0.0, - 0.0, - 0.0, - 0.0, - 0.0 - ], - "SubBoardLocal": [], - "SubBoardAssoc": [] - }, - { - "L": 1899.9999999999998, - "W": 800.0, - "H": 18.0, - "MaterialId": "EE", - "BasePoint": { - "x": 2076.407626150509, - "y": 2060.2104819571225, - "z": -1.816324868286756e-13 - }, - "XVec": { - "x": 1.0, - "y": 0.0, - "z": 0.0 - }, - "YVec": { - "x": 0.0, - "y": 4.440892098500626e-16, - "z": 1.0 - }, - "ZVec": { - "x": 0.0, - "y": -1.0, - "z": 4.440892098500626e-16 - }, - "Handle": "291", - "CabName": "1.标准柜上梁1", - "BoardName": "背板", - "Grain": 0, - "Pts": [ - { - "x": 2076.407626150509, - "y": 2060.2104819571225, - "z": -1.021405182655144e-13 - }, - { - "x": 2876.407626150509, - "y": 2060.2104819571225, - "z": -1.816324868286756e-13 - }, - { - "x": 2876.407626150509, - "y": 2060.210481957123, - "z": 1899.9999999999996 - }, - { - "x": 2076.407626150509, - "y": 2060.210481957123, - "z": 1899.9999999999998 - }, - { - "x": 2076.407626150509, - "y": 2060.2104819571225, - "z": -1.021405182655144e-13 - } - ], - "Buls": [ - 0.0, - 0.0, - 0.0, - 0.0, - 0.0 - ], - "SubBoardLocal": [], - "SubBoardAssoc": [] - }, - { - "L": 800.0, - "W": 482.0000000000002, - "H": 18.0, - "MaterialId": "EE", - "BasePoint": { - "x": 2876.407626150509, - "y": 1578.210481957122, - "z": 97.99999999999999 - }, - "XVec": { - "x": 4.440892098500626e-16, - "y": 1.0, - "z": 0.0 - }, - "YVec": { - "x": -1.0, - "y": 4.440892098500626e-16, - "z": 0.0 - }, - "ZVec": { - "x": 0.0, - "y": 0.0, - "z": 1.0 - }, - "Handle": "290", - "CabName": "1.标准柜上梁1", - "BoardName": "底板", - "Grain": 0, - "Pts": [ - { - "x": 2876.407626150509, - "y": 1578.210481957122, - "z": 97.99999999999999 - }, - { - "x": 2876.407626150509, - "y": 2060.2104819571225, - "z": 97.99999999999999 - }, - { - "x": 2076.407626150509, - "y": 2060.2104819571225, - "z": 97.99999999999999 - }, - { - "x": 2076.407626150509, - "y": 1578.2104819571226, - "z": 97.99999999999999 - }, - { - "x": 2876.407626150509, - "y": 1578.210481957122, - "z": 97.99999999999999 - } - ], - "Buls": [ - 0.0, - 0.0, - 0.0, - 0.0, - 0.0 - ], - "SubBoardLocal": [], - "SubBoardAssoc": [] - }, - { - "L": 80.0, - "W": 800.0, - "H": 18.0, - "MaterialId": "EE", - "BasePoint": { - "x": 2076.407626150509, - "y": 1578.2104819571223, - "z": 0.0 - }, - "XVec": { - "x": 1.0, - "y": 0.0, - "z": 0.0 - }, - "YVec": { - "x": 0.0, - "y": 4.440892098500626e-16, - "z": 1.0 - }, - "ZVec": { - "x": 0.0, - "y": -1.0, - "z": 4.440892098500626e-16 - }, - "Handle": "28E", - "CabName": "1.标准柜上梁1", - "BoardName": "地脚线", - "Grain": 1, - "Pts": [ - { - "x": 2076.407626150509, - "y": 1578.2104819571223, - "z": 0.0 - }, - { - "x": 2876.407626150509, - "y": 1578.2104819571223, - "z": 0.0 - }, - { - "x": 2876.407626150509, - "y": 1578.2104819571223, - "z": 80.0 - }, - { - "x": 2076.407626150509, - "y": 1578.2104819571223, - "z": 80.0 - }, - { - "x": 2076.407626150509, - "y": 1578.2104819571223, - "z": 0.0 - } - ], - "Buls": [ - 0.0, - 0.0, - 0.0, - 0.0, - 0.0 - ], - "SubBoardLocal": [], - "SubBoardAssoc": [] - }, - { - "L": 800.0, - "W": 482.0, - "H": 18.0, - "MaterialId": "EE", - "BasePoint": { - "x": 2876.4076261505085, - "y": 1478.210481957122, - "z": 1999.9999999999996 - }, - "XVec": { - "x": 4.440892098500626e-16, - "y": 1.0, - "z": 0.0 - }, - "YVec": { - "x": -1.0, - "y": 4.440892098500626e-16, - "z": 0.0 - }, - "ZVec": { - "x": 0.0, - "y": 0.0, - "z": 1.0 - }, - "Handle": "28C", - "CabName": "1.标准柜上梁1", - "BoardName": "顶板", - "Grain": 0, - "Pts": [ - { - "x": 2076.407626150509, - "y": 1960.2104819571223, - "z": 1999.9999999999996 - }, - { - "x": 2076.407626150509, - "y": 1478.2104819571226, - "z": 1999.9999999999996 - }, - { - "x": 2876.407626150509, - "y": 1478.210481957122, - "z": 1999.9999999999996 - }, - { - "x": 2876.4076261505085, - "y": 1960.210481957122, - "z": 1999.9999999999996 - }, - { - "x": 2076.407626150509, - "y": 1960.2104819571223, - "z": 1999.9999999999996 - } - ], - "Buls": [ - 0.0, - 0.0, - 0.0, - 0.0, - 0.0 - ], - "SubBoardLocal": [], - "SubBoardAssoc": [] - }, - { - "L": 1999.9999999999996, - "W": 600.0, - "H": 18.0, - "MaterialId": "EE", - "BasePoint": { - "x": 2894.4076261505094, - "y": 1478.2104819571223, - "z": -2.2737367544323197e-13 - }, - "XVec": { - "x": 4.930380657631324e-32, - "y": 1.0, - "z": -2.220446049250313e-16 - }, - "YVec": { - "x": -2.220446049250313e-16, - "y": 2.220446049250313e-16, - "z": 1.0 - }, - "ZVec": { - "x": 1.0, - "y": 0.0, - "z": 2.220446049250313e-16 - }, - "Handle": "28B", - "CabName": "1.标准柜上梁1", - "BoardName": "右侧板", - "Grain": 0, - "Pts": [ - { - "x": 2894.407626150509, - "y": 1960.2104819571228, - "z": 1899.9999999999989 - }, - { - "x": 2894.407626150509, - "y": 1960.2104819571228, - "z": 1999.9999999999994 - }, - { - "x": 2894.407626150509, - "y": 1478.2104819571228, - "z": 1999.9999999999994 - }, - { - "x": 2894.4076261505094, - "y": 1478.2104819571223, - "z": -1.816324868286755e-13 - }, - { - "x": 2894.4076261505094, - "y": 2078.2104819571225, - "z": -6.274980535181384e-13 - }, - { - "x": 2894.407626150509, - "y": 2078.2104819571229, - "z": 1899.9999999999973 - }, - { - "x": 2894.407626150509, - "y": 1960.2104819571228, - "z": 1899.9999999999989 - } - ], - "Buls": [ - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0 - ], - "SubBoardLocal": [], - "SubBoardAssoc": [] - }, - { - "L": 1999.9999999999996, - "W": 600.0, - "H": 18.0, - "MaterialId": "EE", - "BasePoint": { - "x": 2076.4076261505094, - "y": 1478.2104819571223, - "z": 1.0097419586828951e-28 - }, - "XVec": { - "x": 4.930380657631324e-32, - "y": 1.0, - "z": -2.220446049250313e-16 - }, - "YVec": { - "x": -2.220446049250313e-16, - "y": 2.220446049250313e-16, - "z": 1.0 - }, - "ZVec": { - "x": 1.0, - "y": 0.0, - "z": 2.220446049250313e-16 - }, - "Handle": "288", - "CabName": "1.标准柜上梁1", - "BoardName": "左侧板", - "Grain": 0, - "Pts": [ - { - "x": 2076.407626150509, - "y": 1960.2104819571228, - "z": 1899.999999999999 - }, - { - "x": 2076.407626150509, - "y": 1960.2104819571228, - "z": 1999.9999999999996 - }, - { - "x": 2076.407626150509, - "y": 1478.2104819571228, - "z": 1999.9999999999996 - }, - { - "x": 2076.4076261505094, - "y": 1478.2104819571223, - "z": 1.0097419586828951e-28 - }, - { - "x": 2076.4076261505094, - "y": 2078.2104819571225, - "z": -4.4586556668946279e-13 - }, - { - "x": 2076.407626150509, - "y": 2078.2104819571229, - "z": 1899.9999999999978 - }, - { - "x": 2076.407626150509, - "y": 1960.2104819571228, - "z": 1899.999999999999 - } - ], - "Buls": [ - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0 - ], - "SubBoardLocal": [], - "SubBoardAssoc": [] - } -]; -//# sourceMappingURL=data.js.map \ No newline at end of file diff --git a/dist/data.js.map b/dist/data.js.map deleted file mode 100644 index 05dc03f..0000000 --- a/dist/data.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"data.js","sourceRoot":"","sources":["../src/data.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/index.d.ts b/dist/index.d.ts deleted file mode 100644 index b1036cd..0000000 --- a/dist/index.d.ts +++ /dev/null @@ -1,9 +0,0 @@ -export * from "./Viewer"; -export * from "./CameraControls"; -export * from "./GeUtils"; -export * from "./createBoard"; -export * from "./Dimension"; -export * from "./DrawDimension"; -export * from "./Material"; -export * from "./PointPick"; -export * from "./Utils"; diff --git a/dist/index.js b/dist/index.js deleted file mode 100644 index cd3f1dc..0000000 --- a/dist/index.js +++ /dev/null @@ -1,15 +0,0 @@ -"use strict"; -function __export(m) { - for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p]; -} -Object.defineProperty(exports, "__esModule", { value: true }); -__export(require("./Viewer")); -__export(require("./CameraControls")); -__export(require("./GeUtils")); -__export(require("./createBoard")); -__export(require("./Dimension")); -__export(require("./DrawDimension")); -__export(require("./Material")); -__export(require("./PointPick")); -__export(require("./Utils")); -//# sourceMappingURL=index.js.map \ No newline at end of file diff --git a/dist/index.js.map b/dist/index.js.map deleted file mode 100644 index ef85b1c..0000000 --- a/dist/index.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;AAAA,8BAAyB;AACzB,sCAAiC;AACjC,+BAA0B;AAC1B,mCAA8B;AAC9B,iCAA4B;AAC5B,qCAAgC;AAChC,gCAA2B;AAC3B,iCAA2B;AAC3B,6BAAuB"} \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 64373ff..5c5b404 100644 --- a/package-lock.json +++ b/package-lock.json @@ -25,7 +25,7 @@ }, "@types/events": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@types/events/-/events-1.2.0.tgz", + "resolved": "http://registry.npmjs.org/@types/events/-/events-1.2.0.tgz", "integrity": "sha512-KEIlhXnIutzKwRbQkGWb/I4HFqBuUykAdHgDED6xqwXJfONCjF5VoE0cXEiurh3XauygxzeDzgtXUqvLkxFzzA==", "dev": true }, @@ -89,9 +89,9 @@ "dev": true }, "@types/node": { - "version": "10.7.1", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.7.1.tgz", - "integrity": "sha512-EGoI4ylB/lPOaqXqtzAyL8HcgOuCtH2hkEaLmkueOYufsTFWBn4VCvlCDC2HW8Q+9iF+QVC3sxjDKQYjHQeZ9w==", + "version": "10.11.7", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.11.7.tgz", + "integrity": "sha512-yOxFfkN9xUFLyvWaeYj90mlqTJ41CsQzWKS3gXdOMOyPVacUsymejKxJ4/pMW7exouubuEeZLJawGgcNGYlTeg==", "dev": true }, "@types/range-parser": { @@ -117,13 +117,10 @@ "dev": true }, "@types/three": { - "version": "0.92.17", - "resolved": "https://registry.npmjs.org/@types/three/-/three-0.92.17.tgz", - "integrity": "sha512-xTeOfK7Ym4OoENU4PCWZrYzgXirRA8JtDsulgr3CP6yMfP+12KbwzcCNArR5Zg1Wu5c/4Q1040zSTB23B6GFVQ==", - "dev": true, - "requires": { - "@types/webvr-api": "*" - } + "version": "0.92.25", + "resolved": "https://registry.npmjs.org/@types/three/-/three-0.92.25.tgz", + "integrity": "sha512-xutT9mv07h4hmVR5UyL6qTZf+NJGeVpKd/2ZNMBIFN+y51RfavWHePayX5e3qGrZlP5+FeIpRhsCv9zeNqKHjQ==", + "dev": true }, "@types/uglify-js": { "version": "3.0.3", @@ -144,21 +141,22 @@ } }, "@types/webpack": { - "version": "4.4.10", - "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.4.10.tgz", - "integrity": "sha512-5vMiKzNcG19go5sR6++7ubRkBA+hjG4yO/2qwDQhAVfTGV8pqqatFqbrRCiJ2P9DbCilcp+tpXxYhPs2Zn7GyA==", + "version": "4.4.16", + "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.4.16.tgz", + "integrity": "sha512-kE6elo5EaC11mB94xezvAH2vwec8+vsx9bzacIZgIWn7ITShEXE/j8KX4LJ5ssCAYPaXMZchbVmpycDwJ84gtA==", "dev": true, "requires": { "@types/node": "*", "@types/tapable": "*", "@types/uglify-js": "*", + "@types/webpack-dev-server": "*", "source-map": "^0.6.0" } }, "@types/webpack-dev-server": { - "version": "2.9.6", - "resolved": "https://registry.npmjs.org/@types/webpack-dev-server/-/webpack-dev-server-2.9.6.tgz", - "integrity": "sha512-5ZpNdKFxusaPdy7lG7bapsvpq8QIbHYAQXLZT9HAudwPbE8g9SlznYI7hoxyHVbJr9AecnZFQ+6LG0VpdkW3gg==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@types/webpack-dev-server/-/webpack-dev-server-3.1.1.tgz", + "integrity": "sha512-TnEQPT+OZjWV2kRyNs0RPMDQmBCiLrr/ZhKSgFNF6aM4O/moUAfo2Yu3MIMUjoi3aE/02RH1iVR+Y6mWmXOlVA==", "dev": true, "requires": { "@types/express": "*", @@ -182,271 +180,190 @@ "@types/webpack": "*" } }, - "@types/webvr-api": { - "version": "0.0.34", - "resolved": "https://registry.npmjs.org/@types/webvr-api/-/webvr-api-0.0.34.tgz", - "integrity": "sha512-gVAPKK+L1blPJCFnUDmkIdRfIU8xbwl05MDXPRjnjoeDXUUzR6frPuyx9RQz+OCodmxlBcJOkjVTMTZi1BcuZw==", - "dev": true - }, "@webassemblyjs/ast": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.5.13.tgz", - "integrity": "sha512-49nwvW/Hx9i+OYHg+mRhKZfAlqThr11Dqz8TsrvqGKMhdI2ijy3KBJOun2Z4770TPjrIJhR6KxChQIDaz8clDA==", + "version": "1.7.8", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.7.8.tgz", + "integrity": "sha512-dOrtdtEyB8sInpl75yLPNksY4sRl0j/+t6aHyB/YA+ab9hV3Fo7FmG12FHzP+2MvWVAJtDb+6eXR5EZbZJ+uVg==", "dev": true, "requires": { - "@webassemblyjs/helper-module-context": "1.5.13", - "@webassemblyjs/helper-wasm-bytecode": "1.5.13", - "@webassemblyjs/wast-parser": "1.5.13", - "debug": "^3.1.0", - "mamacro": "^0.0.3" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - } + "@webassemblyjs/helper-module-context": "1.7.8", + "@webassemblyjs/helper-wasm-bytecode": "1.7.8", + "@webassemblyjs/wast-parser": "1.7.8" } }, "@webassemblyjs/floating-point-hex-parser": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.5.13.tgz", - "integrity": "sha512-vrvvB18Kh4uyghSKb0NTv+2WZx871WL2NzwMj61jcq2bXkyhRC+8Q0oD7JGVf0+5i/fKQYQSBCNMMsDMRVAMqA==", + "version": "1.7.8", + "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.8.tgz", + "integrity": "sha512-kn2zNKGsbql5i56VAgRYkpG+VazqHhQQZQycT2uXAazrAEDs23gy+Odkh5VblybjnwX2/BITkDtNmSO76hdIvQ==", "dev": true }, "@webassemblyjs/helper-api-error": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.5.13.tgz", - "integrity": "sha512-dBh2CWYqjaDlvMmRP/kudxpdh30uXjIbpkLj9HQe+qtYlwvYjPRjdQXrq1cTAAOUSMTtzqbXIxEdEZmyKfcwsg==", + "version": "1.7.8", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.8.tgz", + "integrity": "sha512-xUwxDXsd1dUKArJEP5wWM5zxgCSwZApSOJyP1XO7M8rNUChUDblcLQ4FpzTpWG2YeylMwMl1MlP5Ztryiz1x4g==", "dev": true }, "@webassemblyjs/helper-buffer": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.5.13.tgz", - "integrity": "sha512-v7igWf1mHcpJNbn4m7e77XOAWXCDT76Xe7Is1VQFXc4K5jRcFrl9D0NrqM4XifQ0bXiuTSkTKMYqDxu5MhNljA==", - "dev": true, - "requires": { - "debug": "^3.1.0" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - } - } + "version": "1.7.8", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.8.tgz", + "integrity": "sha512-WXiIMnuvuwlhWvVOm8xEXU9DnHaa3AgAU0ZPfvY8vO1cSsmYb2WbGbHnMLgs43vXnA7XAob9b56zuZaMkxpCBg==", + "dev": true }, "@webassemblyjs/helper-code-frame": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.5.13.tgz", - "integrity": "sha512-yN6ScQQDFCiAXnVctdVO/J5NQRbwyTbQzsGzEgXsAnrxhjp0xihh+nNHQTMrq5UhOqTb5LykpJAvEv9AT0jnAQ==", + "version": "1.7.8", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.8.tgz", + "integrity": "sha512-TLQxyD9qGOIdX5LPQOPo0Ernd88U5rHkFb8WAjeMIeA0sPjCHeVPaGqUGGIXjUcblUkjuDAc07bruCcNHUrHDA==", "dev": true, "requires": { - "@webassemblyjs/wast-printer": "1.5.13" + "@webassemblyjs/wast-printer": "1.7.8" } }, "@webassemblyjs/helper-fsm": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.5.13.tgz", - "integrity": "sha512-hSIKzbXjVMRvy3Jzhgu+vDd/aswJ+UMEnLRCkZDdknZO3Z9e6rp1DAs0tdLItjCFqkz9+0BeOPK/mk3eYvVzZg==", + "version": "1.7.8", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.8.tgz", + "integrity": "sha512-TjK0CnD8hAPkV5mbSp5aWl6SO1+H3WFcjWtixWoy8EMA99YnNzYhpc/WSYWhf7yrhpzkq5tZB0tvLK3Svr3IXA==", "dev": true }, "@webassemblyjs/helper-module-context": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.5.13.tgz", - "integrity": "sha512-zxJXULGPLB7r+k+wIlvGlXpT4CYppRz8fLUM/xobGHc9Z3T6qlmJD9ySJ2jknuktuuiR9AjnNpKYDECyaiX+QQ==", - "dev": true, - "requires": { - "debug": "^3.1.0", - "mamacro": "^0.0.3" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - } - } + "version": "1.7.8", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.8.tgz", + "integrity": "sha512-uCutAKR7Nm0VsFixcvnB4HhAyHouNbj0Dx1p7eRjFjXGGZ+N7ftTaG1ZbWCasAEbtwGj54LP8+lkBZdTCPmLGg==", + "dev": true }, "@webassemblyjs/helper-wasm-bytecode": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.5.13.tgz", - "integrity": "sha512-0n3SoNGLvbJIZPhtMFq0XmmnA/YmQBXaZKQZcW8maGKwLpVcgjNrxpFZHEOLKjXJYVN5Il8vSfG7nRX50Zn+aw==", + "version": "1.7.8", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.8.tgz", + "integrity": "sha512-AdCCE3BMW6V34WYaKUmPgVHa88t2Z14P4/0LjLwuGkI0X6pf7nzp0CehzVVk51cKm2ymVXjl9dCG+gR1yhITIQ==", "dev": true }, "@webassemblyjs/helper-wasm-section": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.5.13.tgz", - "integrity": "sha512-IJ/goicOZ5TT1axZFSnlAtz4m8KEjYr12BNOANAwGFPKXM4byEDaMNXYowHMG0yKV9a397eU/NlibFaLwr1fbw==", + "version": "1.7.8", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.8.tgz", + "integrity": "sha512-BkBhYQuzyl4hgTGOKo87Vdw6f9nj8HhI7WYpI0MCC5qFa5ahrAPOGgyETVdnRbv+Rjukl9MxxfDmVcVC435lDg==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.5.13", - "@webassemblyjs/helper-buffer": "1.5.13", - "@webassemblyjs/helper-wasm-bytecode": "1.5.13", - "@webassemblyjs/wasm-gen": "1.5.13", - "debug": "^3.1.0" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - } + "@webassemblyjs/ast": "1.7.8", + "@webassemblyjs/helper-buffer": "1.7.8", + "@webassemblyjs/helper-wasm-bytecode": "1.7.8", + "@webassemblyjs/wasm-gen": "1.7.8" } }, "@webassemblyjs/ieee754": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.5.13.tgz", - "integrity": "sha512-TseswvXEPpG5TCBKoLx9tT7+/GMACjC1ruo09j46ULRZWYm8XHpDWaosOjTnI7kr4SRJFzA6MWoUkAB+YCGKKg==", + "version": "1.7.8", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.7.8.tgz", + "integrity": "sha512-tOarWChdG1a3y1yqCX0JMDKzrat5tQe4pV6K/TX19BcXsBLYxFQOL1DEDa5KG9syeyvCrvZ+i1+Mv1ExngvktQ==", "dev": true, "requires": { - "ieee754": "^1.1.11" + "@xtuc/ieee754": "^1.2.0" } }, "@webassemblyjs/leb128": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.5.13.tgz", - "integrity": "sha512-0NRMxrL+GG3eISGZBmLBLAVjphbN8Si15s7jzThaw1UE9e5BY1oH49/+MA1xBzxpf1OW5sf9OrPDOclk9wj2yg==", + "version": "1.7.8", + "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.7.8.tgz", + "integrity": "sha512-GCYeGPgUFWJiZuP4NICbcyUQNxNLJIf476Ei+K+jVuuebtLpfvwkvYT6iTUE7oZYehhkor4Zz2g7SJ/iZaPudQ==", "dev": true, "requires": { - "long": "4.0.0" - }, - "dependencies": { - "long": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz", - "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==", - "dev": true - } + "@xtuc/long": "4.2.1" } }, "@webassemblyjs/utf8": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.5.13.tgz", - "integrity": "sha512-Ve1ilU2N48Ew0lVGB8FqY7V7hXjaC4+PeZM+vDYxEd+R2iQ0q+Wb3Rw8v0Ri0+rxhoz6gVGsnQNb4FjRiEH/Ng==", + "version": "1.7.8", + "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.7.8.tgz", + "integrity": "sha512-9X+f0VV+xNXW2ujfIRSXBJENGE6Qh7bNVKqu3yDjTFB3ar3nsThsGBBKdTG58aXOm2iUH6v28VIf88ymPXODHA==", "dev": true }, "@webassemblyjs/wasm-edit": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.5.13.tgz", - "integrity": "sha512-X7ZNW4+Hga4f2NmqENnHke2V/mGYK/xnybJSIXImt1ulxbCOEs/A+ZK/Km2jgihjyVxp/0z0hwIcxC6PrkWtgw==", + "version": "1.7.8", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.8.tgz", + "integrity": "sha512-6D3Hm2gFixrfyx9XjSON4ml1FZTugqpkIz5Awvrou8fnpyprVzcm4X8pyGRtA2Piixjl3DqmX/HB1xdWyE097A==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.5.13", - "@webassemblyjs/helper-buffer": "1.5.13", - "@webassemblyjs/helper-wasm-bytecode": "1.5.13", - "@webassemblyjs/helper-wasm-section": "1.5.13", - "@webassemblyjs/wasm-gen": "1.5.13", - "@webassemblyjs/wasm-opt": "1.5.13", - "@webassemblyjs/wasm-parser": "1.5.13", - "@webassemblyjs/wast-printer": "1.5.13", - "debug": "^3.1.0" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - } + "@webassemblyjs/ast": "1.7.8", + "@webassemblyjs/helper-buffer": "1.7.8", + "@webassemblyjs/helper-wasm-bytecode": "1.7.8", + "@webassemblyjs/helper-wasm-section": "1.7.8", + "@webassemblyjs/wasm-gen": "1.7.8", + "@webassemblyjs/wasm-opt": "1.7.8", + "@webassemblyjs/wasm-parser": "1.7.8", + "@webassemblyjs/wast-printer": "1.7.8" } }, "@webassemblyjs/wasm-gen": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.5.13.tgz", - "integrity": "sha512-yfv94Se8R73zmr8GAYzezFHc3lDwE/lBXQddSiIZEKZFuqy7yWtm3KMwA1uGbv5G1WphimJxboXHR80IgX1hQA==", + "version": "1.7.8", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.8.tgz", + "integrity": "sha512-a7O/wE6eBeVKKUYgpMK7NOHmMADD85rSXLe3CqrWRDwWff5y3cSVbzpN6Qv3z6C4hdkpq9qyij1Ga1kemOZGvQ==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.5.13", - "@webassemblyjs/helper-wasm-bytecode": "1.5.13", - "@webassemblyjs/ieee754": "1.5.13", - "@webassemblyjs/leb128": "1.5.13", - "@webassemblyjs/utf8": "1.5.13" + "@webassemblyjs/ast": "1.7.8", + "@webassemblyjs/helper-wasm-bytecode": "1.7.8", + "@webassemblyjs/ieee754": "1.7.8", + "@webassemblyjs/leb128": "1.7.8", + "@webassemblyjs/utf8": "1.7.8" } }, "@webassemblyjs/wasm-opt": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.5.13.tgz", - "integrity": "sha512-IkXSkgzVhQ0QYAdIayuCWMmXSYx0dHGU8Ah/AxJf1gBvstMWVnzJnBwLsXLyD87VSBIcsqkmZ28dVb0mOC3oBg==", + "version": "1.7.8", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.8.tgz", + "integrity": "sha512-3lbQ0PT81NHCdi1sR/7+SNpZadM4qYcTSr62nFFAA7e5lFwJr14M1Gi+A/Y3PgcDWOHYjsaNGPpPU0H03N6Blg==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.5.13", - "@webassemblyjs/helper-buffer": "1.5.13", - "@webassemblyjs/wasm-gen": "1.5.13", - "@webassemblyjs/wasm-parser": "1.5.13", - "debug": "^3.1.0" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - } + "@webassemblyjs/ast": "1.7.8", + "@webassemblyjs/helper-buffer": "1.7.8", + "@webassemblyjs/wasm-gen": "1.7.8", + "@webassemblyjs/wasm-parser": "1.7.8" } }, "@webassemblyjs/wasm-parser": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.5.13.tgz", - "integrity": "sha512-XnYoIcu2iqq8/LrtmdnN3T+bRjqYFjRHqWbqK3osD/0r/Fcv4d9ecRzjVtC29ENEuNTK4mQ9yyxCBCbK8S/cpg==", + "version": "1.7.8", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.8.tgz", + "integrity": "sha512-rZ/zlhp9DHR/05zh1MbAjT2t624sjrPP/OkJCjXqzm7ynH+nIdNcn9Ixc+qzPMFXhIrk0rBoQ3to6sEIvHh9jQ==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.5.13", - "@webassemblyjs/helper-api-error": "1.5.13", - "@webassemblyjs/helper-wasm-bytecode": "1.5.13", - "@webassemblyjs/ieee754": "1.5.13", - "@webassemblyjs/leb128": "1.5.13", - "@webassemblyjs/utf8": "1.5.13" + "@webassemblyjs/ast": "1.7.8", + "@webassemblyjs/helper-api-error": "1.7.8", + "@webassemblyjs/helper-wasm-bytecode": "1.7.8", + "@webassemblyjs/ieee754": "1.7.8", + "@webassemblyjs/leb128": "1.7.8", + "@webassemblyjs/utf8": "1.7.8" } }, "@webassemblyjs/wast-parser": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.5.13.tgz", - "integrity": "sha512-Lbz65T0LQ1LgzKiUytl34CwuhMNhaCLgrh0JW4rJBN6INnBB8NMwUfQM+FxTnLY9qJ+lHJL/gCM5xYhB9oWi4A==", + "version": "1.7.8", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.7.8.tgz", + "integrity": "sha512-Q/zrvtUvzWuSiJMcSp90fi6gp2nraiHXjTV2VgAluVdVapM4gy1MQn7akja2p6eSBDQpKJPJ6P4TxRkghRS5dg==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.5.13", - "@webassemblyjs/floating-point-hex-parser": "1.5.13", - "@webassemblyjs/helper-api-error": "1.5.13", - "@webassemblyjs/helper-code-frame": "1.5.13", - "@webassemblyjs/helper-fsm": "1.5.13", - "long": "^3.2.0", - "mamacro": "^0.0.3" + "@webassemblyjs/ast": "1.7.8", + "@webassemblyjs/floating-point-hex-parser": "1.7.8", + "@webassemblyjs/helper-api-error": "1.7.8", + "@webassemblyjs/helper-code-frame": "1.7.8", + "@webassemblyjs/helper-fsm": "1.7.8", + "@xtuc/long": "4.2.1" } }, "@webassemblyjs/wast-printer": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.5.13.tgz", - "integrity": "sha512-QcwogrdqcBh8Z+eUF8SG+ag5iwQSXxQJELBEHmLkk790wgQgnIMmntT2sMAMw53GiFNckArf5X0bsCA44j3lWQ==", + "version": "1.7.8", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.7.8.tgz", + "integrity": "sha512-GllIthRtwTxRDAURRNXscu7Napzmdf1jt1gpiZiK/QN4fH0lSGs3OTmvdfsMNP7tqI4B3ZtfaaWRlNIQug6Xyg==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.5.13", - "@webassemblyjs/wast-parser": "1.5.13", - "long": "^3.2.0" + "@webassemblyjs/ast": "1.7.8", + "@webassemblyjs/wast-parser": "1.7.8", + "@xtuc/long": "4.2.1" } }, + "@xtuc/ieee754": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", + "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==", + "dev": true + }, + "@xtuc/long": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.1.tgz", + "integrity": "sha512-FZdkNBDqBRHKQ2MEbSC17xnPFOhZxeJ2YGSfr2BKf3sujG49Qe3bB+rGCwQfIaA7WHnGeGkSijX4FuBCdrzW/g==", + "dev": true + }, "JSV": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/JSV/-/JSV-4.0.2.tgz", @@ -464,9 +381,9 @@ } }, "acorn": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.1.tgz", - "integrity": "sha512-d+nbxBUGKg7Arpsvbnlq61mc12ek3EY8EQldM3GPAhWJ1UVxC6TDGbIvUMNU6obBX3i1+ptCIzV4vq0gFPEGVQ==", + "version": "5.7.3", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz", + "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==", "dev": true }, "acorn-dynamic-import": { @@ -479,27 +396,33 @@ } }, "ajv": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.2.tgz", - "integrity": "sha512-hOs7GfvI6tUI1LfZddH82ky6mOMyTuY0mk7kE2pWpmhhUSkumzaTO5vbVwij39MdwPQWCV4Zv57Eo06NtL/GVA==", + "version": "6.5.4", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.4.tgz", + "integrity": "sha512-4Wyjt8+t6YszqaXnLDfMmG/8AlO5Zbcsy3ATHncCzjW/NoPzAId8AK6749Ybjmdt+kUY1gP60fCu46oDxPv/mg==", "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.1" + "uri-js": "^4.2.2" } }, + "ajv-errors": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.0.tgz", + "integrity": "sha1-7PAh+hCP0X37Xms4Py3SM+Mf/Fk=", + "dev": true + }, "ajv-keywords": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.2.0.tgz", "integrity": "sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=", "dev": true }, - "ansi-escapes": { + "ansi-colors": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz", - "integrity": "sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.1.0.tgz", + "integrity": "sha512-hTv1qPdi+sVEk3jYsdjox5nQI0C9HTbjKShbCdYLKb1LOfNbb7wsF4d7OEKIZoxIHx02tSp3m94jcPW2EfMjmA==", "dev": true }, "ansi-html": { @@ -557,28 +480,12 @@ "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=", "dev": true }, - "array-find-index": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz", - "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=", - "dev": true - }, "array-flatten": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.1.tgz", "integrity": "sha1-Qmu52oQJDBg42BLIFQryCoMx4pY=", "dev": true }, - "array-includes": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.0.3.tgz", - "integrity": "sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=", - "dev": true, - "requires": { - "define-properties": "^1.1.2", - "es-abstract": "^1.7.0" - } - }, "array-union": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", @@ -650,10 +557,13 @@ "dev": true }, "async": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", - "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", - "dev": true + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz", + "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==", + "dev": true, + "requires": { + "lodash": "^4.17.10" + } }, "async-each": { "version": "1.0.1", @@ -668,9 +578,9 @@ "dev": true }, "awesome-typescript-loader": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/awesome-typescript-loader/-/awesome-typescript-loader-5.2.0.tgz", - "integrity": "sha512-3v5MEUgRz1n90u61UGYbhFxiFq1tK/HBdoY/ScBX1srOiZVo4iF9b6hyP2ZsRp1ewHKYwlEo0OaHUXJVQHv6dw==", + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/awesome-typescript-loader/-/awesome-typescript-loader-5.2.1.tgz", + "integrity": "sha512-slv66OAJB8orL+UUaTI3pKlLorwIvS4ARZzYR9iJJyGsEgOqueMfOMdKySWzZ73vIkEe3fcwFgsKMg4d8zyb1g==", "dev": true, "requires": { "chalk": "^2.4.1", @@ -807,9 +717,9 @@ "dev": true }, "bluebird": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz", - "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==", + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.2.tgz", + "integrity": "sha512-dhHTWMI7kMx5whMQntl7Vr9C6BvV10lFXDAasnqnrMYhXVCzzk6IO9Fo2L75jXHT07WrOngL1WDXOp+yYS91Yg==", "dev": true }, "bn.js": { @@ -819,29 +729,21 @@ "dev": true }, "body-parser": { - "version": "1.18.2", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.2.tgz", - "integrity": "sha1-h2eKGdhLR9hZuDGZvVm84iKxBFQ=", + "version": "1.18.3", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.3.tgz", + "integrity": "sha1-WykhmP/dVTs6DyDe0FkrlWlVyLQ=", "dev": true, "requires": { "bytes": "3.0.0", "content-type": "~1.0.4", "debug": "2.6.9", - "depd": "~1.1.1", - "http-errors": "~1.6.2", - "iconv-lite": "0.4.19", + "depd": "~1.1.2", + "http-errors": "~1.6.3", + "iconv-lite": "0.4.23", "on-finished": "~2.3.0", - "qs": "6.5.1", - "raw-body": "2.3.2", - "type-is": "~1.6.15" - }, - "dependencies": { - "iconv-lite": { - "version": "0.4.19", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz", - "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==", - "dev": true - } + "qs": "6.5.2", + "raw-body": "2.3.3", + "type-is": "~1.6.16" } }, "bonjour": { @@ -911,7 +813,7 @@ }, "browserify-aes": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", + "resolved": "http://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==", "dev": true, "requires": { @@ -948,7 +850,7 @@ }, "browserify-rsa": { "version": "4.0.1", - "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", + "resolved": "http://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=", "dev": true, "requires": { @@ -982,7 +884,7 @@ }, "buffer": { "version": "4.9.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz", + "resolved": "http://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz", "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=", "dev": true, "requires": { @@ -1009,12 +911,6 @@ "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=", "dev": true }, - "builtin-modules": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", - "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=", - "dev": true - }, "builtin-status-codes": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz", @@ -1028,22 +924,23 @@ "dev": true }, "cacache": { - "version": "10.0.4", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz", - "integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==", + "version": "11.2.0", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-11.2.0.tgz", + "integrity": "sha512-IFWl6lfK6wSeYCHUXh+N1lY72UDrpyrYQJNIVQf48paDuWbv5RbAtJYf/4gUQFObTCHZwdZ5sI8Iw7nqwP6nlQ==", "dev": true, "requires": { "bluebird": "^3.5.1", "chownr": "^1.0.1", + "figgy-pudding": "^3.1.0", "glob": "^7.1.2", "graceful-fs": "^4.1.11", - "lru-cache": "^4.1.1", - "mississippi": "^2.0.0", + "lru-cache": "^4.1.3", + "mississippi": "^3.0.0", "mkdirp": "^0.5.1", "move-concurrently": "^1.0.1", "promise-inflight": "^1.0.1", "rimraf": "^2.6.2", - "ssri": "^5.2.4", + "ssri": "^6.0.0", "unique-filename": "^1.1.0", "y18n": "^4.0.0" } @@ -1081,24 +978,6 @@ "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", "dev": true }, - "camelcase-keys": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", - "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", - "dev": true, - "requires": { - "camelcase": "^2.0.0", - "map-obj": "^1.0.0" - }, - "dependencies": { - "camelcase": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz", - "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=", - "dev": true - } - } - }, "chalk": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", @@ -1110,12 +989,6 @@ "supports-color": "^5.3.0" } }, - "chardet": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.5.0.tgz", - "integrity": "sha512-9ZTaoBaePSCFvNlNGrsyI8ZVACP2svUtq0DkM7t4K2ClAa96sqOIRjAzDTc8zXzFt1cZR46rRzLTiHFSJ+Qw0g==", - "dev": true - }, "chokidar": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz", @@ -1138,9 +1011,9 @@ } }, "chownr": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz", - "integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz", + "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==", "dev": true }, "chrome-trace-event": { @@ -1202,21 +1075,6 @@ } } }, - "cli-cursor": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", - "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", - "dev": true, - "requires": { - "restore-cursor": "^2.0.0" - } - }, - "cli-width": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz", - "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=", - "dev": true - }, "cliui": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz", @@ -1303,9 +1161,9 @@ "dev": true }, "colors": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.3.1.tgz", - "integrity": "sha512-jg/vxRmv430jixZrC+La5kMbUWqIg32/JsYNZb94+JEmzceYbWKTsv1OuTp+7EaqiaWRR2tPcykibwCRgclIsw==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.3.2.tgz", + "integrity": "sha512-rhP0JSBGYvpcNQj4s5AdShMeE5ahMop96cTeDl/v9qQQm2fYClE2QXZRi8wLzc+GmXSxdIqqbOIAhyObEXDbfQ==", "dev": true }, "colorspace": { @@ -1319,9 +1177,9 @@ } }, "commander": { - "version": "2.13.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz", - "integrity": "sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==", + "version": "2.17.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz", + "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==", "dev": true }, "commondir": { @@ -1337,12 +1195,12 @@ "dev": true }, "compressible": { - "version": "2.0.14", - "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.14.tgz", - "integrity": "sha1-MmxfUH+7BV9UEWeCuWmoG2einac=", + "version": "2.0.15", + "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.15.tgz", + "integrity": "sha512-4aE67DL33dSW9gw4CI2H/yTxqHLNcxp0yS6jB+4h+wr3e43+1z7vm0HU9qXOH8j+qjKuL8+UtkOxYQSMq60Ylw==", "dev": true, "requires": { - "mime-db": ">= 1.34.0 < 2" + "mime-db": ">= 1.36.0 < 2" } }, "compression": { @@ -1461,7 +1319,7 @@ }, "create-hash": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", + "resolved": "http://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==", "dev": true, "requires": { @@ -1474,7 +1332,7 @@ }, "create-hmac": { "version": "1.1.7", - "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", + "resolved": "http://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==", "dev": true, "requires": { @@ -1536,15 +1394,6 @@ "integrity": "sha1-lGfQMsOM+u+58teVASUwYvh/ob0=", "dev": true }, - "currently-unhandled": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", - "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", - "dev": true, - "requires": { - "array-find-index": "^1.0.1" - } - }, "cyclist": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz", @@ -1596,6 +1445,16 @@ "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=", "dev": true }, + "default-gateway": { + "version": "2.7.2", + "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-2.7.2.tgz", + "integrity": "sha512-lAc4i9QJR0YHSDFdzeBQKfZ1SRDG3hsJNEkrpcZa8QhBfidLAilT60BDEIVUUGqosFp425KOgB3uYqcnQrWafQ==", + "dev": true, + "requires": { + "execa": "^0.10.0", + "ip-regex": "^2.1.0" + } + }, "define-properties": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", @@ -1689,9 +1548,9 @@ "dev": true }, "detect-node": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.3.tgz", - "integrity": "sha1-ogM8CcyOFY03dI+951B4Mr1s4Sc=", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz", + "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==", "dev": true }, "diagnostics": { @@ -1713,7 +1572,7 @@ }, "diffie-hellman": { "version": "5.0.3", - "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", + "resolved": "http://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==", "dev": true, "requires": { @@ -1894,9 +1753,9 @@ "dev": true }, "env-variable": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/env-variable/-/env-variable-0.0.4.tgz", - "integrity": "sha512-+jpGxSWG4vr6gVxUHOc4p+ilPnql7NzZxOZBxNldsKGjCF+97df3CbuX7XMaDa5oAVkKQj4rKp38rYdC4VcpDg==", + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/env-variable/-/env-variable-0.0.5.tgz", + "integrity": "sha512-zoB603vQReOFvTg5xMl9I1P2PnHsHQQKTEowsKKD7nseUfJq6UWzK+4YtlWUO1nhiQUxe6XMkk+JleSZD1NZFA==", "dev": true }, "errno": { @@ -1908,15 +1767,6 @@ "prr": "~1.0.1" } }, - "error-ex": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", - "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", - "dev": true, - "requires": { - "is-arrayish": "^0.2.1" - } - }, "es-abstract": { "version": "1.12.0", "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.12.0.tgz", @@ -2030,7 +1880,7 @@ }, "events": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz", + "resolved": "http://registry.npmjs.org/events/-/events-1.1.1.tgz", "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=", "dev": true }, @@ -2054,31 +1904,18 @@ } }, "execa": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", - "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz", + "integrity": "sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==", "dev": true, "requires": { - "cross-spawn": "^5.0.1", + "cross-spawn": "^6.0.0", "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": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", - "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", - "dev": true, - "requires": { - "lru-cache": "^4.0.1", - "shebang-command": "^1.2.0", - "which": "^1.2.9" - } - } } }, "expand-brackets": { @@ -2117,14 +1954,14 @@ } }, "express": { - "version": "4.16.3", - "resolved": "https://registry.npmjs.org/express/-/express-4.16.3.tgz", - "integrity": "sha1-avilAjUNsyRuzEvs9rWjTSL37VM=", + "version": "4.16.4", + "resolved": "https://registry.npmjs.org/express/-/express-4.16.4.tgz", + "integrity": "sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==", "dev": true, "requires": { "accepts": "~1.3.5", "array-flatten": "1.1.1", - "body-parser": "1.18.2", + "body-parser": "1.18.3", "content-disposition": "0.5.2", "content-type": "~1.0.4", "cookie": "0.3.1", @@ -2141,10 +1978,10 @@ "on-finished": "~2.3.0", "parseurl": "~1.3.2", "path-to-regexp": "0.1.7", - "proxy-addr": "~2.0.3", - "qs": "6.5.1", + "proxy-addr": "~2.0.4", + "qs": "6.5.2", "range-parser": "~1.2.0", - "safe-buffer": "5.1.1", + "safe-buffer": "5.1.2", "send": "0.16.2", "serve-static": "1.13.2", "setprototypeof": "1.1.0", @@ -2159,12 +1996,6 @@ "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=", "dev": true - }, - "safe-buffer": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", - "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", - "dev": true } } }, @@ -2189,17 +2020,6 @@ } } }, - "external-editor": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.0.1.tgz", - "integrity": "sha512-e1neqvSt5pSwQcFnYc6yfGuJD2Q4336cdbHs5VeUO0zTkqPbrHMyw2q1r47fpfLWbvIG8H8A6YO3sck7upTV6Q==", - "dev": true, - "requires": { - "chardet": "^0.5.0", - "iconv-lite": "^0.4.22", - "tmp": "^0.0.33" - } - }, "extglob": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", @@ -2298,14 +2118,11 @@ "integrity": "sha512-lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg==", "dev": true }, - "figures": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz", - "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", - "dev": true, - "requires": { - "escape-string-regexp": "^1.0.5" - } + "figgy-pudding": { + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz", + "integrity": "sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==", + "dev": true }, "fill-range": { "version": "4.0.0", @@ -2332,7 +2149,7 @@ }, "finalhandler": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz", + "resolved": "http://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz", "integrity": "sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==", "dev": true, "requires": { @@ -2346,23 +2163,23 @@ } }, "find-cache-dir": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz", - "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.0.0.tgz", + "integrity": "sha512-LDUY6V1Xs5eFskUVYtIwatojt6+9xC9Chnlk/jYOOvn3FAFfSaWddxahDGyNHh0b2dMXa6YW2m0tk8TdVaXHlA==", "dev": true, "requires": { "commondir": "^1.0.1", "make-dir": "^1.0.0", - "pkg-dir": "^2.0.0" + "pkg-dir": "^3.0.0" } }, "find-up": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", + "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", "dev": true, "requires": { - "locate-path": "^2.0.0" + "locate-path": "^3.0.0" } }, "flush-write-stream": { @@ -2376,12 +2193,12 @@ } }, "follow-redirects": { - "version": "1.5.5", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.5.tgz", - "integrity": "sha512-GHjtHDlY/ehslqv0Gr5N0PUJppgg/q0rOBvX0na1s7y1A3LWxPqCYU76s3Z1bM4+UZB4QF0usaXLT5wFpof5PA==", + "version": "1.5.9", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.9.tgz", + "integrity": "sha512-Bh65EZI/RU8nx0wbYF9shkFZlqLP+6WT/5FnA3cE/djNSuKNHJEinGGZgu/cQEkeeb2GdFOgenAmn8qaqYke2w==", "dev": true, "requires": { - "debug": "^3.1.0" + "debug": "=3.1.0" }, "dependencies": { "debug": { @@ -2509,12 +2326,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -2529,17 +2348,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -2656,7 +2478,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -2668,6 +2491,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -2682,6 +2506,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -2689,12 +2514,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -2713,6 +2540,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -2793,7 +2621,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -2805,6 +2634,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -2926,6 +2756,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -3009,15 +2840,9 @@ "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==", "dev": true }, - "get-stdin": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", - "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=", - "dev": true - }, "get-stream": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", + "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", "dev": true }, @@ -3290,12 +3115,6 @@ "minimalistic-crypto-utils": "^1.0.1" } }, - "hosted-git-info": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz", - "integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==", - "dev": true - }, "hpack.js": { "version": "2.1.6", "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz", @@ -3431,7 +3250,7 @@ }, "http-errors": { "version": "1.6.3", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", + "resolved": "http://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=", "dev": true, "requires": { @@ -3460,7 +3279,7 @@ }, "http-proxy-middleware": { "version": "0.18.0", - "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz", + "resolved": "http://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz", "integrity": "sha512-Fs25KVMPAIIcgjMZkVHJoKg9VcXcC1C8yb9JUgeDvVXY0S/zgVIhMb+qVswDIgtJe2DfckMSY2d6TuTEutlk6Q==", "dev": true, "requires": { @@ -3498,12 +3317,12 @@ "dev": true }, "import-local": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/import-local/-/import-local-1.0.0.tgz", - "integrity": "sha512-vAaZHieK9qjGo58agRBg+bhHX3hoTZU/Oa3GESWLz7t1U62fk63aHuDJJEteXoDeTCcPmUT+z38gkHPZkkmpmQ==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz", + "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==", "dev": true, "requires": { - "pkg-dir": "^2.0.0", + "pkg-dir": "^3.0.0", "resolve-cwd": "^2.0.0" } }, @@ -3513,15 +3332,6 @@ "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", "dev": true }, - "indent-string": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz", - "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", - "dev": true, - "requires": { - "repeating": "^2.0.0" - } - }, "indexof": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz", @@ -3544,51 +3354,14 @@ "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", "dev": true }, - "inquirer": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.1.0.tgz", - "integrity": "sha512-f9K2MMx/G/AVmJSaZg2a+GVLRRmTdlGLbwxsibNd6yNTxXujqxPypjCnxnC0y4+Wb/rNY5KyKuq06AO5jrE+7w==", - "dev": true, - "requires": { - "ansi-escapes": "^3.0.0", - "chalk": "^2.0.0", - "cli-cursor": "^2.1.0", - "cli-width": "^2.0.0", - "external-editor": "^3.0.0", - "figures": "^2.0.0", - "lodash": "^4.3.0", - "mute-stream": "0.0.7", - "run-async": "^2.2.0", - "rxjs": "^6.1.0", - "string-width": "^2.1.0", - "strip-ansi": "^4.0.0", - "through": "^2.3.6" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "^3.0.0" - } - } - } - }, "internal-ip": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-1.2.0.tgz", - "integrity": "sha1-rp+/k7mEh4eF1QqN4bNWlWBYz1w=", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-3.0.1.tgz", + "integrity": "sha512-NXXgESC2nNVtU+pqmC9e6R8B1GpKxzsAQhffvh5AL79qKnodd+L7tnEQmTiUAVngqLalPbSqRA7XGIEL5nCd0Q==", "dev": true, "requires": { - "meow": "^3.3.0" + "default-gateway": "^2.6.0", + "ipaddr.js": "^1.5.2" } }, "interpret": { @@ -3598,9 +3371,9 @@ "dev": true }, "invert-kv": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", - "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz", + "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==", "dev": true }, "ip": { @@ -3609,6 +3382,12 @@ "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=", "dev": true }, + "ip-regex": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz", + "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=", + "dev": true + }, "ipaddr.js": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.8.0.tgz", @@ -3636,9 +3415,9 @@ } }, "is-arrayish": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz", + "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==", "dev": true }, "is-binary-path": { @@ -3656,15 +3435,6 @@ "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", "dev": true }, - "is-builtin-module": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", - "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", - "dev": true, - "requires": { - "builtin-modules": "^1.0.0" - } - }, "is-callable": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz", @@ -3728,15 +3498,6 @@ "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", "dev": true }, - "is-finite": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz", - "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", - "dev": true, - "requires": { - "number-is-nan": "^1.0.0" - } - }, "is-fullwidth-code-point": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", @@ -3811,12 +3572,6 @@ "isobject": "^3.0.1" } }, - "is-promise": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz", - "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=", - "dev": true - }, "is-regex": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz", @@ -3838,12 +3593,6 @@ "integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI=", "dev": true }, - "is-utf8": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", - "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=", - "dev": true - }, "is-windows": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", @@ -3915,9 +3664,9 @@ } }, "killable": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.0.tgz", - "integrity": "sha1-2ouEvUfeU5WHj5XWTQLyRJ/gXms=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz", + "integrity": "sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==", "dev": true }, "kind-of": { @@ -3927,48 +3676,27 @@ "dev": true }, "kuler": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/kuler/-/kuler-1.0.0.tgz", - "integrity": "sha512-oyy6pu/yWRjiVfCoJebNUKFL061sNtrs9ejKTbirIwY3oiHmENVCSkHhxDV85Dkm7JYR/czMCBeoM87WilTdSg==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/kuler/-/kuler-1.0.1.tgz", + "integrity": "sha512-J9nVUucG1p/skKul6DU3PUZrhs0LPulNaeUOox0IyXDi8S4CztTHs1gQphhuZmzXG7VOQSf6NJfKuzteQLv9gQ==", "dev": true, "requires": { "colornames": "^1.1.1" } }, "lcid": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", - "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz", + "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==", "dev": true, "requires": { - "invert-kv": "^1.0.0" - } - }, - "load-json-file": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", - "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" - }, - "dependencies": { - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true - } + "invert-kv": "^2.0.0" } }, "loader-runner": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.0.tgz", - "integrity": "sha1-9IKuqC1UPgeSFwDVpG7yb9rGuKI=", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.1.tgz", + "integrity": "sha512-By6ZFY7ETWOc9RFaAIb23IjJVcM4dvJC/N57nmdz9RSkMXvAXGI7SyVlAw3v8vjtDRlqThgVDVmTnr9fqMlxkw==", "dev": true }, "loader-utils": { @@ -3983,12 +3711,12 @@ } }, "locate-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", - "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", + "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", "dev": true, "requires": { - "p-locate": "^2.0.0", + "p-locate": "^3.0.0", "path-exists": "^3.0.0" } }, @@ -4038,9 +3766,9 @@ } }, "logform": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/logform/-/logform-1.9.1.tgz", - "integrity": "sha512-ZHrZE8VSf7K3xKxJiQ1aoTBp2yK+cEbFcgarsjzI3nt3nE/3O0heNSppoOQMUJVMZo/xiVwCxiXIabaZApsKNQ==", + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/logform/-/logform-1.10.0.tgz", + "integrity": "sha512-em5ojIhU18fIMOw/333mD+ZLE2fis0EzXl1ZwHx4iQzmpQi6odNiY/t+ITNr33JZhT9/KEaH+UPIipr6a9EjWg==", "dev": true, "requires": { "colors": "^1.2.1", @@ -4074,22 +3802,6 @@ "object.assign": "^4.1.0" } }, - "long": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/long/-/long-3.2.0.tgz", - "integrity": "sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s=", - "dev": true - }, - "loud-rejection": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz", - "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", - "dev": true, - "requires": { - "currently-unhandled": "^0.4.1", - "signal-exit": "^3.0.0" - } - }, "lower-case": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz", @@ -4121,11 +3833,14 @@ "integrity": "sha512-0Dab5btKVPhibSalc9QGXb559ED7G7iLjFXBaj9Wq8O3vorueR5K5jaE3hkG6ZQINyhA/JgG6Qk4qdFQjsYV6g==", "dev": true }, - "mamacro": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/mamacro/-/mamacro-0.0.3.tgz", - "integrity": "sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==", - "dev": true + "map-age-cleaner": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.2.tgz", + "integrity": "sha512-UN1dNocxQq44IhJyMI4TU8phc2m9BddacHRPRjKGLYaF0jqd3xLz0jS0skpAU9WgYyoR4gHtUpzytNBS385FWQ==", + "dev": true, + "requires": { + "p-defer": "^1.0.0" + } }, "map-cache": { "version": "0.2.2", @@ -4133,12 +3848,6 @@ "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=", "dev": true }, - "map-obj": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", - "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=", - "dev": true - }, "map-visit": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz", @@ -4149,13 +3858,14 @@ } }, "md5.js": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz", - "integrity": "sha1-6b296UogpawYsENA/Fdk1bCdkB0=", + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz", + "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==", "dev": true, "requires": { "hash-base": "^3.0.0", - "inherits": "^2.0.1" + "inherits": "^2.0.1", + "safe-buffer": "^5.1.2" } }, "media-typer": { @@ -4165,12 +3875,14 @@ "dev": true }, "mem": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz", - "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/mem/-/mem-4.0.0.tgz", + "integrity": "sha512-WQxG/5xYc3tMbYLXoXPm81ET2WDULiU5FxbuIoNbJqLOOI8zehXFdZuiUEgfdrU2mVB1pxBZUGlYORSrpuJreA==", "dev": true, "requires": { - "mimic-fn": "^1.0.0" + "map-age-cleaner": "^0.1.1", + "mimic-fn": "^1.0.0", + "p-is-promise": "^1.1.0" } }, "memory-fs": { @@ -4183,38 +3895,6 @@ "readable-stream": "^2.0.1" } }, - "meow": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", - "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" - }, - "dependencies": { - "decamelize": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", - "dev": true - }, - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true - } - } - }, "merge-descriptors": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", @@ -4265,18 +3945,18 @@ "dev": true }, "mime-db": { - "version": "1.35.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.35.0.tgz", - "integrity": "sha512-JWT/IcCTsB0Io3AhWUMjRqucrHSPsSf2xKLaRldJVULioggvkJvggZ3VXNNSRkCddE6D+BUI4HEIZIA2OjwIvg==", + "version": "1.36.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.36.0.tgz", + "integrity": "sha512-L+xvyD9MkoYMXb1jAmzI/lWYAxAMCPvIBSWur0PZ5nOf5euahRLVqH//FKW9mWp2lkqUgYiXPgkzfMUFi4zVDw==", "dev": true }, "mime-types": { - "version": "2.1.19", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.19.tgz", - "integrity": "sha512-P1tKYHVSZ6uFo26mtnve4HQFE3koh1UWVkp8YUC+ESBHe945xWSoXuHHiGarDqcEZ+whpCDnlNw5LON0kLo+sw==", + "version": "2.1.20", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.20.tgz", + "integrity": "sha512-HrkrPaP9vGuWbLK1B1FfgAkbqNjIuy4eHlIYnFi7kamZyLLrGlo2mpcx0bBmNpKqBtYtAfGbodDddIgddSJC2A==", "dev": true, "requires": { - "mime-db": "~1.35.0" + "mime-db": "~1.36.0" } }, "mimic-fn": { @@ -4313,9 +3993,9 @@ "dev": true }, "mississippi": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-2.0.0.tgz", - "integrity": "sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz", + "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==", "dev": true, "requires": { "concat-stream": "^1.5.0", @@ -4324,7 +4004,7 @@ "flush-write-stream": "^1.0.0", "from2": "^2.1.0", "parallel-transform": "^1.1.0", - "pump": "^2.0.1", + "pump": "^3.0.0", "pumpify": "^1.3.3", "stream-each": "^1.1.0", "through2": "^2.0.0" @@ -4396,12 +4076,6 @@ "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=", "dev": true }, - "mute-stream": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz", - "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=", - "dev": true - }, "nan": { "version": "2.10.0", "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz", @@ -4447,9 +4121,9 @@ "dev": true }, "nice-try": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.4.tgz", - "integrity": "sha512-2NpiFHqC87y/zFke0fC0spBXL3bBsoh/p5H1EFhshxjCR5+0g2d6BiXbUFz9v1sAcxsk2htp2eQnNIci2dIYcA==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", + "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==", "dev": true }, "no-case": { @@ -4547,18 +4221,6 @@ } } }, - "normalize-package-data": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", - "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", - "dev": true, - "requires": { - "hosted-git-info": "^2.1.4", - "is-builtin-module": "^1.0.0", - "semver": "2 || 3 || 4 || 5", - "validate-npm-package-license": "^3.0.1" - } - }, "normalize-path": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", @@ -4711,19 +4373,10 @@ "integrity": "sha1-+M33eISCb+Tf+T46nMN7HkSAdC4=", "dev": true }, - "onetime": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", - "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", - "dev": true, - "requires": { - "mimic-fn": "^1.0.0" - } - }, "opn": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/opn/-/opn-5.3.0.tgz", - "integrity": "sha512-bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g==", + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/opn/-/opn-5.4.0.tgz", + "integrity": "sha512-YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw==", "dev": true, "requires": { "is-wsl": "^1.1.0" @@ -4745,20 +4398,20 @@ "dev": true }, "os-locale": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz", - "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.0.1.tgz", + "integrity": "sha512-7g5e7dmXPtzcP4bgsZ8ixDVqA7oWYuEz4lOSujeWyliPai4gfVDiFIcwBg3aGCPnmSGfzOKTK3ccPn0CKv3DBw==", "dev": true, "requires": { - "execa": "^0.7.0", - "lcid": "^1.0.0", - "mem": "^1.1.0" + "execa": "^0.10.0", + "lcid": "^2.0.0", + "mem": "^4.0.0" } }, - "os-tmpdir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", + "p-defer": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz", + "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=", "dev": true }, "p-finally": { @@ -4767,22 +4420,28 @@ "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=", "dev": true }, + "p-is-promise": { + "version": "1.1.0", + "resolved": "http://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz", + "integrity": "sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=", + "dev": true + }, "p-limit": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", - "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.0.0.tgz", + "integrity": "sha512-fl5s52lI5ahKCernzzIyAP0QAZbGIovtVHGwpcu1Jr/EpzLVDI2myISHwGqK7m8uQFugVWSrbxH7XnhGtvEc+A==", "dev": true, "requires": { - "p-try": "^1.0.0" + "p-try": "^2.0.0" } }, "p-locate": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", - "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", + "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", "dev": true, "requires": { - "p-limit": "^1.1.0" + "p-limit": "^2.0.0" } }, "p-map": { @@ -4792,9 +4451,9 @@ "dev": true }, "p-try": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", - "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz", + "integrity": "sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==", "dev": true }, "pako": { @@ -4825,7 +4484,7 @@ }, "parse-asn1": { "version": "5.1.1", - "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz", + "resolved": "http://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz", "integrity": "sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==", "dev": true, "requires": { @@ -4836,15 +4495,6 @@ "pbkdf2": "^3.0.3" } }, - "parse-json": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", - "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", - "dev": true, - "requires": { - "error-ex": "^1.2.0" - } - }, "parseurl": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz", @@ -4905,29 +4555,10 @@ "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=", "dev": true }, - "path-type": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", - "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" - }, - "dependencies": { - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true - } - } - }, "pbkdf2": { - "version": "3.0.16", - "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.16.tgz", - "integrity": "sha512-y4CXP3thSxqf7c0qmOF+9UeOTrifiVTIM+u7NWlq+PRsHbr7r7dpCmvzrZxa96JJUNi0Y5w9VqG5ZNeCVMoDcA==", + "version": "3.0.17", + "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz", + "integrity": "sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==", "dev": true, "requires": { "create-hash": "^1.1.2", @@ -4959,23 +4590,31 @@ } }, "pkg-dir": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz", - "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz", + "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==", "dev": true, "requires": { - "find-up": "^2.1.0" + "find-up": "^3.0.0" } }, "portfinder": { - "version": "1.0.16", - "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.16.tgz", - "integrity": "sha512-icBXCFQxzlK2PMepOM0QeEdPPFSLAaXXeuKOv5AClJlMy1oVCBrkDGJ12IZYesI/BF8mpeVco3vRCmgeBb4+hw==", + "version": "1.0.17", + "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.17.tgz", + "integrity": "sha512-syFcRIRzVI1BoEFOCaAiizwDolh1S1YXSodsVhncbhjzjZQulhczNRbqnUl9N31Q4dKGOXsNDqxC2BWBgSMqeQ==", "dev": true, "requires": { "async": "^1.5.2", "debug": "^2.2.0", "mkdirp": "0.5.x" + }, + "dependencies": { + "async": { + "version": "1.5.2", + "resolved": "http://registry.npmjs.org/async/-/async-1.5.2.tgz", + "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", + "dev": true + } } }, "posix-character-classes": { @@ -5035,22 +4674,23 @@ "dev": true }, "public-encrypt": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.2.tgz", - "integrity": "sha512-4kJ5Esocg8X3h8YgJsKAuoesBgB7mqH3eowiDzMUPKiRDDE7E/BqqZD1hnTByIaAFiwAw246YEltSq7tdrOH0Q==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz", + "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==", "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" + "randombytes": "^2.0.1", + "safe-buffer": "^5.1.2" } }, "pump": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz", - "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", + "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", "dev": true, "requires": { "end-of-stream": "^1.1.0", @@ -5066,6 +4706,18 @@ "duplexify": "^3.6.0", "inherits": "^2.0.3", "pump": "^2.0.0" + }, + "dependencies": { + "pump": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz", + "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==", + "dev": true, + "requires": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } + } } }, "punycode": { @@ -5075,9 +4727,9 @@ "dev": true }, "qs": { - "version": "6.5.1", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz", - "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==", + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", + "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", "dev": true }, "querystring": { @@ -5093,9 +4745,9 @@ "dev": true }, "querystringify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.0.0.tgz", - "integrity": "sha512-eTPo5t/4bgaMNZxyjWx6N2a6AuE0mq51KWvpc7nU/MAqixcI6v6KrGUKES0HaomdnolQBBXU/++X6/QQ9KL4tw==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.0.tgz", + "integrity": "sha512-sluvZZ1YiTLD5jsqZcDmFyV2EwToyXZBfpoVOmktMmW+VEnhgakFHnasVph65fOjGPTWN0Nw3+XQaSeMayr0kg==", "dev": true }, "randombytes": { @@ -5124,89 +4776,15 @@ "dev": true }, "raw-body": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz", - "integrity": "sha1-vNYMd9Prk83gBQKVw/N5OJvIj4k=", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.3.tgz", + "integrity": "sha512-9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==", "dev": true, "requires": { "bytes": "3.0.0", - "http-errors": "1.6.2", - "iconv-lite": "0.4.19", + "http-errors": "1.6.3", + "iconv-lite": "0.4.23", "unpipe": "1.0.0" - }, - "dependencies": { - "depd": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz", - "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=", - "dev": true - }, - "http-errors": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz", - "integrity": "sha1-CgAsyFcHGSp+eUbO7cERVfYOxzY=", - "dev": true, - "requires": { - "depd": "1.1.1", - "inherits": "2.0.3", - "setprototypeof": "1.0.3", - "statuses": ">= 1.3.1 < 2" - } - }, - "iconv-lite": { - "version": "0.4.19", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz", - "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==", - "dev": true - }, - "setprototypeof": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz", - "integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ=", - "dev": true - } - } - }, - "read-pkg": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", - "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", - "dev": true, - "requires": { - "load-json-file": "^1.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^1.0.0" - } - }, - "read-pkg-up": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", - "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", - "dev": true, - "requires": { - "find-up": "^1.0.0", - "read-pkg": "^1.0.0" - }, - "dependencies": { - "find-up": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", - "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", - "dev": true, - "requires": { - "path-exists": "^2.0.0", - "pinkie-promise": "^2.0.0" - } - }, - "path-exists": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", - "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", - "dev": true, - "requires": { - "pinkie-promise": "^2.0.0" - } - } } }, "readable-stream": { @@ -5236,16 +4814,6 @@ "set-immediate-shim": "^1.0.1" } }, - "redent": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz", - "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", - "dev": true, - "requires": { - "indent-string": "^2.1.0", - "strip-indent": "^1.0.1" - } - }, "regex-not": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz", @@ -5301,15 +4869,6 @@ "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=", "dev": true }, - "repeating": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", - "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", - "dev": true, - "requires": { - "is-finite": "^1.0.0" - } - }, "require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", @@ -5358,16 +4917,6 @@ "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=", "dev": true }, - "restore-cursor": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz", - "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", - "dev": true, - "requires": { - "onetime": "^2.0.0", - "signal-exit": "^3.0.2" - } - }, "ret": { "version": "0.1.15", "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz", @@ -5393,15 +4942,6 @@ "inherits": "^2.0.1" } }, - "run-async": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz", - "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=", - "dev": true, - "requires": { - "is-promise": "^2.1.0" - } - }, "run-queue": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz", @@ -5411,15 +4951,6 @@ "aproba": "^1.1.1" } }, - "rxjs": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.2.2.tgz", - "integrity": "sha512-0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ==", - "dev": true, - "requires": { - "tslib": "^1.9.0" - } - }, "safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", @@ -5442,12 +4973,13 @@ "dev": true }, "schema-utils": { - "version": "0.4.7", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz", - "integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz", + "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", "dev": true, "requires": { "ajv": "^6.1.0", + "ajv-errors": "^1.0.0", "ajv-keywords": "^3.1.0" } }, @@ -5458,18 +4990,18 @@ "dev": true }, "selfsigned": { - "version": "1.10.3", - "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.3.tgz", - "integrity": "sha512-vmZenZ+8Al3NLHkWnhBQ0x6BkML1eCP2xEi3JE+f3D9wW9fipD9NNJHYtE9XJM4TsPaHGZJIamrSI6MTg1dU2Q==", + "version": "1.10.4", + "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.4.tgz", + "integrity": "sha512-9AukTiDmHXGXWtWjembZ5NDmVvP2695EtpgbCsxCa68w3c88B+alqbmZ4O3hZ4VWGXeGWzEVdvqgAJD8DQPCDw==", "dev": true, "requires": { "node-forge": "0.7.5" } }, "semver": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", - "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz", + "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==", "dev": true }, "send": { @@ -5575,7 +5107,7 @@ }, "sha.js": { "version": "2.4.11", - "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", + "resolved": "http://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", "dev": true, "requires": { @@ -5611,14 +5143,6 @@ "dev": true, "requires": { "is-arrayish": "^0.3.1" - }, - "dependencies": { - "is-arrayish": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz", - "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==", - "dev": true - } } }, "snapdragon": { @@ -5819,38 +5343,6 @@ "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=", "dev": true }, - "spdx-correct": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz", - "integrity": "sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==", - "dev": true, - "requires": { - "spdx-expression-parse": "^3.0.0", - "spdx-license-ids": "^3.0.0" - } - }, - "spdx-exceptions": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz", - "integrity": "sha512-4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg==", - "dev": true - }, - "spdx-expression-parse": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz", - "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==", - "dev": true, - "requires": { - "spdx-exceptions": "^2.1.0", - "spdx-license-ids": "^3.0.0" - } - }, - "spdx-license-ids": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz", - "integrity": "sha512-2+EPwgbnmOIl8HjGBXXMd9NAu02vLjOO1nWw4kmeRDFyHn+M/ETfHxQUK0oXg8ctgVnl9t3rosNVsZ1jG61nDA==", - "dev": true - }, "spdy": { "version": "3.4.7", "resolved": "https://registry.npmjs.org/spdy/-/spdy-3.4.7.tgz", @@ -5890,12 +5382,12 @@ } }, "ssri": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-5.3.0.tgz", - "integrity": "sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz", + "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==", "dev": true, "requires": { - "safe-buffer": "^5.1.1" + "figgy-pudding": "^3.5.1" } }, "stack-trace": { @@ -6015,30 +5507,12 @@ "ansi-regex": "^2.0.0" } }, - "strip-bom": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", - "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", - "dev": true, - "requires": { - "is-utf8": "^0.2.0" - } - }, "strip-eof": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=", "dev": true }, - "strip-indent": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz", - "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", - "dev": true, - "requires": { - "get-stdin": "^4.0.1" - } - }, "supports-color": { "version": "5.4.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", @@ -6065,12 +5539,6 @@ "resolved": "https://registry.npmjs.org/three/-/three-0.95.0.tgz", "integrity": "sha512-vy6jMYs7CDwn47CejYHNi+++OdQue7xGIBhbLfekQ/G6MDxKRm0QB0/xWScz46/JvQAvF6pJAS5Q907l0i5iQA==" }, - "through": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=", - "dev": true - }, "through2": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz", @@ -6096,15 +5564,6 @@ "setimmediate": "^1.0.4" } }, - "tmp": { - "version": "0.0.33", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", - "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", - "dev": true, - "requires": { - "os-tmpdir": "~1.0.2" - } - }, "to-arraybuffer": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz", @@ -6159,12 +5618,6 @@ "integrity": "sha1-LmhELZ9k7HILjMieZEOsbKqVACk=", "dev": true }, - "trim-newlines": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz", - "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=", - "dev": true - }, "triple-beam": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.3.0.tgz", @@ -6172,9 +5625,9 @@ "dev": true }, "ts-loader": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-4.4.2.tgz", - "integrity": "sha512-Z3Y1a7A0KZZ1s/mAZkt74l1NAF7Y5xUhD1V9VB8/1eUlUOk8Qa/oo46tO2Uu5kQ3wXypOlbv77lLQySjXEDcdw==", + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-5.2.1.tgz", + "integrity": "sha512-KC0cOvsFVyxBlg5h9jvaMlIL2tNsyQLvT2/OvIlO0AMUBJ4iXTtOfaDEqvmqv2lM/icekQfDsP2PsYBCDHpuOQ==", "dev": true, "requires": { "chalk": "^2.3.0", @@ -6237,33 +5690,33 @@ "dev": true }, "typescript": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.0.1.tgz", - "integrity": "sha512-zQIMOmC+372pC/CCVLqnQ0zSBiY7HHodU7mpQdjiZddek4GMj31I3dUJ7gAs9o65X7mnRma6OokOkc6f9jjfBg==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.1.3.tgz", + "integrity": "sha512-+81MUSyX+BaSo+u2RbozuQk/UWx6hfG0a5gHu4ANEM4sU96XbuIyAB+rWBW1u70c6a5QuZfuYICn3s2UjuHUpA==", "dev": true }, - "uglify-es": { - "version": "3.3.9", - "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.9.tgz", - "integrity": "sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==", + "uglify-js": { + "version": "3.4.9", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.9.tgz", + "integrity": "sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==", "dev": true, "requires": { - "commander": "~2.13.0", + "commander": "~2.17.1", "source-map": "~0.6.1" } }, "uglifyjs-webpack-plugin": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.3.0.tgz", - "integrity": "sha512-ovHIch0AMlxjD/97j9AYovZxG5wnHOPkL7T1GKochBADp/Zwc44pEWNqpKl1Loupp1WhFg7SlYmHZRUfdAacgw==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-2.0.1.tgz", + "integrity": "sha512-1HhCHkOB6wRCcv7htcz1QRPVbWPEY074RP9vzt/X0LF4xXm9l4YGd0qja7z88abDixQlnVwBjXsTBs+Xsn/eeQ==", "dev": true, "requires": { - "cacache": "^10.0.4", - "find-cache-dir": "^1.0.0", - "schema-utils": "^0.4.5", + "cacache": "^11.2.0", + "find-cache-dir": "^2.0.0", + "schema-utils": "^1.0.0", "serialize-javascript": "^1.4.0", "source-map": "^0.6.1", - "uglify-es": "^3.3.4", + "uglify-js": "^3.0.0", "webpack-sources": "^1.1.0", "worker-farm": "^1.5.2" } @@ -6310,18 +5763,18 @@ } }, "unique-filename": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.0.tgz", - "integrity": "sha1-0F8v5AMlYIcfMOk8vnNe6iAVFPM=", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz", + "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==", "dev": true, "requires": { "unique-slug": "^2.0.0" } }, "unique-slug": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.0.tgz", - "integrity": "sha1-22Z258fMBimHj/GWCXx4hVrp9Ks=", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.1.tgz", + "integrity": "sha512-n9cU6+gITaVu7VGj1Z8feKMmfAjEAQGhwD9fE3zvpRRa0wEIx8ODYkVGfSc94M2OX00tUFV8wH3zYbm1I8mxFg==", "dev": true, "requires": { "imurmurhash": "^0.1.4" @@ -6418,12 +5871,6 @@ } } }, - "url-join": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/url-join/-/url-join-4.0.0.tgz", - "integrity": "sha1-TTNA6AfTdzvamZH4MFrNzCpmXSo=", - "dev": true - }, "url-parse": { "version": "1.4.3", "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.3.tgz", @@ -6489,16 +5936,6 @@ "integrity": "sha512-1wFuMUIM16MDJRCrpbpuEPTUGmM5QMUg0cr3KFwra2XgOgFcPGDQHDh3CszSCD2Zewc/dh/pamNEW8CbfDebUw==", "dev": true }, - "validate-npm-package-license": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", - "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", - "dev": true, - "requires": { - "spdx-correct": "^3.0.0", - "spdx-expression-parse": "^3.0.0" - } - }, "vary": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", @@ -6535,16 +5972,15 @@ } }, "webpack": { - "version": "4.16.5", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.16.5.tgz", - "integrity": "sha512-i5cHYHonzSc1zBuwB5MSzW4v9cScZFbprkHK8ZgzPDCRkQXGGpYzPmJhbus5bOrZ0tXTcQp+xyImRSvKb0b+Kw==", + "version": "4.20.2", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.20.2.tgz", + "integrity": "sha512-75WFUMblcWYcocjSLlXCb71QuGyH7egdBZu50FtBGl2Nso8CK3Ej+J7bTZz2FPFq5l6fzCisD9modB7t30ikuA==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.5.13", - "@webassemblyjs/helper-module-context": "1.5.13", - "@webassemblyjs/wasm-edit": "1.5.13", - "@webassemblyjs/wasm-opt": "1.5.13", - "@webassemblyjs/wasm-parser": "1.5.13", + "@webassemblyjs/ast": "1.7.8", + "@webassemblyjs/helper-module-context": "1.7.8", + "@webassemblyjs/wasm-edit": "1.7.8", + "@webassemblyjs/wasm-parser": "1.7.8", "acorn": "^5.6.2", "acorn-dynamic-import": "^3.0.0", "ajv": "^6.1.0", @@ -6561,44 +5997,232 @@ "neo-async": "^2.5.0", "node-libs-browser": "^2.0.0", "schema-utils": "^0.4.4", - "tapable": "^1.0.0", + "tapable": "^1.1.0", "uglifyjs-webpack-plugin": "^1.2.4", "watchpack": "^1.5.0", - "webpack-sources": "^1.0.1" + "webpack-sources": "^1.3.0" + }, + "dependencies": { + "cacache": { + "version": "10.0.4", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz", + "integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==", + "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" + } + }, + "commander": { + "version": "2.13.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz", + "integrity": "sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==", + "dev": true + }, + "find-cache-dir": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz", + "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=", + "dev": true, + "requires": { + "commondir": "^1.0.1", + "make-dir": "^1.0.0", + "pkg-dir": "^2.0.0" + } + }, + "find-up": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", + "dev": true, + "requires": { + "locate-path": "^2.0.0" + } + }, + "locate-path": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", + "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", + "dev": true, + "requires": { + "p-locate": "^2.0.0", + "path-exists": "^3.0.0" + } + }, + "mississippi": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-2.0.0.tgz", + "integrity": "sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==", + "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" + } + }, + "p-limit": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", + "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", + "dev": true, + "requires": { + "p-try": "^1.0.0" + } + }, + "p-locate": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", + "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", + "dev": true, + "requires": { + "p-limit": "^1.1.0" + } + }, + "p-try": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", + "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", + "dev": true + }, + "pkg-dir": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz", + "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", + "dev": true, + "requires": { + "find-up": "^2.1.0" + } + }, + "pump": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz", + "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==", + "dev": true, + "requires": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } + }, + "schema-utils": { + "version": "0.4.7", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz", + "integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==", + "dev": true, + "requires": { + "ajv": "^6.1.0", + "ajv-keywords": "^3.1.0" + } + }, + "ssri": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-5.3.0.tgz", + "integrity": "sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==", + "dev": true, + "requires": { + "safe-buffer": "^5.1.1" + } + }, + "tapable": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.0.tgz", + "integrity": "sha512-IlqtmLVaZA2qab8epUXbVWRn3aB1imbDMJtjB3nu4X0NqPkcY/JH9ZtCBWKHWPxs8Svi9tyo8w2dBoi07qZbBA==", + "dev": true + }, + "uglify-es": { + "version": "3.3.9", + "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.9.tgz", + "integrity": "sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==", + "dev": true, + "requires": { + "commander": "~2.13.0", + "source-map": "~0.6.1" + } + }, + "uglifyjs-webpack-plugin": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.3.0.tgz", + "integrity": "sha512-ovHIch0AMlxjD/97j9AYovZxG5wnHOPkL7T1GKochBADp/Zwc44pEWNqpKl1Loupp1WhFg7SlYmHZRUfdAacgw==", + "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" + } + }, + "webpack-sources": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.3.0.tgz", + "integrity": "sha512-OiVgSrbGu7NEnEvQJJgdSFPl2qWKkWq5lHMhgiToIiN9w34EBnjYzSYs+VbL5KoYiLNtFFa7BZIKxRED3I32pA==", + "dev": true, + "requires": { + "source-list-map": "^2.0.0", + "source-map": "~0.6.1" + } + } } }, "webpack-cli": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.1.0.tgz", - "integrity": "sha512-p5NeKDtYwjZozUWq6kGNs9w+Gtw/CPvyuXjXn2HMdz8Tie+krjEg8oAtonvIyITZdvpF7XG9xDHwscLr2c+ugQ==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.1.2.tgz", + "integrity": "sha512-Cnqo7CeqeSvC6PTdts+dywNi5CRlIPbLx1AoUPK2T6vC1YAugMG3IOoO9DmEscd+Dghw7uRlnzV1KwOe5IrtgQ==", "dev": true, "requires": { "chalk": "^2.4.1", "cross-spawn": "^6.0.5", - "enhanced-resolve": "^4.0.0", - "global-modules-path": "^2.1.0", - "import-local": "^1.0.0", - "inquirer": "^6.0.0", + "enhanced-resolve": "^4.1.0", + "global-modules-path": "^2.3.0", + "import-local": "^2.0.0", "interpret": "^1.1.0", "loader-utils": "^1.1.0", - "supports-color": "^5.4.0", - "v8-compile-cache": "^2.0.0", - "yargs": "^12.0.1" + "supports-color": "^5.5.0", + "v8-compile-cache": "^2.0.2", + "yargs": "^12.0.2" + }, + "dependencies": { + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } } }, "webpack-dev-middleware": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.1.3.tgz", - "integrity": "sha512-I6Mmy/QjWU/kXwCSFGaiOoL5YEQIVmbb0o45xMoCyQAg/mClqZVTcsX327sPfekDyJWpCxb+04whNyLOIxpJdQ==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.4.0.tgz", + "integrity": "sha512-Q9Iyc0X9dP9bAsYskAVJ/hmIZZQwf/3Sy4xCAZgL5cUkjZmUZLt4l5HpbST/Pdgjn3u6pE7u5OdGd1apgzRujA==", "dev": true, "requires": { - "loud-rejection": "^1.6.0", "memory-fs": "~0.4.1", - "mime": "^2.1.0", - "path-is-absolute": "^1.0.0", + "mime": "^2.3.1", "range-parser": "^1.0.3", - "url-join": "^4.0.0", - "webpack-log": "^1.0.1" + "webpack-log": "^2.0.0" }, "dependencies": { "mime": { @@ -6606,17 +6230,26 @@ "resolved": "https://registry.npmjs.org/mime/-/mime-2.3.1.tgz", "integrity": "sha512-OEUllcVoydBHGN1z84yfQDimn58pZNNNXgZlHXSboxMlFvgI6MXSWpWKpFRra7H1HxpVhHTkrghfRW49k6yjeg==", "dev": true + }, + "webpack-log": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz", + "integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==", + "dev": true, + "requires": { + "ansi-colors": "^3.0.0", + "uuid": "^3.3.2" + } } } }, "webpack-dev-server": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.1.5.tgz", - "integrity": "sha512-LVHg+EPwZLHIlfvokSTgtJqO/vI5CQi89fASb5JEDtVMDjY0yuIEqPPdMiKaBJIB/Ab7v/UN/sYZ7WsZvntQKw==", + "version": "3.1.9", + "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.1.9.tgz", + "integrity": "sha512-fqPkuNalLuc/hRC2QMkVYJkgNmRvxZQo7ykA2e1XRg/tMJm3qY7ZaD6d89/Fqjxtj9bOrn5wZzLD2n84lJdvWg==", "dev": true, "requires": { "ansi-html": "0.0.7", - "array-includes": "^3.0.3", "bonjour": "^3.5.0", "chokidar": "^2.0.0", "compression": "^1.5.2", @@ -6626,13 +6259,14 @@ "express": "^4.16.2", "html-entities": "^1.2.0", "http-proxy-middleware": "~0.18.0", - "import-local": "^1.0.0", - "internal-ip": "1.2.0", + "import-local": "^2.0.0", + "internal-ip": "^3.0.1", "ip": "^1.1.5", "killable": "^1.0.0", "loglevel": "^1.4.1", "opn": "^5.1.0", "portfinder": "^1.0.9", + "schema-utils": "^1.0.0", "selfsigned": "^1.9.1", "serve-index": "^1.7.2", "sockjs": "0.3.19", @@ -6640,59 +6274,34 @@ "spdy": "^3.4.1", "strip-ansi": "^3.0.0", "supports-color": "^5.1.0", - "webpack-dev-middleware": "3.1.3", - "webpack-log": "^1.1.2", - "yargs": "11.0.0" + "webpack-dev-middleware": "3.4.0", + "webpack-log": "^2.0.0", + "yargs": "12.0.2" }, "dependencies": { "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", + "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", "dev": true, "requires": { - "ms": "2.0.0" + "ms": "^2.1.1" } }, - "decamelize": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", + "ms": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", + "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", "dev": true }, - "y18n": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", - "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=", - "dev": true - }, - "yargs": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-11.0.0.tgz", - "integrity": "sha512-Rjp+lMYQOWtgqojx1dEWorjCofi1YN7AoFvYV7b1gx/7dAAeuI4kN5SZiEvr0ZmsZTOpDRcCqrpI10L31tFkBw==", + "webpack-log": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz", + "integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==", "dev": true, "requires": { - "cliui": "^4.0.0", - "decamelize": "^1.1.1", - "find-up": "^2.1.0", - "get-caller-file": "^1.0.1", - "os-locale": "^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": "^9.0.2" - } - }, - "yargs-parser": { - "version": "9.0.2", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-9.0.2.tgz", - "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=", - "dev": true, - "requires": { - "camelcase": "^4.1.0" + "ansi-colors": "^3.0.0", + "uuid": "^3.3.2" } } } @@ -6760,31 +6369,20 @@ "dev": true }, "winston": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/winston/-/winston-3.0.0.tgz", - "integrity": "sha512-7QyfOo1PM5zGL6qma6NIeQQMh71FBg/8fhkSAePqtf5YEi6t+UrPDcUuHhuuUasgso49ccvMEsmqr0GBG2qaMQ==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/winston/-/winston-3.1.0.tgz", + "integrity": "sha512-FsQfEE+8YIEeuZEYhHDk5cILo1HOcWkGwvoidLrDgPog0r4bser1lEIOco2dN9zpDJ1M88hfDgZvxe5z4xNcwg==", "dev": true, "requires": { "async": "^2.6.0", - "diagnostics": "^1.0.1", + "diagnostics": "^1.1.1", "is-stream": "^1.1.0", - "logform": "^1.9.0", + "logform": "^1.9.1", "one-time": "0.0.4", "readable-stream": "^2.3.6", "stack-trace": "0.0.x", "triple-beam": "^1.3.0", "winston-transport": "^4.2.0" - }, - "dependencies": { - "async": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz", - "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==", - "dev": true, - "requires": { - "lodash": "^4.17.10" - } - } } }, "winston-transport": { @@ -6813,7 +6411,7 @@ }, "wrap-ansi": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", + "resolved": "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", "dev": true, "requires": { @@ -6899,16 +6497,16 @@ "dev": true }, "yargs": { - "version": "12.0.1", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.1.tgz", - "integrity": "sha512-B0vRAp1hRX4jgIOWFtjfNjd9OA9RWYZ6tqGA9/I/IrTMsxmKvtWy+ersM+jzpQqbC3YfLzeABPdeTgcJ9eu1qQ==", + "version": "12.0.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.2.tgz", + "integrity": "sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==", "dev": true, "requires": { "cliui": "^4.0.0", "decamelize": "^2.0.0", "find-up": "^3.0.0", "get-caller-file": "^1.0.1", - "os-locale": "^2.0.0", + "os-locale": "^3.0.0", "require-directory": "^2.1.1", "require-main-filename": "^1.0.1", "set-blocking": "^2.0.0", @@ -6916,51 +6514,6 @@ "which-module": "^2.0.0", "y18n": "^3.2.1 || ^4.0.0", "yargs-parser": "^10.1.0" - }, - "dependencies": { - "find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", - "dev": true, - "requires": { - "locate-path": "^3.0.0" - } - }, - "locate-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", - "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", - "dev": true, - "requires": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" - } - }, - "p-limit": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.0.0.tgz", - "integrity": "sha512-fl5s52lI5ahKCernzzIyAP0QAZbGIovtVHGwpcu1Jr/EpzLVDI2myISHwGqK7m8uQFugVWSrbxH7XnhGtvEc+A==", - "dev": true, - "requires": { - "p-try": "^2.0.0" - } - }, - "p-locate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", - "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", - "dev": true, - "requires": { - "p-limit": "^2.0.0" - } - }, - "p-try": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz", - "integrity": "sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==", - "dev": true - } } }, "yargs-parser": { diff --git a/package.json b/package.json index aed4930..e41084a 100644 --- a/package.json +++ b/package.json @@ -19,24 +19,24 @@ "license": "ISC", "devDependencies": { "@types/hard-source-webpack-plugin": "^0.9.0", - "@types/node": "^10.7.1", - "@types/three": "^0.92.17", + "@types/node": "^10.11.7", + "@types/three": "^0.92.25", "@types/uglifyjs-webpack-plugin": "^1.1.0", - "@types/webpack": "^4.4.10", - "@types/webpack-dev-server": "^2.9.6", + "@types/webpack": "^4.4.16", + "@types/webpack-dev-server": "^3.1.1", "@types/webpack-env": "^1.13.6", "@types/webpack-merge": "^4.1.3", - "awesome-typescript-loader": "^5.2.0", + "awesome-typescript-loader": "^5.2.1", "fork-ts-checker-webpack-plugin": "^0.4.8", "hard-source-webpack-plugin": "^0.12.0", "html-webpack-plugin": "^3.2.0", - "ts-loader": "^4.4.2", + "ts-loader": "^5.2.1", "ts-node": "^7.0.1", - "typescript": "^3.0.1", - "uglifyjs-webpack-plugin": "^1.3.0", - "webpack": "^4.16.5", - "webpack-cli": "^3.1.0", - "webpack-dev-server": "^3.1.5", + "typescript": "^3.1.3", + "uglifyjs-webpack-plugin": "^2.0.1", + "webpack": "^4.20.2", + "webpack-cli": "^3.1.2", + "webpack-dev-server": "^3.1.9", "webpack-merge": "^4.1.4" }, "dependencies": {