Base Cordova build off of upstream web build

.eslintrc.js

@@ -11,25 +11,39 @@ module.exports = {
   // https://eslint.org/docs/user-guide/configuring#specifying-parser
   parser: 'vue-eslint-parser',
 
-  // https://vuejs.github.io/eslint-plugin-vue/user-guide/#faq
+  // https://eslint.vuejs.org/user-guide/#faq
   parserOptions: {
-    parser: 'babel-eslint',
-    ecmaVersion: 2018,
-    sourceType: 'module'
+    parser: '@babel/eslint-parser',
+    ecmaVersion: 2022,
+    sourceType: 'module',
+    requireConfigFile: false
   },
 
+  overrides: [
+    {
+      files: ['*.json'],
+      parser: 'jsonc-eslint-parser',
+      rules: {
+        'no-tabs': 'off',
+        'comma-spacing': 'off'
+      }
+    }
+  ],
+
   // https://eslint.org/docs/user-guide/configuring#extending-configuration-files
   // order matters: from least important to most important in terms of overriding
   // Prettier + Vue: https://medium.com/@gogl.alex/how-to-properly-set-up-eslint-with-prettier-for-vue-or-nuxt-in-vscode-e42532099a9c
   extends: [
     'prettier',
     'eslint:recommended',
     'plugin:vue/recommended',
-    'standard'
+    'standard',
+    'plugin:jsonc/recommended-with-json',
+    // 'plugin:vuejs-accessibility/recommended' // uncomment once issues are fixed
   ],
 
   // https://eslint.org/docs/user-guide/configuring#configuring-plugins
-  plugins: ['vue'],
+  plugins: ['vue', 'vuejs-accessibility', 'n', 'unicorn'],
 
   rules: {
     'space-before-function-paren': 'off',
@@ -38,8 +52,22 @@ module.exports = {
     'no-console': ['error', { allow: ['warn', 'error'] }],
     'no-unused-vars': 'warn',
     'no-undef': 'warn',
+    'object-shorthand': 'off',
     'vue/no-template-key': 'warn',
     'vue/no-useless-template-attributes': 'off',
-    'vue/multi-word-component-names': 'off'
+    'vue/multi-word-component-names': 'off',
+    'vuejs-accessibility/no-onchange': 'off',
+    'vuejs-accessibility/label-has-for': ['error', {
+      required: {
+        some: ['nesting', 'id']
+      }
+    }],
+    'n/no-callback-literal': 'warn',
+    'n/no-path-concat': 'warn',
+    'unicorn/better-regex': 'error',
+    'unicorn/no-array-push-push': 'error',
+    'unicorn/prefer-keyboard-event-key': 'error',
+    'unicorn/prefer-regexp-test': 'error',
+    'unicorn/prefer-string-replace-all': 'error'
   }
 }

.github/dependabot.yml

@@ -7,6 +7,7 @@ updates:
     labels:
       - "PR: waiting for review"
       - "PR: dependencies"
+    open-pull-requests-limit: 10
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:

.github/workflows/autoMerge.yml

@@ -1,15 +1,15 @@
 name: Auto Merge PR
 on:
   pull_request_target:
-    types: [opened, synchronize, reopened, auto_merge_disabled]
+    types: [opened, synchronize, reopened, auto_merge_disabled, ready_for_review]
 
 jobs:
   build:
     runs-on: ubuntu-latest
 
     steps:
     - name: Auto Merge PR
-      if: contains(${{ github.event.pull_request.base.ref }}, 'development') || contains(${{ github.event.pull_request.base.ref }}, 'RC')
+      if: github.event.pull_request.draft == false && (contains(${{ github.event.pull_request.base.ref }}, 'development') || contains(${{ github.event.pull_request.base.ref }}, 'RC'))
       run: |
         echo ${{ secrets.PUSH_TOKEN }} >> auth.txt
         gh auth login --with-token < auth.txt

.github/workflows/build.yml

@@ -57,7 +57,7 @@ jobs:
     - run: yarn run ci
     - run: yarn run lint
     - name: Get Version Number
-      uses: nyaayaya/package-version@v1
+      uses: jozsefsallai/node-package-version@v1.0.4
       with:
         path: 'package.json'
         follow-symlinks: false
@@ -84,7 +84,7 @@ jobs:
         # script: if ${{ env.IS_DEV }} then echo "::set-output name=VERSION_NUMBER::${{ env.VERSION_NUMBER_NIGHTLY }}" else echo "::set-output name=VERSION_NUMBER::${{ env.VERSION_NUMBER }}" fi
 
     - name: Update package.json version
-      uses: jossef/action-set-json-field@v2
+      uses: jossef/action-set-json-field@v2.1
       with:
         file: package.json
         field: version

.github/workflows/buildCordova.yml

@@ -9,91 +9,91 @@ on:
 
 jobs:
   build:
-    strategy:
-      matrix:
-        node-version: [16.x]
-        runtime: [ linux-x64 ]
-        include:
-        - runtime: linux-x64
-          os: ubuntu-18.04
-
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     environment: development
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v2
+    - uses: actions/checkout@v3
+    - name: Use Node.js
+      uses: actions/setup-node@v3
       with:
-        node-version: ${{ matrix.node-version }}
+        node-version: 16.x
         cache: "yarn"
-    - run: npm run ci
+    - name: 🧶 Yarn install
+      run: yarn ci
 
-    - name: Lint code
-      run: npm run lint
+    - name: 🔍Lint code
+      run: yarn lint
 
-    - name: Get Version Number
-      uses: nyaayaya/package-version@v1
-      with:
-        path: 'package.json'
-        follow-symlinks: false
+    - name: 📚Read package.json
+      id: pkg
+      uses: jaywcjlove/[email protected]
 
     - name: Set Version Number Variable
       id: versionNumber
       uses: actions/github-script@v6
-      env:
-        VERSION_NUMBER_DEVELOPMENT: ${{ env.PACKAGE_VERSION }}-development-${{ github.run_number }}
       with:
         result-encoding: string
         script: |
-          return "${{ env.VERSION_NUMBER_DEVELOPMENT }}"
+          return '${{ steps.pkg.outputs.version }}-nightly-${{ github.run_number }}'
+    - name: Set App ID Variable
+      id: appId
+      uses: actions/github-script@v6
+      with:
+        result-encoding: string
+        script: |
+          return '${{ steps.pkg.outputs.name }}.nightly'
 
-    - name: Update package.json version
-      uses: jossef/action-set-json-field@v2
+    - name: ⬆ Update package.json version
+      uses: jossef/action-set-json-field@v2.1
       with:
         file: package.json
         field: version
         value: ${{ steps.versionNumber.outputs.result }}
 
+    - name: ⬆ Update package.json app environment
+      uses: jossef/[email protected]
+      with:
+        file: package.json
+        field: name
+        value: ${{ steps.appId.outputs.result }}
+
+
+    - name: ⬆ Update package.json product name
+      uses: jossef/[email protected]
+      with:
+        file: package.json
+        field: productName
+        value: ${{ steps.pkg.outputs.productName }} Nightly
 
-    - name: Install libarchive-tools
-      if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
-      run: sudo apt -y install libarchive-tools; echo "Version Number ${{ toJson(job) }} ${{ toJson(needs) }}"
+    - name: 📦 Pack for 🕸web with Node.js
+      run: yarn pack:web
 
-    - name: Pack with Node.js ${{ matrix.node-version}}
-      if: contains(matrix.runtime, 'x64')
-      run: npm run pack:browser
+    - name: 📡 Upload PWA Artifact
+      uses: actions/upload-artifact@v3
+      with:
+        name: freetube-${{ steps.versionNumber.outputs.result }}-PWA
+        path: dist/web
 
-    - name: Setup Android SDK Tools
-      if: contains(matrix.runtime, 'x64')
+    - name: 🚧 Setup Android SDK Tools
       uses: android-actions/[email protected]
 
-    - name: Fetch keystore from secrets
+    - name: 📦 Pack for 📱Android with Node.js & Cordova
+      run: yarn pack:cordova
+
+    - name: 🦴 Fetch keystore from secrets
       run: |
          while read -r line;
          do
            echo "${line}" >> freetube.keystore.asc
          done <<< '${{ secrets.KEYSTORE }}'
          gpg -d --passphrase '${{ secrets.KEYSTORE_PASSWORD }}' --batch freetube.keystore.asc >> freetube.keystore
 
-    - name: Build APK with Cordova with Node.js ${{ matrix.node-version}}
-      if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
-      run: npm run build:cordova freetube-${{ steps.versionNumber.outputs.result }}.apk cordova ./freetube.keystore ${{ secrets.KEYSTORE_PASSWORD }}
-
-    - name: Upload Cordova APK Artifact
-      uses: actions/upload-artifact@v3
-      if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
-      with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}.apk
-        path: build/freetube-${{ steps.versionNumber.outputs.result }}.apk
-
-    - name: Build HTML5 with Node.js ${{ matrix.node-version}}
-      if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
-      run: npm run build:cordova freetube browser
+    - name: 👷‍♀️ Build APK with Cordova with Node.js
+      run: yarn build:cordova freetube-${{ steps.versionNumber.outputs.result }}.apk ./freetube.keystore ${{ secrets.KEYSTORE_PASSWORD }}
 
-    - name: Upload Cordova HTML5 Artifact
+    - name: 📡 Upload Cordova APK Artifact
       uses: actions/upload-artifact@v3
-      if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
       with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-HTML5
-        path: build/freetube
+        name: freetube-${{ steps.versionNumber.outputs.result }}-Android.apk
+        path: dist/freetube-${{ steps.versionNumber.outputs.result }}.apk

.github/workflows/conflicts.yml

@@ -7,9 +7,6 @@ on:
   # In `pull_request` we wouldn't be able to change labels of fork PRs
   pull_request_target:
     types: [synchronize]
-  workflow_run:
-    workflows: ['Dummy workflow for conflicts']
-    types: [requested]
 
 jobs:
   main:
@@ -23,3 +20,4 @@ jobs:
           repoToken: "${{ secrets.GITHUB_TOKEN }}"
           commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."
           commentOnClean: "Conflicts have been resolved. A maintainer will review the pull request shortly."
+

.github/workflows/release.yml

@@ -58,7 +58,7 @@ jobs:
     - run: yarn run lint
 
     - name: Get Version Number
-      uses: nyaayaya/package-version@v1
+      uses: jozsefsallai/node-package-version@v1.0.4
       with:
         path: 'package.json'
         follow-symlinks: false