Skip to content

Commit

Permalink
Why is it always that yarn.lock that trips me up?
Browse files Browse the repository at this point in the history
This is an automated nightly publish.
  • Loading branch information
MarmadileManteater committed Sep 17, 2022
2 parents 87f2dac + 8f4f89f commit f13942a
Show file tree
Hide file tree
Showing 46 changed files with 2,631 additions and 542 deletions.
92 changes: 91 additions & 1 deletion .github/workflows/autoLabelIssue.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,95 @@ jobs:
- uses: Naturalclar/issue-action@v2.0.2
with:
body: "both"
parameters: '[ {"keywords": ["visual bug"], "labels": ["B: visual"]}, {"keywords": ["AUR", "Chocolatey", "PortableApps", "winget", "Scoop"], "labels": ["B: Unofficial Download"]}, {"keywords": ["keyboard control not working"], "labels": ["B: keyboard control"]}, {"keywords": ["text/string issue"], "labels": ["B: text/string"]}, {"keywords": ["content not loading"], "labels": ["B: content not loading"]}, {"keywords": ["accessibility issue"], "labels": ["B: accessibility"]}, {"keywords": ["usability issue"], "labels": ["B: usability"]}, {"keywords": ["causes crash"], "labels": ["B: crash"]}, {"keywords": ["feature stopped working"], "labels": ["B: feature stopped working"]}, {"keywords": ["inconsistent behavior"], "labels": ["B: inconsistent behavior"]}, {"keywords": ["data loss"], "labels": ["B: data loss"]}, {"keywords": ["race condition"], "labels": ["B: race condition"]}, {"keywords": ["API issue"], "labels": ["B: API issue"]}, {"keywords": ["only happens in developer mode"], "labels": ["B: developer mode"]}, {"keywords": ["improvement to existing feature"], "labels": ["E: improvement existing feature"]}, {"keywords": ["new optional setting"], "labels": ["E: new optional setting"]}, {"keywords": ["visual improvement"], "labels": ["E: visual improvement"]}, {"keywords": ["display more information to user"], "labels": ["E: display more information"]}, {"keywords": ["ease of use improvement"], "labels": ["E: ease of use improvement"]}, {"keywords": ["support for external software"], "labels": ["E: support external software"]}, {"keywords": ["new feature"], "labels": ["E: new feature"]}, {"keywords": ["new keyboard shortcut"], "labels": ["E: keyboard shortcut"]}]'
parameters: >-
[
{
"keywords": ["visual bug"],
"labels": ["B: visual"]
},
{
"keywords": ["AUR", "Chocolatey", "PortableApps", "winget", "Scoop"],
"labels": ["B: Unofficial Download"]
},
{
"keywords": ["keyboard control not working"],
"labels": ["B: keyboard control"]
},
{
"keywords": ["text/string issue"],
"labels": ["B: text/string"]
},
{
"keywords": ["content not loading"],
"labels": ["B: content not loading"]
},
{
"keywords": ["accessibility issue"],
"labels": ["B: accessibility"]
},
{
"keywords": ["usability issue"],
"labels": ["B: usability"]
},
{
"keywords": ["causes crash"],
"labels": ["B: crash"]
},
{
"keywords": ["feature stopped working"],
"labels": ["B: feature stopped working"]
},
{
"keywords": ["inconsistent behavior"],
"labels": ["B: inconsistent behavior"]
},
{
"keywords": ["data loss"],
"labels": ["B: data loss"]
},
{
"keywords": ["race condition"],
"labels": ["B: race condition"]
},
{
"keywords": ["API issue"],
"labels": ["B: API issue"]
},
{
"keywords": ["only happens in developer mode"],
"labels": ["B: developer mode"]
},
{
"keywords": ["improvement to existing feature"],
"labels": ["E: improvement existing feature"]
},
{
"keywords": ["new optional setting"],
"labels": ["E: new optional setting"]
},
{
"keywords": ["visual improvement"],
"labels": ["E: visual improvement"]
},
{
"keywords": ["display more information to user"],
"labels": ["E: display more information"]
},
{
"keywords": ["ease of use improvement"],
"labels": ["E: ease of use improvement"]
},
{
"keywords": ["support for external software"],
"labels": ["E: support external software"]
},
{
"keywords": ["new feature"],
"labels": ["E: new feature"]
},
{
"keywords": ["new keyboard shortcut"],
"labels": ["E: keyboard shortcut"]
}
]
github-token: "${{ secrets.GITHUB_TOKEN }}"
2 changes: 1 addition & 1 deletion .github/workflows/buildCordova.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:

- name: Pack with Node.js ${{ matrix.node-version}}
if: contains(matrix.runtime, 'x64')
run: npm run pack
run: npm run pack:browser

- name: Setup Android SDK Tools
if: contains(matrix.runtime, 'x64')
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/releaseCordova.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:

- name: Pack with Node.js ${{ matrix.node-version}}
if: contains(matrix.runtime, 'x64')
run: npm run pack
run: npm run pack:browser

- name: Setup Android SDK Tools
if: contains(matrix.runtime, 'x64')
Expand Down
27 changes: 27 additions & 0 deletions .github/workflows/super-linter.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Lint Code Base
# Documentation:
# https://docs.github.com/en/actions/learn-github-actions/workflow-syntax-for-github-actions
on:
push:
branches-ignore: [master, development]
pull_request:
branches: [master, development]

jobs:
build:
name: Lint Code Base
runs-on: ubuntu-latest
steps:
- name: Checkout Code
uses: actions/checkout@v3
with:
# Full git history is needed to get a proper list of changed files within `super-linter`
fetch-depth: 0
- name: Lint Code Base
uses: github/super-linter/slim@v4
env:
VALIDATE_ALL_CODEBASE: false
VALIDATE_JAVASCRIPT_ES: false
VALIDATE_JAVASCRIPT_STANDARD: false
DEFAULT_BRANCH: development
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
33 changes: 17 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ There is an APK which can be downloaded here:
## How to build and test:

```bash
npm run pack
npm run pack:browser
# This creates the cordova project,
# copies the dist folder, browserifies
# it, and replaces a bunch of functions
Expand Down Expand Up @@ -51,11 +51,11 @@ addressed.

### Browser Extension

FreeTube is supported by the [Privacy Redirect](https://github.com/SimonBrazell/privacy-redirect) and [LibRedirect](https://github.com/libredirect/libredirect) extension, which will allow you to open YouTube links into FreeTube. You must enable the option within the advanced settings for it to work.
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 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 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).
* Download LibRedirect for [Firefox](https://addons.mozilla.org/firefox/addon/libredirect/) or [Google Chrome](https://github.com/libredirect/libredirect/blob/master/chromium.md).

Disclaimer: Learn more about why a browser extension is bad for your [privacy](https://www.privacyguides.org/desktop-browsers/#additional-resources).

Expand Down Expand Up @@ -87,25 +87,25 @@ Go to [FreeTube's Documentation](https://docs.freetubeapp.io/) if you'd like to

### 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)
* 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/)
* Arch User Repository (AUR): [Download](https://aur.archlinux.org/packages/freetube-bin/)

Chocolatey: [Download](https://chocolatey.org/packages/freetube/)
* Chocolatey: [Download](https://chocolatey.org/packages/freetube/)

PortableApps (Windows Only): [Download](https://github.com/rddim/FreeTubePortable/releases) [Source](https://github.com/rddim/FreeTubePortable)
* 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)
* Scoop (Windows Only): [Usage](https://github.com/ScoopInstaller/Scoop)

Windows Package Manager (winget): [Usage](https://docs.microsoft.com/en-us/windows/package-manager/winget/)
* Windows Package Manager (winget): [Usage](https://docs.microsoft.com/en-us/windows/package-manager/winget/)

### Automated Builds (Nightly / Weekly)

Expand Down Expand Up @@ -142,14 +142,15 @@ If you ever have any questions, feel free to make an issue here on GitHub. Alte
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).

## 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
[![GNU AGPLv3 Image](https://www.gnu.org/graphics/agplv3-155x51.png)](https://www.gnu.org/licenses/agpl-3.0.html)
Expand Down
4 changes: 2 additions & 2 deletions _scripts/cordova-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -182,9 +182,9 @@ const archiver = require('archiver');
rendererContent = rendererContent.replace(/(this.showOpenDialog)\(([^\(\)]*?)\)/g, 'showFileLoadDialog($2);')
rendererContent = rendererContent.replace(/(this.showSaveDialog)\(([^\(\)]*?)\)/g, 'showFileSaveDialog($2);')
rendererContent = rendererContent.replace(/const store (= localforage.createInstance)/g, 'const store = window.dataStore $1')
rendererContent = rendererContent.replace(/{openExternalLink\({rootState:t},e\){/g, "{openExternalLink:window.openExternalLink,electronOpenExternalLink({rootState:t},e){")
rendererContent = rendererContent.replace(/{openExternalLink\({/g, "{openExternalLink:window.openExternalLink,electronOpenExternalLink({")
rendererContent = rendererContent.replace(/navigator.clipboard.writeText\(/g, "window.copyToClipboard\(")
rendererContent = rendererContent.replace(/,async downloadMedia\({rootState:t,dispatch:e},{url:i,title:s,extension:n,fallingBackPath:a}\){/g,", downloadMedia(state, mediaFormat) { window.downloadExternalLink(state, mediaFormat.url); return new Promise(function (resolve, reject) { resolve() }) }, async oldDownloadMedia({rootState:t,dispatch:e},{url:i,title:s,extension:n,fallingBackPath:a}){")
rendererContent = rendererContent.replace(/,async downloadMedia\({/g,", downloadMedia(state, mediaFormat) { window.downloadExternalLink(state, mediaFormat.url); return new Promise(function (resolve, reject) { resolve() }) }, async oldDownloadMedia({")
if (exportType === 'cordova') {
rendererContent = rendererContent.replace(/this.invidiousGetVideoInformation\(this.videoId\).then\(/g, 'this.invidiousGetVideoInformation(this.videoId).then(updatePlayingVideo);this.invidiousGetVideoInformation\(this.videoId\).then(')
rendererContent = rendererContent.replace('systemTheme:function(){return window.matchMedia("(prefers-color-scheme: dark)").matches?"dark":"light"}', 'systemTheme:function () { return window.isDarkMode }')
Expand Down
29 changes: 9 additions & 20 deletions _scripts/webpack.main.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
const path = require('path')
const webpack = require('webpack')
const CopyWebpackPlugin = require('copy-webpack-plugin')
const JsonMinimizerPlugin = require('json-minimizer-webpack-plugin')

const { productName } = require('../package.json')

Expand All @@ -24,12 +25,15 @@ 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()
]
},
node: {
__dirname: isDevMode,
__filename: isDevMode,
Expand All @@ -44,6 +48,7 @@ const config = {
filename: '[name].js',
libraryTarget: 'commonjs2',
path: path.join(__dirname, '../dist'),
publicPath: ''
},
resolve: {
extensions: ['.js', '.json'],
Expand Down Expand Up @@ -73,22 +78,6 @@ if (isDevMode) {
ignore: ['**/.*', '**/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: ['**/.*'],
},
},
]
})
)
Expand Down

0 comments on commit f13942a

Please sign in to comment.