Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: sync v2-develop with v2 #3238

Merged
merged 8 commits into from
Nov 12, 2024
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
23 changes: 2 additions & 21 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ jobs:
- name: Pre-Cypress (build all dependencies)
run: yarn test:ci-pre:vue
- name: Cypress run
uses: cypress-io/[email protected].2
uses: cypress-io/[email protected].7
with:
browser: chrome
working-directory: apps/test/vue
Expand Down Expand Up @@ -179,7 +179,7 @@ jobs:
- name: Pre-Cypress (build all dependencies)
run: yarn test:ci-pre:react
- name: Cypress run
uses: cypress-io/[email protected].2
uses: cypress-io/[email protected].7
with:
browser: chrome
working-directory: apps/test/react
Expand Down Expand Up @@ -314,22 +314,3 @@ jobs:
env:
GH_TOKEN: ${{ github.token }}
run: gh pr merge --auto --merge

gg-scanning:
name: GitGuardian scan
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: GitGuardian scan
uses: GitGuardian/[email protected]
with:
args: -v
env:
GITHUB_PUSH_BEFORE_SHA: ${{ github.event.before }}
GITHUB_PUSH_BASE_SHA: ${{ github.event.base }}
GITHUB_PULL_BASE_SHA: ${{ github.event.pull_request.base.sha }}
GITHUB_DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
GITGUARDIAN_API_KEY: ${{ secrets.GITGUARDIAN_API_KEY }}
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -66,5 +66,3 @@ apps/docs/components/utils/components.json
apps/docs/components/utils/showcases.json
apps/docs/components/utils/hooks.json
apps/docs/components/utils/blocks.json

.cache_ggshield
236 changes: 118 additions & 118 deletions .yarn/releases/yarn-3.8.3.cjs → .yarn/releases/yarn-3.8.6.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ plugins:
- path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
spec: '@yarnpkg/plugin-workspace-tools'

yarnPath: .yarn/releases/yarn-3.8.3.cjs
yarnPath: .yarn/releases/yarn-3.8.6.cjs
6 changes: 3 additions & 3 deletions apps/docs/components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
"@microsoft/api-documenter": "^7.25.9",
"@microsoft/api-extractor": "^7.47.4",
"@types/node": "^20.12.7",
"nuxt": "^3.13.2",
"nuxt": "^3.14.159",
"nuxt-gtag": "^3.0.1"
},
"dependencies": {
"@microsoft/api-extractor-model": "^7.29.4",
"@microsoft/tsdoc": "^0.15.0",
"@nuxt/content": "^2.12.1",
"@nuxt/content": "^2.13.4",
"@nuxtjs/algolia": "^1.10.2",
"@nuxtjs/color-mode": "^3.4.2",
"@nuxtjs/seo": "^2.0.0-rc.10",
Expand All @@ -36,7 +36,7 @@
"marked": "^13.0.3",
"nuxt-content-assets": "^1.4.3",
"nuxt-icon": "^0.6.10",
"sf-docs-base": "^1.3.1",
"sf-docs-base": "^1.3.2",
"unstorage": "^1.10.2",
"vite-svg-loader": "^5.1.0"
},
Expand Down
2 changes: 1 addition & 1 deletion apps/preview/nuxt/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"autoprefixer": "^10.4.19",
"eslint": "^8.34.0",
"eslint-plugin-nuxt": "^4.0.0",
"nuxt": "^3.13.2",
"nuxt": "^3.14.159",
"postcss": "^8.4.21",
"prettier": "^3.0.0",
"sass": "^1.77.8",
Expand Down
2 changes: 1 addition & 1 deletion apps/test/vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"test:ci:vue": "yarn test:ci && CYPRESS_COVERAGE=true yarn cypress run --component && yarn generate-coverage"
},
"dependencies": {
"vue": "^3.4.27",
"vue": "^3.5.12",
"vue-router": "^4.3.2"
},
"devDependencies": {
Expand Down
6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,14 +84,16 @@
"yarn": ">=1.22.19",
"node": ">=16.0.0"
},
"packageManager": "[email protected].3",
"packageManager": "[email protected].6",
"config": {
"commitizen": {
"path": "cz-conventional-changelog",
"disableScopeLowerCase": true
}
},
"resolutions": {
"@changesets/assemble-release-plan@^6.0.0": "patch:@changesets/assemble-release-plan@npm%3A6.0.0#./.yarn/patches/@changesets-assemble-release-plan-npm-6.0.0-f7b3005037.patch"
"@changesets/assemble-release-plan@^6.0.0": "patch:@changesets/assemble-release-plan@npm%3A6.0.0#./.yarn/patches/@changesets-assemble-release-plan-npm-6.0.0-f7b3005037.patch",
"#sf-docs-base": "old vue with version 3.4. causing missing renderer",
"vue": "3.5.12"
}
}
2 changes: 1 addition & 1 deletion packages/config/example-style/index.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import 'controls';
@use 'controls';

.e-page {
width: 100%;
Expand Down
2 changes: 1 addition & 1 deletion packages/sfui/frameworks/nuxt/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,6 @@
"@nuxt/schema": "^3.13.2",
"@storefront-ui/eslint-config": "workspace:*",
"eslint": "^8.34.0",
"nuxt": "^3.13.2"
"nuxt": "^3.14.159"
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { computed, unref } from 'vue';
import { computed, toValue } from 'vue';
import { onClickOutside, onKeyStroke, type MaybeElementRef, type MaybeRefOrGetter } from '@vueuse/core';
import { flip, offset, shift } from '@floating-ui/vue';
import { type UseDropdownOptions, usePopover } from '@storefront-ui/vue';
Expand All @@ -8,7 +8,7 @@ export function useDropdown(options: UseDropdownOptions) {

const { floatingRef, referenceRef, style } = usePopover({
placement,
middleware: computed(() => unref(middleware) || [offset(8), shift(), flip()]),
middleware: computed(() => toValue(middleware) || [offset(8), shift(), flip()]),
isOpen,
...popoverOptions,
});
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ref, unref, computed } from 'vue';
import { ref, unref, computed, toValue } from 'vue';
import { arrow, flip, offset, shift, type ReferenceElement, type Side } from '@floating-ui/vue';
import { type UseTooltipOptions, usePopover, useDisclosure } from '@storefront-ui/vue';

Expand All @@ -25,7 +25,10 @@ export function useTooltip<ReferenceEl extends ReferenceElement = ReferenceEleme
isOpen,
placement: initialPlacement,
strategy,
middleware: computed(() => [...(unref(middleware) || [offset(8), shift(), flip()]), arrow({ element: arrowRef })]),
middleware: computed(() => [
...(toValue(middleware) || [offset(8), shift(), flip()]),
arrow({ element: arrowRef }),
]),
...popoverOptions,
});

Expand Down
2 changes: 1 addition & 1 deletion packages/sfui/frameworks/vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"vue-tsc": "^2.0.29"
},
"peerDependencies": {
"vue": "^3.4.27"
"vue": "^3.5.12"
},
"publishConfig": {
"access": "public"
Expand Down
Loading
Loading