Skip to content

Commit

Permalink
Update 6.x deps (#1668)
Browse files Browse the repository at this point in the history
  • Loading branch information
drwpow committed May 19, 2024
1 parent 9a9a9ef commit 0e270bf
Show file tree
Hide file tree
Showing 14 changed files with 7,008 additions and 5,206 deletions.
2 changes: 1 addition & 1 deletion .changeset/config.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://unpkg.com/@changesets/config@2.3.0/schema.json",
"$schema": "https://unpkg.com/@changesets/config@3.0.0/schema.json",
"changelog": ["@changesets/changelog-github", { "repo": "drwpow/openapi-typescript" }],
"ignore": ["openapi-typescript-docs", "@example/*"],
"commit": false,
Expand Down
55 changes: 23 additions & 32 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,70 +11,61 @@ concurrency:
cancel-in-progress: true

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 20
- uses: pnpm/action-setup@v2
with:
version: latest
- run: pnpm i
- run: pnpm run build
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 20
- uses: pnpm/action-setup@v2
node-version: 22
- uses: pnpm/action-setup@v4
with:
version: latest
- run: pnpm i
run_install: true
- run: pnpm run lint
test-node-versions:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [18.x, 20.x]
node-version: [18.x, 20.x, 22.x]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
- uses: pnpm/action-setup@v2
- uses: pnpm/action-setup@v4
with:
version: latest
- run: pnpm i
run_install: true
- run: pnpm run build
- run: pnpm test
test-macos:
runs-on: macos-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 20
- uses: pnpm/action-setup@v2
node-version: 22
- uses: pnpm/action-setup@v4
with:
version: latest
- run: pnpm i
run_install: true
- run: pnpm run build
- run: pnpm test
env:
CI_ENV: macos
test-windows:
runs-on: windows-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 20
- uses: pnpm/action-setup@v2
node-version: 22
- uses: pnpm/action-setup@v4
with:
version: latest
- run: pnpm i
run_install: true
- run: pnpm run build
- run: pnpm test
env:
CI_ENV: windows
10 changes: 5 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ jobs:
changelog:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 20
- uses: pnpm/action-setup@v2
node-version: 22
- uses: pnpm/action-setup@v4
with:
version: latest
- run: pnpm i
run_install: true
- run: pnpm run build
- uses: changesets/action@v1
with:
Expand Down
36 changes: 18 additions & 18 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,32 +4,32 @@
"private": true,
"type": "module",
"scripts": {
"build": "pnpm run tokens && pnpm run update-contributors && astro build",
"dev": "pnpm run tokens && pnpm run update-contributors && astro dev",
"dev": "pnpm run tokens && astro dev",
"tokens": "co build",
"update-contributors": "node scripts/update-contributors.js"
},
"dependencies": {
"@algolia/client-search": "^4.19.1",
"@algolia/client-search": "^4.23.3",
"@astrojs/preact": "^2.2.2",
"@astrojs/react": "^2.2.2",
"@docsearch/css": "^3.5.1",
"@docsearch/react": "^3.5.1",
"@types/react": "^18.2.20",
"@types/react-dom": "^18.2.7",
"astro": "^2.10.9",
"preact": "^10.17.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"sass": "^1.65.1"
"@astrojs/react": "^2.3.2",
"@docsearch/css": "^3.6.0",
"@docsearch/react": "^3.6.0",
"@types/react": "^18.3.2",
"@types/react-dom": "^18.3.0",
"astro": "^2.10.15",
"preact": "^10.22.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"sass": "^1.77.2"
},
"devDependencies": {
"@astrojs/sitemap": "^2.0.2",
"@cobalt-ui/cli": "^1.4.1",
"@cobalt-ui/plugin-sass": "^1.2.3",
"@types/node": "^20.10.4",
"@cobalt-ui/cli": "^1.11.0",
"@cobalt-ui/plugin-css": "^1.7.3",
"@cobalt-ui/plugin-sass": "^1.8.0",
"@types/node": "^20.12.12",
"html-escaper": "^3.0.3",
"typescript": "^5.3.3",
"vite-plugin-sass-dts": "^1.3.9"
"typescript": "^5.4.5",
"vite-plugin-sass-dts": "^1.3.22"
}
}
33 changes: 12 additions & 21 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,32 +8,23 @@
"email": "drew@pow.rs"
},
"scripts": {
"build": "run-p -s build:*",
"build:openapi-typescript": "cd packages/openapi-typescript && pnpm run build",
"build:openapi-fetch": "cd packages/openapi-fetch && pnpm run build",
"lint": "run-p -s lint:*",
"lint:openapi-typescript": "cd packages/openapi-typescript && pnpm run lint",
"lint:openapi-typescript-helpers": "cd packages/openapi-typescript-helpers && pnpm run lint",
"lint:openapi-fetch": "cd packages/openapi-fetch && pnpm run lint",
"test": "pnpm run build && run-p -s test:*",
"test:openapi-typescript": "cd packages/openapi-typescript && pnpm test",
"test:openapi-typescript-helpers": "cd packages/openapi-typescript-helpers && pnpm test",
"test:openapi-fetch": "cd packages/openapi-fetch && pnpm test",
"build": "pnpm run --recursive build",
"lint": "pnpm run --recursive lint",
"test": "pnpm run --recursive test",
"version": "pnpm run build && changeset version && pnpm i"
},
"devDependencies": {
"@changesets/changelog-github": "^0.4.8",
"@changesets/cli": "^2.27.1",
"@typescript-eslint/eslint-plugin": "^6.14.0",
"@typescript-eslint/parser": "^6.14.0",
"@changesets/changelog-github": "^0.5.0",
"@changesets/cli": "^2.27.2",
"@typescript-eslint/eslint-plugin": "^7.9.0",
"@typescript-eslint/parser": "^7.9.0",
"del-cli": "^5.1.0",
"eslint": "^8.55.0",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-no-only-tests": "^3.1.0",
"eslint-plugin-prettier": "^5.0.1",
"eslint-plugin-vitest": "^0.2.8",
"npm-run-all": "^4.1.5",
"prettier": "^3.1.1",
"typescript": "^5.3.3"
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-vitest": "^0.4.1",
"prettier": "^3.2.5",
"typescript": "^5.4.5"
}
}
14 changes: 7 additions & 7 deletions packages/openapi-fetch/examples/nextjs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@
"dev": "next dev"
},
"dependencies": {
"next": "13.4.19",
"next": "14.2.3",
"openapi-fetch": "workspace:^",
"react": "18.2.0",
"react-dom": "18.2.0"
"react": "18.3.1",
"react-dom": "18.3.1"
},
"devDependencies": {
"@types/node": "20.10.4",
"@types/react": "18.2.20",
"@types/react-dom": "18.2.7",
"@types/node": "20.12.12",
"@types/react": "18.3.2",
"@types/react-dom": "18.3.0",
"openapi-typescript": "workspace:^",
"typescript": "5.3.3"
"typescript": "5.4.5"
}
}
12 changes: 6 additions & 6 deletions packages/openapi-fetch/examples/react-query/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
"dev": "vite dev"
},
"dependencies": {
"@tanstack/react-query": "^4.35.0",
"@tanstack/react-query": "^5.37.1",
"openapi-fetch": "workspace:^",
"openapi-typescript": "workspace:^",
"react": "^18.2.0",
"react-dom": "^18.2.0"
"react": "^18.3.1",
"react-dom": "^18.3.1"
},
"devDependencies": {
"@vitejs/plugin-react-swc": "^3.3.2",
"typescript": "^5.3.3",
"vite": "^5.0.8"
"@vitejs/plugin-react-swc": "^3.6.0",
"typescript": "^5.4.5",
"vite": "^5.2.11"
}
}
14 changes: 8 additions & 6 deletions packages/openapi-fetch/examples/sveltekit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,14 @@
"openapi-typescript": "workspace:^"
},
"devDependencies": {
"@sveltejs/adapter-auto": "^2.1.0",
"@sveltejs/kit": "^1.24.1",
"svelte": "^4.2.0",
"svelte-check": "^3.5.1",
"@sveltejs/adapter-auto": "^3.2.0",
"@sveltejs/kit": "^2.5.8",
"@sveltejs/vite-plugin-svelte": "^3.1.0",
"openapi-typescript": "workspace:^",
"svelte": "^4.2.17",
"svelte-check": "^3.7.1",
"tslib": "^2.6.2",
"typescript": "^5.3.3",
"vite": "^5.0.8"
"typescript": "^5.4.5",
"vite": "^5.2.11"
}
}
16 changes: 8 additions & 8 deletions packages/openapi-fetch/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,19 +62,19 @@
"version": "pnpm run prepare && pnpm run build"
},
"dependencies": {
"openapi-typescript-helpers": "^0.0.6"
"openapi-typescript-helpers": "workspace:^"
},
"devDependencies": {
"axios": "^1.6.2",
"axios": "^1.6.8",
"del-cli": "^5.1.0",
"esbuild": "^0.19.9",
"nanostores": "^0.9.5",
"esbuild": "^0.21.3",
"nanostores": "^0.10.3",
"openapi-typescript": "workspace:^",
"openapi-typescript-codegen": "^0.25.0",
"openapi-typescript-codegen": "^0.29.0",
"openapi-typescript-fetch": "^1.1.3",
"superagent": "^8.1.2",
"typescript": "^5.3.3",
"vitest": "^0.34.6",
"superagent": "^9.0.2",
"typescript": "^5.4.5",
"vitest": "^1.6.0",
"vitest-fetch-mock": "^0.2.2"
}
}
3 changes: 1 addition & 2 deletions packages/openapi-typescript-helpers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,9 @@
"scripts": {
"lint": "pnpm run lint:js",
"lint:js": "eslint \"*.{js,ts}\"",
"lint:prettier": "prettier --check \"{src,test}/**/*\"",
"test": "tsc --noEmit"
},
"devDependencies": {
"typescript": "^5.3.3"
"typescript": "^5.4.5"
}
}
21 changes: 10 additions & 11 deletions packages/openapi-typescript/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,16 @@
"url": "https://github.com/drwpow/openapi-typescript/issues"
},
"scripts": {
"build": "run-s -s build:*",
"build:clean": "del dist",
"build:esm": "tsc -p tsconfig.build.json",
"build": "pnpm run build:esm && pnpm run build:cjs",
"build:esm": "del dist && tsc -p tsconfig.build.json",
"build:cjs": "esbuild --bundle --platform=node --target=es2019 --outfile=dist/index.cjs --external:js-yaml --external:undici src/index.ts --footer:js=\"module.exports = module.exports.default;\"",
"dev": "tsc -p tsconfig.build.json --watch",
"download:schemas": "vite-node ./scripts/download-schemas.ts",
"format": "prettier --write \"src/**/*\"",
"lint": "run-p -s lint:*",
"lint": "pnpm run --parallel --filter=\"openapi-typescript\" \"/^lint:/\"",
"lint:js": "eslint \"{src,test}/**/*.{js,ts}\"",
"lint:prettier": "prettier --check \"src/**/*\"",
"test": "run-p -s test:*",
"test": "pnpm run --parallel --filter=\"openapi-typescript\" \"/^test:/\"",
"test:js": "vitest run",
"test:ts": "tsc --noEmit",
"update:examples": "pnpm run download:schemas && vite-node ./scripts/update-examples.ts",
Expand All @@ -62,19 +61,19 @@
"fast-glob": "^3.3.2",
"js-yaml": "^4.1.0",
"supports-color": "^9.4.0",
"undici": "^5.28.2",
"undici": "^5.28.4",
"yargs-parser": "^21.1.1"
},
"devDependencies": {
"@types/degit": "^2.8.6",
"@types/js-yaml": "^4.0.9",
"@types/node": "^20.10.4",
"@types/node": "^20.12.12",
"degit": "^2.8.4",
"del-cli": "^5.1.0",
"esbuild": "^0.19.9",
"esbuild": "^0.21.3",
"execa": "^7.2.0",
"vite": "^5.0.8",
"vite-node": "^1.0.4",
"vitest": "^0.34.6"
"vite": "^5.2.11",
"vite-node": "^1.6.0",
"vitest": "^1.6.0"
}
}
8 changes: 4 additions & 4 deletions packages/openapi-typescript/test/invalid.test.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { SpyInstance } from "vitest";
import type { MockInstance } from "vitest";
import openapiTS from "../dist/index.js";

describe("Invalid schemas", () => {
let consoleError: SpyInstance;
let procExit: SpyInstance;
let consoleError: MockInstance;
let procExit: MockInstance;

beforeEach(() => {
consoleError = vi.spyOn(console, "error").mockImplementation(() => {});
procExit = vi.spyOn(process, "exit").mockImplementation((() => {}) as any);
procExit = vi.spyOn(process, "exit").mockImplementation((() => {}) as any) as any;
});

afterAll(() => {
Expand Down
Loading

0 comments on commit 0e270bf

Please sign in to comment.