Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 19 commits into from
Apr 17, 2024
Merged

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

merged 19 commits into from
Apr 17, 2024

Conversation

MarcWadai
Copy link
Contributor

@MarcWadai MarcWadai commented Apr 4, 2024 •
edited
Loading

This PR will introduce breaking changes on how we organize and code for tchap-web. Directly using matrix-react-sdk fork and not using patches anymore.

Links

#958

Description

In this PR, we added the matrix-react-sdk as a subtree in the project. The sdk is our own fork that can be found here https://github.com/tchapgouv/matrix-react-sdk-tchap
Most of the changes have been made :

  • in webpack config, to point directly to our fork
  • in tsconfig and jest config to also create aliases to our fork
  • To the customisations file that had hard coded value to the node_modules

How to install

  • Pull the code
  • Remove node_modules
  • Remove matrix-react-sdk from yarn-linked-dependencies
  • run yarn unlink matrix-react-sdk
  • Run yarn install in root directory and inside linked-dependencies/matrix-react-sdk
  • yarn start

How to review

  • Hot reloading working
  • Test working
  • No linter error
  • Build working
  • webapp is working
  • update readme
  • modify install script to have the correct yarn link to js-sdk
  • Launch lot of manuel tests

Out of scope

Make js-sdk a subtree as well : #975

@gitguardian GitGuardian
Copy link

gitguardian bot commented Apr 4, 2024 •
edited
Loading

️✅ There are no secrets present in this pull request anymore.

If these secrets were true positive and are still valid, we highly recommend you to revoke them.
Once a secret has been leaked into a git repository, you should consider it compromised, even if it was deleted immediately.
Find here more information about risks.

🦉 GitGuardian detects secrets in your source code to help developers and security teams secure the modern development process. You are seeing this because you or someone else with access to this repository has authorized GitGuardian to scan your pull request.

Our GitHub checks need improvements? Share your feedbacks!

@MarcWadai MarcWadai self-assigned this Apr 4, 2024
estellecomment
estellecomment reviewed Apr 8, 2024
View reviewed changes
README.md Outdated Show resolved Hide resolved
estellecomment
estellecomment reviewed Apr 8, 2024
View reviewed changes
README.md Outdated Show resolved Hide resolved
estellecomment
estellecomment reviewed Apr 8, 2024
View reviewed changes
README.md Outdated Show resolved Hide resolved
@estellecomment estellecomment mentioned this pull request Apr 8, 2024
Closed
@estellecomment
Copy link
Contributor

estellecomment commented Apr 8, 2024 •
edited by MarcWadai
Loading

todo :

  • after each :TCHAP: comment, add the corresponding patch name (so we can continue tracking features)

(This PR is too bug to visualize, so I don't know if it's already done :)

@MarcWadai MarcWadai force-pushed the develop_tchap_subtree branch 4 times, most recently from caf8012 to acad8db Compare April 11, 2024 16:35
marc.sirisak added 3 commits April 13, 2024 09:27
fix(subtree): hardcorded yarn-dep in translations script
f97d0bc
Squashed 'linked-dependencies/matrix-react-sdk/' content from commit …
9a8057d 
…3c5eba3c64

git-subtree-dir: linked-dependencies/matrix-react-sdk
git-subtree-split: 3c5eba3c6489d7efe5ad127e0126213bf0485164
Merge commit '9a8057d6fcee0ab849f05305f5154a6d2fc959d2' as 'linked-de…
d2807b7 
…pendencies/matrix-react-sdk'
@MarcWadai MarcWadai force-pushed the develop_tchap_subtree branch 2 times, most recently from d62c8aa to ed95e56 Compare April 13, 2024 10:23
@MarcWadai
Copy link
Contributor Author

@estellecomment you can check the last commit in which i added all the patch name in the comments of tchap modifications

estellecomment
estellecomment reviewed Apr 15, 2024
View reviewed changes
jest.config.ts Outdated Show resolved Hide resolved
jest.config.ts Outdated Show resolved Hide resolved
jest.config.ts Outdated Show resolved Hide resolved
estellecomment
estellecomment reviewed Apr 15, 2024
View reviewed changes
README.md Outdated Show resolved Hide resolved
@MarcWadai MarcWadai merged commit 564df18 into develop_tchap Apr 17, 2024
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@estellecomment estellecomment estellecomment left review comments

Assignees

@MarcWadai MarcWadai

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@MarcWadai @estellecomment