Merge pull request #515 from opticdev/develop

wasm-diff-engine is now included in builds
opticdev · Jan 15, 2021 · c566903 · c566903
2 parents 54cc317 + f906969
commit c566903
Show file tree

Hide file tree

Showing 19 changed files with 58 additions and 61 deletions.
diff --git a/.env.latest b/.env.latest
@@ -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
diff --git a/workspaces/agent-cli/package.json b/workspaces/agent-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@useoptic/agent-cli",
-  "version": "9.0.0",
+  "version": "9.0.2",
   "author": "@useoptic",
   "bin": {
     "optic-agent": "./bin/run"
@@ -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",

diff --git a/workspaces/analytics/package.json b/workspaces/analytics/package.json
@@ -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/*",

diff --git a/workspaces/ci-cli/package.json b/workspaces/ci-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@useoptic/ci-cli",
-  "version": "9.0.0",
+  "version": "9.0.2",
   "author": "@useoptic",
   "bin": {
     "optic-ci": "./bin/run"
@@ -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",

diff --git a/workspaces/cli-client/package.json b/workspaces/cli-client/package.json
@@ -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/*",
@@ -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"
   },

diff --git a/workspaces/cli-config/package.json b/workspaces/cli-config/package.json
@@ -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",

diff --git a/workspaces/cli-scripts/package.json b/workspaces/cli-scripts/package.json
@@ -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",
@@ -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"

diff --git a/workspaces/cli-server/package.json b/workspaces/cli-server/package.json
@@ -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/*",
@@ -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",

diff --git a/workspaces/cli-shared/package.json b/workspaces/cli-shared/package.json
@@ -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",
@@ -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",

diff --git a/workspaces/client-utilities/package.json b/workspaces/client-utilities/package.json
@@ -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/*",

diff --git a/workspaces/diff-engine-wasm/.gitignore b/workspaces/diff-engine-wasm/.gitignore
@@ -1,2 +1,2 @@
 lib
-.nyc_output
+.nyc_output
diff --git a/workspaces/diff-engine-wasm/package.json b/workspaces/diff-engine-wasm/package.json
@@ -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": {

diff --git a/workspaces/diff-engine/package.json b/workspaces/diff-engine/package.json
@@ -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",

diff --git a/workspaces/local-cli/package.json b/workspaces/local-cli/package.json
@@ -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"
@@ -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",

diff --git a/workspaces/saas-types/package.json b/workspaces/saas-types/package.json
@@ -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"

diff --git a/workspaces/snapshot-tests/package.json b/workspaces/snapshot-tests/package.json
@@ -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/*",
@@ -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"

diff --git a/workspaces/ui/package.json b/workspaces/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@useoptic/ui",
-  "version": "9.0.0",
+  "version": "9.0.2",
   "files": [
     "build",
     "index.js",
@@ -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",

diff --git a/workspaces/ui/src/components/navigation/Navbar.js b/workspaces/ui/src/components/navigation/Navbar.js
@@ -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} />,

diff --git a/workspaces/ui/src/engine/async-work/apply-changes-machine.ts b/workspaces/ui/src/engine/async-work/apply-changes-machine.ts
@@ -171,7 +171,7 @@ export const newApplyChangesMachine = (
                       pathId,
                       method,
                       services.rfcBaseState.domainIdGenerator
-                    );
+                    ).catch(() => null);
                   });
 
                   promise.finally(() => {
@@ -182,7 +182,7 @@ export const newApplyChangesMachine = (
                     });
                   });
 
-                  return await promise.catch(() => null);
+                  return await promise
                 });
               }
             );