diff --git a/build/release.js b/build/release.js index f55f1d2f..25ab9602 100755 --- a/build/release.js +++ b/build/release.js @@ -10,7 +10,10 @@ const CHANGELOG_PATH = path.join(process.cwd(), 'CHANGELOG.md'); const packageFile = require(PACKAGE_JSON_PATH); function exec(command) { - return childProcess.execSync(command).toString().slice(0, -1); + return childProcess + .execSync(command) + .toString() + .slice(0, -1); } const githubRepoUrl = exec('git config --get remote.origin.url').replace( @@ -48,7 +51,9 @@ function getAbbreviatedCommitHash(commitHash) { } function getCommitLink(commitHash) { - return `[${getAbbreviatedCommitHash(commitHash)}](${githubRepoUrl}/commit/${commitHash})`; + return `[${getAbbreviatedCommitHash( + commitHash + )}](${githubRepoUrl}/commit/${commitHash})`; } function replaceIssueLinks(message) { diff --git a/eslint-plugin-prettier.js b/eslint-plugin-prettier.js index 9b979fb5..8d4a2a65 100644 --- a/eslint-plugin-prettier.js +++ b/eslint-plugin-prettier.js @@ -306,9 +306,10 @@ module.exports = { ] }, create(context) { - const prettierOptions = context.options[0] === 'fb' - ? FB_PRETTIER_OPTIONS - : context.options[0]; + const prettierOptions = + context.options[0] === 'fb' + ? FB_PRETTIER_OPTIONS + : context.options[0]; const pragma = context.options[1] ? context.options[1].slice(1) // Remove leading @ @@ -326,10 +327,12 @@ module.exports = { const allComments = sourceCode.getAllComments(); const firstComment = hasShebang ? allComments[1] : allComments[0]; if ( - !(firstComment && + !( + firstComment && firstComment.type === 'Block' && firstComment.loc.start.line === (hasShebang ? 2 : 1) && - firstComment.loc.start.column === 0) + firstComment.loc.start.column === 0 + ) ) { return {}; } diff --git a/package.json b/package.json index d9f58f23..d412c1e9 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "eslint-plugin-node": "^4.2.2", "mocha": "^3.1.2", "moment": "^2.18.1", - "prettier": "^1.3.1", + "prettier": "^1.6.1", "semver": "^5.3.0" }, "engines": { diff --git a/test/prettier.js b/test/prettier.js index 8eaa54bc..14b264e7 100644 --- a/test/prettier.js +++ b/test/prettier.js @@ -34,11 +34,11 @@ ruleTester.run('prettier', rule, { // No pragma = No prettier check. { code: '""\n', options: [null, '@format'] }, // Facebook style uses single quotes. - { code: `'';\n`, options: ['fb'] }, + { code: `('');\n`, options: ['fb'] }, // Facebook style but missing pragma. { code: `"";\n`, options: ['fb', '@format'] }, // Facebook style with pragma. - { code: `/** @format */\n'';\n`, options: ['fb', '@format'] }, + { code: `/** @format */\n('');\n`, options: ['fb', '@format'] }, // Shebang with pragma. { code: `#!/bin/node\n/** @format */\n"";\n`, options: [null, '@format'] } ], diff --git a/yarn.lock b/yarn.lock index c6bfc13d..87a2f0eb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -39,12 +39,6 @@ ansi-styles@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" -ansi-styles@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.0.0.tgz#5404e93a544c4fec7f048262977bebfe3155e0c1" - dependencies: - color-convert "^1.0.0" - argparse@^1.0.7: version "1.0.9" resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86" @@ -65,11 +59,7 @@ arrify@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" -ast-types@0.9.8: - version "0.9.8" - resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.9.8.tgz#6cb6a40beba31f49f20928e28439fc14a3dab078" - -babel-code-frame@6.22.0, babel-code-frame@^6.16.0: +babel-code-frame@^6.16.0: version "6.22.0" resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.22.0.tgz#027620bee567a88c32561574e7fd0801d33118e4" dependencies: @@ -77,10 +67,6 @@ babel-code-frame@6.22.0, babel-code-frame@^6.16.0: esutils "^2.0.2" js-tokens "^3.0.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" - balanced-match@^0.4.1: version "0.4.2" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838" @@ -110,7 +96,7 @@ callsites@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca" -chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3: +chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" dependencies: @@ -142,16 +128,6 @@ code-point-at@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" -color-convert@^1.0.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.0.tgz#1accf97dd739b983bf994d56fec8f95853641b7a" - dependencies: - color-name "^1.1.1" - -color-name@^1.1.1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.2.tgz#5c8ab72b64bd2215d617ae9559ebb148475cf98d" - commander@2.9.0: version "2.9.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4" @@ -374,7 +350,7 @@ estraverse@~4.1.0: version "4.1.1" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.1.1.tgz#f6caca728933a850ef90661d0e17982ba47111a2" -esutils@2.0.2, esutils@^2.0.2: +esutils@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b" @@ -420,10 +396,6 @@ flat-cache@^1.2.1: graceful-fs "^4.1.2" write "^0.2.1" -flow-parser@0.45.0: - version "0.45.0" - resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.45.0.tgz#aa29d4ae27f06aa02817772bba0fcbefef7e62f0" - fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" @@ -438,7 +410,7 @@ generate-object-property@^1.1.0: dependencies: is-property "^1.0.0" -get-stdin@5.0.1, get-stdin@^5.0.1: +get-stdin@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-5.0.1.tgz#122e161591e21ff4c52530305693f20e6393a398" @@ -584,22 +556,6 @@ jest-docblock@^20.0.1: version "20.0.3" resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-20.0.3.tgz#17bea984342cc33d83c50fbe1545ea0efaa44712" -jest-matcher-utils@^19.0.0: - version "19.0.0" - resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-19.0.0.tgz#5ecd9b63565d2b001f61fbf7ec4c7f537964564d" - dependencies: - chalk "^1.1.3" - pretty-format "^19.0.0" - -jest-validate@19.0.0: - version "19.0.0" - resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-19.0.0.tgz#8c6318a20ecfeaba0ba5378bfbb8277abded4173" - dependencies: - chalk "^1.1.1" - jest-matcher-utils "^19.0.0" - leven "^2.0.0" - pretty-format "^19.0.0" - js-tokens@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.1.tgz#08e9f132484a2c45a30907e9dc4d5567b7f114d7" @@ -629,10 +585,6 @@ jsonpointer@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9" -leven@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/leven/-/leven-2.1.0.tgz#c2e7a9f772094dee9d34202ae8acce4687875580" - levn@^0.3.0, levn@~0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" @@ -701,10 +653,6 @@ minimist@0.0.8: version "0.0.8" resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" -minimist@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" - mkdirp@0.5.1, mkdirp@^0.5.0, mkdirp@^0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" @@ -810,26 +758,9 @@ prelude-ls@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" -prettier@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.3.1.tgz#fa0ea84b45ac0ba6de6a1e4cecdcff900d563151" - dependencies: - ast-types "0.9.8" - babel-code-frame "6.22.0" - babylon "7.0.0-beta.8" - chalk "1.1.3" - esutils "2.0.2" - flow-parser "0.45.0" - get-stdin "5.0.1" - glob "7.1.1" - jest-validate "19.0.0" - minimist "1.2.0" - -pretty-format@^19.0.0: - version "19.0.0" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-19.0.0.tgz#56530d32acb98a3fa4851c4e2b9d37b420684c84" - dependencies: - ansi-styles "^3.0.0" +prettier@^1.6.1: + version "1.6.1" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.6.1.tgz#850f411a3116226193e32ea5acfc21c0f9a76d7d" process-nextick-args@~1.0.6: version "1.0.7"