Skip to content

Commit 1144a78

Browse files
z3devkaosat-dev
authored andcommitted
feat(io): add updated dependencies: enable csg to dxf (#394)
* feat() : enabled CSG to DXF conversion * feat() : bumping CSG IO library dependencies to enabled CSG to DXF converions * fix() : corrected AMF test for expected file size * fix() : incremented ava timeout to 40000 * fix() : bumped ava timeout to 60000 ms
1 parent 5f335e8 commit 1144a78

File tree

6 files changed

+20
-22
lines changed

6 files changed

+20
-22
lines changed

packages/cli/cli.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ test('jscad with parameters', t => {
6464
const cmd = `node ${jscadPath} ${inputPath} --name "Just Me" --title "Geek" -o ${outputPath} -add-metadata false`
6565
execSync(cmd, {stdio: [0, 1, 2]})
6666
t.deepEqual(true, fs.existsSync(expPath))
67-
almostEquals(t, fs.statSync(expPath).size, 655732, 50)
67+
almostEquals(t, fs.statSync(expPath).size, 653955, 50)
6868
})
6969

7070
test('jscad with complex/ multiple type of parameters', t => {

packages/cli/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"openjscad": "./cli.js"
88
},
99
"scripts": {
10-
"test": "ava './*.test.js' --verbose --timeout 10000",
10+
"test": "ava './*.test.js' --verbose --timeout 60000",
1111
"preversion": "npm test",
1212
"version": "git add -A ",
1313
"postversion": "git push origin master && git push origin master --tags",
@@ -33,9 +33,9 @@
3333
"license": "MIT",
3434
"dependencies": {
3535
"@jscad/core": "^0.2.3",
36-
"@jscad/csg": "0.5.2",
36+
"@jscad/csg": "0.6.0",
3737
"@jscad/examples": "^1.7.2",
38-
"@jscad/io": "0.4.4",
38+
"@jscad/io": "0.4.6",
3939
"@jscad/openscad-openjscad-translator": "0.0.10"
4040
},
4141
"devDependencies": {

packages/core/io/formats.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ const formats = {
4646
description: 'AutoCAD Drawing Exchange Format',
4747
extension: 'dxf',
4848
mimetype: 'application/dxf',
49-
convertCSG: false,
49+
convertCSG: true,
5050
convertCAG: true },
5151
jscad: {
5252
displayName: 'JSCAD',

packages/core/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"repository": "https://github.com/jscad/OpenJSCAD.org",
66
"main": "module.js",
77
"scripts": {
8-
"test": "ava '*.test.js' --verbose --timeout 10000",
8+
"test": "ava '*.test.js' --verbose --timeout 60000",
99
"preversion": "npm test",
1010
"version": "git add -A ",
1111
"postversion": "git push origin master && git push origin master --tags",
@@ -30,10 +30,10 @@
3030
],
3131
"license": "MIT",
3232
"dependencies": {
33-
"@jscad/csg": "0.5.2",
34-
"@jscad/io": "0.4.4",
33+
"@jscad/csg": "0.6.0",
34+
"@jscad/io": "0.4.6",
3535
"@jscad/openscad-openjscad-translator": "0.0.10",
36-
"astring": "^1.0.2",
36+
"astring": "^1.3.1",
3737
"esprima": "^3.1.3",
3838
"estraverse": "^4.2.0",
3939
"require-from-string": "^2.0.1",

packages/desktop/package.json

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,24 +33,22 @@
3333
"release-major": "git checkout master && git pull origin master && npm version major"
3434
},
3535
"dependencies": {
36-
"@jscad/amf-serializer": "0.1.1",
37-
"@jscad/core": "0.2.0",
38-
"@jscad/csg": "0.5.3",
36+
"@jscad/core": "^0.2.3",
37+
"@jscad/csg": "0.6.0",
3938
"@jscad/csg-viewer": "github:jscad/csg-viewer",
40-
"@jscad/io": "0.4.4",
41-
"@jscad/io-utils": "0.1.2",
39+
"@jscad/io": "0.4.6",
4240
"@most/create": "^2.0.1",
4341
"ast-eval": "^0.8.0",
4442
"ast-parents": "0.0.1",
45-
"astring": "^1.2.0",
43+
"astring": "^1.3.1",
4644
"bel": "^5.1.5",
47-
"blob-to-buffer": "^1.2.6",
45+
"blob-to-buffer": "^1.2.8",
4846
"compare-version": "^0.1.2",
4947
"decache": "^4.3.0",
5048
"detective-cjs": "^2.0.0",
5149
"electron-store": "^1.3.0",
52-
"es2015-i18n-tag": "^1.3.1",
53-
"esprima": "^4.0.0",
50+
"es2015-i18n-tag": "^1.4.0",
51+
"esprima": "^4.0.1",
5452
"esprima-ast-utils": "0.0.7",
5553
"estraverse": "^4.2.0",
5654
"jscad-tree-experiment": "github:kaosat-dev/jscad-tree-experiments",
@@ -65,7 +63,7 @@
6563
"browserify": "^14.5.0",
6664
"cpy-cli": "^1.0.1",
6765
"electron": "^1.8.3",
68-
"electron-builder": "^20.4.1"
66+
"electron-builder": "^20.21.1"
6967
},
7068
"build": {
7169
"appId": "org.jscad.desktop",

packages/web/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@
3434
"license": "MIT",
3535
"dependencies": {
3636
"@jscad/core": "^0.2.3",
37-
"@jscad/csg": "0.5.2",
37+
"@jscad/csg": "0.6.0",
3838
"@jscad/examples": "^1.7.2",
39-
"@jscad/io": "0.4.4",
39+
"@jscad/io": "0.4.6",
4040
"@jscad/openscad-openjscad-translator": "0.0.10",
41-
"astring": "^1.0.2",
41+
"astring": "^1.3.1",
4242
"brace": "0.10.0",
4343
"esprima": "^3.1.3",
4444
"estraverse": "^4.2.0",

0 commit comments

Comments
 (0)