From 5ee062e1fd12ed80d276568f80f36906db9e91a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kr=C3=A6n=20Hansen?= Date: Fri, 18 Sep 2020 00:10:32 +0200 Subject: [PATCH] Upgrading Realm JS (#1331) --- RELEASENOTES.md | 2 +- package-lock.json | 68 +++++++++++++----- package.json | 2 +- .../data-importer/tests/csv/asset_file.realm | Bin 12288 -> 12288 bytes 4 files changed, 54 insertions(+), 18 deletions(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 9db3750f9..617209e18 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -10,4 +10,4 @@ ### Internals -- None +- Upgraded Realm to v6.1.2. ([#1331](https://github.com/realm/realm-studio/pull/1331)) diff --git a/package-lock.json b/package-lock.json index b677c37c2..629e5ce3c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4273,6 +4273,21 @@ "warning": "^4.0.3" } }, + "cross-fetch": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.0.6.tgz", + "integrity": "sha512-KBPUbqgFjzWlVcURG+Svp9TlhA5uliYtiNx/0r8nv0pdypeQCRJ9IaSIc3q/x3q8t3F75cHuwxVql1HFGHCNJQ==", + "requires": { + "node-fetch": "2.6.1" + }, + "dependencies": { + "node-fetch": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz", + "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==" + } + } + }, "cross-spawn": { "version": "6.0.5", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", @@ -6630,18 +6645,25 @@ } }, "fbjs": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-1.0.0.tgz", - "integrity": "sha512-MUgcMEJaFhCaF1QtWGnmq9ZDRAzECTCRAF7O6UZIlAlkTs1SasiX9aP0Iw7wfD2mJ7wDTNfg2w7u5fSCwJk1OA==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-2.0.0.tgz", + "integrity": "sha512-8XA8ny9ifxrAWlyhAbexXcs3rRMtxWcs3M0lctLfB49jRDHiaxj+Mo0XxbwE7nKZYzgCFoq64FS+WFd4IycPPQ==", "requires": { - "core-js": "^2.4.1", + "core-js": "^3.6.4", + "cross-fetch": "^3.0.4", "fbjs-css-vars": "^1.0.0", - "isomorphic-fetch": "^2.1.1", "loose-envify": "^1.0.0", "object-assign": "^4.1.0", "promise": "^7.1.1", "setimmediate": "^1.0.5", "ua-parser-js": "^0.7.18" + }, + "dependencies": { + "core-js": { + "version": "3.6.5", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz", + "integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==" + } } }, "fbjs-css-vars": { @@ -10843,9 +10865,9 @@ "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==" }, "needle": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/needle/-/needle-2.4.1.tgz", - "integrity": "sha512-x/gi6ijr4B7fwl6WYL9FwlCvRQKGlUNvnceho8wxkwXqN8jvVmmmATTmZPRRG7b/yC1eode26C2HO9jl78Du9g==", + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/needle/-/needle-2.5.2.tgz", + "integrity": "sha512-LbRIwS9BfkPvNwNHlsA41Q29kL2L/6VaOJ0qisM5lLWsTV3nP15abO5ITL6L81zqFhzjRKDAYjpcBcwM0AVvLQ==", "requires": { "debug": "^3.2.6", "iconv-lite": "^0.4.4", @@ -11084,12 +11106,13 @@ "dev": true }, "node-pre-gyp": { - "version": "git+https://github.com/kneth/node-pre-gyp.git#09b0c262cf9ba2cb28c8a29f6bb5882c8c160cdf", - "from": "git+https://github.com/kneth/node-pre-gyp.git#add-node-14.0.0", + "version": "0.15.0", + "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.15.0.tgz", + "integrity": "sha512-7QcZa8/fpaU/BKenjcaeFF9hLz2+7S9AqyXFhlH/rilsQ/hPZKK32RtR5EQHJElgu+q5RfbJ34KriI79UWaorA==", "requires": { "detect-libc": "^1.0.2", - "mkdirp": "^0.5.1", - "needle": "^2.2.1", + "mkdirp": "^0.5.3", + "needle": "^2.5.0", "nopt": "^4.0.1", "npm-packlist": "^1.1.6", "npmlog": "^4.0.2", @@ -11099,6 +11122,19 @@ "tar": "^4.4.2" }, "dependencies": { + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" + }, + "mkdirp": { + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", + "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", + "requires": { + "minimist": "^1.2.5" + } + }, "semver": { "version": "5.7.1", "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", @@ -12948,9 +12984,9 @@ } }, "realm": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/realm/-/realm-6.0.0.tgz", - "integrity": "sha512-y5STBWf0cON4iINBN+kpYeeYC8J+3oNqZCrYBxlzedci//qSwmZiPQ9GQlWQt0ZS04B6OHg0UgzKRZdlaZDUzA==", + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/realm/-/realm-6.1.2.tgz", + "integrity": "sha512-hv2FcsqRew6r3mH82eFcYfcxJcA68l6O27bVMUYtWqwosdPL7fZCDyFExlN65OvhAyNCd0qufEWSQw3Hq1S9tQ==", "requires": { "command-line-args": "^4.0.6", "deepmerge": "2.1.0", @@ -12961,7 +12997,7 @@ "node-addon-api": "^3.0.0", "node-fetch": "^1.7.3", "node-machine-id": "^1.1.10", - "node-pre-gyp": "git+https://github.com/kneth/node-pre-gyp.git#add-node-14.0.0", + "node-pre-gyp": "^0.15.0", "progress": "^2.0.3", "prop-types": "^15.6.2", "request": "^2.88.0", diff --git a/package.json b/package.json index 5360aaf07..c3773e1b3 100644 --- a/package.json +++ b/package.json @@ -150,7 +150,7 @@ "react-sortable-hoc": "^1.11.0", "react-virtualized": "^9.21.2", "reactstrap": "^8.4.1", - "realm": "^6.0.0", + "realm": "^6.1.2", "semver": "^7.3.2", "subscriptions-transport-ws": "^0.9.16", "uuid": "^8.1.0" diff --git a/src/services/data-importer/tests/csv/asset_file.realm b/src/services/data-importer/tests/csv/asset_file.realm index 070ce578c9cfefe671921e01b56314b8dd8adce0..c11705b5bbcdb9b0bf0edf1664f71a04b876ab84 100644 GIT binary patch delta 275 zcmZojXh;x?kY@mc3`rVC60%oCVTurRQGU=?7~nA|L9s9qtPAU8vyLKdd>1cL*E z0D}Po2auEik_te`!4NU|v7COr1?vk24aN-q7YrcPEI^YT9i14QKpaP)y-@53Vu08% zAt$hMM>hrrt^#2Oh72a4LlYPnI)MIq0K^sw3=FM6wLq6L?0~o*X!8wDpc(}Wg#ra% PpiBf8P|xPI3c>sU*o!WZ delta 218 zcmZojXh@KVkY@k`133sCqU++s#mT@hxj9-dcmZ?Jc0QE^8uC%EI(KzSS8px*g7~QI4w9cxE^qA z5J?ba5Zj=@z~Bf3AbkQ10t_5LYyl(#z$_4711#bJBo{D9FkIl=0HhhX0{9{NSb+M} gR6!6#sEMkn0a>cb4615Cr-KZ31uEV=Lm`770LnBf5&!@I