Merge branch 'main' into no-update

wmde · Oct 9, 2023 · b00ef43 · b00ef43
2 parents c7fe0d4 + 710f3fe
commit b00ef43
Show file tree

Hide file tree

Showing 10 changed files with 1,126 additions and 419 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -51,7 +51,7 @@
 		"vuex": "^4.0.2"
 	},
 	"devDependencies": {
-		"@namics/stylelint-bem": "^8.1.0",
+		"@namics/stylelint-bem": "^9.0.0",
 		"@rushstack/eslint-patch": "^1.3.2",
 		"@types/jest": "^29.5.5",
 		"@types/lodash": "^4.14.199",
@@ -78,10 +78,10 @@
 		"prettier": "^2.8.8",
 		"sass": "^1.69.0",
 		"start-server-and-test": "^2.0.0",
-		"stylelint": "^14.16.1",
+		"stylelint": "^15.10.3",
 		"stylelint-config-recommended-vue": "^1.5.0",
-		"stylelint-config-standard-scss": "^6.1.0",
-		"stylelint-config-wikimedia": "^0.15.0",
+		"stylelint-config-standard-scss": "^11.0.0",
+		"stylelint-config-wikimedia": "^0.16.1",
 		"ts-jest": "^29.1.1",
 		"typescript": "~4.7.0",
 		"vite": "^3.2.7",

diff --git a/src/components/LanguageInput.vue b/src/components/LanguageInput.vue
@@ -79,12 +79,12 @@ export default {
 </template>
 
 <style lang="scss">
-@import "@wmde/wikit-tokens/variables";
+@import '@wmde/wikit-tokens/variables';
 
-/* stylelint-disable plugin/stylelint-bem-namics, selector-class-pattern */
+/* stylelint-disable selector-class-pattern */
 .wbl-snl-language-lookup .wikit .wikit-Lookup__label-wrapper {
 	gap: $dimension-spacing-xsmall;
 }
-/* stylelint-enable plugin/stylelint-bem-namics, selector-class-pattern */
+/* stylelint-enable selector-class-pattern */
 
 </style>
diff --git a/src/components/LemmaInput.vue b/src/components/LemmaInput.vue
@@ -71,7 +71,7 @@ export default {
 </template>
 
 <style lang="scss">
-@import "@wmde/wikit-tokens/variables";
+@import '@wmde/wikit-tokens/variables';
 
 /* stylelint-disable plugin/stylelint-bem-namics, selector-class-pattern */
 .wbl-snl-lemma-input.wikit .wikit-TextInput__label-wrapper {

diff --git a/src/components/LexicalCategoryInput.vue b/src/components/LexicalCategoryInput.vue
@@ -73,11 +73,11 @@ export default {
 </template>
 
 <style lang="scss">
-@import "@wmde/wikit-tokens/variables";
-/* stylelint-disable plugin/stylelint-bem-namics, selector-class-pattern */
+@import '@wmde/wikit-tokens/variables';
+/* stylelint-disable selector-class-pattern */
 .wbl-snl-lexical-category-lookup .wikit .wikit-Lookup__label-wrapper {
 	gap: $dimension-spacing-xsmall;
 }
-/* stylelint-enable plugin/stylelint-bem-namics, selector-class-pattern */
+/* stylelint-enable selector-class-pattern */
 
 </style>
diff --git a/src/components/NewLexemeForm.vue b/src/components/NewLexemeForm.vue
@@ -190,8 +190,8 @@ export default {
 </template>
 
 <style scoped lang="scss">
-@import "@wmde/wikit-tokens/variables";
-@import "@wmde/wikit-vue-components/src/styles/mixins/Typography";
+@import '@wmde/wikit-tokens/variables';
+@import '@wmde/wikit-vue-components/src/styles/mixins/Typography';
 
 .wbl-snl-form {
 	& > * + * {

diff --git a/src/components/RequiredAsterisk.vue b/src/components/RequiredAsterisk.vue
@@ -21,17 +21,17 @@ export default {
 </template>
 
 <style lang="scss" scoped>
-@import "@wmde/wikit-tokens/variables";
+@import '@wmde/wikit-tokens/variables';
 
 .wbl-snl-required-asterisk {
 	font-size: $font-size-xxlarge;
 	line-height: 0;
 
-	&:not(:first-child) {
+	&:not( :first-child ) {
 		margin-inline-start: $dimension-spacing-small;
 	}
 
-	&:not(:last-child) {
+	&:not( :last-child ) {
 		margin-inline-end: $dimension-spacing-small;
 	}
 }

diff --git a/src/components/SearchExisting.vue b/src/components/SearchExisting.vue
@@ -24,8 +24,8 @@ const searchMessage = computed( () => messages.get(
 </template>
 
 <style lang="scss" scoped>
-@import "@wmde/wikit-tokens/variables";
-@import "@wmde/wikit-vue-components/src/styles/mixins/Typography";
+@import '@wmde/wikit-tokens/variables';
+@import '@wmde/wikit-vue-components/src/styles/mixins/Typography';
 
 .wbl-snl-search-existing {
 	@include body;

diff --git a/src/components/SpellingVariantInput.vue b/src/components/SpellingVariantInput.vue
@@ -127,7 +127,7 @@ export default {
 </template>
 
 <style lang="scss">
-@import "@wmde/wikit-tokens/variables";
+@import '@wmde/wikit-tokens/variables';
 
 .wbl-snl-spelling-variant-lookup {
 	/* stylelint-disable plugin/stylelint-bem-namics, selector-class-pattern */

diff --git a/tests/unit/components/LemmaInput.test.ts b/tests/unit/components/LemmaInput.test.ts
@@ -2,7 +2,6 @@ import { MessagesKey } from '@/plugins/MessagesPlugin/Messages';
 import {
 	DOMWrapper,
 	mount,
-	MountingOptions,
 } from '@vue/test-utils';
 import LemmaInput from '@/components/LemmaInput.vue';
 import { ConfigKey } from '@/plugins/ConfigPlugin/Config';
@@ -19,8 +18,15 @@ describe( 'LemmaInput', () => {
 
 	let store: Store<RootState>;
 
-	// eslint-disable-next-line @typescript-eslint/no-explicit-any
-	function createComponent( config: Partial<MountingOptions<any>> = {} ) {
+	function createComponent( config: {
+		props?: {
+			modelValue?: string;
+		};
+		global?: {
+			// eslint-disable-next-line @typescript-eslint/no-explicit-any
+			provide?: Record<symbol, any>;
+		};
+	} = {} ) {
 		store = initStore( {
 			lexemeCreator: unusedLexemeCreator,
 			langCodeRetriever: unusedLangCodeRetriever,
@@ -29,7 +35,6 @@ describe( 'LemmaInput', () => {
 		} );
 
 		return mount( LemmaInput, {
-			...config,
 			props: {
 				modelValue: '',
 				...config.props,