Skip to content

Commit

Permalink
Merge pull request #386 from bamdadsabbagh/next/bamdad
Browse files Browse the repository at this point in the history
  • Loading branch information
bamdadfr authored Mar 26, 2024
2 parents 49a18bd + 50ef827 commit 38d770a
Show file tree
Hide file tree
Showing 14 changed files with 10,887 additions and 9,151 deletions.
22 changes: 11 additions & 11 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
---
# These are supported funding model platforms

github: [bamdadsabbagh]
patreon: # Replace with a single Patreon username
open_collective: # Replace with a single Open Collective username
ko_fi: bamdadsabbagh
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
liberapay: # Replace with a single Liberapay username
issuehunt: # Replace with a single IssueHunt username
otechie: # Replace with a single Otechie username
lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
patreon: # Replace with a single Patreon username
open_collective: # Replace with a single Open Collective username
ko_fi: # bamdadsabbagh
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
liberapay: # Replace with a single Liberapay username
issuehunt: # Replace with a single IssueHunt username
otechie: # Replace with a single Otechie username
lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
name: codeclimate--onPush

---
name: coverage
on:
push:
branches:
- master

branches: [master]
jobs:
codeclimate--onPush:
coverage:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- run: yarn
- uses: actions/setup-node@master
with:
node-version: '20'
- run: npm install -g pnpm
- run: pnpm i
- uses: paambaati/[email protected]
env:
CC_TEST_REPORTER_ID: ${{ secrets.CODECLIMATE_REPORTER_ID }}
with:
coverageCommand: yarn test:coverage
coverageCommand: pnpm test:coverage
debug: true
Original file line number Diff line number Diff line change
@@ -1,25 +1,19 @@
name: semantic-release-yarn-with-build--onPush

---
name: release
on:
push:
branches:
- master

branches: [master]
jobs:
semantic-release-yarn-with-build--onPush:
release:
runs-on: ubuntu-latest
steps:

- uses: actions/checkout@master

- uses: actions/setup-node@master
with:
node-version: '14'

- run: yarn

- run: yarn build

node-version: '20'
- run: npm install -g pnpm
- run: pnpm i
- run: pnpm build
- run: |
npm install -g \
semantic-release \
Expand All @@ -31,7 +25,6 @@ jobs:
semantic-release-chrome \
semantic-release-firefox-add-on \
[email protected]
- run: semantic-release
env:
GH_TOKEN: ${{ secrets.PAT }}
Expand Down
16 changes: 0 additions & 16 deletions bin/prepare.sh

This file was deleted.

17 changes: 17 additions & 0 deletions build/increment.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#!/bin/bash

next_version=$1

function update_json() {
new_json="$(jq -r '.version = "'$next_version'"' $path)"
echo "$new_json" >$path
}

path='package.json'
update_json

path='src/manifest-chrome.json'
update_json

path='src/manifest-firefox.json'
update_json
84 changes: 46 additions & 38 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,55 +9,63 @@
"url": "https://bamdadsabbagh.com/"
},
"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: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:watch": "jest --watchAll",
"test:coverage": "jest --coverage"
"test:coverage": "jest --coverage",
"webpack:chrome": "webpack --env chrome",
"webpack:firefox": "webpack --env firefox"
},
"dependencies": {
"jspdf": "2.5.1"
},
"devDependencies": {
"@babel/core": "^7.17.0",
"@babel/plugin-transform-runtime": "^7.17.0",
"@babel/preset-env": "^7.14.7",
"@bamdadsabbagh/eslint-config": "^2.0.4",
"@bamdadsabbagh/stylelint-config": "^1.2.43",
"@types/chrome": "^0.0.177",
"@types/jest": "^27.4.0",
"@types/node": "^17.0.14",
"babel-loader": "^8.2.2",
"concurrently": "^7.0.0",
"copy-webpack-plugin": "^10.0.0",
"css-minimizer-webpack-plugin": "^3.0.2",
"html-minimizer-webpack-plugin": "^3.4.0",
"jest": "^27.4.7",
"jest-canvas-mock": "^2.3.1",
"jest-webextension-mock": "^3.7.19",
"rimraf": "^3.0.2",
"terser-webpack-plugin": "^5.3.1",
"ts-jest": "^27.1.3",
"ts-loader": "^9.2.6",
"ts-node": "^10.4.0",
"typescript": "^4.5.5",
"wait-on": "^6.0.0",
"web-ext": "^6.3.0",
"webpack": "^5.68.0",
"webpack-cli": "^4.7.2"
"@babel/core": "^7.24.3",
"@babel/plugin-transform-runtime": "^7.24.3",
"@babel/preset-env": "^7.24.3",
"@bamdadsabbagh/eslint-config": "^2.0.26",
"@bamdadsabbagh/stylelint-config": "^1.3.57",
"@types/chrome": "^0.0.263",
"@types/jest": "^29.5.12",
"@types/node": "^20.11.30",
"babel-loader": "^9.1.3",
"concurrently": "^8.2.2",
"copy-webpack-plugin": "^12.0.2",
"css-minimizer-webpack-plugin": "^6.0.0",
"html-minimizer-webpack-plugin": "^5.0.0",
"jest": "^29.7.0",
"jest-canvas-mock": "^2.5.2",
"jest-environment-jsdom": "^29.7.0",
"jest-webextension-mock": "^3.8.9",
"prettier": "^3.2.5",
"rimraf": "^5.0.5",
"terser-webpack-plugin": "^5.3.10",
"ts-jest": "^29.1.2",
"ts-loader": "^9.5.1",
"ts-node": "^10.9.2",
"typescript": "^5.4.3",
"wait-on": "^7.2.0",
"web-ext": "^7.11.0",
"webpack": "^5.91.0",
"webpack-cli": "^5.1.4"
},
"webExt": {
"sourceDir": "dist",
Expand Down
Loading

0 comments on commit 38d770a

Please sign in to comment.