merge: branch 'master' into production

This commit is contained in:
Paul Makles 2022-09-08 21:28:25 +01:00
commit 1016d80e56
5 changed files with 15 additions and 11 deletions

3
.gitmodules vendored
View file

@ -4,3 +4,6 @@
[submodule "external/components"] [submodule "external/components"]
path = external/components path = external/components
url = https://github.com/revoltchat/components url = https://github.com/revoltchat/components
[submodule "external/revolt.js"]
path = external/revolt.js
url = https://github.com/revoltchat/revolt.js

View file

@ -43,7 +43,7 @@ Get revite up and running locally.
git clone --recursive https://github.com/revoltchat/revite git clone --recursive https://github.com/revoltchat/revite
cd revite cd revite
yarn yarn
yarn build:components yarn build:deps
yarn dev yarn dev
``` ```
@ -56,7 +56,7 @@ You can now access the client at http://local.revolt.chat:3000.
| `yarn pull` | Setup assets required for Revite. | | `yarn pull` | Setup assets required for Revite. |
| `yarn dev` | Start the Revolt client in development mode. | | `yarn dev` | Start the Revolt client in development mode. |
| `yarn build` | Build the Revolt client. | | `yarn build` | Build the Revolt client. |
| `yarn build:components` | Build the Revolt components library. | | `yarn build:deps` | Build external dependencies. |
| `yarn preview` | Start a local server with the built client. | | `yarn preview` | Start a local server with the built client. |
| `yarn lint` | Run ESLint on the client. | | `yarn lint` | Run ESLint on the client. |
| `yarn fmt` | Run Prettier on the client. | | `yarn fmt` | Run Prettier on the client. |

1
external/revolt.js vendored Submodule

@ -0,0 +1 @@
Subproject commit 044b1b91ee583bfb89fff140ecda29a32f6535aa

View file

@ -3,8 +3,8 @@
"scripts": { "scripts": {
"dev": "node scripts/setup_assets.js --check && vite", "dev": "node scripts/setup_assets.js --check && vite",
"pull": "node scripts/setup_assets.js", "pull": "node scripts/setup_assets.js",
"build:components": "cd external && cd components && yarn && yarn build:esm", "build:deps": "cd external && cd components && yarn && yarn build:esm && cd .. && cd revolt.js && yarn && yarn build",
"build": "yarn && rimraf build && node scripts/setup_assets.js --check && yarn build:components && vite build", "build": "yarn && rimraf build && node scripts/setup_assets.js --check && yarn build:deps && vite build",
"build:highmem": "NODE_OPTIONS='--max-old-space-size=4096' yarn build", "build:highmem": "NODE_OPTIONS='--max-old-space-size=4096' yarn build",
"preview": "vite preview", "preview": "vite preview",
"lint": "eslint src/**/*.{js,jsx,ts,tsx}", "lint": "eslint src/**/*.{js,jsx,ts,tsx}",
@ -44,7 +44,6 @@
} }
}, },
"dependencies": { "dependencies": {
"@revoltchat/ui": "^1.0.77",
"fs-extra": "^10.0.0", "fs-extra": "^10.0.0",
"klaw": "^3.0.0", "klaw": "^3.0.0",
"sirv-cli": "^1.0.14", "sirv-cli": "^1.0.14",
@ -77,6 +76,7 @@
"@hcaptcha/react-hcaptcha": "^0.3.6", "@hcaptcha/react-hcaptcha": "^0.3.6",
"@insertish/vite-plugin-babel-macros": "^1.0.5", "@insertish/vite-plugin-babel-macros": "^1.0.5",
"@preact/preset-vite": "^2.0.0", "@preact/preset-vite": "^2.0.0",
"@revoltchat/ui": "^1.0.77",
"@rollup/plugin-replace": "^2.4.2", "@rollup/plugin-replace": "^2.4.2",
"@styled-icons/boxicons-logos": "^10.38.0", "@styled-icons/boxicons-logos": "^10.38.0",
"@styled-icons/boxicons-regular": "^10.38.0", "@styled-icons/boxicons-regular": "^10.38.0",
@ -169,6 +169,7 @@
"license": "MIT", "license": "MIT",
"packageManager": "yarn@3.2.0", "packageManager": "yarn@3.2.0",
"resolutions": { "resolutions": {
"@revoltchat/ui": "portal:external/components" "@revoltchat/ui": "portal:external/components",
"revolt.js": "portal:external/revolt.js"
} }
} }

View file

@ -8023,9 +8023,9 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"revolt.js@npm:6.0.17": "revolt.js@portal:external/revolt.js::locator=client%40workspace%3A.":
version: 6.0.17 version: 0.0.0-use.local
resolution: "revolt.js@npm:6.0.17" resolution: "revolt.js@portal:external/revolt.js::locator=client%40workspace%3A."
dependencies: dependencies:
"@insertish/exponential-backoff": 3.1.0-patch.2 "@insertish/exponential-backoff": 3.1.0-patch.2
"@insertish/isomorphic-ws": ^4.0.1 "@insertish/isomorphic-ws": ^4.0.1
@ -8039,9 +8039,8 @@ __metadata:
revolt-api: 0.5.5-3 revolt-api: 0.5.5-3
ulid: ^2.3.0 ulid: ^2.3.0
ws: ^8.2.2 ws: ^8.2.2
checksum: 2879483d0a3035dbca67da52ff9d74e9f2cc7e7e5421f95605ae99c38f501180e74b95b3482577c0256431b11ba867687da678a6be2bbdb672c39baebe69c13a
languageName: node languageName: node
linkType: hard linkType: soft
"rimraf@npm:^3.0.2": "rimraf@npm:^3.0.2":
version: 3.0.2 version: 3.0.2