mirror of
https://github.com/CringeStudios/element-desktop.git
synced 2025-01-18 07:24:59 +01:00
Manal upgrade to prettier 3.4.2 (#2037)
Including the reformatting changes needed to make it pass again (mostly due to https://github.com/prettier/prettier/pull/15526).
This commit is contained in:
parent
cb88661aa0
commit
9327447538
8
.github/PULL_REQUEST_TEMPLATE.md
vendored
8
.github/PULL_REQUEST_TEMPLATE.md
vendored
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
## Checklist
|
## Checklist
|
||||||
|
|
||||||
- [ ] Ensure your code works with manual testing.
|
- [ ] Ensure your code works with manual testing.
|
||||||
- [ ] New or updated `public`/`exported` symbols have accurate [TSDoc](https://tsdoc.org/) documentation.
|
- [ ] New or updated `public`/`exported` symbols have accurate [TSDoc](https://tsdoc.org/) documentation.
|
||||||
- [ ] Linter and other CI checks pass.
|
- [ ] Linter and other CI checks pass.
|
||||||
- [ ] I have licensed the changes to Element by completing the [Contributor License Agreement (CLA)](https://cla-assistant.io/element-hq/element-desktop)
|
- [ ] I have licensed the changes to Element by completing the [Contributor License Agreement (CLA)](https://cla-assistant.io/element-hq/element-desktop)
|
||||||
|
14
README.md
14
README.md
@ -75,10 +75,10 @@ yarn run build
|
|||||||
|
|
||||||
This will do a couple of things:
|
This will do a couple of things:
|
||||||
|
|
||||||
- Run the `setversion` script to set the local package version to match whatever
|
- Run the `setversion` script to set the local package version to match whatever
|
||||||
version of Element you installed above.
|
version of Element you installed above.
|
||||||
- Run electron-builder to build a package. The package built will match the operating system
|
- Run electron-builder to build a package. The package built will match the operating system
|
||||||
you're running the build process on.
|
you're running the build process on.
|
||||||
|
|
||||||
## Docker
|
## Docker
|
||||||
|
|
||||||
@ -131,9 +131,9 @@ Alternatively, a custom location for the profile data can be specified using the
|
|||||||
|
|
||||||
# User-specified config.json
|
# User-specified config.json
|
||||||
|
|
||||||
- `%APPDATA%\$NAME\config.json` on Windows
|
- `%APPDATA%\$NAME\config.json` on Windows
|
||||||
- `$XDG_CONFIG_HOME/$NAME/config.json` or `~/.config/$NAME/config.json` on Linux
|
- `$XDG_CONFIG_HOME/$NAME/config.json` or `~/.config/$NAME/config.json` on Linux
|
||||||
- `~/Library/Application Support/$NAME/config.json` on macOS
|
- `~/Library/Application Support/$NAME/config.json` on macOS
|
||||||
|
|
||||||
In the paths above, `$NAME` is typically `Element`, unless you use `--profile
|
In the paths above, `$NAME` is typically `Element`, unless you use `--profile
|
||||||
$PROFILE` in which case it becomes `Element-$PROFILE`, or it is using one of
|
$PROFILE` in which case it becomes `Element-$PROFILE`, or it is using one of
|
||||||
|
@ -1,17 +1,17 @@
|
|||||||
# Summary
|
# Summary
|
||||||
|
|
||||||
- [Introduction](../README.md)
|
- [Introduction](../README.md)
|
||||||
|
|
||||||
# Build
|
# Build
|
||||||
|
|
||||||
- [Native Node modules](native-node-modules.md)
|
- [Native Node modules](native-node-modules.md)
|
||||||
- [Windows requirements](windows-requirements.md)
|
- [Windows requirements](windows-requirements.md)
|
||||||
|
|
||||||
# Distribution
|
# Distribution
|
||||||
|
|
||||||
- [Updates](updates.md)
|
- [Updates](updates.md)
|
||||||
- [Packaging](packaging.md)
|
- [Packaging](packaging.md)
|
||||||
|
|
||||||
# Setup
|
# Setup
|
||||||
|
|
||||||
- [Config](config.md)
|
- [Config](config.md)
|
||||||
|
@ -17,9 +17,9 @@ when releasing.
|
|||||||
|
|
||||||
Install the pre-requisites for your system:
|
Install the pre-requisites for your system:
|
||||||
|
|
||||||
- [Windows pre-requisites](https://github.com/vector-im/element-desktop/blob/develop/docs/windows-requirements.md)
|
- [Windows pre-requisites](https://github.com/vector-im/element-desktop/blob/develop/docs/windows-requirements.md)
|
||||||
- Linux: TODO
|
- Linux: TODO
|
||||||
- OS X: TODO
|
- OS X: TODO
|
||||||
|
|
||||||
Then optionally, [add seshat and dependencies to support search in E2E rooms](#adding-seshat-for-search-in-e2e-encrypted-rooms).
|
Then optionally, [add seshat and dependencies to support search in E2E rooms](#adding-seshat-for-search-in-e2e-encrypted-rooms).
|
||||||
|
|
||||||
|
@ -17,8 +17,8 @@ Simply go to https://github.com/vector-im/element-desktop/actions/workflows/buil
|
|||||||
|
|
||||||
For releasing Element Desktop, we assume the following prerequisites:
|
For releasing Element Desktop, we assume the following prerequisites:
|
||||||
|
|
||||||
- a tag of `element-desktop` repo with the Element Desktop version to be released set in `package.json`.
|
- a tag of `element-desktop` repo with the Element Desktop version to be released set in `package.json`.
|
||||||
- an Element Web tarball published to GitHub with a matching version number.
|
- an Element Web tarball published to GitHub with a matching version number.
|
||||||
|
|
||||||
**Both of these are done automatically when you run the release automation.**
|
**Both of these are done automatically when you run the release automation.**
|
||||||
|
|
||||||
|
@ -6,19 +6,19 @@ We rely on Github Actions `windows-2022` plus a few extra utilities as per [the
|
|||||||
|
|
||||||
If you want to build native modules, make sure that the following tools are installed on your system.
|
If you want to build native modules, make sure that the following tools are installed on your system.
|
||||||
|
|
||||||
- [Git for Windows](https://git-scm.com/download/win)
|
- [Git for Windows](https://git-scm.com/download/win)
|
||||||
- [Node 16](https://nodejs.org)
|
- [Node 16](https://nodejs.org)
|
||||||
- [Python 3](https://www.python.org/downloads/) (if you type 'python' into command prompt it will offer to install it from the windows store)
|
- [Python 3](https://www.python.org/downloads/) (if you type 'python' into command prompt it will offer to install it from the windows store)
|
||||||
- [Strawberry Perl](https://strawberryperl.com/)
|
- [Strawberry Perl](https://strawberryperl.com/)
|
||||||
- [Rustup](https://rustup.rs/)
|
- [Rustup](https://rustup.rs/)
|
||||||
- [NASM](https://www.nasm.us/)
|
- [NASM](https://www.nasm.us/)
|
||||||
- [Build Tools for Visual Studio 2019](https://visualstudio.microsoft.com/downloads/#build-tools-for-visual-studio-2019) with the following configuration:
|
- [Build Tools for Visual Studio 2019](https://visualstudio.microsoft.com/downloads/#build-tools-for-visual-studio-2019) with the following configuration:
|
||||||
- On the Workloads tab:
|
- On the Workloads tab:
|
||||||
- Desktop & Mobile -> C++ build tools
|
- Desktop & Mobile -> C++ build tools
|
||||||
- On the Individual components tab:
|
- On the Individual components tab:
|
||||||
- MSVC VS 2019 C++ build tools
|
- MSVC VS 2019 C++ build tools
|
||||||
- Windows 10 SDK (latest version available)
|
- Windows 10 SDK (latest version available)
|
||||||
- C++ CMake tools for Windows
|
- C++ CMake tools for Windows
|
||||||
|
|
||||||
Once installed make sure all those utilities are accessible in your `PATH`.
|
Once installed make sure all those utilities are accessible in your `PATH`.
|
||||||
|
|
||||||
|
@ -5,12 +5,12 @@ documentation for it.
|
|||||||
|
|
||||||
Goals:
|
Goals:
|
||||||
|
|
||||||
- Must build compiled native node modules in a shippable state
|
- Must build compiled native node modules in a shippable state
|
||||||
(ie. only dynamically linked against libraries that will be on the
|
(ie. only dynamically linked against libraries that will be on the
|
||||||
target system, all unnecessary files removed).
|
target system, all unnecessary files removed).
|
||||||
- Must be able to build any native module, no matter what build system
|
- Must be able to build any native module, no matter what build system
|
||||||
it uses (electron-rebuild is supposed to do this job but only works
|
it uses (electron-rebuild is supposed to do this job but only works
|
||||||
for modules that use gyp).
|
for modules that use gyp).
|
||||||
|
|
||||||
It's also loosely designed to be a general tool and agnostic to what it's
|
It's also loosely designed to be a general tool and agnostic to what it's
|
||||||
actually building. It's used here to build modules for the electron app
|
actually building. It's used here to build modules for the electron app
|
||||||
@ -25,13 +25,13 @@ If no dependencies are given, hak runs the command on all dependencies.
|
|||||||
|
|
||||||
There are a lot of files involved:
|
There are a lot of files involved:
|
||||||
|
|
||||||
- scripts/hak/... - The tool itself
|
- scripts/hak/... - The tool itself
|
||||||
- hak/[dependency] - Files provided by the app that tell hak how to build each of its native dependencies.
|
- hak/[dependency] - Files provided by the app that tell hak how to build each of its native dependencies.
|
||||||
Contains a hak.json file and also some script files, each of which must be referenced in hak.json.
|
Contains a hak.json file and also some script files, each of which must be referenced in hak.json.
|
||||||
- .hak/ - Files generated by hak in the course of doing its job. Includes the dependency module itself and
|
- .hak/ - Files generated by hak in the course of doing its job. Includes the dependency module itself and
|
||||||
any of the native dependency's native dependencies.
|
any of the native dependency's native dependencies.
|
||||||
- .hak/[dependency]/build - An extracted copy of the dependency's node module used to build it.
|
- .hak/[dependency]/build - An extracted copy of the dependency's node module used to build it.
|
||||||
- .hak/[dependency]/out - Another extracted copy of the dependency, this one contains only what will be shipped.
|
- .hak/[dependency]/out - Another extracted copy of the dependency, this one contains only what will be shipped.
|
||||||
|
|
||||||
# Workings
|
# Workings
|
||||||
|
|
||||||
@ -60,10 +60,10 @@ own in the .hak directory (unless one already exists, in which case this is your
|
|||||||
|
|
||||||
Hak is divided into lifecycle stages, in order:
|
Hak is divided into lifecycle stages, in order:
|
||||||
|
|
||||||
- fetch - Download and extract the source of the dependency
|
- fetch - Download and extract the source of the dependency
|
||||||
- link - Link the copy of the dependency into your node_modules directory
|
- link - Link the copy of the dependency into your node_modules directory
|
||||||
- build - The Good Stuff. Configure and build any native dependencies, then the module itself.
|
- build - The Good Stuff. Configure and build any native dependencies, then the module itself.
|
||||||
- copy - Copy the built artifact from the module build directory to the module output directory.
|
- copy - Copy the built artifact from the module build directory to the module output directory.
|
||||||
|
|
||||||
# hak.json
|
# hak.json
|
||||||
|
|
||||||
|
@ -6353,9 +6353,9 @@ prelude-ls@^1.2.1:
|
|||||||
integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
|
integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
|
||||||
|
|
||||||
prettier@^3.0.0:
|
prettier@^3.0.0:
|
||||||
version "3.3.3"
|
version "3.4.2"
|
||||||
resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.3.3.tgz#30c54fe0be0d8d12e6ae61dbb10109ea00d53105"
|
resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.4.2.tgz#a5ce1fb522a588bf2b78ca44c6e6fe5aa5a2b13f"
|
||||||
integrity sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==
|
integrity sha512-e9MewbtFo+Fevyuxn/4rrcDAaq0IYxPGLvObpQjiZBMAzB9IGmzlnG9RZy3FFas+eBMu2vA0CszMeduow5dIuQ==
|
||||||
|
|
||||||
pretty-ms@^9.0.0:
|
pretty-ms@^9.0.0:
|
||||||
version "9.2.0"
|
version "9.2.0"
|
||||||
|
Loading…
Reference in New Issue
Block a user