Merge pull request #227 from bamdadsabbagh/next/bamdad

.github/workflows/codeclimate--onPush.yml → .github/workflows/coverage.yml

@@ -1,12 +1,10 @@
-name: codeclimate--onPush
-
+---
+name: coverage
 on:
   push:
-    branches:
-      - master
-
+    branches: [master]
 jobs:
-  codeclimate--onPush:
+  coverage:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@master
@@ -15,5 +13,5 @@ jobs:
         env:
           CC_TEST_REPORTER_ID: ${{ secrets.CODECLIMATE_REPORTER_ID }}
         with:
-          coverageCommand: yarn test:coverage
+          coverageCommand: pnpm test:coverage
           debug: true

.github/workflows/semantic-release-yarn--onPush.yml → .github/workflows/release.yml

@@ -1,25 +1,18 @@
-name: semantic-release-yarn-with-build--onPush
-
+---
+name: release
 on:
   push:
-    branches:
-      - master
-
+    branches: [master]
 jobs:
-  semantic-release-yarn-with-build--onMondays-1030:
+  release:
     runs-on: ubuntu-latest
     steps:
-
       - uses: actions/checkout@master
-
       - uses: actions/setup-node@master
         with:
           node-version: '14'
-
-      - run: yarn
-
-      - run: yarn build
-
+      - run: pnpm i
+      - run: pnpm build
       - run: |
           npm install -g \
             semantic-release \
@@ -31,7 +24,6 @@ jobs:
             semantic-release-chrome \
             semantic-release-firefox-add-on \
             [email protected]
-
       - run: semantic-release
         env:
           GH_TOKEN: ${{ secrets.PAT }}
@@ -40,4 +32,5 @@ jobs:
           FIREFOX_SECRET_KEY: ${{ secrets.FIREFOX_SECRET_KEY }}
           GOOGLE_CLIENT_ID: ${{ secrets.GOOGLE_CLIENT_ID }}
           GOOGLE_CLIENT_SECRET: ${{ secrets.GOOGLE_CLIENT_SECRET }}
-          GOOGLE_REFRESH_TOKEN: ${{ secrets.GOOGLE_REFRESH_TOKEN }}
+          GOOGLE_REFRESH_TOKEN: ${{ secrets.GOOGLE_REFRESH_TOKEN }}
+

README.md

@@ -20,9 +20,9 @@ Add multiple features to <a href="https://www.bandcamp.com/">bandcamp.com</a>
 
 ## 🚀 Download
 
-**[<img height=30 src="https://icons.iconarchive.com/icons/cornmanthe3rd/plex/256/Internet-chrome-icon.png"> Chrome](https://chrome.google.com/webstore/detail/bandcamp%2B/hggjmjobahhmbmnfndhdgidchhhhjkad)**
+**<img height=30 src="https://icons.iconarchive.com/icons/cornmanthe3rd/plex/256/Internet-chrome-icon.png"> [Chrome](https://chrome.google.com/webstore/detail/bandcamp%2B/hggjmjobahhmbmnfndhdgidchhhhjkad)**
 
-**[<img height=30 src="https://icons.iconarchive.com/icons/cornmanthe3rd/plex/256/Internet-firefox-icon.png"> Firefox](https://addons.mozilla.org/firefox/addon/bandcamp)**
+**<img height=30 src="https://icons.iconarchive.com/icons/cornmanthe3rd/plex/256/Internet-firefox-icon.png"> [Firefox](https://addons.mozilla.org/firefox/addon/bandcamp)**
 
 ## 📖 Features
 

bin/prepare.sh → bin/increment.sh

@@ -8,9 +8,10 @@ function update_json() {
 }
 
 path='package.json'
-
 update_json
 
-path='src/manifest.json'
+path='src/manifest-chrome.json'
+update_json
 
+path='src/manifest-firefox.json'
 update_json

package.json

@@ -9,25 +9,30 @@
     "email": "[email protected]"
   },
   "scripts": {
-    "build": "yarn clean && yarn build:webpack && yarn build:ext",
+    "build": "pnpm dev:clean && pnpm build:clean && pnpm build:chrome && pnpm build:firefox",
     "build:clean": "rimraf packages",
-    "build:ext": "web-ext build --source-dir dist",
-    "build:prepare": "./bin/prepare.sh",
-    "build:webpack": "NODE_ENV=production webpack",
-    "clean": "yarn dev:clean && yarn build:clean",
-    "dev": "yarn dev:chrome",
-    "dev:chrome": "yarn dev:clean && concurrently 'yarn dev:webpack' 'wait-on dist/manifest.json && yarn dev:ext:chrome'",
+    "build:increment": "build/increment.sh",
+    "build:chrome": "pnpm build:chrome:webpack && pnpm build:chrome:package",
+    "build:chrome:package": "web-ext build --source-dir dist/chrome --filename chrome.zip",
+    "build:chrome:webpack": "NODE_ENV=production pnpm webpack:chrome",
+    "build:firefox": "pnpm build:firefox:webpack && pnpm build:firefox:package",
+    "build:firefox:package": "web-ext build --source-dir dist/firefox --filename firefox.zip",
+    "build:firefox:webpack": "NODE_ENV=production pnpm webpack:firefox",
     "dev:clean": "rimraf dist",
-    "dev:ext:chrome": "web-ext run -t chromium",
-    "dev:ext:firefox": "web-ext run",
-    "dev:firefox": "yarn dev:clean && concurrently 'yarn dev:webpack' 'wait-on dist/manifest.json && yarn dev:ext:firefox'",
-    "dev:webpack": "webpack",
+    "dev:chrome": "pnpm dev:clean && pnpm dev:chrome:watch",
+    "dev:chrome:run": "web-ext run --source-dir dist/chrome -t chromium",
+    "dev:chrome:watch": "concurrently 'pnpm webpack:chrome' 'wait-on dist/chrome/manifest.json && pnpm dev:chrome:run'",
+    "dev:firefox": "pnpm dev:clean && pnpm dev:firefox:watch",
+    "dev:firefox:run": "web-ext run --source-dir dist/firefox",
+    "dev:firefox:watch": "concurrently 'pnpm webpack:firefox' 'wait-on dist/firefox/manifest.json && pnpm dev:firefox:run'",
     "lint": "eslint src --ext .js --fix",
-    "package:reinstall": "rimraf node_modules && yarn",
+    "package:reinstall": "rimraf node_modules && pnpm",
     "package:sort": "npx sort-package-json",
     "test": "jest",
     "test:coverage": "jest --coverage",
-    "test:watch": "jest --watchAll"
+    "test:watch": "jest --watchAll",
+    "webpack:chrome": "webpack --env chrome",
+    "webpack:firefox": "webpack --env firefox"
   },
   "dependencies": {
     "speed-to-percentage": "^1.2.1",
@@ -45,6 +50,7 @@
     "copy-webpack-plugin": "^11.0.0",
     "jest": "^29.0.2",
     "jest-webextension-mock": "^3.7.22",
+    "prettier": "^3.2.5",
     "rimraf": "^3.0.2",
     "ts-jest": "^28.0.8",
     "ts-loader": "^9.3.1",