diff --git a/knip.ts b/knip.ts index ddd68b6a97..b1696765b7 100644 --- a/knip.ts +++ b/knip.ts @@ -48,6 +48,9 @@ export default { // would with a normal library). "@types/content-type", "@types/sdp-transform", + + // Used in EW but failed because of "link:" + "@element-hq/web-shared-components", ], ignoreBinaries: [ // Used in scripts & workflows diff --git a/package.json b/package.json index 38bf708029..e646b7145f 100644 --- a/package.json +++ b/package.json @@ -65,6 +65,7 @@ "coverage": "yarn test --coverage", "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", + "install": "yarn --cwd packages/shared-components install --frozen-lockfile", "postinstall": "patch-package" }, "resolutions": { @@ -83,7 +84,7 @@ "dependencies": { "@babel/runtime": "^7.12.5", "@element-hq/element-web-module-api": "1.5.0", - "@element-hq/web-shared-components": "file:packages/shared-components", + "@element-hq/web-shared-components": "link:packages/shared-components", "@fontsource/inconsolata": "^5", "@fontsource/inter": "^5", "@formatjs/intl-segmenter": "^11.5.7", diff --git a/scripts/docker-package.sh b/scripts/docker-package.sh index 29b9c4e75e..61f89c6c83 100755 --- a/scripts/docker-package.sh +++ b/scripts/docker-package.sh @@ -18,9 +18,4 @@ fi DIST_VERSION=$("$DIR"/normalize-version.sh "$DIST_VERSION") -yarn --cwd packages/shared-components install -yarn --cwd packages/shared-components link - -yarn link @element-hq/web-shared-components - VERSION=$DIST_VERSION yarn build diff --git a/scripts/layered.sh b/scripts/layered.sh index 0efdd7d226..3da209812d 100755 --- a/scripts/layered.sh +++ b/scripts/layered.sh @@ -44,11 +44,3 @@ fi yarn link matrix-js-sdk [ -d matrix-analytics-events ] && yarn link @matrix-org/analytics-events yarn install --frozen-lockfile $@ - -# Link shared components -pushd packages/shared-components -yarn link -yarn install --frozen-lockfile -popd - -yarn link @element-hq/web-shared-components diff --git a/yarn.lock b/yarn.lock index 20e11c7b12..1fcd6c88f2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1598,16 +1598,9 @@ testcontainers "^11.0.0" yaml "^2.7.0" -"@element-hq/web-shared-components@file:packages/shared-components": - version "0.0.0-test.7" - dependencies: - classnames "^2.5.1" - counterpart "^0.18.6" - lodash "^4.17.21" - matrix-web-i18n "^3.4.0" - patch-package "^8.0.1" - react-merge-refs "^3.0.2" - temporal-polyfill "^0.3.0" +"@element-hq/web-shared-components@link:packages/shared-components": + version "0.0.0" + uid "" "@emnapi/core@^1.5.0": version "1.5.0"