Tchap-web using matrix-react-sdk as a subtree

.prettierignore

@@ -32,6 +32,7 @@ src/vector/modernizr.js
 #remove tchap files from prettier
 patches/
 yarn-linked-dependencies/
+linked-dependencies/
 .github/
 res/
 scripts/tchap

README.md

@@ -217,16 +217,20 @@ yarn install
 popd
 ```
 
-Then similarly with `matrix-react-sdk`:
+For `matrix-react-sdk` we are using a subtree and our own fork:
+When you clone tchap-web-v4, you should be able to see the repo in `linked-dependencies/matrix-react-sdk`.
+
+Don't forget to run a first yarn install inside `linked-dependencies/matrix-react-sdk`. Our `package.json`
+will be using this directory as local dependencies for `matrix-react-sdk`
+
+You can make changes to the subtree repo as if it was code from the parent repo.
+But you have to make sure to also update the fork using those commands :
 
-```bash
-git clone https://github.com/matrix-org/matrix-react-sdk.git
-pushd matrix-react-sdk
-yarn link
-yarn link matrix-js-sdk
-yarn install
-popd
 ```
+git subree push --prefix=./linked-dependencies/matrix-react-sdk  matrix-react-sdk-tchap [email protected]:tchapgouv/matrix-react-sdk-tchap.git develop_tchap
+```
+
+This command will take all the commits that touch the subtree repo and push them to the remote fork. If you don't want to take all the commits (shouldnt happen), you will have to cherry-pick and push manually to the remote.
 
 Clone the repo and switch to the `element-web` directory:
 
@@ -242,7 +246,6 @@ Finally, build and start Element itself:
 
 ```bash
 yarn link matrix-js-sdk
-yarn link matrix-react-sdk
 yarn install
 yarn start
 ```

customisations.json

@@ -14,13 +14,13 @@
     "src/components/views/messages/MStickerBody.tsx": "src/tchap/customisations/components/views/messages/ContentScanningStickerBody.tsx",
     "src/components/views/messages/MVideoBody.tsx": "src/tchap/customisations/components/views/messages/ContentScanningVideoBody.tsx",
     "src/components/views/messages/MVoiceMessageBody.tsx": "src/tchap/customisations/components/views/messages/ContentScanningVoiceMessageBody.tsx",
-    "src/tchap/components/views/messages/OriginalAudioBody.tsx": "node_modules/matrix-react-sdk/src/components/views/messages/MAudioBody.tsx",
-    "src/tchap/components/views/messages/OriginalFileBody.tsx": "node_modules/matrix-react-sdk/src/components/views/messages/MFileBody.tsx",
-    "src/tchap/components/views/messages/OriginalImageBody.tsx": "node_modules/matrix-react-sdk/src/components/views/messages/MImageBody.tsx",
-    "src/tchap/components/views/messages/OriginalImageReplyBody.tsx": "node_modules/matrix-react-sdk/src/components/views/messages/MImageReplyBody.tsx",
-    "src/tchap/components/views/messages/OriginalStickerBody.tsx": "node_modules/matrix-react-sdk/src/components/views/messages/MStickerBody.tsx",
-    "src/tchap/components/views/messages/OriginalVideoBody.tsx": "node_modules/matrix-react-sdk/src/components/views/messages/MVideoBody.tsx",
-    "src/tchap/components/views/messages/OriginalVoiceMessageBody.tsx": "node_modules/matrix-react-sdk/src/components/views/messages/MVoiceMessageBody.tsx",
+    "src/tchap/components/views/messages/OriginalAudioBody.tsx": "linked-dependencies/matrix-react-sdk/src/components/views/messages/MAudioBody.tsx",
+    "src/tchap/components/views/messages/OriginalFileBody.tsx": "linked-dependencies/matrix-react-sdk/src/components/views/messages/MFileBody.tsx",
+    "src/tchap/components/views/messages/OriginalImageBody.tsx": "linked-dependencies/matrix-react-sdk/src/components/views/messages/MImageBody.tsx",
+    "src/tchap/components/views/messages/OriginalImageReplyBody.tsx": "linked-dependencies/matrix-react-sdk/src/components/views/messages/MImageReplyBody.tsx",
+    "src/tchap/components/views/messages/OriginalStickerBody.tsx": "linked-dependencies/matrix-react-sdk/src/components/views/messages/MStickerBody.tsx",
+    "src/tchap/components/views/messages/OriginalVideoBody.tsx": "linked-dependencies/matrix-react-sdk/src/components/views/messages/MVideoBody.tsx",
+    "src/tchap/components/views/messages/OriginalVoiceMessageBody.tsx": "linked-dependencies/matrix-react-sdk/src/components/views/messages/MVoiceMessageBody.tsx",
     "src/components/views/messages/UnknownBody.tsx": "src/tchap/components/views/messages/TchapUnknownBody.tsx",
     "src/components/views/settings/JoinRuleSettings.tsx": "src/tchap/components/views/settings/TchapJoinRuleSettings.tsx",
     "src/components/views/dialogs/RoomUpgradeWarningDialog.tsx": "src/tchap/components/views/dialogs/TchapRoomUpgradeWarningDialog.tsx",

jest.config.ts

@@ -38,38 +38,40 @@ const config: Config = {
     testMatch: ["<rootDir>/test/unit-tests/tchap/**/*-test.[tj]s?(x)"], // :TCHAP: only tchap tests
     setupFiles: ["jest-canvas-mock"],
     setupFilesAfterEnv: [
-        "<rootDir>/node_modules/matrix-react-sdk/test/setupTests.ts",
+        "<rootDir>/linked-dependencies/matrix-react-sdk/test/setupTests.ts",
         "<rootDir>/test/setup/setupLanguage.ts",
         "<rootDir>/test/setupTests.ts",
     ],
     moduleNameMapper: {
         "\\.(css|scss|pcss)$": "<rootDir>/__mocks__/cssMock.js",
-        "\\.(gif|png|ttf|woff2)$": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/imageMock.js",
-        "\\.svg$": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/svg.js",
-        "\\$webapp/i18n/languages.json": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/languages.json",
+        "\\.(gif|png|ttf|woff2)$": "<rootDir>/linked-dependencies/matrix-react-sdk/__mocks__/imageMock.js",
+        "\\.svg$": "<rootDir>/linked-dependencies/matrix-react-sdk/__mocks__/svg.js",
+        "\\$webapp/i18n/languages.json": "<rootDir>/linked-dependencies/matrix-react-sdk/__mocks__/languages.json",
         "^react$": "<rootDir>/node_modules/react",
         "^react-dom$": "<rootDir>/node_modules/react-dom",
         "^matrix-js-sdk$": "<rootDir>/node_modules/matrix-js-sdk/src",
-        "^matrix-react-sdk$": "<rootDir>/node_modules/matrix-react-sdk/src",
-        "decoderWorker\\.min\\.js": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js",
-        "decoderWorker\\.min\\.wasm": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js",
-        "waveWorker\\.min\\.js": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js",
-        "context-filter-polyfill": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js",
-        "FontManager.ts": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/FontManager.js",
-        "workers/(.+)Factory": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/workerFactoryMock.js",
+        "^matrix-react-sdk$": "<rootDir>/linked-dependencies/matrix-react-sdk/src",
+        "decoderWorker\\.min\\.js": "<rootDir>/linked-dependencies/matrix-react-sdk/__mocks__/empty.js",
+        "decoderWorker\\.min\\.wasm": "<rootDir>/linked-dependencies/matrix-react-sdk/__mocks__/empty.js",
+        "waveWorker\\.min\\.js": "<rootDir>/linked-dependencies/matrix-react-sdk/__mocks__/empty.js",
+        "context-filter-polyfill": "<rootDir>/linked-dependencies/matrix-react-sdk/__mocks__/empty.js",
+        "FontManager.ts": "<rootDir>/linked-dependencies/matrix-react-sdk/__mocks__/FontManager.js",
+        "workers/(.+)Factory": "<rootDir>/linked-dependencies/matrix-react-sdk/__mocks__/workerFactoryMock.js",
         "^!!raw-loader!.*": "jest-raw-loader",
-        "recorderWorkletFactory": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js",
+        "recorderWorkletFactory": "<rootDir>/linked-dependencies/matrix-react-sdk/__mocks__/empty.js",
         "^fetch-mock$": "<rootDir>/node_modules/fetch-mock",
         // :TCHAP:
         "MImageBody": "<rootDir>/src/tchap/customisations/components/views/messages/ContentScanningImageBody.tsx",
         "../../../../../../src/tchap/components/views/messages/OriginalFileBody":
-            "<rootDir>/node_modules/matrix-react-sdk/src/components/views/messages/MImageBody.tsx",
+            "<rootDir>/linked-dependencies/matrix-react-sdk/src/components/views/messages/MImageBody.tsx",
         "MAudioBody": "<rootDir>/src/tchap/customisations/components/views/messages/ContentScanningAudioBody.tsx",
         "../../../../../../src/tchap/components/views/messages/OriginalAudioBody":
-            "<rootDir>/node_modules/matrix-react-sdk/src/components/views/messages/MAudioBody.tsx",
+            "<rootDir>/linked-dependencies/matrix-react-sdk/src/components/views/messages/MAudioBody.tsx",
         "MStickerBody": "<rootDir>/src/tchap/customisations/components/views/messages/ContentScanningStickerBody.tsx",
         "~tchap-web-dep/(.*)": "<rootDir>/yarn-linked-dependencies/$1",
         "~tchap-web/(.*)": "<rootDir>/$1",
+        "~linked-dep/(.*)": "<rootDir>/linked-dependencies/$1",
+        "matrix-react-sdk/(.*)": "<rootDir>/linked-dependencies/matrix-react-sdk/$1",
         // end :TCHAP:
     },
     transformIgnorePatterns: ["/node_modules/(?!matrix-js-sdk|matrix-react-sdk).+$"],

linked-dependencies/matrix-react-sdk/.editorconfig

@@ -0,0 +1,29 @@
+#   Copyright 2017 Aviral Dasgupta
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+root = true
+
+[*]
+charset=utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+
+[*.{yml,yaml}]
+indent_size = 4
+
+[*.tsx.snap]
+trim_trailing_whitespace = false

linked-dependencies/matrix-react-sdk/.eslintignore

@@ -0,0 +1,6 @@
+test/end-to-end-tests/node_modules/
+test/end-to-end-tests/element/
+test/end-to-end-tests/synapse/
+test/end-to-end-tests/lib/
+# Legacy skinning file that some people might still have
+src/component-index.js