From 2da493a11088fde9b9e8ea8ead70f3ee18cfa1a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hasan=20Akg=C3=BCn?= Date: Mon, 9 Dec 2024 16:48:01 +0100 Subject: [PATCH] Remove WiKit library, wikit tokens and leftovers Bug: T368529 Change-Id: Ia6230bb3c425fef6d04296d1a4082d02b252e2a4 --- .github/dependabot.yml | 4 +- jest.config.js | 6 --- package-lock.json | 45 -------------------- package.json | 2 - src/App.vue | 1 - src/components/EntityValueLookup.vue | 2 +- src/components/QuantityValueInput.vue | 2 +- src/components/ReferenceRelationDropDown.vue | 2 +- src/components/WikitBouncingDots.vue | 24 +++++------ src/components/WikitInput.vue | 1 + src/components/WikitInputWithExtender.vue | 1 + src/components/WikitPopover.vue | 2 +- vite.config.js | 9 ---- 13 files changed, 19 insertions(+), 82 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 9f1352a4..d7d219c3 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -11,7 +11,5 @@ updates: interval: monthly open-pull-requests-limit: 10 ignore: - - dependency-name: "@wmde/wikit-*" - update-types: ["version-update:semver-major"] - dependency-name: "vue*" - update-types: ["version-update:semver-major", "version-update:semver-minor"] \ No newline at end of file + update-types: ["version-update:semver-major", "version-update:semver-minor"] diff --git a/jest.config.js b/jest.config.js index 9201b4d7..c67dfb3a 100644 --- a/jest.config.js +++ b/jest.config.js @@ -1,8 +1,5 @@ module.exports = { preset: 'ts-jest', - transformIgnorePatterns: [ - '/node_modules/(?!(@wmde/wikit-vue-components)/)', - ], testEnvironment: '/tests/config/JestCustomEnvironment.js', testEnvironmentOptions: { customExportConditions: [ 'node', 'node-addons' ], @@ -12,9 +9,6 @@ module.exports = { moduleNameMapper: { '^vue$': '@vue/compat', '^@vue/composition-api$': '@vue/compat', - '^@wmde/wikit-vue-components$': - '@wmde/wikit-vue-components/dist/wikit-vue-components-vue3compat.common.js', - '^wikit-dist(.*)$': '/node_modules/@wmde/wikit-vue-components/dist$1', '^@/(.*)$': '/src/$1', '/img/(.*)$': '/tests/config/fileMock.js', }, diff --git a/package-lock.json b/package-lock.json index 8fb1c30e..e798a874 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,8 +16,6 @@ "@wikimedia/codex-design-tokens": "^1.12.0", "@wikimedia/codex-icons": "^1.0.1", "@wikimedia/language-data": "^1.1.8", - "@wmde/wikit-tokens": "^2.1.0-alpha.16", - "@wmde/wikit-vue-components": "^2.1.0-alpha.16", "core-js": "^3.37.1", "lodash.debounce": "^4.0.8", "lodash.isequal": "^4.5.0", @@ -4686,49 +4684,6 @@ "eslint-config-wikimedia": "^0.28.2" } }, - "node_modules/@wmde/wikit-tokens": { - "version": "2.1.0-alpha.16", - "resolved": "https://registry.npmjs.org/@wmde/wikit-tokens/-/wikit-tokens-2.1.0-alpha.16.tgz", - "integrity": "sha512-78PAQ9VW02gXQTTEQLZyH/56GG2sklWHe5PJ/lV1BPtldPx7+3gw7KVQfayYz/OXohfQTF8ltayA0EWBUKkN3A==", - "license": "BSD-3-Clause" - }, - "node_modules/@wmde/wikit-vue-components": { - "version": "2.1.0-alpha.16", - "resolved": "https://registry.npmjs.org/@wmde/wikit-vue-components/-/wikit-vue-components-2.1.0-alpha.16.tgz", - "integrity": "sha512-t+h1QcLjlGWtFnUDAGAHLjfgExWLk05DyuwxPZMkIjNWRcN5ZylSrJP86ALDl8XPlvsJ9to6wXzfsyXIMZt8Kg==", - "license": "BSD-3-Clause", - "dependencies": { - "@vue/composition-api": "^1.0.0-beta.20", - "@wmde/wikit-tokens": "^2.1.0-alpha.16", - "core-js": "^3.7.0", - "lodash.debounce": "^4.0.8", - "lodash.isequal": "^4.5.0", - "ress": "^3.0.0", - "vue": "^2.6.12" - } - }, - "node_modules/@wmde/wikit-vue-components/node_modules/@vue/composition-api": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/@vue/composition-api/-/composition-api-1.7.2.tgz", - "integrity": "sha512-M8jm9J/laYrYT02665HkZ5l2fWTK4dcVg3BsDHm/pfz+MjDYwX+9FUaZyGwEyXEDonQYRCo0H7aLgdklcIELjw==", - "license": "MIT", - "peerDependencies": { - "vue": ">= 2.5 < 2.7" - } - }, - "node_modules/@wmde/wikit-vue-components/node_modules/ress": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ress/-/ress-3.0.0.tgz", - "integrity": "sha512-MTPto7t44AawqmSbEmvMKoSMWPnxjaTuHf94s7RjWxuSGFN0o8/b+6yOwkaC50+Vihjsu6ODUEQR397gTMn57w==", - "license": "MIT" - }, - "node_modules/@wmde/wikit-vue-components/node_modules/vue": { - "version": "2.6.14", - "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.14.tgz", - "integrity": "sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ==", - "deprecated": "Vue 2 has reached EOL and is no longer actively maintained. See https://v2.vuejs.org/eol/ for more details.", - "license": "MIT" - }, "node_modules/@xtuc/ieee754": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", diff --git a/package.json b/package.json index 3fef3f76..2b230542 100644 --- a/package.json +++ b/package.json @@ -34,8 +34,6 @@ "@wikimedia/codex-design-tokens": "^1.12.0", "@wikimedia/codex-icons": "^1.0.1", "@wikimedia/language-data": "^1.1.8", - "@wmde/wikit-tokens": "^2.1.0-alpha.16", - "@wmde/wikit-vue-components": "^2.1.0-alpha.16", "core-js": "^3.37.1", "lodash.debounce": "^4.0.8", "lodash.isequal": "^4.5.0", diff --git a/src/App.vue b/src/App.vue index ab5890b9..4250e8c9 100644 --- a/src/App.vue +++ b/src/App.vue @@ -97,7 +97,6 @@ export default defineComponent( { @import 'ress'; @import '@wikimedia/codex/dist/codex.style-bidi.css'; @import './styles/custom-variables.css'; -@import 'wikit-dist/wikit-vue-components-vue3compat.css'; @import './styles/typography'; body { diff --git a/src/components/EntityValueLookup.vue b/src/components/EntityValueLookup.vue index 82bd5e0b..6f4d1938 100644 --- a/src/components/EntityValueLookup.vue +++ b/src/components/EntityValueLookup.vue @@ -16,7 +16,7 @@ import EntityLookup from '@/components/EntityLookup.vue'; import SearchOptions from '@/data-access/SearchOptions'; import SearchResult from '@/data-access/SearchResult'; -import { MenuItem } from '@wmde/wikit-vue-components/dist/components/MenuItem'; +import { MenuItem } from '@/types'; import { PropType } from 'vue'; import { defineComponent } from '@/compat'; import { useStore } from '@/store'; diff --git a/src/components/QuantityValueInput.vue b/src/components/QuantityValueInput.vue index 56193ee8..0a9c8c9e 100644 --- a/src/components/QuantityValueInput.vue +++ b/src/components/QuantityValueInput.vue @@ -34,7 +34,7 @@ import WikitQuantityInput from './WikitQuantityInput.vue'; import { PropType } from 'vue'; import { defineComponent } from '@/compat'; -import { MenuItem } from '@wmde/wikit-vue-components/dist/components/MenuItem'; +import { MenuItem } from '@/types'; import SearchOptions from '@/data-access/SearchOptions'; import SearchResult from '@/data-access/SearchResult'; import InfoTooltip from '@/components/InfoTooltip.vue'; diff --git a/src/components/ReferenceRelationDropDown.vue b/src/components/ReferenceRelationDropDown.vue index 7dda4639..616b84ad 100644 --- a/src/components/ReferenceRelationDropDown.vue +++ b/src/components/ReferenceRelationDropDown.vue @@ -24,7 +24,7 @@ import { PropType } from 'vue'; import { defineComponent } from '@/compat'; import ReferenceRelation from '@/data-model/ReferenceRelation'; -import { MenuItem } from '@wmde/wikit-vue-components/dist/components/MenuItem'; +import { MenuItem } from '@/types'; import { CdxSelect, CdxField } from '@wikimedia/codex'; import InfoTooltip from '@/components/InfoTooltip.vue'; diff --git a/src/components/WikitBouncingDots.vue b/src/components/WikitBouncingDots.vue index d7abb162..7e73470f 100644 --- a/src/components/WikitBouncingDots.vue +++ b/src/components/WikitBouncingDots.vue @@ -27,34 +27,34 @@ withDefaults( defineProps(), { &::after { content: ''; display: inline-block; - background-color: $wikit-BouncingDots-background-color; - border-radius: $wikit-BouncingDots-border-radius; - animation: bounce-delay $wikit-BouncingDots-animation-duration infinite ease-in-out both; - animation-delay: $wikit-BouncingDots-animation-delay-default; + background-color: $color-placeholder; + border-radius: $border-radius-circle; + animation: bounce-delay $animation-duration-medium infinite ease-in-out both; + animation-delay: $animation-delay-medium; } &::before { - margin-inline-end: $wikit-BouncingDots-margin-right; - animation-delay: $wikit-BouncingDots-animation-delay-before; + margin-inline-end: $spacing-25; + animation-delay: $animation-delay-slow; } &::after { - margin-inline-start: $wikit-BouncingDots-margin-left; - animation-delay: $wikit-BouncingDots-animation-delay-after; + margin-inline-start: $spacing-25; + animation-delay: $animation-delay-none; } &--small .bounce, &--small::before, &--small::after { - inline-size: $wikit-BouncingDots-width-small; - block-size: $wikit-BouncingDots-width-small; + inline-size: $size-75; + block-size: $size-75; } &--medium .bounce, &--medium::before, &--medium::after { - inline-size: $wikit-BouncingDots-width-medium; - block-size: $wikit-BouncingDots-width-medium; + inline-size: $size-100; + block-size: $size-100; } } diff --git a/src/components/WikitInput.vue b/src/components/WikitInput.vue index 965e4025..9816c4c9 100644 --- a/src/components/WikitInput.vue +++ b/src/components/WikitInput.vue @@ -36,6 +36,7 @@ defineEmits( [ 'update:modelValue' ] ); line-height: $line-height-xx-small; inline-size: $size-full; box-sizing: $box-sizing-base; + padding: $spacing-25 $spacing-50; padding-inline: $spacing-25 $spacing-50; transition-duration: $transition-duration-medium; transition-property: $transition-property-base; diff --git a/src/components/WikitInputWithExtender.vue b/src/components/WikitInputWithExtender.vue index 44e8b908..c950a08d 100644 --- a/src/components/WikitInputWithExtender.vue +++ b/src/components/WikitInputWithExtender.vue @@ -86,6 +86,7 @@ function onInput( value: string ): void { display: flex; align-items: center; gap: $spacing-50; + font-weight: $font-weight-bold; } &__extension { diff --git a/src/components/WikitPopover.vue b/src/components/WikitPopover.vue index 644dd124..a2fad679 100644 --- a/src/components/WikitPopover.vue +++ b/src/components/WikitPopover.vue @@ -300,7 +300,7 @@ watch( () => props.forcePosition, avoidOverflow );