Skip to content

Commit 7d7b709

Browse files
committed
Merge branch 'travis.rodgers/docs-homepage-header' into aatuvai/docs-top-nav
2 parents bab622b + 63ae32e commit 7d7b709

File tree

78 files changed

+545
-750
lines changed

Some content is hidden

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

78 files changed

+545
-750
lines changed

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ jobs:
3131
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3232

3333
- name: Initialize CodeQL
34-
uses: github/codeql-action/init@d6bbdef45e766d081b84a2def353b0055f728d3e # v3.29.3
34+
uses: github/codeql-action/init@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
3535
with:
3636
languages: ${{ matrix.language }}
3737

3838
- name: Perform CodeQL Analysis
39-
uses: github/codeql-action/analyze@d6bbdef45e766d081b84a2def353b0055f728d3e # v3.29.3
39+
uses: github/codeql-action/analyze@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
4040
with:
4141
category: "/language:${{matrix.language}}"

.github/workflows/test.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,5 @@ jobs:
2626
# make sure this hasn't happened.
2727
- name: Run the docs formatting linter
2828
run: scripts/lint-test.sh
29+
- name: Check source formatting
30+
run: npx prettier --check

.gitmodules

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
branch = branch/v16
55
[submodule "content/17.x"]
66
path = content/17.x
7-
url = https://github.com/aatuvai/teleport/
8-
branch = aatuvai/docs-header
7+
url = https://github.com/gravitational/teleport/
8+
branch = branch/v17
99
[submodule "content/18.x"]
1010
path = content/18.x
1111
url = https://github.com/gravitational/teleport

.prettierignore

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
server/fixtures/*
2+
storybook-static
3+
versioned_sidebars
4+
.remark-build
5+
node_modules
6+
.docusaurus
7+
content
8+
.storybook
9+
docs
10+
.devcontainer
11+
static
12+
scripts
13+
.github
14+
build
15+
versioned_docs
16+
.git
17+
data
18+
**.md

.remarkrc.mjs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ import {
77
getVersionRootPath,
88
} from "./.remark-build/server/docs-helpers.mjs";
99
import { loadConfig } from "./.remark-build/server/config-docs.mjs";
10-
import {
11-
updatePathsInIncludes,
12-
} from "./.remark-build//server/asset-path-helpers.mjs";
10+
import { updatePathsInIncludes } from "./.remark-build/server/asset-path-helpers.mjs";
1311

1412
const configFix = {
1513
settings: {

docusaurus.config.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -178,12 +178,10 @@ const config: Config = {
178178
{
179179
svgrConfig: {
180180
svgoConfig: {
181-
plugins: [
182-
"prefixIds"
183-
],
181+
plugins: ["prefixIds"],
184182
},
185183
},
186-
}
184+
},
187185
],
188186
[
189187
"@docusaurus/plugin-content-docs",
@@ -218,7 +216,7 @@ const config: Config = {
218216

219217
return orderSidebarItems(
220218
removeRedundantItems(items, item.dirName),
221-
getDocPageByID
219+
getDocPageByID,
222220
);
223221
},
224222
// Host docs on the root page, later it will be exposed on goteleport.com/docs

package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"@docusaurus/plugin-svgr": "^3.8.1",
5353
"@docusaurus/theme-classic": "^3.8.1",
5454
"@docusaurus/tsconfig": "^3.8.1",
55-
"@inkeep/cxkit-react": "^0.5.95",
55+
"@inkeep/cxkit-react": "^0.5.96",
5656
"@mdx-js/react": "^3.0.0",
5757
"classnames": "^2.3.1",
5858
"clsx": "^2.1.1",
@@ -101,6 +101,7 @@
101101
"micromark-extension-mdxjs": "^3.0.0",
102102
"postcss": "^8.5.6",
103103
"postcss-loader": "^8.1.1",
104+
"prettier": "^3.6.2",
104105
"rehype-stringify": "^10.0.1",
105106
"remark-cli": "10.0.1",
106107
"remark-copy-linked-files": "^1.5.0",
@@ -111,17 +112,17 @@
111112
"remark-validate-links": "^11.0.2",
112113
"storybook": "^8.6.14",
113114
"to-vfile": "^8.0.0",
114-
"ts-jest": "^29.4.0",
115+
"ts-jest": "^29.4.1",
115116
"ts-loader": "^9.5.2",
116117
"tsc-esm-fix": "^3.1.0",
117-
"typescript": "~5.8.3",
118+
"typescript": "~5.9.2",
118119
"unified": "^11.0.5",
119120
"unified-lint-rule": "^3.0.0",
120121
"unist": "^0.0.1",
121122
"unist-util-find": "^3.0.0",
122123
"unist-util-visit-parents": "^6.0.1",
123124
"vfile": "^6.0.1",
124-
"wait-on": "^8.0.2"
125+
"wait-on": "^8.0.4"
125126
},
126127
"browserslist": {
127128
"production": [

server/config-common.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { ValidateFunction } from "ajv";
66

77
export const validateConfig = <T = Record<string, unknown>>(
88
validator: ValidateFunction,
9-
config: T
9+
config: T,
1010
) => {
1111
if (!validator(config)) {
1212
console.error(validator.errors);

server/config-docs.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ export const normalizeDocsUrl = (version: string, url: string) => {
144144

145145
const normalizeRedirects = (
146146
version: string,
147-
redirects: Redirect[]
147+
redirects: Redirect[],
148148
): Redirect[] => {
149149
return redirects.map((redirect) => {
150150
return {

server/config-site.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,7 @@ export const getLatestVersion = () => {
9292
export const getCurrentVersion = () => {
9393
const versions = getSupportedVersions();
9494

95-
return (
96-
versions[versions.length - 1]
97-
).name;
95+
return versions[versions.length - 1].name;
9896
};
9997

10098
/* Returns version options for docusaurus.config.js */

0 commit comments

Comments
 (0)