Resolve security vulnerabilities (#11)
Addressing security vulnerabilities in NPM packages: * Bumped Node.js.redist * Resolve ansi-html vulnerability * Bump jquery * Bump immer * Bump ajv and browserslist * Bumping css-select to resolve css-what vulnerability (CVE-2021-33587) * Bumping elliptic, hoek, minimist, normalize-url, path-parse, postcss, ws and yargs-parser * Bump hosted-git-info Addressing some warnings during builds of some solutions * Targeting x64 to suppress a warning for RulesDSDTests * Handle Ceiling and Floor to complete a pattern match Addressing CodeQL error: * Remove duplicate property definition
This commit is contained in:
Neil Dalchau
GitHub
Родитель
e75f92d8f1
Коммит
0c5793af50
|
|
@ -75,7 +75,7 @@ type t_env = t_bind list
|
|||
let rec get_range = function
|
||||
String(_,rng) | Int(_,rng) | Domain(_,_,_,_,rng) | DomainS(_,_,_,_,_,rng) | Bool(_,rng)
|
||||
| Char(_,rng) | Float(_,rng) | Variable(_,rng) | Op(_,_,_,rng)
|
||||
| Neg(_,rng) | Show(_,rng) | Function(_,_,rng) | Tuple(_,rng) -> rng
|
||||
| Neg(_,rng) | Show(_,rng) | Function(_,_,rng) | Tuple(_,rng) | Ceiling(_,rng) | Floor(_,rng) -> rng
|
||||
|
||||
(* Erase the position information from a value (i.e. set them all to "empty") .*)
|
||||
let rec erasePosns = function
|
||||
|
|
|
|||
|
|
@ -677,9 +677,9 @@ var System$Collections$Generic$LinkedList$1 = {
|
|||
Insert: function (index, item) {
|
||||
this._list.insert(index, item);
|
||||
},
|
||||
AddLast$$T: function (item) {
|
||||
/*AddLast$$T: function (item) {
|
||||
this._list.insert(this._list.length, item);
|
||||
},
|
||||
},*/
|
||||
get_First: function () {
|
||||
var self = this;
|
||||
var get_Next = function (i) {
|
||||
|
|
|
|||
|
|
@ -12,12 +12,15 @@
|
|||
"@types/rx": "^4.1.1",
|
||||
"@types/file-saver": "2.x.x",
|
||||
"interactive-data-display": "^1.5.39",
|
||||
"jquery": "^3.4.0",
|
||||
"jquery": "^3.5.0",
|
||||
"jquery-mousewheel": "3.x.x",
|
||||
"typescript": "^3.5.3",
|
||||
"file-saver": "2.x.x"
|
||||
},
|
||||
"devDependencies": {},
|
||||
"resolutions": {
|
||||
"jquery": "^3.5.0"
|
||||
},
|
||||
"scripts": {
|
||||
"build": "tsc",
|
||||
"install": "tsc"
|
||||
|
|
|
|||
|
|
@ -253,10 +253,10 @@ jquery-ui@~1.12.1:
|
|||
resolved "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.12.1.tgz#bcb4045c8dd0539c134bc1488cdd3e768a7a9e51"
|
||||
integrity sha1-vLQEXI3QU5wTS8FIjN0+dop6nlE=
|
||||
|
||||
jquery@^3.4.0, jquery@~3.4.0:
|
||||
version "3.4.1"
|
||||
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2"
|
||||
integrity sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw==
|
||||
jquery@^3.5.0, jquery@~3.4.0:
|
||||
version "3.6.0"
|
||||
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470"
|
||||
integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==
|
||||
|
||||
minimatch@^3.0.4:
|
||||
version "3.0.4"
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
"style-loader": "^0.23.1",
|
||||
"webpack": "^4.27.1",
|
||||
"webpack-cli": "^3.1.2",
|
||||
"webpack-dev-server": "^3.1.14",
|
||||
"webpack-dev-server": "^4.1.1",
|
||||
"whatwg-fetch": "^3.0.0"
|
||||
},
|
||||
"dependencies": {
|
||||
|
|
@ -43,10 +43,16 @@
|
|||
"typescript": "^3.5.3"
|
||||
},
|
||||
"resolutions": {
|
||||
"browserslist": "^4.16.5",
|
||||
"css-select": "^4.1.3",
|
||||
"dns-packet": "^1.3.2",
|
||||
"elliptic": "^6.5.4",
|
||||
"glob-parent": "^5.1.2",
|
||||
"jquery": "^3.5.0",
|
||||
"lodash": "^4.17.21",
|
||||
"postcss": "^8.2.13",
|
||||
"ssri": "^8.0.1",
|
||||
"url-parse": "^1.5.0"
|
||||
"url-parse": "^1.5.0",
|
||||
"ws": "^6.2.2"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
|
|
@ -9,7 +9,7 @@
|
|||
"@types/react": "^16.8.23",
|
||||
"monaco-editor": "^0.21.2",
|
||||
"react-monaco-editor": "^0.40.0",
|
||||
"jquery": "^3.4.0",
|
||||
"jquery": "^3.5.0",
|
||||
"react": "^16.x.x",
|
||||
"typescript": "^3.5.3"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -32,10 +32,10 @@ csstype@^2.2.0:
|
|||
resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.8.tgz#0fb6fc2417ffd2816a418c9336da74d7f07db431"
|
||||
integrity sha512-msVS9qTuMT5zwAGCVm4mxfrZ18BNc6Csd0oJAtiFMZ1FAx1CCvy2+5MDmYoix63LM/6NDbNtodCiGYGmFgO0dA==
|
||||
|
||||
jquery@^3.4.0:
|
||||
version "3.4.1"
|
||||
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2"
|
||||
integrity sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw==
|
||||
jquery@^3.5.0:
|
||||
version "3.6.0"
|
||||
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470"
|
||||
integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==
|
||||
|
||||
"js-tokens@^3.0.0 || ^4.0.0":
|
||||
version "4.0.0"
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
"@types/rx": "^4.1.1",
|
||||
"interactive-data-display": "^1.5.35",
|
||||
"jquery-mousewheel": "3.x.x",
|
||||
"jquery": "^3.4.0",
|
||||
"jquery": "^3.5.0",
|
||||
"react": "^17.0.1",
|
||||
"rx": "^4.1.0",
|
||||
"typescript": "^3.5.3"
|
||||
|
|
@ -21,6 +21,9 @@
|
|||
"install": "tsc"
|
||||
},
|
||||
"resolutions":{
|
||||
"cryptiles": "^4.1.2"
|
||||
"ajv": "^6.12.3",
|
||||
"cryptiles": "^4.1.2",
|
||||
"hoek": "^4.2.1",
|
||||
"jquery": "^3.5.0"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -128,13 +128,15 @@
|
|||
resolved "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.2.tgz#a811b8c18e2babab7d542b3365887ae2e4d9de47"
|
||||
integrity sha512-7EJYyKTL7tFR8+gDbB6Wwz/arpGa0Mywk1TJbNzKzHtzbwVmY4HR9WqS5VV7dsBUKQmPNr192jHr/VpBluj/hg==
|
||||
|
||||
ajv@^4.9.1:
|
||||
version "4.11.8"
|
||||
resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536"
|
||||
integrity sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=
|
||||
ajv@^4.9.1, ajv@^6.12.3:
|
||||
version "6.12.6"
|
||||
resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
|
||||
integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
|
||||
dependencies:
|
||||
co "^4.6.0"
|
||||
json-stable-stringify "^1.0.1"
|
||||
fast-deep-equal "^3.1.1"
|
||||
fast-json-stable-stringify "^2.0.0"
|
||||
json-schema-traverse "^0.4.1"
|
||||
uri-js "^4.2.2"
|
||||
|
||||
asn1@~0.2.3:
|
||||
version "0.2.4"
|
||||
|
|
@ -207,11 +209,6 @@ caseless@~0.12.0:
|
|||
resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
|
||||
integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
|
||||
|
||||
co@^4.6.0:
|
||||
version "4.6.0"
|
||||
resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
|
||||
integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
|
||||
|
||||
combined-stream@^1.0.5, combined-stream@~1.0.5:
|
||||
version "1.0.8"
|
||||
resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
|
||||
|
|
@ -281,6 +278,16 @@ extsprintf@^1.2.0:
|
|||
resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
|
||||
integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
|
||||
|
||||
fast-deep-equal@^3.1.1:
|
||||
version "3.1.3"
|
||||
resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
|
||||
integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
|
||||
|
||||
fast-json-stable-stringify@^2.0.0:
|
||||
version "2.1.0"
|
||||
resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
|
||||
integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
|
||||
|
||||
file-saver@~1.3.3:
|
||||
version "1.3.8"
|
||||
resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-1.3.8.tgz#e68a30c7cb044e2fb362b428469feb291c2e09d8"
|
||||
|
|
@ -347,15 +354,10 @@ hawk@~3.1.3:
|
|||
hoek "2.x.x"
|
||||
sntp "1.x.x"
|
||||
|
||||
hoek@2.x.x:
|
||||
version "2.16.3"
|
||||
resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
|
||||
integrity sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=
|
||||
|
||||
hoek@6.x.x:
|
||||
version "6.1.3"
|
||||
resolved "https://registry.yarnpkg.com/hoek/-/hoek-6.1.3.tgz#73b7d33952e01fe27a38b0457294b79dd8da242c"
|
||||
integrity sha512-YXXAAhmF9zpQbC7LEcREFtXfGq5K1fmd+4PHkBq8NUqmzW3G+Dq10bI/i0KucLRwss3YYFQ0fSfoxBZYiGUqtQ==
|
||||
hoek@2.x.x, hoek@6.x.x, hoek@^4.2.1:
|
||||
version "4.2.1"
|
||||
resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.1.tgz#9634502aa12c445dd5a7c5734b572bb8738aacbb"
|
||||
integrity sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA==
|
||||
|
||||
http-signature@~1.1.0:
|
||||
version "1.1.1"
|
||||
|
|
@ -425,10 +427,10 @@ jquery-mousewheel@3.x.x, jquery-mousewheel@~3.1.13:
|
|||
resolved "https://registry.yarnpkg.com/jquery-mousewheel/-/jquery-mousewheel-3.1.13.tgz#06f0335f16e353a695e7206bf50503cb523a6ee5"
|
||||
integrity sha1-BvAzXxbjU6aV5yBr9QUDy1I6buU=
|
||||
|
||||
jquery@^3.4.0, jquery@~3.4.0:
|
||||
version "3.4.1"
|
||||
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2"
|
||||
integrity sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw==
|
||||
jquery@^3.5.0, jquery@~3.4.0:
|
||||
version "3.6.0"
|
||||
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470"
|
||||
integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==
|
||||
|
||||
jqueryui@~1.11.1:
|
||||
version "1.11.1"
|
||||
|
|
@ -445,28 +447,21 @@ jsbn@~0.1.0:
|
|||
resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
|
||||
integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
|
||||
|
||||
json-schema-traverse@^0.4.1:
|
||||
version "0.4.1"
|
||||
resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
|
||||
integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
|
||||
|
||||
json-schema@0.2.3:
|
||||
version "0.2.3"
|
||||
resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
|
||||
integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
|
||||
|
||||
json-stable-stringify@^1.0.1:
|
||||
version "1.0.1"
|
||||
resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af"
|
||||
integrity sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=
|
||||
dependencies:
|
||||
jsonify "~0.0.0"
|
||||
|
||||
json-stringify-safe@~5.0.1:
|
||||
version "5.0.1"
|
||||
resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
|
||||
integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
|
||||
|
||||
jsonify@~0.0.0:
|
||||
version "0.0.0"
|
||||
resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
|
||||
integrity sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=
|
||||
|
||||
jsprim@^1.2.2:
|
||||
version "1.4.1"
|
||||
resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
|
||||
|
|
@ -540,6 +535,11 @@ punycode@^1.4.1:
|
|||
resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
|
||||
integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
|
||||
|
||||
punycode@^2.1.0:
|
||||
version "2.1.1"
|
||||
resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
|
||||
integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
|
||||
|
||||
qs@~6.4.0:
|
||||
version "6.4.0"
|
||||
resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
|
||||
|
|
@ -662,6 +662,13 @@ typescript@^3.5.3:
|
|||
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.4.tgz#1743a5ec5fef6a1fa9f3e4708e33c81c73876c19"
|
||||
integrity sha512-A25xv5XCtarLwXpcDNZzCGvW2D1S3/bACratYBx2sax8PefsFhlYmkQicKHvpYflFS8if4zne5zT5kpJ7pzuvw==
|
||||
|
||||
uri-js@^4.2.2:
|
||||
version "4.4.1"
|
||||
resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
|
||||
integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
|
||||
dependencies:
|
||||
punycode "^2.1.0"
|
||||
|
||||
uuid@^3.0.0:
|
||||
version "3.3.3"
|
||||
resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.3.tgz#4568f0216e78760ee1dbf3a4d2cf53e224112866"
|
||||
|
|
|
|||
|
|
@ -9,13 +9,16 @@
|
|||
"@types/react": "^16.8.23",
|
||||
"@types/rx": "^4.1.1",
|
||||
"interactive-data-display": "^1.5.38",
|
||||
"jquery": "^3.4.0",
|
||||
"jquery": "^3.5.0",
|
||||
"msagljs": "../../HTML5SharedGUI/MSAGL_JS",
|
||||
"react": "^17.0.1",
|
||||
"rx": "^4.1.0",
|
||||
"typescript": "^3.5.3"
|
||||
},
|
||||
"devDependencies": {},
|
||||
"resolutions": {
|
||||
"jquery": "^3.5.0"
|
||||
},
|
||||
"scripts": {
|
||||
"build": "tsc",
|
||||
"install": "tsc"
|
||||
|
|
|
|||
|
|
@ -276,10 +276,10 @@ jquery-ui@~1.12.1:
|
|||
resolved "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.12.1.tgz#bcb4045c8dd0539c134bc1488cdd3e768a7a9e51"
|
||||
integrity sha1-vLQEXI3QU5wTS8FIjN0+dop6nlE=
|
||||
|
||||
jquery@^3.4.0, jquery@~3.4.0:
|
||||
version "3.4.1"
|
||||
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2"
|
||||
integrity sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw==
|
||||
jquery@^3.5.0, jquery@~3.4.0:
|
||||
version "3.6.0"
|
||||
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470"
|
||||
integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==
|
||||
|
||||
jqueryui@~1.11.1:
|
||||
version "1.11.1"
|
||||
|
|
@ -316,7 +316,7 @@ msagljs@../../HTML5SharedGUI/MSAGL_JS:
|
|||
"@types/rx" "^4.1.1"
|
||||
file-saver "2.x.x"
|
||||
interactive-data-display "^1.5.39"
|
||||
jquery "^3.4.0"
|
||||
jquery "^3.5.0"
|
||||
jquery-mousewheel "3.x.x"
|
||||
typescript "^3.5.3"
|
||||
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
"@types/node": "^12.6.2",
|
||||
"@types/react": "^16.8.23",
|
||||
"@types/react-dom": "^16.8.4",
|
||||
"jquery": "~3.4.0",
|
||||
"jquery": "~3.5.0",
|
||||
"monaco-editor-webpack-plugin": "^2.0.0",
|
||||
"msagljs": "../../HTML5SharedGUI/MSAGL_JS",
|
||||
"node-forge": ">=0.8.5",
|
||||
"react": "^16.8.6",
|
||||
"react-dom": "^16.8.6",
|
||||
"react-scripts": "4.0.0",
|
||||
"react-scripts": "^4.0.0",
|
||||
"reactcodepad": "./../ReactCodePad",
|
||||
"reactidd": "./../ReactIDD",
|
||||
"reactmsagl": "./../ReactMsagl",
|
||||
|
|
@ -25,17 +25,29 @@
|
|||
"react-app-rewired": "^2.1.6"
|
||||
},
|
||||
"resolutions": {
|
||||
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.0",
|
||||
"browserslist": "^4.16.5",
|
||||
"css-select": "^4.1.3",
|
||||
"color-string": "^1.5.5",
|
||||
"dns-packet": "^1.3.2",
|
||||
"ejs": "^3.1.6",
|
||||
"elliptic": "^6.5.4",
|
||||
"glob-parent": "^5.1.2",
|
||||
"immer": "^8.0.1",
|
||||
"hosted-git-info": "^2.8.9",
|
||||
"immer": "^9.0.6",
|
||||
"is-svg": "^4.2.2",
|
||||
"jquery": "^3.5.0",
|
||||
"lodash": "^4.17.21",
|
||||
"node-forge": ">=0.8.5",
|
||||
"normalize-url": "^4.5.1",
|
||||
"path-parse": "^1.0.7",
|
||||
"postcss": "^8.2.13",
|
||||
"react-refresh": "^0.10.0",
|
||||
"ssri": "^8.0.1",
|
||||
"tar": "^6.1.9",
|
||||
"url-parse": "^1.5.0"
|
||||
"url-parse": "^1.5.0",
|
||||
"webpack-dev-server": "^4.1.1",
|
||||
"ws": "^7.4.6"
|
||||
},
|
||||
"scripts": {
|
||||
"start": "react-app-rewired start",
|
||||
|
|
|
|||
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
|
|
@ -4,6 +4,8 @@
|
|||
<TargetFramework>netcoreapp3.1</TargetFramework>
|
||||
<IsPackable>false</IsPackable>
|
||||
<GenerateProgramFile>false</GenerateProgramFile>
|
||||
<Platforms>x64</Platforms>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="unification.test.fs" />
|
||||
|
|
|
|||
18
package.json
18
package.json
|
|
@ -54,22 +54,30 @@
|
|||
"tslint-microsoft-contrib": "^5.2.0",
|
||||
"typescript": "3.0.1",
|
||||
"webpack": "^4.x.x",
|
||||
"webpack-aspnet-middleware": "^2.2.0",
|
||||
"webpack-dev-server": "^3.2.1"
|
||||
"webpack-dev-server": "^4.1.1"
|
||||
},
|
||||
"resolutions": {
|
||||
"ajv": "^6.12.3",
|
||||
"browserslist": "^4.16.5",
|
||||
"css-select": "^4.1.3",
|
||||
"dns-packet": "^1.3.2",
|
||||
"ejs": "^3.1.6",
|
||||
"elliptic": "^6.5.4",
|
||||
"extend": "^2.0.2",
|
||||
"glob-parent": "^5.1.2",
|
||||
"hoek": "^4.2.1",
|
||||
"immer": "^8.0.1",
|
||||
"immer": "^9.0.6",
|
||||
"ini": "^1.3.6",
|
||||
"jquery": "^3.4.0",
|
||||
"jquery": "^3.5.0",
|
||||
"minimist": "^1.2.3",
|
||||
"path-parse": "^1.0.7",
|
||||
"postcss": "^8.2.13",
|
||||
"serialize-javascript": "^3.1.0",
|
||||
"ssri": "^8.0.1",
|
||||
"tar": "^6.1.9",
|
||||
"url-parse": "^1.5.0",
|
||||
"y18n": "^4.0.1"
|
||||
"ws": "^6.2.2",
|
||||
"y18n": "^4.0.1",
|
||||
"yargs-parser": "^13.1.2"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -112,7 +112,7 @@ group DOTNETCORE
|
|||
storage:none
|
||||
|
||||
nuget Yarn.MSBuild 1.22.4
|
||||
nuget Node.js.redist 10.16.3
|
||||
nuget Node.js.redist 14.2.0
|
||||
|
||||
nuget FSharp.Core ~> 4.7.0 redirects: force
|
||||
|
||||
|
|
@ -162,6 +162,7 @@ group DOTNETCORE
|
|||
nuget Saturn >= 0.11
|
||||
nuget Fable.JsonConverter
|
||||
nuget Microsoft.AspNetCore >= 2.1.6
|
||||
nuget Microsoft.AspNetCore.Authentication.JwtBearer = 3.1.18
|
||||
nuget Microsoft.AspNetCore.StaticFiles
|
||||
nuget Microsoft.AspNetCore.WebSockets
|
||||
nuget Microsoft.AspNetCore.WebSockets.Server
|
||||
|
|
@ -214,7 +215,7 @@ group Build
|
|||
storage:none
|
||||
|
||||
nuget Yarn.MSBuild 1.22.4
|
||||
nuget Node.js.redist 10.16.3
|
||||
nuget Node.js.redist 14.2.0
|
||||
|
||||
nuget WindowsAzure.Storage 9.3.3
|
||||
|
||||
|
|
@ -234,7 +235,7 @@ group Build
|
|||
|
||||
#These need moving together... can we avoid fragility?
|
||||
nuget fantomas 3.2.0
|
||||
nuget FSharp.Compiler.Service 33.0.0
|
||||
nuget FSharp.Compiler.Service >= 33.0.0
|
||||
|
||||
|
||||
group JavaScriptBuild
|
||||
|
|
@ -246,7 +247,7 @@ group JavaScriptBuild
|
|||
storage:none
|
||||
|
||||
nuget Yarn.MSBuild 1.22.4
|
||||
nuget Node.js.redist 10.16.3 storage:packages
|
||||
nuget Node.js.redist 14.2.0 storage:packages
|
||||
|
||||
nuget Microsoft.TypeScript.MSBuild 3.0.3
|
||||
nuget TypesTSFS ~> 0.4.0 storage:packages
|
||||
|
|
|
|||
16
paket.lock
16
paket.lock
|
|
@ -252,7 +252,7 @@ NUGET
|
|||
System.Runtime.Serialization.Formatters (>= 4.3) - restriction: && (< net20) (>= netstandard1.3) (< netstandard2.0)
|
||||
System.Runtime.Serialization.Primitives (>= 4.3) - restriction: || (&& (< net20) (>= netstandard1.0) (< netstandard1.3)) (&& (< net20) (>= netstandard1.3) (< netstandard2.0))
|
||||
System.Xml.XmlDocument (>= 4.3) - restriction: && (< net20) (>= netstandard1.3) (< netstandard2.0)
|
||||
Node.js.redist (10.16.3)
|
||||
Node.js.redist (14.2)
|
||||
NuGet.Common (5.6) - restriction: >= netstandard2.0
|
||||
NuGet.Frameworks (>= 5.6) - restriction: >= netstandard2.0
|
||||
System.Diagnostics.Process (>= 4.3) - restriction: && (< net472) (>= netstandard2.0)
|
||||
|
|
@ -1151,7 +1151,7 @@ NUGET
|
|||
Microsoft.AspNetCore.Authentication.Abstractions (>= 2.2)
|
||||
Microsoft.AspNetCore.Http (>= 2.2)
|
||||
Microsoft.AspNetCore.Http.Extensions (>= 2.2)
|
||||
Microsoft.AspNetCore.Authentication.JwtBearer (3.1.1)
|
||||
Microsoft.AspNetCore.Authentication.JwtBearer (3.1.18)
|
||||
Microsoft.IdentityModel.Protocols.OpenIdConnect (>= 5.5)
|
||||
Microsoft.AspNetCore.Authentication.OAuth (2.2)
|
||||
Microsoft.AspNetCore.Authentication (>= 2.2)
|
||||
|
|
@ -1522,7 +1522,7 @@ NUGET
|
|||
Newtonsoft.Json (12.0.2)
|
||||
NHamcrest (2.0.1)
|
||||
NETStandard.Library (>= 1.6.1)
|
||||
Node.js.redist (10.16.3)
|
||||
Node.js.redist (14.2)
|
||||
NuGet.Frameworks (5.4)
|
||||
Python.Runtime.NETStandard (3.7.1)
|
||||
System.Reflection.Emit (>= 4.3)
|
||||
|
|
@ -2081,16 +2081,16 @@ STORAGE: NONE
|
|||
NUGET
|
||||
remote: https://api.nuget.org/v3/index.json
|
||||
Microsoft.TypeScript.MSBuild (3.0.3)
|
||||
Node.js.redist (10.16.3) - storage: packages
|
||||
Node.js.redist (14.2) - storage: packages
|
||||
TypesTSFS (0.4) - storage: packages
|
||||
Yarn.MSBuild (1.22.4)
|
||||
GITHUB
|
||||
remote: SharpKit/SharpKit-SDK
|
||||
Frameworks/JsClr/res/jsclr.js (602a5217110e4c81c9a3957ef3cc21e7aadfe355)
|
||||
Frameworks/JsClr/res/jsclr.min.js (602a5217110e4c81c9a3957ef3cc21e7aadfe355)
|
||||
Frameworks/JsClr/res/jsclr.js (66a6e64436c6254b60b7ea5aee54d026fff78237)
|
||||
Frameworks/JsClr/res/jsclr.min.js (66a6e64436c6254b60b7ea5aee54d026fff78237)
|
||||
remote: microsoft/automatic-graph-layout
|
||||
GraphLayout/MsaglSharpkit/WebMsagl/Scripts/src/Microsoft.Msagl.js (9a9ddaafff5e96d29ce031da987259269fbc2bb8)
|
||||
GraphLayout/MsaglSharpkit/WebMsagl/Scripts/src/Microsoft.Msagl.min.js (9a9ddaafff5e96d29ce031da987259269fbc2bb8)
|
||||
GraphLayout/MsaglSharpkit/WebMsagl/Scripts/src/Microsoft.Msagl.js (3c1c937ba3967a2989054d7d0c1e0e4a2c50a3c7)
|
||||
GraphLayout/MsaglSharpkit/WebMsagl/Scripts/src/Microsoft.Msagl.min.js (3c1c937ba3967a2989054d7d0c1e0e4a2c50a3c7)
|
||||
GROUP NETFRAMEWORK
|
||||
REDIRECTS: ON
|
||||
STORAGE: NONE
|
||||
|
|
|
|||
1275
yarn.lock
1275
yarn.lock
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
Загрузка…
Ссылка в новой задаче