From ba62ee4ec55a7b0898b00554197c372425bad48c Mon Sep 17 00:00:00 2001 From: Dimitri Kopriwa Date: Thu, 28 Nov 2019 18:56:24 +0100 Subject: [PATCH 1/2] fix(dependencies): adding missing query-string dependency --- packages/ra-ui-materialui/package-lock.json | 87 +++++++++++++++++++++ packages/ra-ui-materialui/package.json | 1 + 2 files changed, 88 insertions(+) create mode 100644 packages/ra-ui-materialui/package-lock.json diff --git a/packages/ra-ui-materialui/package-lock.json b/packages/ra-ui-materialui/package-lock.json new file mode 100644 index 00000000000..00b8cc97917 --- /dev/null +++ b/packages/ra-ui-materialui/package-lock.json @@ -0,0 +1,87 @@ +{ + "name": "ra-ui-materialui", + "version": "3.0.2", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "decode-uri-component": { + "version": "0.2.0", + "resolved": "https://npm.kopaxgroup.com:443/decode-uri-component/-/decode-uri-component-0.2.0.tgz", + "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=" + }, + "js-tokens": { + "version": "4.0.0", + "resolved": "https://npm.kopaxgroup.com:443/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "dev": true + }, + "loose-envify": { + "version": "1.4.0", + "resolved": "https://npm.kopaxgroup.com:443/loose-envify/-/loose-envify-1.4.0.tgz", + "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", + "dev": true, + "requires": { + "js-tokens": "^3.0.0 || ^4.0.0" + } + }, + "object-assign": { + "version": "4.1.1", + "resolved": "https://npm.kopaxgroup.com:443/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" + }, + "query-string": { + "version": "5.1.1", + "resolved": "https://npm.kopaxgroup.com:443/query-string/-/query-string-5.1.1.tgz", + "integrity": "sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==", + "requires": { + "decode-uri-component": "^0.2.0", + "object-assign": "^4.1.0", + "strict-uri-encode": "^1.0.0" + } + }, + "react-is": { + "version": "16.12.0", + "resolved": "https://npm.kopaxgroup.com:443/react-is/-/react-is-16.12.0.tgz", + "integrity": "sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q==", + "dev": true + }, + "react-test-renderer": { + "version": "16.8.6", + "dev": true, + "requires": { + "object-assign": "^4.1.1", + "prop-types": "^15.6.2", + "react-is": "^16.8.6", + "scheduler": "^0.13.6" + }, + "dependencies": { + "prop-types": { + "version": "15.7.2", + "resolved": "https://npm.kopaxgroup.com:443/prop-types/-/prop-types-15.7.2.tgz", + "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==", + "dev": true, + "requires": { + "loose-envify": "^1.4.0", + "object-assign": "^4.1.1", + "react-is": "^16.8.1" + } + } + } + }, + "scheduler": { + "version": "0.13.6", + "resolved": "https://npm.kopaxgroup.com:443/scheduler/-/scheduler-0.13.6.tgz", + "integrity": "sha512-IWnObHt413ucAYKsD9J1QShUKkbKLQQHdxRyw73sw4FN26iWr3DY/H34xGPe4nmL1DwXyWmSWmMrA9TfQbE/XQ==", + "dev": true, + "requires": { + "loose-envify": "^1.1.0", + "object-assign": "^4.1.1" + } + }, + "strict-uri-encode": { + "version": "1.1.0", + "resolved": "https://npm.kopaxgroup.com:443/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz", + "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=" + } + } +} diff --git a/packages/ra-ui-materialui/package.json b/packages/ra-ui-materialui/package.json index 02b274777a8..6ca09ba6075 100644 --- a/packages/ra-ui-materialui/package.json +++ b/packages/ra-ui-materialui/package.json @@ -75,6 +75,7 @@ "jsonexport": "^2.4.1", "lodash": "~4.17.5", "prop-types": "^15.6.1", + "query-string": "~5.1.1", "react-dropzone": "^10.1.7", "react-transition-group": "^2.2.1", "recompose": "~0.26.0" From 9499374d8f1e71b5eefa113ec7b6b6f0d00a7e5b Mon Sep 17 00:00:00 2001 From: Dimitri Kopriwa Date: Fri, 29 Nov 2019 15:39:47 +0100 Subject: [PATCH 2/2] build(dependencies): remove package-lock.json and more permisive version --- packages/ra-ui-materialui/package-lock.json | 87 --------------------- packages/ra-ui-materialui/package.json | 2 +- 2 files changed, 1 insertion(+), 88 deletions(-) delete mode 100644 packages/ra-ui-materialui/package-lock.json diff --git a/packages/ra-ui-materialui/package-lock.json b/packages/ra-ui-materialui/package-lock.json deleted file mode 100644 index 00b8cc97917..00000000000 --- a/packages/ra-ui-materialui/package-lock.json +++ /dev/null @@ -1,87 +0,0 @@ -{ - "name": "ra-ui-materialui", - "version": "3.0.2", - "lockfileVersion": 1, - "requires": true, - "dependencies": { - "decode-uri-component": { - "version": "0.2.0", - "resolved": "https://npm.kopaxgroup.com:443/decode-uri-component/-/decode-uri-component-0.2.0.tgz", - "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=" - }, - "js-tokens": { - "version": "4.0.0", - "resolved": "https://npm.kopaxgroup.com:443/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", - "dev": true - }, - "loose-envify": { - "version": "1.4.0", - "resolved": "https://npm.kopaxgroup.com:443/loose-envify/-/loose-envify-1.4.0.tgz", - "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", - "dev": true, - "requires": { - "js-tokens": "^3.0.0 || ^4.0.0" - } - }, - "object-assign": { - "version": "4.1.1", - "resolved": "https://npm.kopaxgroup.com:443/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" - }, - "query-string": { - "version": "5.1.1", - "resolved": "https://npm.kopaxgroup.com:443/query-string/-/query-string-5.1.1.tgz", - "integrity": "sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==", - "requires": { - "decode-uri-component": "^0.2.0", - "object-assign": "^4.1.0", - "strict-uri-encode": "^1.0.0" - } - }, - "react-is": { - "version": "16.12.0", - "resolved": "https://npm.kopaxgroup.com:443/react-is/-/react-is-16.12.0.tgz", - "integrity": "sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q==", - "dev": true - }, - "react-test-renderer": { - "version": "16.8.6", - "dev": true, - "requires": { - "object-assign": "^4.1.1", - "prop-types": "^15.6.2", - "react-is": "^16.8.6", - "scheduler": "^0.13.6" - }, - "dependencies": { - "prop-types": { - "version": "15.7.2", - "resolved": "https://npm.kopaxgroup.com:443/prop-types/-/prop-types-15.7.2.tgz", - "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==", - "dev": true, - "requires": { - "loose-envify": "^1.4.0", - "object-assign": "^4.1.1", - "react-is": "^16.8.1" - } - } - } - }, - "scheduler": { - "version": "0.13.6", - "resolved": "https://npm.kopaxgroup.com:443/scheduler/-/scheduler-0.13.6.tgz", - "integrity": "sha512-IWnObHt413ucAYKsD9J1QShUKkbKLQQHdxRyw73sw4FN26iWr3DY/H34xGPe4nmL1DwXyWmSWmMrA9TfQbE/XQ==", - "dev": true, - "requires": { - "loose-envify": "^1.1.0", - "object-assign": "^4.1.1" - } - }, - "strict-uri-encode": { - "version": "1.1.0", - "resolved": "https://npm.kopaxgroup.com:443/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz", - "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=" - } - } -} diff --git a/packages/ra-ui-materialui/package.json b/packages/ra-ui-materialui/package.json index 6ca09ba6075..81443a68d3e 100644 --- a/packages/ra-ui-materialui/package.json +++ b/packages/ra-ui-materialui/package.json @@ -75,7 +75,7 @@ "jsonexport": "^2.4.1", "lodash": "~4.17.5", "prop-types": "^15.6.1", - "query-string": "~5.1.1", + "query-string": "^5.1.1", "react-dropzone": "^10.1.7", "react-transition-group": "^2.2.1", "recompose": "~0.26.0"