Skip to content

Commit 82a26ac

Browse files
authored
build: update scripts to ESM, cleanup deps (#681)
* build: remove obsolete script * build: convert scripts to ESM * build: update scripts to use new file names * build: lint scripts * build(deps): remove unused dependency * build: upgrade `sort-keys` to v5 * build(deps): use `@gr2m/fetch-mock` * build(deps): remove `fs-extra` * build: update `package-lock.json` * style: prettier
1 parent 15fff46 commit 82a26ac

File tree

10 files changed

+116
-159
lines changed

10 files changed

+116
-159
lines changed

.github/workflows/release.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ jobs:
1818
cache: npm
1919
- run: npm ci
2020
- run: npm run build
21-
- name: "Fix pkg.files file pattern"
22-
run: node scripts/fix-package-json.js
2321
- run: npx semantic-release --debug
2422
env:
2523
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

package-lock.json

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

package.json

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
"description": "Octokit plugin adding one method for all of api.github.com REST API endpoints",
55
"scripts": {
66
"build": "node scripts/build.mjs && tsc -p tsconfig.json",
7-
"lint": "prettier --check '{src,test}/**/*' '!src/generated/**' README.md package.json",
8-
"lint:fix": "prettier --write '{src,test}/**/*' '!src/generated/**' README.md package.json",
7+
"lint": "prettier --check '{src,test,scripts}/**/*' '!scripts/update-endpoints/generated/**' '!src/generated/**' README.md package.json",
8+
"lint:fix": "prettier --write '{src,test,scripts}/**/*' '!scripts/update-endpoints/generated/**' '!src/generated/**' README.md package.json",
99
"pretest": "npm run -s lint",
1010
"test": "jest --coverage",
1111
"update-endpoints": "npm-run-all update-endpoints:*",
12-
"update-endpoints:fetch-json": "node scripts/update-endpoints/fetch-json",
13-
"update-endpoints:code": "node scripts/update-endpoints/code",
14-
"update-endpoints:docs": "node scripts/update-endpoints/docs",
15-
"update-endpoints:types": "node scripts/update-endpoints/types"
12+
"update-endpoints:fetch-json": "node scripts/update-endpoints/fetch-json.mjs",
13+
"update-endpoints:code": "node scripts/update-endpoints/code.mjs",
14+
"update-endpoints:docs": "node scripts/update-endpoints/docs.mjs",
15+
"update-endpoints:types": "node scripts/update-endpoints/types.mjs"
1616
},
1717
"repository": "github:octokit/plugin-rest-endpoint-methods.js",
1818
"keywords": [
@@ -27,15 +27,13 @@
2727
"@octokit/types": "^12.0.0"
2828
},
2929
"devDependencies": {
30-
"@gimenete/type-writer": "^0.1.5",
3130
"@octokit/core": "^5.0.0",
3231
"@octokit/tsconfig": "^2.0.0",
3332
"@types/fetch-mock": "^7.3.1",
3433
"@types/jest": "^29.0.0",
3534
"@types/node": "^18.0.0",
3635
"esbuild": "^0.19.0",
37-
"fetch-mock": "^9.0.0",
38-
"fs-extra": "^11.0.0",
36+
"fetch-mock": "npm:@gr2m/fetch-mock@^9.11.0-pull-request-644.1",
3937
"github-openapi-graphql-query": "^4.0.0",
4038
"glob": "^10.2.6",
4139
"jest": "^29.0.0",
@@ -46,7 +44,7 @@
4644
"npm-run-all": "^4.1.5",
4745
"prettier": "3.0.3",
4846
"semantic-release-plugin-update-version-in-files": "^1.0.0",
49-
"sort-keys": "^4.2.0",
47+
"sort-keys": "^5.0.0",
5048
"string-to-jsdoc-comment": "^1.0.0",
5149
"ts-jest": "^29.0.0",
5250
"typescript": "^5.0.0"

scripts/build.mjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ async function main() {
8181
sideEffects: false,
8282
},
8383
null,
84-
2
85-
)
84+
2,
85+
),
8686
);
8787
}
8888
main();

scripts/fix-package-json.js

Lines changed: 0 additions & 15 deletions
This file was deleted.
Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,23 @@
1-
const { writeFileSync } = require("fs");
2-
const { join } = require("path");
1+
import { readFileSync, writeFileSync } from "fs";
2+
import { join } from "path";
3+
import { fileURLToPath } from "url";
34

4-
const prettier = require("prettier");
5-
const sortKeys = require("sort-keys");
5+
import { format } from "prettier";
6+
import sortKeys from "sort-keys";
67

7-
const ENDPOINTS = require("./generated/endpoints.json");
8-
const { isDeprecated } = require("./util");
8+
const parentDir = new URL(".", import.meta.url);
9+
const ENDPOINTS = JSON.parse(
10+
readFileSync(new URL("generated/endpoints.json", parentDir)).toString(),
11+
);
12+
import { isDeprecated } from "./util.mjs";
913

1014
const ROUTES_PATH = join(
11-
__dirname,
15+
fileURLToPath(parentDir),
1216
"..",
1317
"..",
1418
"src",
1519
"generated",
16-
"endpoints.ts"
20+
"endpoints.ts",
1721
);
1822

1923
const newRoutes = {};
@@ -84,7 +88,7 @@ async function generateRoutes() {
8488
}
8589

8690
const renamedParameters = endpoint.parameters.filter(
87-
(parameter) => !!parameter.alias
91+
(parameter) => !!parameter.alias,
8892
);
8993

9094
if (renamedParameters.length) {
@@ -118,15 +122,15 @@ async function generateRoutes() {
118122

119123
writeFileSync(
120124
ROUTES_PATH,
121-
await prettier.format(
125+
await format(
122126
`import type { EndpointsDefaultsAndDecorations } from "../types";
123127
const Endpoints: EndpointsDefaultsAndDecorations = ${JSON.stringify(
124-
sortKeys(newRoutes, { deep: true })
128+
sortKeys(newRoutes, { deep: true }),
125129
)}
126130
127131
export default Endpoints`,
128-
{ parser: "typescript" }
129-
)
132+
{ parser: "typescript" },
133+
),
130134
);
131135
console.log(`${ROUTES_PATH} written.`);
132136
}

0 commit comments

Comments
 (0)