Merge pull request #18 from OneraHub/release-1.0

Release 1.0

.gitignore

@@ -14,3 +14,6 @@ py_xdsmjs/**/dist
 *egg-info
 **/__pycache__
 .pytest_cache
+
+#safe-buffer licensing
+dist/xdsmjs-test.js.LICENSE.txt

package.json

@@ -1,6 +1,6 @@
 {
   "name": "xdsmjs",
-  "version": "0.8.4",
+  "version": "1.0.0",
   "description": "XDSM diagram generator",
   "main": "src/index.js",
   "files": [
@@ -39,24 +39,23 @@
     "babel-core": "^7.0.0-bridge",
     "babel-loader": "^8.0.0",
     "babel-tape-runner": "^3.0.0",
-    "eslint": "^6.2.0",
+    "eslint": "^7.9.0",
     "eslint-config-airbnb": "^18.0.1",
     "eslint-plugin-import": "^2.20.2",
     "eslint-plugin-jsx-a11y": "^6.2.3",
     "eslint-plugin-react": "^7.19.0",
     "faucet": "0.0.1",
-    "tape": "^4.9.1",
-    "uglify-js": "^3.4.9",
-    "uglifyjs-webpack-plugin": "^2.0.1",
+    "tape": "^5.0.0",
+    "terser-webpack-plugin": "^4.2.2",
     "webpack": "^4.26.0",
     "webpack-cli": "^3.1.2",
     "webpack-dev-server": "^3.1.10"
   },
   "dependencies": {
-    "d3-color": "^1.2.3",
-    "d3-fetch": "^1.1.2",
-    "d3-selection": "^1.3.2",
-    "d3-transition": "^1.1.3"
+    "d3-color": "^2.0.0",
+    "d3-fetch": "^2.0.0",
+    "d3-selection": "^2.0.0",
+    "d3-transition": "^2.0.0"
   },
   "eslintConfig": {
     "extends": [
@@ -87,4 +86,4 @@
       "brace-style": "off"
     }
   }
-}
+}

py_xdsmjs/xdsmjs/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.8.4"
+__version__ = "1.0.0"
 
 import os
 

src/animation.js

@@ -1,4 +1,3 @@
-
 import { select, selectAll } from 'd3-selection';
 import { rgb } from 'd3-color';
 import Graph from './graph';

src/controls.js

@@ -1,4 +1,3 @@
-
 import { select } from 'd3-selection';
 import Animation from './animation';
 import { VERSION1, VERSION2 } from './xdsm';
@@ -28,7 +27,6 @@ function Controls(animation, defaultVersion) {
   buttonGroup.append('select')
     .attr('id', 'xdsm-version-toggle');
 
-
   this.startButton = select('button#start');
   this.stopButton = select('button#stop');
   this.stepPrevButton = select('button#step-prev');

src/graph.js

@@ -1,4 +1,3 @@
-
 const UID = '_U_';
 const UNAME = 'User';
 const MULTI_TYPE = '_multi';

src/labelizer.js

@@ -1,4 +1,3 @@
-
 function Labelizer() { }
 
 Labelizer.strParse = function strParse(str, subSupScript) {

src/selectable.js

@@ -1,4 +1,3 @@
-
 import { select, selectAll } from 'd3-selection';
 
 function Selectable(xdsm, callback) {

src/xdsm-factory.js

@@ -3,7 +3,7 @@
  * Copyright 2016-2020 Rémi Lafage
  */
 import { json } from 'd3-fetch';
-import { select, event } from 'd3-selection';
+import { select } from 'd3-selection';
 import Graph from './graph';
 import Xdsm, { VERSION1, VERSION2 } from './xdsm';
 
@@ -109,7 +109,7 @@ class XdsmFactory {
           xdsms[k].draw();
           xdsms[k].svg.select('.optimization').on(
             'click',
-            () => {
+            (event) => {
               const info = select(`.optpb.${k}`);
               info.style('opacity', 0.9);
               info.style('left', `${event.pageX}px`).style('top',

src/xdsm.js

@@ -1,5 +1,4 @@
-
-import { select, selectAll, event } from 'd3-selection';
+import { select, selectAll } from 'd3-selection';
 import 'd3-transition';
 import Graph from './graph';
 import Labelizer from './labelizer';
@@ -188,7 +187,7 @@ Xdsm.prototype._createTextGroup = function _createTextGroup(kind, group, decorat
   selection.exit().remove(); // EXIT
 
   if (self.tooltip) {
-    selectAll('.ellipsized').on('mouseover', (d) => {
+    selectAll('.ellipsized').on('mouseover', (event, d) => {
       self.tooltip.transition().duration(200).style('opacity', 0.9);
       const tooltipize = Labelizer.tooltipize()
         .subSupScript(self.config.labelizer.subSupScript)

webpack.config.js

@@ -1,5 +1,5 @@
 const path = require('path');
-const UglifyJSPlugin = require('uglifyjs-webpack-plugin');
+const TerserPlugin = require('terser-webpack-plugin');
 
 module.exports = {
   mode: 'development',
@@ -31,7 +31,8 @@ module.exports = {
   node: {
     fs: 'empty',
   },
-  plugins: [
-    new UglifyJSPlugin({ sourceMap: true }),
-  ],
+  optimization: {
+    minimize: true,
+    minimizer: [new TerserPlugin()],
+  },
 };