From 54b3923fb58280a06c8da30409721e513fc877f8 Mon Sep 17 00:00:00 2001 From: Mimi Flynn <414934+mimiflynn@users.noreply.github.com> Date: Tue, 5 Mar 2024 16:21:24 -0500 Subject: [PATCH] update to most recent version of ms-gh-pages (#219) --- .github/workflows/deploy.yml | 4 ++-- .github/workflows/pr-build.yml | 4 ++-- site/gatsby-config.js | 6 +++--- site/package-lock.json | 4 ++-- site/package.json | 4 ++-- site/src/config/base-gatsby-plugins.js | 20 -------------------- site/src/pages/documentation/index.js | 4 ++-- site/src/pages/news/index.js | 4 ++-- site/src/styles/header.css | 6 ------ site/src/styles/prismjs.css | 4 ---- site/src/styles/style.css | 2 +- site/src/templates/documentation.js | 4 ++++ 12 files changed, 20 insertions(+), 46 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 8651843e..6421d292 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -18,10 +18,10 @@ jobs: steps: - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 - - name: Use Node.js ${{ matrix.node-version }} + - name: Use Node.js uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2 with: - node-version: 18 + node-version: 20 cache: 'npm' cache-dependency-path: './site/package-lock.json' - run: npm ci diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml index 95f3b490..bd5c1a50 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/pr-build.yml @@ -18,10 +18,10 @@ jobs: steps: - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 - - name: Use Node.js ${{ matrix.node-version }} + - name: Use Node.js uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2 with: - node-version: 18 + node-version: 20 cache: 'npm' cache-dependency-path: './site/package-lock.json' - run: npm ci diff --git a/site/gatsby-config.js b/site/gatsby-config.js index 67fae855..e0cccb57 100644 --- a/site/gatsby-config.js +++ b/site/gatsby-config.js @@ -2,9 +2,9 @@ const { plugins } = require('./src/config/base-gatsby-plugins'); module.exports = { siteMetadata: { - title: `Morgan Stanley Open Source Software`, - description: `Morgan Stanley Open Source Software`, - siteUrl: 'http://opensource.morganstanley.com/crossroads', + title: `Crossroads`, + description: `Crossroads is a dotnet core commandline tool packager for developers.`, + siteUrl: 'http://opensource.morganstanley.com/Crossroads', documentationUrl: false, // documentationUrl: url-of.documentation.site, }, diff --git a/site/package-lock.json b/site/package-lock.json index e916b056..a253c392 100644 --- a/site/package-lock.json +++ b/site/package-lock.json @@ -35,8 +35,8 @@ "prettier": "^3.2.5" }, "engines": { - "node": "^18.14.0", - "npm": "^9.3.1" + "node": "^20.11.0", + "npm": "^10.3.0" } }, "node_modules/@aashutoshrathi/word-wrap": { diff --git a/site/package.json b/site/package.json index ecbf0149..31a46e47 100644 --- a/site/package.json +++ b/site/package.json @@ -8,8 +8,8 @@ "gatsby" ], "engines": { - "node": "^18.14.0", - "npm": "^9.3.1" + "node": "^20.11.0", + "npm": "^10.3.0" }, "dependencies": { "@mdx-js/react": "^2.3.0", diff --git a/site/src/config/base-gatsby-plugins.js b/site/src/config/base-gatsby-plugins.js index 5bd7e024..edd6bb8b 100644 --- a/site/src/config/base-gatsby-plugins.js +++ b/site/src/config/base-gatsby-plugins.js @@ -16,26 +16,6 @@ const gatsbyRemarkPlugins = [ resolve: `gatsby-remark-prismjs`, options: { showLineNumbers: false, - languageExtensions: [ - { - language: 'superscript', - extend: 'javascript', - definition: { - superscript_types: /(SuperType)/, - }, - insertBefore: { - function: { - superscript_keywords: /(superif|superelse)/, - }, - }, - }, - ], - prompt: { - user: 'root', - host: 'localhost', - global: false, - }, - escapeEntities: {}, }, }, `gatsby-remark-copy-linked-files`, diff --git a/site/src/pages/documentation/index.js b/site/src/pages/documentation/index.js index 6a2d30fd..a794b819 100644 --- a/site/src/pages/documentation/index.js +++ b/site/src/pages/documentation/index.js @@ -4,7 +4,7 @@ import { Link, graphql } from 'gatsby'; import Layout from '../../components/layout'; import Seo from '../../components/seo'; -import DocumentationHero from '../../../content/documentation-hero.mdx'; +import HeroContent from '../../../content/hero.mdx'; const DocumentationIndex = ({ data, location }) => { const docs = data.allMdx.nodes; @@ -12,7 +12,7 @@ const DocumentationIndex = ({ data, location }) => { return (
- + {docs.map((node) => { const title = node.frontmatter.title; const toc = node.tableOfContents.items; diff --git a/site/src/pages/news/index.js b/site/src/pages/news/index.js index 59530afb..c2785db9 100644 --- a/site/src/pages/news/index.js +++ b/site/src/pages/news/index.js @@ -4,7 +4,7 @@ import { Link, graphql } from 'gatsby'; import Layout from '../../components/layout'; import Seo from '../../components/seo'; -import NewsHero from '../../../content/news-hero.mdx'; +import HeroContent from '../../../content/hero.mdx'; const NewsIndex = ({ data, location }) => { const news = data.allMdx.nodes; @@ -12,7 +12,7 @@ const NewsIndex = ({ data, location }) => { return (
- + {news.map((node) => { const title = node.frontmatter.title; diff --git a/site/src/styles/header.css b/site/src/styles/header.css index f7b3dfe7..da575765 100644 --- a/site/src/styles/header.css +++ b/site/src/styles/header.css @@ -47,9 +47,3 @@ .header-nav ul li:last-of-type { margin-right: 0; } - -@media (max-width: 767px) { - .header-main .content { - display: block; - } -} diff --git a/site/src/styles/prismjs.css b/site/src/styles/prismjs.css index 97e370ef..e03896b7 100644 --- a/site/src/styles/prismjs.css +++ b/site/src/styles/prismjs.css @@ -83,10 +83,6 @@ http://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javascr --aqua: #4ccacd; } -pre { - overflow: auto; -} - pre::-webkit-scrollbar { width: 14px; } diff --git a/site/src/styles/style.css b/site/src/styles/style.css index 95c7e6b1..9fa0064e 100644 --- a/site/src/styles/style.css +++ b/site/src/styles/style.css @@ -58,7 +58,7 @@ } .documentation-nav { - margin-top: 2rem; + margin-top: 1rem; flex-grow: 1; width: 30%; } diff --git a/site/src/templates/documentation.js b/site/src/templates/documentation.js index 2fb143e8..ff86a246 100644 --- a/site/src/templates/documentation.js +++ b/site/src/templates/documentation.js @@ -8,10 +8,14 @@ const DocumentationTemplate = ({ children, data, pageContext, location }) => { const docs = data.allMdx.nodes; const toc = data.mdx.tableOfContents.items; const pageTitle = pageContext.frontmatter.title; + const siteTitle = data.site?.siteMetadata?.title; return ( +
+

{siteTitle}

+