Skip to content

Commit

Permalink
Merge 60b7cb8 into 8f43d03
Browse files Browse the repository at this point in the history
  • Loading branch information
datakurre committed Oct 20, 2019
2 parents 8f43d03 + 60b7cb8 commit d40a2db
Show file tree
Hide file tree
Showing 6 changed files with 2,346 additions and 1,092 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
@@ -1,7 +1,7 @@
language: node_js
node_js:
- 8.11.1
- 10.1.0
- 8.16.0
- 10.13.0
cache:
pip: true
yarn: true
Expand All @@ -18,7 +18,7 @@ after_success:
- make coveralls
- test $TRAVIS_BRANCH = "master" &&
test $(node --version) = "v10.1.0" &&
GATSBY_BUILD_FLAGS=--prefix-paths make clean coveralls init-backend build
GATSBY_BUILD_FLAGS=--prefix-paths make clean coveralls init-docs-backend build
deploy:
provider: pages
github-token: "$GITHUB_TOKEN"
Expand Down
9 changes: 7 additions & 2 deletions demo/Makefile
Expand Up @@ -8,10 +8,10 @@ GATSBY_BUILD_FLAGS ?=

UNAME_S := $(shell uname -s)
ifeq ($(UNAME_S),Linux)
GECKODRIVER = https://github.com/mozilla/geckodriver/releases/download/v0.20.1/geckodriver-v0.20.1-linux64.tar.gz
GECKODRIVER = https://github.com/mozilla/geckodriver/releases/download/v0.26.0/geckodriver-v0.26.0-linux64.tar.gz
endif
ifeq ($(UNAME_S),Darwin)
GECKODRIVER = https://github.com/mozilla/geckodriver/releases/download/v0.20.1/geckodriver-v0.20.1-macos.tar.gz
GECKODRIVER = https://github.com/mozilla/geckodriver/releases/download/v0.26.0/geckodriver-v0.26.0-macos.tar.gz
endif

.PHONY: all
Expand Down Expand Up @@ -42,6 +42,11 @@ init-backend: start-backend
fixture/purge.sh
fixture/import.sh

.PHONY: init-docs-backend
init-docs-backend: init-backend
curl -X DELETE --user admin:admin http://localhost:8080/Plone/news
curl -X DELETE --user admin:admin http://localhost:8080/Plone/examples

.PHONY: purge
purge: clean stop-backend
docker-compose rm -fv
Expand Down
13 changes: 13 additions & 0 deletions demo/gatsby-node.js
Expand Up @@ -5,6 +5,19 @@
*/

const path = require('path');
const fs = require('fs')
const PLONE_SCHEMA = 'plone-typedefs.graphql'

exports.createSchemaCustomization = ({ actions }) => {
if (fs.existsSync(PLONE_SCHEMA)) {
actions.createTypes(fs.readFileSync(PLONE_SCHEMA, { encoding: 'utf-8' }));
} else {
actions.printTypeDefinitions({
path: PLONE_SCHEMA,
include: { plugins: ['gatsby-source-plone'] },
});
}
};

exports.createPages = async ({ graphql, actions }) => {
const { createPage } = actions;
Expand Down
20 changes: 10 additions & 10 deletions demo/package.json
Expand Up @@ -5,17 +5,17 @@
"author": "Asko Soukka <asko.soukka@iki.fi>",
"dependencies": {
"bootstrap": "^4.3.1",
"gatsby": "2.15.1",
"gatsby-image": "^2.2.15",
"gatsby-plugin-react-helmet": "^3.1.5",
"gatsby-plugin-sass": "^2.1.12",
"gatsby-plugin-sharp": "^2.2.18",
"gatsby-source-filesystem": "^2.1.18",
"gatsby": "2.16.5",
"gatsby-image": "^2.2.29",
"gatsby-plugin-react-helmet": "^3.1.13",
"gatsby-plugin-sass": "^2.1.20",
"gatsby-plugin-sharp": "^2.2.32",
"gatsby-source-filesystem": "^2.1.33",
"gatsby-source-plone": "https://github.com/collective/gatsby-source-plone.git#master",
"gatsby-transformer-sharp": "^2.2.12",
"gatsby-transformer-sharp": "^2.2.23",
"node-sass": "^4.12.0",
"react": "^16.9.0",
"react-dom": "^16.9.0",
"react": "^16.10.2",
"react-dom": "^16.10.2",
"react-helmet": "^5.2.1",
"react-icons": "^3.7.0",
"react-redux": "^7.1.1",
Expand All @@ -27,7 +27,7 @@
"license": "MIT",
"main": "n/a",
"devDependencies": {
"dotenv": "^8.1.0",
"dotenv": "^8.2.0",
"prettier": "^1.18.2",
"yalc": "^1.0.0-pre.34"
}
Expand Down

0 comments on commit d40a2db

Please sign in to comment.