Revert "feat: separate browser storage"

This reverts commit 2cbc31c.

.eslintrc.json

@@ -22,11 +22,6 @@
     },
     "plugins": ["react", "@typescript-eslint"],
     "rules": {
-        "no-restricted-imports": ["error", {
-            "name": "jotai/utils",
-            "importNames": ["atomWithStorage"],
-            "message": "Please use atomWithStorage from 'src/store/utils' instead."
-        }],
         "react/prop-types": "off",
         "react/react-in-jsx-scope": "off",
         "@typescript-eslint/explicit-function-return-type": "off",

src/hooks/useFeatureFlags/atom.ts

@@ -1,4 +1,4 @@
-import { atomWithStorage } from 'src/store/utils';
+import { atomWithStorage } from 'jotai/utils';
 import defaultConfig, {
     FEATURE_FLAG_KEY_STORAGE,
     FeatureFlag,

src/services/storage/browser.ts

@@ -1,4 +1,3 @@
-import connectConfig from 'connect-config';
 import { BaseStorage, IStorage } from '.';
 
 const store: IStorage = {
@@ -23,9 +22,6 @@ export class BrowserStorage<
     T extends Record<string, unknown> = Record<string, unknown>,
 > extends BaseStorage<T> {
     constructor(namespace: string) {
-        super(
-            store as IStorage<T>,
-            `${connectConfig.routerBasename}:${namespace}`,
-        );
+        super(store as IStorage<T>, namespace);
     }
 }

src/store/index.ts

@@ -1,5 +1,5 @@
 import { atom } from 'jotai';
-import { atomWithStorage } from 'src/store/utils';
+import { atomWithStorage } from 'jotai/utils';
 
 export const sidebarCollapsedAtom = atomWithStorage('sidebar-collapsed', false);
 export const sidebarDisableHoverStyles = atom(false);

src/store/utils.ts

@@ -1,52 +1,31 @@
-import connectConfig from 'connect-config';
-// eslint-disable-next-line no-restricted-imports
-import { atomWithStorage as _atomWithStorage } from 'jotai/utils';
-import type { SyncStorage } from 'jotai/vanilla/utils/atomWithStorage';
-
-const namespace = connectConfig.routerBasename;
-
-export const atomWithStorage = <T>(
-    key: string,
-    initialValue: T,
-    storage?: SyncStorage<T>,
-    options?: {
-        getOnInit?: boolean;
-    },
-) =>
-    _atomWithStorage<T>(
-        `${namespace}:${key}`,
-        initialValue,
-        storage ? storage : undefined,
-        options,
-    );
+import { atomWithStorage } from 'jotai/utils';
 
 export const atomWithStorageCallback = <T>(
     key: string,
     initialValue: T,
-    callback: (value: T) => void,
+    callback: (value: T) => void
 ) =>
-    _atomWithStorage<T>(key, initialValue, {
+    atomWithStorage<T>(key, initialValue, {
         getItem(key, initialValue) {
-            const value = localStorage.getItem(`${namespace}:${key}`);
+            const value = localStorage.getItem(key);
             return value ? (JSON.parse(value) as T) : initialValue;
         },
         setItem(key, value) {
-            localStorage.setItem(`${namespace}:${key}`, JSON.stringify(value));
+            localStorage.setItem(key, JSON.stringify(value));
             callback(value);
         },
         removeItem(key) {
-            localStorage.removeItem(`${namespace}:${key}`);
+            localStorage.removeItem(key);
         },
         subscribe(key, callback) {
-            if (typeof window.addEventListener === 'undefined') {
+            if (
+                typeof window?.addEventListener === 'undefined'
+            ) {
                 return () => null;
             }
 
             function listener(e: StorageEvent) {
-                if (
-                    e.storageArea === localStorage &&
-                    e.key === `${namespace}:${key}`
-                ) {
+                if (e.storageArea === localStorage && e.key === key) {
                     callback((e.newValue ?? '') as T);
                 }
             }

src/utils/browser-document-drive.ts

@@ -6,7 +6,7 @@ import { documentModels } from 'src/store/document-model';
 
 export const BrowserDocumentDriveServer = new DocumentDriveServer(
     documentModels,
-    new BrowserStorage(connectConfig.routerBasename),
+    new BrowserStorage(),
 );
 
 BrowserDocumentDriveServer.initialize()