Skip to content

Commit 6f4ad6c

Browse files
authored
Merge branch 'main' into docs/pipelines-displayoutput
2 parents cfe9430 + ed4ec36 commit 6f4ad6c

File tree

829 files changed

+13830
-6620
lines changed

Some content is hidden

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

829 files changed

+13830
-6620
lines changed

.vuepress/config.js

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ export default defineUserConfig({
9090
},
9191
},
9292
head: [
93+
["link", { rel: "preload", href: "/fonts/FiraCode-Regular.woff2", as: "font", type: "font/woff2", crossorigin: "anonymous" }],
9394
['meta', { name: 'theme-color', content: '#3eaf7c' }],
9495
['meta', { name: 'apple-mobile-web-app-capable', content: 'yes' }],
9596
[
@@ -250,14 +251,27 @@ export default defineUserConfig({
250251
);
251252
},
252253
sorter: (a, b) => {
253-
return compareDate(
254-
a.data.git?.createdTime
255-
? new Date(a.data.git?.createdTime)
256-
: a.frontmatter.date,
257-
b.data.git?.createdTime
258-
? new Date(b.data.git?.createdTime)
259-
: b.frontmatter.date,
254+
const pathDateA = new Date(
255+
a.path.replace('/blog/', '').substring(0, 10),
260256
);
257+
const pathDateB = new Date(
258+
b.path.replace('/blog/', '').substring(0, 10),
259+
);
260+
const effectiveDateA =
261+
pathDateA != 'Invalid Date'
262+
? pathDateA
263+
: a.frontmatter.date
264+
? new Date(a.frontmatter.date)
265+
: new Date(a.data.git?.createdTime);
266+
267+
// Determine the effective date for item B
268+
const effectiveDateB =
269+
pathDateB != 'Invalid Date'
270+
? pathDateB
271+
: b.frontmatter.date
272+
? new Date(b.frontmatter.date)
273+
: new Date(b.data.git?.createdTime);
274+
return compareDate(effectiveDateA, effectiveDateB);
261275
},
262276
}),
263277
sitemapPlugin({

.vuepress/configs/sidebar/command_categories.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ export const commandCategories = [
1010
'/commands/categories/date.md',
1111
'/commands/categories/debug.md',
1212
'/commands/categories/default.md',
13-
'/commands/categories/deprecated.md',
1413
'/commands/categories/env.md',
14+
'/commands/categories/experimental.md',
1515
'/commands/categories/expression.md',
1616
'/commands/categories/filesystem.md',
1717
'/commands/categories/filters.md',

.vuepress/configs/sidebar/de.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ export const sidebarDe: SidebarConfig = {
5757
'/de/book/custom_completions',
5858
'/de/book/coloring_and_theming',
5959
'/de/book/hooks',
60-
'/de/book/background_task.md',
60+
'/de/book/background_jobs.md',
6161
],
6262
},
6363
{

.vuepress/configs/sidebar/en.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ export const sidebarEn: SidebarConfig = {
3838
'/book/working_with_records.md',
3939
'/book/working_with_tables.md',
4040
'/book/navigating_structured_data.md',
41+
'/book/special_variables.md',
4142
],
4243
},
4344
{
@@ -82,7 +83,7 @@ export const sidebarEn: SidebarConfig = {
8283
'/book/externs.md',
8384
'/book/coloring_and_theming.md',
8485
'/book/hooks.md',
85-
'/book/background_task.md',
86+
'/book/background_jobs.md',
8687
],
8788
},
8889
{

.vuepress/configs/sidebar/ru.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@ export const sidebarRU: SidebarConfig = {
88
link: '/ru/book/README.md',
99
collapsible: false,
1010
},
11+
{
12+
text: 'Установка',
13+
link: '/ru/book/installation.md',
14+
collapsible: false,
15+
children: ['default_shell.md'],
16+
},
1117
// {
1218
// text: 'Начало работы',
1319
// link: '/ru/book/getting_started.md',
128 KB
Binary file not shown.
101 KB
Binary file not shown.
Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
Copyright (c) 2014, The Fira Code Project Authors (https://github.com/tonsky/FiraCode)
2+
3+
This Font Software is licensed under the SIL Open Font License, Version 1.1.
4+
This license is copied below, and is also available with a FAQ at:
5+
http://scripts.sil.org/OFL
6+
7+
8+
-----------------------------------------------------------
9+
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
10+
-----------------------------------------------------------
11+
12+
PREAMBLE
13+
The goals of the Open Font License (OFL) are to stimulate worldwide
14+
development of collaborative font projects, to support the font creation
15+
efforts of academic and linguistic communities, and to provide a free and
16+
open framework in which fonts may be shared and improved in partnership
17+
with others.
18+
19+
The OFL allows the licensed fonts to be used, studied, modified and
20+
redistributed freely as long as they are not sold by themselves. The
21+
fonts, including any derivative works, can be bundled, embedded,
22+
redistributed and/or sold with any software provided that any reserved
23+
names are not used by derivative works. The fonts and derivatives,
24+
however, cannot be released under any other type of license. The
25+
requirement for fonts to remain under this license does not apply
26+
to any document created using the fonts or their derivatives.
27+
28+
DEFINITIONS
29+
"Font Software" refers to the set of files released by the Copyright
30+
Holder(s) under this license and clearly marked as such. This may
31+
include source files, build scripts and documentation.
32+
33+
"Reserved Font Name" refers to any names specified as such after the
34+
copyright statement(s).
35+
36+
"Original Version" refers to the collection of Font Software components as
37+
distributed by the Copyright Holder(s).
38+
39+
"Modified Version" refers to any derivative made by adding to, deleting,
40+
or substituting -- in part or in whole -- any of the components of the
41+
Original Version, by changing formats or by porting the Font Software to a
42+
new environment.
43+
44+
"Author" refers to any designer, engineer, programmer, technical
45+
writer or other person who contributed to the Font Software.
46+
47+
PERMISSION & CONDITIONS
48+
Permission is hereby granted, free of charge, to any person obtaining
49+
a copy of the Font Software, to use, study, copy, merge, embed, modify,
50+
redistribute, and sell modified and unmodified copies of the Font
51+
Software, subject to the following conditions:
52+
53+
1) Neither the Font Software nor any of its individual components,
54+
in Original or Modified Versions, may be sold by itself.
55+
56+
2) Original or Modified Versions of the Font Software may be bundled,
57+
redistributed and/or sold with any software, provided that each copy
58+
contains the above copyright notice and this license. These can be
59+
included either as stand-alone text files, human-readable headers or
60+
in the appropriate machine-readable metadata fields within text or
61+
binary files as long as those fields can be easily viewed by the user.
62+
63+
3) No Modified Version of the Font Software may use the Reserved Font
64+
Name(s) unless explicit written permission is granted by the corresponding
65+
Copyright Holder. This restriction only applies to the primary font name as
66+
presented to the users.
67+
68+
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
69+
Software shall not be used to promote, endorse or advertise any
70+
Modified Version, except to acknowledge the contribution(s) of the
71+
Copyright Holder(s) and the Author(s) or with their explicit written
72+
permission.
73+
74+
5) The Font Software, modified or unmodified, in part or in whole,
75+
must be distributed entirely under this license, and must not be
76+
distributed under any other license. The requirement for fonts to
77+
remain under this license does not apply to any document created
78+
using the Font Software.
79+
80+
TERMINATION
81+
This license becomes null and void if any of the above conditions are
82+
not met.
83+
84+
DISCLAIMER
85+
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
86+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
87+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
88+
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
89+
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
90+
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
91+
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
92+
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
93+
OTHER DEALINGS IN THE FONT SOFTWARE.

.vuepress/styles/index.scss

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
@font-face {
2+
font-family: 'Fira Code';
3+
src: url('/fonts/FiraCode-Regular.woff2') format('woff2'), url("woff/FiraCode-Regular.woff") format("woff");
4+
font-weight: 400;
5+
font-style: normal;
6+
}
7+
18
.navbar .navbar-items-wrapper {
29
flex-direction: row-reverse;
310
}
@@ -29,7 +36,13 @@ div[class*='language-'].line-numbers-mode .line-numbers {
2936
*/
3037
:root {
3138
--code-line-height: 1.1;
32-
--font-family-code: Consolas, Monaco, 'Andale Mono', 'DejaVu Sans Mono',
39+
--font-family-code: 'Fira Code', Consolas, Monaco, 'Andale Mono', 'DejaVu Sans Mono',
40+
'Ubuntu Mono', monospace;
41+
}
42+
43+
/* override vuepress `:root` --code-font-family variable with higher specificity (`body`) because vuepress puts theirs after this one */
44+
body {
45+
--code-font-family: 'Fira Code', Consolas, Monaco, 'Andale Mono', 'DejaVu Sans Mono',
3346
'Ubuntu Mono', monospace;
3447
}
3548

blog/2024-01-09-nushell_0_89_0.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ Setting the limits is done via flags available in `help ulimit`.
267267
- [Fix the test which fails on windows](https://github.com/nushell/nushell/pull/11478)
268268
- [Fix rm for symlinks pointing to directory on windows (issue #11461)](https://github.com/nushell/nushell/pull/11463)
269269
- [hustcer](https://github.com/hustcer) created
270-
- [Try to fix riscv64 building by using unbuntu-latest](https://github.com/nushell/nushell/pull/11476)
270+
- [Try to fix riscv64 building by using ubuntu-latest](https://github.com/nushell/nushell/pull/11476)
271271
- [Downgrade openssl-src to fix riscv64 build target, close #11345](https://github.com/nushell/nushell/pull/11353)
272272
- [rsteube](https://github.com/rsteube) created
273273
- [Revert "Return external file completions if not empty (#10898)"](https://github.com/nushell/nushell/pull/11446)

0 commit comments

Comments
 (0)