From b174ee2d2af078615b38f84fc9d3b4587e515bb0 Mon Sep 17 00:00:00 2001
From: Jan Kassens <jan@kassens.net>
Date: Tue, 12 Dec 2017 12:47:52 -0800
Subject: [PATCH] Update prettier to 1.9.1 (#273)

---
 .prettierrc                   |  2 +-
 lib/core/Head.js              |  4 +---
 lib/publish-gh-pages.js       | 12 +++---------
 lib/rename-version.js         |  4 +---
 lib/server/versionFallback.js | 24 ++++++------------------
 lib/write-translations.js     |  4 +---
 package-lock.json             |  7 ++++---
 package.json                  |  4 +++-
 yarn.lock                     |  6 +++---
 9 files changed, 23 insertions(+), 44 deletions(-)

diff --git a/.prettierrc b/.prettierrc
index 61793cffde..a9f52d1530 100644
--- a/.prettierrc
+++ b/.prettierrc
@@ -3,7 +3,7 @@
   "jsxBracketSameLine": true,
   "parser": "flow",
   "printWidth": 80,
-  "proseWrap": false,
+  "proseWrap": "never",
   "singleQuote": true,
   "trailingComma": "es5"
 }
diff --git a/lib/core/Head.js b/lib/core/Head.js
index 82fa2b027e..f819784df7 100644
--- a/lib/core/Head.js
+++ b/lib/core/Head.js
@@ -60,9 +60,7 @@ class Head extends React.Component {
         )}
         <link
           rel="stylesheet"
-          href={`//cdnjs.cloudflare.com/ajax/libs/highlight.js/${
-            highlightVersion
-          }/styles/${highlightTheme}.min.css`}
+          href={`//cdnjs.cloudflare.com/ajax/libs/highlight.js/${highlightVersion}/styles/${highlightTheme}.min.css`}
         />
         {hasBlog && (
           <link
diff --git a/lib/publish-gh-pages.js b/lib/publish-gh-pages.js
index b02cbd7c76..8eb0c80ea2 100755
--- a/lib/publish-gh-pages.js
+++ b/lib/publish-gh-pages.js
@@ -54,9 +54,7 @@ let remoteBranch;
 if (USE_SSH === 'true') {
   remoteBranch = `git@github.com:${ORGANIZATION_NAME}/${PROJECT_NAME}.git`;
 } else {
-  remoteBranch = `https://${GIT_USER}@github.com/${ORGANIZATION_NAME}/${
-    PROJECT_NAME
-  }.git`;
+  remoteBranch = `https://${GIT_USER}@github.com/${ORGANIZATION_NAME}/${PROJECT_NAME}.git`;
 }
 
 if (IS_PULL_REQUEST) {
@@ -120,9 +118,7 @@ excludePath = `${PROJECT_NAME}-${DEPLOYMENT_BRANCH}`;
 // https://github.com/shelljs/shelljs/issues/79
 if (
   shell.exec(
-    `rsync -rt --exclude=${excludePath} --exclude=.DS_Store ${fromPath} ${
-      toPath
-    }`
+    `rsync -rt --exclude=${excludePath} --exclude=.DS_Store ${fromPath} ${toPath}`
   ).code !== 0
 ) {
   shell.echo(`Error: Copying build assets failed`);
@@ -137,9 +133,7 @@ shell.exec('git add --all');
 
 if (
   shell.exec(
-    `git commit -m "Deploy website" -m "Deploy website version based on ${
-      currentCommit
-    }"`
+    `git commit -m "Deploy website" -m "Deploy website version based on ${currentCommit}"`
   ).code !== 0
 ) {
   shell.echo(`Error: Committing static website failed`);
diff --git a/lib/rename-version.js b/lib/rename-version.js
index 3726e41313..ba4c4941d8 100755
--- a/lib/rename-version.js
+++ b/lib/rename-version.js
@@ -74,9 +74,7 @@ if (versionIndex < 0) {
   console.error(
     `${chalk.yellow(
       'Version ' + currentVersion + ' does not currently exist!'
-    )}\n Version ${
-      currentVersion
-    } is not in the versions.json file. You can only rename existing versions.`
+    )}\n Version ${currentVersion} is not in the versions.json file. You can only rename existing versions.`
   );
   process.exit(1);
 }
diff --git a/lib/server/versionFallback.js b/lib/server/versionFallback.js
index eac7869d8a..53eb1dd24d 100644
--- a/lib/server/versionFallback.js
+++ b/lib/server/versionFallback.js
@@ -98,14 +98,10 @@ files.forEach(file => {
 
   if (!metadata.original_id) {
     console.error(
-      `No 'original_id' field found in ${
-        file
-      }. Perhaps you forgot to add it when importing prior versions of your docs?`
+      `No 'original_id' field found in ${file}. Perhaps you forgot to add it when importing prior versions of your docs?`
     );
     throw new Error(
-      `No 'original_id' field found in ${
-        file
-      }. Perhaps you forgot to add it when importing prior versions of your docs?`
+      `No 'original_id' field found in ${file}. Perhaps you forgot to add it when importing prior versions of your docs?`
     );
   }
   if (!metadata.id) {
@@ -113,14 +109,10 @@ files.forEach(file => {
     throw new Error(`No 'id' field found in ${file}.`);
   } else if (metadata.id.indexOf('version-') === -1) {
     console.error(
-      `The 'id' field in ${
-        file
-      } is missing the expected 'version-XX-' prefix. Perhaps you forgot to add it when importing prior versions of your docs?`
+      `The 'id' field in ${file} is missing the expected 'version-XX-' prefix. Perhaps you forgot to add it when importing prior versions of your docs?`
     );
     throw new Error(
-      `The 'id' field in ${
-        file
-      } is missing the expected 'version-XX-' prefix. Perhaps you forgot to add it when importing prior versions of your docs?`
+      `The 'id' field in ${file} is missing the expected 'version-XX-' prefix. Perhaps you forgot to add it when importing prior versions of your docs?`
     );
   }
 
@@ -141,9 +133,7 @@ files.forEach(file => {
 function docVersion(id, req_version) {
   if (!available[id]) {
     throw new Error(
-      `Document with id '${
-        id
-      }' was requested but no document with that id could be located.`
+      `Document with id '${id}' was requested but no document with that id could be located.`
     );
   }
   // iterate through versions until a version less than or equal to the requested
@@ -286,9 +276,7 @@ function sidebarVersion(req_version) {
     }
   }
   throw new Error(
-    `No sidebar file available to use for version ${
-      req_version
-    }. Verify that 'version-${req_version}-sidebars.json' exists.`
+    `No sidebar file available to use for version ${req_version}. Verify that 'version-${req_version}-sidebars.json' exists.`
   );
 }
 
diff --git a/lib/write-translations.js b/lib/write-translations.js
index 6dd9a64804..578928cc40 100755
--- a/lib/write-translations.js
+++ b/lib/write-translations.js
@@ -92,9 +92,7 @@ function execute() {
     if (!file.endsWith('-sidebars.json')) {
       if (file.endsWith('-sidebar.json')) {
         console.warn(
-          `Skipping ${
-            file
-          }. Make sure your sidebar filenames follow this format: 'version-VERSION-sidebars.json'.`
+          `Skipping ${file}. Make sure your sidebar filenames follow this format: 'version-VERSION-sidebars.json'.`
         );
       }
       return;
diff --git a/package-lock.json b/package-lock.json
index 0a7ee5e859..bf6bddc5b2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1600,9 +1600,10 @@
       "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
     },
     "prettier": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.8.2.tgz",
-      "integrity": "sha512-fHWjCwoRZgjP1rvLP7OGqOznq7xH1sHMQUFLX8qLRO79hI57+6xbc5vB904LxEkCfgFgyr3vv06JkafgCSzoZg=="
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.9.1.tgz",
+      "integrity": "sha512-oYpQsZk7/0o8+YJUB0LfjkTYQa79gUIF2ESeqvG23IzcgqqvmeOE4+lMG7E/UKX3q3RIj8JHSfhrXWhon1L+zA==",
+      "dev": true
     },
     "private": {
       "version": "0.1.8",
diff --git a/package.json b/package.json
index cba65f2267..5dfe0af327 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,6 @@
     "fs-extra": "^3.0.1",
     "glob": "^7.1.2",
     "highlight.js": "^9.12.0",
-    "prettier": "1.8.2",
     "react": "^15.5.4",
     "react-dom": "^15.5.4",
     "react-dom-factories": "^1.0.1",
@@ -50,5 +49,8 @@
     "docusaurus-version": "./lib/version.js",
     "docusaurus-rename-version": "./lib/rename-version.js",
     "docusaurus-feed": "./lib/generate-feed.js"
+  },
+  "devDependencies": {
+    "prettier": "^1.9.1"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 494823aa28..7f6f734f79 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1298,9 +1298,9 @@ performance-now@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
 
-prettier@1.8.2:
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.8.2.tgz#bff83e7fd573933c607875e5ba3abbdffb96aeb8"
+prettier@^1.9.1:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.9.1.tgz#41638a0d47c1efbd1b7d5a742aaa5548eab86d70"
 
 private@^0.1.6, private@^0.1.7:
   version "0.1.8"