From d709d04e9ab61c1d0b2ed228220e5124c21c5937 Mon Sep 17 00:00:00 2001 From: Adrien Antoine Date: Thu, 13 Apr 2017 23:06:52 +0100 Subject: [PATCH] fix: Upgraded prettier and styles --- package.json | 4 ++-- src/mount.js | 2 +- src/render.js | 8 +++----- src/shallow.js | 11 ++++------- yarn.lock | 44 ++++++++++++++++++-------------------------- 5 files changed, 28 insertions(+), 41 deletions(-) diff --git a/package.json b/package.json index 3075976..e305bb0 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "build": "babel src -d build && babel src/serializer.js -o serializer.js", "prepublish": "yarn build", "lint": "eslint src tests/core", - "format": "prettier src/**/*.js tests/core/**/*.js --write --print-width=100 --single-quote --trailing-comma --no-bracket-spacing", + "format": "prettier src/**/*.js tests/core/**/*.js --write --single-quote --trailing-comma all --no-bracket-spacing", "test": "yarn lint && yarn test-core && yarn test-serializer", "test-core": "NODE_ENV=test jest --coverage", "lint-staged": "lint-staged", @@ -72,7 +72,7 @@ "jest": "~19.0.2", "lint-staged": "^3.4.0", "pre-commit": "~1.2.2", - "prettier": "^0.22.0", + "prettier": "^1.0.2", "react": "^15.5.4", "react-dom": "^15.5.4", "react-test-renderer": "^15.5.4", diff --git a/src/mount.js b/src/mount.js index afe4b3a..27bb16d 100644 --- a/src/mount.js +++ b/src/mount.js @@ -36,7 +36,7 @@ function instToJson(inst) { const type = typeName(currentElement); const props = omitBy( propsOfNode(currentElement), - (val, key) => key === 'children' || val === undefined, + (val, key) => key === 'children' || val === undefined ); const children = []; if (isDOMComponent(publicInst)) { diff --git a/src/render.js b/src/render.js index db8149f..a7a50af 100644 --- a/src/render.js +++ b/src/render.js @@ -12,11 +12,9 @@ const renderChildToJson = child => { return { type: child.name, props: child.attribs, - children: ( - child.children && child.children.length - ? compact(child.children.map(renderChildToJson)) - : null - ), + children: child.children && child.children.length + ? compact(child.children.map(renderChildToJson)) + : null, $$typeof: Symbol.for('react.test.json'), }; } else if (child.type === 'text') { diff --git a/src/shallow.js b/src/shallow.js index 348e510..f784f65 100644 --- a/src/shallow.js +++ b/src/shallow.js @@ -22,13 +22,10 @@ function nodeToJson(node) { } if (isPlainObject(node)) { - return entries(node).reduce( - (obj, [key, val]) => { - obj[key] = nodeToJson(val); - return obj; - }, - {}, - ); + return entries(node).reduce((obj, [key, val]) => { + obj[key] = nodeToJson(val); + return obj; + }, {}); } return node; diff --git a/yarn.lock b/yarn.lock index bceab87..4a8b4da 100644 --- a/yarn.lock +++ b/yarn.lock @@ -223,13 +223,9 @@ assert-plus@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234" -ast-types@0.8.18: - version "0.8.18" - resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.8.18.tgz#c8b98574898e8914e9d8de74b947564a9fe929af" - -ast-types@0.9.4: - version "0.9.4" - resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.9.4.tgz#410d1f81890aeb8e0a38621558ba5869ae53c91b" +ast-types@0.9.8: + version "0.9.8" + resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.9.8.tgz#6cb6a40beba31f49f20928e28439fc14a3dab078" async-each@^1.0.0: version "1.0.1" @@ -778,7 +774,11 @@ babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.24.1: lodash "^4.2.0" to-fast-properties "^1.0.1" -babylon@6.15.0, babylon@^6.11.0, babylon@^6.13.0, babylon@^6.15.0: +babylon@7.0.0-beta.8: + version "7.0.0-beta.8" + resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.8.tgz#2bdc5ae366041442c27e068cce6f0d7c06ea9949" + +babylon@^6.11.0, babylon@^6.13.0, babylon@^6.15.0: version "6.15.0" resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.15.0.tgz#ba65cfa1a80e1759b0e89fb562e27dccae70348e" @@ -1028,10 +1028,6 @@ color-name@^1.1.1: version "1.1.2" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.2.tgz#5c8ab72b64bd2215d617ae9559ebb148475cf98d" -colors@>=0.6.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63" - combined-stream@^1.0.5, combined-stream@~1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009" @@ -1769,13 +1765,9 @@ flat-cache@^1.2.1: graceful-fs "^4.1.2" write "^0.2.1" -flow-parser@0.40.0: - version "0.40.0" - resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.40.0.tgz#b3444742189093323c4319c4fe9d35391f46bcbc" - dependencies: - ast-types "0.8.18" - colors ">=0.6.2" - minimist ">=0.2.0" +flow-parser@0.43.0: + version "0.43.0" + resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.43.0.tgz#e2b8eb1ac83dd53f7b6b04a7c35b6a52c33479b7" follow-redirects@0.0.7: version "0.0.7" @@ -3097,7 +3089,7 @@ minimist@0.0.8, minimist@~0.0.1: version "0.0.8" resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" -minimist@1.2.0, minimist@>=0.2.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0: +minimist@1.2.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" @@ -3566,16 +3558,16 @@ preserve@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" -prettier@^0.22.0: - version "0.22.0" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-0.22.0.tgz#7b37c4480d0858180407e5a8e13f0f47da7385d2" +prettier@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.0.2.tgz#84535548fca00cf0acd7ca8296d492352ef167d7" dependencies: - ast-types "0.9.4" + ast-types "0.9.8" babel-code-frame "6.22.0" - babylon "6.15.0" + babylon "7.0.0-beta.8" chalk "1.1.3" esutils "2.0.2" - flow-parser "0.40.0" + flow-parser "0.43.0" get-stdin "5.0.1" glob "7.1.1" jest-validate "19.0.0"