diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md deleted file mode 100644 index 0a45f9b..0000000 --- a/CODE_OF_CONDUCT.md +++ /dev/null @@ -1,3 +0,0 @@ -# Code of Conduct - -Facebook has adopted a Code of Conduct that we expect project participants to adhere to. Please [read the full text](https://code.facebook.com/codeofconduct) so that you can understand what actions will and will not be tolerated. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 85b5c10..1260005 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -4,7 +4,7 @@ We want to make contributing to this project as easy and transparent as possible. ## Code of Conduct -The code of conduct is described in [`CODE_OF_CONDUCT.md`](CODE_OF_CONDUCT.md) +This project's code of conduct is described in the GraphQL Foundation's [`CODE_OF_CONDUCT.md`](https://github.com/graphql/foundation/blob/master/CODE-OF-CONDUCT.md) ## Pull Requests @@ -17,22 +17,11 @@ We actively welcome your pull requests for documentation and code. 5. Make sure your code lints. 6. If you haven't already, complete the Contributor License Agreement ("CLA"). -## Contributor License Agreement ("CLA") - -In order to accept your pull request, we need you to submit a CLA. You only need -to do this once to work on any of Facebook's open source projects. - -Complete your CLA here: - ## Issues We use GitHub issues to track public bugs. Please ensure your description is clear and has sufficient instructions to be able to reproduce the issue. -Facebook has a [bounty program](https://www.facebook.com/whitehat/) for the safe -disclosure of security bugs. In those cases, please go through the process -outlined on that page and do not file a public issue. - ## Coding Style * 2 spaces for indentation rather than tabs diff --git a/LICENSE b/LICENSE index 9e05101..a4e89f7 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,7 @@ MIT License -Copyright (c) 2015-present, Facebook, Inc. +Copyright (c) 2015-2018, Facebook, Inc. +Copyright (c) 2019-present, GraphQL Foundation Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 23421f6..2c6f04e 100644 --- a/README.md +++ b/README.md @@ -283,7 +283,7 @@ Create a new `DataLoader` given a batch loading function and options. | ---------- | ---- | ------- | ----------- | | *batch* | Boolean | `true` | Set to `false` to disable batching, invoking `batchLoadFn` with a single load key. | *maxBatchSize* | Number | `Infinity` | Limits the number of items that get passed in to the `batchLoadFn`. - | *cache* | Boolean | `true` | Set to `false` to disable memoization caching, creating a new Promise and new key in the `batchLoadFn` for every load of the same key. + | *cache* | Boolean | `true` | Set to `false` to disable memoization caching, creating a new Promise and new key in the `batchLoadFn` for every load of the same key. | *cacheKeyFn* | Function | `key => key` | Produces cache key for a given load key. Useful when objects are keys and two objects should be considered equivalent. | *cacheMap* | Object | `new Map()` | Instance of [Map][] (or an object with a similar API) to be used as cache. diff --git a/package.json b/package.json index 5de6788..5383a06 100644 --- a/package.json +++ b/package.json @@ -8,13 +8,13 @@ "Nicholas Schrock " ], "license": "MIT", - "homepage": "https://github.com/facebook/dataloader", + "homepage": "https://github.com/graphql/dataloader", "bugs": { - "url": "https://github.com/facebook/dataloader/issues" + "url": "https://github.com/graphql/dataloader/issues" }, "repository": { "type": "git", - "url": "http://github.com/facebook/dataloader.git" + "url": "http://github.com/graphql/dataloader.git" }, "main": "index.js", "typings": "index.d.ts", diff --git a/resources/mocha-bootload.js b/resources/mocha-bootload.js index 4d48953..f62500d 100644 --- a/resources/mocha-bootload.js +++ b/resources/mocha-bootload.js @@ -1,10 +1,3 @@ -/** - * Copyright (c) 2015-present, Facebook, Inc. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - process.on('unhandledRejection', function (error) { console.error('Unhandled Promise Rejection:'); console.error(error && error.stack || error); diff --git a/resources/watch.js b/resources/watch.js index 9d51523..c099ed7 100644 --- a/resources/watch.js +++ b/resources/watch.js @@ -1,10 +1,3 @@ -/** - * Copyright (c) 2015-present, Facebook, Inc. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - import sane from 'sane'; import { resolve as resolvePath } from 'path'; import { spawn } from 'child_process'; diff --git a/src/__tests__/abuse-test.js b/src/__tests__/abuse-test.js index 8b03b09..77eb52d 100644 --- a/src/__tests__/abuse-test.js +++ b/src/__tests__/abuse-test.js @@ -1,5 +1,5 @@ /** - * Copyright (c) 2015-present, Facebook, Inc. + * Copyright (c) 2019-present, GraphQL Foundation * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. diff --git a/src/__tests__/dataloader-test.js b/src/__tests__/dataloader-test.js index 64c8567..807b42e 100644 --- a/src/__tests__/dataloader-test.js +++ b/src/__tests__/dataloader-test.js @@ -1,5 +1,5 @@ /** - * Copyright (c) 2015-present, Facebook, Inc. + * Copyright (c) 2019-present, GraphQL Foundation * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. diff --git a/src/index.d.ts b/src/index.d.ts index 68fae7a..aa40aac 100644 --- a/src/index.d.ts +++ b/src/index.d.ts @@ -1,5 +1,5 @@ /** - * Copyright (c) 2015-present, Facebook, Inc. + * Copyright (c) 2019-present, GraphQL Foundation * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. diff --git a/src/index.js b/src/index.js index f714db1..44aa9b9 100644 --- a/src/index.js +++ b/src/index.js @@ -1,5 +1,5 @@ /** - * Copyright (c) 2015-present, Facebook, Inc. + * Copyright (c) 2019-present, GraphQL Foundation * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree.