Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

wasm-diff-engine is now included in builds #515

Merged
merged 6 commits into from
Jan 15, 2021
Merged

wasm-diff-engine is now included in builds #515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
798c419
error handling
Jan 15, 2021
4d03007
fix link in navbar
Jan 15, 2021
a12409a
Merge pull request #514 from opticdev/change-promise-lifecycle
acunniffe Jan 15, 2021
c490c33
update .env.latest
Jan 15, 2021
778805c
fix excluded wasm builds from npm packs
Jan 15, 2021
f906969
move gitignore back to diff-wasm-engine
Jan 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .env.latest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
OPTIC_RUST_DIFF_ENGINE=true
REACT_APP_LEARN_API_MODE=true
REACT_APP_ENABLE_ANALYTICS=yes
OPTIC__CLI_SCRIPTS__SENTRY__ENABLED=yes
OPTIC__CLI_SERVER__SENTRY__ENABLED=yes
4 changes: 2 additions & 2 deletions workspaces/agent-cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@useoptic/agent-cli",
"version": "9.0.0",
"version": "9.0.2",
"author": "@useoptic",
"bin": {
"optic-agent": "./bin/run"
Expand All @@ -15,7 +15,7 @@
"@oclif/command": "^1",
"@oclif/config": "^1",
"@oclif/plugin-help": "^3",
"@useoptic/cli-shared": "9.0.0",
"@useoptic/cli-shared": "9.0.2",
"dotenv": "^8.2.0",
"jwt-decode": "^2.2.0",
"tslib": "^1",
Expand Down
2 changes: 1 addition & 1 deletion workspaces/analytics/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@useoptic/analytics",
"version": "9.0.0",
"version": "9.0.2",
"scripts": {
"ws:build": "tsc -b --verbose",
"ws:clean": "rm -rf build/*",
Expand Down
6 changes: 3 additions & 3 deletions workspaces/ci-cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@useoptic/ci-cli",
"version": "9.0.0",
"version": "9.0.2",
"author": "@useoptic",
"bin": {
"optic-ci": "./bin/run"
Expand All @@ -15,8 +15,8 @@
"@oclif/command": "^1",
"@oclif/config": "^1",
"@oclif/plugin-help": "^3",
"@useoptic/cli-config": "9.0.0",
"@useoptic/cli-shared": "9.0.0",
"@useoptic/cli-config": "9.0.2",
"@useoptic/cli-shared": "9.0.2",
"dotenv": "^8.2.0",
"jwt-decode": "^2.2.0",
"tslib": "^1",
Expand Down
8 changes: 4 additions & 4 deletions workspaces/cli-client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@useoptic/cli-client",
"version": "9.0.0",
"version": "9.0.2",
"scripts": {
"ws:build": "yarn run tsc -b --verbose",
"ws:clean": "rm -rf build/*",
Expand All @@ -14,9 +14,9 @@
"main": "build/index.js",
"types": "build/index.d.ts",
"dependencies": {
"@useoptic/analytics": "9.0.0",
"@useoptic/cli-config": "9.0.0",
"@useoptic/client-utilities": "9.0.0",
"@useoptic/analytics": "9.0.2",
"@useoptic/cli-config": "9.0.2",
"@useoptic/client-utilities": "9.0.2",
"bottleneck": "^2.19.5",
"cross-fetch": "^3.0.4"
},
Expand Down
2 changes: 1 addition & 1 deletion workspaces/cli-config/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@useoptic/cli-config",
"version": "9.0.0",
"version": "9.0.2",
"scripts": {
"ws:test": "jest",
"ws:build": "yarn run tsc -b --verbose",
Expand Down
6 changes: 3 additions & 3 deletions workspaces/cli-scripts/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@useoptic/cli-scripts",
"version": "9.0.0",
"version": "9.0.2",
"scripts": {
"ws:test": "echo scripts",
"ws:build": "yarn run tsc -b --verbose",
Expand All @@ -18,8 +18,8 @@
"@sentry/tracing": "^5.28.0",
"node-notifier": "^7.0.0",
"analytics-node": "^3.4.0-beta.1",
"@useoptic/cli-config": "9.0.0",
"@useoptic/cli-shared": "9.0.0"
"@useoptic/cli-config": "9.0.2",
"@useoptic/cli-shared": "9.0.2"
},
"devDependencies": {
"@types/node-notifier": "^6.0.1"
Expand Down
16 changes: 8 additions & 8 deletions workspaces/cli-server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@useoptic/cli-server",
"version": "9.0.0",
"version": "9.0.2",
"scripts": {
"ws:build": "yarn run tsc -b --verbose",
"ws:clean": "rm -rf build/*",
Expand All @@ -16,13 +16,13 @@
"dependencies": {
"@sentry/node": "^5.28.0",
"@sentry/tracing": "^5.28.0",
"@useoptic/analytics": "9.0.0",
"@useoptic/cli-client": "9.0.0",
"@useoptic/cli-config": "9.0.0",
"@useoptic/cli-scripts": "9.0.0",
"@useoptic/cli-shared": "9.0.0",
"@useoptic/diff-engine-wasm": "9.0.0",
"@useoptic/ui": "9.0.0",
"@useoptic/analytics": "9.0.2",
"@useoptic/cli-client": "9.0.2",
"@useoptic/cli-config": "9.0.2",
"@useoptic/cli-scripts": "9.0.2",
"@useoptic/cli-shared": "9.0.2",
"@useoptic/diff-engine-wasm": "9.0.2",
"@useoptic/ui": "9.0.2",
"analytics-node": "^3.4.0-beta.2",
"avsc": "^5.4.18",
"body-parser": "^1.19.0",
Expand Down
12 changes: 6 additions & 6 deletions workspaces/cli-shared/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@useoptic/cli-shared",
"version": "9.0.0",
"version": "9.0.2",
"scripts": {
"test": "cd test && tap tests",
"ws:build": "yarn run tsc -b --verbose",
Expand All @@ -16,11 +16,11 @@
"types": "build/index.d.ts",
"dependencies": {
"@oclif/command": "^1.6.1",
"@useoptic/cli-client": "9.0.0",
"@useoptic/cli-config": "9.0.0",
"@useoptic/client-utilities": "9.0.0",
"@useoptic/diff-engine": "9.0.0",
"@useoptic/diff-engine-wasm": "9.0.0",
"@useoptic/cli-client": "9.0.2",
"@useoptic/cli-config": "9.0.2",
"@useoptic/client-utilities": "9.0.2",
"@useoptic/diff-engine": "9.0.2",
"@useoptic/diff-engine-wasm": "9.0.2",
"@useoptic/domain": "10.0.64",
"@useoptic/domain-types": "10.0.64",
"@useoptic/domain-utilities": "10.0.64",
Expand Down
2 changes: 1 addition & 1 deletion workspaces/client-utilities/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@useoptic/client-utilities",
"version": "9.0.0",
"version": "9.0.2",
"scripts": {
"ws:build": "yarn run tsc -b --verbose",
"ws:clean": "rm -rf build/*",
Expand Down
2 changes: 1 addition & 1 deletion workspaces/diff-engine-wasm/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
lib
.nyc_output
.nyc_output
3 changes: 2 additions & 1 deletion workspaces/diff-engine-wasm/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
{
"name": "@useoptic/diff-engine-wasm",
"version": "9.0.0",
"version": "9.0.2",
"scripts": {
"build:lib": "tsc -b --verbose",
"build:node": "cd engine && wasm-pack build --target nodejs --out-dir build --out-name index",
"build:browser": "cd engine && wasm-pack build --target bundler --out-dir browser --out-name index",
"test": "cd test && tap tests",
"ws:build": "npm run build:node && npm run build:browser && npm run build:lib",
"ws:clean": "rm -rf engine/build && rm -rf engine/browser",
"prepack": "rm -rf engine/build/.gitignore",
"ws:test": "echo No workspace tests specified for diff-engine-wasm"
},
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion workspaces/diff-engine/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@useoptic/diff-engine",
"version": "9.0.0",
"version": "9.0.2",
"scripts": {
"postinstall": "node scripts/install",
"preuninstall": "node scripts/uninstall",
Expand Down
14 changes: 7 additions & 7 deletions workspaces/local-cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@useoptic/cli",
"description": "The Optic CLI",
"version": "9.0.0",
"version": "9.0.2",
"author": "@useoptic",
"bin": {
"api": "./bin/run"
Expand All @@ -18,12 +18,12 @@
"@oclif/config": "^1",
"@oclif/plugin-help": "^2",
"cli-table3": "^0.6.0",
"@useoptic/analytics": "9.0.0",
"@useoptic/cli-client": "9.0.0",
"@useoptic/cli-config": "9.0.0",
"@useoptic/cli-scripts": "9.0.0",
"@useoptic/cli-server": "9.0.0",
"@useoptic/cli-shared": "9.0.0",
"@useoptic/analytics": "9.0.2",
"@useoptic/cli-client": "9.0.2",
"@useoptic/cli-config": "9.0.2",
"@useoptic/cli-scripts": "9.0.2",
"@useoptic/cli-server": "9.0.2",
"@useoptic/cli-shared": "9.0.2",
"@useoptic/domain": "10.0.64",
"analytics-node": "^3.4.0-beta.1",
"cli-ux": "^5.4.1",
Expand Down
2 changes: 1 addition & 1 deletion workspaces/saas-types/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@useoptic/saas-types",
"description": "interfaces and types for Optic SaaS surface area",
"version": "9.0.0",
"version": "9.0.2",
"main": "build/index.js",
"files": [
"build"
Expand Down
6 changes: 3 additions & 3 deletions workspaces/snapshot-tests/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@useoptic/snapshot-tests",
"version": "9.0.0",
"version": "9.0.2",
"scripts": {
"ws:build": "yarn run tsc -b --verbose",
"ws:clean": "rm -rf build/*",
Expand All @@ -15,8 +15,8 @@
"@useoptic/domain": "10.0.64",
"@useoptic/domain-types": "10.0.64",
"@useoptic/domain-utilities": "10.0.64",
"@useoptic/client-utilities": "9.0.0",
"@useoptic/cli-shared": "9.0.0",
"@useoptic/client-utilities": "9.0.2",
"@useoptic/cli-shared": "9.0.2",
"dataloader": "^2.0.0",
"eventsource": "^1.0.7",
"fs-extra": "^9.0.0"
Expand Down
10 changes: 5 additions & 5 deletions workspaces/ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@useoptic/ui",
"version": "9.0.0",
"version": "9.0.2",
"files": [
"build",
"index.js",
Expand All @@ -15,10 +15,10 @@
"@material-ui/core": "^4.9.7",
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "^4.0.0-alpha.46",
"@useoptic/cli-shared": "9.0.0",
"@useoptic/cli-client": "9.0.0",
"@useoptic/analytics": "9.0.0",
"@useoptic/diff-engine-wasm": "9.0.0",
"@useoptic/cli-shared": "9.0.2",
"@useoptic/cli-client": "9.0.2",
"@useoptic/analytics": "9.0.2",
"@useoptic/diff-engine-wasm": "9.0.2",
"@useoptic/domain": "10.0.64",
"@useoptic/domain-utilities": "10.0.64",
"bottleneck": "^2.19.5",
Expand Down
16 changes: 5 additions & 11 deletions workspaces/ui/src/components/navigation/Navbar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,17 +66,11 @@ export default function Navbar(props) {

const menuItems = useMemo(
() => [
...(!process.env.REACT_APP_DONT_SHOW_DIFF
? [
{
name: 'Review Diff',
icon: <ChangeHistoryIcon className={classes.iconStyles} />,
link: process.env.REACT_APP_DIFF_REVIEW_PAGE
? routerPaths.reviewRoot
: routerPaths.diffsRoot,
},
]
: []),
{
name: 'Review Diff',
icon: <ChangeHistoryIcon className={classes.iconStyles} />,
link: routerPaths.reviewRoot
},
{
name: 'Documentation',
icon: <DescriptionIcon className={classes.iconStyles} />,
Expand Down
4 changes: 2 additions & 2 deletions workspaces/ui/src/engine/async-work/apply-changes-machine.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ export const newApplyChangesMachine = (
pathId,
method,
services.rfcBaseState.domainIdGenerator
);
).catch(() => null);
});

promise.finally(() => {
Expand All @@ -182,7 +182,7 @@ export const newApplyChangesMachine = (
});
});

return await promise.catch(() => null);
return await promise
});
}
);
Expand Down