Merge branch 'release/2.0.0rc1'

.node-persist/storage/0c83f57c786a0b4a39efab23731c7ebc

@@ -0,0 +1 @@
+{"key":"email","value":"[email protected]"}

.node-persist/storage/c4755f318c6fdb260c47f26d0a24f0ca

@@ -0,0 +1 @@
+{"key":"firstRun","value":true}

build.sbt

@@ -1,13 +1,10 @@
 import sbtbuildinfo.BuildInfoPlugin.autoImport.buildInfoPackage
 
-import scala.io.Source
-import scala.util.Try
-
 name := "optic-core"
 
 organization := "com.opticdev"
 
-val appVersion = "1.0.5"
+val appVersion = Constants.cliVersion
 
 version := appVersion
 
@@ -31,8 +28,9 @@ lazy val common = (project in file("common")).
  .settings(
    libraryDependencies ++= Dependencies.commonDependencies,
    buildInfoKeys := Seq[BuildInfoKey](
-     "opticMDVersion" -> Constants.opticMDVersion,
+     "skillsSDKVersion" -> Constants.supportedSdks.last,
      "currentOpticVersion" -> appVersion,
+     "supportedSdks" -> Constants.supportedSdks,
    ),
    buildInfoPackage := "com.opticdev.common"
  )
@@ -43,7 +41,7 @@ lazy val sdk = (project in file("sdk")).
   .settings(
     libraryDependencies ++= Dependencies.sdkDependencies,
     buildInfoKeys := Seq[BuildInfoKey](
-      "opticMDVersion" -> Constants.opticMDVersion,
+      "skillsSDKVersion" -> Constants.supportedSdks.last,
     ),
     buildInfoPackage := "com.opticdev.sdk"
   )
@@ -55,19 +53,6 @@ lazy val opm = (project in file("opm")).
  .dependsOn(common)
  .dependsOn(sdk)
 
-lazy val cli = (project in file("cli")).
-  settings(commonSettings: _*)
-  .settings(
-    libraryDependencies ++= Dependencies.cliDependencies,
-    buildInfoKeys := Seq[BuildInfoKey](
-      "opticVersion" -> appVersion,
-    ),
-    buildInfoPackage := "com.opticdev.cli"
-  )
-  .dependsOn(common)
-  .dependsOn(core)
-  .dependsOn(core % "compile->compile;test->test")
-
 lazy val core = (project in file("core")).
   settings(commonSettings: _*)
   .settings(libraryDependencies ++= Dependencies.coreDependencies)
@@ -83,7 +68,6 @@ lazy val server = (project in file("server")).
  .dependsOn(sdk)
  .dependsOn(common)
  .dependsOn(core)
- .dependsOn(cli)
  .dependsOn(core % "compile->compile;test->test")
  .settings(
    test in assembly := {},

build.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+sbt project clean compile assembly
+output='server/target/scala-2.12/server-assembly.jar'
+
+echo $output
+
+dest='cli/jars/server-assembly.jar'
+
+echo $dest
+
+yes | cp -rf $output $dest

cli/.babelrc

@@ -0,0 +1,9 @@
+{
+  "presets": [
+    "@babel/preset-env",
+    "@babel/preset-react"
+  ],
+  "plugins": [
+
+  ]
+}

cli/.gitignore

@@ -0,0 +1,7 @@
+node_modules
+lib/
+.idea
+jars/*
+*.log
+.node-persist/
+package-lock.json

cli/.npmignore

@@ -0,0 +1 @@
+.node-persist

cli/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2018 Optic
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

cli/README.md

@@ -0,0 +1,4 @@
+Still SUPER EARLY
+Test using `npm run build && node lib/interactive/Interactive.js`
+
+See [spec here](Optic-CLI-Spec.pdf)

cli/features.json

@@ -0,0 +1,5 @@
+{
+  "json-form": {
+    "default-input-is-last-value": false
+  }
+}

cli/package.json

@@ -0,0 +1,77 @@
+{
+  "name": "optic-cli",
+  "version": "2.0.0rc1",
+  "description": "",
+  "main": "./lib/Cli.js",
+  "scripts": {
+    "build": "rm -rf ./lib && babel src --out-dir lib",
+    "build-server": "cd ../ && sh ./build.sh",
+    "test": "npm run build && find ./lib -name '*.test.js' | xargs mocha -R spec",
+    "interactive-test": "npm run build && node ./lib/interactive/Interactive.js interactive-test-protocol",
+    "jre-install": "npm run build && node ./lib/jre/install.js",
+    "cli-test": "npm run build && node ./lib/Cli.js",
+    "first-run-test": "npm run build && node lib/Cli.js force-first-time"
+  },
+  "bin": {
+    "optic": "lib/Cli.js"
+  },
+  "license": "MIT",
+  "devDependencies": {
+    "@babel/cli": "^7.1.0",
+    "@babel/core": "^7.1.0",
+    "@babel/preset-env": "^7.1.0",
+    "@babel/preset-react": "^7.0.0",
+    "mocha": "^3.4.2"
+  },
+  "dependencies": {
+    "ajv": "^5.2.3",
+    "app-root-path": "^2.1.0",
+    "assert": "^1.4.1",
+    "blessed": "^0.1.81",
+    "body-parser": "^1.18.3",
+    "cli-autocomplete": "^0.4.1",
+    "clipboardy": "^1.2.3",
+    "cmdify": "^0.0.4",
+    "colors": "^1.3.2",
+    "commander": "^2.18.0",
+    "deep-freeze": "^0.0.1",
+    "deepcopy": "^1.0.0",
+    "email-validator": "^2.0.4",
+    "equals": "^1.0.5",
+    "express": "^4.16.4",
+    "fs": "0.0.1-security",
+    "fuzzy": "^0.1.3",
+    "hashcode": "1.0.3",
+    "inquirer": "^6.2.0",
+    "kill-port": "^1.3.2",
+    "lodash.isnumber": "^3.0.3",
+    "lodash.isobject": "^3.0.2",
+    "lodash.sortby": "^4.7.0",
+    "mixpanel": "^0.9.2",
+    "nice-try": "^1.0.5",
+    "node-persist": "^3.0.1",
+    "object-path": "^0.11.4",
+    "opn": "^5.4.0",
+    "optic-editor-sdk": "^0.3.0",
+    "os": "^0.1.1",
+    "platform": "^1.3.5",
+    "progress": "^1.1.8",
+    "regenerator-runtime": "^0.12.1",
+    "request": "^2.75.0",
+    "rmdir": "^1.2.0",
+    "tar-fs": "^1.13.2",
+    "update-notifier": "^2.5.0"
+  },
+  "files": [
+    "jars/server-assembly.jar",
+    "resources/Smoketest.class",
+    "resources/Smoketest.java",
+    "react-diff-view/*"
+  ],
+  "jreConfig": {
+    "major_version": "8",
+    "update_number": "191",
+    "build_number": "12",
+    "hash": "2787e4a523244c269598db4e85c51e0c"
+  }
+}

cli/react-diff-view/asset-manifest.json

@@ -0,0 +1,14 @@
+{
+  "main.css": "/static/css/main.00d31530.chunk.css",
+  "main.js": "/static/js/main.bbe92b14.chunk.js",
+  "main.js.map": "/static/js/main.bbe92b14.chunk.js.map",
+  "static/js/1.2d9cc5d7.chunk.js": "/static/js/1.2d9cc5d7.chunk.js",
+  "static/js/1.2d9cc5d7.chunk.js.map": "/static/js/1.2d9cc5d7.chunk.js.map",
+  "runtime~main.js": "/static/js/runtime~main.229c360f.js",
+  "runtime~main.js.map": "/static/js/runtime~main.229c360f.js.map",
+  "static/media/logo.svg": "/static/media/logo.5d5d9eef.svg",
+  "static/css/main.00d31530.chunk.css.map": "/static/css/main.00d31530.chunk.css.map",
+  "index.html": "/index.html",
+  "precache-manifest.9a45d7536728328acf203f96b0cbab56.js": "/precache-manifest.9a45d7536728328acf203f96b0cbab56.js",
+  "service-worker.js": "/service-worker.js"
+}

cli/react-diff-view/index.html

@@ -0,0 +1 @@
+<!doctype html><html lang="en"><head><meta charset="utf-8"><link rel="shortcut icon" href="/favicon.ico"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><link rel="manifest" href="/manifest.json"><title>React App</title><link href="/static/css/main.00d31530.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(l){function e(e){for(var r,t,n=e[0],o=e[1],u=e[2],f=0,i=[];f<n.length;f++)t=n[f],p[t]&&i.push(p[t][0]),p[t]=0;for(r in o)Object.prototype.hasOwnProperty.call(o,r)&&(l[r]=o[r]);for(s&&s(e);i.length;)i.shift()();return c.push.apply(c,u||[]),a()}function a(){for(var e,r=0;r<c.length;r++){for(var t=c[r],n=!0,o=1;o<t.length;o++){var u=t[o];0!==p[u]&&(n=!1)}n&&(c.splice(r--,1),e=f(f.s=t[0]))}return e}var t={},p={2:0},c=[];function f(e){if(t[e])return t[e].exports;var r=t[e]={i:e,l:!1,exports:{}};return l[e].call(r.exports,r,r.exports,f),r.l=!0,r.exports}f.m=l,f.c=t,f.d=function(e,r,t){f.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},f.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},f.t=function(r,e){if(1&e&&(r=f(r)),8&e)return r;if(4&e&&"object"==typeof r&&r&&r.__esModule)return r;var t=Object.create(null);if(f.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:r}),2&e&&"string"!=typeof r)for(var n in r)f.d(t,n,function(e){return r[e]}.bind(null,n));return t},f.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(r,"a",r),r},f.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},f.p="/";var r=window.webpackJsonp=window.webpackJsonp||[],n=r.push.bind(r);r.push=e,r=r.slice();for(var o=0;o<r.length;o++)e(r[o]);var s=n;a()}([])</script><script src="/static/js/1.2d9cc5d7.chunk.js"></script><script src="/static/js/main.bbe92b14.chunk.js"></script></body></html>

cli/react-diff-view/manifest.json

@@ -0,0 +1,15 @@
+{
+  "short_name": "React App",
+  "name": "Create React App Sample",
+  "icons": [
+    {
+      "src": "favicon.ico",
+      "sizes": "64x64 32x32 24x24 16x16",
+      "type": "image/x-icon"
+    }
+  ],
+  "start_url": ".",
+  "display": "standalone",
+  "theme_color": "#000000",
+  "background_color": "#ffffff"
+}

cli/react-diff-view/precache-manifest.9a45d7536728328acf203f96b0cbab56.js

@@ -0,0 +1,26 @@
+self.__precacheManifest = [
+  {
+    "revision": "5d5d9eefa31e5e13a6610d9fa7a283bb",
+    "url": "/static/media/logo.5d5d9eef.svg"
+  },
+  {
+    "revision": "229c360febb4351a89df",
+    "url": "/static/js/runtime~main.229c360f.js"
+  },
+  {
+    "revision": "bbe92b14c2861aead78f",
+    "url": "/static/js/main.bbe92b14.chunk.js"
+  },
+  {
+    "revision": "2d9cc5d70a099ff2e93e",
+    "url": "/static/js/1.2d9cc5d7.chunk.js"
+  },
+  {
+    "revision": "bbe92b14c2861aead78f",
+    "url": "/static/css/main.00d31530.chunk.css"
+  },
+  {
+    "revision": "d13d8c41e8338eafe39dfdb257357ee3",
+    "url": "/index.html"
+  }
+];

cli/react-diff-view/service-worker.js

@@ -0,0 +1,34 @@
+/**
+ * Welcome to your Workbox-powered service worker!
+ *
+ * You'll need to register this file in your web app and you should
+ * disable HTTP caching for this file too.
+ * See https://goo.gl/nhQhGp
+ *
+ * The rest of the code is auto-generated. Please don't update this file
+ * directly; instead, make changes to your Workbox build configuration
+ * and re-run your build process.
+ * See https://goo.gl/2aRDsh
+ */
+
+importScripts("https://storage.googleapis.com/workbox-cdn/releases/3.6.2/workbox-sw.js");
+
+importScripts(
+  "/precache-manifest.9a45d7536728328acf203f96b0cbab56.js"
+);
+
+workbox.clientsClaim();
+
+/**
+ * The workboxSW.precacheAndRoute() method efficiently caches and responds to
+ * requests for URLs in the manifest.
+ * See https://goo.gl/S9QRab
+ */
+self.__precacheManifest = [].concat(self.__precacheManifest || []);
+workbox.precaching.suppressWarnings();
+workbox.precaching.precacheAndRoute(self.__precacheManifest, {});
+
+workbox.routing.registerNavigationRoute("/index.html", {
+
+  blacklist: [/^\/_/,/\/[^\/]+\.[^\/]+$/],
+});