Merge remote-tracking branch 'upstream/develop' into release/v4.0.0-b…

…eta.4

# Conflicts:
#	.npmrc
#	CHANGELOG.md
#	package.json
#	pnpm-lock.yaml
#	readme.md
#	src/index.ts
#	src/social/components/StoryTab/StoryRing.tsx
#	src/social/v4/internal-components/Badege/types.tsx
#	src/social/v4/internal-components/CommentComposeBar/index.tsx
#	src/v4/core/components/BottomSheet/BottomSheet.tsx
#	src/v4/core/components/BottomSheet/styles.tsx
#	src/v4/core/components/Button/Button.module.css
#	src/v4/core/components/Button/Button.tsx
#	src/v4/core/components/InputText/index.tsx
#	src/v4/core/components/InputText/styles.module.css
#	src/v4/core/components/Modal/styles.module.css
#	src/v4/core/providers/ThemeProvider.tsx
#	src/v4/social/components/CommentTray/CommentTray.module.css
#	src/v4/social/components/CommentTray/CommentTray.tsx
#	src/v4/social/components/CommentTray/ui.stories.tsx
#	src/v4/social/components/HyperLinkConfig/HyperLinkConfig.module.css
#	src/v4/social/components/HyperLinkConfig/HyperLinkConfig.tsx
#	src/v4/social/components/ReactionList/ReactionList.module.css
#	src/v4/social/components/ReactionList/ReactionList.tsx
#	src/v4/social/components/ReactionList/styles.tsx
#	src/v4/social/components/StoryTab/StoryRing.module.css
#	src/v4/social/components/StoryTab/StoryRing.tsx
#	src/v4/social/elements/CommentButton/CommentButton.module.css
#	src/v4/social/elements/HyperLink/HyperLink.tsx
#	src/v4/social/elements/HyperLink/styles.tsx
#	src/v4/social/icons/index.ts
#	src/v4/social/internal-components/Badege/styles.tsx
#	src/v4/social/internal-components/Badege/types.ts
#	src/v4/social/internal-components/Badege/types.tsx
#	src/v4/social/internal-components/Comment/CommentText.tsx
#	src/v4/social/internal-components/Comment/UIComment.tsx
#	src/v4/social/internal-components/Comment/index.tsx
#	src/v4/social/internal-components/Comment/styles.tsx
#	src/v4/social/internal-components/CommentComposeBar/CommentComposeBar.tsx
#	src/v4/social/internal-components/CommentComposeBar/index.ts
#	src/v4/social/internal-components/CommentComposeBar/index.tsx
#	src/v4/social/internal-components/CommentComposeBar/styles.tsx
#	src/v4/social/internal-components/CommentList/CommentList.tsx
#	src/v4/social/internal-components/StoryCommentComposeBar/StoryCommentComposeBar.tsx
#	src/v4/social/internal-components/StoryCommentComposeBar/styles.tsx
#	src/v4/social/internal-components/StoryViewer/Renderers/Image.tsx
#	src/v4/social/internal-components/StoryViewer/Renderers/Renderers.module.css
#	src/v4/social/internal-components/StoryViewer/Renderers/Video.tsx
#	src/v4/social/internal-components/StoryViewer/Renderers/Wrappers/Footer/index.tsx
#	src/v4/social/internal-components/StoryViewer/Renderers/Wrappers/Header/Header.module.css
#	src/v4/social/internal-components/StoryViewer/Renderers/styles.tsx
#	src/v4/social/pages/Application/sdk.stories.tsx
#	src/v4/social/pages/DraftsPage/DraftsPage.module.css
#	src/v4/social/pages/DraftsPage/DraftsPage.tsx
#	src/v4/social/pages/DraftsPage/styles.tsx
#	src/v4/social/pages/StoryPage/GlobalFeedStory.tsx
#	src/v4/styles/global.css

.github/workflows/dev.yaml

@@ -3,6 +3,9 @@ name: Dev release pipeline
 on:
   pull_request:
 
+env:
+  NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+
 jobs:
   sync_dev:
     runs-on: ubuntu-latest
@@ -52,6 +55,28 @@ jobs:
       - name: build storybook
         run: pnpm run storybook:build
 
+      - name: get version
+        id: version
+        run: echo "current_version=$(node -p "require('./package.json').version")" >> $GITHUB_OUTPUT
+
+      - name: increase version (pre-release)
+        run: pnpm standard-version --release-as ${{ steps.version.outputs.current_version }} --prerelease alpha.$(git rev-parse --short HEAD) --skip.changelog --skip.commit --skip.tag
+
+      - name: unpublish old version
+        if: "contains(github.event.pull_request.title, '(sdk):')"
+        continue-on-error: true
+        run: |
+          prev=$(npm view @amityco/ui-kit dist-tags.dev/${{ github.event.pull_request.number }})
+          [[ ! -z $prev ]] && npm unpublish @amityco/ui-kit@$prev
+
+      - name: build
+        run: pnpm run build
+
+      - name: publish on npm with dev dist-tag
+        if: "contains(github.event.pull_request.title, '(sdk):')"
+        continue-on-error: true
+        run: npm publish --tag dev/${{ github.event.pull_request.number }}
+
       - name: publish on s3
         uses: jakejarvis/s3-sync-action@master
         with:

.github/workflows/staging.yaml

@@ -33,12 +33,7 @@ jobs:
       - uses: pnpm/action-setup@v2
         with:
           version: 8
-          run_install: false
-
-      - name: Get pnpm store directory
-        id: pnpm-cache
-        run: |
-          echo "pnpm_cache_dir=$(pnpm store path)" >> $GITHUB_OUTPUT
+          run_install: true
 
       - uses: actions/cache@v3
         name: Setup pnpm cache
@@ -48,9 +43,6 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-pnpm-store-
 
-      - name: Install dependencies
-        run: pnpm install
-
       - name: build storybook
         run: pnpm run storybook:build
 

.npmrc

@@ -1 +1 @@
-@fortawesome:registry=https://registry.npmjs.org
+//registry.npmjs.org/:_authToken=${NPM_TOKEN}

CHANGELOG.md

@@ -6,12 +6,6 @@ All notable changes to this project will be documented in this file. See [standa
 
 ### Bug Fixes
 
-- path ([6b130f8](https://github.com/AmityCo/Amity-Social-Cloud-UIKit-Web-OpenSource/commit/6b130f840311ea6723061400a9f16db37444abe0))
-
-## 4.0.0-beta.3 (2024-04-26)
-
-### Bug Fixes
-
 - cherry-pick bugs from v3 ([7b01a95](https://github.com/EkoCommunications/AmityUiKitWeb/commit/7b01a956db5a7c019164ee4ffaf781a55c588714))
 
 ## 4.0.0-beta.2 (2024-04-12)

package.json

@@ -40,9 +40,6 @@
   },
   "devDependencies": {
     "@amityco/ts-sdk": "^6.23.0",
-    "@fortawesome/fontawesome-svg-core": "^1.2.36",
-    "@fortawesome/free-solid-svg-icons": "^5.15.4",
-    "@fortawesome/react-fontawesome": "^0.2.0",
     "@storybook/addon-a11y": "^7.6.7",
     "@storybook/addon-actions": "^7.6.7",
     "@storybook/addon-backgrounds": "^7.6.7",
@@ -104,6 +101,7 @@
     "clsx": "^2.1.0",
     "extract-colors": "^4.0.2",
     "filesize": "^9.0.11",
+    "framer-motion": "^11.1.7",
     "hls.js": "^1.4.14",
     "linkify-react": "^4.1.3",
     "linkifyjs": "^4.1.3",