From 7476505ee796314830b1b45c4d4d8b0196ee7d78 Mon Sep 17 00:00:00 2001
From: Linden <65407488+thelindat@users.noreply.github.com>
Date: Sun, 18 Sep 2022 08:11:25 +1000
Subject: [PATCH] refactor(package): import shared and declare cache in
 server/client

---
 package/client/index.ts                | 6 +-----
 package/client/resource/cache/index.ts | 6 ++++++
 package/server/index.ts                | 5 ++---
 package/server/resource/cache/index.ts | 3 +++
 package/shared/index.ts                | 3 ---
 5 files changed, 12 insertions(+), 11 deletions(-)
 create mode 100644 package/client/resource/cache/index.ts
 create mode 100644 package/server/resource/cache/index.ts

diff --git a/package/client/index.ts b/package/client/index.ts
index 93f2f00..85fa865 100644
--- a/package/client/index.ts
+++ b/package/client/index.ts
@@ -1,9 +1,5 @@
 import * as lib from './resource';
-import { cache, onCache } from '../shared/resource';
 
-cache.playerId = PlayerId();
-cache.serverId = GetPlayerServerId(cache.playerId);
-
-export { cache, onCache };
 export * from './resource';
+export * from '../shared';
 export default lib;
diff --git a/package/client/resource/cache/index.ts b/package/client/resource/cache/index.ts
new file mode 100644
index 0000000..577e9c7
--- /dev/null
+++ b/package/client/resource/cache/index.ts
@@ -0,0 +1,6 @@
+import { cache, onCache } from '../../../shared';
+
+cache.playerId = PlayerId();
+cache.serverId = GetPlayerServerId(cache.playerId);
+
+export { cache, onCache };
diff --git a/package/server/index.ts b/package/server/index.ts
index b3310fd..85fa865 100644
--- a/package/server/index.ts
+++ b/package/server/index.ts
@@ -1,6 +1,5 @@
 import * as lib from './resource';
-import { cache, onCache } from '../shared/resource';
-export * from './resource';
 
+export * from './resource';
+export * from '../shared';
 export default lib;
-export { cache, onCache };
diff --git a/package/server/resource/cache/index.ts b/package/server/resource/cache/index.ts
new file mode 100644
index 0000000..0c74954
--- /dev/null
+++ b/package/server/resource/cache/index.ts
@@ -0,0 +1,3 @@
+import { cache, onCache } from '../../../shared';
+
+export { cache, onCache };
diff --git a/package/shared/index.ts b/package/shared/index.ts
index 26e5aee..c1cb5de 100644
--- a/package/shared/index.ts
+++ b/package/shared/index.ts
@@ -1,4 +1 @@
-import * as lib from './resource';
 export * from './resource';
-
-export default lib;