diff --git a/debian/control b/debian/control index 25945a254b..26ab72d2c0 100644 --- a/debian/control +++ b/debian/control @@ -319,9 +319,11 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, node-d3-axis, node-d3-brush, node-d3-ease, - node-d3-scale, + node-d3-scale (>= 1.0.7~), node-d3-selection (>= 1.2~), node-d3-shape, + node-d3-time (>= 1.0.8~), + node-dateformat, node-fuzzaldrin-plus (>= 0.5~), node-glob, node-jed, @@ -339,6 +341,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, node-three-stl-loader, node-timeago.js, node-underscore, + node-webpack-stats-plugin, # using npm for remaining as it is in contrib # node-babel-core, # node-babel-eslint, @@ -346,8 +349,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, # node-babel-plugin-transform-define, # node-babel-preset-latest, # node-babel-preset-stage-2, -# node-d3-time, # node-d3-time-format, +# node-d3-transition (>= 1.1.1~), # node-debug (>= 3.1.0~), # node-exports-loader, # node-file-loader, @@ -355,7 +358,6 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, # node-katex, # node-marked, # node-raw-loader, -# node-stats-webpack-plugin, # node-url-loader, # node-katex Recommends: certbot, diff --git a/debian/patches/0740-use-packaged-modules.patch b/debian/patches/0740-use-packaged-modules.patch index 34ecf316dc..2fdca4f7cf 100644 --- a/debian/patches/0740-use-packaged-modules.patch +++ b/debian/patches/0740-use-packaged-modules.patch @@ -1,6 +1,6 @@ --- a/package.json +++ b/package.json -@@ -39,28 +39,14 @@ +@@ -39,32 +39,16 @@ "apollo-client": "^2.5.1", "apollo-upload-client": "^10.0.0", "at.js": "^1.5.4", @@ -26,10 +26,14 @@ - "d3-scale": "^1.0.7", - "d3-selection": "^1.2.0", - "d3-shape": "^1.2.0", - "d3-time": "^1.0.8", +- "d3-time": "^1.0.8", "d3-time-format": "^2.1.1", "d3-transition": "^1.1.1", -@@ -75,33 +61,20 @@ +- "dateformat": "^3.0.3", + "deckar01-task_list": "^2.2.0", + "diff": "^3.4.0", + "document-register-element": "1.13.1", +@@ -75,33 +59,20 @@ "exports-loader": "^0.7.0", "file-loader": "^3.0.1", "formdata-polyfill": "^3.0.11", @@ -63,7 +67,7 @@ "raw-loader": "^1.0.0", "sanitize-html": "^1.16.1", "select2": "3.5.2-browserify", -@@ -114,13 +87,9 @@ +@@ -114,13 +85,9 @@ "stylelint-error-string-formatter": "1.0.2", "svg4everybody": "2.1.9", "three": "^0.84.0", @@ -77,6 +81,14 @@ "url-loader": "^1.1.2", "visibilityjs": "^1.2.4", "vue": "^2.6.10", +@@ -134,7 +101,6 @@ + "webpack": "^4.29.0", + "webpack-bundle-analyzer": "^3.0.3", + "webpack-cli": "^3.2.1", +- "webpack-stats-plugin": "^0.2.1", + "worker-loader": "^2.0.0", + "xterm": "^3.5.0" + }, --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -12,7 +12,7 @@