fix: update versions to latest compatible (#26)

FuelLabs · Aug 9, 2023 · 943395d · 943395d
1 parent 67ee545
commit 943395d
Show file tree

Hide file tree

Showing 13 changed files with 27 additions and 53 deletions.
diff --git a/docs/builds/sway b/docs/builds/sway
diff --git a/docs/fuel-indexer b/docs/fuel-indexer
diff --git a/docs/fuels-rs b/docs/fuels-rs
diff --git a/docs/fuels-ts b/docs/fuels-ts
diff --git a/docs/sway b/docs/sway
diff --git a/scripts/clean-build-files.sh b/scripts/clean-build-files.sh
@@ -5,4 +5,4 @@ rm -rf ./docs/builds/sway/v*
 rm -rf ./docs/builds/sway/latest
 
 # generate sidebar links
-pnpm generate:links
+pnpm generate:links
diff --git a/scripts/sync-repos.sh b/scripts/sync-repos.sh
@@ -1,3 +1,7 @@
 #!/bin/bash
 
 git submodule update --init
+
+# TODO: Remove after fuels-rs version updated past 43
+cd docs/fuels-rs
+git cherry-pick 989026923b7cca989bf93a7aae481b04e7be915a
diff --git a/src/components/List.tsx b/src/components/List.tsx
@@ -42,9 +42,5 @@ const styles = {
       pl: '$1',
       lineHeight: '1.7',
     },
-
-    '& li > p': {
-      display: 'inline',
-    },
   }),
 };
diff --git a/src/lib/md-doc.ts b/src/lib/md-doc.ts
@@ -31,7 +31,11 @@ export class Doc {
     }
 
     const config = this.#getConfig(item.slug);
-    const pageLink = join(config.repository, item._raw.flattenedPath);
+    const splitPath = item._raw.flattenedPath.split('/');
+    splitPath.splice(0, 2);
+    splitPath.pop();
+    const actualPath = 'tree/master/' + splitPath.join('/');
+    const pageLink = join(config.repository, actualPath);
 
     this.md = item;
     this.config = config;

diff --git a/src/lib/md-parser.ts b/src/lib/md-parser.ts
@@ -50,6 +50,10 @@ export class DocParser {
     }
 
     slug = slug.replace('README', 'index');
+    // TODO: Remove after fixed
+    if (slug === 'docs/fuels-rs/contributing/contributing') {
+      slug = 'docs/fuels-rs/contributing';
+    }
     return slug;
   }
 }
diff --git a/src/lib/plugins/mdbook-example-import.ts b/src/lib/plugins/mdbook-example-import.ts
@@ -103,7 +103,7 @@ export function handleExampleImports(
   }
 
   const bookPath = dirname.split('/')[1];
-  const fileAbsPath = path.resolve(
+  let fileAbsPath = path.resolve(
     path.join(rootDir, `docs/${bookPath}/`),
     filePath
   );
@@ -118,6 +118,12 @@ export function handleExampleImports(
   }
 
   try {
+    if (fileAbsPath.includes('docs/fuels-ts/demo-typegen/')) {
+      fileAbsPath = fileAbsPath.replace(
+        'fuels-ts/demo-typegen',
+        'fuels-ts/apps/demo-typegen'
+      );
+    }
     const fileContent = fs.readFileSync(fileAbsPath, 'utf8');
     const cachedFile = getFilesOnCache(fileAbsPath);
 

diff --git a/src/lib/plugins/plugins.ts b/src/lib/plugins/plugins.ts
@@ -4,12 +4,12 @@ import { join } from 'path';
 import type { Root } from 'remark-gfm';
 import { visit } from 'unist-util-visit';
 import type { Parent } from 'unist-util-visit/lib';
+import { versions } from '~/docs/fuels-ts/packages/versions/src';
 
 import { handleForcGenDocs } from './forc-gen-docs';
 import { handleLinks } from './links';
 import { handleExampleImports } from './mdbook-example-import';
 import { handleScriptLink } from './ts-docs';
-import { loadTSVersions } from './ts-versions';
 import {
   handleDemoComp,
   handlePlayerComp,
@@ -150,7 +150,6 @@ export function handlePlugins() {
     }
 
     if (filepath.includes('/fuels-ts/')) {
-      const versions = loadTSVersions(rootDir);
       // handle injected link urls
       if (hasScriptLink(tree.children[0])) {
         tree = handleScriptLink(tree, versions);

diff --git a/src/lib/plugins/ts-versions.ts b/src/lib/plugins/ts-versions.ts