Merge branch 'master' into add-new-example

.circleci/config.yml

@@ -0,0 +1,37 @@
+# Javascript Node CircleCI 2.0 configuration file
+#
+# Check https://circleci.com/docs/2.0/language-javascript/ for more details
+#
+version: 2
+jobs:
+  build:
+    docker:
+      # specify the version you desire here
+      - image: circleci/node:10
+
+      # Specify service dependencies here if necessary
+      # CircleCI maintains a library of pre-built images
+      # documented at https://circleci.com/docs/2.0/circleci-images/
+      # - image: circleci/mongo:3.4.4
+
+    working_directory: ~/repo
+
+    steps:
+      - checkout
+
+      # Download and cache dependencies
+      - restore_cache:
+          keys:
+            - v1-dependencies-{{ checksum "package.json" }}
+            # fallback to using the latest cache if no exact match is found
+            - v1-dependencies-
+
+      - run: yarn install
+
+      - save_cache:
+          paths:
+            - node_modules
+          key: v1-dependencies-{{ checksum "package.json" }}
+
+      # run tests!
+      - run: yarn test

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v3.0.8 2019-07-28
+
+- Add support for Gatsby `pathPrefix` option
+
 ## v3.0.0 2019-07-16
 
 - Refactored to leverage Gatsby

docs/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "@mdx-deck/docs",
-  "version": "3.0.7",
+  "version": "3.0.8",
   "main": "index.js",
   "author": "Brent Jackson <jxnblk@gmail.com>",
   "license": "MIT",
@@ -12,8 +12,8 @@
   "dependencies": {
     "@emotion/core": "^10.0.7",
     "@emotion/styled": "^10.0.7",
-    "@mdx-deck/themes": "^3.0.6",
-    "mdx-deck": "^3.0.7",
+    "@mdx-deck/themes": "^3.0.8",
+    "mdx-deck": "^3.0.8",
     "styled-system": "^5.0.15"
   }
 }

examples/appear/package.json

@@ -1,13 +1,13 @@
 {
   "private": true,
   "name": "@mdx-deck/appear-example",
-  "version": "3.0.7",
+  "version": "3.0.8",
   "scripts": {
     "start": "mdx-deck deck.mdx",
     "build": "mdx-deck build deck.mdx",
     "help": "mdx-deck"
   },
   "devDependencies": {
-    "mdx-deck": "^3.0.7"
+    "mdx-deck": "^3.0.8"
   }
 }

examples/aspect-ratio/package.json

@@ -1,13 +1,13 @@
 {
   "private": true,
   "name": "@mdx-deck/aspect-ratio-example",
-  "version": "3.0.7",
+  "version": "3.0.8",
   "scripts": {
     "start": "mdx-deck deck.mdx",
     "build": "mdx-deck build deck.mdx",
     "help": "mdx-deck"
   },
   "devDependencies": {
-    "mdx-deck": "^3.0.7"
+    "mdx-deck": "^3.0.8"
   }
 }

examples/basic/package.json

@@ -1,13 +1,13 @@
 {
   "private": true,
   "name": "@mdx-deck/basic-example",
-  "version": "3.0.7",
+  "version": "3.0.8",
   "scripts": {
     "start": "mdx-deck deck.mdx",
     "build": "mdx-deck build deck.mdx",
     "help": "mdx-deck"
   },
   "devDependencies": {
-    "mdx-deck": "^3.0.7"
+    "mdx-deck": "^3.0.8"
   }
 }

examples/gatsby/decks/beep.mdx

@@ -0,0 +1,10 @@
+
+# Beep
+
+---
+
+## Boop
+
+---
+
+Bop

examples/gatsby/decks/hello.mdx

@@ -0,0 +1,6 @@
+
+# Hello
+
+---
+
+This is built with gatsby-theme-mdx-deck

examples/gatsby/gatsby-config.js

@@ -0,0 +1,12 @@
+module.exports = {
+  pathPrefix: '/mdx-deck',
+  plugins: [
+    'gatsby-plugin-catch-links',
+    {
+      resolve: 'gatsby-theme-mdx-deck',
+      options: {
+        basePath: '/slides',
+      },
+    },
+  ],
+}

examples/gatsby/package.json

@@ -0,0 +1,21 @@
+{
+  "private": true,
+  "name": "@mdx-deck/gatsby-example",
+  "version": "3.0.8",
+  "main": "index.js",
+  "license": "MIT",
+  "scripts": {
+    "start": "gatsby develop",
+    "clean": "gatsby clean",
+    "build": "gatsby build --prefix-paths",
+    "serve": "gatsby serve --prefix-paths",
+    "gh-pages": "npx gh-pages -d public"
+  },
+  "dependencies": {
+    "gatsby": "*",
+    "gatsby-plugin-catch-links": "^2.1.2",
+    "gatsby-theme-mdx-deck": "^3.0.8",
+    "react": "^16.8.6",
+    "react-dom": "^16.8.6"
+  }
+}

examples/gatsby/src/pages/index.mdx

@@ -0,0 +1,4 @@
+
+# MDX Deck Gatsby Example
+
+- [Deck](/slides)

examples/head/package.json

@@ -1,13 +1,13 @@
 {
   "private": true,
   "name": "@mdx-deck/head-example",
-  "version": "3.0.7",
+  "version": "3.0.8",
   "scripts": {
     "start": "mdx-deck deck.mdx",
     "build": "mdx-deck build deck.mdx",
     "help": "mdx-deck"
   },
   "devDependencies": {
-    "mdx-deck": "^3.0.7"
+    "mdx-deck": "^3.0.8"
   }
 }

examples/images/package.json

@@ -1,13 +1,13 @@
 {
   "private": true,
   "name": "@mdx-deck/images-example",
-  "version": "3.0.7",
+  "version": "3.0.8",
   "scripts": {
     "start": "mdx-deck deck.mdx",
     "build": "mdx-deck build deck.mdx",
     "help": "mdx-deck"
   },
   "devDependencies": {
-    "mdx-deck": "^3.0.7"
+    "mdx-deck": "^3.0.8"
   }
 }

examples/layouts/package.json

@@ -1,13 +1,13 @@
 {
   "private": true,
   "name": "@mdx-deck/layouts-example",
-  "version": "3.0.7",
+  "version": "3.0.8",
   "scripts": {
     "start": "mdx-deck deck.mdx",
     "build": "mdx-deck build deck.mdx",
     "help": "mdx-deck"
   },
   "devDependencies": {
-    "mdx-deck": "^3.0.7"
+    "mdx-deck": "^3.0.8"
   }
 }

examples/multiple/package.json

@@ -1,13 +1,13 @@
 {
   "private": true,
   "name": "@mdx-deck/multiple-example",
-  "version": "3.0.7",
+  "version": "3.0.8",
   "scripts": {
     "start": "mdx-deck deck.js",
     "build": "mdx-deck build deck.js",
     "help": "mdx-deck"
   },
   "devDependencies": {
-    "mdx-deck": "^3.0.7"
+    "mdx-deck": "^3.0.8"
   }
 }

examples/prism/package.json

@@ -1,13 +1,13 @@
 {
   "private": true,
   "name": "@mdx-deck/prism-example",
-  "version": "3.0.7",
+  "version": "3.0.8",
   "scripts": {
     "start": "mdx-deck deck.mdx",
     "build": "mdx-deck build deck.mdx",
     "help": "mdx-deck"
   },
   "devDependencies": {
-    "mdx-deck": "^3.0.7"
+    "mdx-deck": "^3.0.8"
   }
 }

examples/provider/package.json

@@ -1,13 +1,13 @@
 {
   "private": true,
   "name": "@mdx-deck/provider-example",
-  "version": "3.0.7",
+  "version": "3.0.8",
   "scripts": {
     "start": "mdx-deck deck.mdx",
     "build": "mdx-deck build deck.mdx",
     "help": "mdx-deck"
   },
   "devDependencies": {
-    "mdx-deck": "^3.0.7"
+    "mdx-deck": "^3.0.8"
   }
 }

examples/syntax-highlighting/package.json

@@ -1,13 +1,13 @@
 {
   "private": true,
   "name": "@mdx-deck/syntax-highlighting-example",
-  "version": "3.0.7",
+  "version": "3.0.8",
   "scripts": {
     "start": "mdx-deck deck.mdx",
     "build": "mdx-deck build deck.mdx",
     "help": "mdx-deck"
   },
   "devDependencies": {
-    "mdx-deck": "^3.0.7"
+    "mdx-deck": "^3.0.8"
   }
 }

examples/themes/package.json

@@ -1,13 +1,13 @@
 {
   "private": true,
   "name": "@mdx-deck/themes-example",
-  "version": "3.0.7",
+  "version": "3.0.8",
   "scripts": {
     "start": "mdx-deck deck.mdx",
     "build": "mdx-deck build deck.mdx",
     "help": "mdx-deck"
   },
   "devDependencies": {
-    "mdx-deck": "^3.0.7"
+    "mdx-deck": "^3.0.8"
   }
 }

lerna.json

@@ -2,5 +2,5 @@
   "packages": ["packages/*"],
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "3.0.7"
+  "version": "3.0.8"
 }

packages/create-deck/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-deck",
-  "version": "3.0.6",
+  "version": "3.0.8",
   "description": "Create mdx-deck presentations",
   "bin": {
     "create-deck": "cli.js"

packages/gatsby-theme/gatsby-node.js

@@ -74,7 +74,7 @@ exports.sourceNodes = ({ actions, schema }) => {
   )
 }
 
-exports.createPages = async ({ graphql, actions, reporter }) => {
+exports.createPages = async ({ graphql, actions, reporter, pathPrefix }) => {
   const { createPage } = actions
 
   const result = await graphql(`
@@ -101,8 +101,11 @@ exports.createPages = async ({ graphql, actions, reporter }) => {
   // single deck mode
   if (decks.length === 1) {
     const [deck] = decks
-    const matchPath = [basePath, '*'].join('/')
-    const slug = basePath === '/' ? '' : basePath
+    const base = basePath === '/' ? '' : basePath
+    const matchPath = [base, '*'].join('/')
+
+    const slug = [pathPrefix, base].filter(Boolean).join('')
+
     createPage({
       path: basePath,
       matchPath,
@@ -112,23 +115,37 @@ exports.createPages = async ({ graphql, actions, reporter }) => {
         slug,
       },
     })
+    createPage({
+      path: basePath + '/print',
+      component: DeckTemplate,
+      context: {
+        ...deck.node,
+        slug,
+      },
+    })
     return
   }
 
   decks.forEach(({ node }, index) => {
-    const { slug } = node
-    const matchPath = [slug, '*'].join('/')
+    const matchPath = [node.slug, '*'].join('/')
+    const slug = [pathPrefix, node.slug].filter(Boolean).join('')
 
     createPage({
-      path: slug,
+      path: node.slug,
       matchPath,
       component: DeckTemplate,
-      context: node,
+      context: {
+        ...node,
+        slug,
+      },
     })
     createPage({
       path: slug + '/print',
       component: DeckTemplate,
-      context: node,
+      context: {
+        ...node,
+        slug,
+      },
     })
   })
 
@@ -179,7 +196,6 @@ exports.onCreateNode = ({ node, actions, getNode, createNodeId }) => {
 }
 
 exports.onCreateDevServer = ({ app }) => {
-  console.log('onCreateDevServer')
   if (typeof process.send !== 'function') return
   process.send({
     mdxDeck: true,

packages/gatsby-theme/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-theme-mdx-deck",
-  "version": "3.0.7",
+  "version": "3.0.8",
   "main": "index.js",
   "license": "MIT",
   "scripts": {
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@emotion/core": "^10.0.14",
-    "@mdx-deck/themes": "^3.0.6",
+    "@mdx-deck/themes": "^3.0.8",
     "@mdx-js/mdx": "^1.0.21",
     "@mdx-js/react": "^1.0.21",
     "@reach/router": "^1.2.1",

packages/gatsby-theme/src/components/deck.js

@@ -67,6 +67,8 @@ const mergeThemes = (...themes) =>
     {}
   )
 
+const DefaultMode = ({ children }) => <React.Fragment children={children} />
+
 export default ({
   slides = [],
   pageContext: { title, slug },
@@ -91,7 +93,7 @@ export default ({
     theme: mergedTheme,
   }
 
-  let Mode = ({ children }) => <React.Fragment children={children} />
+  let Mode = DefaultMode
 
   switch (context.mode) {
     case modes.presenter:

packages/mdx-deck/README.md

@@ -254,7 +254,6 @@ The following examples will open in CodeSandbox.
 [theme ui]: https://theme-ui.com
 
 <!-- examples -->
-
 [design-systems-react]: https://github-ds.now.sh/#0
 [brazil-now]: https://braziljs.now.sh
 [simplify-react]: https://simply-react.netlify.com/#0
@@ -262,3 +261,4 @@ The following examples will open in CodeSandbox.
 [stop-div-fest]: https://stop-div-fest.now.sh/
 [mdx-talk]: https://mdx-talk.developermode.com/
 [components-as-data]: https://componentsasdata.lukeherrington.com
+

packages/mdx-deck/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mdx-deck",
-  "version": "3.0.7",
+  "version": "3.0.8",
   "description": "MDX-based presentation decks",
   "bin": {
     "mdx-deck": "./cli.js"
@@ -16,13 +16,13 @@
   "license": "MIT",
   "repository": "github:jxnblk/mdx-deck",
   "dependencies": {
-    "@mdx-deck/themes": "^3.0.6",
+    "@mdx-deck/themes": "^3.0.8",
     "chalk": "^2.4.2",
     "execa": "^2.0.3",
     "fs-extra": "^8.1.0",
     "gatsby": "^2.13.24",
     "gatsby-plugin-compile-es6-packages": "^2.0.0",
-    "gatsby-theme-mdx-deck": "^3.0.7",
+    "gatsby-theme-mdx-deck": "^3.0.8",
     "initit": "^1.0.0-2",
     "meow": "^5.0.0",
     "react": "^16.8.6",

packages/starter/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "@mdx-deck/gatsby-starter",
-  "version": "3.0.7",
+  "version": "3.0.8",
   "main": "index.js",
   "license": "MIT",
   "scripts": {
@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "gatsby": "^2.13.25",
-    "gatsby-theme-mdx-deck": "^3.0.7",
+    "gatsby-theme-mdx-deck": "^3.0.8",
     "react": "^16.8.6",
     "react-dom": "^16.8.6"
   },

packages/themes/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mdx-deck/themes",
-  "version": "3.0.6",
+  "version": "3.0.8",
   "main": "index.js",
   "author": "Brent Jackson <jxnblk@gmail.com>",
   "license": "MIT",

packages/website-pdf/package.json

@@ -1,6 +1,6 @@
 {
   "name": "website-pdf",
-  "version": "3.0.6",
+  "version": "3.0.8",
   "author": "Brent Jackson <jxnblk@gmail.com>",
   "license": "MIT",
   "bin": {

templates/basic/package.json

@@ -1,13 +1,13 @@
 {
   "private": true,
   "name": "@mdx-deck/basic-template",
-  "version": "3.0.7",
+  "version": "3.0.8",
   "scripts": {
     "start": "mdx-deck deck.mdx",
     "build": "mdx-deck build deck.mdx",
     "help": "mdx-deck"
   },
   "devDependencies": {
-    "mdx-deck": "^3.0.7"
+    "mdx-deck": "^3.0.8"
   }
 }