removed locks from versioning
This commit is contained in:
81
package-lock.json
generated
81
package-lock.json
generated
@@ -71,6 +71,7 @@
|
||||
"webpack-merge": "^4.1.2",
|
||||
"webpack-sources": "^1.1.0",
|
||||
"webpack-subresource-integrity": "^1.1.0-rc.4"
|
||||
<<<<<<< HEAD
|
||||
}
|
||||
},
|
||||
"@angular-devkit/build-ng-packagr": {
|
||||
@@ -107,6 +108,8 @@
|
||||
"source-map": "^0.5.6"
|
||||
}
|
||||
}
|
||||
=======
|
||||
>>>>>>> c982aba19a25a34015fca143901c097fe45b2c8b
|
||||
}
|
||||
},
|
||||
"@angular-devkit/build-optimizer": {
|
||||
@@ -1221,6 +1224,7 @@
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"hoek": "4.x.x"
|
||||
<<<<<<< HEAD
|
||||
}
|
||||
},
|
||||
"boxen": {
|
||||
@@ -1275,6 +1279,8 @@
|
||||
"ansi-regex": "^3.0.0"
|
||||
}
|
||||
}
|
||||
=======
|
||||
>>>>>>> c982aba19a25a34015fca143901c097fe45b2c8b
|
||||
}
|
||||
},
|
||||
"brace-expansion": {
|
||||
@@ -1892,6 +1898,7 @@
|
||||
"inherits": "^2.0.3",
|
||||
"readable-stream": "^2.2.2",
|
||||
"typedarray": "^0.0.6"
|
||||
<<<<<<< HEAD
|
||||
}
|
||||
},
|
||||
"configstore": {
|
||||
@@ -1906,6 +1913,8 @@
|
||||
"unique-string": "^1.0.0",
|
||||
"write-file-atomic": "^2.0.0",
|
||||
"xdg-basedir": "^3.0.0"
|
||||
=======
|
||||
>>>>>>> c982aba19a25a34015fca143901c097fe45b2c8b
|
||||
}
|
||||
},
|
||||
"connect": {
|
||||
@@ -2078,6 +2087,7 @@
|
||||
"requires": {
|
||||
"bn.js": "^4.1.0",
|
||||
"elliptic": "^6.0.0"
|
||||
<<<<<<< HEAD
|
||||
}
|
||||
},
|
||||
"create-error-class": {
|
||||
@@ -2087,6 +2097,8 @@
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"capture-stack-trace": "^1.0.0"
|
||||
=======
|
||||
>>>>>>> c982aba19a25a34015fca143901c097fe45b2c8b
|
||||
}
|
||||
},
|
||||
"create-hash": {
|
||||
@@ -2855,6 +2867,7 @@
|
||||
"requires": {
|
||||
"dom-serializer": "0",
|
||||
"domelementtype": "1"
|
||||
<<<<<<< HEAD
|
||||
}
|
||||
},
|
||||
"dot-prop": {
|
||||
@@ -2864,6 +2877,8 @@
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"is-obj": "^1.0.0"
|
||||
=======
|
||||
>>>>>>> c982aba19a25a34015fca143901c097fe45b2c8b
|
||||
}
|
||||
},
|
||||
"duplexer3": {
|
||||
@@ -3840,6 +3855,7 @@
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"null-check": "^1.0.0"
|
||||
<<<<<<< HEAD
|
||||
}
|
||||
},
|
||||
"fs-extra": {
|
||||
@@ -3851,6 +3867,8 @@
|
||||
"graceful-fs": "^4.1.2",
|
||||
"jsonfile": "^4.0.0",
|
||||
"universalify": "^0.1.0"
|
||||
=======
|
||||
>>>>>>> c982aba19a25a34015fca143901c097fe45b2c8b
|
||||
}
|
||||
},
|
||||
"fs-write-stream-atomic": {
|
||||
@@ -3912,12 +3930,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"
|
||||
@@ -3932,17 +3952,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",
|
||||
@@ -4059,7 +4082,8 @@
|
||||
"inherits": {
|
||||
"version": "2.0.3",
|
||||
"bundled": true,
|
||||
"dev": true
|
||||
"dev": true,
|
||||
"optional": true
|
||||
},
|
||||
"ini": {
|
||||
"version": "1.3.5",
|
||||
@@ -4071,6 +4095,7 @@
|
||||
"version": "1.0.0",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true,
|
||||
"requires": {
|
||||
"number-is-nan": "1.0.1"
|
||||
}
|
||||
@@ -4085,6 +4110,7 @@
|
||||
"version": "3.0.4",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true,
|
||||
"requires": {
|
||||
"brace-expansion": "^1.1.7"
|
||||
}
|
||||
@@ -4092,12 +4118,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"
|
||||
@@ -4116,6 +4144,7 @@
|
||||
"version": "0.5.1",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true,
|
||||
"requires": {
|
||||
"minimist": "0.0.8"
|
||||
}
|
||||
@@ -4196,7 +4225,8 @@
|
||||
"number-is-nan": {
|
||||
"version": "1.0.1",
|
||||
"bundled": true,
|
||||
"dev": true
|
||||
"dev": true,
|
||||
"optional": true
|
||||
},
|
||||
"object-assign": {
|
||||
"version": "4.1.1",
|
||||
@@ -4208,6 +4238,7 @@
|
||||
"version": "1.4.0",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true,
|
||||
"requires": {
|
||||
"wrappy": "1"
|
||||
}
|
||||
@@ -4329,6 +4360,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",
|
||||
@@ -4600,6 +4632,7 @@
|
||||
"glob": "~7.1.1",
|
||||
"lodash": "~4.17.4",
|
||||
"minimatch": "~3.0.2"
|
||||
<<<<<<< HEAD
|
||||
}
|
||||
},
|
||||
"got": {
|
||||
@@ -4619,6 +4652,8 @@
|
||||
"timed-out": "^4.0.0",
|
||||
"unzip-response": "^2.0.1",
|
||||
"url-parse-lax": "^1.0.0"
|
||||
=======
|
||||
>>>>>>> c982aba19a25a34015fca143901c097fe45b2c8b
|
||||
}
|
||||
},
|
||||
"graceful-fs": {
|
||||
@@ -6509,6 +6544,7 @@
|
||||
"requires": {
|
||||
"pseudomap": "^1.0.2",
|
||||
"yallist": "^2.1.2"
|
||||
<<<<<<< HEAD
|
||||
}
|
||||
},
|
||||
"magic-string": {
|
||||
@@ -6518,6 +6554,8 @@
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"vlq": "^0.2.2"
|
||||
=======
|
||||
>>>>>>> c982aba19a25a34015fca143901c097fe45b2c8b
|
||||
}
|
||||
},
|
||||
"make-dir": {
|
||||
@@ -6796,6 +6834,11 @@
|
||||
"minimist": "0.0.8"
|
||||
}
|
||||
},
|
||||
"moment": {
|
||||
"version": "2.22.2",
|
||||
"resolved": "https://registry.npmjs.org/moment/-/moment-2.22.2.tgz",
|
||||
"integrity": "sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y="
|
||||
},
|
||||
"move-concurrently": {
|
||||
"version": "1.0.1",
|
||||
"resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
|
||||
@@ -6876,6 +6919,7 @@
|
||||
"integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
|
||||
"dev": true
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"ng-packagr": {
|
||||
"version": "3.0.6",
|
||||
"resolved": "https://registry.npmjs.org/ng-packagr/-/ng-packagr-3.0.6.tgz",
|
||||
@@ -6969,6 +7013,14 @@
|
||||
"integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
|
||||
"dev": true
|
||||
}
|
||||
=======
|
||||
"ngx-moment": {
|
||||
"version": "3.1.0",
|
||||
"resolved": "https://registry.npmjs.org/ngx-moment/-/ngx-moment-3.1.0.tgz",
|
||||
"integrity": "sha512-liX6iTfOY0XyI3rUuWNgGpgxoeD+DFaAl7UJ/ejl9Ama5cXzw8L1Eft6UQLUo1d80kjNMc6AL+L19CPMvUQ/BA==",
|
||||
"requires": {
|
||||
"tslib": "^1.9.0"
|
||||
>>>>>>> c982aba19a25a34015fca143901c097fe45b2c8b
|
||||
}
|
||||
},
|
||||
"no-case": {
|
||||
@@ -8577,6 +8629,7 @@
|
||||
"regenerate": "^1.2.1",
|
||||
"regjsgen": "^0.2.0",
|
||||
"regjsparser": "^0.1.4"
|
||||
<<<<<<< HEAD
|
||||
}
|
||||
},
|
||||
"registry-auth-token": {
|
||||
@@ -8596,6 +8649,8 @@
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"rc": "^1.0.1"
|
||||
=======
|
||||
>>>>>>> c982aba19a25a34015fca143901c097fe45b2c8b
|
||||
}
|
||||
},
|
||||
"regjsgen": {
|
||||
@@ -8797,6 +8852,7 @@
|
||||
"requires": {
|
||||
"hash-base": "^3.0.0",
|
||||
"inherits": "^2.0.1"
|
||||
<<<<<<< HEAD
|
||||
}
|
||||
},
|
||||
"rollup": {
|
||||
@@ -8949,6 +9005,8 @@
|
||||
"regex-cache": "^0.4.2"
|
||||
}
|
||||
}
|
||||
=======
|
||||
>>>>>>> c982aba19a25a34015fca143901c097fe45b2c8b
|
||||
}
|
||||
},
|
||||
"run-queue": {
|
||||
@@ -10043,6 +10101,7 @@
|
||||
"block-stream": "*",
|
||||
"fstream": "^1.0.2",
|
||||
"inherits": "2"
|
||||
<<<<<<< HEAD
|
||||
}
|
||||
},
|
||||
"term-size": {
|
||||
@@ -10052,6 +10111,8 @@
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"execa": "^0.7.0"
|
||||
=======
|
||||
>>>>>>> c982aba19a25a34015fca143901c097fe45b2c8b
|
||||
}
|
||||
},
|
||||
"through": {
|
||||
@@ -10673,6 +10734,7 @@
|
||||
"requires": {
|
||||
"querystringify": "^2.0.0",
|
||||
"requires-port": "^1.0.0"
|
||||
<<<<<<< HEAD
|
||||
}
|
||||
},
|
||||
"url-parse-lax": {
|
||||
@@ -10682,6 +10744,8 @@
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"prepend-http": "^1.0.1"
|
||||
=======
|
||||
>>>>>>> c982aba19a25a34015fca143901c097fe45b2c8b
|
||||
}
|
||||
},
|
||||
"use": {
|
||||
@@ -11207,6 +11271,7 @@
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"string-width": "^1.0.2"
|
||||
<<<<<<< HEAD
|
||||
}
|
||||
},
|
||||
"widest-line": {
|
||||
@@ -11249,6 +11314,8 @@
|
||||
"ansi-regex": "^3.0.0"
|
||||
}
|
||||
}
|
||||
=======
|
||||
>>>>>>> c982aba19a25a34015fca143901c097fe45b2c8b
|
||||
}
|
||||
},
|
||||
"window-size": {
|
||||
|
||||
Reference in New Issue
Block a user