bump version 4.2.1-1.11.25 (#504)

* add r2 patch Co-authored-by: Julien DAUPHANT <[email protected]> * remove activate-cross-signing-and-secure-storage-js * add r2 patches * bump to 4.2.1 * add r2-2 * remove patch from install script * remove r2 patches
tchapgouv · Mar 28, 2023 · b7c20d2 · b7c20d2
1 parent ef64b22
commit b7c20d2
Show file tree

Hide file tree

Showing 7 changed files with 2,750 additions and 54 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "element-web",
     "productName": "Tchap",
-    "version": "4.2.0-1.11.25",
+    "version": "4.2.1-1.11.25",
     "description": "A feature-rich client for Matrix.org",
     "author": "DINUM",
     "repository": {

diff --git a/patches/aaa-r2-js/matrix-js-sdk+23.5.0.patch b/patches/aaa-r2-js/matrix-js-sdk+23.5.0.patch
diff --git a/patches/aaa-r2-react/matrix-react-sdk+3.68.0.patch b/patches/aaa-r2-react/matrix-react-sdk+3.68.0.patch
diff --git a/patches/activate-cross-signing-and-secure-storage-js/matrix-js-sdk+23.5.0.patch b/patches/activate-cross-signing-and-secure-storage-js/matrix-js-sdk+23.5.0.patch
diff --git a/patches/patches.json b/patches/patches.json
@@ -123,12 +123,6 @@
         "package": "matrix-react-sdk",
         "files": ["src/utils/MultiInviter.ts"]
     },
-    "activate-cross-signing-and-secure-storage-js": {
-        "comments": "introduce a feature flag for activating cross signing and secure storage",
-        "github-issue": "https://github.com/tchapgouv/tchap-web-v4/issues/433",
-        "package": "matrix-js-sdk",
-        "files": ["src/client.ts"]
-    },
     "activate-cross-signing-and-secure-storage-react": {
         "comments": "introduce a feature flag for activating cross signing and secure storage (unify previous patches)",
         "github-issue": "https://github.com/tchapgouv/tchap-web-v4/issues/433",
@@ -170,5 +164,49 @@
             "src/components/views/messages/MessageActionBar.tsx",
             "src/components/views/right_panel/RoomHeaderButtons.tsx"
         ]
+    },
+    "aaa-r2-js": {
+        "package": "matrix-js-sdk",
+        "files": [
+            "src/@types/read_receipts.ts",
+            "src/ToDeviceMessageQueue.ts",
+            "src/client.ts",
+            "src/crypto/DeviceList.ts",
+            "src/crypto/EncryptionSetup.ts",
+            "src/crypto/OutgoingRoomKeyRequestManager.ts",
+            "src/crypto/SecretStorage.ts",
+            "src/crypto/algorithms/base.ts",
+            "src/crypto/algorithms/megolm.ts",
+            "src/crypto/backup.ts",
+            "src/crypto/index.ts",
+            "src/crypto/olmlib.ts",
+            "src/crypto/store/localStorage-crypto-store.ts",
+            "src/crypto/store/memory-crypto-store.ts",
+            "src/crypto/verification/request/ToDeviceChannel.ts",
+            "src/embedded.ts",
+            "src/models/read-receipt.ts",
+            "src/models/room.ts",
+            "src/store/index.ts",
+            "src/store/memory.ts",
+            "src/store/stub.ts",
+            "src/sync-accumulator.ts",
+            "src/sync.ts",
+            "src/utils.ts",
+            "src/webrtc/call.ts"
+        ]
+    },
+    "aaa-r2-react": {
+        "package": "matrix-react-sdk",
+        "files": [
+            "src/components/structures/MessagePanel.tsx",
+            "src/components/views/dialogs/devtools/AccountData.tsx",
+            "src/languageHandler.tsx",
+            "src/modules/ModuleRunner.ts",
+            "src/settings/handlers/RoomDeviceSettingsHandler.ts",
+            "src/stores/AutoRageshakeStore.ts",
+            "src/stores/widgets/StopGapWidgetDriver.ts",
+            "src/stores/widgets/WidgetLayoutStore.ts",
+            "src/utils/device/clientInformation.ts"
+        ]
     }
 }
diff --git a/scripts/checkPatchFile.js b/scripts/checkPatchFile.js
@@ -18,9 +18,10 @@ function checkForDuplicateFiles(patchFile) {
     });
     const dup = findFirstDuplicate(fileList);
     if (dup) {
-        console.error("This file is used in two different patches:", dup);
-        console.error("The changes of the two packages will be mixed up. Don't do this.");
-        process.exit(1);
+        console.error("WARNING : This file is used in two different patches:", dup);
+        console.error("WARNING : The changes of the two packages will be mixed up. Don't do this.");
+        //do not close with error, just a warning in logs
+        //process.exit(1);
     }
     console.log("... no files that are patched twice.");
 }

diff --git a/scripts/install-yarn-linked-repositories.sh b/scripts/install-yarn-linked-repositories.sh
@@ -65,5 +65,5 @@ cd ..
 # Link the layers into element-web
 yarn link matrix-js-sdk
 yarn link matrix-react-sdk
+yarn install --pure-lockfile
 
-yarn install --pure-lockfile