chore(merge): merge from next

christianalfoni · christianalfoni · commit f678aede3841 · 2021-01-23T13:43:00.000+01:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -140,4 +140,4 @@
       "config": ".cz-config.js"
     }
   }
-}
+}
diff --git a/packages/node_modules/overmind-statechart/src/index.test.ts b/packages/node_modules/overmind-statechart/src/index.test.ts
@@ -1,4 +1,5 @@
-import { createOvermind, IContext } from 'overmind'
+import { IContext, createOvermind } from 'overmind'
+
 import { Statechart, statechart } from './'
 
 describe('Statecharts', () => {
diff --git a/packages/node_modules/overmind-statechart/src/index.ts b/packages/node_modules/overmind-statechart/src/index.ts
@@ -1,10 +1,10 @@
 import {
+  ContextFunction,
+  ENVIRONMENT,
   IConfiguration,
+  derived,
   filter,
   pipe,
-  derived,
-  ENVIRONMENT,
-  ContextFunction,
 } from 'overmind'
 
 const ACTIONS = 'ACTIONS'
diff --git a/packages/node_modules/overmind-svelte/src/index.ts b/packages/node_modules/overmind-svelte/src/index.ts
@@ -1,5 +1,5 @@
 import { ENVIRONMENT, EventType } from 'overmind'
-import { onMount, afterUpdate, onDestroy } from 'svelte'
+import { afterUpdate, onDestroy, onMount } from 'svelte'
 
 const IS_PRODUCTION = ENVIRONMENT === 'production'
 
diff --git a/packages/node_modules/overmind/src/index.ts b/packages/node_modules/overmind/src/index.ts
@@ -1,8 +1,8 @@
 import { IS_DERIVED_CONSTRUCTOR } from './derived'
 import * as internalTypes from './internalTypes'
+import { Overmind } from './Overmind'
 import { IConfiguration } from './types'
 import * as utils from './utils'
-import { Overmind } from './Overmind'
 
 export * from './types'
 export * from './operators'
diff --git a/packages/node_modules/overmind/src/internalTypes.ts b/packages/node_modules/overmind/src/internalTypes.ts
@@ -5,7 +5,7 @@ import {
   ITrackStateTree,
 } from 'proxy-state-tree'
 
-import { IAction, IOperator, IContext } from './types'
+import { IAction, IContext, IOperator } from './types'
 
 export type SubType<Base, Condition> = Pick<
   Base,
diff --git a/packages/node_modules/overmind/src/statemachine.test.ts b/packages/node_modules/overmind/src/statemachine.test.ts
@@ -185,7 +185,6 @@ describe('Statemachine', () => {
       actions: typeof actions
     }>
 
-
     const overmind = createOvermind(config, {devtools: false, strict: true, devEnv: 'test'})
     
     expect(() => overmind.actions.transition()).toThrow()
diff --git a/packages/node_modules/overmind/src/statemachine.ts b/packages/node_modules/overmind/src/statemachine.ts
@@ -1,5 +1,6 @@
 import isPlainObject from 'is-plain-obj'
 import { PATH, PROXY_TREE, VALUE } from 'proxy-state-tree'
+
 import { IState } from '.'
 
 type TState = {
diff --git a/packages/node_modules/proxy-state-tree/package.json b/packages/node_modules/proxy-state-tree/package.json
@@ -47,7 +47,7 @@
   "bundlesize": [
     {
       "path": "./dist/proxy-state-tree.min.js",
-      "maxSize": "3.3 kB"
+      "maxSize": "4 kB"
     }
   ]
 }
diff --git a/packages/node_modules/proxy-state-tree/src/Proxyfier.ts b/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
   }
diff --git a/packages/node_modules/proxy-state-tree/src/index.test.ts b/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', () => {
diff --git a/packages/node_modules/proxy-state-tree/src/index.ts b/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) {

Original file line number	Diff line number	Diff line change
`@@ -140,4 +140,4 @@`
`140`	`140`	`"config": ".cz-config.js"`
`141`	`141`	`}`
`142`	`142`	`}`
`143`		`-}`
	`143`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@`
`47`	`47`	`"bundlesize": [`
`48`	`48`	`{`
`49`	`49`	`"path": "./dist/proxy-state-tree.min.js",`
`50`		`- "maxSize": "3.3 kB"`
	`50`	`+ "maxSize": "4 kB"`
`51`	`51`	`}`
`52`	`52`	`]`
`53`	`53`	`}`