[pull] master from gorhill:master

.github/ISSUE_TEMPLATE/config.yml

@@ -10,5 +10,5 @@ contact_links:
     url: https://github.com/uBlockOrigin/uAssets/issues
     about: Report issues with filter lists or broken website functionality in the uAssets issue tracker.
   - name: uBO Lite (uBOL) Issues
-    url: https://github.com/uBlockOrigin/uBOL-issues/issues
+    url: https://github.com/uBlockOrigin/uBOL-home/issues
     about: Report issues specific to the Manifest Version 3 (MV3) variant in the uBOL issue tracker.

.github/workflows/main.yml

@@ -7,9 +7,6 @@ on:
 permissions:
   contents: read
 
-# I used the following project as template to get started:
-# https://github.com/dessant/search-by-image/blob/master/.github/workflows/ci.yml
-
 jobs:
   build:
     permissions:
@@ -25,66 +22,31 @@ jobs:
       - name: Clone uAssets
         run: |
           tools/pull-assets.sh
-      # https://www.gnu.org/software/bash/manual/html_node/Shell-Parameter-Expansion.html
       - name: Get release information
-        id: release_info
         run: |
-          echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
+          echo "VERSION=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
+      - name: Build MV2 packages
+        run: |
+          tools/make-chromium.sh ${{ env.VERSION }}
+          tools/make-firefox.sh ${{ env.VERSION }}
+          tools/make-thunderbird.sh ${{ env.VERSION }}
       - name: Assemble release notes
         run: |
           > release.body.txt
           grep -m1 -B10000 -- "----------" CHANGELOG.md >> release.body.txt
-          sed -e 's/%version%/${{ steps.release_info.outputs.VERSION }}/g' RELEASE.HEAD.md >> release.body.txt
+          sed -e 's/%version%/${{ env.VERSION }}/g' RELEASE.HEAD.md >> release.body.txt
       - name: Create GitHub release
         id: create_release
-        uses: actions/create-release@v1
+        uses: softprops/action-gh-release@v2
         env:
           GITHUB_TOKEN: ${{ github.token }}
         with:
-          tag_name: ${{ steps.release_info.outputs.VERSION }}
-          release_name: ${{ steps.release_info.outputs.VERSION }}
+          tag_name: ${{ env.VERSION }}
+          name: ${{ env.VERSION }}
           draft: true
           prerelease: true
           body_path: release.body.txt
-      - name: Build MV2 packages
-        run: |
-          tools/make-chromium.sh ${{ steps.release_info.outputs.VERSION }}
-          tools/make-firefox.sh ${{ steps.release_info.outputs.VERSION }}
-          tools/make-thunderbird.sh ${{ steps.release_info.outputs.VERSION }}
-          tools/make-npm.sh ${{ steps.release_info.outputs.VERSION }}
-      - name: Upload Chromium package
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: dist/build/uBlock0_${{ steps.release_info.outputs.VERSION }}.chromium.zip
-          asset_name: uBlock0_${{ steps.release_info.outputs.VERSION }}.chromium.zip
-          asset_content_type: application/octet-stream
-      - name: Upload Firefox package
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: dist/build/uBlock0_${{ steps.release_info.outputs.VERSION }}.firefox.xpi
-          asset_name: uBlock0_${{ steps.release_info.outputs.VERSION }}.firefox.xpi
-          asset_content_type: application/octet-stream
-      - name: Upload Thunderbird package
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: dist/build/uBlock0_${{ steps.release_info.outputs.VERSION }}.thunderbird.xpi
-          asset_name: uBlock0_${{ steps.release_info.outputs.VERSION }}.thunderbird.xpi
-          asset_content_type: application/octet-stream
-      - name: Upload NodeJS package
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: dist/build/uBlock0_${{ steps.release_info.outputs.VERSION }}.npm.tgz
-          asset_name: uBlock0_${{ steps.release_info.outputs.VERSION }}.npm.tgz
-          asset_content_type: application/octet-stream
+          files: |
+            dist/build/uBlock0_${{ env.VERSION }}.chromium.zip
+            dist/build/uBlock0_${{ env.VERSION }}.firefox.xpi
+            dist/build/uBlock0_${{ env.VERSION }}.thunderbird.xpi

.gitignore

@@ -1,4 +1,7 @@
 *.bak
 *.pem
+__pycache__/
+node_modules/
 /dist/build/
 /tmp/
+.DS_Store

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "platform/mv3/extension/lib/codemirror/codemirror-ubol"]
+	path = platform/mv3/extension/lib/codemirror/codemirror-ubol
+	url = https://github.com/gorhill/codemirror-ubol.git