Fix dependency incompatibilities

node_modules/@octokit/plugin-rest-endpoint-methods/README.md

@@ -13,12 +13,12 @@
 Browsers
 </th><td width=100%>
 
-Load `@octokit/plugin-rest-endpoint-methods` and [`@octokit/core`](https://github.com/octokit/core.js) (or core-compatible module) directly from [cdn.pika.dev](https://cdn.pika.dev)
+Load `@octokit/plugin-rest-endpoint-methods` and [`@octokit/core`](https://github.com/octokit/core.js) (or core-compatible module) directly from [cdn.skypack.dev](https://cdn.skypack.dev)
 
 ```html
 <script type="module">
-  import { Octokit } from "https://cdn.pika.dev/@octokit/core";
-  import { restEndpointMethods } from "https://cdn.pika.dev/@octokit/plugin-rest-endpoint-methods";
+  import { Octokit } from "https://cdn.skypack.dev/@octokit/core";
+  import { restEndpointMethods } from "https://cdn.skypack.dev/@octokit/plugin-rest-endpoint-methods";
 </script>
 ```
 
@@ -45,7 +45,7 @@ const MyOctokit = Octokit.plugin(restEndpointMethods);
 const octokit = new MyOctokit({ auth: "secret123" });
 
 // https://developer.github.com/v3/users/#get-the-authenticated-user
-octokit.users.getAuthenticated();
+octokit.rest.users.getAuthenticated();
 ```
 
 There is one method for each REST API endpoint documented at [https://developer.github.com/v3](https://developer.github.com/v3). All endpoint methods are documented in the [docs/](docs/) folder, e.g. [docs/users/getAuthenticated.md](docs/users/getAuthenticated.md)
@@ -59,10 +59,14 @@ Example
 ```ts
 import { RestEndpointMethodTypes } from "@octokit/plugin-rest-endpoint-methods";
 
-type UpdateLabelParameters = RestEndpointMethodTypes["issues"]["updateLabel"]["parameters"];
-type UpdateLabelResponse = RestEndpointMethodTypes["issues"]["updateLabel"]["response"];
+type UpdateLabelParameters =
+  RestEndpointMethodTypes["issues"]["updateLabel"]["parameters"];
+type UpdateLabelResponse =
+  RestEndpointMethodTypes["issues"]["updateLabel"]["response"];
 ```
 
+In order to get types beyond parameters and responses, check out [`@octokit/openapi-types`](https://github.com/octokit/openapi-types.ts/#readme), which is a direct transpilation from GitHub's official OpenAPI specification.
+
 ## Contributing
 
 See [CONTRIBUTING.md](CONTRIBUTING.md)

node_modules/@octokit/plugin-rest-endpoint-methods/dist-src/index.js

@@ -1,17 +1,18 @@
 import ENDPOINTS from "./generated/endpoints";
 import { VERSION } from "./version";
 import { endpointsToMethods } from "./endpoints-to-methods";
-/**
- * This plugin is a 1:1 copy of internal @octokit/rest plugins. The primary
- * goal is to rebuild @octokit/rest on top of @octokit/core. Once that is
- * done, we will remove the registerEndpoints methods and return the methods
- * directly as with the other plugins. At that point we will also remove the
- * legacy workarounds and deprecations.
- *
- * See the plan at
- * https://github.com/octokit/plugin-rest-endpoint-methods.js/pull/1
- */
 export function restEndpointMethods(octokit) {
-    return endpointsToMethods(octokit, ENDPOINTS);
+    const api = endpointsToMethods(octokit, ENDPOINTS);
+    return {
+        rest: api,
+    };
 }
 restEndpointMethods.VERSION = VERSION;
+export function legacyRestEndpointMethods(octokit) {
+    const api = endpointsToMethods(octokit, ENDPOINTS);
+    return {
+        ...api,
+        rest: api,
+    };
+}
+legacyRestEndpointMethods.VERSION = VERSION;

node_modules/@octokit/plugin-rest-endpoint-methods/dist-src/version.js

@@ -1 +1 @@
-export const VERSION = "4.2.0";
+export const VERSION = "5.16.2";

node_modules/@octokit/plugin-rest-endpoint-methods/dist-types/index.d.ts

@@ -1,17 +1,11 @@
 import { Octokit } from "@octokit/core";
 export { RestEndpointMethodTypes } from "./generated/parameters-and-response-types";
 import { Api } from "./types";
-/**
- * This plugin is a 1:1 copy of internal @octokit/rest plugins. The primary
- * goal is to rebuild @octokit/rest on top of @octokit/core. Once that is
- * done, we will remove the registerEndpoints methods and return the methods
- * directly as with the other plugins. At that point we will also remove the
- * legacy workarounds and deprecations.
- *
- * See the plan at
- * https://github.com/octokit/plugin-rest-endpoint-methods.js/pull/1
- */
 export declare function restEndpointMethods(octokit: Octokit): Api;
 export declare namespace restEndpointMethods {
     var VERSION: string;
 }
+export declare function legacyRestEndpointMethods(octokit: Octokit): Api["rest"] & Api;
+export declare namespace legacyRestEndpointMethods {
+    var VERSION: string;
+}

node_modules/@octokit/plugin-rest-endpoint-methods/dist-types/types.d.ts

@@ -1,6 +1,8 @@
 import { Route, RequestParameters } from "@octokit/types";
 import { RestEndpointMethods } from "./generated/method-types";
-export declare type Api = RestEndpointMethods;
+export declare type Api = {
+    rest: RestEndpointMethods;
+};
 export declare type EndpointDecorations = {
     mapToData?: string;
     deprecated?: string;

node_modules/@octokit/plugin-rest-endpoint-methods/dist-types/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "4.2.0";
+export declare const VERSION = "5.16.2";

node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/openapi-types/LICENSE

@@ -0,0 +1,7 @@
+Copyright 2020 Gregor Martynus
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/openapi-types/README.md

@@ -0,0 +1,17 @@
+# @octokit/openapi-types
+
+> Generated TypeScript definitions based on GitHub's OpenAPI spec
+
+This package is continously updated based on [GitHub's OpenAPI specification](https://github.com/github/rest-api-description/)
+
+## Usage
+
+```ts
+import { components } from "@octokit/openapi-types";
+
+type Repository = components["schemas"]["full-repository"];
+```
+
+## License
+
+[MIT](LICENSE)

node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/openapi-types/package.json

@@ -0,0 +1,20 @@
+{
+  "name": "@octokit/openapi-types",
+  "description": "Generated TypeScript definitions based on GitHub's OpenAPI spec for api.github.com",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/octokit/openapi-types.ts.git",
+    "directory": "packages/openapi-types"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "version": "12.11.0",
+  "main": "",
+  "types": "types.d.ts",
+  "author": "Gregor Martynus (https://twitter.com/gr2m)",
+  "license": "MIT",
+  "octokit": {
+    "openapi-version": "6.8.0"
+  }
+}

node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/types/README.md

@@ -27,8 +27,9 @@ See all exported types at https://octokit.github.io/types.ts
 ```ts
 import { Endpoints } from "@octokit/types";
 
-type listUserReposParameters = Endpoints["GET /repos/:owner/:repo"]["parameters"];
-type listUserReposResponse = Endpoints["GET /repos/:owner/:repo"]["response"];
+type listUserReposParameters =
+  Endpoints["GET /repos/{owner}/{repo}"]["parameters"];
+type listUserReposResponse = Endpoints["GET /repos/{owner}/{repo}"]["response"];
 
 async function listRepos(
   options: listUserReposParameters

node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/types/dist-node/index.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-const VERSION = "5.5.0";
+const VERSION = "6.41.0";
 
 exports.VERSION = VERSION;
 //# sourceMappingURL=index.js.map

node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/types/dist-src/VERSION.js

@@ -1 +1 @@
-export const VERSION = "5.5.0";
+export const VERSION = "6.41.0";

node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/types/dist-types/AuthInterface.d.ts

@@ -23,7 +23,7 @@ export interface AuthInterface<AuthOptions extends any[], Authentication extends
         /**
          * Sends a request using the passed `request` instance
          *
-         * @param {string} route Request method + URL. Example: `'GET /orgs/:org'`
+         * @param {string} route Request method + URL. Example: `'GET /orgs/{org}'`
          * @param {object} [parameters] URL, query or body parameters, as well as `headers`, `mediaType.{format|previews}`, `request`, or `baseUrl`.
          */
         <T = any>(request: RequestInterface, route: Route, parameters?: RequestParameters): Promise<OctokitResponse<T>>;

node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/types/dist-types/EndpointInterface.d.ts

@@ -19,7 +19,7 @@ export interface EndpointInterface<D extends object = object> {
     /**
      * Transforms a GitHub REST API endpoint into generic request options
      *
-     * @param {string} route Request method + URL. Example: `'GET /orgs/:org'`
+     * @param {string} route Request method + URL. Example: `'GET /orgs/{org}'`
      * @param {object} [parameters] URL, query or body parameters, as well as `headers`, `mediaType.{format|previews}`, `request`, or `baseUrl`.
      */
     <R extends Route, P extends RequestParameters = R extends keyof Endpoints ? Endpoints[R]["parameters"] & RequestParameters : RequestParameters>(route: keyof Endpoints | R, parameters?: P): (R extends keyof Endpoints ? Endpoints[R]["request"] : RequestOptions) & Pick<P, keyof RequestOptions>;
@@ -36,7 +36,7 @@ export interface EndpointInterface<D extends object = object> {
          * Merges current endpoint defaults with passed route and parameters,
          * without transforming them into request options.
          *
-         * @param {string} route Request method + URL. Example: `'GET /orgs/:org'`
+         * @param {string} route Request method + URL. Example: `'GET /orgs/{org}'`
          * @param {object} [parameters] URL, query or body parameters, as well as `headers`, `mediaType.{format|previews}`, `request`, or `baseUrl`.
          *
          */

node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/types/dist-types/OctokitResponse.d.ts

@@ -1,17 +1,17 @@
 import { ResponseHeaders } from "./ResponseHeaders";
 import { Url } from "./Url";
-export declare type OctokitResponse<T> = {
+export declare type OctokitResponse<T, S extends number = number> = {
     headers: ResponseHeaders;
     /**
      * http response code
      */
-    status: number;
+    status: S;
     /**
      * URL of response after all redirects
      */
     url: Url;
     /**
-     *  This is the data you would see in https://developer.Octokit.com/v3/
+     * Response data as documented in the REST API reference documentation at https://docs.github.com/rest/reference
      */
     data: T;
 };

node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/types/dist-types/RequestInterface.d.ts

@@ -19,7 +19,7 @@ export interface RequestInterface<D extends object = object> {
     /**
      * Sends a request based on endpoint options
      *
-     * @param {string} route Request method + URL. Example: `'GET /orgs/:org'`
+     * @param {string} route Request method + URL. Example: `'GET /orgs/{org}'`
      * @param {object} [parameters] URL, query or body parameters, as well as `headers`, `mediaType.{format|previews}`, `request`, or `baseUrl`.
      */
     <R extends Route>(route: keyof Endpoints | R, options?: R extends keyof Endpoints ? Endpoints[R]["parameters"] & RequestParameters : RequestParameters): R extends keyof Endpoints ? Promise<Endpoints[R]["response"]> : Promise<OctokitResponse<any>>;

node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/types/dist-types/RequestParameters.d.ts

@@ -6,9 +6,9 @@ import { Url } from "./Url";
  */
 export declare type RequestParameters = {
     /**
-     * Base URL to be used when a relative URL is passed, such as `/orgs/:org`.
+     * Base URL to be used when a relative URL is passed, such as `/orgs/{org}`.
      * If `baseUrl` is `https://enterprise.acme-inc.com/api/v3`, then the request
-     * will be sent to `https://enterprise.acme-inc.com/api/v3/orgs/:org`.
+     * will be sent to `https://enterprise.acme-inc.com/api/v3/orgs/{org}`.
      */
     baseUrl?: Url;
     /**

node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/types/dist-types/RequestRequestOptions.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-import { Agent } from "http";
 import { Fetch } from "./Fetch";
 import { Signal } from "./Signal";
 /**
@@ -8,8 +6,10 @@ import { Signal } from "./Signal";
 export declare type RequestRequestOptions = {
     /**
      * Node only. Useful for custom proxy, certificate, or dns lookup.
+     *
+     * @see https://nodejs.org/api/http.html#http_class_http_agent
      */
-    agent?: Agent;
+    agent?: unknown;
     /**
      * Custom replacement for built-in fetch method. Useful for testing or request hooks.
      */

node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/types/dist-types/Route.d.ts

@@ -1,4 +1,4 @@
 /**
- * String consisting of an optional HTTP method and relative path or absolute URL. Examples: `'/orgs/:org'`, `'PUT /orgs/:org'`, `GET https://example.com/foo/bar`
+ * String consisting of an optional HTTP method and relative path or absolute URL. Examples: `'/orgs/{org}'`, `'PUT /orgs/{org}'`, `GET https://example.com/foo/bar`
  */
 export declare type Route = string;

node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/types/dist-types/Url.d.ts

@@ -1,4 +1,4 @@
 /**
- * Relative or absolute URL. Examples: `'/orgs/:org'`, `https://example.com/foo/bar`
+ * Relative or absolute URL. Examples: `'/orgs/{org}'`, `https://example.com/foo/bar`
  */
 export declare type Url = string;

node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/types/dist-types/VERSION.d.ts

@@ -1 +1 @@
-export declare const VERSION = "5.5.0";
+export declare const VERSION = "6.41.0";

node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/types/dist-web/index.js

@@ -1,4 +1,4 @@
-const VERSION = "5.5.0";
+const VERSION = "6.41.0";
 
 export { VERSION };
 //# sourceMappingURL=index.js.map

node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/types/package.json

@@ -1,12 +1,19 @@
 {
   "name": "@octokit/types",
   "description": "Shared TypeScript definitions for Octokit projects",
-  "version": "5.5.0",
+  "version": "6.41.0",
   "license": "MIT",
   "files": [
     "dist-*/",
     "bin/"
   ],
+  "source": "dist-src/index.js",
+  "types": "dist-types/index.d.ts",
+  "octokit": {
+    "openapi-version": "6.8.0"
+  },
+  "main": "dist-node/index.js",
+  "module": "dist-web/index.js",
   "pika": true,
   "sideEffects": false,
   "keywords": [
@@ -16,34 +23,32 @@
     "toolkit",
     "typescript"
   ],
-  "repository": "https://github.com/octokit/types.ts",
+  "repository": "github:octokit/types.ts",
   "dependencies": {
-    "@types/node": ">= 8"
+    "@octokit/openapi-types": "^12.11.0"
   },
   "devDependencies": {
-    "@octokit/graphql": "^4.2.2",
-    "@pika/pack": "^0.5.0",
+    "@pika/pack": "^0.3.7",
     "@pika/plugin-build-node": "^0.9.0",
     "@pika/plugin-build-web": "^0.9.0",
     "@pika/plugin-ts-standard-pkg": "^0.9.0",
+    "@types/node": ">= 8",
+    "github-openapi-graphql-query": "^2.0.0",
     "handlebars": "^4.7.6",
-    "json-schema-to-typescript": "^9.1.0",
+    "json-schema-to-typescript": "^11.0.0",
     "lodash.set": "^4.3.2",
     "npm-run-all": "^4.1.5",
     "pascal-case": "^3.1.1",
+    "pika-plugin-merge-properties": "^1.0.6",
     "prettier": "^2.0.0",
-    "semantic-release": "^17.0.0",
+    "semantic-release": "^19.0.3",
     "semantic-release-plugin-update-version-in-files": "^1.0.0",
-    "sort-keys": "^4.0.0",
+    "sort-keys": "^4.2.0",
     "string-to-jsdoc-comment": "^1.0.0",
-    "typedoc": "^0.19.0",
+    "typedoc": "^0.23.0",
     "typescript": "^4.0.2"
   },
   "publishConfig": {
     "access": "public"
-  },
-  "source": "dist-src/index.js",
-  "types": "dist-types/index.d.ts",
-  "main": "dist-node/index.js",
-  "module": "dist-web/index.js"
+  }
 }

node_modules/@octokit/plugin-rest-endpoint-methods/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@octokit/plugin-rest-endpoint-methods",
   "description": "Octokit plugin adding one method for all of api.github.com REST API endpoints",
-  "version": "4.2.0",
+  "version": "5.16.2",
   "license": "MIT",
   "files": [
     "dist-*/",
@@ -15,36 +15,38 @@
     "sdk",
     "toolkit"
   ],
-  "repository": "https://github.com/octokit/plugin-rest-endpoint-methods.js",
+  "repository": "github:octokit/plugin-rest-endpoint-methods.js",
   "dependencies": {
-    "@octokit/types": "^5.5.0",
+    "@octokit/types": "^6.39.0",
     "deprecation": "^2.3.1"
   },
+  "peerDependencies": {
+    "@octokit/core": ">=3"
+  },
   "devDependencies": {
     "@gimenete/type-writer": "^0.1.5",
     "@octokit/core": "^3.0.0",
-    "@octokit/graphql": "^4.3.1",
     "@pika/pack": "^0.5.0",
     "@pika/plugin-build-node": "^0.9.0",
     "@pika/plugin-build-web": "^0.9.0",
     "@pika/plugin-ts-standard-pkg": "^0.9.0",
     "@types/fetch-mock": "^7.3.1",
-    "@types/jest": "^26.0.0",
-    "@types/node": "^14.0.4",
+    "@types/jest": "^27.0.0",
+    "@types/node": "^16.0.0",
     "fetch-mock": "^9.0.0",
-    "fs-extra": "^9.0.0",
-    "jest": "^26.1.0",
+    "fs-extra": "^10.0.0",
+    "github-openapi-graphql-query": "^2.0.0",
+    "jest": "^27.0.0",
     "lodash.camelcase": "^4.3.0",
     "lodash.set": "^4.3.2",
     "lodash.upperfirst": "^4.3.1",
     "mustache": "^4.0.0",
     "npm-run-all": "^4.1.5",
-    "prettier": "^2.0.1",
-    "semantic-release": "^17.0.0",
+    "prettier": "2.7.1",
     "semantic-release-plugin-update-version-in-files": "^1.0.0",
-    "sort-keys": "^4.0.0",
+    "sort-keys": "^4.2.0",
     "string-to-jsdoc-comment": "^1.0.0",
-    "ts-jest": "^26.1.3",
+    "ts-jest": "^27.0.0-next.12",
     "typescript": "^4.0.2"
   },
   "publishConfig": {