Upgrade deps

Makefile

@@ -42,3 +42,7 @@ yarn: ## Update yarn dependencies
 .PHONY: shell
 shell: ## Run shell
 	docker-compose run --rm app sh
+
+.PHONY: open
+open: ## Open app in browser
+	xdg-open http://localhost:3000

app.js

@@ -20,6 +20,7 @@ import search from './routes/search.js';
 import share from './routes/share.js';
 import { slack, oauth } from './routes/slack.js';
 import errorHandler from './lib/error-handler.js';
+import newrelic from 'newrelic';
 
 const debug = debuglog('combine.fm');
 

docker-compose.yml

@@ -50,7 +50,7 @@ services:
       - ./:/app
     command: yarn run watch-worker
     ports:
-      - "3001:3000"
+      - "3001:3001"
   database:
     image: "postgres:12.1-alpine"
     ports:

models/index.cjs

@@ -16,7 +16,7 @@ fs
   .readdirSync(__dirname)
   .filter(file => (file.indexOf('.') !== 0) && (file !== 'index.cjs'))
   .forEach((file) => {
-    const model = sequelize.import(path.join(__dirname, file));
+    const model = require(path.join(__dirname, file))(sequelize, Sequelize.DataTypes)
     db[model.name] = model;
   });
 

package.json

@@ -30,7 +30,7 @@
     "bluebird": "^3.7.2",
     "bulma": "^0.9.0",
     "co": "~4.6.0",
-    "css-loader": "^3.6.0",
+    "css-loader": "^4.2.1",
     "debug": "^4.1.1",
     "ejs": "^3.1.3",
     "file-loader": "^6.0.0",
@@ -45,17 +45,18 @@
     "koa-static": "^5.0.0",
     "koa-views": "^6.3.0",
     "kue": "^0.11.6",
-    "mini-css-extract-plugin": "^0.9.0",
+    "mini-css-extract-plugin": "^0.10.0",
     "mocha-esm": "^1.1.1",
+    "newrelic": "^6.12.0",
     "node-sass": "^4.14.1",
     "nodebrainz": "^2.1.1",
     "pg": "^8.3.0",
     "playmusic": "^2.3.0",
     "sass-loader": "^9.0.2",
-    "sequelize": "^5.21.13",
+    "sequelize": "^6.3.4",
     "sequelize-cli-esm": "^5.0.6",
     "spotify-web-api-node": "^4.0.0",
-    "superagent": "^5.3.1",
+    "superagent": "^6.0.0",
     "vue": "^2.6.11",
     "vue-loader": "^15.9.3",
     "vue-router": "^3.3.4",

public/src/app.vue

@@ -25,12 +25,9 @@
 <style lang="scss">
 @import url('https://fonts.googleapis.com/css?family=Comfortaa');
 
-@import "bulma/sass/utilities/initial-variables.sass";
+@import "scss/_variables.scss";
-@import "bulma/sass/utilities/functions.sass";
+@import "bulma/sass/utilities/_all.sass";
-@import "scss/_variables";
+@import "bulma/sass/base/_all.sass";
-@import "bulma/sass/utilities/derived-variables.sass";
-@import "bulma/sass/utilities/mixins.sass";
-@import "bulma/sass/utilities/controls.sass";
 @import "bulma/sass/helpers/_all.sass";
 @import "bulma/sass/elements/title.sass";
 @import "bulma/sass/elements/button.sass";

public/src/components/social.vue

@@ -11,11 +11,6 @@
         <img src='/assets/images/facebook.png' alt='Facebook' height="20" width="20" />
       </a>
     </li>
-    <li>
-      <a v-bind:href="`https://plus.google.com/share?url=${url}`" class='share-dialog'>
-        <img src='/assets/images/googleplus.png' alt='Google+' height="20" width="20" />
-      </a>
-    </li>
   </ul>
 </template>
 
@@ -24,7 +19,7 @@ export default {
   name: 'social-view',
   props: ['name', 'artist', 'url'],
   mounted() {
-    // Some hacks to pop open the Twitter/Facebook/Google Plus sharing dialogs without using their code.
+    // Some hacks to pop open the Twitter/Facebook sharing dialogs without using their code.
     Array.prototype.forEach.call(document.querySelectorAll('.share-dialog'), function(dialog){
       dialog.addEventListener('click', function(e) {
         e.preventDefault();