Skip to content

Commit 0309a17

Browse files
authored
Merge branch 'main' into locfiles/51ffd811-bddd-40b6-bb03-6b932057433a
2 parents 153f6f3 + 2654667 commit 0309a17

494 files changed

Lines changed: 10347 additions & 6238 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.dockerignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22
!/__tests__
33
/__tests__/__image_snapshots__
44
!/packages/bundle/dist
5+
!/packages/bundle/static
56
!/packages/debug-theme/dist
67
!/packages/fluent-theme/dist
8+
!/packages/fluent-theme/static
79
!/packages/playground/build
810
!/packages/test/fluent-bundle/dist
911
!/packages/test/harness/dist

.github/workflows/daily-release.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,9 @@ jobs:
7878
uses: actions/upload-artifact@v4
7979
with:
8080
name: bundles
81-
path: packages/bundle/dist/**/*
81+
path: |
82+
packages/bundle/dist/**/*
83+
packages/bundle/stable/**/*
8284
8385
- name: Upload tarballs
8486
uses: actions/upload-artifact@v4

.github/workflows/preview-branch.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,9 @@ jobs:
6161
uses: actions/upload-artifact@v2
6262
with:
6363
name: bundle
64-
path: 'packages/bundle/dist/**/*'
64+
path: |
65+
packages/bundle/dist/**/*
66+
packages/bundle/stable/**/*
6567
6668
- name: Upload npm-tarball
6769
uses: actions/upload-artifact@v2

.github/workflows/pull-request-validation.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ env:
2424
NODE_ENV: test # Add instrumentation code
2525
node-version: 18.20 # Need to bump jest@29 to resolve something in https://github.com/facebook/react-native/issues/35701
2626

27+
permissions:
28+
contents: read
29+
2730
jobs:
2831
build:
2932
name: Build
@@ -57,8 +60,10 @@ jobs:
5760
./package.json
5861
./__tests__/
5962
./packages/bundle/dist/
63+
./packages/bundle/static/
6064
./packages/debug-theme/dist/
6165
./packages/fluent-theme/dist/
66+
./packages/fluent-theme/static/
6267
./packages/test/harness/
6368
./packages/test/page-object/dist/
6469
./packages/test/web-server/dist/
@@ -339,3 +344,26 @@ jobs:
339344
delete-merged: true
340345
name: test-snapshot-diff
341346
pattern: test-snapshot-diff-*
347+
348+
print-commit-stats:
349+
if: always()
350+
name: Print commit stats
351+
permissions:
352+
contents: read
353+
runs-on: ubuntu-latest
354+
355+
steps:
356+
- uses: actions/checkout@v4
357+
358+
- run: git fetch origin main
359+
360+
- name: Use Node.js ${{ env.node-version }}
361+
uses: actions/setup-node@v4
362+
with:
363+
node-version: ${{ env.node-version }}
364+
cache: npm
365+
366+
- run: npm clean-install
367+
368+
- name: Print commit stats
369+
run: node ./scripts/printCommitStats.mjs | tee --append $GITHUB_STEP_SUMMARY

ACHIEVEMENTS.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,16 @@ A curated list of major achievements by the Web Chat team. This document celebra
139139

140140
## 🚀 Performance & Developer Experience
141141

142+
143+
### 🧩 Introduction of PolyMiddleware
144+
145+
**Goal:** Enable composable, reusable, and unified way for managing middleware.
146+
**By:** [@compulim](https://github.com/compulim) in [PR #5515](https://github.com/microsoft/BotFramework-WebChat/pull/5515), [#5566](https://github.com/microsoft/BotFramework-WebChat/pull/5566)
147+
148+
- Allows multiple middleware to be composed and applied from a single place.
149+
- Simplifies extension, testing, and maintenance of middleware logic.
150+
- Lays groundwork for Web Chat becomoming an UI orchestration.
151+
142152
### 🧠 Memoization & Hook Optimizations
143153

144154
**Goal:** Reduce rerenders and memory footprint.

CHANGELOG.md

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ Notes: web developers are advised to use [`~` (tilde range)](https://github.com/
9898
- Added support of [contentless activity in livestream](https://github.com/microsoft/BotFramework-WebChat/blob/main/docs/LIVESTREAMING.md#scenario-3-interim-activities-with-no-content), in PR [#5430](https://github.com/microsoft/BotFramework-WebChat/pull/5430), by [@compulim](https://github.com/compulim)
9999
- Added sliding dots typing indicator in Fluent theme, in PR [#5447](https://github.com/microsoft/BotFramework-WebChat/pull/5447) and PR [#5448](https://github.com/microsoft/BotFramework-WebChat/pull/5448), by [@compulim](https://github.com/compulim)
100100
- (Experimental) Add an ability to pass `completion` prop into Fluent send box and expose the component, in PR [#5466](https://github.com/microsoft/BotFramework-WebChat/pull/5466), by [@OEvgeny](https://github.com/OEvgeny)
101-
- Added feedback form for like/dislike button when `feedbackActionsPlacement` is `"activity-actions"`, in PR [#5460](https://github.com/microsoft/BotFramework-WebChat/pull/5460), PR [#5469](https://github.com/microsoft/BotFramework-WebChat/pull/5469), PR [5470](https://github.com/microsoft/BotFramework-WebChat/pull/5470) and PR [#5501](https://github.com/microsoft/BotFramework-WebChat/pull/5501) by [@lexi-taylor](https://github.com/lexi-taylor) and [@OEvgeny](https://github.com/OEvgeny)
101+
- Added feedback form for like/dislike button when `feedbackActionsPlacement` is `"activity-actions"`, in PR [#5460](https://github.com/microsoft/BotFramework-WebChat/pull/5460), PR [#5469](https://github.com/microsoft/BotFramework-WebChat/pull/5469), PR [5470](https://github.com/microsoft/BotFramework-WebChat/pull/5470), PR [#5501](https://github.com/microsoft/BotFramework-WebChat/pull/5501) by [@lexi-taylor](https://github.com/lexi-taylor), and [@OEvgeny](https://github.com/OEvgeny)
102102
- <kbd>ESCAPE</kbd> key should reset the feedback form, in PR [#5480](https://github.com/microsoft/BotFramework-WebChat/pull/5480), by [@compulim](https://github.com/compulim), in PR [#5493](https://github.com/microsoft/BotFramework-WebChat/pull/5493) by [@lexi-taylor](https://github.com/lexi-taylor)
103103
- Added multi-dimensional grouping, `styleOptions.groupActivitiesBy`, and `useGroupActivitiesByName` hook, in PR [#5471](https://github.com/microsoft/BotFramework-WebChat/pull/5471), by [@compulim](https://github.com/compulim)
104104
- Existing behavior will be kept and activities will be grouped by `sender` followed by `status`
@@ -112,7 +112,7 @@ Notes: web developers are advised to use [`~` (tilde range)](https://github.com/
112112
- Deprecated `hideUploadButton` in favor of `disableFileUpload`.
113113
- Updated `BasicSendBoxToolbar` to rely solely on `disableFileUpload`.
114114
- Added support for livestreaming via `entities[type="streaminfo"]` in PR [#5517](https://github.com/microsoft/BotFramework-WebChat/pull/5517) by [@kylerohn](https://github.com/kylerohn) and [@compulim](https://github.com/compulim)
115-
- Added `polymiddleware`, a new [universal middleware for every UIs](./docs/MIDDLEWARE.md), by [@compulim](https://github.com/compulim) in PR [#5515](https://github.com/microsoft/BotFramework-WebChat/pull/5515)
115+
- Added `polymiddleware`, a new [universal middleware for every UIs](./docs/MIDDLEWARE.md), by [@compulim](https://github.com/compulim) in PR [#5515](https://github.com/microsoft/BotFramework-WebChat/pull/5515) and [#5566](https://github.com/microsoft/BotFramework-WebChat/pull/5566)
116116
- Added `polymiddleware` to `<ThemeProvider>`
117117
- Currently supports activity middleware and the new error box middleware
118118
- New internal packages, by [@compulim](https://github.com/compulim) in PR [#5515](https://github.com/microsoft/BotFramework-WebChat/pull/5515)
@@ -121,7 +121,7 @@ Notes: web developers are advised to use [`~` (tilde range)](https://github.com/
121121
- `@msinternal/botframework-webchat-react-hooks` for helpers for React hooks
122122
- Added link sanitization and ESLint rules, in PR [#5564](https://github.com/microsoft/BotFramework-WebChat/pull/5564), by [@compulim](https://github.com/compulim)
123123
- Added blob URL sanitization and ESLint rules, in PR [#5568](https://github.com/microsoft/BotFramework-WebChat/pull/5568), by [@compulim](https://github.com/compulim)
124-
- Added visual message grouping following the `isPartOf` property of the `Message` entity, in PR [#5553](https://github.com/microsoft/BotFramework-WebChat/pull/5553), by [@OEvgeny](https://github.com/OEvgeny)
124+
- Added visual message grouping following the `isPartOf` property of the `Message` entity, in PR [#5553](https://github.com/microsoft/BotFramework-WebChat/pull/5553), in PR [#5585](https://github.com/microsoft/BotFramework-WebChat/pull/5585), by [@OEvgeny](https://github.com/OEvgeny)
125125
- The mode is suitable for providing chain-of-thought reasoning
126126
- Added visual indication of `creativeWorkStatus` property in `Message` entity:
127127
- `undefined` - no indicator is shown
@@ -130,6 +130,20 @@ Notes: web developers are advised to use [`~` (tilde range)](https://github.com/
130130
- Added a `position` property support for the `Message` entity
131131
- The `position` property takes precedence over existing sequence ID
132132
- Unified build info and injection of `<meta>` tag, in PR [#5571](https://github.com/microsoft/BotFramework-WebChat/pull/5571), by [@compulim](https://github.com/compulim)
133+
- Added documentation for `isPartOf` property, in PR [#5573](https://github.com/microsoft/BotFramework-WebChat/pull/5573), by [@compulim](https://github.com/compulim)
134+
- `fluent-theme`: Changed dependencies to import solely from the "bundle" package, in PR [#5584](https://github.com/microsoft/BotFramework-WebChat/pull/5584), by [@compulim](https://github.com/compulim)
135+
- Improved bundling, in PR [#5588](https://github.com/microsoft/BotFramework-WebChat/pull/5588), by [@compulim](https://github.com/compulim)
136+
- New named exports
137+
- `api`: `botframework-webchat-api/hook`
138+
- `bundle`: `botframework-webchat/component`, `botframework-webchat/decorator` (internal-use), `botframework-webchat/hook`
139+
- `component`: `botframework-webchat-component/component`, `botframework-webchat-component/hook`
140+
- (Experimental) Added support for importing via `<script type="module">`, by [@compulim](https://github.com/compulim) in PR [#5592](https://github.com/microsoft/BotFramework-WebChat/pull/5592)
141+
- Added support for `botframework-webchat-fluent-theme` package, by [@compulim](https://github.com/compulim) in PR [#5593](https://github.com/microsoft/BotFramework-WebChat/pull/5593)
142+
- Bundling vendor chunks, by [@compulim](https://github.com/compulim) in PR [#5595](https://github.com/microsoft/BotFramework-WebChat/pull/5595)
143+
- Added deprecation notes for legacy imports, by [@compulim](https://github.com/compulim) in PR [#5600](https://github.com/microsoft/BotFramework-WebChat/pull/5600)
144+
- `import { hooks } from 'botframework-webchat'` should be replaced by `import * as hooks from 'botframework-webchat/hook'`
145+
- Added target to Chrome 100 and re-enable Lightning CSS for ESM builds, by [@compulim](https://github.com/compulim) in PR [#5602](https://github.com/microsoft/BotFramework-WebChat/pull/5602)
146+
- Relaxed `role` prop to allow any string instead of ARIA landmark roles, in PR [#5561](https://github.com/microsoft/BotFramework-WebChat/pull/5561), by [@compulim](https://github.com/compulim)
133147

134148
### Changed
135149

@@ -298,6 +312,12 @@ Notes: web developers are advised to use [`~` (tilde range)](https://github.com/
298312
- Updated file-based import with `.js` extension and removed the file extension from build config, by [@compulim](https://github.com/compulim), in PR [#5516](https://github.com/microsoft/BotFramework-WebChat/pull/5516)
299313
- Fixed [#5518](https://github.com/microsoft/BotFramework-WebChat/issues/5518). Minimal bundled build should work properly, in PR [#5507](https://github.com/microsoft/BotFramework-WebChat/pull/5507), by [@compulim](https://github.com/compulim)
300314
- Fixed [#5520](https://github.com/microsoft/BotFramework-WebChat/issues/5520). Version information should be injected when installed via npm, in PR [#5521](https://github.com/microsoft/BotFramework-WebChat/pull/5521), by [@compulim](https://github.com/compulim)
315+
- Fixed aria-label only announcing placeholder in feedback form, in PR [#5567](https://github.com/microsoft/BotFramework-WebChat/pull/5567)
316+
- Fixed placing focus on the code block content, so it is possible to scroll code via keyboard, in PR [#5575](https://github.com/microsoft/BotFramework-WebChat/pull/5575), by [@OEvgeny](https://github.com/OEvgeny)
317+
- Fixed [#5581](https://github.com/microsoft/BotFramework-WebChat/issues/5581). Activities should be displayed after upgrading via `npm install`, in PR [#5582](https://github.com/microsoft/BotFramework-WebChat/pull/5582), by [@compulim](https://github.com/compulim)
318+
- Fixed Composer props types not resolving correctly in React 16 in PR [#5580](https://github.com/microsoft/BotFramework-WebChat/pull/5580),
319+
by [@lexi-taylor](https://github.com/lexi-taylor)
320+
- Fixed `npm start` may fail subsequently as builds are not fully flushed to `/dist/`, in PR [#5599](https://github.com/microsoft/BotFramework-WebChat/pull/5599), by [@compulim](https://github.com/compulim)
301321

302322
### Removed
303323

Loading
Loading

__tests__/html/adaptiveCards.assumeBorderBox.js

Lines changed: 0 additions & 6 deletions
This file was deleted.

__tests__/html/adaptiveCards.parserMaxVersion.js

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)