Merge pull request #668 from HaudinFlorence/update_files_with_prettie…

…r_formatting

Update files with prettier formatting

.git-blame-ignore-revs

@@ -0,0 +1,2 @@
+# Reformatting all JS / JSON / MD / CSS with prettier
+9eeb4671dd2ce61c0a54f4be196ff2b986573aba

.prettierignore

@@ -0,0 +1,9 @@
+**/build
+**/node_modules
+**/lib
+**/dist
+**/static
+**/.ipynb_checkpoints
+**/coverage
+CHANGELOG.md
+package-lock.json

.prettierrc

@@ -0,0 +1,5 @@
+{
+  "singleQuote": true,
+  "trailingComma": "all",
+  "arrowParens": "avoid"
+}

LICENSE.md

@@ -25,7 +25,7 @@ software without specific prior written permission.
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
 FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
 SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
@@ -47,8 +47,8 @@ Jupyter uses a shared copyright model. Each contributor maintains copyright
 over their contributions to Jupyter. But, it is important to note that these
 contributions are typically only changes to the repositories. Thus, the Jupyter
 source code, in its entirety is not the copyright of any single person or
-institution.  Instead, it is the collective copyright of the entire Jupyter
-Development Team.  If individual contributors want to maintain a record of what
+institution. Instead, it is the collective copyright of the entire Jupyter
+Development Team. If individual contributors want to maintain a record of what
 changes/contributions they have specific copyright on, they should indicate
 their copyright in the commit message of the change, when they commit the
 change to one of the Jupyter repositories.

lerna.json

@@ -1,7 +1,5 @@
 {
   "lerna": "2.0.0",
-  "packages": [
-    "packages/*"
-  ],
+  "packages": ["packages/*"],
   "version": "independent"
 }

nbdime/diff_format.schema.json

@@ -1,10 +1,9 @@
-
 {
   "$schema": "http://json-schema.org/draft-04/schema#",
   "title": "Notebook diff format",
   "description": "A list of diff entries that each describe a difference between two Jupyter Notebooks",
   "type": ["array", "object", "null"],
-  "items": {"$ref": "#/definitions/diff"},
+  "items": { "$ref": "#/definitions/diff" },
 
   "definitions": {
     "diff": {
@@ -27,7 +26,7 @@
       "type": "object",
 
       "properties": {
-        "op": { "enum": ["add"]},
+        "op": { "enum": ["add"] },
         "key": {
           "type": ["integer", "string"]
         },
@@ -40,7 +39,7 @@
       "type": "object",
 
       "properties": {
-        "op": { "enum": ["remove"]},
+        "op": { "enum": ["remove"] },
         "key": {
           "type": ["integer", "string"]
         }
@@ -52,7 +51,7 @@
       "type": "object",
 
       "properties": {
-        "op": { "enum": ["replace"]},
+        "op": { "enum": ["replace"] },
         "key": {
           "type": ["integer", "string"]
         },
@@ -65,7 +64,7 @@
       "type": "object",
 
       "properties": {
-        "op": { "enum": ["addrange"]},
+        "op": { "enum": ["addrange"] },
         "key": {
           "type": "integer"
         },
@@ -80,7 +79,7 @@
       "type": "object",
 
       "properties": {
-        "op": { "enum": ["removerange"]},
+        "op": { "enum": ["removerange"] },
         "key": {
           "type": "integer"
         },
@@ -95,13 +94,13 @@
       "type": "object",
 
       "properties": {
-        "op": { "enum": ["patch"]},
+        "op": { "enum": ["patch"] },
         "key": {
           "type": ["integer", "string"]
         },
         "diff": {
           "type": "array",
-          "items": {"$ref": "#/definitions/diff"}
+          "items": { "$ref": "#/definitions/diff" }
         }
       }
     }

nbdime/merge_format.schema.json

@@ -1,10 +1,9 @@
-
 {
   "$schema": "http://json-schema.org/draft-04/schema#",
   "title": "Merge decisions",
   "description": "A list of merge decisions that in their entirety describes a merge of two Jupyter Notebooks",
   "type": "array",
-  "items": {"$ref": "#/definitions/decision"},
+  "items": { "$ref": "#/definitions/decision" },
 
   "definitions": {
     "decision": {
@@ -31,7 +30,18 @@
 
         "action": {
           "description": "How the merge was resolved, or for conflicted entries, the \"best\" initial suggestion for resolution",
-          "enum": ["local", "remote", "base", "clear", "clear_all", "remove", "either", "local_then_remote", "remote_then_local", "custom"]
+          "enum": [
+            "local",
+            "remote",
+            "base",
+            "clear",
+            "clear_all",
+            "remove",
+            "either",
+            "local_then_remote",
+            "remote_then_local",
+            "custom"
+          ]
         },
 
         "custom_diff": {