Skip to content

Commit

Permalink
Merge branch 'develop' into features/configurable-parser
Browse files Browse the repository at this point in the history
  • Loading branch information
mnaumanali94 authored Nov 12, 2024
2 parents 13d28d5 + 4182f1d commit 60a387a
Show file tree
Hide file tree
Showing 20 changed files with 119 additions and 91 deletions.
7 changes: 4 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ defaults:
only: /^v.*/
node-versions: &node-versions
- &node-maintenance-lts "16.20"
- &node-active-lts "18.20"
- &node-active-lts "18.18"
- &node-current "20.17"
pkg-cache-path: &pkg-cache-path /tmp/pkg-node-binaries
ldid-version: &ldid-version 2.1.5-procursus7 # https://github.com/ProcursusTeam/ldid
Expand Down Expand Up @@ -290,6 +290,7 @@ jobs:
test-windows:
executor:
name: windows/default
size: large
steps:
- checkout
- cached-dependencies:
Expand Down Expand Up @@ -406,13 +407,13 @@ jobs:

upload-artifacts:
docker:
- image: circleci/golang:1-stretch
- image: cimg/go:1.23
steps:
- attach_workspace:
at: /tmp/
- run:
name: "Download GitHub Release Utility"
command: go get github.com/tcnksm/ghr
command: go install github.com/tcnksm/ghr@latest
- run:
name: "Publish Release artifacts on GitHub"
command: ghr -t ${GH_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} ${CIRCLE_TAG} /tmp/binaries
Expand Down
7 changes: 5 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
},
"license": "Apache-2.0",
"engines": {
"node": "^12.20 || >= 14.13"
"node": "^16.20 || ^18.18 || >= 20.17"
},
"scripts": {
"preclean": "yarn workspaces foreach run preclean",
Expand Down Expand Up @@ -78,6 +78,9 @@
"@semantic-release/git"
]
},
"resolutions": {
"jsep": "1.4.0"
},
"devDependencies": {
"@commitlint/cli": "^14.1.0",
"@commitlint/config-conventional": "^12.1.4",
Expand Down Expand Up @@ -125,7 +128,7 @@
"semantic-release": "^19.0.5",
"ts-jest": "^29.2.5",
"ts-node": "^10.8.2",
"typescript": "^4.4.4"
"typescript": "4.4.4"
},
"lint-staged": {
"*.{ts,js}": [
Expand Down
7 changes: 7 additions & 0 deletions packages/cli/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
# @stoplight/spectral-cli [6.14.0](https://github.com/stoplightio/spectral/compare/@stoplight/spectral-cli-6.13.1...@stoplight/spectral-cli-6.14.0) (2024-11-12)


### Features

* **cli:** require new stoplight dependencies ([#2726](https://github.com/stoplightio/spectral/issues/2726)) ([8a736b5](https://github.com/stoplightio/spectral/commit/8a736b557a441e578c498df5af4cf5313c6dc2d5))

## @stoplight/spectral-cli [6.13.1](https://github.com/stoplightio/spectral/compare/@stoplight/spectral-cli-6.13.0...@stoplight/spectral-cli-6.13.1) (2024-09-21)


Expand Down
16 changes: 8 additions & 8 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"name": "@stoplight/spectral-cli",
"version": "6.13.1",
"version": "6.14.0",
"homepage": "https://github.com/stoplightio/spectral",
"bugs": "https://github.com/stoplightio/spectral/issues",
"author": "Stoplight <support@stoplight.io>",
"bin": {
"spectral": "./dist/index.js"
},
"engines": {
"node": "^12.20 || >= 14.13"
"node": "^16.20 || ^18.18 || >= 20.17"
},
"license": "Apache-2.0",
"main": "dist/index.js",
Expand Down Expand Up @@ -36,12 +36,12 @@
"dependencies": {
"@stoplight/json": "~3.21.0",
"@stoplight/path": "1.3.2",
"@stoplight/spectral-core": "^1.18.3",
"@stoplight/spectral-formatters": "^1.3.0",
"@stoplight/spectral-parsers": "^1.0.3",
"@stoplight/spectral-core": "^1.19.2",
"@stoplight/spectral-formatters": "^1.4.0",
"@stoplight/spectral-parsers": "^1.0.4",
"@stoplight/spectral-ref-resolver": "^1.0.4",
"@stoplight/spectral-ruleset-bundler": "^1.5.4",
"@stoplight/spectral-ruleset-migrator": "^1.9.6",
"@stoplight/spectral-ruleset-bundler": "^1.6.0",
"@stoplight/spectral-ruleset-migrator": "^1.11.0",
"@stoplight/spectral-rulesets": ">=1",
"@stoplight/spectral-runtime": "^1.1.2",
"@stoplight/types": "^13.6.0",
Expand All @@ -58,7 +58,7 @@
"@types/es-aggregate-error": "^1.0.2",
"@types/xml2js": "^0.4.9",
"@types/yargs": "^17.0.8",
"@yao-pkg/pkg": "^5.11.1",
"@yao-pkg/pkg": "5.11.0",
"es-aggregate-error": "^1.0.7",
"nock": "^13.5.4",
"xml2js": "^0.5.0"
Expand Down
7 changes: 7 additions & 0 deletions packages/core/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## @stoplight/spectral-core [1.19.2](https://github.com/stoplightio/spectral/compare/@stoplight/spectral-core-1.19.1...@stoplight/spectral-core-1.19.2) (2024-11-12)


### Bug Fixes

* **core:** require new formats version ([#2725](https://github.com/stoplightio/spectral/issues/2725)) ([8ec328f](https://github.com/stoplightio/spectral/commit/8ec328fe68e42519cea1d6afedc4eb309a2c121c))

## @stoplight/spectral-core [1.19.1](https://github.com/stoplightio/spectral/compare/@stoplight/spectral-core-1.19.0...@stoplight/spectral-core-1.19.1) (2024-09-13)


Expand Down
8 changes: 4 additions & 4 deletions packages/core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@stoplight/spectral-core",
"version": "1.19.1",
"version": "1.19.2",
"sideEffects": false,
"homepage": "https://github.com/stoplightio/spectral",
"bugs": "https://github.com/stoplightio/spectral/issues",
Expand Down Expand Up @@ -31,7 +31,7 @@
}
},
"engines": {
"node": "^12.20 || >= 14.13"
"node": "^16.20 || ^18.18 || >= 20.17"
},
"dependencies": {
"@stoplight/better-ajv-errors": "1.0.3",
Expand All @@ -53,11 +53,11 @@
"minimatch": "3.1.2",
"nimma": "0.2.3",
"pony-cause": "^1.0.0",
"simple-eval": "1.0.0",
"simple-eval": "1.0.1",
"tslib": "^2.3.0"
},
"devDependencies": {
"@stoplight/spectral-formats": "^1.7.0",
"@stoplight/spectral-formats": "^1.8.0",
"@stoplight/spectral-functions": "*",
"@stoplight/spectral-parsers": "*",
"@stoplight/yaml": "^4.2.2",
Expand Down
7 changes: 7 additions & 0 deletions packages/formats/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
# @stoplight/spectral-formats [1.8.0](https://github.com/stoplightio/spectral/compare/@stoplight/spectral-formats-1.7.0...@stoplight/spectral-formats-1.8.0) (2024-11-12)


### Features

* **rulesets:** add AsyncAPI v3 support ([#2697](https://github.com/stoplightio/spectral/issues/2697)) ([3d69be7](https://github.com/stoplightio/spectral/commit/3d69be7058e8f25f0697b69fd8317a2aefe313c1))

# @stoplight/spectral-formats [1.7.0](https://github.com/stoplightio/spectral/compare/@stoplight/spectral-formats-1.6.0...@stoplight/spectral-formats-1.7.0) (2024-09-12)


Expand Down
4 changes: 2 additions & 2 deletions packages/formats/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@stoplight/spectral-formats",
"version": "1.7.0",
"version": "1.8.0",
"sideEffects": false,
"homepage": "https://github.com/stoplightio/spectral",
"bugs": "https://github.com/stoplightio/spectral/issues",
Expand All @@ -16,7 +16,7 @@
],
"types": "dist/index.d.ts",
"engines": {
"node": ">=12"
"node": "^16.20 || ^18.18 || >= 20.17"
},
"dependencies": {
"@stoplight/json": "^3.17.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/formatters/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"bugs": "https://github.com/stoplightio/spectral/issues",
"author": "Stoplight <support@stoplight.io>",
"engines": {
"node": "^12.20 || >=14.13"
"node": "^16.20 || ^18.18 || >= 20.17"
},
"license": "Apache-2.0",
"files": [
Expand Down Expand Up @@ -50,7 +50,7 @@
},
"devDependencies": {
"ast-types": "^0.14.2",
"astring": "^1.8.4",
"astring": "^1.9.0",
"eol": "0.9.1",
"node-html-parser": "^4.1.5",
"xml2js": "^0.5.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/functions/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
],
"types": "dist/index.d.ts",
"engines": {
"node": ">=12"
"node": "^16.20 || ^18.18 || >= 20.17"
},
"dependencies": {
"@stoplight/better-ajv-errors": "1.0.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/parsers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"bugs": "https://github.com/stoplightio/spectral/issues",
"author": "Stoplight <support@stoplight.io>",
"engines": {
"node": "^12.20 || >=14.13"
"node": "^16.20 || ^18.18 || >= 20.17"
},
"license": "Apache-2.0",
"main": "dist/index.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/ref-resolver/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"bugs": "https://github.com/stoplightio/spectral/issues",
"author": "Stoplight <support@stoplight.io>",
"engines": {
"node": ">=12"
"node": "^16.20 || ^18.18 || >= 20.17"
},
"license": "Apache-2.0",
"main": "dist/index.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/ruleset-bundler/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"bugs": "https://github.com/stoplightio/spectral/issues",
"author": "Stoplight <support@stoplight.io>",
"engines": {
"node": "^12.20 || >= 14.13"
"node": "^16.20 || ^18.18 || >= 20.17"
},
"license": "Apache-2.0",
"main": "dist/index.js",
Expand Down
7 changes: 7 additions & 0 deletions packages/ruleset-migrator/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
# @stoplight/spectral-ruleset-migrator [1.11.0](https://github.com/stoplightio/spectral/compare/@stoplight/spectral-ruleset-migrator-1.10.0...@stoplight/spectral-ruleset-migrator-1.11.0) (2024-11-12)


### Features

* **rulesets:** add AsyncAPI v3 support ([#2697](https://github.com/stoplightio/spectral/issues/2697)) ([3d69be7](https://github.com/stoplightio/spectral/commit/3d69be7058e8f25f0697b69fd8317a2aefe313c1))

# @stoplight/spectral-ruleset-migrator [1.10.0](https://github.com/stoplightio/spectral/compare/@stoplight/spectral-ruleset-migrator-1.9.5...@stoplight/spectral-ruleset-migrator-1.10.0) (2024-09-12)


Expand Down
6 changes: 3 additions & 3 deletions packages/ruleset-migrator/package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "@stoplight/spectral-ruleset-migrator",
"version": "1.10.0",
"version": "1.11.0",
"homepage": "https://github.com/stoplightio/spectral",
"bugs": "https://github.com/stoplightio/spectral/issues",
"author": "Stoplight <support@stoplight.io>",
"engines": {
"node": ">=12"
"node": "^16.20 || ^18.18 || >= 20.17"
},
"license": "Apache-2.0",
"main": "dist/index.js",
Expand All @@ -31,7 +31,7 @@
"@types/node": "*",
"ajv": "^8.17.1",
"ast-types": "0.14.2",
"astring": "^1.7.5",
"astring": "^1.9.0",
"reserved": "0.1.2",
"tslib": "^2.3.1",
"validate-npm-package-name": "3.0.0"
Expand Down
12 changes: 12 additions & 0 deletions packages/rulesets/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
# @stoplight/spectral-rulesets [1.21.0](https://github.com/stoplightio/spectral/compare/@stoplight/spectral-rulesets-1.20.2...@stoplight/spectral-rulesets-1.21.0) (2024-11-12)


### Bug Fixes

* **rulesets:** always allow string examples in asyncapi schema ([#2625](https://github.com/stoplightio/spectral/issues/2625)) ([4e2f797](https://github.com/stoplightio/spectral/commit/4e2f7974b623afa51221d426f975e2592a14f963))


### Features

* **rulesets:** add AsyncAPI v3 support ([#2697](https://github.com/stoplightio/spectral/issues/2697)) ([3d69be7](https://github.com/stoplightio/spectral/commit/3d69be7058e8f25f0697b69fd8317a2aefe313c1))

## @stoplight/spectral-rulesets [1.20.2](https://github.com/stoplightio/spectral/compare/@stoplight/spectral-rulesets-1.20.1...@stoplight/spectral-rulesets-1.20.2) (2024-09-17)


Expand Down
4 changes: 2 additions & 2 deletions packages/rulesets/package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "@stoplight/spectral-rulesets",
"version": "1.20.2",
"version": "1.21.0",
"homepage": "https://github.com/stoplightio/spectral",
"bugs": "https://github.com/stoplightio/spectral/issues",
"author": "Stoplight <support@stoplight.io>",
"engines": {
"node": ">=12"
"node": "^16.20 || ^18.18 || >= 20.17"
},
"license": "Apache-2.0",
"main": "dist/index.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/runtime/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"bugs": "https://github.com/stoplightio/spectral/issues",
"author": "Stoplight <support@stoplight.io>",
"engines": {
"node": ">=12"
"node": "^16.20 || ^18.18 || >= 20.17"
},
"license": "Apache-2.0",
"main": "dist/index.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/runtime/src/reader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export async function readFile(name: string, opts: IReadOptions): Promise<string
timeout = setTimeout(() => {
controller.abort();
}, opts.timeout);
requestOpts.signal = controller.signal;
requestOpts.signal = controller.signal as AbortSignal;
}

response = await request(name, requestOpts);
Expand Down
Loading

0 comments on commit 60a387a

Please sign in to comment.