update package json, clean unused dependencies

bluzky · bluzky · commit 4f5715659c81 · 2020-08-18T22:27:50.000+07:00
diff --git a/package.json b/package.json
@@ -3,32 +3,25 @@
   "version": "1.0.0",
   "private": false,
   "description": "Mindmap viewer for web",
+  "main": "dist/js/mindtree.js",
   "scripts": {
     "watch": "webpack --watch --progress --mode development",
     "start": "webpack-dev-server",
     "dev": "webpack --mode development",
-    "clean": "shx rm -rf build/static",
+    "clean": "shx rm -rf dist",
     "build": "npm run clean && cross-env NODE_ENV=\"production\" webpack"
   },
   "devDependencies": {
     "@babel/core": "^7.11.0",
     "@babel/plugin-syntax-class-properties": "^7.10.4",
     "@babel/preset-env": "^7.11.0",
     "babel-loader": "^8.1.0",
-    "copy-webpack-plugin": "^6.0.0",
     "cross-env": "^7.0.0",
-    "css-loader": "^4.1.1",
-    "file-loader": "^6.0.0",
-    "mini-css-extract-plugin": "^0.9.0",
-    "postcss-loader": "^3.0.0",
     "random-graph": "^0.0.3",
-    "sass": "^1.26.10",
-    "sass-loader": "^9.0.2",
     "shx": "^0.3.2",
     "stylelint": "^13.6.1",
     "stylelint-config-standard": "^20.0.0",
-    "uglifyjs-webpack-plugin": "^2.2.0",
-    "url-loader": "^4.0.1",
+    "terser-webpack-plugin": "^4.1.0",
     "webpack": "^4.44.1",
     "webpack-cli": "^3.3.12",
     "webpack-dev-server": "^3.11.0"
diff --git a/src/js/algorithms/layout.js b/src/js/algorithms/layout.js
@@ -1,67 +1,66 @@
-import { Tree, layout } from 'non-layered-tidy-tree-layout'
+import { Tree, layout } from "non-layered-tidy-tree-layout";
 
 class Layout {
-    constructor(boundingBox) {
-        this.bb = boundingBox
-    }
-
-    /**
-     * Layout treeData.
-     * Return modified treeData and the bounding box encompassing all the nodes.
-     * 
-     * See getSize() for more explanation.
-     */
-    layout(treeData) {
-        const tree = this.convert(treeData)
-        layout(tree)
-        const { boundingBox, result } = this.assignLayout(tree, treeData)
+  constructor(boundingBox) {
+    this.bb = boundingBox;
+  }
 
-        return { result, boundingBox }
-    }
+  /**
+   * Layout treeData.
+   * Return modified treeData and the bounding box encompassing all the nodes.
+   *
+   * See getSize() for more explanation.
+   */
+  layout(treeData) {
+    const tree = this.convert(treeData);
+    layout(tree);
+    const { boundingBox, result } = this.assignLayout(tree, treeData);
 
-    /**
-     * Returns Tree to layout, with bounding boxes added to each node.
-     */
-    convert(treeData, y = 0) {
-        if (treeData === null) return null
+    return { result, boundingBox };
+  }
 
-        const { width, height } = this.bb.addBoundingBox(
-            treeData.width,
-            treeData.height
-        )
-        let children = []
-        if (treeData.children && treeData.children.length) {
-            for (let i = 0; i < treeData.children.length; i++) {
-                children[i] = this.convert(treeData.children[i], y + height)
-            }
-        }
+  /**
+   * Returns Tree to layout, with bounding boxes added to each node.
+   */
+  convert(treeData, y = 0) {
+    if (treeData === null) return null;
 
-        return new Tree(width, height, y, children)
+    const { width, height } = this.bb.addBoundingBox(
+      treeData.width,
+      treeData.height
+    );
+    let children = [];
+    if (treeData.children && treeData.children.length) {
+      for (let i = 0; i < treeData.children.length; i++) {
+        children[i] = this.convert(treeData.children[i], y + height);
+      }
     }
 
-    /**
-     * Assign layout tree x, y coordinates back to treeData,
-     * with bounding boxes removed.
-     */
-    assignCoordinates(tree, treeData) {
-        const { x, y } = this.bb.removeBoundingBox(tree.x, tree.y)
-        treeData.x = x
-        treeData.y = y
-        for (let i = 0; i < tree.c.length; i++) {
-            this.assignCoordinates(tree.c[i], treeData.children[i])
-        }
-        return treeData
-    }
+    return new Tree(width, height, y, children);
+  }
 
-    /**
-     * This function does assignCoordinates and getSize in one pass.
-     */
-    assignLayout(tree, treeData, box = null) {
-        return {
-            result: this.assignCoordinates(tree, treeData)
-        }
+  /**
+   * Assign layout tree x, y coordinates back to treeData,
+   * with bounding boxes removed.
+   */
+  assignCoordinates(tree, treeData) {
+    const { x, y } = this.bb.removeBoundingBox(tree.x, tree.y);
+    treeData.x = x;
+    treeData.y = y;
+    for (let i = 0; i < tree.c.length; i++) {
+      this.assignCoordinates(tree.c[i], treeData.children[i]);
     }
-}
+    return treeData;
+  }
 
+  /**
+   * This function does assignCoordinates and getSize in one pass.
+   */
+  assignLayout(tree, treeData, box = null) {
+    return {
+      result: this.assignCoordinates(tree, treeData),
+    };
+  }
+}
 
-export default Layout
+export default Layout;
diff --git a/webpack/config.js b/webpack/config.js
@@ -17,7 +17,7 @@ const path = require("path"),
   manifest = require("./manifest"),
   rules = require("./rules"),
   plugins = [],
-  UglifyJsPlugin = require("uglifyjs-webpack-plugin");
+  TerserPlugin = require("terser-webpack-plugin");
 
 // ------------------
 // @Entry Point Setup
@@ -49,26 +49,8 @@ var optimization = {
 
 if (manifest.IS_PRODUCTION) {
   optimization.minimizer = [
-    new UglifyJsPlugin({
+    new TerserPlugin({
       parallel: true,
-      uglifyOptions: {
-        compress: {
-          comparisons: true,
-          conditionals: true,
-          dead_code: true,
-          drop_debugger: true,
-          evaluate: true,
-          if_return: true,
-          join_vars: true,
-          sequences: true,
-          unused: true,
-          warnings: false,
-        },
-
-        output: {
-          comments: false,
-        },
-      },
     }),
   ];
 }
diff --git a/yarn.lock b/yarn.lock
@@ -1587,7 +1587,7 @@ cacache@^12.0.2:
     unique-filename "^1.1.1"
     y18n "^4.0.0"
 
-cacache@^15.0.4:
+cacache@^15.0.4, cacache@^15.0.5:
   version "15.0.5"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.0.5.tgz#69162833da29170d6732334643c60e005f5f17d0"
   integrity sha512-lloiL22n7sOjEEXdL8NAjTgv9a1u43xICE9/203qonkZUCj5X1UEWIdf2/Y0d6QcCtMzbKQyhrcDbdvlZTs/+A==
@@ -3640,6 +3640,15 @@ isobject@^3.0.0, isobject@^3.0.1:
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
 
+jest-worker@^26.3.0:
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.3.0.tgz#7c8a97e4f4364b4f05ed8bca8ca0c24de091871f"
+  integrity sha512-Vmpn2F6IASefL+DVBhPzI2J9/GJUsqzomdeN+P+dK8/jKxbh8R3BtFnx3FIta7wYlPU62cpJMJQo4kuOowcMnw==
+  dependencies:
+    "@types/node" "*"
+    merge-stream "^2.0.0"
+    supports-color "^7.0.0"
+
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
@@ -3951,6 +3960,11 @@ merge-descriptors@1.0.1:
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
   integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
 
+merge-stream@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
+  integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
+
 merge2@^1.3.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
@@ -4422,7 +4436,7 @@ p-limit@^2.0.0, p-limit@^2.2.0:
   dependencies:
     p-try "^2.0.0"
 
-p-limit@^3.0.1:
+p-limit@^3.0.1, p-limit@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.0.2.tgz#1664e010af3cadc681baafd3e2a437be7b0fb5fe"
   integrity sha512-iwqZSOoWIW+Ew4kAGUlN16J4M7OB3ysMLSZtnhmqx7njIHFPlxWBX8xo3lVTyFVq6mI/lL9qt2IsN1sHwaxJkg==
@@ -5323,7 +5337,7 @@ schema-utils@^1.0.0:
     ajv-errors "^1.0.0"
     ajv-keywords "^3.1.0"
 
-schema-utils@^2.6.5, schema-utils@^2.7.0:
+schema-utils@^2.6.5, schema-utils@^2.6.6, schema-utils@^2.7.0:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.0.tgz#17151f76d8eae67fbbf77960c33c676ad9f4efc7"
   integrity sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==
@@ -5940,7 +5954,7 @@ supports-color@^6.1.0:
   dependencies:
     has-flag "^3.0.0"
 
-supports-color@^7.1.0:
+supports-color@^7.0.0, supports-color@^7.1.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1"
   integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==
@@ -5994,6 +6008,21 @@ terser-webpack-plugin@^1.4.3:
     webpack-sources "^1.4.0"
     worker-farm "^1.7.0"
 
+terser-webpack-plugin@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-4.1.0.tgz#6e9d6ae4e1a900d88ddce8da6a47507ea61f44bc"
+  integrity sha512-0ZWDPIP8BtEDZdChbufcXUigOYk6dOX/P/X0hWxqDDcVAQLb8Yy/0FAaemSfax3PAA67+DJR778oz8qVbmy4hA==
+  dependencies:
+    cacache "^15.0.5"
+    find-cache-dir "^3.3.1"
+    jest-worker "^26.3.0"
+    p-limit "^3.0.2"
+    schema-utils "^2.6.6"
+    serialize-javascript "^4.0.0"
+    source-map "^0.6.1"
+    terser "^5.0.0"
+    webpack-sources "^1.4.3"
+
 terser@^4.1.2:
   version "4.8.0"
   resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17"
@@ -6003,6 +6032,15 @@ terser@^4.1.2:
     source-map "~0.6.1"
     source-map-support "~0.5.12"
 
+terser@^5.0.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.2.0.tgz#e547d0b20926b321d3e524bf9e5bc1b10ba2f360"
+  integrity sha512-nZ9TWhBznZdlww3borgJyfQDrxzpgd0RlRNoxR63tMVry01lIH/zKQDTTiaWRMGowydfvSHMgyiGyn6A9PSkCQ==
+  dependencies:
+    commander "^2.20.0"
+    source-map "~0.6.1"
+    source-map-support "~0.5.12"
+
 through2@^2.0.0:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
