Skip to content

Commit 5bc20ea

Browse files
authored
Merge branch 'main' into dependabot/npm_and_yarn/providers/cross-env-10.1.0
2 parents a270c7b + cba17a2 commit 5bc20ea

4 files changed

Lines changed: 40 additions & 29 deletions

File tree

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: Dependabot Force Rebase
2+
on:
3+
pull_request:
4+
types: [opened, synchronize, reopened]
5+
6+
jobs:
7+
rebase:
8+
runs-on: ubuntu-latest
9+
if: github.actor == 'dependabot[bot]'
10+
permissions:
11+
contents: write # 👈 allows pushing commits to branches
12+
pull-requests: write # 👈 allows updating PR metadata
13+
steps:
14+
- uses: peter-evans/rebase@v4

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@
6565
},
6666
"devDependencies": {
6767
"@istanbuljs/nyc-config-typescript": "^1.0.2",
68-
"@microsoft/rush": "5.163.0",
69-
"@nevware21/grunt-eslint-ts": "0.2.4",
70-
"@nevware21/grunt-ts-plugin": "0.4.5",
68+
"@microsoft/rush": "5.164.0",
69+
"@nevware21/grunt-eslint-ts": "0.5.1",
70+
"@nevware21/grunt-ts-plugin": "0.5.1",
7171
"@nevware21/coverage-tools": "^0.1.3",
7272
"@nevware21/publish-npm": "^0.1.3",
7373
"@types/eslint": "^8.4.2",
@@ -86,7 +86,7 @@
8686
"typedoc": "^0.28.15",
8787
"typedoc-github-theme": "^0.3.0",
8888
"typescript": "~5.2.2",
89-
"nyc": "^15.1.0",
89+
"nyc": "^17.1.0",
9090
"codecov": "^3.8.3",
9191
"copyfiles": "^2.4.1"
9292
}

providers/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,11 @@
6767
"@nevware21/coverage-tools": "^0.1.3",
6868
"@nevware21/tripwire": ">= 0.1.2 < 2.x",
6969
"@istanbuljs/nyc-config-typescript": "^1.0.2",
70-
"@rollup/plugin-commonjs": "^24.0.0",
70+
"@rollup/plugin-commonjs": "^29.0.0",
7171
"@rollup/plugin-json": "^6.0.0",
72-
"@rollup/plugin-node-resolve": "^15.0.1",
72+
"@rollup/plugin-node-resolve": "^16.0.3",
7373
"@rollup/plugin-strip": "^3.0.2",
74-
"@rollup/plugin-typescript": "^11.0.0",
74+
"@rollup/plugin-typescript": "^12.3.0",
7575
"@types/mocha": "^10.0.1",
7676
"@types/sinon": "^10.0.11",
7777
"cross-env": "^10.1.0",
@@ -91,9 +91,9 @@
9191
"mocha": "^10.0.0",
9292
"nyc": "^17.0.0",
9393
"puppeteer": "24.33.1",
94-
"rollup": "^3.8.1",
94+
"rollup": "^4.54.0",
9595
"rollup-plugin-minify-es": "^1.1.1",
96-
"rollup-plugin-istanbul": "^4.0.0",
96+
"rollup-plugin-istanbul": "^5.0.0",
9797
"rollup-plugin-cleanup": "^3.2.1",
9898
"sinon": "^15.0.0",
9999
"ts-mocha": "^10.0.0",

rush.json

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,18 @@
1-
21
{
3-
"$schema": "https://developer.microsoft.com/json-schemas/rush/v5/rush.schema.json",
4-
5-
"npmVersion": "9.9.4",
6-
"rushVersion": "5.163.0",
7-
"projectFolderMaxDepth": 4,
8-
"projects": [
9-
{
10-
"packageName": "@nevware21/ts-debug",
11-
"projectFolder": "dbg",
12-
"shouldPublish": true
13-
},
14-
{
15-
"packageName": "@nevware21/ts-debug-providers",
16-
"projectFolder": "providers",
17-
"shouldPublish": true
18-
}
19-
]
20-
}
21-
2+
"$schema": "https://developer.microsoft.com/json-schemas/rush/v5/rush.schema.json",
3+
"npmVersion": "9.9.4",
4+
"rushVersion": "5.164.0",
5+
"projectFolderMaxDepth": 4,
6+
"projects": [
7+
{
8+
"packageName": "@nevware21/ts-debug",
9+
"projectFolder": "dbg",
10+
"shouldPublish": true
11+
},
12+
{
13+
"packageName": "@nevware21/ts-debug-providers",
14+
"projectFolder": "providers",
15+
"shouldPublish": true
16+
}
17+
]
18+
}

0 commit comments

Comments
 (0)