Skip to content

Commit ae8f4ec

Browse files
committed
Merge branch 'main' into 42-integrate-changeset
# Conflicts: # package-lock.json
2 parents a2e3163 + f64b264 commit ae8f4ec

File tree

8 files changed

+14841
-7753
lines changed

8 files changed

+14841
-7753
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.

output/stencil/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
},
3131
"devDependencies": {
3232
"@custom-elements-manifest/analyzer": "0.10.5",
33-
"@stencil/core": "4.36.2",
33+
"@stencil/core": "4.36.3",
3434
"cem-plugin-expanded-types": "1.4.0",
3535
"custom-element-jet-brains-integration": "1.7.0",
3636
"custom-element-vs-code-integration": "1.5.0",

output/vue/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"typescript": "5.8.3",
4545
"vite": "6.3.5",
4646
"vue": "3.5.18",
47-
"vue-tsc": "3.0.5"
47+
"vue-tsc": "3.0.6"
4848
},
4949
"publishConfig": {
5050
"registry": "https://registry.npmjs.org/",

0 commit comments

Comments
 (0)