From 4902979b10b3efbf303e79e016408ca16375df5d Mon Sep 17 00:00:00 2001 From: BalbinaK Date: Wed, 12 Jul 2023 16:23:11 +0200 Subject: [PATCH 1/6] fix(package.json): bump @warp-ds/uno to -alpha.58 & @warp-ds/css to -alpha.33 --- package.json | 4 +-- pnpm-lock.yaml | 90 +++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 80 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index 2e49313e..e0a55628 100644 --- a/package.json +++ b/package.json @@ -29,8 +29,8 @@ "license": "Apache-2.0", "dependencies": { "@warp-ds/core": "^1.0.0", - "@warp-ds/component-classes": "^1.0.0-alpha.116", - "@warp-ds/uno": "1.0.0-alpha.49", + "@warp-ds/css": "1.0.0-alpha.33", + "@warp-ds/uno": "^1.0.0-alpha.58", "@floating-ui/dom": "^1.4.2", "create-v-model": "^2.2.0", "dom-focus-lock": "^1.1.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d986df53..75a9c470 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -8,15 +8,15 @@ dependencies: '@floating-ui/dom': specifier: ^1.4.2 version: 1.4.2 - '@warp-ds/component-classes': - specifier: ^1.0.0-alpha.116 - version: 1.0.0-alpha.116 '@warp-ds/core': specifier: ^1.0.0 version: 1.0.0 + '@warp-ds/css': + specifier: 1.0.0-alpha.33 + version: 1.0.0-alpha.33(@warp-ds/component-classes@1.0.0-alpha.110) '@warp-ds/uno': - specifier: 1.0.0-alpha.49 - version: 1.0.0-alpha.49 + specifier: ^1.0.0-alpha.58 + version: 1.0.0-alpha.58(@warp-ds/component-classes@1.0.0-alpha.110) create-v-model: specifier: ^2.2.0 version: 2.2.0 @@ -1547,8 +1547,8 @@ packages: vue-component-type-helpers: 1.6.5 dev: true - /@warp-ds/component-classes@1.0.0-alpha.116: - resolution: {integrity: sha512-7bAQOPtynoGtgcZ+TSX6OE+chK2s0tW/fnE1dOScjDMvd7O+6EFbBi3eTKSnmozEKL/d9c7gGL/9/OnGxlF9lg==} + /@warp-ds/component-classes@1.0.0-alpha.110: + resolution: {integrity: sha512-kqOYLHBxNjyuIs7X7hlZyywxua//Gxd6+h3H13d1RT/Zfkjnr/ByUJdFvbcYqPNrNsLLwqdPsRZTbL02f0EuDg==} dev: false /@warp-ds/core@1.0.0: @@ -1557,11 +1557,35 @@ packages: '@floating-ui/dom': 0.5.4 dev: false - /@warp-ds/uno@1.0.0-alpha.49: - resolution: {integrity: sha512-72c5dT6QAy7GFmL+SN2gRlOsJWBWYM4uJpyw8WA9gCQHNENHXtoWu+D24+c47T9K908M3ZG+2+U1M/FXEZ7ojA==} + /@warp-ds/css@1.0.0-alpha.33(@warp-ds/component-classes@1.0.0-alpha.110): + resolution: {integrity: sha512-zc+g1CyKptApAfryLKpEc5N3SnPW87gl7Rx2Zz9hGOrqY42PvjG2NplkKbas1/bLvpGKW5VTBrdaVcyt049cFA==} + dependencies: + '@warp-ds/fonts': 1.1.0 + '@warp-ds/tokenizer': 0.0.2 + '@warp-ds/uno': 1.0.0-alpha.58(@warp-ds/component-classes@1.0.0-alpha.110) + transitivePeerDependencies: + - '@warp-ds/component-classes' + dev: false + + /@warp-ds/fonts@1.1.0: + resolution: {integrity: sha512-kLNZzK3o0rMJApm7/YT3K7rYoFKgH5PyJMTVwv34O4Dx6ikfN7appc4f2DFYkE2XY6gifpD5F2r1ftcJtdW4+w==} + dev: false + + /@warp-ds/tokenizer@0.0.2: + resolution: {integrity: sha512-pEtBvP6my14f1kOmYSoDNhofGK/L2yNqnZkEotvY6boVs3jcIncHpgo9Nt4AHOiAvzDrPP0t8b36jwqGaWzNPg==} + dependencies: + glob: 9.3.5 + yaml: 2.3.1 + dev: false + + /@warp-ds/uno@1.0.0-alpha.58(@warp-ds/component-classes@1.0.0-alpha.110): + resolution: {integrity: sha512-azdVumf9P46ZwT0uLxOm2ik8yUWupBsVyE7pHncOdkubUBj23oSH8MalaqSO0p/7sK5H9hl6yKFG4lsD/kCYsQ==} + peerDependencies: + '@warp-ds/component-classes': 1.0.0-alpha.110 dependencies: '@unocss/core': 0.50.6 '@unocss/preset-mini': 0.50.6 + '@warp-ds/component-classes': 1.0.0-alpha.110 dev: false /JSONStream@1.3.5: @@ -1761,7 +1785,6 @@ packages: /balanced-match@1.0.2: resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==} - dev: true /base64-js@1.5.1: resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==} @@ -1821,7 +1844,6 @@ packages: resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==} dependencies: balanced-match: 1.0.2 - dev: true /braces@3.0.2: resolution: {integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==} @@ -2834,7 +2856,6 @@ packages: /fs.realpath@1.0.0: resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==} - dev: true /fsevents@2.3.2: resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==} @@ -2929,6 +2950,16 @@ packages: once: 1.4.0 dev: true + /glob@9.3.5: + resolution: {integrity: sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q==} + engines: {node: '>=16 || 14 >=14.17'} + dependencies: + fs.realpath: 1.0.0 + minimatch: 8.0.4 + minipass: 4.2.8 + path-scurry: 1.10.1 + dev: false + /global-dirs@0.1.1: resolution: {integrity: sha512-NknMLn7F2J7aflwFOlGdNIuCDpN3VGoSoB+aap3KABFWbHVn1TCgFC+np23J8W2BiZbjfEw3BFBycSMv1AFblg==} engines: {node: '>=4'} @@ -3636,6 +3667,11 @@ packages: get-func-name: 2.0.0 dev: true + /lru-cache@10.0.0: + resolution: {integrity: sha512-svTf/fzsKHffP42sujkO/Rjs37BCIsQVRCeNYIm9WN8rgT7ffoUnRtZCqU+6BqcSBdv8gwJeTz8knJpgACeQMw==} + engines: {node: 14 || >=16.14} + dev: false + /lru-cache@4.1.5: resolution: {integrity: sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==} dependencies: @@ -3815,6 +3851,13 @@ packages: brace-expansion: 2.0.1 dev: true + /minimatch@8.0.4: + resolution: {integrity: sha512-W0Wvr9HyFXZRGIDgCicunpQ299OKXs9RgZfaukz4qAW/pJhcpUfupc9c+OObPOFueNy8VSrZgEmDtk6Kh4WzDA==} + engines: {node: '>=16 || 14 >=14.17'} + dependencies: + brace-expansion: 2.0.1 + dev: false + /minimist-options@4.1.0: resolution: {integrity: sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==} engines: {node: '>= 6'} @@ -3839,6 +3882,16 @@ packages: yallist: 4.0.0 dev: true + /minipass@4.2.8: + resolution: {integrity: sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==} + engines: {node: '>=8'} + dev: false + + /minipass@7.0.2: + resolution: {integrity: sha512-eL79dXrE1q9dBbDCLg7xfn/vl7MS4F1gvJAgjJrQli/jbQWdUttuVawphqpffoIYfRdq78LHx6GP4bU/EQ2ATA==} + engines: {node: '>=16 || 14 >=14.17'} + dev: false + /minizlib@2.1.2: resolution: {integrity: sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==} engines: {node: '>= 8'} @@ -4301,6 +4354,14 @@ packages: resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==} dev: true + /path-scurry@1.10.1: + resolution: {integrity: sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==} + engines: {node: '>=16 || 14 >=14.17'} + dependencies: + lru-cache: 10.0.0 + minipass: 7.0.2 + dev: false + /path-type@4.0.0: resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==} engines: {node: '>=8'} @@ -5584,6 +5645,11 @@ packages: resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==} dev: true + /yaml@2.3.1: + resolution: {integrity: sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==} + engines: {node: '>= 14'} + dev: false + /yargs-parser@20.2.9: resolution: {integrity: sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==} engines: {node: '>=10'} From b04916c12cb93fa926c2d35126ce67f5a846ebe3 Mon Sep 17 00:00:00 2001 From: BalbinaK Date: Wed, 12 Jul 2023 16:24:01 +0200 Subject: [PATCH 2/6] fix(components): import classes from @warp-ds/css --- components/alert/w-alert.vue | 2 +- components/attention/w-attention-arrow.vue | 2 +- components/attention/w-attention.vue | 2 +- components/box/w-box.vue | 2 +- components/breadcrumbs/w-breadcrumbs.vue | 2 +- components/button-group/w-button-group-item.vue | 2 +- components/button-group/w-button-group.vue | 2 +- components/button/w-button.vue | 2 +- components/card/w-card.vue | 2 +- components/expandable/w-expandable.vue | 2 +- components/forms/w-affix.vue | 2 +- components/forms/w-field.vue | 2 +- components/forms/w-input.vue | 2 +- components/forms/w-select.vue | 2 +- components/forms/w-suffix.vue | 2 +- components/forms/w-textarea.vue | 2 +- components/forms/w-toggle.vue | 2 +- components/generic/w-clickable.vue | 2 +- components/generic/w-dead-toggle.vue | 2 +- components/generic/w-toggle-item.vue | 2 +- components/modal/w-modal.vue | 2 +- components/pill/w-pill.vue | 2 +- components/slider/w-slider.vue | 2 +- components/steps/w-step.vue | 2 +- components/steps/w-steps.vue | 2 +- components/switch/w-switch.vue | 2 +- components/tabs/w-tab.vue | 2 +- components/tabs/w-tabs.vue | 2 +- components/tag/w-tag.vue | 2 +- test/wBox.test.js | 2 +- test/wButton.test.js | 2 +- test/wCard.test.js | 2 +- 32 files changed, 32 insertions(+), 32 deletions(-) diff --git a/components/alert/w-alert.vue b/components/alert/w-alert.vue index 5b2dea2d..fd19b883 100644 --- a/components/alert/w-alert.vue +++ b/components/alert/w-alert.vue @@ -2,7 +2,7 @@ import { computed } from 'vue'; import { wExpandTransition } from '#generics'; import { createModel, modelProps } from 'create-v-model'; -import { alert as ccAlert } from '@warp-ds/component-classes'; +import { alert as ccAlert } from '@warp-ds/css/component-classes'; const props = defineProps({ title: String, diff --git a/components/attention/w-attention-arrow.vue b/components/attention/w-attention-arrow.vue index f47cd6ea..08d85973 100644 --- a/components/attention/w-attention-arrow.vue +++ b/components/attention/w-attention-arrow.vue @@ -1,7 +1,7 @@