chore: merge branch 'v2' into v2-develop

vuestorefront · May 25, 2023 · cad819e · cad819e
2 parents 635b6ed + 1ef4305
commit cad819e
Show file tree

Hide file tree

Showing 13 changed files with 141 additions and 215 deletions.
diff --git a/.vuestorefrontcloud/docs/Dockerfile b/.vuestorefrontcloud/docs/Dockerfile
@@ -25,3 +25,5 @@ RUN yarn build:docs
 
 FROM nginx
 COPY --from=build /var/www/apps/docs/components/.vuepress/dist /usr/share/nginx/html/v2
+COPY .vuestorefrontcloud/docs/default.conf /etc/nginx/conf.d/default.conf
+
diff --git a/.vuestorefrontcloud/docs/README.md b/.vuestorefrontcloud/docs/README.md
@@ -4,6 +4,6 @@
 
 You can debug dockerized docs image by following steps below:
 - add `EXPOSE 80` command at the end of the Dockerfile in this folder next to this readme file, 
-- build image using `docker build -t docs -f .vuestorefrontcloud/docs/Dockerfile .`, 
+- build image using `DOCKER_BUILDKIT=1 docker build -t docs --build-arg VITE_DOCS_BASEPATH=/v2/  -f .vuestorefrontcloud/docs/Dockerfile .`, 
 - run image using `docker run -p 48080:80 docs`, 
 - open browser and go to the address `localhost:48080/v2/index.html` to see the docs page running.
diff --git a/.vuestorefrontcloud/docs/default.conf b/.vuestorefrontcloud/docs/default.conf
@@ -0,0 +1,13 @@
+server {
+    listen       80;
+    server_name  _;
+
+  location /v2/figma {
+    return 307 https://www.figma.com/file/7APRfAoRBRwsZeu07wN5Vg/Storefront-UI-%7C-Design-Kit-v2.2-(public);
+  }
+
+  location /v2 {
+    try_files $uri $uri.html $uri/ =404;
+    root /usr/share/nginx/html;
+  }
+}
diff --git a/.vuestorefrontcloud/router/docker/default.conf b/.vuestorefrontcloud/router/docker/default.conf
@@ -10,8 +10,4 @@ server {
   location / {
     return 301 https://docs.storefrontui.io/v2$uri$is_args$args;
   }
-
-  location /v2/figma {
-    return 307 https://www.figma.com/file/7APRfAoRBRwsZeu07wN5Vg/Storefront-UI-%7C-Design-Kit-v2.2-(public)
-  }
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+# 2.2.1 (2023-05-24)
+
+## Overview
+
+This is a patch release containing bug fixes to SFUI2.
+
+## Bug fixes
+
+- enable CJS support introduced by `react-merge-refs` dependency ([#2699](https://github.com/vuestorefront/storefront-ui/issues/2699), [c1c5b5fee](https://github.com/vuestorefront/storefront-ui/commit/c1c5b5feee1c7a7e2a2933f001e3f4239887f15d)).
+
 # 2.2.0 (2023-05-11)
 
 ## Overview

diff --git a/packages/config/tailwind/package.json b/packages/config/tailwind/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storefront-ui/tailwind-config",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "license": "MIT",
   "sideEffects": false,
   "exports": {

diff --git a/packages/sfui/frameworks/react/hooks/useScrollable/useScrollable.ts b/packages/sfui/frameworks/react/hooks/useScrollable/useScrollable.ts
@@ -1,4 +1,4 @@
-import { useEffect, useRef, useState, useCallback } from 'react';
+import { useEffect, useRef, useState } from 'react';
 import { type UseScrollableOptions, Scrollable, composeHandlers, createPropsGetter } from '@storefront-ui/react';
 
 export function useScrollable<TElement extends HTMLElement>({

diff --git a/packages/sfui/frameworks/react/package.json b/packages/sfui/frameworks/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storefront-ui/react",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "license": "MIT",
   "sideEffects": false,
   "exports": {

diff --git a/packages/sfui/frameworks/vue/package.json b/packages/sfui/frameworks/vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storefront-ui/vue",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "license": "MIT",
   "sideEffects": false,
   "exports": {

diff --git a/packages/sfui/shared/package.json b/packages/sfui/shared/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@storefront-ui/shared",
   "description": "Shared set of utils and typings used by `@storefront-ui/*` packages",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "license": "MIT",
   "sideEffects": false,
   "exports": {

diff --git a/packages/sfui/tw-plugin-peer-next/package.json b/packages/sfui/tw-plugin-peer-next/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@storefront-ui/tw-plugin-peer-next",
     "description": "SFUI peer-next plugin for Tailwind",
-    "version": "2.2.0",
+    "version": "2.2.1",
     "license": "MIT",
     "sideEffects": false,
     "exports": {

diff --git a/packages/sfui/typography/package.json b/packages/sfui/typography/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@storefront-ui/typography",
     "description": "SFUI typography plugin for Tailwind",
-    "version": "2.2.0",
+    "version": "2.2.1",
     "sideEffects": false,
     "license": "MIT",
     "exports": {