remove old files and consolidate some configs (gatsbyjs#2716)

* remove old files and consolidate some configs * fix test
Moocar · Nov 1, 2017 · 9ce9c95 · 9ce9c95
1 parent c3593e1
commit 9ce9c95
Show file tree

Hide file tree

Showing 41 changed files with 197 additions and 1,318 deletions.
diff --git a/.eslintignore b/.eslintignore
diff --git a/.eslintrc b/.eslintrc
@@ -9,10 +9,7 @@
     "prettier/flowtype",
     "prettier/react"
   ],
-  "plugins": [
-    "flowtype",
-    "react"
-  ],
+  "plugins": ["flowtype", "react"],
   "parserOptions": {
     "ecmaVersion": 2016,
     "sourceType": "module",
@@ -29,30 +26,16 @@
     "no-console": "off",
     "valid-jsdoc": "off",
     "require-jsdoc": "off",
-    "quotes": [
-      "error",
-      "backtick"
-    ],
-    "consistent-return": [
-      "error",
-    ],
+    "quotes": ["error", "backtick"],
+    "consistent-return": ["error"],
     "arrow-body-style": [
       "error",
       "as-needed",
       { "requireReturnForObjectLiteral": true }
     ],
-    "jsx-quotes": [
-      "error",
-      "prefer-double"
-    ],
-    "semi": [
-      "error",
-      "never"
-    ],
-    "object-curly-spacing": [
-      "error",
-      "always"
-    ],
+    "jsx-quotes": ["error", "prefer-double"],
+    "semi": ["error", "never"],
+    "object-curly-spacing": ["error", "always"],
     "comma-dangle": [
       "error",
       {

diff --git a/.flowconfig b/.flowconfig
@@ -3,8 +3,12 @@
 
 [ignore]
 .*/test/.*
+.*/node_modules/documentation/.*
 .*/node_modules/typography/.*
 .*/node_modules/fbjs/.*
 .*/node_modules/react-side-effect/.*
+.*/node_modules/styled-components/.*
+.*/node_modules/preact/.*
+.*/node_modules/jss/.*
 .*/www/.*
 .*/examples/.*
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,7 @@
+
+packages/*/yarn.lock
+packages/*/package-lock.json
+
 # Logs
 logs
 *.log
@@ -44,5 +48,4 @@ node_modules/
 # IDE specific
 .idea/
 .vscode/
-yarn.lock
-package-lock.json
+
diff --git a/.pre-commit.sh b/.pre-commit.sh
diff --git a/.publishrc b/.publishrc
diff --git a/decls/globals.js → flow-typed/globals.js b/decls/globals.js → flow-typed/globals.js
diff --git a/interfaces/invariant.js b/interfaces/invariant.js
diff --git a/interfaces/object-assign.js b/interfaces/object-assign.js
diff --git a/interfaces/parse-filepath.js b/interfaces/parse-filepath.js
diff --git a/interfaces/slash.js b/interfaces/slash.js
diff --git a/package.json b/package.json
@@ -37,18 +37,19 @@
     "rimraf": "^2.6.1"
   },
   "engines": {
-    "yarn": "^1.0.2"
+    "yarn": "^1.2.1"
   },
   "private": true,
-  "engines": {
-    "yarn": "^1.0.2"
-  },
+
   "scripts": {
     "bootstrap": "yarn && npm run check-versions && lerna run prepublish",
     "check-versions": "babel-node scripts/check-versions.js",
-    "format": "npm run format-packages && npm run format-cache-dir && npm run format-www && npm run format-examples && npm run format-scripts",
-    "format-cache-dir": "prettier-eslint --write \"packages/gatsby/cache-dir/*.js\"",
-    "format-examples": "prettier-eslint --write \"examples/**/gatsby-node.js\" \"examples/**/gatsby-config.js\" \"examples/**/src/**/*.js\"",
+    "format":
+      "npm run format-packages && npm run format-cache-dir && npm run format-www && npm run format-examples && npm run format-scripts",
+    "format-cache-dir":
+      "prettier-eslint --write \"packages/gatsby/cache-dir/*.js\"",
+    "format-examples":
+      "prettier-eslint --write \"examples/**/gatsby-node.js\" \"examples/**/gatsby-config.js\" \"examples/**/src/**/*.js\"",
     "format-packages": "prettier-eslint --write \"packages/*/src/**/*.js\"",
     "format-scripts": "prettier-eslint --write \"scripts/**/*.js\"",
     "format-www": "prettier-eslint --write \"www/*.js\" \"www/src/**/*.js\"",
@@ -63,10 +64,10 @@
     "test": "yarn run lint && jest",
     "test:update": "jest --updateSnapshot",
     "test:watch": "jest --watch",
-    "test_bkup": "npm run lint && npm run test-node && npm run test-integration",
+    "test_bkup":
+      "npm run lint && npm run test-node && npm run test-integration",
     "watch": "lerna run watch --no-sort --stream --concurrency 999"
   },
-  "workspaces": [
-    "packages/*"
-  ]
+  "workspaces": ["packages/*"],
+  "eslintIgnore": ["interfaces", "**/__tests__/fixtures/"]
 }
diff --git a/packages/gatsby/src/redux/__tests__/__snapshots__/jobs.js.snap b/packages/gatsby/src/redux/__tests__/__snapshots__/jobs.js.snap
@@ -8,7 +8,7 @@ Object {
       "completedAt": 1482363367071,
       "createdAt": 1482363367071,
       "id": "test job",
-      "plugin": Object {},
+      "plugin": null,
       "runTime": 0,
     },
   ],
@@ -20,7 +20,7 @@ Object {
   "payload": Object {
     "id": "test job",
   },
-  "plugin": Object {},
+  "plugin": null,
   "type": "CREATE_JOB",
 }
 `;

diff --git a/packages/gatsby/src/redux/__tests__/__snapshots__/pages.js.snap b/packages/gatsby/src/redux/__tests__/__snapshots__/pages.js.snap
@@ -8,6 +8,7 @@ Array [
     "context": Object {},
     "internalComponentName": "ComponentHi",
     "jsonName": "hi.json",
+    "layout": null,
     "path": "/hi/",
     "pluginCreatorId": "test",
     "pluginCreator___NODE": "test",
@@ -19,6 +20,7 @@ Array [
     "context": Object {},
     "internalComponentName": "ComponentHiPizza",
     "jsonName": "hi-pizza.json",
+    "layout": null,
     "path": "/hi/pizza/",
     "pluginCreatorId": "test",
     "pluginCreator___NODE": "test",
@@ -35,6 +37,7 @@ Object {
     "context": Object {},
     "internalComponentName": "ComponentHi",
     "jsonName": "hi.json",
+    "layout": null,
     "path": "/hi/",
     "pluginCreatorId": "test",
     "pluginCreator___NODE": "test",
@@ -57,6 +60,7 @@ Array [
     "context": Object {},
     "internalComponentName": "ComponentHi",
     "jsonName": "hi.json",
+    "layout": null,
     "path": "/hi/",
     "pluginCreatorId": "test",
     "pluginCreator___NODE": "test",
@@ -75,6 +79,7 @@ Object {
     },
     "internalComponentName": "ComponentHi",
     "jsonName": "hi.json",
+    "layout": null,
     "path": "/hi/",
     "pluginCreatorId": "test",
     "pluginCreator___NODE": "test",
@@ -99,6 +104,7 @@ Array [
     },
     "internalComponentName": "ComponentHi",
     "jsonName": "hi.json",
+    "layout": null,
     "path": "/hi/",
     "pluginCreatorId": "test",
     "pluginCreator___NODE": "test",
@@ -117,6 +123,7 @@ Array [
     "context": Object {},
     "internalComponentName": "ComponentHi",
     "jsonName": "hi.json",
+    "layout": null,
     "path": "/hi/",
     "pluginCreatorId": "test",
     "pluginCreator___NODE": "test",