diff --git a/package-lock.json b/package-lock.json index eba7e9b..e4d29ae 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "dxf-parser", - "version": "1.0.0-alpha.1", + "version": "1.0.0-alpha.2", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -944,6 +944,15 @@ } } }, + "@purtuga/esm-webpack-plugin": { + "version": "1.2.1", + "resolved": "https://www.necosystem.com/verdaccio/@purtuga%2fesm-webpack-plugin/-/esm-webpack-plugin-1.2.1.tgz", + "integrity": "sha512-q17/jiGfDiJlgsiQ79tOQE2z4p8E1i0d4Ftvi9GqYB9mZCyWvWEY/EnXZxVbImBgFS6NgnhaEXGYJ19FtVpo8A==", + "dev": true, + "requires": { + "webpack-sources": "^1.0.0" + } + }, "@webassemblyjs/ast": { "version": "1.8.3", "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.3.tgz", @@ -1222,7 +1231,6 @@ "callsite": "^1.0.0", "chalk": "^1.1.1", "diff": "^3.2.0", - "edge": "^7.10.1", "event-stream": "^3.1.5", "file-type": "^4.1.0", "glob": "^7.1.1", @@ -2180,22 +2188,6 @@ "stream-shift": "^1.0.0" } }, - "edge": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/edge/-/edge-7.10.1.tgz", - "integrity": "sha1-aDhurBAvOXJNJzzBmuowCR4rSuQ=", - "dev": true, - "requires": { - "edge-cs": "1.2.1", - "nan": "^2.0.9" - } - }, - "edge-cs": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/edge-cs/-/edge-cs-1.2.1.tgz", - "integrity": "sha1-vRqezblO8O1AyJRYIEZ0nlcEXlo=", - "dev": true - }, "electron-to-chromium": { "version": "1.3.113", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.113.tgz", @@ -3719,9 +3711,9 @@ "dev": true }, "loglevel": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.1.tgz", - "integrity": "sha1-4PyVEztu8nbNyIh82vJKpvFW+Po=" + "version": "1.6.6", + "resolved": "https://www.necosystem.com/verdaccio/loglevel/-/loglevel-1.6.6.tgz", + "integrity": "sha512-Sgr5lbboAUBo3eXCSPL4/KoVz3ROKquOjcctxmHIt+vol2DrqTQe3SwkKKuYhEiWB5kYa13YyopJ69deJ1irzQ==" }, "loose-envify": { "version": "1.4.0", @@ -4073,7 +4065,8 @@ "version": "2.12.1", "resolved": "https://registry.npmjs.org/nan/-/nan-2.12.1.tgz", "integrity": "sha512-JY7V6lRkStKcKTvHO5NVSQRv+RV+FIL5pvDoLiAtSL9pKlC5x9PKQcZDsq7m4FO4d57mkhC6Z+QhAh3Jdk5JFw==", - "dev": true + "dev": true, + "optional": true }, "nanomatch": { "version": "1.2.13", diff --git a/package.json b/package.json index c3eb801..405ff89 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,8 @@ "scripts": { "test": "mocha --require @babel/register test", "start": "webpack --mode development", - "build": "webpack --mode production" + "build": "webpack --mode production", + "build-module": "webpack --mode production --config webpack.config.module.js" }, "repository": { "type": "git", @@ -27,6 +28,7 @@ "@babel/core": "^7.2.2", "@babel/preset-env": "^7.3.1", "@babel/register": "^7.0.0", + "@purtuga/esm-webpack-plugin": "^1.2.1", "approvals": "^2.1.2", "mocha": "^5.2.0", "should": "^6.0.1", @@ -34,7 +36,7 @@ "webpack-cli": "^3.2.3" }, "dependencies": { - "loglevel": "^1.2.0" + "loglevel": "^1.6.6" }, "keywords": [ "dxf", diff --git a/src/DxfParser.js b/src/DxfParser.js index ff493b6..d48320c 100644 --- a/src/DxfParser.js +++ b/src/DxfParser.js @@ -589,6 +589,10 @@ DxfParser.prototype._parse = function(dxfString) { layerName = curr.value; curr = scanner.next(); break; + case 6: // line type + layer.lineType = curr.value; + curr = scanner.next(); + break; case 62: // color, visibility layer.visible = curr.value >= 0; // TODO 0 and 256 are BYBLOCK and BYLAYER respectively. Need to handle these values for layers?. diff --git a/webpack.config.js b/webpack.config.js index 977ba40..7a1e053 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -10,4 +10,4 @@ module.exports = { libraryExport: 'default', globalObject: 'typeof self !== \'undefined\' ? self : this' } -}; \ No newline at end of file +}; diff --git a/webpack.config.module.js b/webpack.config.module.js new file mode 100644 index 0000000..ab11908 --- /dev/null +++ b/webpack.config.module.js @@ -0,0 +1,15 @@ +const path = require('path'); +const EsmWebpackPlugin = require("@purtuga/esm-webpack-plugin"); + +module.exports = { + entry: './src/index.js', + output: { + filename: 'dxf-parser-module.js', + path: path.resolve(__dirname, 'dist'), + library: 'LIB', + libraryTarget: 'var', +// libraryExport: 'default', + globalObject: 'typeof self !== \'undefined\' ? self : this' + }, + plugins:[new EsmWebpackPlugin()] +};