Merge branch 'develop' of ssh://github.com/element-hq/element-web into t3chguy/merge-modules
# Conflicts: # pnpm-lock.yaml # pnpm-workspace.yaml
This commit is contained in:
@@ -55,7 +55,15 @@ export default {
|
||||
// Brought in via hak scripts
|
||||
"matrix-seshat",
|
||||
],
|
||||
ignoreBinaries: ["scripts/in-docker.sh"],
|
||||
ignoreBinaries: [
|
||||
"scripts/in-docker.sh",
|
||||
// Used to build seshat (optional)
|
||||
"rustc",
|
||||
// Used by the fetch-package script (optional)
|
||||
"gpg",
|
||||
// Used for the macOS universal builds
|
||||
"lipo",
|
||||
],
|
||||
},
|
||||
"modules/*": {
|
||||
entry: "src/index.ts{x,}",
|
||||
|
||||
Reference in New Issue
Block a user