diff --git a/demo/lib/pathseg.js b/demo/lib/pathseg.js index 2b0cc9bd..39479343 100644 --- a/demo/lib/pathseg.js +++ b/demo/lib/pathseg.js @@ -846,4 +846,4 @@ return builder.pathSegList; } } -}()); \ No newline at end of file +}()); diff --git a/package-lock.json b/package-lock.json index 3e1ddd35..80bae2f4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1731,12 +1731,6 @@ } } }, - "dat.gui": { - "version": "0.7.7", - "resolved": "https://registry.npmjs.org/dat.gui/-/dat.gui-0.7.7.tgz", - "integrity": "sha512-sRl/28gF/XRC5ywC9I4zriATTsQcpSsRG7seXCPnTkK8/EQMIbCu5NPMpICLGxX9ZEUvcXR3ArLYCtgreFoMDw==", - "dev": true - }, "eslint": { "version": "6.8.0", "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.8.0.tgz", @@ -7564,60 +7558,66 @@ } } }, - "jquery": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz", - "integrity": "sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg==", - "dev": true - }, "json-stringify-pretty-compact": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/json-stringify-pretty-compact/-/json-stringify-pretty-compact-2.0.0.tgz", "integrity": "sha512-WRitRfs6BGq4q8gTgOy4ek7iPFXjbra0H3PmDLKm2xnZ+Gh1HUhiKGgCZkSPNULlP7mvfu6FV/mOLhCarspADQ==", "dev": true }, - "jstree": { - "version": "3.3.11", - "resolved": "https://registry.npmjs.org/jstree/-/jstree-3.3.11.tgz", - "integrity": "sha512-9ZJKroPjCyjb6JLPuAbBrLJKT6pS1f4m5gkwoEagG5oQWtvzm0IiDsntXTxeFtz7AmqrKfij+gLfF9MgWriNxg==", + "matter-tools": { + "version": "0.12.2", + "resolved": "https://registry.npmjs.org/matter-tools/-/matter-tools-0.12.2.tgz", + "integrity": "sha512-C9cyoT4guftKqCHYyqXmOVh8/R6JWtDQMcIpJ68r2s517VtmRfMSJktdUxZogZEaE0EbwxcvGbLSX3rfQPFH9Q==", "dev": true, "requires": { - "jquery": ">=1.9.1" + "dat.gui": "^0.7.7", + "jquery": "^3.5.1", + "jstree": "^3.3.11", + "keymaster": "^1.6.2", + "matter-js": "^0.15.0" }, "dependencies": { + "dat.gui": { + "version": "0.7.7", + "resolved": "https://registry.npmjs.org/dat.gui/-/dat.gui-0.7.7.tgz", + "integrity": "sha512-sRl/28gF/XRC5ywC9I4zriATTsQcpSsRG7seXCPnTkK8/EQMIbCu5NPMpICLGxX9ZEUvcXR3ArLYCtgreFoMDw==", + "dev": true + }, "jquery": { "version": "3.5.1", "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz", "integrity": "sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg==", "dev": true + }, + "jstree": { + "version": "3.3.11", + "resolved": "https://registry.npmjs.org/jstree/-/jstree-3.3.11.tgz", + "integrity": "sha512-9ZJKroPjCyjb6JLPuAbBrLJKT6pS1f4m5gkwoEagG5oQWtvzm0IiDsntXTxeFtz7AmqrKfij+gLfF9MgWriNxg==", + "dev": true, + "requires": { + "jquery": ">=1.9.1" + } + }, + "keymaster": { + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/keymaster/-/keymaster-1.6.2.tgz", + "integrity": "sha1-4a5U0OqUiPn2C2a2aPAumhlGxus=", + "dev": true + }, + "matter-js": { + "version": "0.15.0", + "resolved": "https://registry.npmjs.org/matter-js/-/matter-js-0.15.0.tgz", + "integrity": "sha512-+SXrgSz0IbbXo5pifWnw/IlWVrkrZXPI+2gMdvI6BCHpXrgRsmlj2wGKVBmjZC6qzBNM2ImqHCRuYhmEmwTOlA==", + "dev": true } } }, - "keymaster": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/keymaster/-/keymaster-1.6.2.tgz", - "integrity": "sha1-4a5U0OqUiPn2C2a2aPAumhlGxus=", - "dev": true - }, - "matter-js": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/matter-js/-/matter-js-0.15.0.tgz", - "integrity": "sha512-+SXrgSz0IbbXo5pifWnw/IlWVrkrZXPI+2gMdvI6BCHpXrgRsmlj2wGKVBmjZC6qzBNM2ImqHCRuYhmEmwTOlA==", + "pathseg": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/pathseg/-/pathseg-1.2.0.tgz", + "integrity": "sha512-+pQS7lTaoVIXhaCW7R3Wd/165APzZHWzYVqe7dxzdupxQwebgpBaCmf0/XZwmoA/rkDq3qvzO0qv4d5oFVrBRw==", "dev": true }, - "matter-tools": { - "version": "0.12.2", - "resolved": "https://registry.npmjs.org/matter-tools/-/matter-tools-0.12.2.tgz", - "integrity": "sha512-C9cyoT4guftKqCHYyqXmOVh8/R6JWtDQMcIpJ68r2s517VtmRfMSJktdUxZogZEaE0EbwxcvGbLSX3rfQPFH9Q==", - "dev": true, - "requires": { - "dat.gui": "^0.7.7", - "jquery": "^3.5.1", - "jstree": "^3.3.11", - "keymaster": "^1.6.2", - "matter-js": "^0.15.0" - } - }, "puppeteer-core": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-5.5.0.tgz", diff --git a/package.json b/package.json index d35f4383..b6d58f74 100644 --- a/package.json +++ b/package.json @@ -26,6 +26,7 @@ "jest-worker": "^24.9.0", "json-stringify-pretty-compact": "^2.0.0", "matter-tools": "^0.12.2", + "pathseg": "^1.2.0", "puppeteer-core": "^5.5.0", "webpack": "^4.46.0", "webpack-cli": "^3.3.11", diff --git a/webpack.config.js b/webpack.config.js index 87cf24f6..b833432d 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -60,7 +60,8 @@ License ${pkg.license}${!minimize ? '\n\n' + license : ''}`; contentBase: [ path.resolve(__dirname, './demo'), path.resolve(__dirname, './examples'), - path.resolve(__dirname, './node_modules/matter-tools/build/') + path.resolve(__dirname, './node_modules/matter-tools/build'), + path.resolve(__dirname, './node_modules/pathseg') ], open: true, openPage: '', @@ -81,11 +82,15 @@ License ${pkg.license}${!minimize ? '\n\n' + license : ''}`; }, '/lib/matter-tools.inspector.js': { target: 'http://localhost:8000/', - pathRewrite: { '^/lib/matter-tools.inspector.js' : 'matter-tools.inspector.js' } + pathRewrite: { '^/lib/matter-tools.inspector.js' : '/matter-tools.inspector.js' } }, '/lib/matter-tools.gui.js': { target: 'http://localhost:8000/', - pathRewrite: { '^/lib/matter-tools.gui.js' : 'matter-tools.gui.js' } + pathRewrite: { '^/lib/matter-tools.gui.js' : '/matter-tools.gui.js' } + }, + '/lib/pathseg.js': { + target: 'http://localhost:8000/', + pathRewrite: { '^/lib/pathseg.js' : '/pathseg.js' } } } }