[med-svn] [Git][med-team/q2-taxa][master] 3 commits: Update Build-Depends

[Nilesh Patra]

Nilesh Patra pushed to branch master at Debian Med / q2-taxa


Commits:
33cd11e8 by Nilesh Patra at 2021-01-13T20:36:42+05:30
Update Build-Depends

- - - - -
ca8b868c by Nilesh Patra at 2021-01-13T20:38:37+05:30
Change old webpack schema wrt webpack4

- - - - -
4ae7fabd by Nilesh Patra at 2021-01-13T20:38:53+05:30
Build the relevant JS assets

- - - - -


4 changed files:

- debian/control
- + debian/patches/fix
- + debian/patches/series
- debian/rules


Changes:

=====================================
debian/control
=====================================
@@ -14,7 +14,13 @@ Build-Depends: debhelper-compat (= 13),
                qiime (>= 2020.11.0),
                q2templates,
                q2-types,
-               libjs-d3
+               node-webpack,
+               node-uglifyjs-webpack-plugin,
+               node-babel-loader,
+               node-d3-scale-chromatic,
+               node-natural-sort,
+               node-thenby,
+               node-d3
 Standards-Version: 4.5.1
 Vcs-Browser: https://salsa.debian.org/med-team/q2-taxa
 Vcs-Git: https://salsa.debian.org/med-team/q2-taxa.git


=====================================
debian/patches/fix
=====================================
@@ -0,0 +1,63 @@
+Description: webpack.config.js in incompatible with webpack4 API, Hence did the needed changes
+Author: Nilesh Patra <npatra974 at gmail.com>
+Last-Update: 2021-01-13
+--- a/q2_taxa/assets/barplot/webpack.config.js
++++ b/q2_taxa/assets/barplot/webpack.config.js
+@@ -1,38 +1,42 @@
+ var path = require('path');
+ var webpack = require('webpack');
++const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
+ 
+ module.exports = {
+   entry: {
+     app: './src/main.js',
+-    vendor: ['thenby', 'd3', 'd3-scale-chromatic', 'natural-sort']
++    //vendor: ['thenby', 'd3', 'd3-scale-chromatic', 'natural-sort']
+   },
+   plugins: [
+-    new webpack.optimize.CommonsChunkPlugin('vendor', 'dist/vendor.bundle.js'),
+-    new webpack.optimize.UglifyJsPlugin({
+-      compress: { warnings: false }
++    //new webpack.optimize.CommonsChunkPlugin('vendor', 'dist/vendor.bundle.js'),
++    new UglifyJsPlugin({
++      uglifyOptions: {
++        "warnings": false
++      }
+     }),
+-    new webpack.NoErrorsPlugin(),
++    new webpack.NoEmitOnErrorsPlugin(),
+   ],
+   output: {
+     path: __dirname,
+     filename: 'dist/bundle.js'
+   },
+   module: {
+-    preLoaders: [
+-      {
+-        test: /\.js$/,
+-        loader: "eslint-loader",
+-        exclude: /node_modules/
+-      }
+-    ],
+-    loaders: [
++    rules: [
+       {
+-        loader: 'babel-loader',
+         exclude: /node_modules/,
++	use: [{      
++        loader: 'babel-loader',
+         query: {
+-          presets: ['es2015']
++          presets: ['@babel/preset-env']
+         }
++       }]
+       }
+     ]
+   },
++ resolve: {
++   modules: ['/usr/lib/nodejs', '/usr/share/nodejs', '.']
++ },
++ resolveLoader: {
++   modules: ['/usr/lib/nodejs', '/usr/share/nodejs', '.'],
++ }
+ };


=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+fix


=====================================
debian/rules
=====================================
@@ -12,11 +12,8 @@ export PYBUILD_BEFORE_INSTALL=rm -rvf {build_dir}/.coverage*
 
 override_dh_auto_build:
 	dh_auto_build
-	# TODO: rewrite the code below when JS dependencies are packaged!
-	#cd q2_taxa/assets/barplot && \
-	#	npm install && \
-	#	npm run build && \
-	#	cp licenses/* dist/
+	cd q2_taxa/assets/barplot && \
+	webpack --bail
 
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))



View it on GitLab: https://salsa.debian.org/med-team/q2-taxa/-/compare/953125d56bc1cfb84398b684e0765675cc66ddf6...4ae7fabdec57f2ffba25eca693784de649e42d08

-- 
View it on GitLab: https://salsa.debian.org/med-team/q2-taxa/-/compare/953125d56bc1cfb84398b684e0765675cc66ddf6...4ae7fabdec57f2ffba25eca693784de649e42d08
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20210113/6903369f/attachment-0001.html>