2022-02-22 13:17:22 +01:00
|
|
|
<!--
|
|
|
|
Copyright: Ankitects Pty Ltd and contributors
|
|
|
|
License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
|
|
|
|
-->
|
|
|
|
<script lang="ts">
|
Move away from Bazel (#2202)
(for upgrading users, please see the notes at the bottom)
Bazel brought a lot of nice things to the table, such as rebuilds based on
content changes instead of modification times, caching of build products,
detection of incorrect build rules via a sandbox, and so on. Rewriting the build
in Bazel was also an opportunity to improve on the Makefile-based build we had
prior, which was pretty poor: most dependencies were external or not pinned, and
the build graph was poorly defined and mostly serialized. It was not uncommon
for fresh checkouts to fail due to floating dependencies, or for things to break
when trying to switch to an older commit.
For day-to-day development, I think Bazel served us reasonably well - we could
generally switch between branches while being confident that builds would be
correct and reasonably fast, and not require full rebuilds (except on Windows,
where the lack of a sandbox and the TS rules would cause build breakages when TS
files were renamed/removed).
Bazel achieves that reliability by defining rules for each programming language
that define how source files should be turned into outputs. For the rules to
work with Bazel's sandboxing approach, they often have to reimplement or
partially bypass the standard tools that each programming language provides. The
Rust rules call Rust's compiler directly for example, instead of using Cargo,
and the Python rules extract each PyPi package into a separate folder that gets
added to sys.path.
These separate language rules allow proper declaration of inputs and outputs,
and offer some advantages such as caching of build products and fine-grained
dependency installation. But they also bring some downsides:
- The rules don't always support use-cases/platforms that the standard language
tools do, meaning they need to be patched to be used. I've had to contribute a
number of patches to the Rust, Python and JS rules to unblock various issues.
- The dependencies we use with each language sometimes make assumptions that do
not hold in Bazel, meaning they either need to be pinned or patched, or the
language rules need to be adjusted to accommodate them.
I was hopeful that after the initial setup work, things would be relatively
smooth-sailing. Unfortunately, that has not proved to be the case. Things
frequently broke when dependencies or the language rules were updated, and I
began to get frustrated at the amount of Anki development time I was instead
spending on build system upkeep. It's now about 2 years since switching to
Bazel, and I think it's time to cut losses, and switch to something else that's
a better fit.
The new build system is based on a small build tool called Ninja, and some
custom Rust code in build/. This means that to build Anki, Bazel is no longer
required, but Ninja and Rust need to be installed on your system. Python and
Node toolchains are automatically downloaded like in Bazel.
This new build system should result in faster builds in some cases:
- Because we're using cargo to build now, Rust builds are able to take advantage
of pipelining and incremental debug builds, which we didn't have with Bazel.
It's also easier to override the default linker on Linux/macOS, which can
further improve speeds.
- External Rust crates are now built with opt=1, which improves performance
of debug builds.
- Esbuild is now used to transpile TypeScript, instead of invoking the TypeScript
compiler. This results in faster builds, by deferring typechecking to test/check
time, and by allowing more work to happen in parallel.
As an example of the differences, when testing with the mold linker on Linux,
adding a new message to tags.proto (which triggers a recompile of the bulk of
the Rust and TypeScript code) results in a compile that goes from about 22s on
Bazel to about 7s in the new system. With the standard linker, it's about 9s.
Some other changes of note:
- Our Rust workspace now uses cargo-hakari to ensure all packages agree on
available features, preventing unnecessary rebuilds.
- pylib/anki is now a PEP420 implicit namespace, avoiding the need to merge
source files and generated files into a single folder for running. By telling
VSCode about the extra search path, code completion now works with generated
files without needing to symlink them into the source folder.
- qt/aqt can't use PEP420 as it's difficult to get rid of aqt/__init__.py.
Instead, the generated files are now placed in a separate _aqt package that's
added to the path.
- ts/lib is now exposed as @tslib, so the source code and generated code can be
provided under the same namespace without a merging step.
- MyPy and PyLint are now invoked once for the entire codebase.
- dprint will be used to format TypeScript/json files in the future instead of
the slower prettier (currently turned off to avoid causing conflicts). It can
automatically defer to prettier when formatting Svelte files.
- svelte-check is now used for typechecking our Svelte code, which revealed a
few typing issues that went undetected with the old system.
- The Jest unit tests now work on Windows as well.
If you're upgrading from Bazel, updated usage instructions are in docs/development.md and docs/build.md. A summary of the changes:
- please remove node_modules and .bazel
- install rustup (https://rustup.rs/)
- install rsync if not already installed (on windows, use pacman - see docs/windows.md)
- install Ninja (unzip from https://github.com/ninja-build/ninja/releases/tag/v1.11.1 and
place on your path, or from your distro/homebrew if it's 1.10+)
- update .vscode/settings.json from .vscode.dist
2022-11-27 06:24:20 +01:00
|
|
|
import * as tr from "@tslib/ftl";
|
|
|
|
import { altPressed, shiftPressed } from "@tslib/keys";
|
|
|
|
import { getPlatformString } from "@tslib/shortcuts";
|
|
|
|
import { singleCallback } from "@tslib/typing";
|
2022-08-15 05:34:16 +02:00
|
|
|
import { onMount } from "svelte";
|
2022-11-28 00:17:39 +01:00
|
|
|
|
2022-08-18 04:06:06 +02:00
|
|
|
import CheckBox from "../../components/CheckBox.svelte";
|
2022-02-22 13:17:22 +01:00
|
|
|
import DropdownItem from "../../components/DropdownItem.svelte";
|
|
|
|
import IconButton from "../../components/IconButton.svelte";
|
2022-09-05 09:20:00 +02:00
|
|
|
import Popover from "../../components/Popover.svelte";
|
2022-02-22 13:17:22 +01:00
|
|
|
import Shortcut from "../../components/Shortcut.svelte";
|
2022-09-05 09:20:00 +02:00
|
|
|
import WithFloating from "../../components/WithFloating.svelte";
|
2022-02-22 13:17:22 +01:00
|
|
|
import type { MatchType } from "../../domlib/surround";
|
2022-09-05 09:20:00 +02:00
|
|
|
import { chevronDown } from "../icons";
|
2022-08-15 05:34:16 +02:00
|
|
|
import { surrounder } from "../rich-text-input";
|
2022-02-22 13:17:22 +01:00
|
|
|
import type { RemoveFormat } from "./EditorToolbar.svelte";
|
|
|
|
import { context as editorToolbarContext } from "./EditorToolbar.svelte";
|
|
|
|
import { eraserIcon } from "./icons";
|
|
|
|
|
2022-08-15 05:34:16 +02:00
|
|
|
const { removeFormats } = editorToolbarContext.get();
|
2022-02-22 13:17:22 +01:00
|
|
|
|
2022-08-17 08:00:37 +02:00
|
|
|
function filterForKeys(formats: RemoveFormat[], value: boolean): string[] {
|
|
|
|
return formats
|
|
|
|
.filter((format) => format.active === value)
|
|
|
|
.map((format) => format.key);
|
2022-02-22 13:17:22 +01:00
|
|
|
}
|
|
|
|
|
2022-08-15 05:34:16 +02:00
|
|
|
let activeKeys: string[];
|
2022-08-17 08:00:37 +02:00
|
|
|
$: activeKeys = filterForKeys($removeFormats, true);
|
2022-02-22 13:17:22 +01:00
|
|
|
|
2022-08-15 05:34:16 +02:00
|
|
|
let inactiveKeys: string[];
|
2022-08-17 08:00:37 +02:00
|
|
|
$: inactiveKeys = filterForKeys($removeFormats, false);
|
2022-02-22 13:17:22 +01:00
|
|
|
|
2022-08-15 05:34:16 +02:00
|
|
|
let showFormats: RemoveFormat[];
|
2022-08-17 08:00:37 +02:00
|
|
|
$: showFormats = $removeFormats.filter(
|
|
|
|
(format: RemoveFormat): boolean => format.show,
|
|
|
|
);
|
2022-02-22 13:17:22 +01:00
|
|
|
|
|
|
|
function remove(): void {
|
2022-08-15 05:34:16 +02:00
|
|
|
surrounder.remove(activeKeys, inactiveKeys);
|
2022-02-22 13:17:22 +01:00
|
|
|
}
|
|
|
|
|
2022-08-15 05:34:16 +02:00
|
|
|
function onItemClick(event: MouseEvent, format: RemoveFormat): void {
|
2022-02-22 13:17:22 +01:00
|
|
|
if (altPressed(event)) {
|
2022-08-17 08:00:37 +02:00
|
|
|
const value = shiftPressed(event);
|
|
|
|
|
2022-02-22 13:17:22 +01:00
|
|
|
for (const format of showFormats) {
|
2022-08-17 08:00:37 +02:00
|
|
|
format.active = value;
|
2022-02-22 13:17:22 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
format.active = !format.active;
|
|
|
|
$removeFormats = $removeFormats;
|
|
|
|
}
|
|
|
|
|
|
|
|
const keyCombination = "Control+R";
|
2022-08-15 05:34:16 +02:00
|
|
|
|
|
|
|
let disabled: boolean;
|
2022-09-05 09:20:00 +02:00
|
|
|
let showFloating = false;
|
2022-08-15 05:34:16 +02:00
|
|
|
|
2022-08-17 08:00:37 +02:00
|
|
|
onMount(() => {
|
|
|
|
const surroundElement = document.createElement("span");
|
|
|
|
|
|
|
|
function matcher(
|
|
|
|
element: HTMLElement | SVGElement,
|
|
|
|
match: MatchType<never>,
|
|
|
|
): void {
|
|
|
|
if (
|
|
|
|
element.tagName === "SPAN" &&
|
|
|
|
element.className.length === 0 &&
|
|
|
|
element.style.cssText.length === 0
|
|
|
|
) {
|
|
|
|
match.remove();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
const simpleSpans = {
|
|
|
|
matcher,
|
|
|
|
surroundElement,
|
|
|
|
};
|
|
|
|
|
|
|
|
const key = "simple spans";
|
|
|
|
|
|
|
|
removeFormats.update((formats: RemoveFormat[]): RemoveFormat[] => [
|
|
|
|
...formats,
|
|
|
|
{
|
|
|
|
key,
|
|
|
|
name: key,
|
|
|
|
show: false,
|
|
|
|
active: true,
|
|
|
|
},
|
|
|
|
]);
|
|
|
|
|
|
|
|
return singleCallback(
|
2022-08-15 05:34:16 +02:00
|
|
|
surrounder.active.subscribe((value) => (disabled = !value)),
|
2022-08-17 08:00:37 +02:00
|
|
|
surrounder.registerFormat(key, simpleSpans),
|
|
|
|
);
|
|
|
|
});
|
2022-02-22 13:17:22 +01:00
|
|
|
</script>
|
|
|
|
|
|
|
|
<IconButton
|
|
|
|
tooltip="{tr.editingRemoveFormatting()} ({getPlatformString(keyCombination)})"
|
|
|
|
{disabled}
|
|
|
|
on:click={remove}
|
|
|
|
--border-left-radius="5px"
|
|
|
|
>
|
|
|
|
{@html eraserIcon}
|
|
|
|
</IconButton>
|
|
|
|
|
|
|
|
<Shortcut {keyCombination} on:action={remove} />
|
|
|
|
|
2022-09-05 09:20:00 +02:00
|
|
|
<WithFloating
|
|
|
|
show={showFloating && !disabled}
|
|
|
|
inline
|
|
|
|
on:close={() => (showFloating = false)}
|
|
|
|
>
|
2022-09-30 03:43:08 +02:00
|
|
|
<IconButton
|
|
|
|
slot="reference"
|
|
|
|
class="remove-format-button"
|
|
|
|
tooltip={tr.editingSelectRemoveFormatting()}
|
|
|
|
{disabled}
|
|
|
|
widthMultiplier={0.5}
|
|
|
|
iconSize={120}
|
|
|
|
--border-right-radius="5px"
|
|
|
|
on:click={() => (showFloating = !showFloating)}
|
|
|
|
>
|
|
|
|
{@html chevronDown}
|
|
|
|
</IconButton>
|
2022-09-05 09:20:00 +02:00
|
|
|
|
2022-09-10 10:46:59 +02:00
|
|
|
<Popover slot="floating" --popover-padding-inline="0">
|
2022-09-05 09:20:00 +02:00
|
|
|
{#each showFormats as format (format.name)}
|
|
|
|
<DropdownItem on:click={(event) => onItemClick(event, format)}>
|
|
|
|
<CheckBox bind:value={format.active} />
|
|
|
|
<span class="d-flex-inline ps-3">{format.name}</span>
|
|
|
|
</DropdownItem>
|
|
|
|
{/each}
|
|
|
|
</Popover>
|
|
|
|
</WithFloating>
|