Skip to content

Commit 4a3d4d6

Browse files
committed
Merge remote-tracking branch 'upstream/develop' into timfish/time-side-effects
2 parents f1e186c + 973ef9c commit 4a3d4d6

File tree

1,385 files changed

+19444
-11903
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,385 files changed

+19444
-11903
lines changed

.eslintrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ module.exports = {
2121
'examples/**',
2222
'test/manual/**',
2323
'types/**',
24+
'scripts/*.js',
2425
],
2526
reportUnusedDisableDirectives: true,
2627
overrides: [

.github/dependabot.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,10 @@ updates:
1313
schedule:
1414
interval: 'weekly'
1515
allow:
16-
- dependency-name: "@sentry/cli"
17-
- dependency-name: "@sentry/vite-plugin"
18-
- dependency-name: "@sentry/webpack-plugin"
19-
- dependency-name: "@sentry/rollup-plugin"
20-
- dependency-name: "@sentry/esbuild-plugin"
16+
- dependency-name: "@sentry/*"
2117
- dependency-name: "@opentelemetry/*"
2218
- dependency-name: "@prisma/instrumentation"
19+
- dependency-name: "opentelemetry-instrumentation-remix"
2320
versioning-strategy: increase
2421
commit-message:
2522
prefix: feat
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
fail-on-severity: 'high'
2+
allow-ghsas:
3+
# dependency review does not allow specific file exclusions
4+
# we use an older version of NextJS in our tests and thus need to
5+
# exclude this
6+
# once our minimum supported version is over 14.1.1 this can be removed
7+
- GHSA-fr5h-rqp8-mj6g
8+
# we need this for an E2E test for the minimum required version of Nuxt 3.7.0
9+
- GHSA-v784-fjjh-f8r4

0 commit comments

Comments
 (0)