Skip to content

Commit 9c383fd

Browse files
harshithkashyapharshithkashyap
committed
refactor(directline): update rxjs to v6, use rxjs pipeable operators, update webpack to v4
chore(npm): update dependencies, add tslint fix(directline): add missing commits post rebase docs(changelog): add message to change log, bump npm version fix(directline.interface): fix tslint errors fix(directline): add new changes from master refactor(app): remove dist directory chore(npm): update dependencies refactor(directline): remove unused imports chore(npm): update dependencies fix(directline): add new changes from master fix(changelog): remove duplicate entries fix(directline): add new changes from master test(directline): update failing tests to use rxjs v6 chore(npm): update dependencies fix(directline): remove unused files chore(npm): update dependencies fix(directline): add new changes from master chore(npm): update dependencies refactor(directline): update deprecated rxjs functions with new equivalent, fix failing tests fix(readme): correct typo fix(.gitignore): add missing newline at EOF fix(directline-mock): correct function, variables order fix(directline-streaming): import explicit named import from bfse refactor(directline): disable directline streaming export until Node.js packages are removed from botframework-streaming package chore(npm): update dependencies fix(webpack): replace deprecated webpack Visualizer plugin with BundleAnalyzerPlugin docs(directline): update streaming package comment fix(package): correct version, name chore(npm): update dependencies fix(tests): add directline streaming package back to fix failing tests chore(jsdom): update package feat(Activity): add adaptive card InvokeActivity type refactor(directline): add new changes from master chore(npm): update dependencies refactor(directline): add new changes from master
1 parent 2056970 commit 9c383fd

67 files changed

Lines changed: 17066 additions & 8149 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.

‎.github/workflows/continuous-deployment.yml‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
name: Continuous deployment
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
- master
8+
9+
jobs:
10+
build:
11+
runs-on: ubuntu-latest
12+
13+
strategy:
14+
matrix:
15+
node-version: [18.x]
16+
17+
steps:
18+
- uses: actions/checkout@v3
19+
- name: Use Node.js ${{ matrix.node-version }}
20+
uses: actions/setup-node@v3
21+
with:
22+
node-version: ${{ matrix.node-version }}
23+
cache: 'npm'
24+
- id: set-version
25+
name: Run npx version-from-git --no-git-tag-version
26+
run: |
27+
npx version-from-git --no-git-tag-version
28+
echo version=`cat package.json | jq -r '.version'` > $GITHUB_OUTPUT
29+
- run: npm clean-install
30+
- run: npm run prepublishOnly
31+
- name: Upload tarball artifact
32+
uses: actions/upload-artifact@v3.1.1
33+
with:
34+
name: bundle
35+
path: ./dist
36+
- run: npm pack
37+
- name: Upload tarball artifact
38+
uses: actions/upload-artifact@v3.1.1
39+
with:
40+
name: tarball
41+
path: ./*.tgz
42+
43+
publish:
44+
needs: build
45+
runs-on: ubuntu-latest
46+
environment: prerelease
47+
48+
steps:
49+
- uses: actions/setup-node@v3
50+
with:
51+
node-version: 18
52+
registry-url: https://registry.npmjs.org/
53+
- name: Download tarball artifact
54+
uses: actions/download-artifact@v3.0.1
55+
with:
56+
name: tarball
57+
- id: get-version
58+
name: Get version
59+
run: |
60+
echo package-name=`tar --extract --file=\`ls ./*.tgz\` --to-stdout package/package.json | jq -r .name` >> $GITHUB_OUTPUT
61+
echo version=`tar --extract --file=\`ls ./*.tgz\` --to-stdout package/package.json | jq -r .version` >> $GITHUB_OUTPUT
62+
- if: ${{ !contains(steps.get-version.outputs.version, '-') }}
63+
name: Validate version
64+
run: |
65+
echo Cannot publish production version
66+
exit 1
67+
- run: npm publish --access public --tag ${{ github.ref_name }} `ls *.tgz`
68+
env:
69+
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
70+
- name: Generate job summary
71+
run: echo "NPM package has been published to https://npmjs.com/package/${{ steps.get-version.outputs.package-name }}/v/${{ steps.get-version.outputs.version }}." > $GITHUB_STEP_SUMMARY

‎.github/workflows/publish-release.yml‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
name: Publish release on push tag
2+
3+
on:
4+
push:
5+
tags: 'v*'
6+
7+
jobs:
8+
build-and-draft:
9+
runs-on: ubuntu-latest
10+
11+
steps:
12+
- uses: actions/checkout@v3
13+
- name: Use Node.js 18
14+
uses: actions/setup-node@v3
15+
with:
16+
node-version: 18
17+
cache: 'npm'
18+
- id: get-version
19+
name: Get version
20+
run: echo version=`cat package.json | jq -r '.version'` >> $GITHUB_OUTPUT
21+
- name: Validate version
22+
if: ${{ contains(steps.get-version.outputs.version, '-') }}
23+
run: |
24+
echo Version number must not be a prerelease.
25+
exit 1
26+
- run: npm clean-install
27+
- run: npm run prepublishOnly
28+
- name: Upload tarball artifact
29+
uses: actions/upload-artifact@v3.1.1
30+
with:
31+
name: bundle
32+
path: ./dist
33+
- run: npm pack
34+
- name: Upload tarball artifact
35+
uses: actions/upload-artifact@v3.1.1
36+
with:
37+
name: tarball
38+
path: ./*.tgz
39+
- name: Draft a new release
40+
run: gh release create ${{ github.ref_name }} ./dist/directline.js ./*.tgz --draft --notes-file ./CHANGELOG.md
41+
env:
42+
GH_TOKEN: ${{ github.token }}
43+
44+
publish-package:
45+
environment: production
46+
needs: build-and-draft
47+
runs-on: ubuntu-latest
48+
49+
steps:
50+
- uses: actions/setup-node@v3
51+
with:
52+
node-version: 18
53+
registry-url: https://registry.npmjs.org/
54+
- name: Download tarball artifact
55+
uses: actions/download-artifact@v3.0.1
56+
with:
57+
name: tarball
58+
- id: get-version
59+
name: Get version
60+
run: |
61+
echo package-name=`tar --extract --file=\`ls ./*.tgz\` --to-stdout package/package.json | jq -r .name` >> $GITHUB_OUTPUT
62+
echo version=`tar --extract --file=\`ls ./*.tgz\` --to-stdout package/package.json | jq -r .version` >> $GITHUB_OUTPUT
63+
- run: npm publish --access public `ls ./*.tgz`
64+
env:
65+
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
66+
- name: Generate job summary
67+
run: echo "NPM package has been published to https://npmjs.com/package/${{ steps.get-version.outputs.package-name }}/v/${{ steps.get-version.outputs.version }}." > $GITHUB_STEP_SUMMARY
68+
69+
publish-release:
70+
needs:
71+
- build-and-draft
72+
- publish-package
73+
runs-on: ubuntu-latest
74+
75+
steps:
76+
- name: Publish release
77+
run: gh release edit ${{ github.ref_name }} --draft=false --repo ${{ github.repository }}
78+
env:
79+
GH_TOKEN: ${{ github.token }}
80+
- name: Generate job summary
81+
run: echo "GitHub release created at https://github.com/${{ github.repository }}/releases/tag/${{ github.ref_name }}." >> $GITHUB_STEP_SUMMARY

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

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: Pull request validation
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- main
7+
- master
8+
9+
jobs:
10+
build:
11+
runs-on: ubuntu-latest
12+
13+
strategy:
14+
matrix:
15+
node-version: [18.x]
16+
17+
steps:
18+
- uses: actions/checkout@v3
19+
- name: Use Node.js ${{ matrix.node-version }}
20+
uses: actions/setup-node@v3
21+
with:
22+
node-version: ${{ matrix.node-version }}
23+
cache: 'npm'
24+
- run: npm clean-install
25+
- run: npm run prepublishOnly
26+
- name: Upload tarball artifact
27+
uses: actions/upload-artifact@v3.1.1
28+
with:
29+
name: bundle
30+
path: ./dist
31+
- run: npm pack
32+
- name: Upload tarball artifact
33+
uses: actions/upload-artifact@v3.1.1
34+
with:
35+
name: tarball
36+
path: ./*.tgz
37+
- run: npm test

‎.gitignore‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/.env
2-
dist
3-
lib
4-
node_modules
5-
.vscode
2+
/.vscode
3+
/*.tgz
4+
/dist
5+
/lib
6+
/node_modules

‎.travis.yml‎

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

‎CHANGELOG.md‎

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,40 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
1616

1717
## [Unreleased]
1818

19-
## [0.15.1] - 2022-02-09
19+
- Update DirectLine to rxjs v6 pipeable operators, PR [#102](https://github.com/microsoft/BotFramework-DirectLineJS/pull/102/files)
20+
21+
## [0.15.5] - 2023-10-10
22+
23+
### Added
24+
25+
- Direct Line Streaming: Added `networkInformation` option to assist detection of connection issues, by [@compulim](https://github.com/compulim), in PR [#412](https://github.com/microsoft/BotFramework-DirectLineJS/pull/412)
26+
27+
## [0.15.4] - 2023-06-05
28+
29+
### Changed
30+
31+
- Bumped dependencies, by [@compulim](https://github.com/compulim), in PR [#406](https://github.com/microsoft/BotFramework-DirectLineJS/pull/406)
32+
- Production dependencies
33+
- [`botframework-streaming@4.20.0`](https://npmjs.com/package/botframework-streaming)
34+
35+
## [0.15.3] - 2023-06-05
2036

37+
### Fixed
38+
39+
- Fixed [#398](https://github.com/microsoft/BotFramework-DirectLineJS/issues/398). In `DirectLineStreaming`, all calls to async function should be caught and rethrow appropriately, by [@compulim](https://github.com/compulim) in PR [#399](https://github.com/microsoft/BotFramework-DirectLineJS/pull/399)
40+
41+
## [0.15.2] - 2023-03-21
42+
43+
### Changed
44+
45+
- Bumped dependencies, by [@compulim](https://github.com/compulim), in PR [#390](https://github.com/microsoft/BotFramework-DirectLineJS/pull/390) and PR [#396](https://github.com/microsoft/BotFramework-DirectLineJS/pull/396)
46+
- Production dependencies
47+
- [`botframework-streaming@4.19.3`](https://npmjs.com/package/botframework-streaming)
48+
- Development dependencies
49+
- [`restify@11.0.0`](https://npmjs.com/package/restify)
50+
- [`webpack@5.76.2`](https://npmjs.com/package/webpack)
51+
52+
## [0.15.1] - 2022-02-09
2153
### Changed
2254

2355
- Bumped dependencies, by [@compulim](https://github.com/compulim), in PR [#351](https://github.com/microsoft/BotFramework-DirectLineJS/pull/351) and PR [#366](https://github.com/microsoft/BotFramework-DirectLineJS/pull/366)
@@ -233,4 +265,4 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
233265
### Added
234266
- OAuthCard and `getSessionId` in PR #67
235267
- Add OAuthCard ([`c7b8af7`](https://github.com/microsoft/BotFramework-DirectLineJS/commit/c7b8af7be35685c220f2d777daa96f52d757f53f))
236-
- Add `getSessionId` ([`9c87aa3`](https://github.com/microsoft/BotFramework-DirectLineJS/commit/9c87aa3f54947ea2fee836b41eec8ec45297a57a), [`9a2b2d8`](https://github.com/microsoft/BotFramework-DirectLineJS/commit/9a2b2d889af48e558f563758aa01d498b2b2cf49), [`df84d00`](df84d0054f784ae5eb36784ef07a2aa38ca6c95b), [`92cc331`](92cc33138dfbdd533b4d14f6be275d1c86ef8db4))
268+
- Add `getSessionId` ([`9c87aa3`](https://github.com/microsoft/BotFramework-DirectLineJS/commit/9c87aa3f54947ea2fee836b41eec8ec45297a57a), [`9a2b2d8`](https://github.com/microsoft/BotFramework-DirectLineJS/commit/9a2b2d889af48e558f563758aa01d498b2b2cf49), [`df84d00`](df84d0054f784ae5eb36784ef07a2aa38ca6c95b), [`92cc331`](92cc33138dfbdd533b4d14f6be275d1c86ef8db4))

0 commit comments

Comments
 (0)