vmario/Doodle3D-Slicer
0
0
Fork 0
mirror of https://github.com/Doodle3D/Doodle3D-Slicer.git synced 2024-11-22 13:37:58 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/Doodle3D/Doodle3D-Slicer into develop

Browse Source
This commit is contained in:
Rick Companje 2018-01-29 16:14:44 +01:00
commit 4a3a5d832c
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
package-lock.json generated
View File

@ -23,9 +23,9 @@
"integrity": "sha512-glELSijsD9b+/0d9iOdasBwqH3s+xPxD59tJ7aXkBx7klugygGOMXn7PB05AdhVyA1OYMj7GUCegaQa7nvLtmQ==" "integrity": "sha512-glELSijsD9b+/0d9iOdasBwqH3s+xPxD59tJ7aXkBx7klugygGOMXn7PB05AdhVyA1OYMj7GUCegaQa7nvLtmQ=="
}, },
"@doodle3d/doodle3d-api": { "@doodle3d/doodle3d-api": {
"version": "1.0.2", "version": "1.0.4",
"resolved": "https://registry.npmjs.org/@doodle3d/doodle3d-api/-/doodle3d-api-1.0.2.tgz", "resolved": "https://registry.npmjs.org/@doodle3d/doodle3d-api/-/doodle3d-api-1.0.4.tgz",
"integrity": "sha512-zrm6NOGkX27Rzd6Bgyjiz9GWGOh23MQAL9JncaMZQmJ55Zrf3hw9alGs0a948qcgNw/HBbqnAZFZypWqTfd5rw==", "integrity": "sha512-B1gynKrtBzcmvYbTCFZ9KBS8JbtdwktzfxhHdCmLw7jm/Az0IOASFk++uCXXvDenSpQnwCnu21iP4hBVOU1u1g==",
"requires": { "requires": {
"eventdispatcher.js": "0.0.2", "eventdispatcher.js": "0.0.2",
"whatwg-fetch": "2.0.3" "whatwg-fetch": "2.0.3"
@ -88,6 +88,9 @@
"version": "1.2.0", "version": "1.2.0",
"resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
"integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==" "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ=="
},
"three-js-csg": {
"version": "github:Doodle3D/three-js-csg#a36f23da6e9be2405a9094de5709cb0ae8f58045"
} }
} }
}, },
@ -5950,9 +5953,9 @@
} }
}, },
"node-abi": { "node-abi": {
"version": "2.1.2", "version": "2.2.0",
"resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.1.2.tgz", "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.2.0.tgz",
"integrity": "sha512-hmUtb8m75RSi7N+zZLYqe75XDvZB+6LyTBPkj2DConvNgQet2e3BIqEwe1LLvqMrfyjabuT5ZOrTioLCH1HTdA==", "integrity": "sha512-FqVC0WNNL8fQWQK3GYTESfwZXZKDbSIiEEIvufq7HV6Lj0IDDZRVa4CU/KTA0JVlqY9eTDSuPiC8FS9UfGVuzA==",
"requires": { "requires": {
"semver": "5.4.1" "semver": "5.4.1"
} }
@ -6517,7 +6520,7 @@
"github-from-package": "0.0.0", "github-from-package": "0.0.0",
"minimist": "1.2.0", "minimist": "1.2.0",
"mkdirp": "0.5.1", "mkdirp": "0.5.1",
"node-abi": "2.1.2", "node-abi": "2.2.0",
"noop-logger": "0.1.1", "noop-logger": "0.1.1",
"npmlog": "4.1.2", "npmlog": "4.1.2",
"os-homedir": "1.0.2", "os-homedir": "1.0.2",
@ -7799,9 +7802,6 @@
"resolved": "https://registry.npmjs.org/three/-/three-0.88.0.tgz", "resolved": "https://registry.npmjs.org/three/-/three-0.88.0.tgz",
"integrity": "sha1-QlbC/Djk+yOg0j66K2zOTfjkZtU=" "integrity": "sha1-QlbC/Djk+yOg0j66K2zOTfjkZtU="
}, },
"three-js-csg": {
"version": "github:Doodle3D/three-js-csg#a36f23da6e9be2405a9094de5709cb0ae8f58045"
},
"through2": { "through2": {
"version": "2.0.3", "version": "2.0.3",
"resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz", "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",

2
package.json
View File

@ -19,7 +19,7 @@
}, },
"dependencies": { "dependencies": {
"@doodle3d/clipper-js": "^1.0.10", "@doodle3d/clipper-js": "^1.0.10",
"@doodle3d/doodle3d-api": "^1.0.2", "@doodle3d/doodle3d-api": "^1.0.4",
"@doodle3d/doodle3d-core": "github:doodle3d/doodle3d-core", "@doodle3d/doodle3d-core": "github:doodle3d/doodle3d-core",
"babel-plugin-transform-class-properties": "^6.24.1", "babel-plugin-transform-class-properties": "^6.24.1",
"file-saver": "^1.3.3", "file-saver": "^1.3.3",

4
webpack.config.js
View File

@ -71,8 +71,8 @@ module.exports = {
appMountId: 'app' appMountId: 'app'
}) })
], ],
devtool: false, devtool: 'source-map',
devtool: devMode ? 'source-map' : false, // devtool: devMode ? 'source-map' : false,
devServer: { devServer: {
contentBase: 'dist' contentBase: 'dist'
} }