Merge pull request #176 from TylerVigario/node-flow-cleanup

Cleanup artifacts from node build flow

README.md

@@ -69,6 +69,9 @@ cd botamusique
 python3 -m venv venv
 venv/bin/pip install wheel
 venv/bin/pip install -r requirements.txt
+cd web
+npm install
+npm run build
 ```
 
 

web/js/main.mjs

@@ -4,7 +4,7 @@ import Popper from 'popper.js/dist/esm/popper';
 import {
   Modal,
   Toast,
-  Tooltip
+  Tooltip,
 } from 'bootstrap/js/src/index';
 import {
   isOverflown,
@@ -1184,7 +1184,7 @@ playerBarBox.addEventListener('mousedown', function() {
 
 playerBarBox.addEventListener('mouseup', function(event) {
   playerBarBox.removeEventListener('mousemove', playheadDragged);
-  const percent = (event.clientX -  playerBarBox.getBoundingClientRect().x)  / playerBarBox.clientWidth;
+  const percent = (event.clientX - playerBarBox.getBoundingClientRect().x) / playerBarBox.clientWidth;
   request('post', {
     move_playhead: percent * currentPlayingItem.duration,
   });
@@ -1192,7 +1192,7 @@ playerBarBox.addEventListener('mouseup', function(event) {
 });
 
 function playheadDragged(event) {
-  const percent = (event.clientX -  playerBarBox.getBoundingClientRect().x)  / playerBarBox.clientWidth;
+  const percent = (event.clientX - playerBarBox.getBoundingClientRect().x) / playerBarBox.clientWidth;
   setProgressBar(playerBar, percent, secondsToStr(percent * currentPlayingItem.duration));
 }
 

web/js/util.js

@@ -6,7 +6,7 @@ export function setProgressBar(bar, progress, text = '') {
   const progPos = (-1 * (1 - progress) * bar.scrollWidth).toString();
   const progStr = (progress * 100).toString();
   bar.setAttribute('aria-valuenow', progStr);
-  bar.style.transform = "translateX(" + progPos + "px)";
+  bar.style.transform = 'translateX(' + progPos + 'px)';
   bar.textContent = text;
 }
 

web/package-lock.json

@@ -2177,9 +2177,9 @@
       "dev": true
     },
     "autoprefixer": {
-      "version": "9.8.1",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.1.tgz",
-      "integrity": "sha512-zDw9+mkCdWZHloBIGrOgMq1tTUed4qy6ZgNAe2Ze2xERZA7CyTgW5Bw3XZbwSeJe8lfDHZIkw8Hwd/6hI3p0NQ==",
+      "version": "9.8.2",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.2.tgz",
+      "integrity": "sha512-9UwMMU8Rg7Fj0c55mbOpXrr/2WrRqoOwOlLNTyyYt+nhiyQdIBWipp5XWzt+Lge8r3DK5y+EHMc1OBf8VpZA6Q==",
       "dev": true,
       "requires": {
         "browserslist": "^4.12.0",
@@ -3733,17 +3733,17 @@
       }
     },
     "eslint-plugin-jsdoc": {
-      "version": "27.1.2",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-27.1.2.tgz",
-      "integrity": "sha512-iWrG2ZK4xrxamoMkoyzgkukdmfqWc5Ncd6K+CnwRgxrbwjQQpzmt5Kl8GB0l12R0oUK2AF+9tGFJKNGzuyz79Q==",
+      "version": "28.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-28.0.0.tgz",
+      "integrity": "sha512-Etne7B8AQcgXrnDPXdfV4x+szHVEP+JVZ2cYNfZGn+HoaZigIOzxxJGU+QUhymz6vuz0fpzFM6fTt64XOvw69w==",
       "dev": true,
       "requires": {
         "comment-parser": "^0.7.5",
         "debug": "^4.1.1",
-        "jsdoctypeparser": "^6.1.0",
+        "jsdoctypeparser": "^7.0.0",
         "lodash": "^4.17.15",
         "regextras": "^0.7.1",
-        "semver": "^6.3.0",
+        "semver": "^7.3.2",
         "spdx-expression-parse": "^3.0.1"
       },
       "dependencies": {
@@ -3763,9 +3763,9 @@
           "dev": true
         },
         "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "version": "7.3.2",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
+          "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
           "dev": true
         }
       }
@@ -4955,9 +4955,9 @@
       }
     },
     "jsdoctypeparser": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsdoctypeparser/-/jsdoctypeparser-6.1.0.tgz",
-      "integrity": "sha512-UCQBZ3xCUBv/PLfwKAJhp6jmGOSLFNKzrotXGNgbKhWvz27wPsCsVeP7gIcHPElQw2agBmynAitXqhxR58XAmA==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/jsdoctypeparser/-/jsdoctypeparser-7.0.0.tgz",
+      "integrity": "sha512-6vWPn5qSy+MbgCVjXsQKVkRywhs+IxFU7Chw72DKsWoGueYp6QX8eTc55+EA0yPGYfhmglb1gfi283asXirfGQ==",
       "dev": true
     },
     "jsesc": {

web/package.json

@@ -3,7 +3,7 @@
   "private": true,
   "type": "module",
   "scripts": {
-    "lint": "eslint --config .eslintrc.json src/js/ --ext .mjs",
+    "lint": "eslint --config .eslintrc.json js/ --ext .mjs",
     "lint:fix": "npm run lint -- --fix",
     "build": "webpack --config webpack.config.cjs --progress",
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -22,7 +22,7 @@
     "@babel/core": "^7.10.3",
     "@babel/plugin-proposal-class-properties": "^7.10.1",
     "@babel/preset-env": "^7.10.3",
-    "autoprefixer": "^9.8.1",
+    "autoprefixer": "^9.8.2",
     "babel-eslint": "^10.1.0",
     "babel-loader": "^8.1.0",
     "core-js": "^3.6.5",
@@ -30,7 +30,7 @@
     "eslint": "^7.3.0",
     "eslint-config-google": "^0.14.0",
     "eslint-plugin-import": "^2.21.2",
-    "eslint-plugin-jsdoc": "^27.1.2",
+    "eslint-plugin-jsdoc": "^28.0.0",
     "eslint-plugin-node": "^11.1.0",
     "html-webpack-plugin": "^4.3.0",
     "mini-css-extract-plugin": "^0.9.0",

web/scripts/build-css.js

@@ -1,21 +0,0 @@
-const sass = require('node-sass');
-const fs = require('fs');
-
-sass.render({
-    file: './src/sass/main.scss',
-    outFile: './build/assets/css/main.min.css',
-    outputStyle: 'compressed',
-}, function (error, result) {
-    if (error) {
-        console.error(error);
-    }
-    
-    // No errors during compilation, write the result to disk
-    fs.writeFile('./build/assets/css/main.min.css', result.css, function (err) {
-        if (err) {
-            console.error(err);
-        }
-
-        console.info('CSS compiled.');
-    });
-});

web/webpack.config.cjs

@@ -6,11 +6,11 @@ module.exports = {
   mode: 'production',
   entry: {
     main: [
-      './src/js/app.mjs',
-      './src/sass/app.scss',
+      './js/app.mjs',
+      './sass/app.scss',
     ],
     dark: [
-      './src/sass/app-dark.scss',
+      './sass/app-dark.scss',
     ],
   },
   devtool: 'source-map',
@@ -30,12 +30,12 @@ module.exports = {
     }),
     new HtmlWebpackPlugin({
       filename: 'templates/index.html',
-      template: './src/templates/index.html',
+      template: './templates/index.html',
       inject: false,
     }),
     new HtmlWebpackPlugin({
       filename: 'templates/need_token.html',
-      template: './src/templates/need_token.html',
+      template: './templates/need_token.html',
       inject: false,
     }),
   ],