Minor Changes

NoteSpaceTeam · Jun 26, 2024 · 84e3cf5 · 84e3cf5
1 parent 8e7618e
commit 84e3cf5
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 82 deletions.
diff --git a/code/client/src/pwa/pwa-config.ts b/code/client/src/pwa/pwa-config.ts
@@ -1,16 +1,10 @@
-//import { injectConfig } from './inject-config';
 import { manifestConfig } from '@pwa/manifest-config';
 import { VitePWAOptions } from 'vite-plugin-pwa';
-import { workboxConfig } from '@pwa/workbox-config';
 
 export const pwaConfig: Partial<VitePWAOptions> = {
   mode: 'development',
   strategies: 'generateSW',
-  //injectRegister: false,
-  //injectManifest: injectConfig,
-  //registerType: 'prompt',
   manifest: manifestConfig,
-  workbox: workboxConfig,
   devOptions: {
     enabled: true,
     navigateFallback: 'index.html',

diff --git a/code/client/src/pwa/service-worker.ts b/code/client/src/pwa/service-worker.ts
diff --git a/code/client/src/pwa/workbox-config.ts b/code/client/src/pwa/workbox-config.ts
diff --git a/code/server/test/commits/commits.test.ts → code/server/test/documents/commits.test.ts b/code/server/test/commits/commits.test.ts → code/server/test/documents/commits.test.ts
diff --git a/code/server/test/resources/resources.test.ts b/code/server/test/resources/resources.test.ts
@@ -1,7 +1,7 @@
 import { TestDatabases } from '../../src/databases/TestDatabases';
 import { Services } from '../../src/services/Services';
 import { ResourceType } from '@notespace/shared/src/workspace/types/resource';
-import { excludeRoot } from '../workspaces/utils';
+import { excludeRoot } from '../utils';
 
 let services: Services;
 

diff --git a/code/server/test/users/authentication.test.ts b/code/server/test/users/authentication.test.ts
diff --git a/code/server/test/utils.ts b/code/server/test/utils.ts
@@ -1,6 +1,6 @@
 import { getRandomId } from '../src/services/utils';
 import { Services } from '../src/services/Services';
-import { ResourceType } from '@notespace/shared/src/workspace/types/resource';
+import { Resource, ResourceType } from '@notespace/shared/src/workspace/types/resource';
 import { InsertOperation } from '@notespace/shared/src/document/types/operations';
 import { Author } from '@notespace/shared/src/document/types/commits';
 
@@ -36,3 +36,7 @@ export async function createTestCommit(services: Services) {
 
   return { wid, id, author, commitId, operation };
 }
+
+export function excludeRoot(wid: string, resources: Resource[]): Resource[] {
+  return resources.filter(r => r.id != wid);
+}
diff --git a/code/server/test/workspaces/tree.test.ts b/code/server/test/workspaces/tree.test.ts
@@ -1,7 +1,7 @@
 import { TestDatabases } from '../../src/databases/TestDatabases';
 import { Services } from '../../src/services/Services';
 import { ResourceType } from '@notespace/shared/src/workspace/types/resource';
-import { excludeRoot } from './utils';
+import { excludeRoot } from '../utils';
 
 let services: Services;
 

diff --git a/code/server/test/workspaces/utils.ts b/code/server/test/workspaces/utils.ts