Compare commits

..
Author SHA1 Message Date
Krishan d21ad3a91e Update prod-deploy.yml 2022-06-14 19:52:45 +05:30
Krishan fc45f81ec2 Update netlify-dev.yml 2022-06-14 19:52:13 +05:30
Krishan 959091f7f3 Update build-pull-request.yml 2022-06-14 19:50:28 +05:30
Ajay Bura 923b37e4b2 Update build-pull-request.yml 2022-06-14 15:46:43 +05:30
Ajay Bura b770780fb4 Update netlify-dev.yml 2022-06-14 15:46:13 +05:30
Ajay Bura d7c991a19f Update prod-deploy.yml 2022-06-14 15:45:10 +05:30
10 changed files with 1227 additions and 1243 deletions

No files matched your search

+1 -1
View File
@@ -19,7 +19,7 @@ jobs:
with:
node-version: 17.9.0
- name: Build and deploy to Netlify
uses: jsmrcaga/action-netlify-deploy@53de32e559b0b3833615b9788c7a090cd2fddb03
uses: jsmrcaga/action-netlify-deploy@fb6a5f936a4b06a8f7793e69fc5a022ffe39807a
with:
install_command: "npm ci"
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
+1 -1
View File
@@ -54,7 +54,7 @@ jobs:
with:
node-version: 17.9.0
- name: Build and deploy to Netlify
uses: jsmrcaga/action-netlify-deploy@53de32e559b0b3833615b9788c7a090cd2fddb03
uses: jsmrcaga/action-netlify-deploy@fb6a5f936a4b06a8f7793e69fc5a022ffe39807a
with:
install_command: "npm ci"
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
+1 -1
View File
@@ -10,7 +10,7 @@ RUN npm run build
## App
FROM nginx:1.23.0-alpine
FROM nginx:1.21.6-alpine
COPY --from=builder /src/dist /app
+2 -2
View File
@@ -6,7 +6,7 @@
"halogen.city",
"kde.org",
"matrix.org",
"mozilla.org"
"chat.mozilla.org"
],
"allowCustomHomeservers": true
}
}
+1201 -1215
View File
File diff suppressed because it is too large. Load diff
+16 -17
View File
@@ -26,11 +26,10 @@
"file-saver": "^2.0.5",
"flux": "^4.0.3",
"formik": "^2.2.9",
"html-react-parser": "^2.0.0",
"html-react-parser": "^1.4.14",
"katex": "^0.15.6",
"linkify-html": "^4.0.0-beta.5",
"linkifyjs": "^4.0.0-beta.5",
"matrix-js-sdk": "^18.1.0",
"linkifyjs": "^2.1.9",
"matrix-js-sdk": "^18.0.0",
"micromark": "^3.0.10",
"micromark-extension-gfm": "^2.0.1",
"micromark-extension-math": "^2.0.2",
@@ -50,9 +49,9 @@
"twemoji": "^14.0.2"
},
"devDependencies": {
"@babel/core": "^7.18.6",
"@babel/preset-env": "^7.18.6",
"@babel/preset-react": "^7.18.6",
"@babel/core": "^7.18.2",
"@babel/preset-env": "^7.18.2",
"@babel/preset-react": "^7.17.12",
"assert": "^2.0.0",
"babel-loader": "^8.2.5",
"browserify-fs": "^1.0.0",
@@ -62,27 +61,27 @@
"crypto-browserify": "^3.12.0",
"css-loader": "^6.7.1",
"css-minimizer-webpack-plugin": "^4.0.0",
"eslint": "^8.19.0",
"eslint": "^8.17.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-jsx-a11y": "^6.6.0",
"eslint-plugin-react": "^7.30.1",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-jsx-a11y": "^6.4.1",
"eslint-plugin-react": "^7.30.0",
"eslint-plugin-react-hooks": "^4.5.0",
"favicons": "^6.2.2",
"favicons-webpack-plugin": "^5.0.2",
"html-loader": "^3.1.2",
"html-loader": "^3.1.0",
"html-webpack-plugin": "^5.3.1",
"mini-css-extract-plugin": "^2.6.1",
"mini-css-extract-plugin": "^2.6.0",
"path-browserify": "^1.0.1",
"sass": "^1.53.0",
"sass-loader": "^13.0.2",
"sass": "^1.52.2",
"sass-loader": "^13.0.0",
"stream-browserify": "^3.0.0",
"style-loader": "^3.3.1",
"url": "^0.11.0",
"util": "^0.12.4",
"webpack": "^5.73.0",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^4.9.3",
"webpack-cli": "^4.9.2",
"webpack-dev-server": "^4.9.2",
"webpack-merge": "^5.7.3"
}
}
@@ -118,7 +118,7 @@ function RoomAliases({ roomId }) {
const loadLocalAliases = async () => {
let local = [];
try {
const result = await mx.getLocalAliases(roomId);
const result = await mx.unstableGetLocalAliases(roomId);
local = result.aliases.filter((alias) => !aliases.published.includes(alias));
} catch {
local = [];
+2 -3
View File
@@ -1,6 +1,5 @@
import emojisData from 'emojibase-data/en/compact.json';
import joypixels from 'emojibase-data/en/shortcodes/joypixels.json';
import emojibase from 'emojibase-data/en/shortcodes/emojibase.json';
import shortcodes from 'emojibase-data/en/shortcodes/joypixels.json';
const emojiGroups = [{
name: 'Smileys & people',
@@ -53,7 +52,7 @@ function addToGroup(emoji) {
const emojis = [];
emojisData.forEach((emoji) => {
const myShortCodes = joypixels[emoji.hexcode] || emojibase[emoji.hexcode];
const myShortCodes = shortcodes[emoji.hexcode];
if (!myShortCodes) return;
const em = {
...emoji,
+1 -1
View File
@@ -44,7 +44,7 @@ function transformSpanTag(tagName, attribs) {
}
function transformATag(tagName, attribs) {
const userLink = decodeURIComponent(attribs.href).match(/^https?:\/\/matrix.to\/#\/(@.+:.+)/);
const userLink = attribs.href.match(/^https?:\/\/matrix.to\/#\/(@.+:.+)/);
if (userLink !== null) {
// convert user link to pill
const userId = userLink[1];
+1 -1
View File
@@ -1,7 +1,7 @@
/* eslint-disable import/prefer-default-export */
import React, { lazy, Suspense } from 'react';
import linkifyHtml from 'linkify-html';
import linkifyHtml from 'linkifyjs/html';
import parse from 'html-react-parser';
import twemoji from 'twemoji';
import { sanitizeText } from './sanitize';