From 0562fa74b86aae8b48501a661e38616e91ea6e50 Mon Sep 17 00:00:00 2001 From: Muhammad Abdullah Waheed <42172960+abdullahwaheed@users.noreply.github.com> Date: Wed, 8 Feb 2023 17:31:02 +0500 Subject: [PATCH] fix: upgraded frontend-component-header to fix dependency issues (#258) --- package-lock.json | 67 +++++++++++++++++++++++++++++------------------ package.json | 7 ++--- 2 files changed, 46 insertions(+), 28 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3382e24d..17486ab0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "@cospired/i18n-iso-languages": "4.0.0", "@edx/brand": "npm:@edx/brand-openedx@^1.1.0", "@edx/frontend-component-footer": "11.1.2", - "@edx/frontend-component-header": "3.1.1", + "@edx/frontend-component-header": "^3.6.0", "@edx/frontend-platform": "2.5.0", "@edx/paragon": "^20.20.0", "@fortawesome/fontawesome-svg-core": "6.1.2", @@ -2347,10 +2347,11 @@ } }, "node_modules/@edx/frontend-component-header": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@edx/frontend-component-header/-/frontend-component-header-3.1.1.tgz", - "integrity": "sha512-Qlzp3bOS+wypLrJljVpkVveP462uTR/ZDQYQHP7kKzh/5SXHIHpHMuTqdi6b8ZPSFKMZksJTnNvEAWWjgabhzA==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/@edx/frontend-component-header/-/frontend-component-header-3.6.0.tgz", + "integrity": "sha512-7s7qy5WXT3qY0F5p8yZyHo1KUsWQxb0Xex1PEnXYCalNR1IfBTxU9pd5DVbSMIcJ1LSJJuymNtP6rWEXEh3qeg==", "dependencies": { + "@edx/paragon": "20.20.0", "@fortawesome/fontawesome-svg-core": "1.2.36", "@fortawesome/free-brands-svg-icons": "5.15.4", "@fortawesome/free-regular-svg-icons": "5.15.4", @@ -2358,11 +2359,11 @@ "@fortawesome/react-fontawesome": "^0.2.0", "babel-polyfill": "6.26.0", "react-responsive": "8.2.0", - "react-transition-group": "4.4.2" + "react-transition-group": "4.4.5" }, "peerDependencies": { - "@edx/frontend-platform": "^2.0.0", - "@edx/paragon": ">= 7.0.0 < 20.0.0", + "@edx/frontend-platform": "^2.0.0 || ^3.0.0", + "@edx/paragon": ">= 7.0.0 < 21.0.0", "prop-types": "^15.5.10", "react": "^16.9.0", "react-dom": "^16.9.0" @@ -2416,6 +2417,21 @@ "node": ">=6" } }, + "node_modules/@edx/frontend-component-header/node_modules/react-transition-group": { + "version": "4.4.5", + "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz", + "integrity": "sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==", + "dependencies": { + "@babel/runtime": "^7.5.5", + "dom-helpers": "^5.0.1", + "loose-envify": "^1.4.0", + "prop-types": "^15.6.2" + }, + "peerDependencies": { + "react": ">=16.6.0", + "react-dom": ">=16.6.0" + } + }, "node_modules/@edx/frontend-platform": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/@edx/frontend-platform/-/frontend-platform-2.5.0.tgz", @@ -8533,12 +8549,7 @@ "node_modules/decode-uri-component": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", -<<<<<<< HEAD "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=", -======= - "integrity": "sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og==", - "dev": true, ->>>>>>> 4d848deb4c78fa66e7313fe309a29975b1275bfd "engines": { "node": ">=0.10" } @@ -20052,6 +20063,7 @@ "version": "4.1.4", "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz", "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==", + "dev": true, "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.1.4", @@ -28570,10 +28582,11 @@ } }, "@edx/frontend-component-header": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@edx/frontend-component-header/-/frontend-component-header-3.1.1.tgz", - "integrity": "sha512-Qlzp3bOS+wypLrJljVpkVveP462uTR/ZDQYQHP7kKzh/5SXHIHpHMuTqdi6b8ZPSFKMZksJTnNvEAWWjgabhzA==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/@edx/frontend-component-header/-/frontend-component-header-3.6.0.tgz", + "integrity": "sha512-7s7qy5WXT3qY0F5p8yZyHo1KUsWQxb0Xex1PEnXYCalNR1IfBTxU9pd5DVbSMIcJ1LSJJuymNtP6rWEXEh3qeg==", "requires": { + "@edx/paragon": "20.20.0", "@fortawesome/fontawesome-svg-core": "1.2.36", "@fortawesome/free-brands-svg-icons": "5.15.4", "@fortawesome/free-regular-svg-icons": "5.15.4", @@ -28581,7 +28594,7 @@ "@fortawesome/react-fontawesome": "^0.2.0", "babel-polyfill": "6.26.0", "react-responsive": "8.2.0", - "react-transition-group": "4.4.2" + "react-transition-group": "4.4.5" }, "dependencies": { "@fortawesome/fontawesome-svg-core": { @@ -28615,6 +28628,17 @@ "requires": { "@fortawesome/fontawesome-common-types": "^0.2.36" } + }, + "react-transition-group": { + "version": "4.4.5", + "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz", + "integrity": "sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==", + "requires": { + "@babel/runtime": "^7.5.5", + "dom-helpers": "^5.0.1", + "loose-envify": "^1.4.0", + "prop-types": "^15.6.2" + } } } }, @@ -33469,8 +33493,7 @@ "decode-uri-component": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", - "integrity": "sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og==", - "dev": true + "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=" }, "decompress": { "version": "4.2.1", @@ -42042,16 +42065,10 @@ } }, "object.assign": { -<<<<<<< HEAD - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz", - "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==", - "dev": true, -======= "version": "4.1.4", "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz", "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==", ->>>>>>> 4d848deb4c78fa66e7313fe309a29975b1275bfd + "dev": true, "requires": { "call-bind": "^1.0.2", "define-properties": "^1.1.4", diff --git a/package.json b/package.json index d60fb91d..6a97a131 100644 --- a/package.json +++ b/package.json @@ -19,8 +19,9 @@ "publishConfig": { "access": "public" }, - "browserslist": ["extends @edx/browserslist-config"] -, + "browserslist": [ + "extends @edx/browserslist-config" + ], "husky": { "pre-commit": "npm run lint" }, @@ -28,7 +29,7 @@ "@cospired/i18n-iso-languages": "4.0.0", "@edx/brand": "npm:@edx/brand-openedx@^1.1.0", "@edx/frontend-component-footer": "11.1.2", - "@edx/frontend-component-header": "3.1.1", + "@edx/frontend-component-header": "^3.6.0", "@edx/frontend-platform": "2.5.0", "@edx/paragon": "^20.20.0", "@fortawesome/fontawesome-svg-core": "6.1.2",