diff --git a/debian/control b/debian/control index 03a0ada..75e18b5 100644 --- a/debian/control +++ b/debian/control @@ -8,14 +8,13 @@ , dh-buildinfo , nodejs , node-tape - , node-babel-cli + , webpack + , node-babel-loader + , node-babel-plugin-add-module-exports , node-babel-preset-es2015 -# , node-babel-loader -# , node-babel-core -# , webpack , node-d3-path (>= 1) , node-d3-polygon -Standards-Version: 4.1.0 +Standards-Version: 4.1.3 Homepage: https://d3js.org/d3-shape/ Vcs-Git: https://anonscm.debian.org/git/pkg-javascript/node-d3-shape.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-javascript/node-d3-shape.git diff --git a/debian/install b/debian/install index 692beda..ab084c1 100644 --- a/debian/install +++ b/debian/install @@ -1,2 +1,2 @@ package.json usr/lib/nodejs/d3-shape/ -lib usr/lib/nodejs/d3-shape/ +build usr/lib/nodejs/d3-shape/ diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 7937310..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -use-babel.patch diff --git a/debian/patches/use-babel.patch b/debian/patches/use-babel.patch deleted file mode 100644 index 61da329..0000000 --- a/debian/patches/use-babel.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- /dev/null -+++ b/.babelrc -@@ -0,0 +1,7 @@ -+{ -+ "presets": [ -+ ["es2015", { -+ "loose": false, -+ }], -+ ], -+} ---- a/package.json -+++ b/package.json -@@ -16,7 +16,7 @@ - "name": "Mike Bostock", - "url": "http://bost.ocks.org/mike" - }, -- "main": "build/d3-shape.js", -+ "main": "lib/index.js", - "module": "index", - "jsnext:main": "index", - "repository": { diff --git a/debian/rules b/debian/rules index e5762c8..d71790f 100755 --- a/debian/rules +++ b/debian/rules @@ -8,15 +8,13 @@ dh $@ override_dh_auto_build: - babeljs src -d lib - babeljs index.js -d lib - sed -i 's/.\/src/./' lib/index.js -# TODO: investigate segfault -# webpack --config debian/webpack.config.js index.js build/d3-shape.js --target=web --output-library=d3-shape --output-library-target=umd --module-bind 'js=babel-loader' + webpack --config debian/webpack.config.js \ + --output-library=d3 \ + index.js build/d3-shape.js override_dh_auto_test: tape 'test/**/*.js' override_dh_auto_clean: - rm -rf lib build + rm -rf build dh_auto_clean diff --git a/debian/webpack.config.js b/debian/webpack.config.js index 1f62b0e..f9cb59f 100644 --- a/debian/webpack.config.js +++ b/debian/webpack.config.js @@ -1,18 +1,16 @@ 'use strict'; - -var fs = require('fs'); var path = require('path'); -var webpack = require('webpack'); - var config = { - + target: 'web', resolve: { + modules: ['/usr/lib/nodejs', '.'], + }, + resolveLoader: { modules: ['/usr/lib/nodejs'], }, - - resolveLoader: { - modules: ['/usr/lib/nodejs'], - } + output: { + libraryTarget: 'umd' + }, + module: { rules: [ {test: /\.js$/, loader: 'babel-loader', options: { presets: [ 'es2015' ], plugins: ['add-module-exports'] } }] } } - module.exports = config;