Merge branch 'master' into feat/vue3

.github/workflows/release.yml

@@ -57,11 +57,12 @@ jobs:
         run: |
           mkdir -p $TEMP_DIR/updates
           if [ "$PRERELEASE" != "true" ]; then
-              # Publish listed version, ignore error since we don't need to download it
-              node scripts/amo-upload.mjs || 0
+            # Publish listed version, ignore error since we don't need to download it
+            node scripts/amo-upload.mjs || 0
+          else
+            # Publish unlisted version
+            BETA=1 node scripts/amo-upload.mjs
           fi
-          # Publish unlisted version
-          BETA=1 node scripts/amo-upload.mjs
         env:
           AMO_KEY: ${{ secrets.AMO_KEY }}
           AMO_SECRET: ${{ secrets.AMO_SECRET }}
@@ -82,9 +83,10 @@ jobs:
           if [ "$PRERELEASE" != "true" ]; then
             # Publish release
             npx chrome-webstore-upload-cli@1 upload --extension-id $EXTENSION_ID_RELEASE --source $ASSETS_DIR/$ASSET_ZIP --auto-publish
+          else
+            # Publish prerelease
+            npx chrome-webstore-upload-cli@1 upload --extension-id $EXTENSION_ID_BETA --source $TEMP_DIR/$ASSET_CWS_BETA_ZIP --auto-publish
           fi
-          # Always publish prerelease
-          npx chrome-webstore-upload-cli@1 upload --extension-id $EXTENSION_ID_BETA --source $TEMP_DIR/$ASSET_CWS_BETA_ZIP --auto-publish
         env:
           EXTENSION_ID_BETA: opokoaglpekkimldnlggpoagmjegichg
           EXTENSION_ID_RELEASE: jinjaccalgkegednnccohejagnlnfdag

package.json

@@ -1,7 +1,7 @@
 {
   "name": "violentmonkey",
   "description": "Violentmonkey",
-  "version": "2.13.0",
+  "version": "2.13.1",
   "scripts": {
     "prepare": "husky install",
     "dev": "gulp dev",
@@ -50,6 +50,7 @@
     "sharp": "^0.31.0",
     "through2": "^4.0.2",
     "vinyl": "^2.2.1",
+    "vue-eslint-parser": "^9.0.3",
     "wrapper-webpack-plugin": "2.2.2"
   },
   "author": "Gerald <[email protected]>",

scripts/amo-upload.mjs

@@ -37,7 +37,7 @@ async function main() {
     channel: beta ? 'unlisted' : 'listed',
     distFile: beta
       ? join(process.env.TEMP_DIR, process.env.ASSET_SELF_HOSTED_ZIP)
-      : join(process.env.ASSETS_DIR, process.env.ASSETS_ZIP),
+      : join(process.env.ASSETS_DIR, process.env.ASSET_ZIP),
     sourceFile: join(process.env.TEMP_DIR, process.env.SOURCE_ZIP),
     output: tempFile,
     ...pollOptions,