Skip to content

Commit 0c1d31f

Browse files
committed
chore: merge upstream/master
2 parents af60118 + 541eb0a commit 0c1d31f

92 files changed

Lines changed: 30411 additions & 7112 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.stylelintrc.js

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,9 @@ export default {
4141
},
4242
],
4343
"no-invalid-position-at-import-rule": null,
44-
"plugin/use-logical-properties-and-values": [
45-
true,
46-
{
47-
severity: "warning",
48-
ignore: ["overflow-y", "overflow-x"],
49-
},
50-
],
51-
"plugin/use-logical-units": [true, { severity: "warning" }],
44+
"logical-css/require-logical-keywords": [true, { severity: "warning" }],
45+
"logical-css/require-logical-properties": [true, { severity: "warning" }],
46+
"logical-css/require-logical-units": [true, { severity: "warning" }],
5247
"order/order": [
5348
[
5449
"at-variables",
@@ -242,9 +237,7 @@ export default {
242237
"border-bottom-left-image",
243238
"overflow",
244239
"overflow-anchor",
245-
"overflow-x",
246240
"overflow-inline",
247-
"overflow-y",
248241
"overflow-block",
249242
"overflow-clip-margin",
250243
"scroll-behavior",

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ WORKDIR /usr/src/app
77
COPY . .
88

99
# Install dependencies
10-
RUN npm install
10+
RUN npm ci
1111

1212
# Compile monorepo and build bundle
1313
RUN npm run compile && npm run build

docs/translations_report.md

Lines changed: 42 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,11 @@ Untranslated: 30 messages, 1171 words
6868

6969
# Czech
7070

71-
Translated: 336 messages, 4740 words
71+
Translated: 338 messages, 4742 words
7272

73-
Untranslated: 6 messages, 9 words
73+
Untranslated: 4 messages, 7 words
7474

7575
* *Font:*
76-
* *Reset*
77-
* *Zones:*
7876
* *Syntax:*
7977
* *Sound theme:*
8078
* *Key sounds only*
@@ -162,9 +160,9 @@ Untranslated: 4 messages, 6 words
162160

163161
# Persian
164162

165-
Translated: 287 messages, 2823 words
163+
Translated: 295 messages, 2959 words
166164

167-
Untranslated: 53 messages, 1904 words
165+
Untranslated: 45 messages, 1768 words
168166

169167
* *Books*
170168
* *Zones:*
@@ -173,19 +171,19 @@ Untranslated: 53 messages, 1904 words
173171
* *Top accuracy*
174172
* *Explain charts*
175173
* *Key sounds only*
176-
* *Accuracy Streaks*
177-
* *Average accuracy*
178-
* *Relative Accuracy*
179174
* *Repeat each word:*
180175
* *Keyboard hardware emulates layout*
181-
* *Switch the current interface layout.*
182176
* *Circle color: {label1} – hit count, {label2} – miss count.*
183-
* *Generate lessons that resemble the specified programming lan...*
184177
* *Practice punctuation characters that are specific to a progr...*
185-
* *This is a histogram of the accuracies of all users, and your...*
186178
* *Show color coding of the keyboard zones. Use this option to ...*
187179
* *Bar color: {label1} – hit count, {label2} – miss count, {lab...*
188180
* *Generate typing lessons from the text of a book. All keys ar...*
181+
* *Horizontal axis: lesson number. Vertical axis: typing speed ...*
182+
* *<a>Benford’s law</a> is an observation that in many real-lif...*
183+
* *You don’t have any accuracy streaks. Consider completing a l...*
184+
* *These are the typing assists which help your preserve your c...*
185+
* *Horizontal axis: lesson number. Vertical axis: {label1} – ty...*
186+
* *Horizontal axis: lesson number. Vertical axis: {label1} – ty...*
189187
* ...
190188

191189
# Finnish
@@ -390,19 +388,17 @@ Untranslated: 195 messages, 3430 words
390388

391389
# Lithuanian
392390

393-
Translated: 298 messages, 3096 words
391+
Translated: 305 messages, 3388 words
394392

395-
Untranslated: 41 messages, 1622 words
393+
Untranslated: 34 messages, 1330 words
396394

397395
* *Key sounds only*
398396
* *Accuracy Streaks*
399397
* *Relative Accuracy*
400398
* *No accuracy streaks.*
401399
* *Practice numbers only.*
402400
* *The difference from the average value.*
403-
* *Sort letters in the order of keyboard keys*
404401
* *Download all your typing data in JSON format.*
405-
* *Help us translate keybr.com into your language.*
406402
* *The detailed statistics regarding your learning progress.*
407403
* *Permanently delete all of your typing data and reset statist...*
408404
* *This is a histogram of the accuracies of all users, and your...*
@@ -412,8 +408,10 @@ Untranslated: 41 messages, 1622 words
412408
* *You don’t have any accuracy streaks. Consider completing a l...*
413409
* *Highlight a key that must to be pressed next. Use this optio...*
414410
* *<p>This indicator shows the current subset of letters used t...*
415-
* *For the purpose of typing measurement, each word is standard...*
416411
* *Repeat each word a number of times. Type a word for the firs...*
412+
* *See how accurate you type relative to other users. The highe...*
413+
* *Manually unlock the remaining letters. Use this option if wa...*
414+
* *Adjust the amount of capital letters added to the lesson tex...*
417415
* ...
418416

419417
# Mongolian
@@ -446,30 +444,30 @@ Untranslated: 316 messages, 4273 words
446444

447445
# Norwegian Bokmål
448446

449-
Translated: 158 messages, 2338 words
447+
Translated: 211 messages, 2446 words
450448

451-
Untranslated: 178 messages, 2356 words
449+
Untranslated: 126 messages, 2250 words
452450

453451
* *Done*
454452
* *Help*
455-
* *Time*
456453
* *Books*
457454
* *Font:*
458-
* *Reset*
459455
* *Speed*
460-
* *Visit*
461-
* *Zones:*
462456
* *Account*
463-
* *Layouts*
464-
* *Lessons*
465-
* *Metrics*
466-
* *Not set*
467-
* *Options*
468-
* *Preview*
469-
* *Profile*
470-
* *Sign-In*
471-
* *Syntax:*
472-
* *Volume:*
457+
* *Accuracy*
458+
* *Settings*
459+
* *Alphabet:*
460+
* *Examples:*
461+
* *All sounds*
462+
* *Daily goal*
463+
* *Last speed*
464+
* *Custom text*
465+
* *Daily goal:*
466+
* *Smoothness:*
467+
* *Whitespace:*
468+
* *Cursor shape:*
469+
* *Learning rate*
470+
* *No whitespace*
473471
* ...
474472

475473
# Nepali
@@ -516,9 +514,9 @@ Untranslated: 4 messages, 6 words
516514

517515
# European Portuguese
518516

519-
Translated: 318 messages, 4597 words
517+
Translated: 319 messages, 4618 words
520518

521-
Untranslated: 22 messages, 130 words
519+
Untranslated: 21 messages, 109 words
522520

523521
* *Books*
524522
* *Layout*
@@ -539,7 +537,7 @@ Untranslated: 22 messages, 130 words
539537
* *New letter unlocked!*
540538
* *Premium account price:*
541539
* *This is a histogram of the accuracies of all users, and your...*
542-
* *Generate typing lessons from the text of a book. All keys ar...*
540+
* *Repeat each word a number of times. Type a word for the firs...*
543541
* ...
544542

545543
# Romanian
@@ -589,59 +587,20 @@ Untranslated: 2 messages, 4 words
589587

590588
# Slovenian
591589

592-
Translated: 192 messages, 3519 words
590+
Translated: 340 messages, 4745 words
593591

594-
Untranslated: 149 messages, 1228 words
592+
Untranslated: 2 messages, 4 words
595593

596-
* *Copy*
597-
* *Done*
598-
* *Help*
599-
* *Next*
600-
* *Time*
601-
* *Books*
602-
* *Close*
603594
* *Font:*
604-
* *Reset*
605-
* *Speed*
606-
* *Visit*
607-
* *Typing*
608-
* *Zones:*
609-
* *Account*
610-
* *Layouts*
611-
* *Lessons*
612-
* *Lessons*
613-
* *Metrics*
614-
* *Not set*
615-
* *Numbers*
616-
* ...
595+
* *Key sounds only*
617596

618597
# Albanian
619598

620-
Translated: 43 messages, 684 words
599+
Translated: 341 messages, 4746 words
621600

622-
Untranslated: 291 messages, 3996 words
601+
Untranslated: 1 messages, 3 words
623602

624-
* *GO!*
625-
* *Copy*
626-
* *Done*
627-
* *Help*
628-
* *Next*
629-
* *Time*
630-
* *User*
631-
* *Books*
632-
* *Close*
633-
* *Font:*
634-
* *Reset*
635-
* *Score*
636-
* *Speed*
637-
* *Speed*
638-
* *Visit*
639-
* *Errors*
640-
* *Layout*
641-
* *Typing*
642-
* *Zones:*
643-
* *Account*
644-
* ...
603+
* *Key sounds only*
645604

646605
# Swedish
647606

@@ -710,31 +669,11 @@ Untranslated: 1 messages, 3 words
710669

711670
# Vietnamese
712671

713-
Translated: 275 messages, 2745 words
672+
Translated: 341 messages, 4746 words
714673

715-
Untranslated: 64 messages, 1973 words
674+
Untranslated: 1 messages, 3 words
716675

717-
* *Visit*
718-
* *Typing*
719-
* *Zones:*
720-
* *Box cursor*
721-
* *Line cursor*
722-
* *Block cursor*
723-
* *Sound theme:*
724-
* *Top accuracy*
725-
* *Unique words*
726-
* *M|T|W|T|F|S|S*
727-
* *Smooth cursor*
728-
* *Jumping cursor*
729676
* *Key sounds only*
730-
* *Average accuracy*
731-
* *Underline cursor*
732-
* *Repeat each word:*
733-
* *Premium account price:*
734-
* *Key Frequency Histogram*
735-
* *Key Typing Speed Histogram*
736-
* *Keyboard hardware emulates layout*
737-
* ...
738677

739678
# Simplified Chinese
740679

eslint.config.js

Lines changed: 49 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import reactHooks from "eslint-plugin-react-hooks";
1010
import simpleImportSort from "eslint-plugin-simple-import-sort";
1111
import globals from "globals";
1212
import ts from "typescript-eslint";
13-
import pkg from "./package.json" with { type: "json" };
1413

1514
export default [
1615
{
@@ -124,8 +123,55 @@ export default [
124123
node: {
125124
version: ">=24",
126125
allowModules: [
127-
...Object.keys(pkg.dependencies),
128-
...Object.keys(pkg.devDependencies),
126+
// Prod libraries.
127+
"@fastr/client",
128+
"@fastr/client-testlib",
129+
"@fastr/controller",
130+
"@fastr/core",
131+
"@fastr/errors",
132+
"@fastr/fake-http",
133+
"@fastr/fetch",
134+
"@fastr/headers",
135+
"@fastr/invert",
136+
"@fastr/lang",
137+
"@fastr/middleware-body",
138+
"@fastr/middleware-canonical",
139+
"@fastr/middleware-compress",
140+
"@fastr/middleware-conditional",
141+
"@fastr/middleware-router",
142+
"@fastr/middleware-session",
143+
"@fastr/middleware-session-file-store",
144+
"@fastr/middleware-static-files",
145+
"@fastr/middleware-websocket",
146+
"@fastr/status",
147+
"@mdi/js",
148+
"@sosimple/fsx",
149+
"@sosimple/fsx-file",
150+
"@sosimple/fsx-lockfile",
151+
"@sosimple/retry",
152+
"@unicode/unicode-16.0.0",
153+
"clsx",
154+
"debug",
155+
"knex",
156+
"objection",
157+
"react",
158+
"react-dom",
159+
"react-intl",
160+
"react-router",
161+
"tslib",
162+
"xml-js",
163+
"zod",
164+
// Testing and script libraries.
165+
"@formatjs/cli-lib",
166+
"@formatjs/ts-transformer",
167+
"@testing-library/dom",
168+
"@testing-library/react",
169+
"@testing-library/user-event",
170+
"cheerio",
171+
"confusing-browser-globals",
172+
"glob",
173+
"rich-assert",
174+
"typescript",
129175
],
130176
typescriptExtensionMap: [
131177
[".ts", ".ts"],

0 commit comments

Comments
 (0)