Skip to content

Commit b8767bc

Browse files
committed
Fix Immutable refs during parsing
kolodny/jsan/issues/19
1 parent 028e69e commit b8767bc

File tree

3 files changed

+15
-9
lines changed

3 files changed

+15
-9
lines changed

Diff for: package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
"webpack": "^3.1.0"
7373
},
7474
"dependencies": {
75-
"jsan": "^3.1.12",
75+
"jsan": "^3.1.13",
7676
"lodash": "^4.17.2",
7777
"react": "^15.4.1",
7878
"react-dom": "^15.4.1",
@@ -84,7 +84,7 @@
8484
"redux-devtools-instrument": "^1.9.3",
8585
"remotedev-app": "^0.10.12",
8686
"remotedev-monitor-components": "^0.0.5",
87-
"remotedev-serialize": "^0.1.5",
87+
"remotedev-serialize": "^0.1.7",
8888
"remotedev-slider": "^1.1.1",
8989
"remotedev-utils": "0.0.1"
9090
}

Diff for: src/app/api/index.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ export function getSeralizeParameter(config, param) {
5151
return {
5252
replacer: immutableSerializer.replacer,
5353
reviver: immutableSerializer.reviver,
54-
options: serialize.options || true
54+
options: typeof serialize.options === 'object' ?
55+
{ ...immutableSerializer.options, ...serialize.options } : immutableSerializer.options
5556
};
5657
}
5758
if (!serialize.replacer && !serialize.reviver) return { options: serialize.options };

Diff for: yarn.lock

+11-6
Original file line numberDiff line numberDiff line change
@@ -4522,11 +4522,16 @@ [email protected]:
45224522
argparse "^1.0.2"
45234523
esprima "^2.6.0"
45244524

4525-
jsan@^3.1.11, jsan@^3.1.12:
4525+
jsan@^3.1.12:
45264526
version "3.1.12"
45274527
resolved "https://registry.yarnpkg.com/jsan/-/jsan-3.1.12.tgz#e784ce5ab533ee41f868bb054d74769365c80be5"
45284528
integrity sha512-EDJhJdWGP++Qh5TGfsdc3k2hFjr1/4Q3nVX6MPkTYlqqj3Xv9erXnBRZEBmuGR2IpfARdm0Ivj5EBSvhFylWRA==
45294529

4530+
jsan@^3.1.13:
4531+
version "3.1.13"
4532+
resolved "https://registry.yarnpkg.com/jsan/-/jsan-3.1.13.tgz#4de8c7bf8d1cfcd020c313d438f930cec4b91d86"
4533+
integrity sha512-9kGpCsGHifmw6oJet+y8HaCl14y7qgAsxVdV3pCHDySNR3BfDC30zgkssd7x5LRVAT22dnpbe9JdzzmXZnq9/g==
4534+
45304535
jsan@^3.1.3:
45314536
version "3.1.10"
45324537
resolved "https://registry.yarnpkg.com/jsan/-/jsan-3.1.10.tgz#ba9917b864defff567e0c990a34ae7a8d5eb1d90"
@@ -7518,12 +7523,12 @@ remotedev-monitor-components@^0.0.5:
75187523
codemirror "^5.21.0"
75197524
styled-components "^1.1.1"
75207525

7521-
remotedev-serialize@^0.1.5:
7522-
version "0.1.5"
7523-
resolved "https://registry.yarnpkg.com/remotedev-serialize/-/remotedev-serialize-0.1.5.tgz#26ae46fcefb7cdf6cb282a9a7c717c2d3d26972e"
7524-
integrity sha512-ed5rQ3Q78s8r2+iL9KjsFQfVWySnoFYxgyo6g2/4T74PpKOVW3M13t4Ahzds+EvIN9EHGypx+6LesgTyHgjI9Q==
7526+
remotedev-serialize@^0.1.7:
7527+
version "0.1.7"
7528+
resolved "https://registry.yarnpkg.com/remotedev-serialize/-/remotedev-serialize-0.1.7.tgz#744182d1d42c557207495a438442f18152933ec3"
7529+
integrity sha512-iTWTPjxazpwRHDqrfR0Vaxnq1XdW3TOAuClowoj6DYu3z0iQmd812tvrmA96TswZv22gIkwx9eEhz7vOQOEIgw==
75257530
dependencies:
7526-
jsan "^3.1.11"
7531+
jsan "^3.1.13"
75277532

75287533
[email protected], remotedev-slider@^1.1.1:
75297534
version "1.1.3"

0 commit comments

Comments
 (0)