mirror of
https://github.com/element-hq/element-web
synced 2024-11-22 09:15:41 +03:00
Merge branch 'develop' of https://github.com/vector-im/element-web into t3chguy/intl-segmenter-modernizr
# Conflicts: # src/vector/index.ts
This commit is contained in:
commit
be92e64458
7 changed files with 16 additions and 26 deletions
1
.github/workflows/build.yml
vendored
1
.github/workflows/build.yml
vendored
|
@ -37,6 +37,7 @@ jobs:
|
||||||
- uses: actions/setup-node@v4
|
- uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
cache: "yarn"
|
cache: "yarn"
|
||||||
|
node-version: "lts/*"
|
||||||
|
|
||||||
# Workaround for yarn install timeouts, especially on Windows
|
# Workaround for yarn install timeouts, especially on Windows
|
||||||
- run: yarn config set network-timeout 300000
|
- run: yarn config set network-timeout 300000
|
||||||
|
|
1
.github/workflows/build_develop.yml
vendored
1
.github/workflows/build_develop.yml
vendored
|
@ -26,6 +26,7 @@ jobs:
|
||||||
- uses: actions/setup-node@v4
|
- uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
cache: "yarn"
|
cache: "yarn"
|
||||||
|
node-version: "lts/*"
|
||||||
|
|
||||||
- name: Install Dependencies
|
- name: Install Dependencies
|
||||||
run: "./scripts/layered.sh"
|
run: "./scripts/layered.sh"
|
||||||
|
|
5
.github/workflows/static_analysis.yaml
vendored
5
.github/workflows/static_analysis.yaml
vendored
|
@ -21,6 +21,7 @@ jobs:
|
||||||
- uses: actions/setup-node@v4
|
- uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
cache: "yarn"
|
cache: "yarn"
|
||||||
|
node-version: "lts/*"
|
||||||
|
|
||||||
- name: Install Dependencies
|
- name: Install Dependencies
|
||||||
run: "./scripts/layered.sh"
|
run: "./scripts/layered.sh"
|
||||||
|
@ -43,6 +44,7 @@ jobs:
|
||||||
- uses: actions/setup-node@v4
|
- uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
cache: "yarn"
|
cache: "yarn"
|
||||||
|
node-version: "lts/*"
|
||||||
|
|
||||||
# Does not need branch matching as only analyses this layer
|
# Does not need branch matching as only analyses this layer
|
||||||
- name: Install Deps
|
- name: Install Deps
|
||||||
|
@ -60,6 +62,7 @@ jobs:
|
||||||
- uses: actions/setup-node@v4
|
- uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
cache: "yarn"
|
cache: "yarn"
|
||||||
|
node-version: "lts/*"
|
||||||
|
|
||||||
# Needs branch matching as it inherits .stylelintrc.js from matrix-react-sdk
|
# Needs branch matching as it inherits .stylelintrc.js from matrix-react-sdk
|
||||||
- name: Install Dependencies
|
- name: Install Dependencies
|
||||||
|
@ -77,6 +80,7 @@ jobs:
|
||||||
- uses: actions/setup-node@v4
|
- uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
cache: "yarn"
|
cache: "yarn"
|
||||||
|
node-version: "lts/*"
|
||||||
|
|
||||||
# Does not need branch matching as only analyses this layer
|
# Does not need branch matching as only analyses this layer
|
||||||
- name: Install Deps
|
- name: Install Deps
|
||||||
|
@ -94,6 +98,7 @@ jobs:
|
||||||
- uses: actions/setup-node@v4
|
- uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
cache: "yarn"
|
cache: "yarn"
|
||||||
|
node-version: "lts/*"
|
||||||
|
|
||||||
- name: Install Deps
|
- name: Install Deps
|
||||||
run: "scripts/layered.sh"
|
run: "scripts/layered.sh"
|
||||||
|
|
1
.github/workflows/tests.yaml
vendored
1
.github/workflows/tests.yaml
vendored
|
@ -23,6 +23,7 @@ jobs:
|
||||||
uses: actions/setup-node@v4
|
uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
cache: "yarn"
|
cache: "yarn"
|
||||||
|
node-version: "lts/*"
|
||||||
|
|
||||||
- name: Install Dependencies
|
- name: Install Dependencies
|
||||||
run: "./scripts/layered.sh"
|
run: "./scripts/layered.sh"
|
||||||
|
|
1
.github/workflows/update-jitsi.yml
vendored
1
.github/workflows/update-jitsi.yml
vendored
|
@ -13,6 +13,7 @@ jobs:
|
||||||
- uses: actions/setup-node@v4
|
- uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
cache: "yarn"
|
cache: "yarn"
|
||||||
|
node-version: "lts/*"
|
||||||
|
|
||||||
- name: Install Deps
|
- name: Install Deps
|
||||||
run: "yarn install --frozen-lockfile"
|
run: "yarn install --frozen-lockfile"
|
||||||
|
|
|
@ -81,31 +81,6 @@
|
||||||
<img src="<%= require('matrix-react-sdk/res/img/format/quote.svg').default %>" aria-hidden alt="" width="25" height="22" style="visibility: hidden; position: absolute; top: 0px; left: 0px;"/>
|
<img src="<%= require('matrix-react-sdk/res/img/format/quote.svg').default %>" aria-hidden alt="" width="25" height="22" style="visibility: hidden; position: absolute; top: 0px; left: 0px;"/>
|
||||||
<img src="<%= require('matrix-react-sdk/res/img/format/strikethrough.svg').default %>" aria-hidden alt="" width="25" height="22" style="visibility: hidden; position: absolute; top: 0px; left: 0px;"/>
|
<img src="<%= require('matrix-react-sdk/res/img/format/strikethrough.svg').default %>" aria-hidden alt="" width="25" height="22" style="visibility: hidden; position: absolute; top: 0px; left: 0px;"/>
|
||||||
|
|
||||||
<audio id="messageAudio">
|
|
||||||
<source src="media/message.ogg" type="audio/ogg" />
|
|
||||||
<source src="media/message.mp3" type="audio/mpeg" />
|
|
||||||
</audio>
|
|
||||||
<audio id="ringAudio" loop>
|
|
||||||
<source src="media/ring.ogg" type="audio/ogg" />
|
|
||||||
<source src="media/ring.mp3" type="audio/mpeg" />
|
|
||||||
</audio>
|
|
||||||
<audio id="ringbackAudio" loop>
|
|
||||||
<source src="media/ringback.ogg" type="audio/ogg" />
|
|
||||||
<source src="media/ringback.mp3" type="audio/mpeg" />
|
|
||||||
</audio>
|
|
||||||
<audio id="callendAudio">
|
|
||||||
<source src="media/callend.ogg" type="audio/ogg" />
|
|
||||||
<source src="media/callend.mp3" type="audio/mpeg" />
|
|
||||||
</audio>
|
|
||||||
<audio id="busyAudio">
|
|
||||||
<source src="media/busy.ogg" type="audio/ogg" />
|
|
||||||
<source src="media/busy.mp3" type="audio/mpeg" />
|
|
||||||
</audio>
|
|
||||||
<audio id="errorAudio">
|
|
||||||
<source src="media/error.ogg" type="audio/ogg" />
|
|
||||||
<source src="media/error.mp3" type="audio/mpeg" />
|
|
||||||
</audio>
|
|
||||||
<audio id="remoteAudio"></audio>
|
|
||||||
<!-- let CSS themes pass constants to the app -->
|
<!-- let CSS themes pass constants to the app -->
|
||||||
<div id="mx_theme_accentColor"></div><div id="mx_theme_secondaryAccentColor"></div><div id="mx_theme_tertiaryAccentColor"></div>
|
<div id="mx_theme_accentColor"></div><div id="mx_theme_secondaryAccentColor"></div><div id="mx_theme_tertiaryAccentColor"></div>
|
||||||
|
|
||||||
|
|
|
@ -56,7 +56,8 @@ function checkBrowserFeatures(): boolean {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Custom checks atop Modernizr because it doesn't have modern checks in it for some features we depend on.
|
// Custom checks atop Modernizr because it doesn't have checks in it for
|
||||||
|
// some features we depend on.
|
||||||
// Modernizr requires rules to be lowercase with no punctuation.
|
// Modernizr requires rules to be lowercase with no punctuation.
|
||||||
// ES2018: http://262.ecma-international.org/9.0/#sec-promise.prototype.finally
|
// ES2018: http://262.ecma-international.org/9.0/#sec-promise.prototype.finally
|
||||||
window.Modernizr.addTest("promiseprototypefinally", () => typeof window.Promise?.prototype?.finally === "function");
|
window.Modernizr.addTest("promiseprototypefinally", () => typeof window.Promise?.prototype?.finally === "function");
|
||||||
|
@ -69,6 +70,11 @@ function checkBrowserFeatures(): boolean {
|
||||||
);
|
);
|
||||||
// ES2019: http://262.ecma-international.org/10.0/#sec-object.fromentries
|
// ES2019: http://262.ecma-international.org/10.0/#sec-object.fromentries
|
||||||
window.Modernizr.addTest("objectfromentries", () => typeof window.Object?.fromEntries === "function");
|
window.Modernizr.addTest("objectfromentries", () => typeof window.Object?.fromEntries === "function");
|
||||||
|
// ES2024: https://tc39.es/ecma262/2024/#sec-get-regexp.prototype.unicodesets
|
||||||
|
window.Modernizr.addTest(
|
||||||
|
"regexpunicodesets",
|
||||||
|
() => window.RegExp?.prototype && "unicodeSets" in window.RegExp.prototype,
|
||||||
|
);
|
||||||
// ES2024: https://402.ecma-international.org/9.0/#sec-intl.segmenter
|
// ES2024: https://402.ecma-international.org/9.0/#sec-intl.segmenter
|
||||||
window.Modernizr.addTest("intlsegmenter", () => typeof window.Intl?.Segmenter === "function");
|
window.Modernizr.addTest("intlsegmenter", () => typeof window.Intl?.Segmenter === "function");
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue