Skip to content

Commit 52c7ce2

Browse files
committed
Merge branch 'upstream_master'
* upstream_master: lerna repair, remove deprecated command udpate lerna version, update node version 5.3.1 (stoplightio#2368) remove faker types not in use remove package-lock.json
2 parents 0018b62 + 59de042 commit 52c7ce2

File tree

10 files changed

+1195
-19233
lines changed

10 files changed

+1195
-19233
lines changed

.circleci/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ version: 2.1
22
executors:
33
docker-node:
44
docker:
5-
- image: circleci/node:16
5+
- image: cimg/node:16.20.2
66
docker-harness:
77
docker:
8-
- image: circleci/node:16
8+
- image: cimg/node:16.20.2
99
- image: kennethreitz/httpbin
1010
name: httpbin.org
1111
macos:
@@ -82,7 +82,7 @@ jobs:
8282
- run: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc
8383
- run:
8484
name: Publish
85-
command: yarn lerna publish from-git --create-release=github --yes --no-verify-access
85+
command: yarn lerna publish from-git --create-release=github --yes
8686
- run:
8787
name: Create CLI binaries
8888
command: npx pkg --out-path ./cli-binaries ./packages/cli/

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
88

99
# Unreleased
1010

11+
# 5.3.1 (2023.08.25)
12+
13+
- fixed issue with validateOutput() when schema contains internal reference. [#2363](https://github.com/stoplightio/prism/pull/2363) - thanks @mtjandra for your contribution!
14+
1115
# 5.3.0 (2023.08.17)
1216

1317
- added new cli parameter to control the json schema faker fillProperties setting universally. [#2355](https://github.com/stoplightio/prism/pull/2355)

lerna.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"packages": ["packages/*"],
33
"npmClient": "yarn",
4-
"useWorkspaces": true,
5-
"version": "5.3.0",
6-
"independent": false
4+
"version": "5.3.1",
5+
"independent": false,
6+
"$schema": "node_modules/lerna/schemas/lerna-schema.json"
77
}

0 commit comments

Comments
 (0)