Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/npm_and_yarn/js/production-008885…
Browse files Browse the repository at this point in the history
…8d61
  • Loading branch information
corinagum authored Feb 23, 2024
2 parents 0366c6a + ab7da8c commit 30af264
Show file tree
Hide file tree
Showing 9 changed files with 61 additions and 54 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/dependency-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ jobs:
- name: 'Checkout Repository'
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: 'Dependency Review'
uses: actions/dependency-review-action@4901385134134e04cec5fbe5ddfe3b2c5bd5d976 # v4.0.0
uses: actions/dependency-review-action@be8bc500ee15e96754d2a6f2d34be14e945a46f3 # v4.1.2
4 changes: 2 additions & 2 deletions .github/workflows/dotnet-codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
- name: Checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: Initialize CodeQL
uses: github/codeql-action/init@e8893c57a1f3a2b659b6b55564fdfdbbd2982911 # v3.24.0
uses: github/codeql-action/init@379614612a29c9e28f31f39a59013eb8012a51f0 # v3.24.3
with:
languages: csharp
- name: Setup .NET
Expand All @@ -50,6 +50,6 @@ jobs:
working-directory: dotnet/packages/Microsoft.TeamsAI/
run: dotnet build Microsoft.Teams.AI.sln --configuration Release
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@e8893c57a1f3a2b659b6b55564fdfdbbd2982911 # v3.24.0
uses: github/codeql-action/analyze@379614612a29c9e28f31f39a59013eb8012a51f0 # v3.24.3
with:
category: "/language:csharp"
4 changes: 2 additions & 2 deletions .github/workflows/js-codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ jobs:
- name: Checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: Initialize CodeQL
uses: github/codeql-action/init@e8893c57a1f3a2b659b6b55564fdfdbbd2982911 # v3.24.0
uses: github/codeql-action/init@379614612a29c9e28f31f39a59013eb8012a51f0 # v3.24.3
with:
languages: javascript
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@e8893c57a1f3a2b659b6b55564fdfdbbd2982911 # v3.24.0
uses: github/codeql-action/analyze@379614612a29c9e28f31f39a59013eb8012a51f0 # v3.24.3
with:
category: "/language:javascript"
2 changes: 1 addition & 1 deletion .github/workflows/scorecards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,6 @@ jobs:

# Upload the results to GitHub's code scanning dashboard.
- name: "Upload to code-scanning"
uses: github/codeql-action/upload-sarif@e8893c57a1f3a2b659b6b55564fdfdbbd2982911 # v3.24.0
uses: github/codeql-action/upload-sarif@379614612a29c9e28f31f39a59013eb8012a51f0 # v3.24.3
with:
sarif_file: results.sarif
6 changes: 3 additions & 3 deletions js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,23 +22,23 @@
"devDependencies": {
"@azure/logger": "^1.0.2",
"@azure/ms-rest-js": "2.7.0",
"@microsoft/api-extractor": "^7.40.1",
"@microsoft/api-extractor": "^7.40.6",
"@standardlabs/is-private": "^1.0.1",
"@types/jsonwebtoken": "9.0.4",
"@types/lodash": "^4.14.202",
"@types/mocha": "^10.0.6",
"@types/sinon": "^10.0.19",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6.21.0",
"applicationinsights": "^2.9.2",
"applicationinsights": "^2.9.4",
"browserify": "^17.0.0",
"chai": "^4.4.1",
"depcheck": "^1.4.7",
"eslint": "^8.56.0",
"eslint-config-prettier": "^8.10.0",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jsdoc": "^46.10.1",
"eslint-plugin-mocha": "^10.2.0",
"eslint-plugin-mocha": "^10.3.0",
"eslint-plugin-only-warn": "^1.1.0",
"eslint-plugin-prettier": "^5.1.3",
"exorcist": "^2.0.0",
Expand Down
2 changes: 1 addition & 1 deletion js/packages/teams-ai/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"@types/express": "^4.17.21",
"@types/jsonwebtoken": "^9.0.4",
"@types/mocha": "^10.0.6",
"@types/node": "^20.11.19",
"@types/node": "^20.11.20",
"@types/uuid": "^9.0.8",
"eslint": "^8.56.0",
"express": "^4.18.2",
Expand Down
2 changes: 1 addition & 1 deletion js/samples/04.ai.a.teamsChefBot/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"devDependencies": {
"@types/dotenv": "6.1.1",
"@types/restify": "8.5.12",
"@types/node": "^20.11.19",
"@types/node": "^20.11.20",
"ts-node": "^10.9.2",
"env-cmd": "^10.1.0",
"nodemon": "~1.19.4",
Expand Down
2 changes: 1 addition & 1 deletion js/samples/04.ai.f.vision.cardGazer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"devDependencies": {
"@types/dotenv": "6.1.1",
"@types/restify": "8.5.12",
"@types/node": "^20.11.19",
"@types/node": "^20.11.20",
"ts-node": "^10.9.2",
"env-cmd": "^10.1.0",
"nodemon": "~1.19.4",
Expand Down
91 changes: 49 additions & 42 deletions js/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -740,34 +740,34 @@
markdown-it "^12.2.0"
react "^17.0.2"

"@microsoft/[email protected].9":
version "7.28.9"
resolved "https://registry.yarnpkg.com/@microsoft/api-extractor-model/-/api-extractor-model-7.28.9.tgz#97ba8c74aa0e95da0ef43489b2bd7aceff2b953e"
integrity sha512-lM77dV+VO46MGp5lu4stUBnO3jyr+CrDzU+DtapcOQEZUqJxPYUoK5zjeD+gRZ9ckgGMZC94ch6FBkpmsjwQgw==
"@microsoft/[email protected].13":
version "7.28.13"
resolved "https://registry.yarnpkg.com/@microsoft/api-extractor-model/-/api-extractor-model-7.28.13.tgz#96fbc52155e0d07e0eabbd9699065b77702fe33a"
integrity sha512-39v/JyldX4MS9uzHcdfmjjfS6cYGAoXV+io8B5a338pkHiSt+gy2eXQ0Q7cGFJ7quSa1VqqlMdlPrB6sLR/cAw==
dependencies:
"@microsoft/tsdoc" "0.14.2"
"@microsoft/tsdoc-config" "~0.16.1"
"@rushstack/node-core-library" "3.66.0"
"@rushstack/node-core-library" "4.0.2"

"@microsoft/api-extractor@^7.40.1":
version "7.40.1"
resolved "https://registry.yarnpkg.com/@microsoft/api-extractor/-/api-extractor-7.40.1.tgz#004a4f2291e9e534cf4b751f004911b7e1e34932"
integrity sha512-xHn2Zkh6s5JIjP94SG6VtIlIeRJcASgfZpDKV+bgoddMt1X4ujSZFOz7uEGNYNO7mEtdVOvpNKBpC4CDytD8KQ==
"@microsoft/api-extractor@^7.40.6":
version "7.40.6"
resolved "https://registry.yarnpkg.com/@microsoft/api-extractor/-/api-extractor-7.40.6.tgz#810372f2fc75156e38120194d5b58d61142e9940"
integrity sha512-9N+XCIQB94Di+ETTzNGLqjgQydslynHou7QPgDhl5gZ+B/Q5hTv5jtqBglTUnTrC0trHdG5/YKN07ehGKlSb5g==
dependencies:
"@microsoft/api-extractor-model" "7.28.9"
"@microsoft/api-extractor-model" "7.28.13"
"@microsoft/tsdoc" "0.14.2"
"@microsoft/tsdoc-config" "~0.16.1"
"@rushstack/node-core-library" "3.66.0"
"@rushstack/rig-package" "0.5.1"
"@rushstack/ts-command-line" "4.17.1"
colors "~1.2.1"
"@rushstack/node-core-library" "4.0.2"
"@rushstack/rig-package" "0.5.2"
"@rushstack/terminal" "0.9.0"
"@rushstack/ts-command-line" "4.17.3"
lodash "~4.17.15"
resolve "~1.22.1"
semver "~7.5.4"
source-map "~0.6.1"
typescript "5.3.3"

"@microsoft/applicationinsights-web-snippet@^1.0.1":
"@microsoft/[email protected]":
version "1.0.1"
resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-web-snippet/-/applicationinsights-web-snippet-1.0.1.tgz#6bb788b2902e48bf5d460c38c6bb7fedd686ddd7"
integrity sha512-2IHAOaLauc8qaAitvWS+U931T+ze+7MNWrDHY47IENP5y2UA0vqJDu67kWZDdpCN1fFC77sfgfB+HV7SrKshnQ==
Expand Down Expand Up @@ -992,35 +992,42 @@
resolved "https://registry.yarnpkg.com/@pkgr/core/-/core-0.1.0.tgz#7d8dacb7fdef0e4387caf7396cbd77f179867d06"
integrity sha512-Zwq5OCzuwJC2jwqmpEQt7Ds1DTi6BWSwoGkbb1n9pO3hzb35BoJELx7c0T23iDkBGkh2e7tvOtjF3tr3OaQHDQ==

"@rushstack/node-core-library@3.66.0":
version "3.66.0"
resolved "https://registry.yarnpkg.com/@rushstack/node-core-library/-/node-core-library-3.66.0.tgz#88fb1a9632221847d84298f9d7899ef58b5b2704"
integrity sha512-nXyddNe3T9Ph14TrIfjtLZ+GDzC7HL/wF+ZKC18qmRVtz2xXLd1ZzreVgiAgGDwn8ZUWZ/7q//gQJk96iWjSrg==
"@rushstack/node-core-library@4.0.2":
version "4.0.2"
resolved "https://registry.yarnpkg.com/@rushstack/node-core-library/-/node-core-library-4.0.2.tgz#e26854a3314b279d57e8abdb4acce7797d02f554"
integrity sha512-hyES82QVpkfQMeBMteQUnrhASL/KHPhd7iJ8euduwNJG4mu2GSOKybf0rOEjOm1Wz7CwJEUm9y0yD7jg2C1bfg==
dependencies:
colors "~1.2.1"
fs-extra "~7.0.1"
import-lazy "~4.0.0"
jju "~1.4.0"
resolve "~1.22.1"
semver "~7.5.4"
z-schema "~5.0.2"

"@rushstack/[email protected].1":
version "0.5.1"
resolved "https://registry.yarnpkg.com/@rushstack/rig-package/-/rig-package-0.5.1.tgz#6c9c283cc96b5bb1eae9875946d974ac5429bb21"
integrity sha512-pXRYSe29TjRw7rqxD4WS3HN/sRSbfr+tJs4a9uuaSIBAITbUggygdhuG0VrO0EO+QqH91GhYMN4S6KRtOEmGVA==
"@rushstack/[email protected].2":
version "0.5.2"
resolved "https://registry.yarnpkg.com/@rushstack/rig-package/-/rig-package-0.5.2.tgz#0e23a115904678717a74049661931c0b37dd5495"
integrity sha512-mUDecIJeH3yYGZs2a48k+pbhM6JYwWlgjs2Ca5f2n1G2/kgdgP9D/07oglEGf6mRyXEnazhEENeYTSNDRCwdqA==
dependencies:
resolve "~1.22.1"
strip-json-comments "~3.1.1"

"@rushstack/[email protected]":
version "4.17.1"
resolved "https://registry.yarnpkg.com/@rushstack/ts-command-line/-/ts-command-line-4.17.1.tgz#c78db928ce5b93f2e98fd9e14c24f3f3876e57f1"
integrity sha512-2jweO1O57BYP5qdBGl6apJLB+aRIn5ccIRTPDyULh0KMwVzFqWtw6IZWt1qtUoZD/pD2RNkIOosH6Cq45rIYeg==
"@rushstack/[email protected]":
version "0.9.0"
resolved "https://registry.yarnpkg.com/@rushstack/terminal/-/terminal-0.9.0.tgz#17ef64c671417a8cf080e60a64c37eb09df1a317"
integrity sha512-49RnIDooriXyqcd7mGyjh9CmjOjf/Vn8PkOQXHa1CS0/RrrynCJLFhRDkswf7gGXZW+6UhROOE8wTmbOrfUTSA==
dependencies:
"@rushstack/node-core-library" "4.0.2"
colors "~1.2.1"

"@rushstack/[email protected]":
version "4.17.3"
resolved "https://registry.yarnpkg.com/@rushstack/ts-command-line/-/ts-command-line-4.17.3.tgz#e8ae87c6dcfd93f43a8e44166f155b25dc695766"
integrity sha512-/PtTYW38A8iUviuCmQSccHfmx3uBh4Jm5YRPU2aTgYEgwT2jtg60vAbwnkMYkyaT1AbWpjZM3xq5uHYPURvStw==
dependencies:
"@rushstack/terminal" "0.9.0"
"@types/argparse" "1.0.38"
argparse "~1.0.9"
colors "~1.2.1"
string-argv "~0.3.1"

"@sinonjs/commons@^2.0.0":
Expand Down Expand Up @@ -1277,10 +1284,10 @@
"@types/node" "*"
form-data "^4.0.0"

"@types/node@*", "@types/node@^20.11.19":
version "20.11.19"
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.19.tgz#b466de054e9cb5b3831bee38938de64ac7f81195"
integrity sha512-7xMnVEcZFu0DikYjWOlRq7NTPETrm7teqUT2WkQjrTIkEgUyyGdWsj/Zg8bEJt5TNklzbPD1X3fqfsHw3SpapQ==
"@types/node@*", "@types/node@^20.11.20":
version "20.11.20"
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.20.tgz#f0a2aee575215149a62784210ad88b3a34843659"
integrity sha512-7/rR21OS+fq8IyHTgtLkDK949uzsa6n8BkziAKtPVpugIkO6D+/ooXMvzXxDnZrmtXVfjb1bKQafYpb8s89LOg==
dependencies:
undici-types "~5.26.4"

Expand Down Expand Up @@ -1830,16 +1837,16 @@ append-transform@^2.0.0:
dependencies:
default-require-extensions "^3.0.0"

applicationinsights@^2.9.2:
version "2.9.2"
resolved "https://registry.yarnpkg.com/applicationinsights/-/applicationinsights-2.9.2.tgz#a83b4bb3201da350cf438015d1e5032cb9978fe1"
integrity sha512-wlDiD7v0BQNM8oNzsf9C836R5ze25u+CuCEZsbA5xMIXYYBxkqkWE/mo9GFJM7rsKaiGqpxEwWmePHKD2Lwy2w==
applicationinsights@^2.9.4:
version "2.9.4"
resolved "https://registry.yarnpkg.com/applicationinsights/-/applicationinsights-2.9.4.tgz#c61527357645dbc4c5b134aae854e5620c95a993"
integrity sha512-mMWW/E+1wy3oreeH1xJd2N5WIwIz4xj3JKneHOi7gHFqPjxgFV68mdKMEeM3YhLK1nC6k+M6Ekhf7e9WhQCSSw==
dependencies:
"@azure/core-auth" "^1.5.0"
"@azure/core-rest-pipeline" "1.10.1"
"@azure/core-util" "1.2.0"
"@azure/opentelemetry-instrumentation-azure-sdk" "^1.0.0-beta.5"
"@microsoft/applicationinsights-web-snippet" "^1.0.1"
"@microsoft/applicationinsights-web-snippet" "1.0.1"
"@opentelemetry/api" "^1.7.0"
"@opentelemetry/core" "^1.19.0"
"@opentelemetry/sdk-trace-base" "^1.19.0"
Expand Down Expand Up @@ -4158,10 +4165,10 @@ eslint-plugin-jsdoc@^46.10.1:
semver "^7.5.4"
spdx-expression-parse "^4.0.0"

eslint-plugin-mocha@^10.2.0:
version "10.2.0"
resolved "https://registry.yarnpkg.com/eslint-plugin-mocha/-/eslint-plugin-mocha-10.2.0.tgz#15b05ce5be4b332bb0d76826ec1c5ebf67102ad6"
integrity sha512-ZhdxzSZnd1P9LqDPF0DBcFLpRIGdh1zkF2JHnQklKQOvrQtT73kdP5K9V2mzvbLR+cCAO9OI48NXK/Ax9/ciCQ==
eslint-plugin-mocha@^10.3.0:
version "10.3.0"
resolved "https://registry.yarnpkg.com/eslint-plugin-mocha/-/eslint-plugin-mocha-10.3.0.tgz#a1cd40737c230f4dc7477a3bef3bbaad7f8d8282"
integrity sha512-IWzbg2K6B1Q7h37Ih4zMyW+nhmw1JvUlHlbCUUUu6PfOOAUGCB0gxmvv7/U+TQQ6e8yHUv+q7KMdIIum4bx+PA==
dependencies:
eslint-utils "^3.0.0"
rambda "^7.4.0"
Expand Down

0 comments on commit 30af264

Please sign in to comment.