Skip to content

Commit 154445d

Browse files
authored
Bump samples to use botframework-webchat@main and rename packages (#5533)
* Bump to webchat@main and rename packages * Move under @msinternal/* * Update bump scripts * Add private and move to @msinternal/* * Update bump scripts * Remove --save-exact * Change author * Pin eslint-plugin-promise * Pin eslint@8 * Add overrides * Use ^4.23.2 * Add overrides for restify * Remove unnecessary bump scripts * npm run bump * Archived 07.advanced-web-chat-apps * Add entry * Skip 07 * Include in workspaces * Add postaudit * Add audit-all * Remove postaudit * Add PR number * Revert * Fix react-film * Archive 01.l.sharepoint-web-part * Add 01.l
1 parent 93043a9 commit 154445d

File tree

52 files changed

+3610
-110830
lines changed

Some content is hidden

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

52 files changed

+3610
-110830
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,10 @@ Notes: web developers are advised to use [`~` (tilde range)](https://github.com/
281281
- `useSuggestedActions()` hook is being deprecated in favor of the `useSuggestedActionsHooks().useSuggestedActions()` hook, in PR [#5489](https://github.com/microsoft/BotFramework-WebChat/pull/5489), by [@compulim](https://github.com/compulim)
282282
- Fixed core internal import in legacy CommonJS environments, in [5509](https://github.com/microsoft/BotFramework-WebChat/pull/5509), by [@OEvgeny](https://github.com/OEvgeny)
283283

284+
### Samples
285+
286+
- Sample `01.getting-started/l.sharepoint-web-part` and samples under `07.advanced-web-chat-apps` is being archived and will no longer receive updates, in PR [#5533](https://github.com/microsoft/BotFramework-WebChat/pull/5533), by [@compulim](https://github.com/compulim)
287+
284288
## [4.18.0] - 2024-07-10
285289

286290
### Added

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
"./packages/fluent-theme"
3636
],
3737
"scripts": {
38+
"audit-all": "find -name package-lock.json | xargs dirname | xargs -I {} sh -c 'cd {} && npm audit'",
3839
"biome": "biome check ./packages",
3940
"browser": "node ./packages/test/harness/src/host/dev/index http://localhost:5001/__tests__/html/",
4041
"browser:watch": "node-dev --no-notify --respawn ./packages/test/harness/src/host/dev/index http://localhost:5001/__tests__/html/",
@@ -43,7 +44,7 @@
4344
"bump:dev": "PACKAGES_TO_BUMP=$(cat package.json | jq -r '(.pinDependencies // {}) as $P | (.localPeerDependencies // []) as $L | (.devDependencies // {}) | to_entries | map(select(.key as $K | $L | contains([$K]) | not)) | map(.key + \"@\" + ($P[.key] // [\"latest\"])[0]) | join(\" \")') && [ ! -z \"$PACKAGES_TO_BUMP\" ] && npm install $PACKAGES_TO_BUMP || true",
4445
"bump:prod": "PACKAGES_TO_BUMP=$(cat package.json | jq -r '(.pinDependencies // {}) as $P | (.localPeerDependencies // []) as $L | (.dependencies // {}) | to_entries | map(select(.key as $K | $L | contains([$K]) | not)) | map(.key + \"@\" + ($P[.key] // [\"latest\"])[0]) | join(\" \")') && [ ! -z \"$PACKAGES_TO_BUMP\" ] && npm install --save-exact $PACKAGES_TO_BUMP || true",
4546
"bump:packages": "npm run bump --workspaces",
46-
"bump:samples": "cd samples && npm run bump --workspaces",
47+
"bump:samples": "cd samples && npm run bump",
4748
"docker": "npm run docker:up",
4849
"docker:down": "docker compose -f docker-compose-wsl2.yml down --rmi all",
4950
"docker:up": "docker compose -f docker-compose-wsl2.yml down && docker compose -f docker-compose-wsl2.yml up --build --scale chrome=4",

samples/01.getting-started/k.direct-line-token/javascript/bot/package-lock.json

Lines changed: 1198 additions & 708 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

samples/01.getting-started/k.direct-line-token/javascript/bot/package.json

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,32 @@
11
{
2-
"name": "bot",
2+
"name": "@msinternal/bot",
33
"version": "1.0.0",
44
"description": "",
55
"main": "src/index.js",
66
"author": "Microsoft Corporation",
77
"license": "MIT",
8+
"private": true,
89
"scripts": {
9-
"bump": "if [ `cat package.json | jq -r '(.devDependencies // {} + .devDependencies // {}) | length'` -ne 0 ]; then npm install --legacy-peer-deps $(cat package.json | jq -r '(.pinDependencies // {}) as $p | ((.dependencies // {}), (.devDependencies // {}) | keys) | map(. + \"@\" + ($p[.] // [\"latest\"])[0]) | .[]') && (npm audit fix || exit 0); fi",
10+
"bump": "npm run bump:prod && npm run bump:dev && (npm audit fix || exit 0)",
11+
"bump:dev": "PACKAGES_TO_BUMP=$(cat package.json | jq -r '(.pinDependencies // {}) as $P | (.localPeerDependencies // []) as $L | (.devDependencies // {}) | to_entries | map(select(.key as $K | $L | contains([$K]) | not)) | map(.key + \"@\" + ($P[.key] // [\"latest\"])[0]) | join(\" \")') && [ ! -z \"$PACKAGES_TO_BUMP\" ] && npm install $PACKAGES_TO_BUMP || true",
12+
"bump:prod": "PACKAGES_TO_BUMP=$(cat package.json | jq -r '(.pinDependencies // {}) as $P | (.localPeerDependencies // []) as $L | (.dependencies // {}) | to_entries | map(select(.key as $K | $L | contains([$K]) | not)) | map(.key + \"@\" + ($P[.key] // [\"latest\"])[0]) | join(\" \")') && [ ! -z \"$PACKAGES_TO_BUMP\" ] && npm install $PACKAGES_TO_BUMP || true",
1013
"start": "node-dev --no-notify --respawn ."
1114
},
15+
"pinDependencies": {
16+
"botbuilder": [
17+
"^4.23.2",
18+
"botbuilder has a bad @latest pointing to 4.17.0-blobs1"
19+
]
20+
},
21+
"overrides": {
22+
"restify": {
23+
"find-my-way": "^8.2.2",
24+
"send": "^0.19.1"
25+
}
26+
},
1227
"dependencies": {
13-
"botbuilder": "^4.22.2",
14-
"dotenv": "^16.4.5",
28+
"botbuilder": "^4.23.2",
29+
"dotenv": "^17.2.1",
1530
"restify": "^11.1.0"
1631
},
1732
"devDependencies": {

samples/01.getting-started/k.direct-line-token/javascript/web/package-lock.json

Lines changed: 54 additions & 54 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

samples/01.getting-started/k.direct-line-token/javascript/web/package.json

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,27 @@
11
{
2-
"name": "web",
2+
"name": "@msinternal/web",
33
"version": "1.0.0",
44
"description": "",
55
"main": "src/index.js",
66
"author": "Microsoft Corporation",
77
"license": "MIT",
8+
"private": true,
89
"scripts": {
9-
"bump": "if [ `cat package.json | jq -r '(.devDependencies // {} + .devDependencies // {}) | length'` -ne 0 ]; then npm install --legacy-peer-deps $(cat package.json | jq -r '(.pinDependencies // {}) as $p | ((.dependencies // {}), (.devDependencies // {}) | keys) | map(. + \"@\" + ($p[.] // [\"latest\"])[0]) | .[]') && (npm audit fix || exit 0); fi",
10+
"bump": "npm run bump:prod && npm run bump:dev && (npm audit fix || exit 0)",
11+
"bump:dev": "PACKAGES_TO_BUMP=$(cat package.json | jq -r '(.pinDependencies // {}) as $P | (.localPeerDependencies // []) as $L | (.devDependencies // {}) | to_entries | map(select(.key as $K | $L | contains([$K]) | not)) | map(.key + \"@\" + ($P[.key] // [\"latest\"])[0]) | join(\" \")') && [ ! -z \"$PACKAGES_TO_BUMP\" ] && npm install $PACKAGES_TO_BUMP || true",
12+
"bump:prod": "PACKAGES_TO_BUMP=$(cat package.json | jq -r '(.pinDependencies // {}) as $P | (.localPeerDependencies // []) as $L | (.dependencies // {}) | to_entries | map(select(.key as $K | $L | contains([$K]) | not)) | map(.key + \"@\" + ($P[.key] // [\"latest\"])[0]) | join(\" \")') && [ ! -z \"$PACKAGES_TO_BUMP\" ] && npm install $PACKAGES_TO_BUMP || true",
1013
"start": "node-dev --no-notify --respawn .",
1114
"test": "echo \"Error: no test specified\" && exit 1"
1215
},
1316
"pinDependencies": {},
17+
"overrides": {
18+
"restify": {
19+
"find-my-way": "^8.2.2",
20+
"send": "^0.19.1"
21+
}
22+
},
1423
"dependencies": {
15-
"dotenv": "^16.4.5",
24+
"dotenv": "^17.2.1",
1625
"http-proxy": "^1.18.1",
1726
"restify": "^11.1.0"
1827
},

0 commit comments

Comments
 (0)