Skip to content

Commit 2e5cacf

Browse files
committed
Merge branch 'release-1.x' into azure_auth_tests_update
2 parents fb4405e + b54ace6 commit 2e5cacf

File tree

15 files changed

+351
-227
lines changed

15 files changed

+351
-227
lines changed

package-lock.json

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

package.json

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,16 @@
5858
"@types/node": "^10.12.0",
5959
"@types/request": "^2.47.1",
6060
"@types/stream-buffers": "^3.0.3",
61-
"@types/tar": "^4.0.3",
61+
"@types/tar": "^6.1.1",
6262
"@types/underscore": "^1.8.9",
6363
"@types/ws": "^6.0.1",
64+
"abort-controller": "^3.0.0",
6465
"byline": "^5.0.0",
6566
"execa": "5.0.0",
6667
"isomorphic-ws": "^4.0.1",
6768
"js-yaml": "^4.1.0",
6869
"jsonpath-plus": "^0.19.0",
70+
"node-fetch": "^2.6.0",
6971
"openid-client": "^4.1.1",
7072
"request": "^2.88.0",
7173
"rfc4648": "^1.3.0",
@@ -75,12 +77,13 @@
7577
"tmp-promise": "^3.0.2",
7678
"tslib": "^1.9.3",
7779
"underscore": "^1.9.1",
80+
"url-parse": "^1.4.3",
7881
"ws": "^7.3.1"
7982
},
8083
"devDependencies": {
8184
"@types/byline": "^4.2.31",
82-
"@types/chai": "^4.1.6",
83-
"@types/chai-as-promised": "^7.1.0",
85+
"@types/chai": "^4.3.0",
86+
"@types/chai-as-promised": "^7.1.5",
8487
"@types/mocha": "^5.2.7",
8588
"@types/mock-fs": "^3.6.30",
8689
"chai": "^4.2.0",
@@ -122,4 +125,4 @@
122125
"overrides": {
123126
"colors": "1.4.0"
124127
}
125-
}
128+
}

src/api.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export * from './gen/api';
1+
export * from './gen';

src/cache.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ObjectSerializer } from './api';
1+
import { ObjectSerializer } from './util';
22
import {
33
ADD,
44
CHANGE,

0 commit comments

Comments
 (0)