From 98d7f66b5a0dfe2d2dbbc1a573fb6b90e2bf98c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1n=20D=C3=A9nes?= Date: Fri, 16 Jul 2021 16:16:23 +0200 Subject: [PATCH] Make old jscad stuff audit friendly --- package-lock.json | 103 ++++++---------------------------------------- package.json | 2 +- 2 files changed, 14 insertions(+), 91 deletions(-) diff --git a/package-lock.json b/package-lock.json index 62545eb..6610a31 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,7 +8,7 @@ "version": "2.0.0", "license": "MIT", "dependencies": { - "@jscad/openjscad": "^1.6.1", + "@jscad/openjscad": "github:mrzealot/oldjscad", "fs-extra": "^9.0.1", "js-yaml": "^3.14.0", "json5": "^2.2.0", @@ -289,24 +289,6 @@ "node": ">=8" } }, - "node_modules/@jscad/amf-deserializer": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/@jscad/amf-deserializer/-/amf-deserializer-0.0.4.tgz", - "integrity": "sha1-BB3uKQrNpBEPs7m/hxoepUIDTCs=", - "dependencies": { - "sax": "^1.2.1" - } - }, - "node_modules/@jscad/amf-serializer": { - "version": "0.0.5", - "resolved": "https://registry.npmjs.org/@jscad/amf-serializer/-/amf-serializer-0.0.5.tgz", - "integrity": "sha1-3A+Hx7LG15/F9rZnfwxoag0/Bg4=", - "dependencies": { - "@jscad/io-utils": "^0.1.2", - "sax": "^1.2.1", - "xmldom": "^0.1.27" - } - }, "node_modules/@jscad/csg": { "version": "0.3.6", "resolved": "https://registry.npmjs.org/@jscad/csg/-/csg-0.3.6.tgz", @@ -325,11 +307,9 @@ }, "node_modules/@jscad/io": { "version": "0.3.7", - "resolved": "https://registry.npmjs.org/@jscad/io/-/io-0.3.7.tgz", - "integrity": "sha1-CNWCv/0juTdopkvYo3Qv3De86u4=", + "resolved": "git+ssh://git@github.com/mrzealot/oldjscadio.git#692cf142062208b0097b2d4852c30d6cc51eea8d", + "license": "MIT", "dependencies": { - "@jscad/amf-deserializer": "^0.0.4", - "@jscad/amf-serializer": "^0.0.5", "@jscad/dxf-serializer": "^0.0.4", "@jscad/gcode-deserializer": "^0.0.4", "@jscad/io-utils": "^0.1.2", @@ -339,8 +319,7 @@ "@jscad/stl-deserializer": "^0.1.2", "@jscad/stl-serializer": "^0.0.6", "@jscad/svg-deserializer": "^0.2.3", - "@jscad/svg-serializer": "^0.0.4", - "@jscad/x3d-serializer": "^0.0.6" + "@jscad/svg-serializer": "^0.0.4" } }, "node_modules/@jscad/io-utils": { @@ -372,13 +351,12 @@ }, "node_modules/@jscad/openjscad": { "version": "1.6.1", - "resolved": "https://registry.npmjs.org/@jscad/openjscad/-/openjscad-1.6.1.tgz", - "integrity": "sha512-D8W/ErfXhERXXbx9jGD75IupYEw85XyEF2lgrpekJaqKzETJRYAiQeggPEYk1U4zd8i6swoCNTkqgGI3NYdnQg==", - "deprecated": "See @jscad for a list of supported packages", + "resolved": "git+ssh://git@github.com/mrzealot/oldjscad.git#0397e0f35aa9319005a2e64aa1419022423857de", "hasInstallScript": true, + "license": "MIT", "dependencies": { "@jscad/csg": "0.3.6", - "@jscad/io": "0.3.7", + "@jscad/io": "github:mrzealot/oldjscadio", "@jscad/openscad-openjscad-translator": "0.0.10", "@jscad/scad-api": "^0.5.1", "astring": "^1.0.2", @@ -463,15 +441,6 @@ "@jscad/csg": "0.3.6" } }, - "node_modules/@jscad/x3d-serializer": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/@jscad/x3d-serializer/-/x3d-serializer-0.0.6.tgz", - "integrity": "sha1-pBl1qeN0B2E2JkjklutkKTuD99c=", - "dependencies": { - "@jscad/io-utils": "^0.1.2", - "xmldom": "^0.1.27" - } - }, "node_modules/@most/multicast": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/@most/multicast/-/multicast-1.3.0.tgz", @@ -3001,15 +2970,6 @@ "typedarray-to-buffer": "^3.1.5" } }, - "node_modules/xmldom": { - "version": "0.1.31", - "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.31.tgz", - "integrity": "sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ==", - "deprecated": "Deprecated due to CVE-2021-21366 resolved in 0.5.0", - "engines": { - "node": ">=0.1" - } - }, "node_modules/y18n": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz", @@ -3486,24 +3446,6 @@ "integrity": "sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==", "dev": true }, - "@jscad/amf-deserializer": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/@jscad/amf-deserializer/-/amf-deserializer-0.0.4.tgz", - "integrity": "sha1-BB3uKQrNpBEPs7m/hxoepUIDTCs=", - "requires": { - "sax": "^1.2.1" - } - }, - "@jscad/amf-serializer": { - "version": "0.0.5", - "resolved": "https://registry.npmjs.org/@jscad/amf-serializer/-/amf-serializer-0.0.5.tgz", - "integrity": "sha1-3A+Hx7LG15/F9rZnfwxoag0/Bg4=", - "requires": { - "@jscad/io-utils": "^0.1.2", - "sax": "^1.2.1", - "xmldom": "^0.1.27" - } - }, "@jscad/csg": { "version": "0.3.6", "resolved": "https://registry.npmjs.org/@jscad/csg/-/csg-0.3.6.tgz", @@ -3520,12 +3462,9 @@ "integrity": "sha1-pdk+zvhGvzCllvUCHXs26mKhOic=" }, "@jscad/io": { - "version": "0.3.7", - "resolved": "https://registry.npmjs.org/@jscad/io/-/io-0.3.7.tgz", - "integrity": "sha1-CNWCv/0juTdopkvYo3Qv3De86u4=", + "version": "git+ssh://git@github.com/mrzealot/oldjscadio.git#692cf142062208b0097b2d4852c30d6cc51eea8d", + "from": "@jscad/io@github:mrzealot/oldjscadio", "requires": { - "@jscad/amf-deserializer": "^0.0.4", - "@jscad/amf-serializer": "^0.0.5", "@jscad/dxf-serializer": "^0.0.4", "@jscad/gcode-deserializer": "^0.0.4", "@jscad/io-utils": "^0.1.2", @@ -3535,8 +3474,7 @@ "@jscad/stl-deserializer": "^0.1.2", "@jscad/stl-serializer": "^0.0.6", "@jscad/svg-deserializer": "^0.2.3", - "@jscad/svg-serializer": "^0.0.4", - "@jscad/x3d-serializer": "^0.0.6" + "@jscad/svg-serializer": "^0.0.4" } }, "@jscad/io-utils": { @@ -3567,12 +3505,11 @@ "integrity": "sha1-3LPPXMRyeKfPejW3azLq0NBE38M=" }, "@jscad/openjscad": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/@jscad/openjscad/-/openjscad-1.6.1.tgz", - "integrity": "sha512-D8W/ErfXhERXXbx9jGD75IupYEw85XyEF2lgrpekJaqKzETJRYAiQeggPEYk1U4zd8i6swoCNTkqgGI3NYdnQg==", + "version": "git+ssh://git@github.com/mrzealot/oldjscad.git#0397e0f35aa9319005a2e64aa1419022423857de", + "from": "@jscad/openjscad@github:mrzealot/oldjscad", "requires": { "@jscad/csg": "0.3.6", - "@jscad/io": "0.3.7", + "@jscad/io": "github:mrzealot/oldjscadio", "@jscad/openscad-openjscad-translator": "0.0.10", "@jscad/scad-api": "^0.5.1", "astring": "^1.0.2", @@ -3648,15 +3585,6 @@ "@jscad/csg": "0.3.6" } }, - "@jscad/x3d-serializer": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/@jscad/x3d-serializer/-/x3d-serializer-0.0.6.tgz", - "integrity": "sha1-pBl1qeN0B2E2JkjklutkKTuD99c=", - "requires": { - "@jscad/io-utils": "^0.1.2", - "xmldom": "^0.1.27" - } - }, "@most/multicast": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/@most/multicast/-/multicast-1.3.0.tgz", @@ -5675,11 +5603,6 @@ "typedarray-to-buffer": "^3.1.5" } }, - "xmldom": { - "version": "0.1.31", - "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.31.tgz", - "integrity": "sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ==" - }, "y18n": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz", diff --git a/package.json b/package.json index c0bcf77..457bbed 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ }, "dependencies": { "kle-serial": "github:mrzealot/kle-serial", - "@jscad/openjscad": "^1.6.1", + "@jscad/openjscad": "github:mrzealot/oldjscad", "fs-extra": "^9.0.1", "js-yaml": "^3.14.0", "json5": "^2.2.0",