Skip to content
This repository has been archived by the owner on Nov 10, 2020. It is now read-only.

Commit

Permalink
Merge pull request #3870 from ONRR/dev
Browse files Browse the repository at this point in the history
Release of gatsby v2
  • Loading branch information
master12 authored Apr 9, 2019
2 parents a52e567 + a37f825 commit 84ba818
Show file tree
Hide file tree
Showing 2,791 changed files with 64,905 additions and 485,214 deletions.
7 changes: 7 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"presets": ["babel-preset-gatsby"],
"plugins": [
"@babel/plugin-proposal-export-default-from",
"@babel/plugin-proposal-object-rest-spread"
]
}
28 changes: 5 additions & 23 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,39 +2,21 @@ version: 2
jobs:
build:
docker:
- image: circleci/ruby:2.5-node
- image: circleci/node:11.7.0
steps:
- checkout
- restore_cache:
key: v1-bundle-{{ checksum "Gemfile.lock" }}
- run:
name: Install ruby dependencies
command: bundle install --path vendor/bundle
- save_cache:
key: v1-bundle-{{ checksum "Gemfile.lock" }}
paths:
- vendor/bundle
- restore_cache:
key: v1-node-modules-{{ checksum "package-lock.json" }}
key: v2-node-modules-{{ checksum "package-lock.json" }}
- run:
name: Install node dependencies
command: npm install
- save_cache:
key: v1-node-modules-{{ checksum "package-lock.json" }}
key: v2-node-modules-{{ checksum "package-lock.json" }}
paths:
- node_modules
- run:
name: Build webpack
command: npm run webpack
- run:
name: Build styleguide
command: npm run release-styleguide
- run:
name: Build pattern library
command: npm run release-patterns
- run:
name: Build jekyll
command: bundle exec jekyll build
name: Build gatsby
command: npm run build
- run:
name: Run tests
command: npm test
Expand Down
28 changes: 28 additions & 0 deletions .circleci/config.yml.old
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
version: 2
jobs:
build:
docker:
- image: circleci/node:11.7.0
steps:
- checkout
- restore_cache:
key: v2-node-modules-{{ checksum "package-lock.json" }}
- run:
name: Install node dependencies
command: npm install
- save_cache:
key: v2-node-modules-{{ checksum "package-lock.json" }}
paths:
- node_modules
- run:
name: Build gatsby
command: npm run build
- run:
name: Run tests
command: npm test

workflows:
version: 2
commit:
jobs:
- build
3 changes: 0 additions & 3 deletions .dockerignore

This file was deleted.

14 changes: 10 additions & 4 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
js/vendor/*.js
js/**/*.min.js
js/**/*.min.js.map
js/lib/main.js
/src/img
/src/styles
/src/styles/fonts
*.css
*.md
*.scss
*.svg
*.xlsx
*.yml
**/__tests__/*
59 changes: 59 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
module.exports = {
extends: ["standard", "plugin:css-modules/recommended"],
plugins: ["standard", "react", "css-modules"],
rules: {
"no-var": "error", // optional, recommended when using es6+
"no-unused-vars": 1, // recommended
"no-tabs": ["error", { allowIndentationTabs: true }],
"no-mixed-spaces-and-tabs": ["error", "smart-tabs"],
"arrow-spacing": ["error", { before: true, after: true }], // recommended
"brace-style": ["error", "stroustrup"],
"indent": ["error", "tab", { "SwitchCase": 1 }],

indent: ["error", 2],
"comma-dangle": [
"error",
{
objects: "only-multiline",
arrays: "only-multiline",
imports: "never",
exports: "never",
functions: "never",
},
],

// options to emulate prettier setup
semi: ["error", "never"],
"max-len": ["warn", { code: 170 }],
"template-curly-spacing": ["error", "always"],
"arrow-parens": ["error", "as-needed"],

// standard.js
"space-before-function-paren": [
"error",
{
named: "always",
anonymous: "always",
asyncArrow: "always",
},
],

// standard plugin - options
"standard/object-curly-even-spacing": ["error", "either"],
"standard/array-bracket-even-spacing": ["error", "either"],
"standard/computed-property-even-spacing": ["error", "even"],
"standard/no-callback-literal": ["error", ["cb", "callback"]],

// react plugin - options
"react/jsx-uses-react": "error",
"react/jsx-uses-vars": "error",

"import/no-webpack-loader-syntax": "off",

"css-modules/no-unused-class": 1,
},
parser: "babel-eslint",
parserOptions: {
ecmaVersion: 8, // optional, recommended 6+
},
}
19 changes: 0 additions & 19 deletions .eslintrc.yml

This file was deleted.

27 changes: 7 additions & 20 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,23 +1,10 @@
# Project dependencies
.cache
node_modules
yarn-error.log
yarn.lock

gatsby-public*.css.map
*.db
*.db-journal
*.log
.*.sw?
# Build directory
/public
.DS_Store
.env
.jekyll-metadata
.sass-cache
patterns
/public/
_site
node_modules
tmp
yarn*
styleguide
.brackets.json
.clasp.json
.npmrc
/.project
gatsby-public
blog
12 changes: 0 additions & 12 deletions .hound.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8.9
11.7.0
Loading

0 comments on commit 84ba818

Please sign in to comment.