From b518866d24b17f4ef78cff66918ba35af53ff806 Mon Sep 17 00:00:00 2001 From: TC Date: Sun, 15 Jan 2023 21:12:12 +0100 Subject: [PATCH] Fix bypass-age-restriction lib import --- package.json | 3 ++- plugins/bypass-age-restrictions/front.js | 2 +- utils/generate-package-json.js | 10 +++++++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index fac1302e2c..b93cd5cf8e 100644 --- a/package.json +++ b/package.json @@ -82,8 +82,9 @@ "build:win": "yarn run clean && electron-builder --win", "lint": "xo", "changelog": "auto-changelog", - "plugins": "yarn run plugin:adblocker", + "plugins": "yarn run plugin:adblocker && yarn run plugin:bypass-age-restrictions", "plugin:adblocker": "rimraf plugins/adblocker/ad-blocker-engine.bin && node plugins/adblocker/blocker.js", + "plugin:bypass-age-restrictions": "yarn run generate:package Simple-YouTube-Age-Restriction-Bypass", "release:linux": "yarn run clean && electron-builder --linux -p always -c.snap.publish=github", "release:mac": "yarn run clean && electron-builder --mac -p always", "release:win": "yarn run clean && electron-builder --win -p always" diff --git a/plugins/bypass-age-restrictions/front.js b/plugins/bypass-age-restrictions/front.js index 381fa65689..a74f441347 100644 --- a/plugins/bypass-age-restrictions/front.js +++ b/plugins/bypass-age-restrictions/front.js @@ -1,4 +1,4 @@ module.exports = () => { // See https://github.com/zerodytrash/Simple-YouTube-Age-Restriction-Bypass#userscript - require("simple-youtube-age-restriction-bypass/Simple-YouTube-Age-Restriction-Bypass.user.js"); + require("Simple-YouTube-Age-Restriction-Bypass/Simple-YouTube-Age-Restriction-Bypass.user.js"); }; diff --git a/utils/generate-package-json.js b/utils/generate-package-json.js index 56566528ca..bcda791fd6 100755 --- a/utils/generate-package-json.js +++ b/utils/generate-package-json.js @@ -10,7 +10,15 @@ const { promisify } = require("util"); */ const generatePackageJson = async packageName => { - var filepath = join("node_modules", packageName, "package.json"); + const packageFolder = join("node_modules", packageName) + if (!existsSync(packageFolder )) { + console.log( + `${packageName} module not found, exiting…` + ); + return + } + + const filepath = join(packageFolder, "package.json"); if (!existsSync(filepath)) { console.log( `No package.json found for ${packageName} module, generating one…`