fix(overmind): improve ssr bug fix

Author: christianalfoni

packages/node_modules/proxy-state-tree/src/Proxyfier.ts

@@ -53,8 +53,10 @@ const shouldProxy = (value: any) => {
 export class Proxifier {
   CACHED_PROXY = Symbol('CACHED_PROXY')
   delimiter: string
+  ssr: boolean
   constructor(private tree: TTree) {
     this.delimiter = tree.master.options.delimiter
+    this.ssr = Boolean(tree.master.options.ssr)
   }
   private concat(path, prop) {
     return path ? path + this.delimiter + prop : prop
@@ -141,7 +143,7 @@ export class Proxifier {
     )
   }
   private createArrayProxy(value, path) {
-    if (this.isProxyCached(value, path)) {
+    if (!this.ssr && this.isProxyCached(value, path)) {
       return value[this.CACHED_PROXY]
     }
 
@@ -234,16 +236,18 @@ export class Proxifier {
       },
     })
 
-    Object.defineProperty(value, this.CACHED_PROXY, {
-      value: proxy,
-      configurable: true,
-    })
+    if (!this.ssr) {
+      Object.defineProperty(value, this.CACHED_PROXY, {
+        value: proxy,
+        configurable: true,
+      })
+    }
 
     return proxy
   }
 
   private createObjectProxy(object, path) {
-    if (this.isProxyCached(object, path)) {
+    if (!this.ssr && this.isProxyCached(object, path)) {
       return object[this.CACHED_PROXY]
     }
 
@@ -386,10 +390,12 @@ export class Proxifier {
       },
     })
 
-    Object.defineProperty(object, this.CACHED_PROXY, {
-      value: proxy,
-      configurable: true,
-    })
+    if (!this.ssr) {
+      Object.defineProperty(object, this.CACHED_PROXY, {
+        value: proxy,
+        configurable: true,
+      })
+    }
 
     return proxy
   }

packages/node_modules/proxy-state-tree/src/index.test.ts

@@ -16,13 +16,23 @@ describe('TrackStateTree', () => {
       tree.getTrackStateTree().track(() => {}).state[IS_PROXY]
     ).toBeTruthy()
   })
-  test('should not create proxies when SSR', () => {
-    const state = {}
+  test('should not cache proxies in SSR', () => {
+    const state = {
+      foo: {},
+    }
     const tree = new ProxyStateTree(state, {
       ssr: true,
     })
 
-    expect(tree.getTrackStateTree().track(() => {}).state[IS_PROXY]).toBeFalsy()
+    const trackStateTree = tree.getTrackStateTree()
+    trackStateTree.track(() => {
+      trackStateTree.state.foo
+    })
+
+    expect(
+      // @ts-ignore
+      trackStateTree.state.foo[trackStateTree.proxifier.CACHED_PROXY]
+    ).toBeFalsy()
   })
 
   test('should not create nested proxies when initialized', () => {

packages/node_modules/proxy-state-tree/src/index.ts

@@ -73,16 +73,12 @@ export class ProxyStateTree<T extends object> implements IProxyStateTree<T> {
   private createTrackStateProxifier() {
     const trackStateTree = new TrackStateTree(this)
 
-    if (this.options.ssr) {
-      this.state = this.sourceState
-    } else {
-      this.proxifier = trackStateTree.proxifier = new Proxifier(trackStateTree)
+    this.proxifier = trackStateTree.proxifier = new Proxifier(trackStateTree)
 
-      this.state = trackStateTree.state = this.proxifier.proxify(
-        this.sourceState,
-        ''
-      )
-    }
+    this.state = trackStateTree.state = this.proxifier.proxify(
+      this.sourceState,
+      ''
+    )
   }
   getMutationTree(): IMutationTree<T> {
     if (!this.options.devmode) {