Merge pull request #13 from th-ch/snyk-upgrade-5770951f6ab79d4e413754bb7cab1225

[Snyk] Upgrade electron-localshortcut from 3.1.0 to 3.2.1
Upgrade electron-localshortcut from 3.1.0 to 3.2.1
2026-01-12 02:51:46 +00:00 · 2020-03-15 12:38:57 +01:00 · 2020-03-15 12:22:41 +01:00 · 2020-03-15 12:21:17 +01:00 · 2020-03-15 12:02:44 +01:00 · 2020-03-15 12:02:12 +01:00
20 changed files with 5694 additions and 6976 deletions
--- a/.npmrc
+++ b/.npmrc
@ -0,0 +1,2 @@
+engine-strict=true
+scripts-prepend-node-path=true
--- a/.travis.yml
+++ b/.travis.yml
@ -0,0 +1,45 @@
+matrix:
+  include:
+    - os: osx
+      osx_image: xcode9.4
+      language: node_js
+      node_js: "10"
+      env:
+        - ELECTRON_CACHE=$HOME/.cache/electron
+        - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
+
+    - os: linux
+      services: docker
+      language: generic
+
+cache:
+  yarn: false
+  directories:
+    - $HOME/.cache/electron
+    - $HOME/.cache/electron-builder
+
+script:
+  - |
+    if [ "$TRAVIS_OS_NAME" == "linux" ]; then
+      docker run --rm \
+        $(env | \
+          grep -Eo '^[^\s=]*(DEBUG|NODE_|ELECTRON_|YARN_|NPM_|CI|CIRCLE|TRAVIS|APPVEYOR_|CSC_|_TOKEN|_KEY|AWS_|STRIP|BUILD_)[^\s=]*' | \
+          sed '/^$/d;s/^/-e /' | \
+          paste -sd ' ' \
+        ) \
+        -v ${PWD}:/project \
+        -v ~/.cache/electron:/root/.cache/electron \
+        -v ~/.cache/electron-builder:/root/.cache/electron-builder \
+        electronuserland/builder:10 \
+        /bin/bash -c "yarn && npm run release:linux"
+    else
+      npm run release:mac
+    fi
+before_cache:
+  - rm -rf $HOME/.cache/electron-builder
+before_install:
+  - rm -rf node_modules
+
+branches:
+  except:
+    - "/^v\\d+\\.\\d+\\.\\d+$/"
--- a/appveyor.yml
+++ b/appveyor.yml
@ -0,0 +1,20 @@
+image: Visual Studio 2017
+
+platform:
+  - x64
+
+cache:
+  - node_modules
+  - '%USERPROFILE%\.electron'
+
+init:
+  - git config --global core.autocrlf input
+
+install:
+  - ps: Install-Product node 10 x64
+  - yarn
+
+build_script:
+  - yarn run release:win
+
+test: off
--- a/error.html
+++ b/error.html
@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="utf-8" />
+		<title>Cannot load YouTube Music</title>
+		<style>
+			body {
+				background: #000;
+			}
+
+			.container {
+				margin: 0;
+				font-family: Roboto, Arial, sans-serif;
+				font-size: 20px;
+				font-weight: 500;
+				color: rgba(255, 255, 255, 0.5);
+				position: absolute;
+				top: 50%;
+				left: 50%;
+				margin-right: -50%;
+				transform: translate(-50%, -50%);
+				text-align: center;
+			}
+
+			.button {
+				background: #065fd4;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+				color: white;
+				font: inherit;
+				text-transform: uppercase;
+				text-decoration: none;
+				border-radius: 2px;
+				font-size: 16px;
+				font-weight: normal;
+				text-align: center;
+				padding: 8px 22px;
+				display: inline-block;
+			}
+		</style>
+	</head>
+
+	<body>
+		<div class="container">
+			<p>Cannot load YouTube Music… Internet disconnected?</p>
+			<a href="#" class="button" onclick="reload()">Retry</a>
+		</div>
+	</body>
+</html>
--- a/index.js
+++ b/index.js
@ -2,7 +2,7 @@
 const path = require("path");

 const electron        = require("electron");
-const isDev           = require("electron-is-dev");
+const is              = require("electron-is");
 const { autoUpdater } = require("electron-updater");

 const { setApplicationMenu }       = require("./menu");
@ -42,11 +42,13 @@ function createMainWindow() {
 		backgroundColor: "#000",
 		show           : false,
 		webPreferences : {
-			nodeIntegration: false,
-			preload        : path.join(__dirname, "preload.js")
+			nodeIntegration : false,
+			preload         : path.join(__dirname, "preload.js"),
+			nativeWindowOpen: true,                                 // window.open return Window object(like in regular browsers), not BrowserWindowProxy
+			affinity        : "main-window"                         // main window, and addition windows should work in one process
 		},
-		frame        : false,
-		titleBarStyle: "hiddenInset"
+		frame        : !is.macOS(),
+		titleBarStyle: is.macOS() ? "hiddenInset": "default"
 	});
 	if (windowMaximized) {
 		win.maximize();
@ -57,7 +59,7 @@ function createMainWindow() {

 	injectCSS(win.webContents, path.join(__dirname, "youtube-music.css"));
 	win.webContents.on("did-finish-load", () => {
-		if (isDev) {
+		if (is.dev()) {
 			console.log("did finish load");
 			win.webContents.openDevTools();
 		}
@ -72,6 +74,13 @@ function createMainWindow() {
 		});
 	});

+	win.webContents.on("did-fail-load", () => {
+		if (is.dev()) {
+			console.log("did fail load");
+		}
+		win.webContents.loadFile(path.join(__dirname, "error.html"));
+	});
+
 	win.webContents.on("did-navigate-in-page", () => {
 		const url = win.webContents.getURL();
 		if (url.startsWith("https://music.youtube.com")) {
@ -79,6 +88,17 @@ function createMainWindow() {
 		}
 	});

+	win.webContents.on(
+		"new-window",
+		(e, url, frameName, disposition, options) => {
+			// hook on new opened window
+
+			// at now new window in mainWindow renderer process.
+			// Also, this will automatically get an option `nodeIntegration=false`(not override to true, like in iframe's) - like in regular browsers
+			options.webPreferences.affinity = "main-window";
+		}
+	);
+
 	win.on("move", () => {
 		let position = win.getPosition();
 		store.set("window-position", { x: position[0], y: position[1] });
@ -122,7 +142,7 @@ app.on("activate", () => {
 app.on("ready", () => {
 	setApplicationMenu();
 	mainWindow = createMainWindow();
-	if (!isDev) {
+	if (!is.dev()) {
 		autoUpdater.checkForUpdatesAndNotify();
 		autoUpdater.on("update-available", () => {
 			const dialogOpts = {
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -1,57 +1,65 @@
 {
-	"name"       : "youtube-music",
+	"name": "youtube-music",
 	"productName": "YouTube Music",
-	"version"    : "1.1.0",
+	"version": "1.2.0",
 	"description": "YouTube Music Desktop App - including custom plugins",
-	"license"    : "MIT",
-	"repository" : "th-ch/youtube-music",
-	"author"     : {
-		"name" : "th-ch",
+	"license": "MIT",
+	"repository": "th-ch/youtube-music",
+	"author": {
+		"name": "th-ch",
 		"email": "th-ch@users.noreply.github.com",
-		"url"  : "https://github.com/th-ch/youtube-music"
+		"url": "https://github.com/th-ch/youtube-music"
 	},
 	"build": {
-		"appId"      : "com.github.th-ch.youtube-music",
+		"appId": "com.github.th-ch.youtube-music",
 		"productName": "YouTube Music",
-		"mac"        : {
+		"mac": {
 			"identity": null,
-			"icon"    : "assets/generated/icons/mac/icon.icns"
+			"icon": "assets/generated/icons/mac/icon.icns"
 		},
 		"win": {
 			"icon": "assets/generated/icons/win/icon.ico"
 		},
 		"linux": {
-			"icon"    : "assets/generated/icons/png",
-			"category": "Audio"
+			"icon": "assets/generated/icons/png",
+			"category": "AudioVideo"
 		}
 	},
 	"scripts": {
-		"test"       : "xo",
-		"start"      : "electron .",
-		"icon"       : "rimraf assets/generated && electron-icon-maker --input=assets/youtube-music.png --output=assets/generated",
-		"postinstall": "npm run icon && npm rebuild && node plugins/adblocker/generator.js && electron-rebuild",
-		"clean"      : "rimraf dist",
-		"build"      : "npm run clean && build --win --mac --linux",
-		"build:mac"  : "npm run clean && build --mac",
-		"release"    : "npm run clean && build --win --mac --linux -p always"
+		"test": "xo",
+		"start": "electron .",
+		"icon": "rimraf assets/generated && electron-icon-maker --input=assets/youtube-music.png --output=assets/generated",
+		"generate:package": "node utils/generate-package-json.js",
+		"postinstall": "yarn run generate:package YoutubeNonStop && yarn run icon && npm rebuild && node plugins/adblocker/generator.js && electron-rebuild",
+		"clean": "rimraf dist",
+		"build": "yarn run clean && build --win --mac --linux",
+		"build:mac": "yarn run clean && build --mac",
+		"build:win": "yarn run clean && build --win",
+		"release:linux": "yarn run clean && build --linux -p always",
+		"release:mac": "yarn run clean && build --mac -p always",
+		"release:win": "yarn run clean && build --win -p always"
+	},
+	"engines": {
+		"npm": "Please use yarn and not npm"
 	},
 	"dependencies": {
-		"ad-block"              : "^4.1.3",
-		"electron-debug"        : "^2.0.0",
-		"electron-is-dev"       : "^1.0.1",
-		"electron-localshortcut": "^3.1.0",
-		"electron-store"        : "^2.0.0",
-		"electron-updater"      : "^4.0.6"
+		"YoutubeNonStop": "git://github.com/lawfx/YoutubeNonStop.git#v0.7.1",
+		"ad-block": "^4.1.3",
+		"electron-debug": "^2.2.0",
+		"electron-is": "^3.0.0",
+		"electron-localshortcut": "^3.2.1",
+		"electron-store": "^3.1.0",
+		"electron-updater": "^4.2.2"
 	},
 	"devDependencies": {
-		"devtron"                    : "^1.4.0",
-		"electron"                   : "^4.0.8",
-		"electron-builder"           : "^20.40.2",
+		"devtron": "^1.4.0",
+		"electron": "^4.0.8",
+		"electron-builder": "^20.40.2",
 		"electron-devtools-installer": "^2.2.4",
-		"electron-icon-maker"        : "0.0.4",
-		"electron-rebuild"           : "^1.8.4",
-		"rimraf"                     : "^2.6.3",
-		"xo"                         : "^0.24.0"
+		"electron-icon-maker": "0.0.4",
+		"electron-rebuild": "^1.8.4",
+		"rimraf": "^2.6.3",
+		"xo": "^0.24.0"
 	},
 	"xo": {
 		"envs": [
--- a/plugins/auto-confirm-when-paused/front.js
+++ b/plugins/auto-confirm-when-paused/front.js
@ -0,0 +1,12 @@
+// Define global chrome object to be compliant with the extension code
+global.chrome = {
+	runtime: {
+		getManifest: () => ({
+			version: 1
+		})
+	}
+};
+
+module.exports = () => {
+	require("YoutubeNonStop/autoconfirm.js");
+};
--- a/plugins/navigation/back.js
+++ b/plugins/navigation/back.js
@ -1,7 +1,10 @@
-const { listenAction } = require("../utils");
-const { ACTIONS, CHANNEL } = require("./actions.js");
+const path = require("path");
+
+const { injectCSS, listenAction } = require("../utils");
+const { ACTIONS, CHANNEL }        = require("./actions.js");

 function handle(win) {
+	injectCSS(win.webContents, path.join(__dirname, "style.css"));
 	listenAction(CHANNEL, (event, action) => {
 		switch (action) {
 			case ACTIONS.NEXT: 
--- a/plugins/navigation/front.js
+++ b/plugins/navigation/front.js
@ -1,14 +1,15 @@
-const { ElementFromFile, templatePath } = require('../utils');
+const { ElementFromFile, templatePath } = require("../utils");

 function run() {
-    const forwardButton = ElementFromFile(templatePath(__dirname, 'forward.html'));
-    const backButton = ElementFromFile(templatePath(__dirname, 'back.html'));
-    const menu = document.querySelector("ytmusic-pivot-bar-renderer");
+	const forwardButton = ElementFromFile(
+		templatePath(__dirname, "forward.html")
+	);
+	const backButton = ElementFromFile(templatePath(__dirname, "back.html"));
+	const menu       = document.querySelector("ytmusic-pivot-bar-renderer");

-    if (menu) {
-        menu.prepend(forwardButton);
-        menu.prepend(backButton);
-    }
+	if (menu) {
+		menu.prepend(backButton, forwardButton);
+	}
 }

 module.exports = run;
--- a/plugins/navigation/style.css
+++ b/plugins/navigation/style.css
@ -0,0 +1,36 @@
+.navigation-item {
+	font-family                : Roboto, Noto Naskh Arabic UI, Arial, sans-serif;
+	font-size                  : 20px;
+	line-height                : var(--ytmusic-title-1_-_line-height);
+	font-weight                : 500;
+	color                      : #fff;
+	--yt-endpoint-color        : #fff;
+	--yt-endpoint-hover-color  : #fff;
+	--yt-endpoint-visited-color: #fff;
+	display                    : inline-flex;
+	align-items                : center;
+	color                      : rgba(255, 255, 255, 0.5);
+	cursor                     : pointer;
+	margin                     : 0 var(--ytmusic-pivot-bar-tab-margin);
+}
+
+.navigation-item:hover {
+	color: #fff;
+}
+
+.navigation-icon {
+	display                : inline-flex;
+	-ms-flex-align         : center;
+	-webkit-align-items    : center;
+	align-items            : center;
+	-ms-flex-pack          : center;
+	-webkit-justify-content: center;
+	justify-content        : center;
+	position               : relative;
+	vertical-align         : middle;
+	fill                   : var(--iron-icon-fill-color, currentcolor);
+	stroke                 : none;
+	width                  : var(--iron-icon-width, 24px);
+	height                 : var(--iron-icon-height, 24px);
+	animation              : var(--iron-icon_-_animation);
+}
--- a/plugins/navigation/templates/back.html
+++ b/plugins/navigation/templates/back.html
@ -1,21 +1,51 @@
-<ytmusic-pivot-bar-item-renderer class="style-scope ytmusic-pivot-bar-renderer" tab-id="FEmusic_back" role="tab" onclick="goToPreviousPage()">
-    <yt-icon class="tab-icon style-scope ytmusic-pivot-bar-item-renderer">
-        <svg viewBox="0 0 24 24" preserveAspectRatio="xMidYMid meet" focusable="false" class="style-scope yt-icon" style="pointer-events: none; display: block; width: 100%; height: 100%;">
-            <g class="style-scope yt-icon">
-                <path class="st0" d="M109.3 265.2l218.9 218.9c5.1 5.1 11.8 7.9 19 7.9s14-2.8 19-7.9l16.1-16.1c10.5-10.5 10.5-27.6 0-38.1L198.6 246.1 382.7 62c5.1-5.1 7.9-11.8 7.9-19 0-7.2-2.8-14-7.9-19L366.5 7.9c-5.1-5.1-11.8-7.9-19-7.9-7.2 0-14 2.8-19 7.9L109.3 227c-5.1 5.1-7.9 11.9-7.8 19.1 0 7.2 2.8 14 7.8 19.1z" class="style-scope yt-icon">
-                </path>
-            </g>
-        </svg>
-    </yt-icon>
+<div
+	class="style-scope ytmusic-pivot-bar-renderer navigation-item"
+	tab-id="FEmusic_back"
+	role="tab"
+	onclick="goToPreviousPage()"
+>
+	<div
+		class="tab-icon style-scope ytmusic-pivot-bar-item-renderer yt-icon-container"
+	>
+		<svg
+			viewBox="0 0 24 24"
+			preserveAspectRatio="xMidYMid meet"
+			focusable="false"
+			class="style-scope yt-icon"
+			style="pointer-events: none; display: block; width: 100%; height: 100%;"
+		>
+			<g class="style-scope yt-icon">
+				<path
+					class="st0"
+					d="M109.3 265.2l218.9 218.9c5.1 5.1 11.8 7.9 19 7.9s14-2.8 19-7.9l16.1-16.1c10.5-10.5 10.5-27.6 0-38.1L198.6 246.1 382.7 62c5.1-5.1 7.9-11.8 7.9-19 0-7.2-2.8-14-7.9-19L366.5 7.9c-5.1-5.1-11.8-7.9-19-7.9-7.2 0-14 2.8-19 7.9L109.3 227c-5.1 5.1-7.9 11.9-7.8 19.1 0 7.2 2.8 14 7.8 19.1z"
+					class="style-scope yt-icon"
+				></path>
+			</g>
+		</svg>
+	</div>

-    <paper-icon-button class="search-icon style-scope ytmusic-search-box" role="button" tabindex="0" aria-disabled="false" title="Go to previous page">
-        <iron-icon id="icon" class="style-scope paper-icon-button">
-            <svg viewBox="0 0 492 492"  preserveAspectRatio="xMidYMid meet" focusable="false" class="style-scope iron-icon" style="pointer-events: none; display: block; width: 100%; height: 100%;">
-                <g class="style-scope iron-icon">
-                    <path class="st0" d="M109.3 265.2l218.9 218.9c5.1 5.1 11.8 7.9 19 7.9s14-2.8 19-7.9l16.1-16.1c10.5-10.5 10.5-27.6 0-38.1L198.6 246.1 382.7 62c5.1-5.1 7.9-11.8 7.9-19 0-7.2-2.8-14-7.9-19L366.5 7.9c-5.1-5.1-11.8-7.9-19-7.9-7.2 0-14 2.8-19 7.9L109.3 227c-5.1 5.1-7.9 11.9-7.8 19.1 0 7.2 2.8 14 7.8 19.1z">
-                    </path>
-                </g>
-            </svg>
-        </iron-icon>
-    </paper-icon-button>
-</ytmusic-pivot-bar-item-renderer>
+	<div
+		class="search-icon style-scope ytmusic-search-box"
+		role="button"
+		tabindex="0"
+		aria-disabled="false"
+		title="Go to previous page"
+	>
+		<div id="icon" class="style-scope paper-icon-button navigation-icon">
+			<svg
+				viewBox="0 0 492 492"
+				preserveAspectRatio="xMidYMid meet"
+				focusable="false"
+				class="style-scope iron-icon"
+				style="pointer-events: none; display: block; width: 100%; height: 100%;"
+			>
+				<g class="style-scope iron-icon">
+					<path
+						class="st0"
+						d="M109.3 265.2l218.9 218.9c5.1 5.1 11.8 7.9 19 7.9s14-2.8 19-7.9l16.1-16.1c10.5-10.5 10.5-27.6 0-38.1L198.6 246.1 382.7 62c5.1-5.1 7.9-11.8 7.9-19 0-7.2-2.8-14-7.9-19L366.5 7.9c-5.1-5.1-11.8-7.9-19-7.9-7.2 0-14 2.8-19 7.9L109.3 227c-5.1 5.1-7.9 11.9-7.8 19.1 0 7.2 2.8 14 7.8 19.1z"
+					></path>
+				</g>
+			</svg>
+		</div>
+	</div>
+</div>
--- a/plugins/navigation/templates/forward.html
+++ b/plugins/navigation/templates/forward.html
@ -1,26 +1,53 @@
-<ytmusic-pivot-bar-item-renderer class="style-scope ytmusic-pivot-bar-renderer" tab-id="FEmusic_next" role="tab" onclick="goToNextPage()">
-    <yt-icon class="tab-icon style-scope ytmusic-pivot-bar-item-renderer">
-        <svg viewBox="0 0 24 24" preserveAspectRatio="xMidYMid meet" focusable="false" class="style-scope yt-icon" style="pointer-events: none; display: block; width: 100%; height: 100%;">
-            <g class="style-scope yt-icon">
-                <path d="M382.678,226.804L163.73,7.86C158.666,2.792,151.906,0,144.698,0s-13.968,2.792-19.032,7.86l-16.124,16.12
+<div
+	class="style-scope ytmusic-pivot-bar-renderer navigation-item"
+	tab-id="FEmusic_next"
+	role="tab"
+	onclick="goToNextPage()"
+>
+	<div class="tab-icon style-scope ytmusic-pivot-bar-item-renderer">
+		<svg
+			viewBox="0 0 24 24"
+			preserveAspectRatio="xMidYMid meet"
+			focusable="false"
+			class="style-scope yt-icon"
+			style="pointer-events: none; display: block; width: 100%; height: 100%;"
+		>
+			<g class="style-scope yt-icon">
+				<path
+					d="M382.678,226.804L163.73,7.86C158.666,2.792,151.906,0,144.698,0s-13.968,2.792-19.032,7.86l-16.124,16.12
                c-10.492,10.504-10.492,27.576,0,38.064L293.398,245.9l-184.06,184.06c-5.064,5.068-7.86,11.824-7.86,19.028
                c0,7.212,2.796,13.968,7.86,19.04l16.124,16.116c5.068,5.068,11.824,7.86,19.032,7.86s13.968-2.792,19.032-7.86L382.678,265
-                c5.076-5.084,7.864-11.872,7.848-19.088C390.542,238.668,387.754,231.884,382.678,226.804z" class="style-scope yt-icon">
-                </path>
-            </g>
-        </svg>
-    </yt-icon>
+                c5.076-5.084,7.864-11.872,7.848-19.088C390.542,238.668,387.754,231.884,382.678,226.804z"
+					class="style-scope yt-icon"
+				></path>
+			</g>
+		</svg>
+	</div>

-    <paper-icon-button class="search-icon style-scope ytmusic-search-box" role="button" tabindex="0" aria-disabled="false" title="Go to next page">
-        <iron-icon id="icon" class="style-scope paper-icon-button">
-            <svg viewBox="0 0 492 492"  preserveAspectRatio="xMidYMid meet" focusable="false" class="style-scope iron-icon" style="pointer-events: none; display: block; width: 100%; height: 100%;">
-                <g class="style-scope iron-icon">
-                    <path class="st0" d="M382.7,226.8L163.7,7.9c-5.1-5.1-11.8-7.9-19-7.9s-14,2.8-19,7.9L109.5,24c-10.5,10.5-10.5,27.6,0,38.1
+	<div
+		class="search-icon style-scope ytmusic-search-box"
+		role="button"
+		tabindex="0"
+		aria-disabled="false"
+		title="Go to next page"
+	>
+		<div id="icon" class="style-scope paper-icon-button navigation-icon">
+			<svg
+				viewBox="0 0 492 492"
+				preserveAspectRatio="xMidYMid meet"
+				focusable="false"
+				class="style-scope iron-icon"
+				style="pointer-events: none; display: block; width: 100%; height: 100%;"
+			>
+				<g class="style-scope iron-icon">
+					<path
+						class="st0"
+						d="M382.7,226.8L163.7,7.9c-5.1-5.1-11.8-7.9-19-7.9s-14,2.8-19,7.9L109.5,24c-10.5,10.5-10.5,27.6,0,38.1
                    l183.9,183.9L109.3,430c-5.1,5.1-7.9,11.8-7.9,19c0,7.2,2.8,14,7.9,19l16.1,16.1c5.1,5.1,11.8,7.9,19,7.9s14-2.8,19-7.9L382.7,265
-                    c5.1-5.1,7.9-11.9,7.8-19.1C390.5,238.7,387.8,231.9,382.7,226.8z">
-                    </path>
-                </g>
-            </svg>
-        </iron-icon>
-    </paper-icon-button>
-</ytmusic-pivot-bar-item-renderer>
+                    c5.1-5.1,7.9-11.9,7.8-19.1C390.5,238.7,387.8,231.9,382.7,226.8z"
+					></path>
+				</g>
+			</svg>
+		</div>
+	</div>
+</div>
--- a/preload.js
+++ b/preload.js
@ -1,7 +1,9 @@
 const path = require("path");

-const { getEnabledPlugins } = require("./store");
-const { fileExists }        = require("./plugins/utils");
+const { getCurrentWindow } = require("electron").remote;
+
+const { getEnabledPlugins, store } = require("./store");
+const { fileExists }               = require("./plugins/utils");

 const plugins = getEnabledPlugins();

@ -23,4 +25,8 @@ document.addEventListener("DOMContentLoaded", () => {
 			run();
 		});
 	});
+
+	// Add action for reloading
+	global.reload = () =>
+		getCurrentWindow().webContents.loadURL(store.get("url"));
 });
--- a/readme.md
+++ b/readme.md
@ -1,7 +1,11 @@
 # YouTube Music
+
 [![GitHub release](https://img.shields.io/github/release/th-ch/youtube-music.svg)](https://GitHub.com/th-ch/youtube-music/releases/)
 [![GitHub license](https://img.shields.io/github/license/th-ch/youtube-music.svg)](https://github.com/th-ch/youtube-music/blob/master/LICENSE)
 [![XO code style](https://img.shields.io/badge/code_style-XO-5ed9c7.svg)](https://github.com/sindresorhus/xo)
+[![Build status](https://ci.appveyor.com/api/projects/status/tgre12r150ynvwl2?svg=true)](https://ci.appveyor.com/project/th-ch/youtube-music)
+[![Build Status](https://travis-ci.org/th-ch/youtube-music.svg?branch=master)](https://travis-ci.org/th-ch/youtube-music)
+[![Known Vulnerabilities](https://snyk.io/test/github/th-ch/youtube-music/badge.svg)](https://snyk.io/test/github/th-ch/youtube-music)

 ![Screenshot](screenshot.jpg "Screenshot")

@ -13,11 +17,6 @@
 ## Download

 You can check out the [latest release](https://github.com/th-ch/youtube-music/releases/latest) to quickly find the latest version.
-Here are the links to the current version:
-
- [Mac](https://github.com/th-ch/youtube-music/releases/download/v1.0.0/youtube-music-1.0.0.dmg)
- [Windows](https://github.com/th-ch/youtube-music/releases/download/v1.0.0/youtube-music-setup-1.0.0.exe)
- [Linux](https://github.com/th-ch/youtube-music/releases/download/v1.0.0/youtube-music-1.0.0-x86_64.AppImage)

 ## Available plugins:

@ -25,14 +24,15 @@ Here are the links to the current version:
 - **No Google Login**: remove Google login buttons and links from the interface
 - **Shortcuts**: use your usual shortcuts (media keys, Ctrl/CMD + F…) to control YouTube Music
 - **Navigation**: next/back navigation arrows directly integrated in the interface, like in your favorite browser
+- **Auto confirm when paused**: when the "Continue Watching?" modal appears, automatically click "Yes"

 ## Dev

-```
+```sh
 git clone https://github.com/th-ch/youtube-music
 cd youtube-music
-npm install
-npm start
+yarn
+yarn start
 ```

 ## Build your own plugins
@ -48,7 +48,7 @@ Create a folder in `plugins/YOUR-PLUGIN-NAME`:

 - if you need to manipulate the BrowserWindow, create a file `back.js` with the following template:

-```
+```node
 module.exports = win => {
 	// win is the BrowserWindow object
 };
@ -56,7 +56,7 @@ module.exports = win => {

 - if you need to change the front, create a file `front.js` with the following template:

-```
+```node
 module.exports = () => {
 	// This function will be called as a preload script
 	// So you can use front features like `document.querySelector`
@ -67,7 +67,10 @@ module.exports = () => {

 - injecting custom CSS: create a `style.css` file in the same folder then:

-```
+```node
+const path = require("path");
+const { injectCSS } = require("../utils");
+
 // back.js
 module.exports = win => {
 	injectCSS(win.webContents, path.join(__dirname, "style.css"));
@ -76,11 +79,11 @@ module.exports = win => {

 - changing the HTML:

-```
+```node
 // front.js
 module.exports = () => {
 	// Remove the login button
-	document.querySelector('.sign-in-link.ytmusic-nav-bar').remove();
+	document.querySelector(".sign-in-link.ytmusic-nav-bar").remove();
 };
 ```

@ -88,7 +91,7 @@ module.exports = () => {

 ## Build

-```
+```sh
 npm run build
 ```

--- a/store/index.js
+++ b/store/index.js
@ -8,7 +8,7 @@ const store = new Store({
 			height: 550
 		},
 		url    : "https://music.youtube.com",
-		plugins: ["navigation", "shortcuts", "adblocker", "no-google-login"]
+		plugins: ["navigation", "shortcuts", "adblocker"]
 	}
 });

@ -16,6 +16,6 @@ module.exports = {
 	store            : store,
 	isPluginEnabled  : plugin => plugins.isEnabled(store, plugin),
 	getEnabledPlugins: () => plugins.getEnabledPlugins(store),
-	enableplugin     : plugin => plugins.enablePlugin(store, plugin),
+	enablePlugin     : plugin => plugins.enablePlugin(store, plugin),
 	disablePlugin    : plugin => plugins.disablePlugin(store, plugin)
 };
--- a/store/plugins.js
+++ b/store/plugins.js
@ -26,6 +26,6 @@ function disablePlugin(store, plugin) {
 module.exports = {
 	isEnabled        : isEnabled,
 	getEnabledPlugins: getEnabledPlugins,
-	enableplugin     : enablePlugin,
-	disableplugin    : disablePlugin
+	enablePlugin     : enablePlugin,
+	disablePlugin    : disablePlugin
 };
--- a/utils/generate-package-json.js
+++ b/utils/generate-package-json.js
@ -0,0 +1,34 @@
+#!/usr/bin/env node
+
+const { existsSync, writeFile } = require("fs");
+const { join } = require("path");
+const { promisify } = require("util");
+
+/**
+ * Generates a fake package.json for given packages that don't have any.
+ * Allows electron-builder to resolve them
+ */
+
+const generatePackageJson = async packageName => {
+	var filepath = join("node_modules", packageName, "package.json");
+	if (!existsSync(filepath)) {
+		console.log(
+			`No package.json found for ${packageName} module, generating one…`
+		);
+		pkg = {
+			name: packageName,
+			version: "0.0.0",
+			description: "-",
+			repository: { type: "git", url: "-" },
+			readme: "-"
+		};
+		const writeFileAsync = promisify(writeFile);
+		await writeFileAsync(filepath, JSON.stringify(pkg, null, 2));
+	}
+};
+
+if (require.main === module) {
+	process.argv.slice(2).forEach(async packageName => {
+		await generatePackageJson(packageName);
+	});
+}
--- a/yarn.lock
+++ b/yarn.lock
--- a/youtube-music.css
+++ b/youtube-music.css
@ -23,3 +23,8 @@ ytmusic-app-layout {
 ytmusic-search-box.ytmusic-nav-bar {
 	margin-top: 12px;
 }
+
+/* Blocking annoying elements */
+ytmusic-mealbar-promo-renderer {
+	display: none !important;
+}
Author	SHA1	Message	Date
th-ch	a3d5c038ea	Merge pull request #13 from th-ch/snyk-upgrade-5770951f6ab79d4e413754bb7cab1225 [Snyk] Upgrade electron-localshortcut from 3.1.0 to 3.2.1	2020-03-15 12:38:57 +01:00
TC	91f7a0d1a5	Upgrade electron-localshortcut from 3.1.0 to 3.2.1	2020-03-15 12:22:41 +01:00
th-ch	d5a6e50017	Merge pull request #12 from th-ch/snyk-upgrade-ab1b7600d9bb3bfaa5180a93741f304a [Snyk] Upgrade electron-updater from 4.0.6 to 4.2.2	2020-03-15 12:21:17 +01:00
TC	6d8204f60a	Bump appveyor to node 10 (semver requires node >=10)	2020-03-15 12:02:44 +01:00
TC	f25bb59065	Bump electron updater	2020-03-15 12:02:12 +01:00
th-ch	39c7d56791	Merge pull request #15 from th-ch/snyk-upgrade-d9ce5c80db3f2ceedbda9bf03d7e2e8e [Snyk] Upgrade electron-debug from 2.1.0 to 2.2.0	2020-03-15 11:56:01 +01:00
th-ch	1a0369b69d	Merge pull request #16 from th-ch/fix-vulnerability Fix vulnerability	2020-03-15 11:55:19 +01:00
snyk-bot	e5b4e01a96	fix: upgrade electron-debug from 2.1.0 to 2.2.0 Snyk has created this PR to upgrade electron-debug from 2.1.0 to 2.2.0. See this package in NPM: https://www.npmjs.com/package/electron-debug See this project in Snyk: https://app.snyk.io/org/th-ch/project/81809c53-bb7b-46b9-a0d7-806d45d74ac6?utm_source=github&utm_medium=upgrade-pr	2020-03-15 02:28:47 +00:00
TC	0a6587942b	Add snyk badge to readme	2020-03-15 00:15:28 +01:00
TC	7050dfca5c	Bump electron-store to fix a vulnerability	2020-03-15 00:03:58 +01:00
th-ch	4a7a94240a	Merge pull request #11 from th-ch/autoconfirm-when-paused Plugin: autoconfirm when paused	2020-03-14 23:43:22 +01:00
TC	479013f9c9	Generate fake package.json for electron-builder to resolve modules	2020-03-14 23:11:11 +01:00
TC	164c3141ca	Bump version to 1.2.0	2020-03-14 18:14:54 +01:00
TC	234954a86c	Travis: fix MacOS build	2020-03-14 18:03:26 +01:00
TC	8c19757dfc	Readme: build with npm	2020-03-14 16:46:43 +01:00
TC	790185893d	Build/release with npm on travis	2020-03-14 16:31:07 +01:00
TC	7a816fa4f3	Use node 10 in linux container	2020-03-14 15:22:45 +01:00
TC	d4b5c53dc3	Add env var to allow unresolved deps	2020-03-14 14:51:19 +01:00
TC	e1b83f07a8	Block promo element	2020-03-14 09:32:48 +01:00
TC	b855726973	New plugin: autoconfirm when paused	2020-03-14 09:32:37 +01:00
TC	9371a4827e	Migrate to yarn to install packages without package.json (but keep npm rebuild)	2020-03-14 09:32:14 +01:00
TC	81ce939451	Lint readme	2020-03-13 22:17:54 +01:00
TC	6fd10ea4a0	Bump version to 1.1.6	2019-09-11 23:49:31 +02:00
TC	746b5f13bb	Fix Google login	2019-09-11 23:46:19 +02:00
th-ch	474bfd19a2	Merge pull request #7 from th-ch/dependabot/npm_and_yarn/eslint-utils-1.4.2 Bump eslint-utils from 1.3.1 to 1.4.2	2019-09-03 13:41:20 +02:00
dependabot[bot]	71222649a0	Bump eslint-utils from 1.3.1 to 1.4.2 Bumps [eslint-utils](https://github.com/mysticatea/eslint-utils) from 1.3.1 to 1.4.2. - [Release notes](https://github.com/mysticatea/eslint-utils/releases) - [Commits](https://github.com/mysticatea/eslint-utils/compare/v1.3.1...v1.4.2) Signed-off-by: dependabot[bot] <support@github.com>	2019-08-26 22:51:08 +00:00
TC	1a72129108	npm audit fix	2019-07-13 19:51:01 +02:00
th-ch	3108e16018	Merge pull request #4 from th-ch/dependabot/npm_and_yarn/lodash.mergewith-4.6.2 Bump lodash.mergewith from 4.6.1 to 4.6.2	2019-07-13 19:47:14 +02:00
th-ch	fae19f4533	Merge pull request #5 from th-ch/dependabot/npm_and_yarn/lodash-4.17.14 Bump lodash from 4.17.11 to 4.17.14	2019-07-13 19:47:01 +02:00
dependabot[bot]	348f1b8189	Bump lodash from 4.17.11 to 4.17.14 Bumps [lodash](https://github.com/lodash/lodash) from 4.17.11 to 4.17.14. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.11...4.17.14) Signed-off-by: dependabot[bot] <support@github.com>	2019-07-13 05:20:15 +00:00
dependabot[bot]	ffdc7f66b9	Bump lodash.mergewith from 4.6.1 to 4.6.2 Bumps [lodash.mergewith](https://github.com/lodash/lodash) from 4.6.1 to 4.6.2. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/commits) Signed-off-by: dependabot[bot] <support@github.com>	2019-07-11 10:21:14 +00:00
TC	07c4a429c1	Bump version to 1.1.5	2019-07-06 20:04:53 +02:00
TC	b10a1bb32d	Fix navigation plugin	2019-07-06 20:03:29 +02:00
TC	0420f2e49e	Bump version to 1.1.4	2019-06-08 13:59:37 +02:00
TC	9714994501	Remove no-google-login from default plugins	2019-06-08 13:26:44 +02:00
TC	b1c4cc9c45	Add titlebar/frame only on MacOS	2019-06-08 13:26:16 +02:00
TC	a85325f33d	isDev -> is package	2019-06-08 13:25:30 +02:00
TC	147ac48de6	Version 1.1.3 + npm audit fix	2019-06-02 16:08:57 +02:00
TC	e86d63da8c	Fix case for {en/dis}ablePlugin	2019-06-02 16:06:13 +02:00
th-ch	09a39daeda	Merge pull request #3 from th-ch/dependabot/npm_and_yarn/fstream-1.0.12 Bump fstream from 1.0.11 to 1.0.12	2019-06-01 16:57:54 +02:00
dependabot[bot]	d9247dad33	Bump fstream from 1.0.11 to 1.0.12 Bumps [fstream](https://github.com/npm/fstream) from 1.0.11 to 1.0.12. - [Release notes](https://github.com/npm/fstream/releases) - [Commits](https://github.com/npm/fstream/compare/v1.0.11...v1.0.12)	2019-05-31 19:22:51 +00:00
th-ch	ec58b5cbed	Remove outdated download links	2019-05-13 11:51:10 +02:00
TC	eac2c5cf14	Bump version to 1.1.2	2019-05-01 19:31:47 +02:00
TC	5a1d7fbf23	Display error/retry in case of failure	2019-05-01 19:31:35 +02:00
th-ch	15275236b0	Add build badges to readme	2019-04-28 17:19:15 +02:00
TC	639ae28122	Update linux category	2019-04-28 17:03:36 +02:00
TC	d3453a600b	Install deps in docker	2019-04-28 16:36:56 +02:00
TC	caf76e7588	Fix env in travis config	2019-04-28 16:28:02 +02:00
TC	2d3f77d962	Update package lock	2019-04-28 16:27:42 +02:00
TC	5279a45f35	Add travis config	2019-04-28 16:18:40 +02:00
TC	e52e522d22	Release on appveyor	2019-04-28 16:02:46 +02:00
TC	aa3e4b32eb	Bump version	2019-04-28 15:55:58 +02:00
TC	eb63917b5d	Revert "publish=never for win build" This reverts commit `6e037483c7`.	2019-04-28 15:47:31 +02:00
TC	6e037483c7	publish=never for win build	2019-04-28 13:09:20 +02:00
TC	941477bb0c	Build only for Windows on Appveyor	2019-04-28 12:37:44 +02:00
TC	abc2bb8a4f	Add Appveyor config	2019-04-28 12:31:55 +02:00
th-ch	253e82a2d7	Improve readme snippets	2019-04-26 15:23:54 +02:00