diff --git a/.eslintrc.js b/.eslintrc.js index 277e85c4..85290a11 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -26,9 +26,6 @@ module.exports = { // resetting this back to the default value, to comply with modern vite conventions 'vue/component-tags-order': [ 'error', { order: [ [ 'script', 'template' ], 'style' ] } ], - // we still need to use some legacy APIs to interact with the vue3compat build of Wikit - 'vue/no-deprecated-v-on-native-modifier': 'off', - // rule has no support for our @/ aliases; // the designated replacement, plugin:import, was a pain so we ditched it 'n/no-missing-import': 'off', diff --git a/README.md b/README.md index ea97b575..a03f22a5 100644 --- a/README.md +++ b/README.md @@ -94,8 +94,6 @@ npm run cypress:open You can see which dependencies have new releases by first making sure your local dependencies are up-to-date by executing `npm ci` and then running `npm outdated`. The following dependencies should be ignored: -- Wikit (i.e. `@wmde/wikit-tokens` and `@wmde/wikit-vue-components`): - we’re using a newer pre-release version and don’t want to downgrade to the latest full release. - Vue and Vuex: in production, we use the versions shipped by MediaWiki core, so we should use the same versions for testing. diff --git a/package-lock.json b/package-lock.json index 6adcb3ea..226cdec9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,8 +12,6 @@ "@wikimedia/codex": "^1.14.0", "@wikimedia/codex-design-tokens": "^1.14.0", "@wmde/wikibase-datamodel-types": "^0.2.0", - "@wmde/wikit-tokens": "^3.0.0-alpha.12", - "@wmde/wikit-vue-components": "^3.0.0-alpha.12", "jest-environment-jsdom": "^29.7.0", "vue": "3.4.27", "vuex": "4.0.2" @@ -3560,24 +3558,6 @@ "resolved": "https://registry.npmjs.org/@wmde/wikibase-datamodel-types/-/wikibase-datamodel-types-0.2.0.tgz", "integrity": "sha512-ydQQPEDVmf/VCLPlCfwxV0hYqrA/9US91gSmtVaqvy9gGbyQK67x8AQFKTjdLR5rwoWsGpz8QU5wPWP1z5/56A==" }, - "node_modules/@wmde/wikit-tokens": { - "version": "3.0.0-alpha.12", - "resolved": "https://registry.npmjs.org/@wmde/wikit-tokens/-/wikit-tokens-3.0.0-alpha.12.tgz", - "integrity": "sha512-jUYaa/nDF69S+dXVXsg27jRuPvbEbCzrtM8iFb6DRbfwfWAdNUnNlD4/WbIefbkWVJLrAYnuT0lCc4M1sBnRoA==" - }, - "node_modules/@wmde/wikit-vue-components": { - "version": "3.0.0-alpha.12", - "resolved": "https://registry.npmjs.org/@wmde/wikit-vue-components/-/wikit-vue-components-3.0.0-alpha.12.tgz", - "integrity": "sha512-M94Z6fCURkaZsQhanWc2AOEXYKam4vhjH5G20vbYUTSbpdNZlh+sgdFHa6dP6KNKy1Lol09Hn/N3j5p/WuAoaw==", - "dependencies": { - "@wmde/wikit-tokens": "^3.0.0-alpha.12", - "core-js": "^3.7.0", - "lodash.debounce": "^4.0.8", - "lodash.isequal": "^4.5.0", - "ress": "^3.0.0", - "vue": "^3.2.31" - } - }, "node_modules/abab": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz", @@ -4638,16 +4618,6 @@ "safe-buffer": "~5.1.1" } }, - "node_modules/core-js": { - "version": "3.23.3", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.23.3.tgz", - "integrity": "sha512-oAKwkj9xcWNBAvGbT//WiCdOMpb9XQG92/Fe3ABFM/R16BsHgePG00mFOgKf7IsCtfj8tA1kHtf/VwErhriz5Q==", - "hasInstallScript": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/core-js" - } - }, "node_modules/core-js-compat": { "version": "3.38.0", "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.38.0.tgz", @@ -11119,16 +11089,6 @@ "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", "dev": true }, - "node_modules/lodash.debounce": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", - "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==" - }, - "node_modules/lodash.isequal": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", - "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==" - }, "node_modules/lodash.memoize": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", @@ -12728,11 +12688,6 @@ "node": ">=10" } }, - "node_modules/ress": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ress/-/ress-3.0.0.tgz", - "integrity": "sha512-MTPto7t44AawqmSbEmvMKoSMWPnxjaTuHf94s7RjWxuSGFN0o8/b+6yOwkaC50+Vihjsu6ODUEQR397gTMn57w==" - }, "node_modules/restore-cursor": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", @@ -17604,24 +17559,6 @@ "resolved": "https://registry.npmjs.org/@wmde/wikibase-datamodel-types/-/wikibase-datamodel-types-0.2.0.tgz", "integrity": "sha512-ydQQPEDVmf/VCLPlCfwxV0hYqrA/9US91gSmtVaqvy9gGbyQK67x8AQFKTjdLR5rwoWsGpz8QU5wPWP1z5/56A==" }, - "@wmde/wikit-tokens": { - "version": "3.0.0-alpha.12", - "resolved": "https://registry.npmjs.org/@wmde/wikit-tokens/-/wikit-tokens-3.0.0-alpha.12.tgz", - "integrity": "sha512-jUYaa/nDF69S+dXVXsg27jRuPvbEbCzrtM8iFb6DRbfwfWAdNUnNlD4/WbIefbkWVJLrAYnuT0lCc4M1sBnRoA==" - }, - "@wmde/wikit-vue-components": { - "version": "3.0.0-alpha.12", - "resolved": "https://registry.npmjs.org/@wmde/wikit-vue-components/-/wikit-vue-components-3.0.0-alpha.12.tgz", - "integrity": "sha512-M94Z6fCURkaZsQhanWc2AOEXYKam4vhjH5G20vbYUTSbpdNZlh+sgdFHa6dP6KNKy1Lol09Hn/N3j5p/WuAoaw==", - "requires": { - "@wmde/wikit-tokens": "^3.0.0-alpha.12", - "core-js": "^3.7.0", - "lodash.debounce": "^4.0.8", - "lodash.isequal": "^4.5.0", - "ress": "^3.0.0", - "vue": "^3.2.31" - } - }, "abab": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz", @@ -18388,11 +18325,6 @@ "safe-buffer": "~5.1.1" } }, - "core-js": { - "version": "3.23.3", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.23.3.tgz", - "integrity": "sha512-oAKwkj9xcWNBAvGbT//WiCdOMpb9XQG92/Fe3ABFM/R16BsHgePG00mFOgKf7IsCtfj8tA1kHtf/VwErhriz5Q==" - }, "core-js-compat": { "version": "3.38.0", "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.38.0.tgz", @@ -22994,16 +22926,6 @@ "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", "dev": true }, - "lodash.debounce": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", - "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==" - }, - "lodash.isequal": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", - "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==" - }, "lodash.memoize": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", @@ -24140,11 +24062,6 @@ "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==", "dev": true }, - "ress": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ress/-/ress-3.0.0.tgz", - "integrity": "sha512-MTPto7t44AawqmSbEmvMKoSMWPnxjaTuHf94s7RjWxuSGFN0o8/b+6yOwkaC50+Vihjsu6ODUEQR397gTMn57w==" - }, "restore-cursor": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", diff --git a/package.json b/package.json index 35d6cccb..6ba89fd2 100644 --- a/package.json +++ b/package.json @@ -46,8 +46,6 @@ "@wikimedia/codex": "^1.14.0", "@wikimedia/codex-design-tokens": "^1.14.0", "@wmde/wikibase-datamodel-types": "^0.2.0", - "@wmde/wikit-tokens": "^3.0.0-alpha.12", - "@wmde/wikit-vue-components": "^3.0.0-alpha.12", "jest-environment-jsdom": "^29.7.0", "vue": "3.4.27", "vuex": "4.0.2" diff --git a/src/App.vue b/src/App.vue index b2eb49fd..ce541dc4 100644 --- a/src/App.vue +++ b/src/App.vue @@ -2,7 +2,6 @@ import AnonymousEditWarning from '@/components/AnonymousEditWarning.vue'; import NewLexemeForm from '@/components/NewLexemeForm.vue'; import SearchExisting from '@/components/SearchExisting.vue'; -import '@wmde/wikit-vue-components/dist/wikit-vue-components.css'; diff --git a/src/components/LanguageInput.vue b/src/components/LanguageInput.vue index 2db82156..69778dc2 100644 --- a/src/components/LanguageInput.vue +++ b/src/components/LanguageInput.vue @@ -94,11 +94,4 @@ export default { diff --git a/src/components/LexicalCategoryInput.vue b/src/components/LexicalCategoryInput.vue index b93ead0b..96329050 100644 --- a/src/components/LexicalCategoryInput.vue +++ b/src/components/LexicalCategoryInput.vue @@ -74,10 +74,4 @@ export default { diff --git a/src/components/SpellingVariantInput.vue b/src/components/SpellingVariantInput.vue index 1dc8639d..86b953d4 100644 --- a/src/components/SpellingVariantInput.vue +++ b/src/components/SpellingVariantInput.vue @@ -133,12 +133,6 @@ export default { @import '@wikimedia/codex-design-tokens/theme-wikimedia-ui'; .wbl-snl-spelling-variant-lookup { - /* stylelint-disable plugin/stylelint-bem-namics, selector-class-pattern */ - &.wikit .wikit-Lookup__label-wrapper { - gap: $spacing-50; - } - /* stylelint-enable plugin/stylelint-bem-namics, selector-class-pattern */ - &__help-link { padding-bottom: $spacing-50; display: inline-block; diff --git a/src/components/WikitLookup.ts b/src/components/WikitLookup.ts deleted file mode 100644 index aca379a7..00000000 --- a/src/components/WikitLookup.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { - defineComponent, - h, -} from 'vue'; -import { Lookup as RealWikitLookup } from '@wmde/wikit-vue-components'; - -/* - * This component wraps a Wikit Lookup with no changes. - * This is necessary to prevent the following vue-tsc error for : - * Element implicitly has an 'any' type because expression of type '"no-results"' - * can't be used to index type '{} | {}'. - */ - -export default defineComponent( { - name: 'WikitLookup', - render() { - return h( RealWikitLookup, this.$props, this.$slots ); - }, - compatConfig: { MODE: 3 }, -} ); diff --git a/tests/integration/NewLexemeForm.test.ts b/tests/integration/NewLexemeForm.test.ts index 0a379e6f..59455d13 100644 --- a/tests/integration/NewLexemeForm.test.ts +++ b/tests/integration/NewLexemeForm.test.ts @@ -162,7 +162,7 @@ describe( 'NewLexemeForm', () => { await selectLanguage( wrapper ); await nextTick(); - const warning = wrapper.find( '.wikit-ValidationMessage--warning' ); + const warning = wrapper.find( '.cdx-message--warning' ); expect( warning.exists() ).toBe( false ); const spellingVariantLookup = wrapper.find( '.wbl-snl-spelling-variant-lookup input' ); diff --git a/vite.config.ts b/vite.config.ts index 11cf4453..69e03df0 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -31,10 +31,6 @@ export default defineConfig( { build: getBuildConfig( !!process.env.BUILD_AS_APP ), resolve: { alias: { - '@wmde/wikit-tokens/variables': resolve( - __dirname, - 'node_modules/@wmde/wikit-tokens/dist/_variables.scss', - ), '@': resolve( __dirname, 'src' ), }, },