From 1f1b01d6f06e18fc86dad1f99c42a8d5d417a200 Mon Sep 17 00:00:00 2001 From: Savio van Hoi Date: Tue, 25 Jul 2017 19:32:21 +0200 Subject: [PATCH] Issue 29/refactor gatsby starter default (#31) * Delete TravisCI config * Remove gh-pages dependency and add prettier * Change double quotes to single quotes in src files * Update packages, refactor classes to stateless components and update readme * Removed package-lock as yarn is the default for this project * Readded travis yml * Remove travis config * Remove Eslint and Editorconfig * Remove html.js as it's already imported implicitely * Update lock file --- .gitignore | 31 +- .travis.yml | 38 -- README.md | 3 + package.json | 9 +- src/html.js | 45 -- src/{css/typography.css => layouts/index.css} | 0 src/layouts/index.js | 114 ++--- src/pages/404.js | 9 +- src/pages/index.js | 27 +- src/pages/page-2.js | 25 +- yarn.lock | 464 ++++++++++++------ 11 files changed, 401 insertions(+), 364 deletions(-) delete mode 100644 .travis.yml delete mode 100644 src/html.js rename src/{css/typography.css => layouts/index.css} (100%) diff --git a/.gitignore b/.gitignore index fe02ec058d2b1..dcd06d5631dea 100644 --- a/.gitignore +++ b/.gitignore @@ -1,32 +1,7 @@ -# Logs -logs -*.log - -# Runtime data -pids -*.pid -*.seed - -# Directory for instrumented libs generated by jscoverage/JSCover -lib-cov - -# Coverage directory used by tools like istanbul -coverage - -# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files) -.grunt - -# node-waf configuration -.lock-wscript - -# Compiled binary addons (http://nodejs.org/api/addons.html) -build/Release - -# Dependency directory +# Project dependencies # https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git node_modules -.gatsby-context.js -.sass-cache/ -public/ .cache/ +# Build directory +public/ .DS_Store diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 7ea1540678ec3..0000000000000 --- a/.travis.yml +++ /dev/null @@ -1,38 +0,0 @@ -# back to language cpp to try to bypass osx node failure -language: cpp -sudo: false -env: - - export NODE_VERSION="0.12" - - export NODE_VERSION="4" - - export NODE_VERSION="5" -os: - - linux - - osx -# pre-install to bring in the correct version of node via nvm -before_install: - - git submodule update --init --recursive - - git clone https://github.com/creationix/nvm.git ./.nvm - - source ./.nvm/nvm.sh - - nvm install $NODE_VERSION - - nvm use $NODE_VERSION - - npm config set python `which python` - - if [ $TRAVIS_OS_NAME == "linux" ]; then - export CC="gcc-4.8"; - export CXX="g++-4.8"; - export LINK="gcc-4.8"; - export LINKXX="g++-4.8"; - fi - - gcc --version - - g++ --version -# node 4 depends on gcc 4.8 -addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.8 - - gcc-4.8 -# script needed to test, because defaults don't work on osx -script: - - npm install - - npm run lint diff --git a/README.md b/README.md index ea67d3fbba8c3..d9a5172730b93 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,13 @@ # gatsby-starter-default The default Gatsby starter +For an overview of the project structure please refer to the [Gatsby documentation - Building with Components](https://www.gatsbyjs.org/docs/building-with-components/) + Install this starter (assuming Gatsby is installed) by running from your CLI: ``` gatsby new gatsby-example-site ``` + ## Deploy [![Deploy to Netlify](https://www.netlify.com/img/deploy/button.svg)](https://app.netlify.com/start/deploy?repository=https://github.com/gatsbyjs/gatsby-starter-default) diff --git a/package.json b/package.json index 4137996b75946..03ceed5fdcdd7 100644 --- a/package.json +++ b/package.json @@ -8,9 +8,6 @@ "gatsby-link": "^1.0.1", "gatsby-plugin-react-helmet": "^1.0.1" }, - "devDependencies": { - "gh-pages": "^0.12.0" - }, "keywords": [ "gatsby" ], @@ -18,9 +15,11 @@ "main": "n/a", "scripts": { "build": "gatsby build", - "deploy": "gatsby build --prefix-paths && gh-pages -d public", "develop": "gatsby develop", - "format": "prettier --trailing-comma es5 --no-semi --single-quote --write \"pages/*.js\" \"utils/*.js\" \"wrappers/*.js\" \"html.js\"", + "format": "prettier --trailing-comma es5 --no-semi --single-quote --write 'src/**/*.js'", "test": "echo \"Error: no test specified\" && exit 1" + }, + "devDependencies": { + "prettier": "^1.5.2" } } diff --git a/src/html.js b/src/html.js deleted file mode 100644 index 77c7b93064083..0000000000000 --- a/src/html.js +++ /dev/null @@ -1,45 +0,0 @@ -import React from "react" -import PropTypes from "prop-types" - -const BUILD_TIME = new Date().getTime() - -export default class HTML extends React.Component { - static propTypes = { - body: PropTypes.string, - } - - render() { - let css - if (process.env.NODE_ENV === "production") { - css = ( -