diff --git a/.eslintrc.yml b/.eslintrc.yml index 7c07d6a45..226a83c30 100644 --- a/.eslintrc.yml +++ b/.eslintrc.yml @@ -8,6 +8,8 @@ extends: plugins: - import - unicorn +settings: + import/internal-regex: ^linguist-languages/ rules: curly: error dot-notation: error @@ -18,6 +20,7 @@ rules: import/no-extraneous-dependencies: - error - devDependencies: ["tests*/**", "scripts/**"] + import/order: error no-else-return: error no-inner-declarations: error no-unneeded-ternary: error diff --git a/scripts/build/build.js b/scripts/build/build.js index feb53d0a8..99ca212d6 100644 --- a/scripts/build/build.js +++ b/scripts/build/build.js @@ -1,10 +1,10 @@ "use strict"; +const path = require("path"); +const fs = require("fs"); const chalk = require("chalk"); const execa = require("execa"); const minimist = require("minimist"); -const path = require("path"); -const fs = require("fs"); const stringWidth = require("string-width"); const bundler = require("./bundler"); diff --git a/scripts/build/bundler.js b/scripts/build/bundler.js index 03d18b272..aa70c22c7 100644 --- a/scripts/build/bundler.js +++ b/scripts/build/bundler.js @@ -1,7 +1,7 @@ "use strict"; -const execa = require("execa"); const path = require("path"); +const execa = require("execa"); const { rollup } = require("rollup"); const webpack = require("webpack"); const { nodeResolve } = require("@rollup/plugin-node-resolve"); diff --git a/scripts/build/rollup-plugins/native-shims.js b/scripts/build/rollup-plugins/native-shims.js index bb931a54c..db4b5ce98 100644 --- a/scripts/build/rollup-plugins/native-shims.js +++ b/scripts/build/rollup-plugins/native-shims.js @@ -1,8 +1,8 @@ "use strict"; -const builtins = require("builtin-modules"); const fs = require("fs"); const path = require("path"); +const builtins = require("builtin-modules"); const EMPTY = "export default {};"; const PREFIX = "\0shim:"; diff --git a/scripts/check-deps.js b/scripts/check-deps.js index 85bfc539b..c892a1063 100644 --- a/scripts/check-deps.js +++ b/scripts/check-deps.js @@ -1,7 +1,7 @@ "use strict"; -const pkg = require("../package.json"); const chalk = require("chalk"); +const pkg = require("../package.json"); validateDependencyObject(pkg.dependencies); validateDependencyObject(pkg.devDependencies); diff --git a/scripts/release/steps/update-changelog.js b/scripts/release/steps/update-changelog.js index e70c13bbd..76cfad53a 100644 --- a/scripts/release/steps/update-changelog.js +++ b/scripts/release/steps/update-changelog.js @@ -1,8 +1,8 @@ "use strict"; +const fs = require("fs"); const chalk = require("chalk"); const { outdent, string: outdentString } = require("outdent"); -const fs = require("fs"); const semver = require("semver"); const { waitForEnter, runYarn, logPromise } = require("../utils"); diff --git a/scripts/release/utils.js b/scripts/release/utils.js index 66f35fee7..22a8370e7 100644 --- a/scripts/release/utils.js +++ b/scripts/release/utils.js @@ -2,8 +2,8 @@ require("readline").emitKeypressEvents(process.stdin); -const chalk = require("chalk"); const fs = require("fs"); +const chalk = require("chalk"); const execa = require("execa"); const stringWidth = require("string-width"); diff --git a/scripts/sync-flow-tests.js b/scripts/sync-flow-tests.js index 313c04f4a..a42309b59 100644 --- a/scripts/sync-flow-tests.js +++ b/scripts/sync-flow-tests.js @@ -1,9 +1,9 @@ "use strict"; const fs = require("fs"); +const path = require("path"); const flowParser = require("flow-parser"); const globby = require("globby"); -const path = require("path"); const rimraf = require("rimraf"); const DEFAULT_SPEC_CONTENT = "run_spec(__dirname);\n"; diff --git a/src/cli/index.js b/src/cli/index.js index 05dbc776a..1d5c15edc 100644 --- a/src/cli/index.js +++ b/src/cli/index.js @@ -3,9 +3,9 @@ // eslint-disable-next-line no-restricted-modules require("please-upgrade-node")(require("../../package.json")); +const stringify = require("fast-json-stable-stringify"); // eslint-disable-next-line no-restricted-modules const prettier = require("../index"); -const stringify = require("fast-json-stable-stringify"); const util = require("./util"); function run(args) { diff --git a/src/cli/util.js b/src/cli/util.js index 5696205c7..de2aa90f8 100644 --- a/src/cli/util.js +++ b/src/cli/util.js @@ -1,12 +1,12 @@ "use strict"; const path = require("path"); +const fs = require("fs"); +const readline = require("readline"); const camelCase = require("camelcase"); const dashify = require("dashify"); -const fs = require("fs"); const chalk = require("chalk"); -const readline = require("readline"); const stringify = require("fast-json-stable-stringify"); const fromPairs = require("lodash/fromPairs"); const pick = require("lodash/pick"); diff --git a/src/common/create-ignorer.js b/src/common/create-ignorer.js index 1fdae0944..785677ec3 100644 --- a/src/common/create-ignorer.js +++ b/src/common/create-ignorer.js @@ -1,7 +1,7 @@ "use strict"; -const ignore = require("ignore"); const path = require("path"); +const ignore = require("ignore"); const getFileContentOrNull = require("../utils/get-file-content-or-null"); /** diff --git a/src/common/get-file-info.js b/src/common/get-file-info.js index 2814d2b50..f7f2776e6 100644 --- a/src/common/get-file-info.js +++ b/src/common/get-file-info.js @@ -1,9 +1,9 @@ "use strict"; -const createIgnorer = require("./create-ignorer"); +const path = require("path"); const options = require("../main/options"); const config = require("../config/resolve-config"); -const path = require("path"); +const createIgnorer = require("./create-ignorer"); /** * @typedef {{ ignorePath?: string, withNodeModules?: boolean, plugins: object }} FileInfoOptions diff --git a/src/common/load-plugins.js b/src/common/load-plugins.js index 7cc20403c..cab1e27bf 100644 --- a/src/common/load-plugins.js +++ b/src/common/load-plugins.js @@ -1,13 +1,13 @@ "use strict"; +const fs = require("fs"); +const path = require("path"); const uniqBy = require("lodash/uniqBy"); const partition = require("lodash/partition"); -const fs = require("fs"); const globby = require("globby"); -const path = require("path"); +const mem = require("mem"); const thirdParty = require("./third-party"); const internalPlugins = require("./internal-plugins"); -const mem = require("mem"); const resolve = require("./resolve"); const memoizedLoad = mem(load, { cacheKey: JSON.stringify }); diff --git a/src/config/resolve-config.js b/src/config/resolve-config.js index c32067876..9fa5b85f0 100644 --- a/src/config/resolve-config.js +++ b/src/config/resolve-config.js @@ -1,13 +1,13 @@ "use strict"; -const thirdParty = require("../common/third-party"); -const minimatch = require("minimatch"); const path = require("path"); +const minimatch = require("minimatch"); const mem = require("mem"); +const thirdParty = require("../common/third-party"); -const resolveEditorConfig = require("./resolve-config-editorconfig"); const loadToml = require("../utils/load-toml"); const resolve = require("../common/resolve"); +const resolveEditorConfig = require("./resolve-config-editorconfig"); const getExplorerMemoized = mem( (opts) => { diff --git a/src/language-css/index.js b/src/language-css/index.js index 3e91afc61..f6c6bf95d 100644 --- a/src/language-css/index.js +++ b/src/language-css/index.js @@ -1,8 +1,8 @@ "use strict"; +const createLanguage = require("../utils/create-language"); const printer = require("./printer-postcss"); const options = require("./options"); -const createLanguage = require("../utils/create-language"); const languages = [ createLanguage(require("linguist-languages/data/CSS"), () => ({ diff --git a/src/language-css/printer-postcss.js b/src/language-css/printer-postcss.js index d0ff8f786..708b75c2b 100644 --- a/src/language-css/printer-postcss.js +++ b/src/language-css/printer-postcss.js @@ -1,8 +1,5 @@ "use strict"; -const clean = require("./clean"); -const embed = require("./embed"); -const { insertPragma } = require("./pragma"); const { printNumber, printString, @@ -11,7 +8,6 @@ const { isFrontMatterNode, } = require("../common/util"); const { isNextLineEmpty } = require("../common/util-shared"); - const { builders: { concat, @@ -27,6 +23,9 @@ const { }, utils: { removeLines }, } = require("../document"); +const clean = require("./clean"); +const embed = require("./embed"); +const { insertPragma } = require("./pragma"); const { getAncestorNode, diff --git a/src/language-graphql/index.js b/src/language-graphql/index.js index be64a9e2c..2561fce78 100644 --- a/src/language-graphql/index.js +++ b/src/language-graphql/index.js @@ -1,8 +1,8 @@ "use strict"; +const createLanguage = require("../utils/create-language"); const printer = require("./printer-graphql"); const options = require("./options"); -const createLanguage = require("../utils/create-language"); const languages = [ createLanguage(require("linguist-languages/data/GraphQL"), () => ({ diff --git a/src/language-handlebars/index.js b/src/language-handlebars/index.js index 966ae6ba3..06ce119d6 100644 --- a/src/language-handlebars/index.js +++ b/src/language-handlebars/index.js @@ -1,7 +1,7 @@ "use strict"; -const printer = require("./printer-glimmer"); const createLanguage = require("../utils/create-language"); +const printer = require("./printer-glimmer"); const languages = [ createLanguage(require("linguist-languages/data/Handlebars"), () => ({ diff --git a/src/language-handlebars/printer-glimmer.js b/src/language-handlebars/printer-glimmer.js index 53f0d5369..f540ba4ff 100644 --- a/src/language-handlebars/printer-glimmer.js +++ b/src/language-handlebars/printer-glimmer.js @@ -1,8 +1,5 @@ "use strict"; -const clean = require("./clean"); -const preprocess = require("./preprocess"); - const { concat, group, @@ -14,6 +11,8 @@ const { softline, } = require("../document").builders; +const clean = require("./clean"); +const preprocess = require("./preprocess"); const { getNextNode, getPreviousNode, diff --git a/src/language-html/index.js b/src/language-html/index.js index 3fcfb3ea2..2fc468106 100644 --- a/src/language-html/index.js +++ b/src/language-html/index.js @@ -1,7 +1,7 @@ "use strict"; -const printer = require("./printer-html"); const createLanguage = require("../utils/create-language"); +const printer = require("./printer-html"); const options = require("./options"); const languages = [ diff --git a/src/language-html/parser-html.js b/src/language-html/parser-html.js index cd1515433..43d6a791e 100644 --- a/src/language-html/parser-html.js +++ b/src/language-html/parser-html.js @@ -1,16 +1,16 @@ "use strict"; const parseFrontMatter = require("../utils/front-matter"); +const createError = require("../common/parser-create-error"); +const { getParserName } = require("../common/util"); const { HTML_ELEMENT_ATTRIBUTES, HTML_TAGS, isUnknownNamespace, } = require("./utils"); const { hasPragma } = require("./pragma"); -const createError = require("../common/parser-create-error"); const { Node } = require("./ast"); const { parseIeConditionalComment } = require("./conditional-comment"); -const { getParserName } = require("../common/util"); function ngHtmlParser( input, diff --git a/src/language-html/printer-html.js b/src/language-html/printer-html.js index 72593e5e9..b6b1fede3 100644 --- a/src/language-html/printer-html.js +++ b/src/language-html/printer-html.js @@ -1,10 +1,12 @@ "use strict"; -const clean = require("./clean"); +const assert = require("assert"); const { builders, utils: { stripTrailingHardline, mapDoc, normalizeParts }, } = require("../document"); +const { replaceEndOfLineWith } = require("../common/util"); +const clean = require("./clean"); const { breakParent, dedentToRoot, @@ -41,9 +43,7 @@ const { shouldPreserveContent, unescapeQuoteEntities, } = require("./utils"); -const { replaceEndOfLineWith } = require("../common/util"); const preprocess = require("./preprocess"); -const assert = require("assert"); const { insertPragma } = require("./pragma"); const { printVueFor, diff --git a/src/language-html/syntax-attribute.js b/src/language-html/syntax-attribute.js index c17a8d625..982e55fa0 100644 --- a/src/language-html/syntax-attribute.js +++ b/src/language-html/syntax-attribute.js @@ -1,9 +1,9 @@ "use strict"; +const parseSrcset = require("parse-srcset"); const { builders: { concat, ifBreak, join, line }, } = require("../document"); -const parseSrcset = require("parse-srcset"); function printImgSrcset(value) { const srcset = parseSrcset(value, { diff --git a/src/language-html/utils.js b/src/language-html/utils.js index 70098d73a..632f11efa 100644 --- a/src/language-html/utils.js +++ b/src/language-html/utils.js @@ -1,15 +1,14 @@ "use strict"; +const htmlTagNames = require("html-tag-names"); +const htmlElementAttributes = require("html-element-attributes"); +const { getParserName, isFrontMatterNode } = require("../common/util"); const { CSS_DISPLAY_TAGS, CSS_DISPLAY_DEFAULT, CSS_WHITE_SPACE_TAGS, CSS_WHITE_SPACE_DEFAULT, } = require("./constants.evaluate"); -const { getParserName, isFrontMatterNode } = require("../common/util"); - -const htmlTagNames = require("html-tag-names"); -const htmlElementAttributes = require("html-element-attributes"); const HTML_TAGS = arrayToMap(htmlTagNames); const HTML_ELEMENT_ATTRIBUTES = mapObject(htmlElementAttributes, arrayToMap); diff --git a/src/language-js/embed.js b/src/language-js/embed.js index abccc3851..8a040300a 100644 --- a/src/language-js/embed.js +++ b/src/language-js/embed.js @@ -1,7 +1,5 @@ "use strict"; -const { isBlockComment, hasLeadingComment } = require("./comments"); - const { builders: { indent, @@ -16,6 +14,7 @@ const { }, utils: { mapDoc, stripTrailingHardline }, } = require("../document"); +const { isBlockComment, hasLeadingComment } = require("./comments"); function embed(path, print, textToDoc, options) { const node = path.getValue(); diff --git a/src/language-js/index.js b/src/language-js/index.js index 380bc5551..9f4d97017 100644 --- a/src/language-js/index.js +++ b/src/language-js/index.js @@ -1,9 +1,9 @@ "use strict"; +const createLanguage = require("../utils/create-language"); const estreePrinter = require("./printer-estree"); const estreeJsonPrinter = require("./printer-estree-json"); const options = require("./options"); -const createLanguage = require("../utils/create-language"); const languages = [ createLanguage(require("linguist-languages/data/JavaScript"), (data) => ({ diff --git a/src/language-js/print/member-chain.js b/src/language-js/print/member-chain.js index 74c67c625..1732a3066 100644 --- a/src/language-js/print/member-chain.js +++ b/src/language-js/print/member-chain.js @@ -21,14 +21,6 @@ const { isSimpleCallArgument, } = require("../utils"); -const printCallArguments = require("./call-arguments"); -const { - printOptionalToken, - printFunctionTypeParameters, - printMemberLookup, - printBindExpressionCallee, -} = require("./misc"); - const { builders: { concat, @@ -41,6 +33,13 @@ const { }, utils: { willBreak }, } = require("../../document"); +const printCallArguments = require("./call-arguments"); +const { + printOptionalToken, + printFunctionTypeParameters, + printMemberLookup, + printBindExpressionCallee, +} = require("./misc"); // We detect calls on member expressions specially to format a // common pattern better. The pattern we are looking for is this: diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js index fd794a220..7b4c9ffca 100644 --- a/src/language-js/printer-estree.js +++ b/src/language-js/printer-estree.js @@ -24,6 +24,28 @@ const { isNextLineEmpty, getNextNonSpaceNonCommentCharacterIndex, } = require("../common/util-shared"); +const { + builders: { + concat, + join, + line, + hardline, + softline, + literalline, + group, + indent, + align, + conditionalGroup, + fill, + ifBreak, + lineSuffixBoundary, + addAlignmentToDoc, + dedent, + breakParent, + }, + utils: { willBreak, isLineNext, isEmpty, removeLines, normalizeParts }, + printer: { printDocToString }, +} = require("../document"); const embed = require("./embed"); const clean = require("./clean"); const { insertPragma } = require("./pragma"); @@ -101,29 +123,6 @@ const { printModuleSource, printModuleSpecifiers } = require("./print/module"); const needsQuoteProps = new WeakMap(); -const { - builders: { - concat, - join, - line, - hardline, - softline, - literalline, - group, - indent, - align, - conditionalGroup, - fill, - ifBreak, - lineSuffixBoundary, - addAlignmentToDoc, - dedent, - breakParent, - }, - utils: { willBreak, isLineNext, isEmpty, removeLines, normalizeParts }, - printer: { printDocToString }, -} = require("../document"); - let uid = 0; function genericPrint(path, options, printPath, args) { diff --git a/src/language-js/utils.js b/src/language-js/utils.js index a7d81ff7f..accf78408 100644 --- a/src/language-js/utils.js +++ b/src/language-js/utils.js @@ -1,5 +1,6 @@ "use strict"; +const isIdentifierName = require("esutils").keyword.isIdentifierNameES5; const { getLast, hasNewline, @@ -8,7 +9,6 @@ const { hasNodeIgnoreComment, skipWhitespace, } = require("../common/util"); -const isIdentifierName = require("esutils").keyword.isIdentifierNameES5; const handleComments = require("./comments"); // We match any whitespace except line terminators because diff --git a/src/language-markdown/index.js b/src/language-markdown/index.js index 359654551..9c77d766f 100644 --- a/src/language-markdown/index.js +++ b/src/language-markdown/index.js @@ -1,8 +1,8 @@ "use strict"; +const createLanguage = require("../utils/create-language"); const printer = require("./printer-markdown"); const options = require("./options"); -const createLanguage = require("../utils/create-language"); const languages = [ createLanguage(require("linguist-languages/data/Markdown"), (data) => ({ diff --git a/src/language-markdown/parser-markdown.js b/src/language-markdown/parser-markdown.js index 27218d0fa..2d3e9d5bc 100644 --- a/src/language-markdown/parser-markdown.js +++ b/src/language-markdown/parser-markdown.js @@ -2,12 +2,12 @@ const remarkParse = require("remark-parse"); const unified = require("unified"); -const pragma = require("./pragma"); -const parseFrontMatter = require("../utils/front-matter"); -const { mapAst, INLINE_NODE_WRAPPER_TYPES } = require("./utils"); -const mdx = require("./mdx"); const remarkMath = require("remark-math"); const footnotes = require("remark-footnotes"); +const parseFrontMatter = require("../utils/front-matter"); +const pragma = require("./pragma"); +const { mapAst, INLINE_NODE_WRAPPER_TYPES } = require("./utils"); +const mdx = require("./mdx"); /** * based on [MDAST](https://github.com/syntax-tree/mdast) with following modifications: diff --git a/src/language-markdown/printer-markdown.js b/src/language-markdown/printer-markdown.js index 6600b2590..d5d093778 100644 --- a/src/language-markdown/printer-markdown.js +++ b/src/language-markdown/printer-markdown.js @@ -1,9 +1,6 @@ "use strict"; const privateUtil = require("../common/util"); -const embed = require("./embed"); -const pragma = require("./pragma"); -const preprocess = require("./preprocess"); const { builders: { breakParent, @@ -23,6 +20,10 @@ const { utils: { normalizeDoc }, printer: { printDocToString }, } = require("../document"); +const { replaceEndOfLineWith, isFrontMatterNode } = require("../common/util"); +const embed = require("./embed"); +const pragma = require("./pragma"); +const preprocess = require("./preprocess"); const { getFencedCodeBlockValue, hasGitDiffFriendlyOrderedList, @@ -32,7 +33,6 @@ const { INLINE_NODE_WRAPPER_TYPES, isAutolink, } = require("./utils"); -const { replaceEndOfLineWith, isFrontMatterNode } = require("../common/util"); const TRAILING_HARDLINE_NODES = new Set(["importExport"]); const SINGLE_LINE_NODE_TYPES = ["heading", "tableCell", "link"]; diff --git a/src/language-markdown/utils.js b/src/language-markdown/utils.js index db1e8ab48..5e29c675e 100644 --- a/src/language-markdown/utils.js +++ b/src/language-markdown/utils.js @@ -1,11 +1,11 @@ "use strict"; +const { getLast } = require("../common/util"); const { cjkPattern, kPattern, punctuationPattern, } = require("./constants.evaluate"); -const { getLast } = require("../common/util"); const INLINE_NODE_TYPES = [ "liquidNode", diff --git a/src/language-yaml/index.js b/src/language-yaml/index.js index 6e7414b6c..9147c27a9 100644 --- a/src/language-yaml/index.js +++ b/src/language-yaml/index.js @@ -1,8 +1,8 @@ "use strict"; +const createLanguage = require("../utils/create-language"); const printer = require("./printer-yaml"); const options = require("./options"); -const createLanguage = require("../utils/create-language"); const languages = [ createLanguage(require("linguist-languages/data/YAML"), (data) => ({ diff --git a/src/language-yaml/printer-yaml.js b/src/language-yaml/printer-yaml.js index 4269f77c6..5b899ca7c 100644 --- a/src/language-yaml/printer-yaml.js +++ b/src/language-yaml/printer-yaml.js @@ -1,5 +1,24 @@ "use strict"; +const docBuilders = require("../document").builders; +const { + conditionalGroup, + breakParent, + concat, + dedent, + dedentToRoot, + fill, + group, + hardline, + ifBreak, + join, + line, + lineSuffix, + literalline, + markAsRoot, + softline, +} = docBuilders; +const { replaceEndOfLineWith, isPreviousLineEmpty } = require("../common/util"); const { insertPragma, isPragma } = require("./pragma"); const { getAncestorCount, @@ -20,25 +39,6 @@ const { defineShortcut, mapNode, } = require("./utils"); -const docBuilders = require("../document").builders; -const { - conditionalGroup, - breakParent, - concat, - dedent, - dedentToRoot, - fill, - group, - hardline, - ifBreak, - join, - line, - lineSuffix, - literalline, - markAsRoot, - softline, -} = docBuilders; -const { replaceEndOfLineWith, isPreviousLineEmpty } = require("../common/util"); function preprocess(ast) { return mapNode(ast, defineShortcuts); diff --git a/src/main/ast-to-doc.js b/src/main/ast-to-doc.js index 8863f26b4..7d861c258 100644 --- a/src/main/ast-to-doc.js +++ b/src/main/ast-to-doc.js @@ -1,11 +1,11 @@ "use strict"; const assert = require("assert"); -const comments = require("./comments"); const FastPath = require("../common/fast-path"); +const doc = require("../document"); +const comments = require("./comments"); const multiparser = require("./multiparser"); -const doc = require("../document"); const docBuilders = doc.builders; const { concat, hardline, addAlignmentToDoc } = docBuilders; const docUtils = doc.utils; diff --git a/src/main/core.js b/src/main/core.js index 01dcfd7a9..72ab155e9 100644 --- a/src/main/core.js +++ b/src/main/core.js @@ -2,21 +2,21 @@ const diff = require("diff"); +const { + printer: { printDocToString }, + debug: { printDocToDebug }, +} = require("../document"); +const privateUtil = require("../common/util"); +const { + guessEndOfLine, + convertEndOfLineToChars, +} = require("../common/end-of-line"); const normalizeOptions = require("./options").normalize; const massageAST = require("./massage-ast"); const comments = require("./comments"); const parser = require("./parser"); const printAstToDoc = require("./ast-to-doc"); -const { - guessEndOfLine, - convertEndOfLineToChars, -} = require("../common/end-of-line"); const rangeUtil = require("./range-util"); -const privateUtil = require("../common/util"); -const { - printer: { printDocToString }, - debug: { printDocToDebug }, -} = require("../document"); const BOM = "\uFEFF"; diff --git a/tests_config/run_spec.js b/tests_config/run_spec.js index e20884606..eec6386a9 100644 --- a/tests_config/run_spec.js +++ b/tests_config/run_spec.js @@ -1,8 +1,13 @@ "use strict"; +const { TEST_STANDALONE } = process.env; + const fs = require("fs"); const path = require("path"); const { isCI } = require("ci-info"); +const prettier = !TEST_STANDALONE + ? require("prettier/local") + : require("prettier/standalone"); const checkParsers = require("./utils/check-parsers"); const visualizeRange = require("./utils/visualize-range"); const createSnapshot = require("./utils/create-snapshot"); @@ -11,7 +16,6 @@ const visualizeEndOfLine = require("./utils/visualize-end-of-line"); const consistentEndOfLine = require("./utils/consistent-end-of-line"); const stringifyOptionsForTitle = require("./utils/stringify-options-for-title"); -const { TEST_STANDALONE } = process.env; const AST_COMPARE = isCI || process.env.AST_COMPARE; const DEEP_COMPARE = isCI || process.env.DEEP_COMPARE; const TEST_CRLF = @@ -21,10 +25,6 @@ const CURSOR_PLACEHOLDER = "<|>"; const RANGE_START_PLACEHOLDER = "<<>>"; const RANGE_END_PLACEHOLDER = "<<>>"; -const prettier = !TEST_STANDALONE - ? require("prettier/local") - : require("prettier/standalone"); - // TODO: these test files need fix const unstableTests = new Map( [ diff --git a/tests_integration/__tests__/config-resolution.js b/tests_integration/__tests__/config-resolution.js index f54875426..6749deb9d 100644 --- a/tests_integration/__tests__/config-resolution.js +++ b/tests_integration/__tests__/config-resolution.js @@ -2,8 +2,8 @@ const path = require("path"); -const runPrettier = require("../runPrettier"); const prettier = require("prettier/local"); +const runPrettier = require("../runPrettier"); expect.addSnapshotSerializer(require("../path-serializer")); diff --git a/tests_integration/__tests__/file-info.js b/tests_integration/__tests__/file-info.js index 2edf607cb..e993b5c8f 100644 --- a/tests_integration/__tests__/file-info.js +++ b/tests_integration/__tests__/file-info.js @@ -1,12 +1,12 @@ "use strict"; const path = require("path"); -const tempy = require("tempy"); const fs = require("fs"); +const tempy = require("tempy"); const fromPairs = require("lodash/fromPairs"); -const runPrettier = require("../runPrettier"); const prettier = require("prettier/local"); +const runPrettier = require("../runPrettier"); expect.addSnapshotSerializer(require("../path-serializer")); diff --git a/tests_integration/__tests__/infer-parser.js b/tests_integration/__tests__/infer-parser.js index 0c5a22be5..768e39ada 100644 --- a/tests_integration/__tests__/infer-parser.js +++ b/tests_integration/__tests__/infer-parser.js @@ -1,7 +1,7 @@ "use strict"; -const runPrettier = require("../runPrettier"); const prettier = require("prettier/local"); +const runPrettier = require("../runPrettier"); describe("stdin no path and no parser", () => { describe("logs error and exits with 2", () => { diff --git a/tests_integration/__tests__/loglevel.js b/tests_integration/__tests__/loglevel.js index 24360e1ba..8aba3aaf0 100644 --- a/tests_integration/__tests__/loglevel.js +++ b/tests_integration/__tests__/loglevel.js @@ -1,7 +1,7 @@ "use strict"; -const runPrettier = require("../runPrettier"); const stripAnsi = require("strip-ansi"); +const runPrettier = require("../runPrettier"); test("do not show logs with --loglevel silent", () => { runPrettierWithLogLevel("silent", null); diff --git a/tests_integration/__tests__/patterns-dirs.js b/tests_integration/__tests__/patterns-dirs.js index 0818ab93b..81dbb5089 100644 --- a/tests_integration/__tests__/patterns-dirs.js +++ b/tests_integration/__tests__/patterns-dirs.js @@ -1,5 +1,7 @@ "use strict"; +const path = require("path"); +const fs = require("fs"); const runPrettier = require("../runPrettier"); expect.addSnapshotSerializer(require("../path-serializer")); @@ -56,8 +58,6 @@ testPatterns("Exclude yarn.lock when expanding directories", ["."], { stdout: expect.not.stringContaining("yarn.lock"), }); -const path = require("path"); -const fs = require("fs"); if (path.sep === "/") { // Don't use snapshots in these tests as they're conditionally executed on non-Windows only. diff --git a/tests_integration/__tests__/plugin-options-string.js b/tests_integration/__tests__/plugin-options-string.js index aa2547738..1c7f07f21 100644 --- a/tests_integration/__tests__/plugin-options-string.js +++ b/tests_integration/__tests__/plugin-options-string.js @@ -1,7 +1,7 @@ "use strict"; -const runPrettier = require("../runPrettier"); const snapshotDiff = require("snapshot-diff"); +const runPrettier = require("../runPrettier"); describe("show external options with `--help`", () => { const originalStdout = runPrettier("plugins/options-string", ["--help"]) diff --git a/tests_integration/__tests__/plugin-options.js b/tests_integration/__tests__/plugin-options.js index 1d47987c2..209bed0ac 100644 --- a/tests_integration/__tests__/plugin-options.js +++ b/tests_integration/__tests__/plugin-options.js @@ -1,7 +1,7 @@ "use strict"; -const runPrettier = require("../runPrettier"); const snapshotDiff = require("snapshot-diff"); +const runPrettier = require("../runPrettier"); describe("show external options with `--help`", () => { const originalStdout = runPrettier("plugins/options", ["--help"]).stdout; diff --git a/tests_integration/__tests__/with-parser-inference.js b/tests_integration/__tests__/with-parser-inference.js index ecf3b2cde..43f7a0288 100644 --- a/tests_integration/__tests__/with-parser-inference.js +++ b/tests_integration/__tests__/with-parser-inference.js @@ -1,7 +1,7 @@ "use strict"; -const runPrettier = require("../runPrettier"); const prettier = require("prettier/local"); +const runPrettier = require("../runPrettier"); describe("infers postcss parser", () => { runPrettier("cli/with-parser-inference", ["--end-of-line", "lf", "*"]).test({ diff --git a/website/.eslintrc.yml b/website/.eslintrc.yml index b390ee898..853f35fd6 100644 --- a/website/.eslintrc.yml +++ b/website/.eslintrc.yml @@ -1,5 +1,8 @@ extends: - plugin:react/recommended +settings: + react: + version: "16" rules: import/no-extraneous-dependencies: off react/display-name: off diff --git a/website/pages/en/index.js b/website/pages/en/index.js index df8585211..b637d8e0f 100755 --- a/website/pages/en/index.js +++ b/website/pages/en/index.js @@ -2,8 +2,8 @@ const React = require("react"); const PropTypes = require("prop-types"); -const { MarkdownBlock, Container } = require("../../core/CompLibrary.js"); const AnimatedLogo = require("@sandhose/prettier-animated-logo"); +const { MarkdownBlock, Container } = require("../../core/CompLibrary.js"); const siteConfig = require(process.cwd() + "/siteConfig.js"); diff --git a/website/siteConfig.js b/website/siteConfig.js index 5f4f86aed..b2b7f6484 100644 --- a/website/siteConfig.js +++ b/website/siteConfig.js @@ -2,9 +2,9 @@ // Docs: https://docusaurus.io/docs/en/site-config.html -const parseYaml = require("js-yaml").safeLoad; const path = require("path"); const fs = require("fs"); +const parseYaml = require("js-yaml").safeLoad; const PACKAGE = require("../package"); const GITHUB_URL = `https://github.com/${PACKAGE.repository}`;