diff --git a/.prettierignore b/.prettierignore
new file mode 100644
index 0000000000..85f4c013e1
--- /dev/null
+++ b/.prettierignore
@@ -0,0 +1,5 @@
+__generated__
+__fixtures__
+dist
+node_modules
+build
diff --git a/v1/package.json b/v1/package.json
index 29cb57cfb5..3b01ec57ca 100644
--- a/v1/package.json
+++ b/v1/package.json
@@ -105,7 +105,6 @@
"husky": "^0.14.3",
"jest": "^23.6.0",
"lint-staged": "^7.2.0",
- "prettier": "^1.13.7",
"rimraf": "^2.6.2"
}
}
diff --git a/v1/yarn.lock b/v1/yarn.lock
index 74d9b4548e..83509a3e6e 100644
--- a/v1/yarn.lock
+++ b/v1/yarn.lock
@@ -5829,10 +5829,6 @@ preserve@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
-prettier@^1.13.7:
- version "1.14.3"
- resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.14.3.tgz#90238dd4c0684b7edce5f83b0fb7328e48bd0895"
-
pretty-format@^23.6.0:
version "23.6.0"
resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-23.6.0.tgz#5eaac8eeb6b33b987b7fe6097ea6a8a146ab5760"
diff --git a/v2/.eslintignore b/v2/.eslintignore
index 6798faba6d..85f4c013e1 100644
--- a/v2/.eslintignore
+++ b/v2/.eslintignore
@@ -1,4 +1,4 @@
-generated
+__generated__
__fixtures__
dist
node_modules
diff --git a/v2/.gitignore b/v2/.gitignore
index 6fd39e33e8..b5ad799a9a 100644
--- a/v2/.gitignore
+++ b/v2/.gitignore
@@ -5,6 +5,6 @@
node_modules
dist
yarn-error.log
-generated
+__generated__
website/node_modules
build
diff --git a/v2/lib/load/utils.js b/v2/lib/load/utils.js
index 0fcc2ce5e2..f03b2f23bb 100644
--- a/v2/lib/load/utils.js
+++ b/v2/lib/load/utils.js
@@ -10,7 +10,7 @@ const fm = require('front-matter');
const escapeStringRegexp = require('escape-string-regexp');
const fs = require('fs-extra');
-const genPath = path.resolve(__dirname, '../core/generated');
+const genPath = path.resolve(__dirname, '../core/__generated__');
fs.ensureDirSync(genPath);
const genCache = new Map();
diff --git a/v2/lib/theme/DocsPaginator/index.js b/v2/lib/theme/DocsPaginator/index.js
index 203aa35d77..25fcd224cc 100644
--- a/v2/lib/theme/DocsPaginator/index.js
+++ b/v2/lib/theme/DocsPaginator/index.js
@@ -22,34 +22,36 @@ function DocsPaginator() {
return (
- {metadata.previous && docsMetadatas[metadata.previous] && (
-
-
{' '}
-
{metadata.previous_title}
-
- )}
+ {metadata.previous &&
+ docsMetadatas[metadata.previous] && (
+
+
{' '}
+
{metadata.previous_title}
+
+ )}
- {metadata.next && docsMetadatas[metadata.next] && (
-
-
{metadata.next_title}{' '}
-
-
- )}
+ {metadata.next &&
+ docsMetadatas[metadata.next] && (
+
+
{metadata.next_title}{' '}
+
+
+ )}
);
diff --git a/v2/lib/webpack/base.js b/v2/lib/webpack/base.js
index ca120a0011..3ec2bdd9c3 100644
--- a/v2/lib/webpack/base.js
+++ b/v2/lib/webpack/base.js
@@ -69,7 +69,7 @@ module.exports = function createBaseConfig(props, isServer) {
.set('@docs', docsDir)
.set('@pages', pagesDir)
.set('@build', outDir)
- .set('@generated', path.resolve(__dirname, '../core/generated'))
+ .set('@generated', path.resolve(__dirname, '../core/__generated__'))
.set('@core', path.resolve(__dirname, '../core'))
.set('@docusaurus', path.resolve(__dirname, '../docusaurus'))
.end()
diff --git a/v2/package.json b/v2/package.json
index b3086cbe2e..c5379ba9a5 100644
--- a/v2/package.json
+++ b/v2/package.json
@@ -43,7 +43,6 @@
"eslint-plugin-react": "^7.11.1",
"eslint-plugin-react-hooks": "^0.0.0",
"jest": "^23.4.2",
- "prettier": "^1.13.7",
"react": "^16.7.0-alpha.0",
"react-dom": "^16.7.0-alpha.0",
"react-helmet": "^5.2.0"
diff --git a/v2/website/pages/index.js b/v2/website/pages/index.js
index 8f2f17e99d..343ea6a336 100644
--- a/v2/website/pages/index.js
+++ b/v2/website/pages/index.js
@@ -113,16 +113,19 @@ const QUOTES = [
function Home() {
const [featureIndex, setFeatureIndex] = useState(0);
- useEffect(() => {
- const timer = window.setTimeout(() => {
- setFeatureIndex(
- prevFeatureIndex => (prevFeatureIndex + 1) % FEATURES.length,
- );
- }, FEATURE_INTERVAL);
- return () => {
- window.clearTimeout(timer);
- };
- }, [featureIndex]);
+ useEffect(
+ () => {
+ const timer = window.setTimeout(() => {
+ setFeatureIndex(
+ prevFeatureIndex => (prevFeatureIndex + 1) % FEATURES.length,
+ );
+ }, FEATURE_INTERVAL);
+ return () => {
+ window.clearTimeout(timer);
+ };
+ },
+ [featureIndex],
+ );
return (
diff --git a/v2/yarn.lock b/v2/yarn.lock
index 54896edbe9..ce3a83c5a4 100644
--- a/v2/yarn.lock
+++ b/v2/yarn.lock
@@ -6738,11 +6738,6 @@ preserve@^0.2.0:
resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=
-prettier@^1.13.7:
- version "1.16.4"
- resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.16.4.tgz#73e37e73e018ad2db9c76742e2647e21790c9717"
- integrity sha512-ZzWuos7TI5CKUeQAtFd6Zhm2s6EpAD/ZLApIhsF9pRvRtM1RFo61dM/4MSRUA0SuLugA/zgrZD8m0BaY46Og7g==
-
pretty-error@^2.0.2:
version "2.1.1"
resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.1.tgz#5f4f87c8f91e5ae3f3ba87ab4cf5e03b1a17f1a3"