Skip to content

Commit

Permalink
[Cosmos] Return to node-abort-controller (#5555)
Browse files Browse the repository at this point in the history
* Bring back node-abort-controller

* 3.3.5

* pnpm update
  • Loading branch information
southpolesteve authored Oct 14, 2019
1 parent 71302ce commit 76ad872
Show file tree
Hide file tree
Showing 6 changed files with 40 additions and 48 deletions.
74 changes: 33 additions & 41 deletions common/config/rush/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions sdk/cosmosdb/cosmos/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@azure/cosmos",
"version": "3.3.4",
"version": "3.3.5",
"description": "Microsoft Azure Cosmos DB Service Node.js SDK for SQL API",
"sdk-type": "client",
"keywords": [
Expand Down Expand Up @@ -73,7 +73,6 @@
"tsdocFlavor": "AEDoc"
},
"dependencies": {
"@azure/abort-controller": "1.0.0-preview.2",
"@types/debug": "^4.1.4",
"debug": "^4.1.1",
"fast-json-stable-stringify": "^2.0.0",
Expand Down Expand Up @@ -121,6 +120,7 @@
"mocha": "^6.2.0",
"mocha-junit-reporter": "^1.18.0",
"mocha-multi": "^1.1.3",
"node-abort-controller": "1.0.4",
"prettier": "^1.16.4",
"proxy-agent": "3.0.3",
"requirejs": "^2.3.5",
Expand Down
2 changes: 1 addition & 1 deletion sdk/cosmosdb/cosmos/review/cosmos.api.md
Original file line number Diff line number Diff line change
Expand Up @@ -578,12 +578,12 @@ export class Items {
query<T>(query: string | SqlQuerySpec, options: FeedOptions): QueryIterator<T>;
readAll(options?: FeedOptions): QueryIterator<ItemDefinition>;
readAll<T extends ItemDefinition>(options?: FeedOptions): QueryIterator<T>;
readChangeFeed<T>(changeFeedOptions?: ChangeFeedOptions): ChangeFeedIterator<T>;
// Warning: (ae-forgotten-export) The symbol "ChangeFeedOptions" needs to be exported by the entry point index.d.ts
// Warning: (ae-forgotten-export) The symbol "ChangeFeedIterator" needs to be exported by the entry point index.d.ts
readChangeFeed(partitionKey: string | number | boolean, changeFeedOptions: ChangeFeedOptions): ChangeFeedIterator<any>;
readChangeFeed(changeFeedOptions?: ChangeFeedOptions): ChangeFeedIterator<any>;
readChangeFeed<T>(partitionKey: string | number | boolean, changeFeedOptions: ChangeFeedOptions): ChangeFeedIterator<T>;
readChangeFeed<T>(changeFeedOptions?: ChangeFeedOptions): ChangeFeedIterator<T>;
upsert(body: any, options?: RequestOptions): Promise<ItemResponse<ItemDefinition>>;
upsert<T extends ItemDefinition>(body: T, options?: RequestOptions): Promise<ItemResponse<T>>;
}
Expand Down
4 changes: 2 additions & 2 deletions sdk/cosmosdb/cosmos/rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export default [
"universal-user-agent",
"uuid/v4",
"debug",
"@azure/abort-controller",
"node-abort-controller",
"node-fetch",
"priorityqueuejs",
"semaphore",
Expand All @@ -23,7 +23,7 @@ export default [
"universal-user-agent": "universalUserAgent",
"fast-json-stable-stringify": "stableStringify",
"uuid/v4": "uuid",
"@azure/abort-controller": "AbortController",
"node-abort-controller": "AbortController",
"node-fetch": "fetch",
crypto: "crypto",
tslib: "tslib_1",
Expand Down
2 changes: 1 addition & 1 deletion sdk/cosmosdb/cosmos/src/request/RequestHandler.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT license.
import { AbortController } from "@azure/abort-controller";
import AbortController from "node-abort-controller";
import fetch, { RequestInit, Response } from "node-fetch";
import { trimSlashes } from "../common";
import { Constants } from "../common/constants";
Expand Down
2 changes: 1 addition & 1 deletion sdk/cosmosdb/cosmos/test/functional/client.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
generateDocuments,
bulkInsertItems
} from "../common/TestHelpers";
import { AbortController } from "@azure/abort-controller";
import AbortController from "node-abort-controller";

describe("NodeJS CRUD Tests", function() {
this.timeout(process.env.MOCHA_TIMEOUT || 20000);
Expand Down

0 comments on commit 76ad872

Please sign in to comment.