Compare commits
14
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a1568f3523 | ||
|
|
4fe4c8bb03 | ||
|
|
1302682900 | ||
|
|
62e0821be2 | ||
|
|
856e616247 | ||
|
|
71fdba3c4a | ||
|
|
7803bd5c06 | ||
|
|
8dc9e01439 | ||
|
|
1d6ce13a6c | ||
|
|
6a907b1542 | ||
|
|
bef759e358 | ||
|
|
63023c5266 | ||
|
|
b6f2f9998e | ||
|
|
6d9115f593 |
No files matched your search
@@ -16,7 +16,7 @@ jobs:
|
||||
- name: Setup node
|
||||
uses: actions/setup-node@v3.5.1
|
||||
with:
|
||||
node-version: 17.9.0
|
||||
node-version: 18.12.1
|
||||
cache: 'npm'
|
||||
- name: Install dependencies
|
||||
run: npm ci
|
||||
@@ -35,4 +35,4 @@ jobs:
|
||||
with:
|
||||
name: pr
|
||||
path: ./pr.txt
|
||||
retention-days: 1
|
||||
retention-days: 1
|
||||
@@ -20,7 +20,7 @@ jobs:
|
||||
name: pr
|
||||
- name: Output pr number
|
||||
id: pr
|
||||
run: echo "::set-output name=id::$(<pr.txt)"
|
||||
run: echo "id=$(<pr.txt)" >> $GITHUB_OUTPUT
|
||||
- name: Download artifact
|
||||
uses: dawidd6/action-download-artifact@46b4ae883bf0726f5949d025d31cb62c7a5ac70c
|
||||
with:
|
||||
|
||||
@@ -15,7 +15,7 @@ jobs:
|
||||
- name: Setup node
|
||||
uses: actions/setup-node@v3.5.1
|
||||
with:
|
||||
node-version: 17.9.0
|
||||
node-version: 18.12.1
|
||||
cache: 'npm'
|
||||
- name: Install dependencies
|
||||
run: npm ci
|
||||
|
||||
@@ -14,7 +14,7 @@ jobs:
|
||||
- name: Setup node
|
||||
uses: actions/setup-node@v3.5.1
|
||||
with:
|
||||
node-version: 17.9.0
|
||||
node-version: 18.12.1
|
||||
cache: 'npm'
|
||||
- name: Install dependencies
|
||||
run: npm ci
|
||||
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
## Builder
|
||||
FROM node:17.9.0-alpine3.15 as builder
|
||||
FROM node:18.12.0-alpine3.15 as builder
|
||||
|
||||
WORKDIR /src
|
||||
|
||||
|
||||
@@ -84,7 +84,7 @@ UeGsouhyuITLwEhScounZDqop+Dx
|
||||
|
||||
## Local development
|
||||
> We recommend using a version manager as versions change very quickly. You will likely need to switch
|
||||
between multiple Node.js versions based on the needs of different projects you're working on. [NVM on windows](https://github.com/coreybutler/nvm-windows#installation--upgrades) on Windows and [nvm](https://github.com/nvm-sh/nvm) on Linux/macOS are pretty good choices. Also recommended nodejs version is 16.15.0 LTS.
|
||||
between multiple Node.js versions based on the needs of different projects you're working on. [NVM on windows](https://github.com/coreybutler/nvm-windows#installation--upgrades) on Windows and [nvm](https://github.com/nvm-sh/nvm) on Linux/macOS are pretty good choices. Also recommended nodejs version Hydrogen LTS (v18).
|
||||
|
||||
Execute the following commands to start a development server:
|
||||
```sh
|
||||
|
||||
Generated
+884
-1469
File diff suppressed because it is too large.
Load diff
+10
-11
@@ -4,8 +4,7 @@
|
||||
"description": "Yet another matrix client",
|
||||
"main": "index.js",
|
||||
"engines": {
|
||||
"npm": ">=6.14.8",
|
||||
"node": ">=14.15.0"
|
||||
"node": ">=16.0.0"
|
||||
},
|
||||
"scripts": {
|
||||
"start": "webpack serve --config ./webpack.dev.js --open",
|
||||
@@ -21,7 +20,7 @@
|
||||
"@matrix-org/olm": "3.2.13",
|
||||
"@tippyjs/react": "4.2.6",
|
||||
"babel-polyfill": "6.26.0",
|
||||
"blurhash": "2.0.3",
|
||||
"blurhash": "2.0.4",
|
||||
"browser-encrypt-attachment": "0.3.0",
|
||||
"dateformat": "5.0.3",
|
||||
"emojibase-data": "7.0.1",
|
||||
@@ -32,7 +31,7 @@
|
||||
"katex": "0.16.3",
|
||||
"linkify-html": "4.0.2",
|
||||
"linkifyjs": "4.0.2",
|
||||
"matrix-js-sdk": "20.1.0",
|
||||
"matrix-js-sdk": "21.0.1",
|
||||
"prop-types": "15.8.1",
|
||||
"react": "17.0.2",
|
||||
"react-autosize-textarea": "7.1.0",
|
||||
@@ -42,24 +41,24 @@
|
||||
"react-dom": "17.0.2",
|
||||
"react-google-recaptcha": "2.1.0",
|
||||
"react-modal": "3.16.1",
|
||||
"sanitize-html": "2.7.2",
|
||||
"sanitize-html": "2.7.3",
|
||||
"tippy.js": "6.3.7",
|
||||
"twemoji": "14.0.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@babel/core": "7.19.6",
|
||||
"@babel/preset-env": "7.19.4",
|
||||
"@babel/core": "7.20.2",
|
||||
"@babel/preset-env": "7.20.2",
|
||||
"@babel/preset-react": "7.18.6",
|
||||
"assert": "2.0.0",
|
||||
"babel-loader": "8.2.5",
|
||||
"babel-loader": "9.1.0",
|
||||
"browserify-fs": "1.0.0",
|
||||
"buffer": "6.0.3",
|
||||
"clean-webpack-plugin": "4.0.0",
|
||||
"copy-webpack-plugin": "11.0.0",
|
||||
"crypto-browserify": "3.12.0",
|
||||
"css-loader": "6.7.1",
|
||||
"css-minimizer-webpack-plugin": "4.1.0",
|
||||
"eslint": "8.26.0",
|
||||
"css-minimizer-webpack-plugin": "4.2.2",
|
||||
"eslint": "8.27.0",
|
||||
"eslint-config-airbnb": "19.0.4",
|
||||
"eslint-plugin-import": "2.26.0",
|
||||
"eslint-plugin-jsx-a11y": "6.6.1",
|
||||
@@ -69,7 +68,7 @@
|
||||
"html-webpack-plugin": "5.5.0",
|
||||
"mini-css-extract-plugin": "2.6.1",
|
||||
"path-browserify": "1.0.1",
|
||||
"sass": "1.55.0",
|
||||
"sass": "1.56.0",
|
||||
"sass-loader": "13.1.0",
|
||||
"stream-browserify": "3.0.0",
|
||||
"style-loader": "3.3.1",
|
||||
|
||||
@@ -27,9 +27,7 @@ function ImagePackUpload({ onUpload }) {
|
||||
|
||||
setProgress(true);
|
||||
const image = await scaleDownImage(imgFile, 512, 512);
|
||||
const url = await mx.uploadContent(image, {
|
||||
onlyContentUri: true,
|
||||
});
|
||||
const { content_uri: url } = await mx.uploadContent(image);
|
||||
|
||||
onUpload(shortcode, url);
|
||||
setProgress(false);
|
||||
|
||||
@@ -22,7 +22,7 @@ function ImageUpload({
|
||||
const file = e.target.files.item(0);
|
||||
if (file === null) return;
|
||||
try {
|
||||
const uPromise = initMatrix.matrixClient.uploadContent(file, { onlyContentUri: false });
|
||||
const uPromise = initMatrix.matrixClient.uploadContent(file);
|
||||
setUploadPromise(uPromise);
|
||||
|
||||
const res = await uPromise;
|
||||
|
||||
@@ -236,16 +236,12 @@ async function createRoom(opts) {
|
||||
});
|
||||
}
|
||||
if (parentId && joinRule === 'restricted') {
|
||||
try {
|
||||
const caps = await mx.getCapabilities();
|
||||
options.room_version = caps
|
||||
?.['m.room_versions']
|
||||
?.['org.matrix.msc3244.room_capabilities']
|
||||
?.restricted
|
||||
?.preferred
|
||||
|| undefined;
|
||||
} catch {
|
||||
console.error('Can\'t find room version for restricted.');
|
||||
const caps = await mx.getCapabilities();
|
||||
if (caps['m.room_versions'].available?.['9'] !== 'stable') {
|
||||
throw new Error("ERROR: The server doesn't support restricted rooms");
|
||||
}
|
||||
if (Number(caps['m.room_versions'].default) < 9) {
|
||||
options.room_version = '9';
|
||||
}
|
||||
options.initial_state.push({
|
||||
type: 'm.room.join_rules',
|
||||
|
||||
@@ -395,7 +395,7 @@ class RoomsInput extends EventEmitter {
|
||||
input.attachment.uploadingPromise = uploadingPromise;
|
||||
this.roomIdToInput.set(roomId, input);
|
||||
|
||||
const url = await uploadingPromise;
|
||||
const { content_uri: url } = await uploadingPromise;
|
||||
|
||||
delete input.attachment.uploadingPromise;
|
||||
this.roomIdToInput.set(roomId, input);
|
||||
|
||||
Reference in new issue
Block a user