Skip to content

Commit

Permalink
Updates of dependencies and CI
Browse files Browse the repository at this point in the history
  • Loading branch information
remusao committed Jul 22, 2023
1 parent 1f49855 commit 0d92f27
Show file tree
Hide file tree
Showing 19 changed files with 583 additions and 313 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/assets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ jobs:
runs-on: ubuntu-latest
if: github.repository_owner == 'ghostery'
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Get yarn cache
id: yarn-cache
run: echo "::set-output name=dir::$(yarn cache dir)"

- uses: actions/cache@v2
- uses: actions/cache@v3
with:
path: ${{ steps.yarn-cache.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
Expand Down Expand Up @@ -53,7 +53,7 @@ jobs:
private_key: ${{ secrets.ADBLOCKERBOT_PRIVATE_KEY }}

- name: Create Pull Request
uses: peter-evans/create-pull-request@v3
uses: peter-evans/create-pull-request@v5
with:
token: ${{ steps.generate-token.outputs.token }}
committer: Ghostery Adblocker Bot <ghostery-adblocker-bot@users.noreply.github.com>
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, 'ci skip') && !contains(github.event.head_commit.message, 'skip ci')"
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Prepare repository
run: |
Expand All @@ -22,7 +22,7 @@ jobs:
id: yarn-cache
run: echo "::set-output name=dir::$(yarn cache dir)"

- uses: actions/cache@v2
- uses: actions/cache@v3
with:
path: ${{ steps.yarn-cache.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ jobs:

strategy:
matrix:
node: [14, 16, 19]
node: [16, 18, 20]
os: [ubuntu-latest]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Use node ${{ matrix.node }}
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node }}
registry-url: https://registry.npmjs.org
Expand All @@ -26,7 +26,7 @@ jobs:
id: yarn-cache
run: echo "::set-output name=dir::$(yarn cache dir)"

- uses: actions/cache@v2
- uses: actions/cache@v3
with:
path: ${{ steps.yarn-cache.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,12 @@
"devDependencies": {
"@remusao/auto-config": "^1.1.1",
"@types/benchmark": "^2.1.0",
"@types/node": "^18.11.3",
"@types/node": "^20.4.3",
"auto": "^10.27.0",
"benchmark": "^2.1.4",
"chalk": "^5.0.0",
"chalk": "^5.3.0",
"lerna": "^6.0.1",
"prettier": "^2.0.4",
"prettier": "^3.0.0",
"tslint-no-unused-expression-chai": "^0.1.4"
},
"dependencies": {},
Expand Down
6 changes: 3 additions & 3 deletions packages/adblocker-benchmarks/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
},
"dependencies": {
"@cliqz/adblocker": "^1.26.6",
"tldts-experimental": "^6.0.1"
"tldts-experimental": "^6.0.11"
},
"contributors": [
{
Expand Down Expand Up @@ -64,9 +64,9 @@
}
],
"devDependencies": {
"@rollup/plugin-commonjs": "^24.0.0",
"@rollup/plugin-commonjs": "^25.0.3",
"@rollup/plugin-json": "^6.0.0",
"rollup": "^3.2.3",
"rollup": "^3.26.3",
"rollup-plugin-terser": "^7.0.2"
}
}
12 changes: 6 additions & 6 deletions packages/adblocker-content/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,17 @@
"@cliqz/adblocker-extended-selectors": "^1.26.6"
},
"devDependencies": {
"@rollup/plugin-node-resolve": "^15.0.1",
"@rollup/plugin-typescript": "^11.0.0",
"@types/node": "^18.11.3",
"rimraf": "^4.0.7",
"rollup": "^3.2.3",
"@rollup/plugin-node-resolve": "^15.1.0",
"@rollup/plugin-typescript": "^11.1.2",
"@types/node": "^20.4.3",
"rimraf": "^5.0.1",
"rollup": "^3.26.3",
"rollup-plugin-sourcemaps": "^0.6.1",
"rollup-plugin-terser": "^7.0.0",
"tslint": "^6.0.0",
"tslint-config-prettier": "^1.18.0",
"tslint-no-unused-expression-chai": "^0.1.4",
"typescript": "^5.0.4"
"typescript": "^5.1.6"
},
"contributors": [
{
Expand Down
4 changes: 2 additions & 2 deletions packages/adblocker-electron-example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,14 @@
],
"dependencies": {
"@cliqz/adblocker-electron": "^1.26.6",
"electron": "^24.0.0",
"electron": "^25.3.1",
"node-fetch": "^3.0.0",
"ts-node": "^10.0.0"
},
"devDependencies": {
"@types/node-fetch": "^3.0.3",
"tslint": "^6.0.0",
"tslint-config-prettier": "^1.18.0",
"typescript": "^5.0.4"
"typescript": "^5.1.6"
}
}
16 changes: 8 additions & 8 deletions packages/adblocker-electron-preload/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,18 @@
"@cliqz/adblocker-content": "^1.26.6"
},
"devDependencies": {
"@rollup/plugin-commonjs": "^24.0.0",
"@rollup/plugin-node-resolve": "^15.0.1",
"@rollup/plugin-typescript": "^11.0.0",
"@types/chrome": "^0.0.228",
"electron": "^24.0.0",
"rimraf": "^4.0.7",
"rollup": "^3.2.3",
"@rollup/plugin-commonjs": "^25.0.3",
"@rollup/plugin-node-resolve": "^15.1.0",
"@rollup/plugin-typescript": "^11.1.2",
"@types/chrome": "^0.0.241",
"electron": "^25.3.1",
"rimraf": "^5.0.1",
"rollup": "^3.26.3",
"rollup-plugin-sourcemaps": "^0.6.1",
"tslint": "^6.0.0",
"tslint-config-prettier": "^1.18.0",
"tslint-no-unused-expression-chai": "^0.1.4",
"typescript": "^5.0.4"
"typescript": "^5.1.6"
},
"contributors": [
{
Expand Down
8 changes: 4 additions & 4 deletions packages/adblocker-electron/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,21 +39,21 @@
"dependencies": {
"@cliqz/adblocker": "^1.26.6",
"@cliqz/adblocker-electron-preload": "^1.26.6",
"tldts-experimental": "^6.0.1"
"tldts-experimental": "^6.0.11"
},
"devDependencies": {
"@types/chai": "^4.2.18",
"@types/mocha": "^10.0.0",
"chai": "^4.2.0",
"electron": "^24.0.0",
"electron": "^25.3.1",
"mocha": "^10.1.0",
"nyc": "^15.0.0",
"rimraf": "^4.0.7",
"rimraf": "^5.0.1",
"ts-node": "^10.0.0",
"tslint": "^6.0.0",
"tslint-config-prettier": "^1.18.0",
"tslint-no-unused-expression-chai": "^0.1.4",
"typescript": "^5.0.4"
"typescript": "^5.1.6"
},
"contributors": [
{
Expand Down
8 changes: 4 additions & 4 deletions packages/adblocker-extended-selectors/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,18 +38,18 @@
"@types/chai-as-promised": "^7.1.4",
"@types/jsdom": "^21.1.0",
"@types/mocha": "^10.0.0",
"@types/node": "^18.11.3",
"@types/node": "^20.4.3",
"chai": "^4.2.0",
"chai-as-promised": "^7.1.1",
"jsdom": "^21.0.0",
"jsdom": "^22.1.0",
"mocha": "^10.1.0",
"nyc": "^15.0.0",
"rimraf": "^4.0.7",
"rimraf": "^5.0.1",
"ts-node": "^10.0.0",
"tslint": "^6.0.0",
"tslint-config-prettier": "^1.18.0",
"tslint-no-unused-expression-chai": "^0.1.4",
"typescript": "^5.0.4"
"typescript": "^5.1.6"
},
"contributors": [
{
Expand Down
4 changes: 2 additions & 2 deletions packages/adblocker-playwright-example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@
"dependencies": {
"@cliqz/adblocker-playwright": "^1.26.6",
"node-fetch": "^3.0.0",
"playwright": "^1.x",
"playwright": "^1.36.1",
"ts-node": "^10.0.0"
},
"devDependencies": {
"@types/node-fetch": "^3.0.3",
"tslint": "^6.0.0",
"tslint-config-prettier": "^1.18.0",
"typescript": "^5.0.4"
"typescript": "^5.1.6"
},
"contributors": [
{
Expand Down
8 changes: 4 additions & 4 deletions packages/adblocker-playwright/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,19 +39,19 @@
"dependencies": {
"@cliqz/adblocker": "^1.26.6",
"@cliqz/adblocker-content": "^1.26.6",
"tldts-experimental": "^6.0.1"
"tldts-experimental": "^6.0.11"
},
"devDependencies": {
"@types/chai": "^4.2.18",
"@types/mocha": "^10.0.0",
"chai": "^4.2.0",
"mocha": "^10.1.0",
"nyc": "^15.0.0",
"playwright": "^1.x",
"rimraf": "^4.0.7",
"playwright": "^1.36.1",
"rimraf": "^5.0.1",
"tslint": "^6.0.0",
"tslint-config-prettier": "^1.18.0",
"typescript": "^5.0.4"
"typescript": "^5.1.6"
},
"contributors": [
{
Expand Down
4 changes: 2 additions & 2 deletions packages/adblocker-puppeteer-example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@
"dependencies": {
"@cliqz/adblocker-puppeteer": "^1.26.6",
"node-fetch": "^3.0.0",
"puppeteer": "19.8.5",
"puppeteer": "20.9.0",
"ts-node": "^10.0.0"
},
"devDependencies": {
"@types/node-fetch": "^3.0.3",
"tslint": "^6.0.0",
"tslint-config-prettier": "^1.18.0",
"typescript": "^5.0.4"
"typescript": "^5.1.6"
},
"contributors": [
{
Expand Down
8 changes: 4 additions & 4 deletions packages/adblocker-puppeteer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,21 +39,21 @@
"dependencies": {
"@cliqz/adblocker": "^1.26.6",
"@cliqz/adblocker-content": "^1.26.6",
"tldts-experimental": "^6.0.1"
"tldts-experimental": "^6.0.11"
},
"devDependencies": {
"@types/chai": "^4.2.18",
"@types/mocha": "^10.0.0",
"chai": "^4.2.0",
"mocha": "^10.1.0",
"nyc": "^15.0.0",
"puppeteer": "19.8.5",
"rimraf": "^4.0.7",
"puppeteer": "20.9.0",
"rimraf": "^5.0.1",
"ts-node": "^10.0.0",
"tslint": "^6.0.0",
"tslint-config-prettier": "^1.18.0",
"tslint-no-unused-expression-chai": "^0.1.4",
"typescript": "^5.0.4"
"typescript": "^5.1.6"
},
"contributors": [
{
Expand Down
18 changes: 9 additions & 9 deletions packages/adblocker-webextension-cosmetics/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,29 +68,29 @@
}
],
"devDependencies": {
"@rollup/plugin-node-resolve": "^15.0.1",
"@rollup/plugin-typescript": "^11.0.0",
"@rollup/plugin-node-resolve": "^15.1.0",
"@rollup/plugin-typescript": "^11.1.2",
"@types/chai": "^4.2.18",
"@types/chrome": "^0.0.228",
"@types/chrome": "^0.0.241",
"@types/jsdom": "^21.1.0",
"@types/mocha": "^10.0.0",
"@types/sinon": "^10.0.0",
"@types/sinon": "^10.0.15",
"@types/sinon-chai": "^3.2.3",
"chai": "^4.2.0",
"jsdom": "^21.0.0",
"jsdom": "^22.1.0",
"mocha": "^10.1.0",
"nyc": "^15.0.0",
"rimraf": "^4.0.7",
"rollup": "^3.2.3",
"rimraf": "^5.0.1",
"rollup": "^3.26.3",
"rollup-plugin-sourcemaps": "^0.6.1",
"rollup-plugin-terser": "^7.0.0",
"sinon": "^15.0.0",
"sinon": "^15.2.0",
"sinon-chai": "^3.5.0",
"ts-node": "^10.0.0",
"tslint": "^6.0.0",
"tslint-config-prettier": "^1.18.0",
"tslint-no-unused-expression-chai": "^0.1.4",
"typescript": "^5.0.4"
"typescript": "^5.1.6"
},
"dependencies": {
"@cliqz/adblocker-content": "^1.26.6",
Expand Down
14 changes: 7 additions & 7 deletions packages/adblocker-webextension-example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,16 @@
"webextension-polyfill-ts": "^0.26.0"
},
"devDependencies": {
"@rollup/plugin-commonjs": "^24.0.0",
"@rollup/plugin-node-resolve": "^15.0.1",
"@rollup/plugin-typescript": "^11.0.0",
"@types/chrome": "^0.0.228",
"rimraf": "^4.0.7",
"rollup": "^3.2.3",
"@rollup/plugin-commonjs": "^25.0.3",
"@rollup/plugin-node-resolve": "^15.1.0",
"@rollup/plugin-typescript": "^11.1.2",
"@types/chrome": "^0.0.241",
"rimraf": "^5.0.1",
"rollup": "^3.26.3",
"rollup-plugin-sourcemaps": "^0.6.1",
"tslint": "^6.0.0",
"tslint-config-prettier": "^1.18.0",
"typescript": "^5.0.4"
"typescript": "^5.1.6"
},
"contributors": [
{
Expand Down
Loading

0 comments on commit 0d92f27

Please sign in to comment.