Skip to content

Commit aa47dbc

Browse files
author
GitHub Workflow
committed
Merge branch 'main' into v1
2 parents ef136d7 + 9e8c1f4 commit aa47dbc

File tree

6 files changed

+33
-27
lines changed

6 files changed

+33
-27
lines changed

.github/renovate.json5

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,13 @@
77
"github>microsoft/m365-renovate-config:scheduleNoisy"
88
],
99

10-
// Ignore default semantic commit config (see packageRules below)
11-
"ignorePresets": [":semanticPrefixFixDepsChoreOthers"],
10+
11+
"ignorePresets": [
12+
// Ignore default semantic commit config (see packageRules below)
13+
":semanticPrefixFixDepsChoreOthers",
14+
// Automatically make PRs for major version updates
15+
"github>microsoft/m365-renovate-config:dependencyDashboardMajor"
16+
],
1217

1318
"labels": ["renovate"],
1419

.github/workflows/ci.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ on:
66
- main
77
# validate configs that are pushed to a branch
88
- v1
9-
# validate renovate updates
10-
- 'renovate/*'
119

1210
concurrency:
1311
group: ${{ github.ref }}-ci

README.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -697,25 +697,25 @@ Disable upgrades to package versions that have been converted to ES modules.
697697
```json
698698
{
699699
"packageRules": [
700+
{
701+
"matchPackageNames": ["p-limit"],
702+
"allowedVersions": "<4.0.0"
703+
},
700704
{
701705
"matchPackageNames": ["chalk"],
702706
"allowedVersions": "<5.0.0"
703707
},
704708
{
705-
"matchPackageNames": ["execa", "find-up", "pretty-bytes"],
709+
"matchPackageNames": ["ansi-regex", "execa", "find-up", "pretty-bytes"],
706710
"allowedVersions": "<6.0.0"
707711
},
708-
{
709-
"matchPackageNames": ["globby"],
710-
"allowedVersions": "<12.0.0"
711-
},
712-
{
713-
"matchPackageNames": ["p-limit"],
714-
"allowedVersions": "<4.0.0"
715-
},
716712
{
717713
"matchPackageNames": ["supports-color"],
718714
"allowedVersions": "<9.0.0"
715+
},
716+
{
717+
"matchPackageNames": ["globby"],
718+
"allowedVersions": "<12.0.0"
719719
}
720720
]
721721
}

disableEsmVersions.json

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@
22
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
33
"description": "Disable upgrades to package versions that have been converted to ES modules.",
44
"packageRules": [
5-
{ "matchPackageNames": ["chalk"], "allowedVersions": "<5.0.0" },
6-
{ "matchPackageNames": ["execa", "find-up", "pretty-bytes"], "allowedVersions": "<6.0.0" },
7-
{ "matchPackageNames": ["globby"], "allowedVersions": "<12.0.0" },
85
{ "matchPackageNames": ["p-limit"], "allowedVersions": "<4.0.0" },
9-
{ "matchPackageNames": ["supports-color"], "allowedVersions": "<9.0.0" }
6+
{ "matchPackageNames": ["chalk"], "allowedVersions": "<5.0.0" },
7+
{
8+
"matchPackageNames": ["ansi-regex", "execa", "find-up", "pretty-bytes"],
9+
"allowedVersions": "<6.0.0"
10+
},
11+
{ "matchPackageNames": ["supports-color"], "allowedVersions": "<9.0.0" },
12+
{ "matchPackageNames": ["globby"], "allowedVersions": "<12.0.0" }
1013
]
1114
}

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@
2626
"@semantic-release/exec": "6.0.3",
2727
"@semantic-release/git": "10.0.1",
2828
"@types/jju": "1.4.2",
29-
"@types/node": "16.11.56",
29+
"@types/node": "16.11.59",
3030
"conventional-changelog-conventionalcommits": "5.0.0",
3131
"execa": "6.1.0",
3232
"husky": "8.0.1",
3333
"jju": "1.4.0",
3434
"prettier": "2.7.1",
3535
"renovate": "32.195.1",
3636
"semantic-release": "19.0.5",
37-
"typescript": "4.7.4"
37+
"typescript": "4.8.3"
3838
},
3939
"release": {
4040
"branches": [

yarn.lock

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1997,10 +1997,10 @@
19971997
resolved "https://registry.yarnpkg.com/@types/moo/-/moo-0.5.5.tgz#83220b7349c59fd4bb1bc14b1d4ea0041899dc15"
19981998
integrity sha512-eXQpwnkI4Ntw5uJg6i2PINdRFWLr55dqjuYQaLHNjvqTzF14QdNWbCbml9sza0byyXNA0hZlHtcdN+VNDcgVHA==
19991999

2000-
"@types/node@*", "@types/[email protected].56":
2001-
version "16.11.56"
2002-
resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.56.tgz#dcbb617669481e158e0f1c6204d1c768cd675901"
2003-
integrity sha512-aFcUkv7EddxxOa/9f74DINReQ/celqH8DiB3fRYgVDM2Xm5QJL8sl80QKuAnGvwAsMn+H3IFA6WCrQh1CY7m1A==
2000+
"@types/node@*", "@types/[email protected].59":
2001+
version "16.11.59"
2002+
resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.59.tgz#823f238b9063ccc3b3b7f13186f143a57926c4f6"
2003+
integrity sha512-6u+36Dj3aDzhfBVUf/mfmc92OEdzQ2kx2jcXGdigfl70E/neV21ZHE6UCz4MDzTRcVqGAM27fk+DLXvyDsn3Jw==
20042004

20052005
"@types/node@^13.7.0":
20062006
version "13.13.52"
@@ -6749,10 +6749,10 @@ typedarray-to-buffer@^3.1.5:
67496749
dependencies:
67506750
is-typedarray "^1.0.0"
67516751

6752-
typescript@4.7.4, typescript@^4.6.4:
6753-
version "4.7.4"
6754-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.4.tgz#1a88596d1cf47d59507a1bcdfb5b9dfe4d488235"
6755-
integrity sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==
6752+
typescript@4.8.3, typescript@^4.6.4:
6753+
version "4.8.3"
6754+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.3.tgz#d59344522c4bc464a65a730ac695007fdb66dd88"
6755+
integrity sha512-goMHfm00nWPa8UvR/CPSvykqf6dVV8x/dp0c5mFTMTIu0u0FlGWRioyy7Nn0PGAdHxpJZnuO/ut+PpQ8UiHAig==
67566756

67576757
uc.micro@^1.0.1, uc.micro@^1.0.5:
67586758
version "1.0.6"

0 commit comments

Comments
 (0)