Merge pull request #3238 from vuestorefront/v2-develop

Szymon-dziewonski · web-flow · commit e291f4ac3d95 · 2024-11-12T10:32:00.000+01:00
chore: sync v2-develop with v2
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -144,7 +144,7 @@ jobs:
       - name: Pre-Cypress (build all dependencies)
         run: yarn test:ci-pre:vue
       - name: Cypress run
-        uses: cypress-io/github-action@v6.7.2
+        uses: cypress-io/github-action@v6.7.7
         with:
           browser: chrome
           working-directory: apps/test/vue
@@ -179,7 +179,7 @@ jobs:
       - name: Pre-Cypress (build all dependencies)
         run: yarn test:ci-pre:react
       - name: Cypress run
-        uses: cypress-io/github-action@v6.7.2
+        uses: cypress-io/github-action@v6.7.7
         with:
           browser: chrome
           working-directory: apps/test/react
@@ -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/ggshield-action@v1.29.0
-        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 }}
diff --git a/.gitignore b/.gitignore
@@ -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
diff --git a/.yarn/releases/yarn-3.8.6.cjs b/.yarn/releases/yarn-3.8.6.cjs
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -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
diff --git a/apps/docs/components/package.json b/apps/docs/components/package.json
@@ -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",
@@ -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"
   },
diff --git a/apps/preview/nuxt/package.json b/apps/preview/nuxt/package.json
@@ -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",
diff --git a/apps/test/vue/package.json b/apps/test/vue/package.json
@@ -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": {
diff --git a/package.json b/package.json
@@ -84,14 +84,16 @@
     "yarn": ">=1.22.19",
     "node": ">=16.0.0"
   },
-  "packageManager": "yarn@3.8.3",
+  "packageManager": "yarn@3.8.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"
   }
 }
diff --git a/packages/config/example-style/index.scss b/packages/config/example-style/index.scss
@@ -1,4 +1,4 @@
-@import 'controls';
+@use 'controls';
 
 .e-page {
     width: 100%;
diff --git a/packages/sfui/frameworks/nuxt/package.json b/packages/sfui/frameworks/nuxt/package.json
@@ -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"
   }
 }
diff --git a/packages/sfui/frameworks/vue/composables/useDropdown/useDropdown.ts b/packages/sfui/frameworks/vue/composables/useDropdown/useDropdown.ts
@@ -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';
@@ -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,
   });
diff --git a/packages/sfui/frameworks/vue/composables/useTooltip/useTooltip.ts b/packages/sfui/frameworks/vue/composables/useTooltip/useTooltip.ts
@@ -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';
 
@@ -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,
   });
 
diff --git a/packages/sfui/frameworks/vue/package.json b/packages/sfui/frameworks/vue/package.json
@@ -61,7 +61,7 @@
     "vue-tsc": "^2.0.29"
   },
   "peerDependencies": {
-    "vue": "^3.4.27"
+    "vue": "^3.5.12"
   },
   "publishConfig": {
     "access": "public"
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -84,14 +84,16 @@`
`84`	`84`	`"yarn": ">=1.22.19",`
`85`	`85`	`"node": ">=16.0.0"`
`86`	`86`	`},`
`87`		`- "packageManager": "[email protected].3",`
	`87`	`+ "packageManager": "[email protected].6",`
`88`	`88`	`"config": {`
`89`	`89`	`"commitizen": {`
`90`	`90`	`"path": "cz-conventional-changelog",`
`91`	`91`	`"disableScopeLowerCase": true`
`92`	`92`	`}`
`93`	`93`	`},`
`94`	`94`	`"resolutions": {`
`95`		`- "@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"`
	`95`	`+ "@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",`
	`96`	`+ "#sf-docs-base": "old vue with version 3.4. causing missing renderer",`
	`97`	`+ "vue": "3.5.12"`
`96`	`98`	`}`
`97`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-@import 'controls';`
	`1`	`+@use 'controls';`
`2`	`2`
`3`	`3`	`.e-page {`
`4`	`4`	`width: 100%;`
Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,6 @@`
`49`	`49`	`"@nuxt/schema": "^3.13.2",`
`50`	`50`	`"@storefront-ui/eslint-config": "workspace:*",`
`51`	`51`	`"eslint": "^8.34.0",`
`52`		`- "nuxt": "^3.13.2"`
	`52`	`+ "nuxt": "^3.14.159"`
`53`	`53`	`}`
`54`	`54`	`}`