Skip to content

Commit 49bbd72

Browse files
drwpowdrwpow
authored
Update deps (#1484)
* Update deps * Remove prepare scripts, improve CI
1 parent c6d945b commit 49bbd72

File tree

11 files changed

+1097
-1313
lines changed

11 files changed

+1097
-1313
lines changed

‎.changeset/friendly-turtles-count.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"openapi-fetch": patch
3+
---
4+
5+
Remove prepare script

‎docs/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
"update-contributors": "node scripts/update-contributors.js"
1111
},
1212
"devDependencies": {
13-
"vitepress": "1.0.0-rc.28"
13+
"vitepress": "1.0.0-rc.31"
1414
}
1515
}

‎package.json

+11-10
Original file line numberDiff line numberDiff line change
@@ -8,33 +8,34 @@
88
"email": "[email protected]"
99
},
1010
"scripts": {
11-
"build": "run-p -s build:*",
11+
"build": "run-s -s build:*",
1212
"build:openapi-typescript": "cd packages/openapi-typescript && pnpm run build",
13-
"build:openapi-fetch": "cd packages/openapi-typescript-helpers && pnpm run build && cd ../openapi-fetch && pnpm run build",
13+
"build:openapi-typescript-helpers": "cd packages/openapi-typescript-helpers && pnpm run build",
14+
"build:openapi-fetch": "cd packages/openapi-fetch && pnpm run build",
1415
"lint": "run-p -s lint:*",
1516
"lint:openapi-typescript": "cd packages/openapi-typescript && pnpm run lint",
1617
"lint:openapi-typescript-helpers": "cd packages/openapi-typescript-helpers && pnpm run lint",
1718
"lint:openapi-fetch": "cd packages/openapi-fetch && pnpm run lint",
18-
"test": "run-p -s test:*",
19+
"test": "pnpm run build && run-p test:*",
1920
"test:openapi-typescript": "cd packages/openapi-typescript && pnpm test",
2021
"test:openapi-typescript-helpers": "cd packages/openapi-typescript-helpers && pnpm test",
2122
"test:openapi-fetch": "cd packages/openapi-fetch && pnpm test",
2223
"version": "pnpm run build && changeset version && pnpm i"
2324
},
2425
"devDependencies": {
2526
"@changesets/changelog-github": "^0.4.8",
26-
"@changesets/cli": "^2.26.2",
27-
"@typescript-eslint/eslint-plugin": "^6.12.0",
28-
"@typescript-eslint/parser": "^6.12.0",
27+
"@changesets/cli": "^2.27.1",
28+
"@typescript-eslint/eslint-plugin": "^6.14.0",
29+
"@typescript-eslint/parser": "^6.14.0",
2930
"del-cli": "^5.1.0",
30-
"eslint": "^8.54.0",
31-
"eslint-config-prettier": "^9.0.0",
31+
"eslint": "^8.55.0",
32+
"eslint-config-prettier": "^9.1.0",
3233
"eslint-plugin-import": "^2.29.0",
3334
"eslint-plugin-no-only-tests": "^3.1.0",
3435
"eslint-plugin-prettier": "^5.0.1",
3536
"eslint-plugin-vitest": "^0.2.8",
3637
"npm-run-all": "^4.1.5",
37-
"prettier": "^3.1.0",
38-
"typescript": "^5.3.2"
38+
"prettier": "^3.1.1",
39+
"typescript": "^5.3.3"
3940
}
4041
}

‎packages/openapi-fetch/examples/nextjs/package.json

+2-3
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
"private": true,
44
"type": "module",
55
"scripts": {
6-
"dev": "next dev",
7-
"prepare": "openapi-typescript lib/api/v1.json -o lib/api/v1.d.ts"
6+
"dev": "next dev"
87
},
98
"dependencies": {
109
"next": "14.0.1",
@@ -17,6 +16,6 @@
1716
"@types/react": "18.2.20",
1817
"@types/react-dom": "18.2.7",
1918
"openapi-typescript": "workspace:^",
20-
"typescript": "5.3.2"
19+
"typescript": "5.3.3"
2120
}
2221
}

‎packages/openapi-fetch/examples/react-query/package.json

+5-6
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,18 @@
33
"private": true,
44
"type": "module",
55
"scripts": {
6-
"dev": "vite dev",
7-
"prepare": "openapi-typescript src/lib/api/v1.json -o src/lib/api/v1.d.ts"
6+
"dev": "vite dev"
87
},
98
"dependencies": {
10-
"@tanstack/react-query": "^4.35.0",
9+
"@tanstack/react-query": "^5.13.4",
1110
"openapi-fetch": "workspace:^",
1211
"openapi-typescript": "workspace:^",
1312
"react": "^18.2.0",
1413
"react-dom": "^18.2.0"
1514
},
1615
"devDependencies": {
17-
"@vitejs/plugin-react-swc": "^3.3.2",
18-
"typescript": "^5.3.2",
19-
"vite": "^4.4.9"
16+
"@vitejs/plugin-react-swc": "^3.5.0",
17+
"typescript": "^5.3.3",
18+
"vite": "^5.0.8"
2019
}
2120
}

‎packages/openapi-fetch/examples/sveltekit/package.json

+7-8
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,19 @@
55
"scripts": {
66
"dev": "vite dev",
77
"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
8-
"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
9-
"prepare": "openapi-typescript src/lib/api/v1.json -o src/lib/api/v1.d.ts"
8+
"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch"
109
},
1110
"dependencies": {
1211
"openapi-fetch": "workspace:^",
1312
"openapi-typescript": "workspace:^"
1413
},
1514
"devDependencies": {
16-
"@sveltejs/adapter-auto": "^2.1.0",
17-
"@sveltejs/kit": "^1.24.1",
18-
"svelte": "^4.2.0",
19-
"svelte-check": "^3.5.1",
15+
"@sveltejs/adapter-auto": "^2.1.1",
16+
"@sveltejs/kit": "^1.30.2",
17+
"svelte": "^4.2.8",
18+
"svelte-check": "^3.6.2",
2019
"tslib": "^2.6.2",
21-
"typescript": "^5.3.2",
22-
"vite": "^4.4.9"
20+
"typescript": "^5.3.3",
21+
"vite": "^5.0.8"
2322
}
2423
}

‎packages/openapi-fetch/package.json

+9-8
Original file line numberDiff line numberDiff line change
@@ -55,26 +55,27 @@
5555
"lint": "pnpm run lint:js",
5656
"lint:js": "eslint \"{src,test}/**/*.{js,ts}\"",
5757
"lint:prettier": "prettier --check \"{src,test}/**/*\"",
58-
"test": "pnpm run test:ts && npm run test:js",
58+
"generate-types": "cd ../openapi-typescript && pnpm run build && cd ../openapi-fetch ../openapi-typescript/bin/cli.js ./test/fixtures/api.yaml -o ./test/fixtures/v7-beta.test.ts && npx openapi-typescript ./test/fixtures/api.yaml -o ./test/fixtures/api.d.ts",
59+
"pretest": "pnpm run generate-types",
60+
"test": "run-p -s test:*",
5961
"test:js": "vitest run",
6062
"test:ts": "tsc --noEmit",
61-
"prepare": "openapi-typescript test/fixtures/api.yaml -o test/fixtures/api.d.ts",
62-
"prepublish": "pnpm run prepare && pnpm run build",
6363
"version": "pnpm run prepare && pnpm run build"
6464
},
6565
"dependencies": {
6666
"openapi-typescript-helpers": "^0.0.6"
6767
},
6868
"devDependencies": {
69-
"axios": "^1.6.0",
69+
"axios": "^1.6.2",
7070
"del-cli": "^5.1.0",
71-
"esbuild": "^0.19.5",
72-
"nanostores": "^0.9.4",
73-
"openapi-typescript": "^6.7.0",
71+
"esbuild": "^0.19.9",
72+
"nanostores": "^0.9.5",
73+
"npm-run-all": "^4.1.5",
74+
"openapi-typescript": "^6.7.2",
7475
"openapi-typescript-codegen": "^0.25.0",
7576
"openapi-typescript-fetch": "^1.1.3",
7677
"superagent": "^8.1.2",
77-
"typescript": "^5.3.2",
78+
"typescript": "^5.3.3",
7879
"vitest": "^0.34.6",
7980
"vitest-fetch-mock": "^0.2.2"
8081
}

‎packages/openapi-typescript-helpers/package.json

+2-3
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,9 @@
3333
"url": "https://github.com/drwpow/openapi-typescript/issues"
3434
},
3535
"scripts": {
36-
"build": "pnpm run build:clean && pnpm run build:js && pnpm run build:cjs",
36+
"build": "pnpm run build:clean && pnpm run build:js",
3737
"build:clean": "del dist",
38-
"build:js": "mkdir -p dist && cp index.js index.d.ts dist",
39-
"build:cjs": "mkdir -p dist/cjs && cp index.js dist/cjs/index.js && cp index.d.ts dist/cjs/index.d.cts",
38+
"build:js": "node ./scripts/build.js",
4039
"lint": "pnpm run lint:js",
4140
"lint:js": "eslint \"*.{js,ts}\"",
4241
"lint:prettier": "prettier --check \"{src,test}/**/*\"",

‎packages/openapi-typescript-helpers/scripts/build.js

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
/**
2+
* Build
3+
* Only copies files & makes folders, but works on Windows too
4+
*/
5+
import fs from "node:fs";
6+
7+
const cwd = new URL("../", import.meta.url);
8+
9+
fs.mkdirSync(new URL("./dist/cjs/", cwd), { recursive: true });
10+
11+
const files = [
12+
{
13+
in: new URL("./index.js", cwd),
14+
out: new URL("./dist/index.js", cwd),
15+
},
16+
{
17+
in: new URL("./index.d.ts", cwd),
18+
out: new URL("./dist/index.d.ts", cwd),
19+
},
20+
{
21+
in: new URL("./index.js", cwd),
22+
out: new URL("./dist/cjs/index.cjs", cwd),
23+
},
24+
{
25+
in: new URL("./index.d.ts", cwd),
26+
out: new URL("./dist/cjs/index.d.cts", cwd),
27+
},
28+
];
29+
30+
for (const f of files) {
31+
fs.copyFileSync(f.in, f.out);
32+
}

‎packages/openapi-typescript/package.json

+5-6
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
"lint": "run-p -s lint:*",
5151
"lint:js": "eslint \"{src,test}/**/*.{js,ts}\"",
5252
"lint:prettier": "prettier --check \"src/**/*\"",
53-
"prepare": "pnpm run build",
5453
"test": "run-p -s test:*",
5554
"test:examples": "tsc -p tsconfig.examples.json --noEmit",
5655
"test:js": "vitest run",
@@ -60,21 +59,21 @@
6059
"version": "pnpm run build"
6160
},
6261
"dependencies": {
63-
"@redocly/openapi-core": "^1.4.1",
62+
"@redocly/openapi-core": "^1.5.0",
6463
"ansi-colors": "^4.1.3",
6564
"supports-color": "^9.4.0",
66-
"typescript": "^5.3.2",
65+
"typescript": "^5.3.3",
6766
"yargs-parser": "^21.1.1"
6867
},
6968
"devDependencies": {
7069
"@types/degit": "^2.8.6",
7170
"@types/js-yaml": "^4.0.9",
72-
"@types/node": "^20.9.4",
71+
"@types/node": "^20.10.4",
7372
"degit": "^2.8.4",
7473
"del-cli": "^5.1.0",
75-
"esbuild": "^0.19.7",
74+
"esbuild": "^0.19.9",
7675
"execa": "^7.2.0",
77-
"vite-node": "^0.34.6",
76+
"vite-node": "^1.0.4",
7877
"vitest": "^0.34.6"
7978
}
8079
}

0 commit comments

Comments
 (0)