From 0179d2fb9e5ef61d3a02a40b7bd4f785614222b4 Mon Sep 17 00:00:00 2001 From: Cristi Paval Date: Mon, 14 Nov 2022 20:50:00 +0200 Subject: [PATCH 1/2] Update expensify-common dependency. --- package-lock.json | 12 ++++++------ package.json | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6ee9d38168b7..4f793edf7693 100644 --- a/package-lock.json +++ b/package-lock.json @@ -38,7 +38,7 @@ "dom-serializer": "^0.2.2", "domhandler": "^4.3.0", "dotenv": "^8.2.0", - "expensify-common": "git+https://github.com/Expensify/expensify-common.git#805a4c34debc7e27b14e33847ac4df4d59b6d878", + "expensify-common": "git+https://github.com/Expensify/expensify-common.git#dd66d931aeffe18cdcffab8e7d05af32f3ef7ad1", "fbjs": "^3.0.2", "file-loader": "^6.0.0", "html-entities": "^1.3.1", @@ -23861,8 +23861,8 @@ }, "node_modules/expensify-common": { "version": "1.0.0", - "resolved": "git+ssh://git@github.com/Expensify/expensify-common.git#805a4c34debc7e27b14e33847ac4df4d59b6d878", - "integrity": "sha512-46gx59CkEPWEH4Y0VDIZreZg7fvaPdi8TEitTu7kiejKmKJWnPxNt/2RDZK3QFHLUiMy0RzTxAozLqR7N2MsYw==", + "resolved": "git+ssh://git@github.com/Expensify/expensify-common.git#dd66d931aeffe18cdcffab8e7d05af32f3ef7ad1", + "integrity": "sha512-6UVLbHiKHe34NLzD5+jf3WEqA9HGEvmbeIwDPEkAckL1I1+8Y6a9/GonICUg/b4V/O/ZcjUByOv/055awKqz2g==", "license": "MIT", "dependencies": { "classnames": "2.3.1", @@ -60824,9 +60824,9 @@ } }, "expensify-common": { - "version": "git+ssh://git@github.com/Expensify/expensify-common.git#805a4c34debc7e27b14e33847ac4df4d59b6d878", - "integrity": "sha512-46gx59CkEPWEH4Y0VDIZreZg7fvaPdi8TEitTu7kiejKmKJWnPxNt/2RDZK3QFHLUiMy0RzTxAozLqR7N2MsYw==", - "from": "expensify-common@git+https://github.com/Expensify/expensify-common.git#805a4c34debc7e27b14e33847ac4df4d59b6d878", + "version": "git+ssh://git@github.com/Expensify/expensify-common.git#dd66d931aeffe18cdcffab8e7d05af32f3ef7ad1", + "integrity": "sha512-6UVLbHiKHe34NLzD5+jf3WEqA9HGEvmbeIwDPEkAckL1I1+8Y6a9/GonICUg/b4V/O/ZcjUByOv/055awKqz2g==", + "from": "expensify-common@git+https://github.com/Expensify/expensify-common.git#dd66d931aeffe18cdcffab8e7d05af32f3ef7ad1", "requires": { "classnames": "2.3.1", "clipboard": "2.0.4", diff --git a/package.json b/package.json index bdc8873b50c3..d34362119897 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "dom-serializer": "^0.2.2", "domhandler": "^4.3.0", "dotenv": "^8.2.0", - "expensify-common": "git+https://github.com/Expensify/expensify-common.git#805a4c34debc7e27b14e33847ac4df4d59b6d878", + "expensify-common": "git+https://github.com/Expensify/expensify-common.git#dd66d931aeffe18cdcffab8e7d05af32f3ef7ad1", "fbjs": "^3.0.2", "file-loader": "^6.0.0", "html-entities": "^1.3.1", From ebc28fe15cdb74b149637e60641391263f6e5ee8 Mon Sep 17 00:00:00 2001 From: Cristi Paval Date: Tue, 15 Nov 2022 22:21:31 +0200 Subject: [PATCH 2/2] Fix conflicts with main. --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4f793edf7693..e1d992823776 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "1.2.27-3", + "version": "1.2.27-4", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "1.2.27-3", + "version": "1.2.27-4", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index d34362119897..b2bbf76eea8b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.2.27-3", + "version": "1.2.27-4", "author": "Expensify, Inc.", "homepage": "https://new.expensify.com", "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",