Skip to content

Commit 38af761

Browse files
authored
Merge preview into master (#1277)
* Remove typing after 5s * Cleanup * Update action name * Improve perf * Update Adaptive Card styles * Update README.md * Use WebSocket for MockBot * Dedupe by skipping existing activity ID * Take clockskew into account * More clockskew fix * Fix Edge problem * Send typing with debouncer * Auto submit on speech input * Setup Web Speech polyfill * Add Web Speech polyfill * Add Bing Speech to playground * Do not send empty speech transcript * Use custom class instead of extra * Get speech token on-demand * Speak out text after speak input * Move speaking logic to backend * Move speech input to backend * Add TODO * Handsfree mode * Move microphone button out of text box * Disable speech recognition if not supported * Cosmetics * Add TODO * Move send box to backend * Add submitSendBox action * Move sendMessage to Redux action * Move sendTyping to Redux * Cleanup start/stop speak logic * Update to use createConnectAction * Rename interface to settings * Support sign-in flow * Hide empty bubbles * Add TODO * Fix retry send and bump DirectLineJS * Fix typing not showing up * Cleanup * Move activities and suggestedActions to read from Redux * Add browser bundle story * Add Webpack * Add Cognitive Services to bundle * Add Webpack visualizer * Add bundle variations * Prepare should run build first * Use prepublishOnly * Support reference grammar ID * Mark ported code * Move sendFiles to Redux * Cleanup * Cleanup * Add TODO * Cleanup * Cleanup * Move to middleware-based renderer * Add comments * Add unknown card * Refactor debug container * Add TODO * Add activity render middleware * Add language to timestamp and cleanup * Cleanup * Add basic language support * Add logic to languages * Add more strings * Add Japanese strings * Localize sending message * Add more localized strings * Add TODO * Toggle-able sendTyping * Cleanup * Collapse timestamp * Configurable collapse timestamp * Add script * Configurable avatar initials * Move to style set * Extract paddingRegular * Add localization * Cleanup * Cleanup * Cleanup * Add styled bubble from user * Cosmetics * Cosmetics * Add POC.md * Rank the list * Add links to GitHub issues * Sample: using from CDN * Cleanup v1 * Update SAMPLES.md * Code review * Code review * Rename to lowercase * Add SendState constants * Fix runtime break * Cleanup * Move dev mode renderer to playground * Differentiate between error and deprecations * Separate retry send into another component * Rename SendState to ActivityClientState * Add faulty Direct Line for testing * Mark TODO with priorities * Update priorities * Update priorities * Rename packages * Rename String to Localize * Add logo asset * Fix build break * Update TODO * Add serve.json * Flush out first sample * More samples * Update POC.md * Add React integration sample * Update README.md * Update README.md * Rename * Fix bundling * Rename * Update README.md * Add GItHub repository sample * Cleanup * Better middleware architecture * Fix build break * Cleanup * Add comment * Add activity decorator band * Add activity decorator for buttons * Use postback * Accessibility contrast * Postback as string * Use dispatcher for post back * Update POC.md * Add connectWithContext * Composer use storeKey * Add TODO * Cleanup * Move Adaptive Cards dependency to attachment * Move sanitize to bundle-full * Update SAMPLES.md * Move backend-cli to samples * Renaming packages * Fix after merge * Fix merge * Cleanup * Fix build break * Override instead of replace default style options * Update LICENSE * Add Redux middleware sample * Incorporate code review comments * Update SAMPLES.md * More samples * Add styleOptions sample * Add TODO * Add link to article * Add presentation mode style options * Disable suggested actions thru props * Disable tappable image * Disable tappable text * Cleanup * Cleanup * Fix serialization * Update README.md * Add screenshot * Center screenshot * Update README.md Initial pass * Update docs * Update samples * Update image width * Update images * Update code snippets * Add secret param * Update docs * Update docs * Update docs * Update docs * Travis on CDN * Uncomment tag section * Install lerna before sync version * Update package-lock.json * Disable git on version * Use --no-git-tag-version instead * Use lerna exec npm version * Update package version * Update package name * Use temp branch * Ignore changes * Force publish * Add quiet * Add NPM * Update CDN dest * Fix path * Fix path * Fix publish script * Skip cleanup * Add .npmrc * Use npm publish * Use preview tag * Public access publish * Update to preview branch * Update dependencies (#1168) * Update URLs * Deploy Markdown files (#1169) * Update to absolute URL Relative URL doesn't work well in NPM * Cleanup samples (#1170) * Cleanup samples * Update link * Deploy GitHub pages (#1172) * Add hosted samples page * Move build_pages to deploy * Fix copy script * Update dest * Correct homepage path * Add source links * Support tamper-proof user ID (#1184) * Sample: IE11 compatibility (#1183) * Update polyfill * Remove bluebird * Update README.md for ES5 sample * Clean up comment * Add parseURL * Add isFinite for file upload * Video layout for IE11 * Add gitignore for serve * Add Japanese 'X minutes ago' localization (#1193) * add x minutes ago localization for Japanese * Add localization tests for Japanese * Format/indentation * Format/indentation * Sample: Speech thru Cognitive Services and browser support (#1190) * Move dictation to a headless component * Cleanup * Cleanup * Update serve.json * Update README.md * Cleanup * Remove enableSpeech * Add browser speech sample * Cleanup bundle * Add warnings for non-supported browser * Fix broken build * Update package-lock.json * Add TODO * Break dictation interims to its own component * Update TODOs * Cleanup * Don't parallel build * Incorporate PR changes * Add quick speak test * Update package-lock.json * Sample: group timestamp (#1189) * Group timestamp sample * Update README.md * Add backchannel sample (#1191) * Fix playground not building on Docker (#1197) * Add React sample (#1200) * Add language (#1206) * Fix URL parsing in modern browsers (#1213) * Numerous fixes for playground (#1214) * Carousel should show on dev mode speak activity * Default language should read from window.navigator.language * Lerna version should use exact version (#1219) * Honor locale on speech recognition and synthesis (#1220) * Option to hide timestamp * Prefer user ID from token * Remove username * Minor update to pl-Pl localization (#1225) * Add alt text * Add nb-NO (#1203) * Simplify Provider/connect and hide Redux (#1222) * Simplify Provider/connect and hide Redux * Use latest Web Chat in samples * Flatten Redux store * Rename upsertActivity to incomingActivity * Add TODO * Rename action family * Rename speech input to dictate * Update package-lock.json * Move serve.json to root * Fixing samples * Revisit all breakaway components to make sure they are easy to recompose (#1226) * Simplify Provider/connect and hide Redux * Flatten Redux store * Rename upsertActivity to incomingActivity * Rename action family * Simplify show/hide activities/timestamps * Expose UI and fix propTypes * Expose more UI components * Exposing more UIs * Add breakaway speech button sample * Making breakaway components more easy to reuse * Move to connectWithContext and remove withStyleSet * Fix build break * Move all to connectWithContext * Move Basic* to top-level and un-expose Context * Fix styleSet null * Rename activity2 to activity * Cleanup * Cleanup * Move default store to Composer * Add custom UI * Remove speech only button demo from playground * Cleanup * Update README.md * Update README.md * Update package-lock.json * Fix build break * Remove package-lock.json from samples * Add build script for breakaway speech button * Rename connectWithContext to connectToWebChat * Clean up * Bundling package-lock.json for npm ci * Corinagum/preview samples (#1235) * Update full-bundle README.md * Add more details and code snippets to full-bundle sample * minor edits to full-bundle readme * Clean up full-bundle readme * some minor edits + integrate with react README * Add README file to speech cognitive services sample * insignificant updates to previous samples * fix reference to wrong file * add speech browser sample * Add minimal bundle sample readme * README PR fixes & update CHANGELOG * reduce changelog line's character count * Adding empty lines for clarity * Update README.md - Adding empty lines after header - Removing `## Description` because it convey no meanings - Consistent upper/lowercase for header title (First word uppercase, other lowercase) * Styling update - Also make sure header level are continuous and not discrete (# -> ## instead of # -> ###) * Styling * Styling * Styling * Stying * Accessibility pass using Keros (#1233) * Simplify Provider/connect and hide Redux * Flatten Redux store * Rename upsertActivity to incomingActivity * Rename action family * Expose UI and fix propTypes * Remove package-lock.json from samples * Add title attribute * Add alt/title * Use role="img" * Bundling package-lock.json for npm ci * Make cropped image accessible * Make carousel flipper accessible * Revert botchat.js URL change * Allow img alt tag in sanitizer * Clean up * Rename connectWithContext to connectToWebChat * Use unified selector * Render unknown file attachment * Style for carousel * Default to null * Remove padding for filler * Add landmark role * Fix scroll to bottom * Remove external * Bump to react-scroll-to-bottom@1.2.0 * Bump react-film to 1.1.0 * Bump to react-say@1.1.0 * Flipper aria-label * Button title text * Add "Starting..." * Remove redundant narrative * Focus indicator for Firefox * Fix uploading attachment not showing up * Hide scrollbar in Firefox * Fix broken upload * Accessibility fix * Revert targetting debug build * aria-label for input type="file" * Rename UploadAttachmentButton to UploadButton * Focus indicator high contrast mode * Add TODO * Cover instead of contains * Update package-lock.json * Fix build break (#1255) * Update README.md * Catch slow Direct Line response (#1254) * Embed version via bundle (#1256) * Embed version via bundle * Add variant * Sort tag order * Update tag name * Rename botchat-core to botchat-minimal * Fix samples (#1271) * Fix homepage for gh-pages * Move gh-pages * Move gh-pages * Add breakaway speech button * Use lerna for samples written in React (#1272) * Samples use lerna for linking * Change page title * Include package-lock.json * Last mile on GA (#1260) * Add LOCALIZATION.md * Clean up * Fix upload button fail because overriding props * Fix send button not working on click * Guess MIME type for send files to preview photos * Customizable send timeout and default to 20s * Update package-lock.json * Fix audio card null ref on styleSet * Reset the branch * Update package-lock.json * Change preview branch to master branch
1 parent aeca50e commit 38af761

File tree

454 files changed

+87949
-18578
lines changed

Some content is hidden

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

454 files changed

+87949
-18578
lines changed

.dockerignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
/**/node_modules
2+
/v1
3+
/.vscode

.gitattributes

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

.github/PULL_REQUEST_TEMPLATE.md

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

.gitignore

Lines changed: 3 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,3 @@
1-
node_modules
2-
/.vs/botchat/v14/.suo
3-
/.vs/config/applicationhost.config
4-
/botchat.sln
5-
/Web.config
6-
/local
7-
**/.vscode
8-
npm-debug.log*
9-
debug.log
10-
test/src
11-
test/mock_dl/conversations.js*
12-
test/mock_dl/index.js*
13-
test/mock_speech/index.js*
14-
test/commands_map.js*
15-
test/server_content.js*
16-
test/interfaces_sdk.js*
17-
npm
18-
cdn
19-
webpacked
20-
built
21-
botchat.js
22-
botchat.js.map
23-
botchat-es5.js
24-
botchat-es5.js.map
25-
CognitiveServices.js
26-
CognitiveServices.js.map
27-
*.css
28-
/test/uploads
29-
.env
1+
/gh-pages
2+
/lerna-debug.log
3+
/node_modules

.travis.yml

Lines changed: 39 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,61 @@
1+
sudo: required
2+
13
language: node_js
4+
25
node_js:
3-
- "9"
6+
- "10"
7+
8+
services:
9+
- docker
10+
411
before_install:
12+
- npm install
13+
- sudo apt-get install jq
514
- npx version-from-git --travis
15+
- git checkout -b temp-ci
16+
- lerna version --exact --force-publish --no-git-tag-version --no-push --yes `cat package.json | jq -r .version`
17+
618
install:
7-
- npm install
8-
- npm run install-test
9-
before_script:
19+
- npm run bootstrap
1020
- npm run build
11-
- npm run build-test
21+
- npm run prepublishOnly
22+
- docker build -t webchat.azurecr.io/playground .
23+
1224
script:
13-
# Our tests currently don't run on Travis, disabling them for now
14-
- npm --version
25+
- echo
26+
1527
before_deploy:
1628
- git config --local user.name "Bot Framework"
1729
- git config --local user.email "botframework@microsoft.com"
30+
1831
deploy:
19-
- provider: npm
20-
api_key:
21-
secure: "Mgt7i6P52nq77RdBUlcS1EBosxW6Qd6mM86A6RLQKzNJTWMW6GM0YhrqVHT6HQxrqcTRvuSHxJtOKyLoLPou2lWCZbsSy0ANb8tEJcurTF4lLvcTgMN+G5YD74F4RHRyLNW6rHDKvYvBl4iDLE6rW/B6Ew6uORMdlzJOJzjw075/7AoJIjB60f/Hf2aAx3q0wcWxlPyTqh6YD2mJ1GaiflTalxkYalr/Xh3bevrP4I2XyZV1vaCJqDZvrUVlYfSOCJRyBUSrCemkc6nkSTwdbY38L4k7ilrNgm5QfugoaKIPe600WCy4uPp0woz796rdurppsKeLmMSCKKu2mIqz1CT6mf8CR8hQAzGhKqsF0Rydjz6N/OF2XnFbtPZzu/FQJYED9H1UViUAHXsw528Ul9NSseMCVIZirRT+ysIB8Ny9oBddfRyifxnv2T9Zorm7y1V0nrmMXgCrZIvfgvOVXqij7euC4dgnOG4w0eG/Vd1EW87rskpZswV8gx/7ZsVOY/1NFDVxBi//EBSBOLctOSoZF8snT0+Duvw5Id3pXKvqm+ffI19xBe8Bua64fMg7dHWqZN/ixjTqeySBAYDPtRx/0wBSBwMIDh/Syux+fgjXpqf87HJc3vbjAXyuwPyO9mlblpm02JrZmG8Yik1krVvnLWzvqGqrmVKsLKmndn8="
22-
email: "botframework@microsoft.com"
32+
- provider: script
33+
script: bash scripts/build_pages
34+
skip_cleanup: true
2335
on:
2436
branch: master
37+
- provider: script
38+
script: bash scripts/deploy_cdn
2539
skip_cleanup: true
26-
tag: master
27-
- provider: npm
28-
api_key:
29-
secure: "Mgt7i6P52nq77RdBUlcS1EBosxW6Qd6mM86A6RLQKzNJTWMW6GM0YhrqVHT6HQxrqcTRvuSHxJtOKyLoLPou2lWCZbsSy0ANb8tEJcurTF4lLvcTgMN+G5YD74F4RHRyLNW6rHDKvYvBl4iDLE6rW/B6Ew6uORMdlzJOJzjw075/7AoJIjB60f/Hf2aAx3q0wcWxlPyTqh6YD2mJ1GaiflTalxkYalr/Xh3bevrP4I2XyZV1vaCJqDZvrUVlYfSOCJRyBUSrCemkc6nkSTwdbY38L4k7ilrNgm5QfugoaKIPe600WCy4uPp0woz796rdurppsKeLmMSCKKu2mIqz1CT6mf8CR8hQAzGhKqsF0Rydjz6N/OF2XnFbtPZzu/FQJYED9H1UViUAHXsw528Ul9NSseMCVIZirRT+ysIB8Ny9oBddfRyifxnv2T9Zorm7y1V0nrmMXgCrZIvfgvOVXqij7euC4dgnOG4w0eG/Vd1EW87rskpZswV8gx/7ZsVOY/1NFDVxBi//EBSBOLctOSoZF8snT0+Duvw5Id3pXKvqm+ffI19xBe8Bua64fMg7dHWqZN/ixjTqeySBAYDPtRx/0wBSBwMIDh/Syux+fgjXpqf87HJc3vbjAXyuwPyO9mlblpm02JrZmG8Yik1krVvnLWzvqGqrmVKsLKmndn8="
30-
email: "botframework@microsoft.com"
3140
on:
32-
tags: true
41+
branch: master
42+
- provider: script
43+
script: bash scripts/deploy_cdn
3344
skip_cleanup: true
45+
on:
46+
tags: true
3447
- provider: script
35-
script: bash scripts/deploycdn.sh
48+
script: bash scripts/lerna_publish
3649
skip_cleanup: true
3750
on:
3851
branch: master
3952
- provider: script
40-
script: bash scripts/deploycdn.sh
41-
skip_cleanup: true
53+
script: bash scripts/docker_push
4254
on:
43-
tags: true
55+
branch: master
56+
- provider: pages
57+
skip-cleanup: true
58+
github-token: $GITHUB_TOKEN
59+
local-dir: gh-pages
60+
on:
61+
branch: master

.vscode/launch.json

Lines changed: 14 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,15 @@
11
{
2-
"version": "0.2.0",
3-
"configurations": [
4-
{
5-
"name": "Launch index.html with sourcemaps",
6-
"type": "chrome",
7-
"request": "launch",
8-
"file": "${workspaceRoot}/index.html",
9-
"sourceMaps": true,
10-
"webRoot": "${workspaceRoot}"
11-
},
12-
{
13-
"name": "Launch localhost with sourcemaps",
14-
"type": "chrome",
15-
"request": "launch",
16-
"url": "http://localhost:8000",
17-
"sourceMaps": true,
18-
"webRoot": "${workspaceRoot}"
19-
},
20-
{
21-
"name": "Attach with sourcemaps",
22-
"type": "chrome",
23-
"request": "attach",
24-
"port": 9222,
25-
"sourceMaps": true,
26-
"webRoot": "${workspaceRoot}"
27-
},
28-
{
29-
"type": "node",
30-
"request": "launch",
31-
"name": "Launch mock_dl server",
32-
"program": "${workspaceRoot}/test/mock_dl/index"
33-
}
34-
]
35-
}
2+
// Use IntelliSense to learn about possible attributes.
3+
// Hover to view descriptions of existing attributes.
4+
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
5+
"version": "0.2.0",
6+
"configurations": [
7+
{
8+
"type": "chrome",
9+
"request": "launch",
10+
"name": "Launch Chrome",
11+
"url": "http://localhost:3000",
12+
"webRoot": "${workspaceFolder}"
13+
}
14+
]
15+
}

.vscode/settings.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"files.exclude": {
3+
"packages/*/dist": true,
4+
"packages/*/lib": true
5+
},
6+
"typescript.tsdk": "packages\\component\\node_modules\\typescript\\lib"
7+
}

AdaptiveCards.md

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

0 commit comments

Comments
 (0)