Skip to content

Commit 99cfb08

Browse files
committed
Merge branch 'main' into copilot/fix-4537
2 parents 4426556 + 4f8600a commit 99cfb08

File tree

6 files changed

+6195
-4178
lines changed

6 files changed

+6195
-4178
lines changed

.config/.lintstagedrc.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ export default {
99
// And elsewhere we don't, compare to https://github.com/stylelint/stylelint/pull/8009
1010
'*.{css,scss}': 'stylelint --fix --allow-empty-input --no-validate',
1111
'*.{js,ts,tsx,jsx,mjs,cjs}': 'xo --fix',
12-
// ensure that security vulnerabilities are fixed before committing
13-
'package-lock.json': 'npm audit fix --omit=dev'
12+
// ensure that security vulnerabilities are fixed before committing - we need to skip `dev` for the moment as there are some unsolveable conflicts
13+
'package-lock.json': 'npm audit fix --omit=dev',
14+
// ensure that lock file is up to date
15+
'**/package.json': () => 'npm install --package-lock-only --ignore-scripts',
1416
};

.husky/pre-push

Lines changed: 0 additions & 78 deletions
This file was deleted.

0 commit comments

Comments
 (0)