Skip to content

Commit cdf948b

Browse files
committed
fix: Merge conflicts
1 parent a7f2ced commit cdf948b

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

.gitignore

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@ deploy_key
5959
jsdocs/
6060
site/
6161

62-
# Needed for packages/server # Custom files
63-
!packages/**/test/fixtures/**/node_modules
62+
# Needed for packages/server
63+
!packages/**/test/fixtures/**/node_modules
6464

65-
# Documentation
65+
# Documentation
6666
packages/documentation/docs/pages/CLI.md
6767
packages/documentation/.vitepress/dist
6868
packages/documentation/.vitepress/cache
69-
packages/documentation/dist
69+
packages/documentation/dist

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
1919
## Resources
2020

21-
- [Documentation](https://ui5.github.io/cli/v4/)
22-
- [API Reference](https://ui5.github.io/cli/v4/api/)
23-
- [CLI Documentation](https://ui5.github.io/cli/v4/pages/CLI/)
24-
- [Project Configuration](https://ui5.github.io/cli/v4/pages/Configuration/)
21+
- [Documentation](https://ui5.github.io/cli/stable/)
22+
- [API Reference](https://ui5.github.io/cli/stable/api/)
23+
- [CLI Documentation](https://ui5.github.io/cli/stable/pages/CLI/)
24+
- [Project Configuration](https://ui5.github.io/cli/stable/pages/Configuration/)
2525
- 🎬 [UI5con@SAP 2020 Talk](https://www.youtube.com/watch?v=8IHoVJLKN34)
2626
- 🎬 [UI5con@SAP 2018 Talk](https://www.youtube.com/watch?v=iQ07oe26y_k)
2727
- [Contribution Guidelines](https://github.com/UI5/cli/blob/main/CONTRIBUTING.md)

scripts/generateCliDoc.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,10 @@ function generateDoc() {
183183
.split("&lt;").join("<")
184184
.split("&gt;").join(">")
185185
// Escape <option> as it's considered HTML tag to prevent rendering issues
186-
.replaceAll("<option>", "&lt;option&gt;");
186+
.replaceAll("<option>", "&lt;option&gt;")
187+
// Wrap standalone URLs in backticks to prevent VitePress from treating them as live links
188+
// Only target URLs that are not already in markdown link syntax [text](url)
189+
.replace(/(?<!\()(https?:\/\/[^\s)]+)(?!\))/g, "`$1`");
187190
content = content.split("&#x3D;").join("=");
188191
try {
189192
writeFileSync("./packages/documentation/docs/pages/CLI.md", content);

0 commit comments

Comments
 (0)