Skip to content

Commit a6575fb

Browse files
authored
Merge branch 'master' into renovate/webpack-5.x
2 parents 4ab4d04 + 0568c4e commit a6575fb

4 files changed

Lines changed: 47 additions & 36 deletions

File tree

.github/mergify.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,19 @@ pull_request_rules:
66
label:
77
toggle:
88
- conflict
9+
10+
- name: Automatic merge on approval
11+
conditions:
12+
- "#commits-behind=0"
13+
- or:
14+
- "#approved-reviews-by>=1"
15+
- label=ci:auto-merge
16+
- not:
17+
and:
18+
- "head*=renovate/lockfile-maintenance-*"
19+
- "created-at>24h ago"
20+
- base=master
21+
- check-success=build
22+
actions:
23+
merge:
24+
method: squash

.github/renovate.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,10 @@
1818
],
1919
"separateMajorMinor": false,
2020
"updateNotScheduled": false,
21-
"rangeStrategy": "bump"
21+
"rangeStrategy": "bump",
22+
"labels": [
23+
"ci:auto-merge",
24+
"dependencies"
25+
],
26+
"prConcurrentLimit": 3
2227
}

package-lock.json

Lines changed: 20 additions & 30 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"private": true,
2222
"dependencies": {
2323
"@trim21/gm-fetch": "^0.3.0",
24-
"jquery": "^3.7.1"
24+
"jquery": "^4.0.0"
2525
},
2626
"lint-staged": {
2727
"*.{js,jsx,ts,tsx,json}": [
@@ -30,14 +30,14 @@
3030
},
3131
"devDependencies": {
3232
"@types/greasemonkey": "^4.0.7",
33-
"@types/jquery": "^3.5.33",
33+
"@types/jquery": "^4.0.0",
3434
"@types/node": "^22.17.0",
3535
"browserslist": "^4.28.1",
3636
"cross-env": "^10.1.0",
37-
"css-loader": "^7.1.3",
37+
"css-loader": "^7.1.4",
3838
"husky": "^9.1.7",
3939
"less": "^4.5.1",
40-
"less-loader": "^12.3.0",
40+
"less-loader": "^12.3.1",
4141
"lint-staged": "^16.2.7",
4242
"prettier": "^3.8.1",
4343
"style-loader": "^4.0.0",
@@ -49,6 +49,6 @@
4949
"webpack-cli": "^6.0.1",
5050
"webpack-livereload-plugin": "^3.0.2",
5151
"webpack-merge": "^6.0.1",
52-
"webpack-sources": "^3.3.3"
52+
"webpack-sources": "^3.3.4"
5353
}
5454
}

0 commit comments

Comments
 (0)