Merge pull request #85 from mohatt/fixes

mohatt · Feb 4, 2021 · 7b76be8 · 7b76be8
2 parents 39d0be4 + 13dbbe7
commit 7b76be8
Show file tree

Hide file tree

Showing 31 changed files with 155 additions and 240 deletions.
diff --git a/.babelrc b/.babelrc
diff --git a/jest.config.js b/jest.config.js
diff --git a/package.json b/package.json
@@ -14,9 +14,9 @@
   "scripts": {
     "prepare": "cross-env NODE_ENV=production npm run build",
     "prebuild": "rimraf 'dist/*'",
-    "build": "babel src --out-dir dist --copy-files --ignore '**/__tests__,**/*.test.js'",
+    "build": "babel src --out-dir dist --copy-files --ignore '**/__tests__,**/*.test.js,**/*.fragment.js'",
     "postbuild": "rimraf 'dist/**/__tests__' 'dist/**/*.test.js'",
-    "watch": "babel -w src --out-dir dist --copy-files --ignore '**/__tests__,**/*.test.js'",
+    "watch": "babel -w src --out-dir dist --copy-files --ignore '**/__tests__,**/*.test.js,**/*.fragment.js'",
     "test": "jest --runInBand",
     "test:coverage": "jest --runInBand --coverage",
     "test:watch": "jest --watch --runInBand",
@@ -74,6 +74,18 @@
   "engines": {
     "node": ">=10.13.0"
   },
+  "jest": {
+    "roots": [
+      "<rootDir>/test/",
+      "<rootDir>/src/"
+    ],
+    "testPathIgnorePatterns": [
+      "/__tests__/__fixtures__/.*$"
+    ],
+    "collectCoverageFrom": [
+      "src/**/*.js"
+    ]
+  },
   "standard": {
     "parser": "@babel/eslint-parser",
     "env": [

diff --git a/src/.babelrc b/src/.babelrc
@@ -0,0 +1,7 @@
+{
+  "presets": [
+    ["babel-preset-gatsby-package", {
+      "browser": true
+    }]
+  ]
+}
diff --git a/test/__fixtures__/routes.js → src/__tests__/__fixtures__/routes.js b/test/__fixtures__/routes.js → src/__tests__/__fixtures__/routes.js
diff --git a/src/__tests__/api.js b/src/__tests__/api.js
@@ -1,5 +1,5 @@
 import { withPrefix } from 'gatsby'
-import routes from '../../test/__fixtures__/routes'
+import routes from './__fixtures__/routes'
 import {
   getRoutes,
   routeExists,
@@ -10,8 +10,11 @@ import {
   generatePath
 } from '../api'
 
-// Create a virtual mock for routes.js
-jest.doMock('../routes', () => routes, { virtual: true })
+// Create a virtual mock for routes.json
+jest.doMock(
+  'gatsby-plugin-advanced-pages-cache/routes.json',
+  () => routes, { virtual: true }
+)
 
 jest.doMock('@reach/router', () => ({
   globalHistory: {

diff --git a/src/api.js b/src/api.js
@@ -3,7 +3,7 @@ import { pick, compile } from './lib/route-compiler'
 
 // Gets an array of all routes
 export function getRoutes () {
-  return require('./routes')
+  return require('gatsby-plugin-advanced-pages-cache/routes.json')
 }
 
 // Gets a specific route

diff --git a/src/components/Link/__tests__/Link.js b/src/components/Link/__tests__/Link.js
@@ -1,10 +1,13 @@
 import React from 'react'
 import TestRenderer from 'react-test-renderer'
 import Link from '../Link'
-import routes from '../../../../test/__fixtures__/routes'
+import routes from '../../../__tests__/__fixtures__/routes'
 
-// Create a virtual mock for routes.js
-jest.doMock('../../../routes', () => routes, { virtual: true })
+// Create a virtual mock for routes.json
+jest.doMock(
+  'gatsby-plugin-advanced-pages-cache/routes.json',
+  () => routes, { virtual: true }
+)
 
 describe('<Link />', () => {
   const render = (props = {}) => {

diff --git a/...components/Pagination/Pagination.fragment → ...ponents/Pagination/Pagination.fragment.js b/...components/Pagination/Pagination.fragment → ...ponents/Pagination/Pagination.fragment.js
@@ -1,6 +1,6 @@
-import { graphql } from "gatsby"
+import { graphql } from 'gatsby'
 
-export const pagination = graphql`
+export const Pagination = graphql`
   fragment Pagination on PageInfo {
     perPage
     pageCount

diff --git a/src/components/Pagination/__tests__/Pagination.js b/src/components/Pagination/__tests__/Pagination.js
@@ -2,7 +2,7 @@ import React from 'react'
 import ShallowRenderer from 'react-test-renderer/shallow'
 import { mapValues, merge } from 'lodash'
 import Pagination from '../Pagination'
-import testCases, { defaultTestCase } from '../../../../test/__fixtures__/pagination'
+import testCases, { defaultTestCase } from './__fixtures__/pagination'
 
 describe('<Pagination />', () => {
   const render = (props = {}) => {

diff --git a/test/__fixtures__/pagination.js → ...tion/__tests__/__fixtures__/pagination.js b/test/__fixtures__/pagination.js → ...tion/__tests__/__fixtures__/pagination.js
diff --git a/src/gatsby/.babelrc b/src/gatsby/.babelrc
@@ -1,6 +1,8 @@
 {
   "presets": [
-    ["babel-preset-gatsby-package", { "nodeVersion": "8" }]
+    ["babel-preset-gatsby-package", {
+      "browser": false,
+      "nodeVersion": "10.13.0"
+    }]
   ]
 }
-
diff --git a/test/__fixtures__/create-pages.js → ...by/__tests__/__fixtures__/create-pages.js b/test/__fixtures__/create-pages.js → ...by/__tests__/__fixtures__/create-pages.js
@@ -69,9 +69,7 @@ export default [
         ]
       }
     ],
-    helper: function ({ createAdvancedPage }) {
-      throw new Error('some error')
-    }
+    helper: () => { throw new Error('some error') }
   },
   {
     id: 'bad-helper-empty-call',
@@ -85,9 +83,7 @@ export default [
         ]
       }
     ],
-    helper: function ({ createAdvancedPage }) {
-      createAdvancedPage()
-    }
+    helper: ({ createAdvancedPage }) => createAdvancedPage()
   },
   {
     id: 'bad-helper-undefined-route',
@@ -101,11 +97,7 @@ export default [
         ]
       }
     ],
-    helper: function ({ createAdvancedPage }) {
-      createAdvancedPage({
-        route: 'blog'
-      })
-    }
+    helper: ({ createAdvancedPage }) => createAdvancedPage({ route: 'blog' })
   },
   {
     id: 'bad-helper-invalid-route-params',
@@ -119,11 +111,7 @@ export default [
         ]
       }
     ],
-    helper: function ({ createAdvancedPage }) {
-      createAdvancedPage({
-        route: 'about'
-      })
-    }
+    helper: ({ createAdvancedPage }) => createAdvancedPage({ route: 'about' })
   },
   {
     id: 'bad-helper-empty-pagination',
@@ -137,7 +125,7 @@ export default [
         ]
       }
     ],
-    helper: function ({ createAdvancedPage }) {
+    helper: ({ createAdvancedPage }) => {
       createAdvancedPage({
         route: 'about',
         pagination: {}
@@ -156,7 +144,7 @@ export default [
         ]
       }
     ],
-    helper: function ({ createAdvancedPage }) {
+    helper: ({ createAdvancedPage }) => {
       createAdvancedPage({
         route: 'about',
         pagination: {
@@ -177,7 +165,7 @@ export default [
         ]
       }
     ],
-    helper: function ({ createAdvancedPage }) {
+    helper: ({ createAdvancedPage }) => {
       createAdvancedPage({
         route: 'about',
         pagination: {
@@ -199,7 +187,7 @@ export default [
         ]
       }
     ],
-    helper: function ({ createAdvancedPage }) {
+    helper: ({ createAdvancedPage }) => {
       createAdvancedPage({
         route: 'about',
         pagination: {
@@ -221,7 +209,7 @@ export default [
         ]
       }
     ],
-    helper: function ({ createAdvancedPage }) {
+    helper: ({ createAdvancedPage }) => {
       createAdvancedPage({
         route: 'blog',
         pagination: {
@@ -243,7 +231,7 @@ export default [
         ]
       }
     ],
-    helper: function ({ createAdvancedPage }) {
+    helper: ({ createAdvancedPage }) => {
       createAdvancedPage({
         route: 'blog',
         pagination: {
@@ -265,7 +253,7 @@ export default [
         ]
       }
     ],
-    helper: function ({ createAdvancedPage }) {
+    helper: ({ createAdvancedPage }) => {
       createAdvancedPage({
         route: 'blog',
         pagination: {
@@ -287,7 +275,7 @@ export default [
         ]
       }
     ],
-    helper: function ({ createAdvancedPage }) {
+    helper: ({ createAdvancedPage }) => {
       for (const slug of ['hello', 'world']) {
         createAdvancedPage({
           route: 'page',
@@ -310,7 +298,7 @@ export default [
         ]
       }
     ],
-    helper: function ({ createAdvancedPage }) {
+    helper: ({ createAdvancedPage }) => {
       createAdvancedPage({
         route: 'about',
         params: {

diff --git a/test/__fixtures__/pagesSchema.js → ...sby/__tests__/__fixtures__/pagesSchema.js b/test/__fixtures__/pagesSchema.js → ...sby/__tests__/__fixtures__/pagesSchema.js
diff --git a/test/__fixtures__/pluginOptionsSchema.js → ...sts__/__fixtures__/pluginOptionsSchema.js b/test/__fixtures__/pluginOptionsSchema.js → ...sts__/__fixtures__/pluginOptionsSchema.js
diff --git a/test/__fixtures__/source-nodes.js → ...by/__tests__/__fixtures__/source-nodes.js b/test/__fixtures__/source-nodes.js → ...by/__tests__/__fixtures__/source-nodes.js
diff --git a/src/gatsby/__tests__/__snapshots__/create-pages.js.snap b/src/gatsby/__tests__/__snapshots__/create-pages.js.snap
@@ -38,19 +38,7 @@ Array [
 ]
 `;
 
-exports[`createPages correctly creates pages on (blog-paginated-auto-route) 2`] = `
-"\\"use strict\\";
-
-module.exports = [
-  {
-    \\"name\\": \\"blog\\",
-    \\"path\\": \\"/blog\\",
-    \\"scopes\\": {
-      \\"pagination\\": \\"/blog/page/:page\\"
-    }
-  }
-];"
-`;
+exports[`createPages correctly creates pages on (blog-paginated-auto-route) 2`] = `"[{\\"name\\":\\"blog\\",\\"path\\":\\"/blog\\",\\"scopes\\":{\\"pagination\\":\\"/blog/page/:page\\"}}]"`;
 
 exports[`createPages correctly creates pages on (blog-paginated-custom-limit) 1`] = `
 Array [
@@ -101,19 +89,7 @@ Array [
 ]
 `;
 
-exports[`createPages correctly creates pages on (blog-paginated-custom-limit) 2`] = `
-"\\"use strict\\";
-
-module.exports = [
-  {
-    \\"name\\": \\"blog\\",
-    \\"path\\": \\"/blog\\",
-    \\"scopes\\": {
-      \\"pagination\\": \\"/blog/page/:page\\"
-    }
-  }
-];"
-`;
+exports[`createPages correctly creates pages on (blog-paginated-custom-limit) 2`] = `"[{\\"name\\":\\"blog\\",\\"path\\":\\"/blog\\",\\"scopes\\":{\\"pagination\\":\\"/blog/page/:page\\"}}]"`;
 
 exports[`createPages correctly creates pages on (blog-paginated-manual-route) 1`] = `
 Array [
@@ -153,24 +129,7 @@ Array [
 ]
 `;
 
-exports[`createPages correctly creates pages on (blog-paginated-manual-route) 2`] = `
-"\\"use strict\\";
-
-module.exports = [
-  {
-    \\"name\\": \\"blog\\",
-    \\"path\\": \\"/blog\\",
-    \\"scopes\\": {
-      \\"pagination\\": \\"/blog/what/:page\\"
-    }
-  },
-  {
-    \\"name\\": \\"blog.paginated\\",
-    \\"path\\": \\"/blog/what/:page\\",
-    \\"scopes\\": {}
-  }
-];"
-`;
+exports[`createPages correctly creates pages on (blog-paginated-manual-route) 2`] = `"[{\\"name\\":\\"blog\\",\\"path\\":\\"/blog\\",\\"scopes\\":{\\"pagination\\":\\"/blog/what/:page\\"}},{\\"name\\":\\"blog.paginated\\",\\"path\\":\\"/blog/what/:page\\",\\"scopes\\":{}}]"`;
 
 exports[`createPages correctly creates pages on (dynamic-page) 1`] = `
 Array [
@@ -197,17 +156,7 @@ Array [
 ]
 `;
 
-exports[`createPages correctly creates pages on (dynamic-page) 2`] = `
-"\\"use strict\\";
-
-module.exports = [
-  {
-    \\"name\\": \\"page\\",
-    \\"path\\": \\"/pages/:page\\",
-    \\"scopes\\": {}
-  }
-];"
-`;
+exports[`createPages correctly creates pages on (dynamic-page) 2`] = `"[{\\"name\\":\\"page\\",\\"path\\":\\"/pages/:page\\",\\"scopes\\":{}}]"`;
 
 exports[`createPages correctly creates pages on (home-about) 1`] = `
 Array [
@@ -241,27 +190,7 @@ Array [
 ]
 `;
 
-exports[`createPages correctly creates pages on (home-about) 2`] = `
-"\\"use strict\\";
-
-module.exports = [
-  {
-    \\"name\\": \\"home\\",
-    \\"path\\": \\"/\\",
-    \\"scopes\\": {}
-  },
-  {
-    \\"name\\": \\"about\\",
-    \\"path\\": \\"/about\\",
-    \\"scopes\\": {}
-  },
-  {
-    \\"name\\": \\"aboutme\\",
-    \\"path\\": \\"/aboutme\\",
-    \\"scopes\\": {}
-  }
-];"
-`;
+exports[`createPages correctly creates pages on (home-about) 2`] = `"[{\\"name\\":\\"home\\",\\"path\\":\\"/\\",\\"scopes\\":{}},{\\"name\\":\\"about\\",\\"path\\":\\"/about\\",\\"scopes\\":{}},{\\"name\\":\\"aboutme\\",\\"path\\":\\"/aboutme\\",\\"scopes\\":{}}]"`;
 
 exports[`createPages correctly creates pages on (page-context) 1`] = `
 Array [
@@ -296,17 +225,7 @@ Array [
 ]
 `;
 
-exports[`createPages correctly creates pages on (page-context) 2`] = `
-"\\"use strict\\";
-
-module.exports = [
-  {
-    \\"name\\": \\"about\\",
-    \\"path\\": \\"/about/:name\\",
-    \\"scopes\\": {}
-  }
-];"
-`;
+exports[`createPages correctly creates pages on (page-context) 2`] = `"[{\\"name\\":\\"about\\",\\"path\\":\\"/about/:name\\",\\"scopes\\":{}}]"`;
 
 exports[`createPages throws error on (bad-helper-empty-call) 1`] = `[Error: Route name passed to createAdvancedPage() at "/path/to/helper.js" must be a non-empty string]`;