From aa2a05c4f4429ba3fbd006266c4edca703b12552 Mon Sep 17 00:00:00 2001
From: Zachary Belford <belfordz66@gmail.com>
Date: Sat, 1 Jun 2019 00:23:51 -0700
Subject: [PATCH] fix: build directory issues

---
 .circleci/config.yml |  4 ++--
 .gitignore           |  1 -
 examples/index.ts    |  2 +-
 package.json         | 12 ++++++------
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9c6f3410..ba17660c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -53,7 +53,7 @@ jobs:
       - run: npm run build
       - run:
           name: Authenticate with registry
-          command: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > ~/jade-service-runner/build/typescript/.npmrc
+          command: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > ~/jade-service-runner/build/generated-client/typescript/.npmrc
       - run: npx semantic-release
       - run: npm run publish
 
@@ -76,4 +76,4 @@ workflows:
       - release:
           filters: *filter-only-master
           requires:
-            - hold
\ No newline at end of file
+            - hold
diff --git a/.gitignore b/.gitignore
index b2587a37..1f4709e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,3 @@ services
 coverage
 build
 docs
-src/generated-client
diff --git a/examples/index.ts b/examples/index.ts
index 5c6a6e6d..62210159 100644
--- a/examples/index.ts
+++ b/examples/index.ts
@@ -1,4 +1,4 @@
-import ServiceRunner from "../src/generated-client/typescript/src";
+import ServiceRunner from "../build/generated-client/typescript";
 const client = new ServiceRunner({
   transport: {
     type: "http",
diff --git a/package.json b/package.json
index 6bd03452..2788e42d 100644
--- a/package.json
+++ b/package.json
@@ -43,16 +43,16 @@
     "typescript": "^3.4.5"
   },
   "scripts": {
-    "test": "npx jest",
     "build": "npm run build:typings && npm run build:client && npm run build:code && npm run build:docs",
-    "build:code": "npx tsc",
-    "build:typings": "npx open-rpc-typings --output-ts src/generated-types",
-    "build:client": "open-rpc-generator-client --ts-name=@etclabscore/jade-service-runner-client --rs-name=jade-service-runner-client -o src/generated-client",
+    "build:code": "tsc",
+    "build:typings": "open-rpc-typings --output-ts src/generated-types",
+    "build:client": "open-rpc-generator-client --ts-name=@etclabscore/jade-service-runner-client --rs-name=jade-service-runner-client -o build/generated-client",
     "build:docs": "typedoc",
     "publish": "npm run publish:typescript",
-    "publish:typescript": "cd src/generated-client/typescript && npm publish --access=public",
+    "publish:typescript": "cd build/generated-client/typescript && npm publish --access=public",
     "start": "npm run build && node build/src/cli/index.js",
     "start:client": "node build/client.js",
+    "test": "npm run test:lint && npm run test:unit",
     "test:debug": "node --inspect node_modules/.bin/jest --runInBand",
     "test:lint": "tslint -c tslint.json 'src/**/*.ts' --fix",
     "test:unit": "jest --coverage"
@@ -62,7 +62,7 @@
     "url": "git+https://github.com/etclabscore/jade-service-runner.git"
   },
   "author": "",
-  "license": "ISC",
+  "license": "Apache-2.0",
   "bugs": {
     "url": "https://github.com/etclabscore/jade-service-runner/issues"
   },