Skip to content

Commit

Permalink
feat(subtree): update install script to link our linked-dep directory
Browse files Browse the repository at this point in the history
  • Loading branch information
marc.sirisak committed Apr 15, 2024
1 parent 3fd6690 commit a13c6e1
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
"coverage": "yarn test --coverage",
"analyse:unused-exports": "ts-node ./scripts/analyse_unused_exports.ts",
"patch-package": "patch-package",
"patches-reapply": "cd linked-dependencies/matrix-react-sdk; git checkout .; cd ../matrix-js-sdk; git checkout .; cd ../..; ./scripts/tchap/apply_patches.sh",
"patches-reapply": "cd .yarn-linked-dependencies/matrix-js-sdk; git checkout .; cd ../..; ./scripts/tchap/apply_patches.sh",
"patch-make": "node scripts/tchap/makePatch.ts",
"analyse:webpack-bundles": "webpack-bundle-analyzer webpack-stats.json webapp",
"update:jitsi": "curl -s https://meet.element.io/libs/external_api.min.js > ./res/jitsi_external_api.min.js"
Expand Down
13 changes: 8 additions & 5 deletions scripts/tchap/install-yarn-linked-repositories.sh
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,15 @@ popd
# #yarn link @matrix-org/analytics-events # :TCHAP: we don't use this
# yarn install --pure-lockfile
# popd
cd ../linked-dependencies/matrix-react-sdk
yarn unlink # :TCHAP: for local build, undo previous links if present.
yarn link
yarn install --pure-lockfile

# :TCHAP: we are now in linked-dependencies, go back out to tchap-web-v4 dir
cd ..

# :TCHAP: yarn-link modules
cd .. # go back to root

for d in modules/*/ ; do
echo "Linking $d ..."
pushd $d
Expand All @@ -78,9 +82,8 @@ done

# Link the layers into element-web
yarn link matrix-js-sdk
yarn link matrix-react-sdk

# yarn link matrix-react-sdk
yarn install --pure-lockfile


cd ./linked-dependencies/matrix-react-sdk
yarn install

0 comments on commit a13c6e1

Please sign in to comment.