Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
"ts-node": "10.9.2",
"tslib": "2.8.1",
"typescript": "5.9.2",
"vite": "^6.1.0",
"vite": "^7.0.0",
"vite-plugin-environment": "^1.1.3",
"vite-plugin-node-polyfills": "0.24.0",
"vite-plugin-static-copy": "^3.0.0",
Expand Down
1 change: 1 addition & 0 deletions packages/design-system/docs/.vitepress/theme/custom.scss
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
html * {
text-rendering: optimizeLegibility;
-webkit-font-smoothing: antialiased;
overflow: auto;
}

@font-face {
Expand Down
2 changes: 1 addition & 1 deletion packages/design-system/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
"sass-resources-loader": "^2.2.5",
"tailwindcss": "^4.1.11",
"url": "^0.11.3",
"vite": "^6.0.9",
"vite": "^7.0.0",
"vite-plugin-dts": "^4.2.3",
"vite-plugin-node-polyfills": "^0.24.0",
"vitepress": "^1.6.3",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
appearance="raw"
class="raw-hover-surface oc-bottom-drawer-close-button"
:aria-label="$gettext('Close the context menu')"
@click="hide"
@click="hide()"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why though?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(clarified in chat: didn't want $event to be auto-passed into hide)

>
<oc-icon name="close" fill-type="line" />
</oc-button>
Expand Down Expand Up @@ -65,7 +65,7 @@ import { onKeyStroke } from '@vueuse/core'
import OcButton from '../OcButton/OcButton.vue'
import OcCard from '../OcCard/OcCard.vue'

interface Props {
export interface Props {
/**
* @docs The ID the drawer element gets.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
</template>

<script setup lang="ts">
import { computed, useAttrs } from 'vue'
import { computed, HTMLAttributes, useAttrs } from 'vue'
import { uniqueId } from '../../helpers'
import OcButton from '../OcButton/OcButton.vue'
import OcIcon from '../OcIcon/OcIcon.vue'
Expand Down Expand Up @@ -169,7 +169,7 @@ const additionalAttributes = computed(() => {
})

const ariaInvalid = computed(() => {
return (!!errorMessage).toString()
return (!!errorMessage).toString() as HTMLAttributes['aria-invalid']
})

const messageText = computed(() => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
</template>

<script setup lang="ts">
import { computed, nextTick, useAttrs, useTemplateRef, unref } from 'vue'
import { computed, nextTick, useAttrs, useTemplateRef, unref, HTMLAttributes } from 'vue'
import { uniqueId } from '../../helpers'
import OcButton from '../OcButton/OcButton.vue'
import OcIcon from '../OcIcon/OcIcon.vue'
Expand Down Expand Up @@ -193,7 +193,7 @@ const additionalAttributes = computed(() => {
})

const ariaInvalid = computed(() => {
return (!!errorMessage).toString()
return (!!errorMessage).toString() as HTMLAttributes['aria-invalid']
})

const messageText = computed(() => {
Expand Down
2 changes: 2 additions & 0 deletions packages/design-system/types.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import OcAvatarItem from './src/components/OcAvatarItem/OcAvatarItem.vue'
import OcAvatarLink from './src/components/OcAvatarLink/OcAvatarLink.vue'
import OcAvatars from './src/components/OcAvatars/OcAvatars.vue'
import OcBreadcrumb from './src/components/OcBreadcrumb/OcBreadcrumb.vue'
import OcBottomDrawer from './src/components/OcBottomDrawer/OcBottomDrawer.vue'
import OcButton from './src/components/OcButton/OcButton.vue'
import OcCard from './src/components/OcCard/OcCard.vue'
import OcCheckbox from './src/components/OcCheckbox/OcCheckbox.vue'
Expand Down Expand Up @@ -65,6 +66,7 @@ declare module 'vue' {
OcAvatarLink: typeof OcAvatarLink
OcAvatars: typeof OcAvatars
OcBreadcrumb: typeof OcBreadcrumb
OcBottomDrawer: typeof OcBottomDrawer
OcButton: typeof OcButton
OcCard: typeof OcCard
OcCheckbox: typeof OcCheckbox
Expand Down
7 changes: 3 additions & 4 deletions packages/design-system/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
import { resolve } from 'path'
import { defineConfig, searchForWorkspaceRoot } from 'vite'
import { defineConfig } from 'vite'
import dts from 'vite-plugin-dts'
import vue from '@vitejs/plugin-vue'
import pkg from './package.json'
import { viteStaticCopy } from 'vite-plugin-static-copy'

const projectRootDir = searchForWorkspaceRoot(process.cwd())

export default defineConfig({
css: {
preprocessorOptions: {
scss: {
additionalData: `
@use "sass:math";
@import "${projectRootDir}/packages/design-system/src/styles/styles";
@use "sass:string";
@use "sass:meta";
`,
silenceDeprecations: ['legacy-js-api', 'import']
}
Expand Down
2 changes: 1 addition & 1 deletion packages/extension-sdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"@vitejs/plugin-vue": "^6.0.0"
},
"peerDependencies": {
"vite": "^5 || ^6.0.0",
"vite": "^5 || ^6.0.0 || ^7.0.0",
"sass": "^1.79.5"
}
}
2 changes: 1 addition & 1 deletion packages/web-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,6 @@
"clean-publish": "5.2.2",
"vite-plugin-dts": "4.5.4",
"vite-plugin-node-polyfills": "0.24.0",
"vite": "^6.1.0"
"vite": "^7.0.0"
}
}
3 changes: 2 additions & 1 deletion packages/web-pkg/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ export default defineConfig({
scss: {
additionalData: `
@use "sass:math";
@import "${projectRootDir}/packages/design-system/src/styles/styles";
@use "sass:string";
@use "sass:meta";
`,
silenceDeprecations: ['legacy-js-api', 'import']
}
Expand Down
2 changes: 1 addition & 1 deletion packages/web-test-helpers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"@vitejs/plugin-vue": "6.0.1",
"clean-publish": "^5.0.0",
"vite-plugin-dts": "^4.2.3",
"vite": "^6.0.9"
"vite": "^7.0.0"
},
"dependencies": {
"@casl/ability": "^6.7.1",
Expand Down
Loading