+
Screenshots • How does it work? • Features • Download Links • Contributing • Localization • Contact • Donate • License
+Website • Blog • Documentation • FAQ • Discussions
+
## How does it work?
FreeTube uses a built in extractor to grab and serve data / videos. The [Invidious API](https://github.com/iv-org/invidious) can also optionally be used. FreeTube does not use any official APIs to obtain data. While YouTube can still see your video requests, it can no
longer track you using cookies or JavaScript. Your subscriptions and history are stored locally on your computer and never sent out. Using a VPN or Tor is highly recommended
to hide your IP while using FreeTube.
-Go to [FreeTube's Documentation](https://docs.freetubeapp.io/) if you'd like to know more about how to operate FreeTube and its features.
-
-## Screenshots
-
-
## Features
* Watch videos without ads
* Use YouTube without Google tracking you using cookies and JavaScript
* Two extractor APIs to choose from (Built in or Invidious)
* Subscribe to channels without an account
-* Local subscriptions, history, and saved videos
+* Connect to an externally setup proxy such as Tor
+* View and search your local subscriptions, history, and saved videos
* Organize your subscriptions into "Profiles" to create a more focused feed
* Export & import subscriptions
+* Youtube Trending
+* Youtube Chapters
+* Most popular videos page based on the set Invidious instance
+* SponsorBlock
* Open videos from your browser directly into FreeTube (with extension)
-* Mini Player
+* Watch videos using an external player
* Full Theme support
+* Make a screenshot of a video
+* Multiple windows
+* Mini Player (Picture-in-Picture)
+* Keyboard shortcuts
+* Option to show only family friendly content
+* Show/hide functionality or elements within the app using the distraction free settings
+
+### Browser Extension
+FreeTube is supported by the [Privacy Redirect](https://github.com/SimonBrazell/privacy-redirect) and [LibRedirect](https://github.com/libredirect/libredirect) extensions, which will allow you to open YouTube links into FreeTube. You must enable the option within the advanced settings of the extension for it to work.
+
+* Download Privacy Redirect for [Firefox](https://addons.mozilla.org/en-US/firefox/addon/privacy-redirect/) or [Google Chrome](https://chrome.google.com/webstore/detail/privacy-redirect/pmcmeagblkinmogikoikkdjiligflglb).
+
+* Download LibRedirect for [Firefox](https://addons.mozilla.org/firefox/addon/libredirect/) or [Google Chrome](https://github.com/libredirect/libredirect/blob/master/chromium.md).
+
+If you have issues with the extension working with FreeTube, please create an issue in this repository instead of the extension repository. This extension does not work on Linux portable builds!
## Download Links
-
### Official Downloads
+* [GitHub Releases](https://github.com/FreeTubeApp/FreeTube/releases)
-[GitHub Releases](https://github.com/FreeTubeApp/FreeTube/releases)
+* [FreeTube Website](https://freetubeapp.io/#download)
-[FreeTube Website](https://freetubeapp.io/#download)
-
-Flatpak on Flathub: [Download](https://flathub.org/apps/details/io.freetubeapp.FreeTube) [Source](https://github.com/flathub/io.freetubeapp.FreeTube)
-
-### Unofficial Downloads
-
-These builds are maintained by the community. While they should be safe, download at your own risk. There may be issues with using these versus the official builds. Any issues specific with these builds should be sent to their respective maintainer.
-
-Arch User Repository (AUR): [Download](https://aur.archlinux.org/packages/freetube-bin/)
-
-Chocolatey: [Download](https://chocolatey.org/packages/freetube/)
-
-PortableApps (Windows Only): [Download](https://github.com/rddim/FreeTubePortable/releases) [Source](https://github.com/rddim/FreeTubePortable)
-
-Windows Package Manager (winget): [Usage](https://docs.microsoft.com/en-us/windows/package-manager/winget/)
-
-### Automated Builds (Nightly / Weekly)
+* Flatpak on Flathub: [Download](https://flathub.org/apps/details/io.freetubeapp.FreeTube) [Source](https://github.com/flathub/io.freetubeapp.FreeTube)
+#### Automated Builds (Nightly / Weekly)
Builds are automatically created from changes to our development branch via [GitHub Actions](https://github.com/FreeTubeApp/FreeTube/actions?query=workflow%3ABuild).
The first build with a green check mark is the latest build. You will need to have a GitHub account to download these builds.
-## Contributing
-If you have an idea or if you found a bug, please submit a GitHub issue so that
-we can track it. Please search the existing issues before submitting to
-prevent duplicates.
+### Unofficial Downloads
+These builds are maintained by the community. While they should be safe, download at your own risk. There may be issues with using these versus the official builds. Any issues specific with these builds should be sent to their respective maintainer.
+* Arch User Repository (AUR): [Download](https://aur.archlinux.org/packages/freetube-bin/)
+
+* Chocolatey: [Download](https://chocolatey.org/packages/freetube/)
+
+* makedeb Package Repository (MPR): [Download](https://mpr.makedeb.org/packages/freetube-bin)
+
+* PortableApps (Windows Only): [Download](https://github.com/rddim/FreeTubePortable/releases) [Source](https://github.com/rddim/FreeTubePortable)
+
+* Scoop (Windows Only): [Usage](https://github.com/ScoopInstaller/Scoop)
+
+* Windows Package Manager (winget): [Usage](https://docs.microsoft.com/en-us/windows/package-manager/winget/)
+
+## Contributing
If you like to get your hands dirty and want to contribute, we would love to
have your help. Send a pull request and someone will review your code. Please
follow the [Contribution
@@ -89,7 +96,7 @@ Thank you very much to the [People and Projects](https://docs.freetubeapp.io/cre
## Localization
-
+
We are actively looking for translations! We use [Weblate](https://hosted.weblate.org/engage/free-tube/) to make it easy for translators to get involved. Click on the badge above to learn how to get involved.
@@ -97,20 +104,18 @@ We are actively looking for translations! We use [Weblate](https://hosted.webla
For the Linux Flatpak, the desktop entry comment string can be translated at our [Flatpak repository](https://github.com/flathub/io.freetubeapp.FreeTube/blob/master/io.freetubeapp.FreeTube.desktop).
## Contact
-
-If you ever have any questions, feel free to make an issue here on GitHub. Alternatively, you can email me at FreeTubeApp@protonmail.com or you can join our [Matrix Community](https://matrix.to/#/+freetube:matrix.org). Don't forget to check out the [rules](https://docs.freetubeapp.io/community/matrix/) before joining.
-
-You can also stay up to date by reading the [FreeTube Blog](https://write.as/freetube/). [View the welcome blog](https://write.as/freetube/welcome-to-freetube-blogs).
+If you ever have any questions, feel free to ask it on our [Discussions](https://github.com/FreeTubeApp/FreeTube/discussions) page. Alternatively, you can email us at FreeTubeApp@protonmail.com or you can join our [Matrix Community](https://matrix.to/#/+freetube:matrix.org). Don't forget to check out the [rules](https://docs.freetubeapp.io/community/matrix/) before joining.
## Donate
+If you enjoy using FreeTube, you're welcome to leave a donation using the following methods.
-[FreeTube on Liberapay](https://liberapay.com/FreeTube)
+* [FreeTube on Liberapay](https://liberapay.com/FreeTube)
-Bitcoin Address: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS
+* Bitcoin Address: `1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS`
-Monero Address: 48WyAPdjwc6VokeXACxSZCFeKEXBiYPV6GjfvBsfg4CrUJ95LLCQSfpM9pvNKy5GE5H4hNaw99P8RZyzmaU9kb1pD7kzhCB
+* Monero Address: `48WyAPdjwc6VokeXACxSZCFeKEXBiYPV6GjfvBsfg4CrUJ95LLCQSfpM9pvNKy5GE5H4hNaw99P8RZyzmaU9kb1pD7kzhCB`
-If you enjoy using FreeTube, you're welcome to leave a donation using the following methods. While your donations are much appreciated, only donate if you really want to. Donations are used for keeping the website up and running and eventual code signing costs.
+While your donations are much appreciated, only donate if you really want to. Donations are used for keeping the website up and running and eventual code signing costs.
## License
[](https://www.gnu.org/licenses/agpl-3.0.html)
diff --git a/_icons/.icon-set/iconColor_256.png b/_icons/.icon-set/iconColor_256.png
index 1ea2028e6..7818894de 100644
Binary files a/_icons/.icon-set/iconColor_256.png and b/_icons/.icon-set/iconColor_256.png differ
diff --git a/_icons/.icon-set/icon_128x128.png b/_icons/.icon-set/icon_128x128.png
index 324ca1520..ac8f23332 100644
Binary files a/_icons/.icon-set/icon_128x128.png and b/_icons/.icon-set/icon_128x128.png differ
diff --git a/_icons/.icon-set/icon_16x16.png b/_icons/.icon-set/icon_16x16.png
index 2faf48e60..9c6ea12d0 100644
Binary files a/_icons/.icon-set/icon_16x16.png and b/_icons/.icon-set/icon_16x16.png differ
diff --git a/_icons/.icon-set/icon_32x32.png b/_icons/.icon-set/icon_32x32.png
index 4240b9750..0cc282795 100644
Binary files a/_icons/.icon-set/icon_32x32.png and b/_icons/.icon-set/icon_32x32.png differ
diff --git a/_icons/.icon-set/icon_48x48.png b/_icons/.icon-set/icon_48x48.png
index 402e87156..08a7db092 100644
Binary files a/_icons/.icon-set/icon_48x48.png and b/_icons/.icon-set/icon_48x48.png differ
diff --git a/_icons/.icon-set/icon_64x64.png b/_icons/.icon-set/icon_64x64.png
index 80b3724d2..43b0e7699 100644
Binary files a/_icons/.icon-set/icon_64x64.png and b/_icons/.icon-set/icon_64x64.png differ
diff --git a/_icons/256x256.png b/_icons/256x256.png
index 5b40c707e..191266143 100644
Binary files a/_icons/256x256.png and b/_icons/256x256.png differ
diff --git a/_icons/iconBlackSmall.png b/_icons/iconBlackSmall.png
index ef5c46018..04528fd49 100644
Binary files a/_icons/iconBlackSmall.png and b/_icons/iconBlackSmall.png differ
diff --git a/_icons/iconCatppuccinMochaDarkSmall.png b/_icons/iconCatppuccinMochaDarkSmall.png
index bfc93ad56..c963e8a0e 100644
Binary files a/_icons/iconCatppuccinMochaDarkSmall.png and b/_icons/iconCatppuccinMochaDarkSmall.png differ
diff --git a/_icons/iconCatppuccinMochaLightSmall.png b/_icons/iconCatppuccinMochaLightSmall.png
index 021f62670..618b08e29 100644
Binary files a/_icons/iconCatppuccinMochaLightSmall.png and b/_icons/iconCatppuccinMochaLightSmall.png differ
diff --git a/_icons/iconColor.png b/_icons/iconColor.png
index 5b40c707e..191266143 100644
Binary files a/_icons/iconColor.png and b/_icons/iconColor.png differ
diff --git a/_icons/iconColorSmall.png b/_icons/iconColorSmall.png
index c9fb08621..fd0060151 100644
Binary files a/_icons/iconColorSmall.png and b/_icons/iconColorSmall.png differ
diff --git a/_icons/iconDraculaDarkSmall.png b/_icons/iconDraculaDarkSmall.png
index 3f2a93583..5b515c649 100644
Binary files a/_icons/iconDraculaDarkSmall.png and b/_icons/iconDraculaDarkSmall.png differ
diff --git a/_icons/iconDraculaLightSmall.png b/_icons/iconDraculaLightSmall.png
index 3f34041d5..e497925fb 100644
Binary files a/_icons/iconDraculaLightSmall.png and b/_icons/iconDraculaLightSmall.png differ
diff --git a/_icons/logoColor.png b/_icons/logoColor.png
index 4766f8cfa..9851c8f93 100644
Binary files a/_icons/logoColor.png and b/_icons/logoColor.png differ
diff --git a/_icons/textCatppuccinMochaDarkSmall.png b/_icons/textCatppuccinMochaDarkSmall.png
index e2fba035e..c5b70b215 100644
Binary files a/_icons/textCatppuccinMochaDarkSmall.png and b/_icons/textCatppuccinMochaDarkSmall.png differ
diff --git a/_icons/textCatppuccinMochaLightSmall.png b/_icons/textCatppuccinMochaLightSmall.png
index 70e969010..8a7bd5bc5 100644
Binary files a/_icons/textCatppuccinMochaLightSmall.png and b/_icons/textCatppuccinMochaLightSmall.png differ
diff --git a/_icons/textColor.png b/_icons/textColor.png
index 8552c1988..bdc83759e 100644
Binary files a/_icons/textColor.png and b/_icons/textColor.png differ
diff --git a/_icons/textColorSmall.png b/_icons/textColorSmall.png
index 705ab0e3e..7a2196aff 100644
Binary files a/_icons/textColorSmall.png and b/_icons/textColorSmall.png differ
diff --git a/_icons/textDraculaDarkSmall.png b/_icons/textDraculaDarkSmall.png
index 3ca93c5b7..ae2329595 100644
Binary files a/_icons/textDraculaDarkSmall.png and b/_icons/textDraculaDarkSmall.png differ
diff --git a/_icons/textDraculaLightSmall.png b/_icons/textDraculaLightSmall.png
index 0ba1a3d8d..219397d61 100644
Binary files a/_icons/textDraculaLightSmall.png and b/_icons/textDraculaLightSmall.png differ
diff --git a/_icons/textWhite.png b/_icons/textWhite.png
index 0ba1a3d8d..219397d61 100644
Binary files a/_icons/textWhite.png and b/_icons/textWhite.png differ
diff --git a/_scripts/ProcessLocalesPlugin.js b/_scripts/ProcessLocalesPlugin.js
new file mode 100644
index 000000000..4d471cd21
--- /dev/null
+++ b/_scripts/ProcessLocalesPlugin.js
@@ -0,0 +1,94 @@
+const { existsSync, readFileSync } = require('fs')
+const { brotliCompressSync, constants } = require('zlib')
+const { load: loadYaml } = require('js-yaml')
+
+class ProcessLocalesPlugin {
+ constructor(options = {}) {
+ this.compress = !!options.compress
+
+ if (typeof options.inputDir !== 'string') {
+ throw new Error('ProcessLocalesPlugin: no input directory `inputDir` specified.')
+ } else if (!existsSync(options.inputDir)) {
+ throw new Error('ProcessLocalesPlugin: the specified input directory does not exist.')
+ }
+ this.inputDir = options.inputDir
+
+ if (typeof options.outputDir !== 'string') {
+ throw new Error('ProcessLocalesPlugin: no output directory `outputDir` specified.')
+ }
+ this.outputDir = options.outputDir
+
+ this.localeNames = []
+
+ this.loadLocales()
+ }
+
+ apply(compiler) {
+ compiler.hooks.thisCompilation.tap('ProcessLocalesPlugin', (compilation) => {
+
+ const { RawSource } = compiler.webpack.sources;
+
+ compilation.hooks.processAssets.tapPromise({
+ name: 'process-locales-plugin',
+ stage: compiler.webpack.Compilation.PROCESS_ASSETS_STAGE_ADDITIONAL
+ },
+ async (_assets) => {
+ const promises = []
+
+ for (const { locale, data } of this.locales) {
+ promises.push(new Promise((resolve) => {
+ if (Object.prototype.hasOwnProperty.call(data, 'Locale Name')) {
+ delete data['Locale Name']
+ }
+
+ let filename = `${this.outputDir}/${locale}.json`
+ let output = JSON.stringify(data)
+
+ if (this.compress) {
+ filename += '.br'
+ output = this.compressLocale(output)
+ }
+
+ compilation.emitAsset(
+ filename,
+ new RawSource(output),
+ { minimized: true }
+ )
+
+ resolve()
+ }))
+ }
+
+ await Promise.all(promises)
+ })
+ })
+ }
+
+ loadLocales() {
+ this.locales = []
+
+ const activeLocales = JSON.parse(readFileSync(`${this.inputDir}/activeLocales.json`))
+
+ for (const locale of activeLocales) {
+ const contents = readFileSync(`${this.inputDir}/${locale}.yaml`, 'utf-8')
+ const data = loadYaml(contents)
+
+ this.localeNames.push(data['Locale Name'] ?? locale)
+ this.locales.push({ locale, data })
+ }
+ }
+
+ compressLocale(data) {
+ const buffer = Buffer.from(data, 'utf-8')
+
+ return brotliCompressSync(buffer, {
+ params: {
+ [constants.BROTLI_PARAM_MODE]: constants.BROTLI_MODE_TEXT,
+ [constants.BROTLI_PARAM_QUALITY]: constants.BROTLI_MAX_QUALITY,
+ [constants.BROTLI_PARAM_SIZE_HINT]: buffer.byteLength
+ }
+ })
+ }
+}
+
+module.exports = ProcessLocalesPlugin
diff --git a/_scripts/build.js b/_scripts/build.js
index 6b762cc76..fea20bf8c 100644
--- a/_scripts/build.js
+++ b/_scripts/build.js
@@ -8,20 +8,23 @@ const args = process.argv
let targets
const platform = os.platform()
-const cpus = os.cpus()
if (platform === 'darwin') {
let arch = Arch.x64
-// Macbook Air 2020 with M1 = 'Apple M1'
- // Macbook Pro 2021 with M1 Pro = 'Apple M1 Pro'
- if (cpus[0].model.startsWith('Apple')) {
+ if (args[2] === 'arm64') {
arch = Arch.arm64
}
- targets = Platform.MAC.createTarget(['dmg'], arch)
+ targets = Platform.MAC.createTarget(['DMG','zip', '7z'], arch)
} else if (platform === 'win32') {
- targets = Platform.WINDOWS.createTarget()
+ let arch = Arch.x64
+
+ if (args[2] === 'arm64') {
+ arch = Arch.arm64
+ }
+
+ targets = Platform.WINDOWS.createTarget(['nsis', 'zip', '7z', 'portable'], arch)
} else if (platform === 'linux') {
let arch = Arch.x64
@@ -33,7 +36,7 @@ if (platform === 'darwin') {
arch = Arch.armv7l
}
- targets = Platform.LINUX.createTarget(['deb', 'zip', 'apk', 'rpm', 'AppImage', 'pacman'], arch)
+ targets = Platform.LINUX.createTarget(['deb', 'zip', '7z', 'apk', 'rpm', 'AppImage', 'pacman'], arch)
}
const config = {
@@ -58,22 +61,14 @@ const config = {
'icon.svg',
'./dist/**/*',
'!dist/web/*',
- '!**/node_modules/**/.*',
- '!**/node_modules/**/index.html',
- '!**/{.github,Jenkinsfile}',
- '!**/{CHANGES.md,CODE_OF_CONDUCT.md,CONTRIBUTING.md,CONTRIBUTION.md,DEVELOPMENT.md,docs,docs.md,docs.mli,examples,History.md,HISTORY.md,README.md,TODO.md,UPGRADE_GUIDE.md,UPGRADING.md}',
- '!**/{commitlint.config.js,.editorconfig,.eslintignore,.eslintrc.{js,yml},.gitmodules,.huskyrc,.lintstagedrc,.nvmrc,.nycrc{,.json},.prettierrc{,.yaml},tslint.json}',
- '!**/{.babelrc,bower.json,Gruntfile.js,Makefile,.npmrc.proregistry,rollup.config.js,.tm_properties,.tool-versions,tsconfig.json,webpack.config.js}',
- '!**/*.{{,c,m}js,min,ts}.map',
- '!**/*.d.ts',
+ '!node_modules/**/*',
- // only exclude the src directory for specific packages
- // as some of them have their dist code in there and we don't want to exclude those
- '!**/node_modules/{@fortawesome/vue-fontawesome,agent-base,jquery,localforage,m3u8-parser,marked,mpd-parser,performance-now,video.js,vue,vue-i18n,vue-router}/src/*',
- '!**/node_modules/**/{bin,man,scripts}/*',
- '!**/node_modules/jquery/dist/jquery.slim*.js',
- '!**/node_modules/video.js/dist/{alt/*,video.js}',
- '!**/node_modules/@videojs/*/src'
+ // renderer
+ 'node_modules/{miniget,ytpl,ytsr}/**/*',
+
+ '!**/README.md',
+ '!**/*.js.map',
+ '!**/*.d.ts',
],
dmg: {
contents: [
@@ -97,7 +92,7 @@ const config = {
linux: {
category: 'Network',
icon: '_icons/icon.svg',
- target: ['deb', 'zip', 'apk', 'rpm', 'AppImage', 'pacman'],
+ target: ['deb', 'zip', '7z', 'apk', 'rpm', 'AppImage', 'pacman'],
},
// See the following issues for more information
// https://github.com/jordansissel/fpm/issues/1503
@@ -121,7 +116,7 @@ const config = {
mac: {
category: 'public.app-category.utilities',
icon: '_icons/iconMac.icns',
- target: ['dmg', 'zip'],
+ target: ['dmg', 'zip', '7z'],
type: 'distribution',
extendInfo: {
CFBundleURLTypes: [
@@ -134,7 +129,7 @@ const config = {
},
win: {
icon: '_icons/icon.ico',
- target: ['nsis', 'zip', 'portable', 'squirrel'],
+ target: ['nsis', 'zip', '7z', 'portable'],
},
nsis: {
allowToChangeInstallationDirectory: true,
diff --git a/_scripts/dev-runner.js b/_scripts/dev-runner.js
index c48daa56b..24857459b 100644
--- a/_scripts/dev-runner.js
+++ b/_scripts/dev-runner.js
@@ -1,5 +1,6 @@
process.env.NODE_ENV = 'development'
+const open = require('open')
const electron = require('electron')
const webpack = require('webpack')
const WebpackDevServer = require('webpack-dev-server')
@@ -10,13 +11,14 @@ const { spawn } = require('child_process')
const mainConfig = require('./webpack.main.config')
const rendererConfig = require('./webpack.renderer.config')
+const webConfig = require('./webpack.web.config')
const workersConfig = require('./webpack.workers.config')
let electronProcess = null
let manualRestart = null
-const remoteDebugging = !!(
- process.argv[2] && process.argv[2] === '--remote-debug'
-)
+
+const remoteDebugging = process.argv.indexOf('--remote-debug') !== -1
+const web = process.argv.indexOf('--web') !== -1
if (remoteDebugging) {
// disable dvtools open in electron
@@ -51,10 +53,12 @@ async function restartElectron() {
electronProcess = spawn(electron, [
path.join(__dirname, '../dist/main.js'),
- // '--enable-logging', Enable to show logs from all electron processes
+ // '--enable-logging', // Enable to show logs from all electron processes
remoteDebugging ? '--inspect=9222' : '',
- remoteDebugging ? '--remote-debugging-port=9223' : '',
- ])
+ remoteDebugging ? '--remote-debugging-port=9223' : ''
+ ],
+ // { stdio: 'inherit' } // required for logs to actually appear in the stdout
+ )
electronProcess.on('exit', (code, _) => {
if (code === relaunchExitCode) {
@@ -87,7 +91,6 @@ function startMain() {
manualRestart = true
await restartElectron()
-
setTimeout(() => {
manualRestart = false
}, 2500)
@@ -135,4 +138,38 @@ function startRenderer(callback) {
})
}
-startRenderer(startMain)
+function startWeb (callback) {
+ const compiler = webpack(webConfig)
+ const { name } = compiler
+
+ compiler.hooks.afterEmit.tap('afterEmit', () => {
+ console.log(`\nCompiled ${name} script!`)
+ console.log(`\nWatching file changes for ${name} script...`)
+ })
+
+ const server = new WebpackDevServer({
+ static: {
+ directory: path.join(process.cwd(), 'dist/web/static'),
+ watch: {
+ ignored: [
+ /(dashFiles|storyboards)\/*/,
+ '/**/.DS_Store',
+ ]
+ }
+ },
+ port
+ }, compiler)
+
+ server.startCallback(err => {
+ if (err) console.error(err)
+
+ callback({ port: server.options.port })
+ })
+}
+if (!web) {
+ startRenderer(startMain)
+} else {
+ startWeb(({ port }) => {
+ open(`http://localhost:${port}`)
+ })
+}
diff --git a/_scripts/webpack.main.config.js b/_scripts/webpack.main.config.js
index d7316fd74..c5561dcb1 100644
--- a/_scripts/webpack.main.config.js
+++ b/_scripts/webpack.main.config.js
@@ -1,16 +1,11 @@
const path = require('path')
const webpack = require('webpack')
const CopyWebpackPlugin = require('copy-webpack-plugin')
+const JsonMinimizerPlugin = require('json-minimizer-webpack-plugin')
-const {
- dependencies,
- devDependencies,
- productName,
-} = require('../package.json')
+const { productName } = require('../package.json')
-const externals = Object.keys(dependencies).concat(Object.keys(devDependencies))
const isDevMode = process.env.NODE_ENV === 'development'
-const whiteListedModules = []
const config = {
name: 'main',
@@ -19,7 +14,6 @@ const config = {
entry: {
main: path.join(__dirname, '../src/main/index.js'),
},
- externals: externals.filter(d => !whiteListedModules.includes(d)),
module: {
rules: [
{
@@ -27,12 +21,17 @@ const config = {
use: 'babel-loader',
exclude: /node_modules/,
},
- {
- test: /\.node$/,
- loader: 'node-loader',
- },
],
},
+ // webpack defaults to only optimising the production builds, so having this here is fine
+ optimization: {
+ minimizer: [
+ '...', // extend webpack's list instead of overwriting it
+ new JsonMinimizerPlugin({
+ exclude: /\/locales\/.*\.json/
+ })
+ ]
+ },
node: {
__dirname: isDevMode,
__filename: isDevMode,
@@ -58,49 +57,19 @@ const config = {
target: 'electron-main',
}
-if (isDevMode) {
- config.plugins.push(
- new webpack.DefinePlugin({
- __static: `"${path.join(__dirname, '../static').replace(/\\/g, '\\\\')}"`,
- })
- )
-} else {
+if (!isDevMode) {
config.plugins.push(
new CopyWebpackPlugin({
patterns: [
- {
- from: path.join(__dirname, '../static/pwabuilder-sw.js'),
- to: path.join(__dirname, '../dist/web/pwabuilder-sw.js'),
- },
{
from: path.join(__dirname, '../static'),
- to: path.join(__dirname, '../dist/web/static'),
+ to: path.join(__dirname, '../dist/static'),
globOptions: {
dot: true,
- ignore: ['**/.*', '**/pwabuilder-sw.js', '**/dashFiles/**', '**/storyboards/**'],
+ ignore: ['**/.*', '**/locales/**', '**/pwabuilder-sw.js', '**/dashFiles/**', '**/storyboards/**'],
},
},
- {
- from: path.join(__dirname, '../_icons'),
- to: path.join(__dirname, '../dist/_icons'),
- globOptions: {
- dot: true,
- ignore: ['**/.*'],
- },
- },
- {
- from: path.join(__dirname, '../src/renderer/assets/img'),
- to: path.join(__dirname, '../dist/images'),
- globOptions: {
- dot: true,
- ignore: ['**/.*'],
- },
- },
- ]
- }
- ),
- new webpack.LoaderOptionsPlugin({
- minimize: true,
+ ]
})
)
}
diff --git a/_scripts/webpack.renderer.config.js b/_scripts/webpack.renderer.config.js
index 4f73ce068..f2a07d731 100644
--- a/_scripts/webpack.renderer.config.js
+++ b/_scripts/webpack.renderer.config.js
@@ -2,18 +2,13 @@ const path = require('path')
const webpack = require('webpack')
const HtmlWebpackPlugin = require('html-webpack-plugin')
const VueLoaderPlugin = require('vue-loader/lib/plugin')
-const CopyWebpackPlugin = require('copy-webpack-plugin')
const MiniCssExtractPlugin = require('mini-css-extract-plugin')
+const CssMinimizerPlugin = require('css-minimizer-webpack-plugin')
+const ProcessLocalesPlugin = require('./ProcessLocalesPlugin')
-const {
- dependencies,
- devDependencies,
- productName,
-} = require('../package.json')
+const { productName } = require('../package.json')
-const externals = Object.keys(dependencies).concat(Object.keys(devDependencies))
const isDevMode = process.env.NODE_ENV === 'development'
-const whiteListedModules = ['vue']
const config = {
name: 'renderer',
@@ -33,7 +28,10 @@ const config = {
path: path.join(__dirname, '../dist'),
filename: '[name].js',
},
- externals: externals.filter(d => !whiteListedModules.includes(d)),
+ // webpack spits out errors while inlining ytpl and ytsr as
+ // they dynamically import their package.json file to extract the bug report URL
+ // the error: "Critical dependency: the request of a dependency is an expression"
+ externals: ['ytpl', 'ytsr'],
module: {
rules: [
{
@@ -41,10 +39,6 @@ const config = {
use: 'babel-loader',
exclude: /node_modules/,
},
- {
- test: /\.node$/,
- loader: 'node-loader',
- },
{
test: /\.vue$/,
loader: 'vue-loader',
@@ -54,10 +48,12 @@ const config = {
use: [
{
loader: MiniCssExtractPlugin.loader,
- options: {},
},
{
loader: 'css-loader',
+ options: {
+ esModule: false
+ }
},
{
loader: 'sass-loader',
@@ -75,43 +71,49 @@ const config = {
test: /\.css$/,
use: [
{
- loader: MiniCssExtractPlugin.loader,
- options: {},
+ loader: MiniCssExtractPlugin.loader
},
- 'css-loader',
+ {
+ loader: 'css-loader',
+ options: {
+ esModule: false
+ }
+ }
],
},
{
test: /\.(png|jpe?g|gif|tif?f|bmp|webp|svg)(\?.*)?$/,
- use: {
- loader: 'url-loader',
- options: {
- esModule: false,
- limit: 10000,
- name: 'imgs/[name]--[folder].[ext]',
- },
- },
+ type: 'asset/resource',
+ generator: {
+ filename: 'imgs/[name][ext]'
+ }
},
{
test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/,
- use: {
- loader: 'url-loader',
- options: {
- esModule: false,
- limit: 10000,
- name: 'fonts/[name]--[folder].[ext]',
- },
- },
+ type: 'asset/resource',
+ generator: {
+ filename: 'fonts/[name][ext]'
+ }
},
],
},
+ // webpack defaults to only optimising the production builds, so having this here is fine
+ optimization: {
+ minimizer: [
+ '...', // extend webpack's list instead of overwriting it
+ new CssMinimizerPlugin()
+ ]
+ },
node: {
__dirname: isDevMode,
__filename: isDevMode,
global: isDevMode,
},
plugins: [
- // new WriteFilePlugin(),
+ new webpack.DefinePlugin({
+ 'process.env.PRODUCT_NAME': JSON.stringify(productName),
+ 'process.env.IS_ELECTRON': true
+ }),
new HtmlWebpackPlugin({
excludeChunks: ['processTaskWorker'],
filename: 'index.html',
@@ -121,9 +123,6 @@ const config = {
: false,
}),
new VueLoaderPlugin(),
- new webpack.DefinePlugin({
- 'process.env.PRODUCT_NAME': JSON.stringify(productName),
- }),
new MiniCssExtractPlugin({
filename: isDevMode ? '[name].css' : '[name].[contenthash].css',
chunkFilename: isDevMode ? '[id].css' : '[id].[contenthash].css',
@@ -146,58 +145,23 @@ const config = {
/**
* Adjust rendererConfig for production settings
*/
-if (isDevMode) {
- // any dev only config
+if (!isDevMode) {
+ const processLocalesPlugin = new ProcessLocalesPlugin({
+ compress: true,
+ inputDir: path.join(__dirname, '../static/locales'),
+ outputDir: 'static/locales',
+ })
+
config.plugins.push(
+ processLocalesPlugin,
new webpack.DefinePlugin({
- __static: `"${path.join(__dirname, '../static').replace(/\\/g, '\\\\')}"`,
- })
- )
-} else {
- config.plugins.push(
- new CopyWebpackPlugin({
- patterns: [
- {
- from: path.join(__dirname, '../static/pwabuilder-sw.js'),
- to: path.join(__dirname, '../dist/web/pwabuilder-sw.js'),
- },
- {
- from: path.join(__dirname, '../static'),
- to: path.join(__dirname, '../dist/web/static'),
- globOptions: {
- dot: true,
- ignore: ['**/.*', '**/pwabuilder-sw.js', '**/dashFiles/**', '**/storyboards/**'],
- },
- },
- {
- from: path.join(__dirname, '../static'),
- to: path.join(__dirname, '../dist/static'),
- globOptions: {
- dot: true,
- ignore: ['**/.*', '**/pwabuilder-sw.js', '**/dashFiles/**', '**/storyboards/**'],
- },
- },
- {
- from: path.join(__dirname, '../_icons'),
- to: path.join(__dirname, '../dist/web/_icons'),
- globOptions: {
- dot: true,
- ignore: ['**/.*'],
- },
- },
- {
- from: path.join(__dirname, '../src/renderer/assets/img'),
- to: path.join(__dirname, '../dist/web/images'),
- globOptions: {
- dot: true,
- ignore: ['**/.*'],
- },
- },
- ]
- }
- ),
- new webpack.LoaderOptionsPlugin({
- minimize: true,
+ 'process.env.LOCALE_NAMES': JSON.stringify(processLocalesPlugin.localeNames)
+ }),
+ // webpack doesn't get rid of js-yaml even though it isn't used in the production builds
+ // so we need to manually tell it to ignore any imports for `js-yaml`
+ new webpack.IgnorePlugin({
+ resourceRegExp: /^js-yaml$/,
+ contextRegExp: /i18n$/
})
)
}
diff --git a/_scripts/webpack.web.config.js b/_scripts/webpack.web.config.js
index 1b15f319f..845832fa9 100644
--- a/_scripts/webpack.web.config.js
+++ b/_scripts/webpack.web.config.js
@@ -1,9 +1,13 @@
const path = require('path')
+const fs = require('fs')
const webpack = require('webpack')
const HtmlWebpackPlugin = require('html-webpack-plugin')
const VueLoaderPlugin = require('vue-loader/lib/plugin')
const CopyWebpackPlugin = require('copy-webpack-plugin')
const MiniCssExtractPlugin = require('mini-css-extract-plugin')
+const JsonMinimizerPlugin = require('json-minimizer-webpack-plugin')
+const CssMinimizerPlugin = require('css-minimizer-webpack-plugin')
+const ProcessLocalesPlugin = require('./ProcessLocalesPlugin')
const { productName } = require('../package.json')
@@ -12,7 +16,7 @@ const isDevMode = process.env.NODE_ENV === 'development'
const config = {
name: 'web',
mode: process.env.NODE_ENV,
- devtool: isDevMode ? '#cheap-module-eval-source-map' : false,
+ devtool: isDevMode ? 'eval-cheap-module-source-map' : false,
entry: {
web: path.join(__dirname, '../src/renderer/main.js'),
},
@@ -20,6 +24,11 @@ const config = {
path: path.join(__dirname, '../dist/web'),
filename: '[name].js',
},
+ externals: {
+ electron: '{}',
+ ytpl: '{}',
+ ytsr: '{}'
+ },
module: {
rules: [
{
@@ -29,27 +38,19 @@ const config = {
},
{
test: /\.vue$/,
- use: {
- loader: 'vue-loader',
- options: {
- extractCSS: true,
- loaders: {
- sass: 'vue-style-loader!css-loader!sass-loader?indentedSyntax=1',
- scss: 'vue-style-loader!css-loader!sass-loader',
- less: 'vue-style-loader!css-loader!less-loader',
- },
- },
- },
+ loader: 'vue-loader'
},
{
test: /\.s(c|a)ss$/,
use: [
{
loader: MiniCssExtractPlugin.loader,
- options: {},
},
{
loader: 'css-loader',
+ options: {
+ esModule: false
+ }
},
{
loader: 'sass-loader',
@@ -67,10 +68,14 @@ const config = {
test: /\.css$/,
use: [
{
- loader: MiniCssExtractPlugin.loader,
- options: {},
+ loader: MiniCssExtractPlugin.loader
},
- 'css-loader',
+ {
+ loader: 'css-loader',
+ options: {
+ esModule: false
+ }
+ }
],
},
{
@@ -79,39 +84,43 @@ const config = {
},
{
test: /\.(png|jpe?g|gif|tif?f|bmp|webp|svg)(\?.*)?$/,
- use: {
- loader: 'url-loader',
- options: {
- esModule: false,
- limit: 10000,
- name: 'imgs/[name]--[folder].[ext]',
- },
- },
+ type: 'asset/resource',
+ generator: {
+ filename: 'imgs/[name][ext]'
+ }
},
{
test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/,
- use: {
- loader: 'url-loader',
- options: {
- esModule: false,
- limit: 10000,
- name: 'fonts/[name]--[folder].[ext]',
- },
- },
+ type: 'asset/resource',
+ generator: {
+ filename: 'fonts/[name][ext]'
+ }
},
],
},
+ // webpack defaults to only optimising the production builds, so having this here is fine
+ optimization: {
+ minimizer: [
+ '...', // extend webpack's list instead of overwriting it
+ new JsonMinimizerPlugin({
+ exclude: /\/locales\/.*\.json/
+ }),
+ new CssMinimizerPlugin()
+ ]
+ },
node: {
- __dirname: isDevMode,
+ __dirname: true,
__filename: isDevMode,
- fs: 'empty',
- net: 'empty',
- tls: 'empty',
- child_process: 'empty',
- dns: 'empty'
},
plugins: [
- // new WriteFilePlugin(),
+ new webpack.DefinePlugin({
+ 'process.env.PRODUCT_NAME': JSON.stringify(productName),
+ 'process.env.IS_ELECTRON': false
+ }),
+ new webpack.ProvidePlugin({
+ process: 'process/browser',
+ Buffer: ['buffer', 'Buffer'],
+ }),
new HtmlWebpackPlugin({
excludeChunks: ['processTaskWorker'],
filename: 'index.html',
@@ -119,9 +128,6 @@ const config = {
nodeModules: false,
}),
new VueLoaderPlugin(),
- new webpack.DefinePlugin({
- 'process.env.PRODUCT_NAME': JSON.stringify(productName),
- }),
new MiniCssExtractPlugin({
filename: isDevMode ? '[name].css' : '[name].[contenthash].css',
chunkFilename: isDevMode ? '[id].css' : '[id].[contenthash].css',
@@ -136,60 +142,61 @@ const config = {
images: path.join(__dirname, '../src/renderer/assets/img/'),
static: path.join(__dirname, '../static/'),
},
+ fallback: {
+ buffer: require.resolve('buffer/'),
+ dns: require.resolve('browserify/lib/_empty.js'),
+ fs: require.resolve('browserify/lib/_empty.js'),
+ http: require.resolve('stream-http'),
+ https: require.resolve('https-browserify'),
+ net: require.resolve('browserify/lib/_empty.js'),
+ os: require.resolve('os-browserify/browser.js'),
+ path: require.resolve('path-browserify'),
+ stream: require.resolve('stream-browserify'),
+ timers: require.resolve('timers-browserify'),
+ tls: require.resolve('browserify/lib/_empty.js'),
+ vm: require.resolve('vm-browserify'),
+ zlib: require.resolve('browserify-zlib')
+ },
extensions: ['.js', '.vue', '.json', '.css'],
},
target: 'web',
}
-/**
- * Adjust web for production settings
- */
-if (isDevMode) {
- // any dev only config
- config.plugins.push(
- new webpack.DefinePlugin({
- __static: `"${path.join(__dirname, '../static').replace(/\\/g, '\\\\')}"`,
- })
- )
-} else {
- config.plugins.push(
- new CopyWebpackPlugin({
- patterns: [
- {
- from: path.join(__dirname, '../static/pwabuilder-sw.js'),
- to: path.join(__dirname, '../dist/web/pwabuilder-sw.js'),
+const processLocalesPlugin = new ProcessLocalesPlugin({
+ compress: false,
+ inputDir: path.join(__dirname, '../static/locales'),
+ outputDir: 'static/locales',
+})
+
+config.plugins.push(
+ processLocalesPlugin,
+ new webpack.DefinePlugin({
+ 'process.env.LOCALE_NAMES': JSON.stringify(processLocalesPlugin.localeNames),
+ 'process.env.GEOLOCATION_NAMES': JSON.stringify(fs.readdirSync(path.join(__dirname, '..', 'static', 'geolocations')))
+ }),
+ new CopyWebpackPlugin({
+ patterns: [
+ {
+ from: path.join(__dirname, '../static/pwabuilder-sw.js'),
+ to: path.join(__dirname, '../dist/web/pwabuilder-sw.js'),
+ },
+ {
+ from: path.join(__dirname, '../static'),
+ to: path.join(__dirname, '../dist/web/static'),
+ globOptions: {
+ dot: true,
+ ignore: ['**/.*', '**/locales/**', '**/pwabuilder-sw.js', '**/dashFiles/**', '**/storyboards/**'],
},
- {
- from: path.join(__dirname, '../static'),
- to: path.join(__dirname, '../dist/web/static'),
- globOptions: {
- dot: true,
- ignore: ['**/.*', '**/pwabuilder-sw.js', '**/dashFiles/**', '**/storyboards/**'],
- },
- },
- {
- from: path.join(__dirname, '../_icons'),
- to: path.join(__dirname, '../dist/web/_icons'),
- globOptions: {
- dot: true,
- ignore: ['**/.*'],
- },
- },
- {
- from: path.join(__dirname, '../src/renderer/assets/img'),
- to: path.join(__dirname, '../dist/web/images'),
- globOptions: {
- dot: true,
- ignore: ['**/.*'],
- },
- },
- ]
- }
- ),
- new webpack.LoaderOptionsPlugin({
- minimize: true,
- })
- )
-}
+ },
+ ]
+ }),
+ // webpack doesn't get rid of js-yaml even though it isn't used in the production builds
+ // so we need to manually tell it to ignore any imports for `js-yaml`
+ new webpack.IgnorePlugin({
+ resourceRegExp: /^js-yaml$/,
+ contextRegExp: /i18n$/
+ })
+)
+
module.exports = config
diff --git a/_scripts/webpack.workers.config.js b/_scripts/webpack.workers.config.js
index 7ca42754f..1ac26a191 100644
--- a/_scripts/webpack.workers.config.js
+++ b/_scripts/webpack.workers.config.js
@@ -30,10 +30,6 @@ const config = {
use: 'babel-loader',
exclude: /node_modules/,
},
- {
- test: /\.node$/,
- loader: 'node-loader',
- },
],
},
node: {
@@ -63,11 +59,7 @@ const config = {
if (isDevMode) {
// any dev only config
} else {
- config.plugins.push(
- new webpack.LoaderOptionsPlugin({
- minimize: true,
- })
- )
+ // any producation only config
}
module.exports = config
diff --git a/lefthook.yml b/lefthook.yml
new file mode 100644
index 000000000..7f6f4e3d6
--- /dev/null
+++ b/lefthook.yml
@@ -0,0 +1,48 @@
+
+# Refer for explanation to following link:
+# https://github.com/evilmartians/lefthook/blob/master/docs/full_guide.md
+pre-commit:
+ parallel: true
+ commands:
+ lint:
+ # Only runs when any file with filename
+ # matching the glob is being committed
+ glob: "*.{js,vue}"
+ run: yarn run eslint --no-color {staged_files}
+ skip:
+ - rebase
+
+
+
+# EXAMPLE USAGE
+#
+# pre-push:
+# commands:
+# packages-audit:
+# tags: frontend security
+# run: yarn audit
+# gems-audit:
+# tags: backend security
+# run: bundle audit
+#
+# pre-commit:
+# parallel: true
+# commands:
+# eslint:
+# glob: "*.{js,ts}"
+# run: yarn eslint {staged_files}
+# rubocop:
+# tags: backend style
+# glob: "*.rb"
+# exclude: "application.rb|routes.rb"
+# run: bundle exec rubocop --force-exclusion {all_files}
+# govet:
+# tags: backend style
+# files: git ls-files -m
+# glob: "*.go"
+# run: go vet {files}
+# scripts:
+# "hello.js":
+# runner: node
+# "any.go":
+# runner: go run
diff --git a/package.json b/package.json
index e8861bcbe..7a6c940fd 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
"name": "freetube",
"productName": "FreeTube",
"description": "A private YouTube client",
- "version": "0.17.1",
+ "version": "0.18.0",
"license": "AGPL-3.0-or-later",
"main": "./dist/main.js",
"private": true,
@@ -29,6 +29,7 @@
"debug": "run-s rebuild:electron debug-runner",
"debug-runner": "node _scripts/dev-runner.js --remote-debug",
"dev": "run-s rebuild:electron dev-runner",
+ "dev:web": "node _scripts/dev-runner.js --web",
"dev-runner": "node _scripts/dev-runner.js",
"lint-fix": "eslint --fix --ext .js,.vue ./",
"lint": "eslint --ext .js,.vue ./",
@@ -37,92 +38,88 @@
"pack:renderer": "webpack --mode=production --node-env=production --config _scripts/webpack.renderer.config.js",
"pack:web": "webpack --mode=production --node-env=production --config _scripts/webpack.web.config.js",
"pack:workers": "webpack --mode=production --node-env=production --config _scripts/webpack.workers.config.js",
- "postinstall": "npm run rebuild:electron",
+ "postinstall": "yarn run --silent rebuild:electron",
"prettier": "prettier --write \"{src,_scripts}/**/*.{js,vue}\"",
"rebuild:electron": "electron-builder install-app-deps",
- "rebuild:node": "npm rebuild",
"release": "run-s test build",
- "ci": "yarn install --frozen-lockfile"
+ "ci": "yarn install --silent --frozen-lockfile"
},
"dependencies": {
- "@fortawesome/fontawesome-svg-core": "^1.2.36",
- "@fortawesome/free-brands-svg-icons": "^5.15.4",
- "@fortawesome/free-solid-svg-icons": "^5.15.4",
- "@fortawesome/vue-fontawesome": "^2.0.2",
+ "@fortawesome/fontawesome-svg-core": "^6.2.0",
+ "@fortawesome/free-brands-svg-icons": "^6.2.0",
+ "@fortawesome/free-solid-svg-icons": "^6.2.0",
+ "@fortawesome/vue-fontawesome": "^2.0.8",
"@freetube/youtube-chat": "^1.1.2",
- "@freetube/yt-comment-scraper": "^6.1.0",
+ "@freetube/yt-comment-scraper": "^6.2.0",
+ "@freetube/yt-trending-scraper": "^3.1.1",
"@silvermine/videojs-quality-selector": "^1.2.5",
- "autolinker": "^3.15.0",
- "electron-context-menu": "^3.1.2",
- "http-proxy-agent": "^4.0.1",
+ "autolinker": "^4.0.0",
+ "browserify": "^17.0.0",
+ "browserify-zlib": "^0.2.0",
+ "electron-context-menu": "^3.5.0",
+ "http-proxy-agent": "^5.0.0",
"https-proxy-agent": "^5.0.0",
- "jquery": "^3.6.0",
- "js-yaml": "^4.1.0",
"lodash.debounce": "^4.0.8",
"lodash.isequal": "^4.5.0",
- "marked": "^4.0.17",
- "nedb-promises": "^5.0.1",
+ "marked": "^4.1.1",
+ "nedb-promises": "^6.2.1",
"opml-to-json": "^1.0.1",
- "rss-parser": "^3.12.0",
+ "process": "^0.11.10",
"socks-proxy-agent": "^6.0.0",
"video.js": "7.18.1",
"videojs-contrib-quality-levels": "^2.1.0",
"videojs-http-source-selector": "^1.1.6",
+ "videojs-mobile-ui": "^0.8.0",
"videojs-overlay": "^2.1.4",
"videojs-vtt-thumbnails-freetube": "0.0.15",
- "vue": "^2.6.14",
- "vue-i18n": "^8.25.0",
+ "vue": "^2.7.13",
+ "vue-i18n": "^8.28.1",
"vue-observe-visibility": "^1.0.0",
- "vue-router": "^3.5.2",
+ "vue-router": "^3.6.5",
"vuex": "^3.6.2",
- "youtube-suggest": "^1.1.2",
- "yt-channel-info": "^3.0.4",
+ "youtube-suggest": "^1.2.0",
+ "yt-channel-info": "^3.2.1",
"yt-dash-manifest-generator": "1.1.0",
- "yt-trending-scraper": "^2.0.1",
- "ytdl-core": "git+https://github.com/absidue/node-ytdl-core#temp-fix-11-08-2022",
+ "ytdl-core": "^4.11.2",
"ytpl": "^2.3.0",
"ytsr": "^3.8.0"
},
"devDependencies": {
- "@babel/core": "^7.17.10",
- "@babel/plugin-proposal-class-properties": "^7.16.7",
- "@babel/preset-env": "^7.17.10",
+ "@babel/core": "^7.18.13",
+ "@babel/plugin-proposal-class-properties": "^7.18.6",
+ "@babel/preset-env": "^7.18.10",
"babel-eslint": "^10.1.0",
"babel-loader": "^8.2.5",
- "copy-webpack-plugin": "^9.0.1",
- "css-loader": "5.2.6",
- "electron": "^16.2.7",
- "electron-builder": "^23.0.3",
- "electron-builder-squirrel-windows": "^22.13.1",
- "electron-debug": "^3.2.0",
+ "copy-webpack-plugin": "^11.0.0",
+ "css-loader": "^6.7.1",
+ "css-minimizer-webpack-plugin": "^4.2.2",
+ "electron": "^21.2.0",
+ "electron-builder": "^23.6.0",
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.3.0",
"eslint-config-standard": "^16.0.3",
"eslint-plugin-import": "^2.24.2",
"eslint-plugin-node": "^11.1.0",
- "eslint-plugin-prettier": "^4.0.0",
+ "eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-promise": "^5.1.0",
"eslint-plugin-standard": "^5.0.0",
- "eslint-plugin-vue": "^7.17.0",
- "file-loader": "^6.2.0",
+ "eslint-plugin-vue": "^9.6.0",
"html-webpack-plugin": "^5.3.2",
- "mini-css-extract-plugin": "^2.2.2",
- "node-loader": "^2.0.0",
+ "js-yaml": "^4.1.0",
+ "json-minimizer-webpack-plugin": "^4.0.0",
+ "lefthook": "^1.1.3",
+ "mini-css-extract-plugin": "^2.6.1",
"npm-run-all": "^4.1.5",
- "prettier": "^2.3.2",
+ "prettier": "^2.7.1",
"rimraf": "^3.0.2",
- "sass": "^1.38.2",
- "sass-loader": "^12.1.0",
- "style-loader": "^3.2.1",
+ "sass": "^1.54.9",
+ "sass-loader": "^13.0.2",
"tree-kill": "1.2.2",
- "url-loader": "^4.1.1",
"vue-devtools": "^5.1.4",
- "vue-eslint-parser": "^7.10.0",
- "vue-loader": "^15.9.8",
- "vue-style-loader": "^4.1.3",
- "vue-template-compiler": "^2.6.14",
- "webpack": "^5.51.1",
- "webpack-cli": "^4.8.0",
- "webpack-dev-server": "^4.1.0"
+ "vue-eslint-parser": "^9.1.0",
+ "vue-loader": "^15.10.0",
+ "webpack": "^5.74.0",
+ "webpack-cli": "^4.10.0",
+ "webpack-dev-server": "^4.11.1"
}
}
diff --git a/src/datastores/handlers/index.js b/src/datastores/handlers/index.js
index 0b1dc938b..e96565d1f 100644
--- a/src/datastores/handlers/index.js
+++ b/src/datastores/handlers/index.js
@@ -1,6 +1,5 @@
let handlers
-const usingElectron = window?.process?.type === 'renderer'
-if (usingElectron) {
+if (process.env.IS_ELECTRON) {
handlers = require('./electron').default
} else {
handlers = require('./web').default
diff --git a/src/index.ejs b/src/index.ejs
index f0dad7e03..9fd3136e3 100644
--- a/src/index.ejs
+++ b/src/index.ejs
@@ -18,23 +18,13 @@
-
-
-