diff --git a/sourceme.sh b/sourceme.sh index 6656e89db7..f90be37f0f 100755 --- a/sourceme.sh +++ b/sourceme.sh @@ -57,20 +57,15 @@ optic_build() { optic_workspace_build ) } + optic_build_with_linked_core() { ( set -o errexit cd "$OPTIC_SRC_DIR" - - yarn link @useoptic/domain - yarn link @useoptic/domain-types - yarn link @useoptic/domain-utilities - - yarn install - optic_workspace_clean + yarn workspaces run ws:linkDomain + yarn install optic_workspace_build - ) } diff --git a/workspaces/agent-cli/package.json b/workspaces/agent-cli/package.json index 5718ccf593..548ac3f6b2 100644 --- a/workspaces/agent-cli/package.json +++ b/workspaces/agent-cli/package.json @@ -1,6 +1,6 @@ { "name": "@useoptic/agent-cli", - "version": "8.2.4", + "version": "8.2.5", "author": "@useoptic", "bin": { "optic-agent": "./bin/run" @@ -15,7 +15,7 @@ "@oclif/command": "^1", "@oclif/config": "^1", "@oclif/plugin-help": "^3", - "@useoptic/cli-shared": "8.2.4", + "@useoptic/cli-shared": "8.2.5", "dotenv": "^8.2.0", "jwt-decode": "^2.2.0", "tslib": "^1", @@ -67,6 +67,7 @@ "version": "oclif-dev readme && git add README.md", "ws:build": "tsc -b --verbose", "ws:clean": "rm -rf lib", + "ws:linkDomain": "yarn link @useoptic/domain @useoptic/domain-types @useoptic/domain-utilities", "ws:test": "echo skipping tests" }, "types": "lib/index.d.ts" diff --git a/workspaces/ci-cli/package.json b/workspaces/ci-cli/package.json index 7249ed3035..7322babd1b 100644 --- a/workspaces/ci-cli/package.json +++ b/workspaces/ci-cli/package.json @@ -1,6 +1,6 @@ { "name": "@useoptic/ci-cli", - "version": "8.2.4", + "version": "8.2.5", "author": "@useoptic", "bin": { "optic-ci": "./bin/run" @@ -15,8 +15,8 @@ "@oclif/command": "^1", "@oclif/config": "^1", "@oclif/plugin-help": "^3", - "@useoptic/cli-config": "8.2.4", - "@useoptic/cli-shared": "8.2.4", + "@useoptic/cli-config": "8.2.5", + "@useoptic/cli-shared": "8.2.5", "dotenv": "^8.2.0", "jwt-decode": "^2.2.0", "tslib": "^1", @@ -68,6 +68,7 @@ "version": "oclif-dev readme && git add README.md", "ws:build": "tsc -b --verbose", "ws:clean": "rm -rf lib", + "ws:linkDomain": "yarn link @useoptic/domain @useoptic/domain-types @useoptic/domain-utilities", "ws:test": "echo skipping tests" }, "types": "lib/index.d.ts" diff --git a/workspaces/cli-client/package.json b/workspaces/cli-client/package.json index 3b38cba900..b01a190e23 100644 --- a/workspaces/cli-client/package.json +++ b/workspaces/cli-client/package.json @@ -1,10 +1,11 @@ { "name": "@useoptic/cli-client", - "version": "8.2.4", + "version": "8.2.5", "scripts": { "ws:build": "yarn run tsc -b --verbose", "ws:clean": "rm -rf build/*", - "ws:test": "echo cli-client" + "ws:test": "echo cli-client", + "ws:linkDomain": "yarn link @useoptic/domain @useoptic/domain-types @useoptic/domain-utilities" }, "repository": { "type": "git", @@ -14,8 +15,8 @@ "main": "build/index.js", "types": "build/index.d.ts", "dependencies": { - "@useoptic/cli-config": "8.2.4", - "@useoptic/client-utilities": "8.2.4", + "@useoptic/cli-config": "8.2.5", + "@useoptic/client-utilities": "8.2.5", "bottleneck": "^2.19.5", "cross-fetch": "^3.0.4" }, diff --git a/workspaces/cli-config/package.json b/workspaces/cli-config/package.json index f810c286f8..fded018b57 100644 --- a/workspaces/cli-config/package.json +++ b/workspaces/cli-config/package.json @@ -1,10 +1,11 @@ { "name": "@useoptic/cli-config", - "version": "8.2.4", + "version": "8.2.5", "scripts": { "ws:test": "echo config", "ws:build": "yarn run tsc -b --verbose", - "ws:clean": "rm -rf build/*" + "ws:clean": "rm -rf build/*", + "ws:linkDomain": "yarn link @useoptic/domain @useoptic/domain-types @useoptic/domain-utilities" }, "repository": { "type": "git", diff --git a/workspaces/cli-scripts/package.json b/workspaces/cli-scripts/package.json index 29287ded1c..6d742fe0b2 100644 --- a/workspaces/cli-scripts/package.json +++ b/workspaces/cli-scripts/package.json @@ -1,10 +1,11 @@ { "name": "@useoptic/cli-scripts", - "version": "8.2.4", + "version": "8.2.5", "scripts": { "ws:test": "echo scripts", "ws:build": "yarn run tsc -b --verbose", - "ws:clean": "rm -rf build/*" + "ws:clean": "rm -rf build/*", + "ws:linkDomain": "yarn link @useoptic/domain @useoptic/domain-types @useoptic/domain-utilities" }, "repository": { "type": "git", @@ -16,7 +17,7 @@ "dependencies": { "node-notifier": "^7.0.0", "analytics-node": "^3.4.0-beta.1", - "@useoptic/cli-shared": "8.2.4" + "@useoptic/cli-shared": "8.2.5" }, "devDependencies": { "@types/node-notifier": "^6.0.1" diff --git a/workspaces/cli-server/package.json b/workspaces/cli-server/package.json index 9f8bfa3c2d..43e61af0bc 100644 --- a/workspaces/cli-server/package.json +++ b/workspaces/cli-server/package.json @@ -1,10 +1,11 @@ { "name": "@useoptic/cli-server", - "version": "8.2.4", + "version": "8.2.5", "scripts": { "ws:build": "yarn run tsc -b --verbose", "ws:clean": "rm -rf build/*", - "ws:test": "echo cli-server" + "ws:test": "echo cli-server", + "ws:linkDomain": "yarn link @useoptic/domain @useoptic/domain-types @useoptic/domain-utilities" }, "repository": { "type": "git", @@ -14,11 +15,11 @@ "main": "build/index.js", "types": "build/index.d.ts", "dependencies": { - "@useoptic/cli-client": "8.2.4", - "@useoptic/cli-config": "8.2.4", - "@useoptic/cli-scripts": "8.2.4", - "@useoptic/cli-shared": "8.2.4", - "@useoptic/ui": "8.2.4", + "@useoptic/cli-client": "8.2.5", + "@useoptic/cli-config": "8.2.5", + "@useoptic/cli-scripts": "8.2.5", + "@useoptic/cli-shared": "8.2.5", + "@useoptic/ui": "8.2.5", "avsc": "^5.4.18", "body-parser": "^1.19.0", "cors": "^2.8.5", diff --git a/workspaces/cli-shared/package.json b/workspaces/cli-shared/package.json index ea54e0ff93..ed2471eab7 100644 --- a/workspaces/cli-shared/package.json +++ b/workspaces/cli-shared/package.json @@ -1,10 +1,11 @@ { "name": "@useoptic/cli-shared", - "version": "8.2.4", + "version": "8.2.5", "scripts": { "ws:build": "yarn run tsc -b --verbose", "ws:clean": "rm -rf build/*", - "ws:test": "echo cli-shared" + "ws:test": "echo cli-shared", + "ws:linkDomain": "yarn link @useoptic/domain @useoptic/domain-types @useoptic/domain-utilities" }, "repository": { "type": "git", @@ -15,12 +16,12 @@ "types": "build/index.d.ts", "dependencies": { "@oclif/command": "^1.6.1", - "@useoptic/cli-client": "8.2.4", - "@useoptic/cli-config": "8.2.4", - "@useoptic/client-utilities": "8.2.4", - "@useoptic/domain": "8.3.0", - "@useoptic/domain-types": "8.3.0", - "@useoptic/domain-utilities": "8.3.0", + "@useoptic/cli-client": "8.2.5", + "@useoptic/cli-config": "8.2.5", + "@useoptic/client-utilities": "8.2.5", + "@useoptic/domain": "8.3.1", + "@useoptic/domain-types": "8.3.1", + "@useoptic/domain-utilities": "8.3.1", "avsc": "^5.4.21", "proper-lockfile": "^4.1.1", "bottleneck": "^2.19.5", diff --git a/workspaces/client-utilities/package.json b/workspaces/client-utilities/package.json index 14c0131a3a..bf0c8a4a33 100644 --- a/workspaces/client-utilities/package.json +++ b/workspaces/client-utilities/package.json @@ -1,10 +1,11 @@ { "name": "@useoptic/client-utilities", - "version": "8.2.4", + "version": "8.2.5", "scripts": { "ws:build": "yarn run tsc -b --verbose", "ws:clean": "rm -rf build/*", - "ws:test": "echo client-utilities" + "ws:test": "echo client-utilities", + "ws:linkDomain": "yarn link @useoptic/domain @useoptic/domain-types @useoptic/domain-utilities" }, "repository": { "type": "git", diff --git a/workspaces/local-cli/package.json b/workspaces/local-cli/package.json index 2e1591a54a..a31b606ac8 100644 --- a/workspaces/local-cli/package.json +++ b/workspaces/local-cli/package.json @@ -1,7 +1,7 @@ { "name": "@useoptic/cli", "description": "The Optic CLI", - "version": "8.2.4", + "version": "8.2.5", "author": "@useoptic", "bin": { "api": "./bin/run" @@ -16,12 +16,12 @@ "@oclif/command": "^1", "@oclif/config": "^1", "@oclif/plugin-help": "^2", - "@useoptic/cli-client": "8.2.4", - "@useoptic/cli-config": "8.2.4", - "@useoptic/cli-scripts": "8.2.4", - "@useoptic/cli-server": "8.2.4", - "@useoptic/cli-shared": "8.2.4", - "@useoptic/domain": "8.3.0", + "@useoptic/cli-client": "8.2.5", + "@useoptic/cli-config": "8.2.5", + "@useoptic/cli-scripts": "8.2.5", + "@useoptic/cli-server": "8.2.5", + "@useoptic/cli-shared": "8.2.5", + "@useoptic/domain": "8.3.1", "analytics-node": "^3.4.0-beta.1", "cli-ux": "^5.4.1", "colors": "^1.4.0", @@ -89,6 +89,7 @@ "ws:build": "tsc -b --verbose", "ws:clean": "rm -rf lib/*", "ws:test": "echo local-cli", + "ws:linkDomain": "yarn link @useoptic/domain @useoptic/domain-types @useoptic/domain-utilities", "postinstall": "api daemon:stop || exit 0" }, "types": "lib/index.d.ts" diff --git a/workspaces/saas-types/package.json b/workspaces/saas-types/package.json index 564dd1d5d8..4c57836c5d 100644 --- a/workspaces/saas-types/package.json +++ b/workspaces/saas-types/package.json @@ -1,14 +1,15 @@ { "name": "@useoptic/saas-types", "description": "interfaces and types for Optic SaaS surface area", - "version": "8.2.4", + "version": "8.2.5", "main": "build/index.js", "files": [ "build" ], "scripts": { "ws:build": "tsc -b --verbose", - "ws:clean": "rm -rf build/*" + "ws:clean": "rm -rf build/*", + "ws:linkDomain": "yarn link @useoptic/domain @useoptic/domain-types @useoptic/domain-utilities" }, "dependencies": {}, "devDependencies": {} diff --git a/workspaces/snapshot-tests/package.json b/workspaces/snapshot-tests/package.json index 40dc377f6f..d80fb5d3fc 100644 --- a/workspaces/snapshot-tests/package.json +++ b/workspaces/snapshot-tests/package.json @@ -1,10 +1,11 @@ { "name": "@useoptic/snapshot-tests", - "version": "8.2.4", + "version": "8.2.5", "scripts": { "ws:build": "yarn run tsc -b --verbose", "ws:clean": "rm -rf build/*", - "ws:test": "node build/index.js" + "ws:test": "node build/index.js", + "ws:linkDomain": "yarn link @useoptic/domain @useoptic/domain-types @useoptic/domain-utilities" }, "repository": { "type": "git", @@ -12,9 +13,9 @@ "directory": "workspaces/snapshot-tests" }, "dependencies": { - "@useoptic/domain-types": "8.3.0", - "@useoptic/domain": "8.3.0", - "@useoptic/domain-utilities": "8.3.0", + "@useoptic/domain-types": "8.3.1", + "@useoptic/domain": "8.3.1", + "@useoptic/domain-utilities": "8.3.1", "dataloader": "^2.0.0", "fs-extra": "^9.0.0" }, diff --git a/workspaces/ui/package.json b/workspaces/ui/package.json index 894a71cab3..bf06808b57 100644 --- a/workspaces/ui/package.json +++ b/workspaces/ui/package.json @@ -1,6 +1,6 @@ { "name": "@useoptic/ui", - "version": "8.2.4", + "version": "8.2.5", "files": [ "build", "index.js", @@ -15,9 +15,9 @@ "@material-ui/core": "^4.9.7", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "^4.0.0-alpha.46", - "@useoptic/cli-client": "8.2.4", - "@useoptic/domain": "8.3.0", - "@useoptic/domain-utilities": "8.3.0", + "@useoptic/cli-client": "8.2.5", + "@useoptic/domain": "8.3.1", + "@useoptic/domain-utilities": "8.3.1", "bottleneck": "^2.19.5", "camelcase": "^5.2.0", "classnames": "^2.2.6", @@ -62,6 +62,7 @@ "ws:build": "echo building ui", "ws:clean": "rm -rf build/*", "ws:test": "echo ui", + "ws:linkDomain": "yarn link @useoptic/domain @useoptic/domain-types @useoptic/domain-utilities", "prepare": "CI='' yarn run build-local" }, "eslintConfig": { diff --git a/workspaces/ui/src/components/diff/v2/DiffCopy.js b/workspaces/ui/src/components/diff/v2/DiffCopy.js new file mode 100644 index 0000000000..7f3a9b1aff --- /dev/null +++ b/workspaces/ui/src/components/diff/v2/DiffCopy.js @@ -0,0 +1,48 @@ +import React from 'react'; +import { makeStyles } from '@material-ui/core/styles'; +import { mapScala } from '@useoptic/domain'; +import { UpdatedBlue, UpdatedBlueBackground } from '../../../theme'; + +export function DiffCopy(props) { + const classes = useStyles(); + + const copy = props.copy; + const fontSize = props.fontSize || 13; + + const components = mapScala(copy)((i) => { + if (i.style === 'normal') { + return ( + + {i.value}{' '} + + ); + } else if (i.style === 'code') { + return ( + + + {i.value} + {' '} + + ); + } + }); + + return