From 023eb6af340261e11db3f48e7cc7a8a648fad86a Mon Sep 17 00:00:00 2001
From: Jack Steam <teamsteamdev@gmail.com>
Date: Thu, 12 Mar 2020 14:22:36 -0500
Subject: [PATCH] Refactor file structure & build steps

---
 package.json                                           | 3 ++-
 src/add-elements.ts                                    | 2 +-
 src/createHandler.ts                                   | 4 ++--
 src/index.test.ts                                      | 4 ++--
 src/index.ts                                           | 2 +-
 jest-chrome-schema.json => src/jest-chrome-schema.json | 0
 jest-chrome.d.ts => src/jest-chrome.d.ts               | 2 +-
 7 files changed, 9 insertions(+), 8 deletions(-)
 rename jest-chrome-schema.json => src/jest-chrome-schema.json (100%)
 rename jest-chrome.d.ts => src/jest-chrome.d.ts (99%)

diff --git a/package.json b/package.json
index d19d992..b37f9fa 100644
--- a/package.json
+++ b/package.json
@@ -25,11 +25,12 @@
     "jest-chrome.d.ts"
   ],
   "scripts": {
-    "build": "run-p build:pro build:types build:copy",
+    "build": "run-s build:clean build:pro build:types build:copy",
     "build:copy": "copyfiles -f src/jest-chrome.d.ts types",
     "build:dev": "rollup -c --environment NODE_ENV:development",
     "build:pro": "rollup -c --environment NODE_ENV:production",
     "build:types": "tsc -p tsconfig.d.json",
+    "build:clean": "rm -rf lib types",
     "build:watch": "npm run build:dev -- -w",
     "release:beta": "git push && npm publish --tag beta",
     "release:full": "git push && npm publish",
diff --git a/src/add-elements.ts b/src/add-elements.ts
index 0f9cd33..dc0c2d4 100644
--- a/src/add-elements.ts
+++ b/src/add-elements.ts
@@ -1,5 +1,5 @@
 import { createEvent } from './create-event'
-import { Storage } from '../jest-chrome'
+import { Storage } from './jest-chrome'
 
 /**
  * Namespace member data format from jest-chrome-schema.json
diff --git a/src/createHandler.ts b/src/createHandler.ts
index 408bd31..e147e74 100644
--- a/src/createHandler.ts
+++ b/src/createHandler.ts
@@ -1,6 +1,6 @@
-import jestChromeSchema from '../jest-chrome-schema.json';
+import jestChromeSchema from './jest-chrome-schema.json';
 import { addEvent, addFunction, addProperty } from './add-elements';
-import { JestChrome } from '../jest-chrome';
+import { JestChrome } from './jest-chrome';
 
 export function createHandler(schema = jestChromeSchema as any): ProxyHandler<JestChrome> {
   return {
diff --git a/src/index.test.ts b/src/index.test.ts
index e1033a0..06c112d 100644
--- a/src/index.test.ts
+++ b/src/index.test.ts
@@ -1,5 +1,5 @@
 import { chrome } from '.'
-import { Storage, Runtime } from '../jest-chrome'
+import { Storage, Runtime } from './jest-chrome'
 import {
   CallableEvent,
   EventCallback,
@@ -9,7 +9,7 @@ import { readJSONSync } from 'fs-extra'
 import { resolve } from 'path'
 
 const chromeSchema = readJSONSync(
-  resolve(__dirname, '..', 'jest-chrome-schema.json'),
+  resolve(__dirname, 'jest-chrome-schema.json'),
 )
 
 afterEach(() => {
diff --git a/src/index.ts b/src/index.ts
index ff58b3d..9e0d7e8 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,4 +1,4 @@
-import { JestChrome } from '../jest-chrome'
+import { JestChrome } from './jest-chrome'
 import { createHandler } from './createHandler'
 
 export const chrome = new Proxy<JestChrome>(
diff --git a/jest-chrome-schema.json b/src/jest-chrome-schema.json
similarity index 100%
rename from jest-chrome-schema.json
rename to src/jest-chrome-schema.json
diff --git a/jest-chrome.d.ts b/src/jest-chrome.d.ts
similarity index 99%
rename from jest-chrome.d.ts
rename to src/jest-chrome.d.ts
index 4cd33d1..d428e99 100755
--- a/jest-chrome.d.ts
+++ b/src/jest-chrome.d.ts
@@ -1,5 +1,5 @@
 /* eslint-disable no-shadow-restricted-names */
-import { CallableEvent, EventCallback, MonotypeEventSelector } from './src/create-event'
+import { CallableEvent, EventCallback, MonotypeEventSelector } from './create-event'
 
 // Derived from @types/chrome:
 // Type definitions for Chrome extension development