Merge branch 'main' into add-alias-commands

Author: yathomasi

packages/example/content/docs/examples.md

@@ -75,3 +75,13 @@ Second Tab Three
 </tab>
 
 </toggle>
+
+## Skip code with hash
+
+```cli
+$ gto assign cv-class --version v0.1.13 --stage dev
+Created git tag 'cv-class#dev#1' that assigns stage to version 'v0.1.13'
+To push the changes upstream, run:
+    git push origin cv-class#dev#1 #this is a comment
+#This is a comment
+```

packages/example/src/pages/index.tsx

@@ -1,18 +1,39 @@
 import React from 'react'
-import { Link } from 'gatsby'
+import cn from 'classnames'
+import { PageProps } from 'gatsby'
+import MainLayout from '@dvcorg/gatsby-theme-iterative/src/components/MainLayout'
+import Link from '@dvcorg/gatsby-theme-iterative/src/components/Link'
 
-export default function Home() {
+export default function Home({ location }: PageProps) {
   return (
-    <div>
-      <h1>Gatsby Theme: Iterative</h1>
-      <p>
-        Welcome to the documentation and example website for Iterative&apos;s
-        website engine!
-      </p>
-      <p>
-        This theme is primarily related to adding a documentation engine, which
-        you can see <Link to="/doc">here!</Link>
-      </p>
-    </div>
+    <MainLayout location={location}>
+      <div
+        className={cn(
+          'container',
+          'mx-auto',
+          'mt-14',
+          'px-4',
+          'py-14',
+          'flex',
+          'flex-col',
+          'justify-center',
+          'items-center'
+        )}
+      >
+        <h1 className={cn('text-2xl', 'font-bold', 'text-center', 'mb-5')}>
+          Gatsby Theme: Iterative
+        </h1>
+        <section className="text-lg">
+          <p>
+            Welcome to the documentation and example website for
+            Iterative&apos;s website engine!
+          </p>
+          <p>
+            This theme is primarily related to adding a documentation engine,
+            which you can see <Link href="/doc">here!</Link>
+          </p>
+        </section>
+      </div>
+    </MainLayout>
   )
 }

packages/example/tailwind.config.js

@@ -1,7 +1,13 @@
+const themeConfig = require('@dvcorg/gatsby-theme-iterative/tailwind.config')
+
 module.exports = {
-  content: ['./src/**/*.{js,jsx,ts,tsx}'],
+  ...themeConfig,
+  content: [...themeConfig.content, './src/**/*'],
   theme: {
-    extend: {}
-  },
-  plugins: []
+    ...themeConfig.theme,
+    fontFamily: {
+      sans: ['Tahoma', 'Arial', 'sans-serif'],
+      mono: ['Consolas', '"Liberation Mono"', 'Menlo', 'Courier', 'monospace']
+    }
+  }
 }

packages/gatsby-theme-iterative/config-defaults.js

@@ -0,0 +1,8 @@
+const path = require('path')
+module.exports = {
+  glossaryPath: path.resolve('content', 'docs', 'user-guide', 'basic-concepts'),
+  docsPath: path.resolve('content', 'docs'),
+  glossaryInstanceName: 'iterative-glossary',
+  docsInstanceName: 'iterative-docs',
+  argsLinkerPath: ['command-reference', `ref`, 'cli-reference']
+}

packages/gatsby-theme-iterative/config/postcss/media.d.ts

@@ -76,7 +76,10 @@ Prism.languages.cli = {
       ...bash
     }
   },
-  comment: bash.comment
+  comment: {
+    pattern: /(^|[\s^"{\\$])#.*/,
+    lookbehind: true
+  }
 }
 
 Prism.languages.dvc = Prism.languages.cli

packages/gatsby-theme-iterative/config/postcss/media.js

@@ -3,6 +3,8 @@ const GithubSlugger = require('github-slugger')
 const slugger = new GithubSlugger()
 const SLUG_REGEXP = /\s+{#([a-z0-9-]*[a-z0-9]+)}\s*$/
 
+const path = require('path')
+
 const extractSlugFromTitle = title => {
   // extracts expressions like {#too-many-files} from the end of a title
   const meta = title.match(SLUG_REGEXP)
@@ -34,7 +36,7 @@ const parseHeadings = text => {
 
 const createPages = async (
   { graphql, actions },
-  { defaultTemplate, getTemplate, disable }
+  { defaultTemplate, getTemplate, disable, docsPrefix }
 ) => {
   if (disable) return
   const docsResponse = await graphql(
@@ -73,14 +75,13 @@ const createPages = async (
     } = doc
     const headings = parseHeadings(rawMarkdownBody)
 
-    if (slug) {
+    if (slug !== undefined) {
       actions.createPage({
         component: getTemplate(template, defaultTemplate),
-        path: slug,
+        path: path.posix.join(docsPrefix, slug),
         context: {
           id,
           slug,
-          isDocs: true,
           headings
         }
       })