Remove blank lines between imports (#16450)

This commit is contained in:
fisker Cheung authored and GitHub committed 2024-09-29 17:56:37 +08:00
1 parent 4b9c16703c
commit 07b468917e
147 files changed
+27 -183

No files matched your search

+25 -3
View File
@@ -1,5 +1,4 @@
import url from "node:url"; import url from "node:url";
import eslintPluginJs from "@eslint/js"; import eslintPluginJs from "@eslint/js";
import eslintPluginStylisticJs from "@stylistic/eslint-plugin-js"; import eslintPluginStylisticJs from "@stylistic/eslint-plugin-js";
import eslintPluginTypescriptEslint from "@typescript-eslint/eslint-plugin"; import eslintPluginTypescriptEslint from "@typescript-eslint/eslint-plugin";
@@ -12,7 +11,6 @@ import eslintPluginRegexp from "eslint-plugin-regexp";
import eslintPluginSimpleImportSort from "eslint-plugin-simple-import-sort"; import eslintPluginSimpleImportSort from "eslint-plugin-simple-import-sort";
import eslintPluginUnicorn from "eslint-plugin-unicorn"; import eslintPluginUnicorn from "eslint-plugin-unicorn";
import globals from "globals"; import globals from "globals";
import eslintPluginPrettierInternalRules from "./scripts/tools/eslint-plugin-prettier-internal-rules/index.js"; import eslintPluginPrettierInternalRules from "./scripts/tools/eslint-plugin-prettier-internal-rules/index.js";
const toPath = (file) => url.fileURLToPath(new URL(file, import.meta.url)); const toPath = (file) => url.fileURLToPath(new URL(file, import.meta.url));
@@ -198,7 +196,31 @@ export default [
], ],
/* eslint-plugin-simple-import-sort */ /* eslint-plugin-simple-import-sort */
"simple-import-sort/imports": "error", "simple-import-sort/imports": [
"error",
{
groups: [
// https://github.com/lydell/eslint-plugin-simple-import-sort/blob/20e25f3b83c713825f96b8494e2091e6600954d6/src/imports.js#L5-L19
// Side effect imports.
[String.raw`^\u0000`],
// Remove blank lines between groups
// https://github.com/lydell/eslint-plugin-simple-import-sort#how-do-i-remove-all-blank-lines-between-imports
[
// Node.js builtins prefixed with `node:`.
"^node:",
// Packages.
// Things that start with a letter (or digit or underscore), or `@` followed by a letter.
String.raw`^@?\w`,
// Absolute imports and other imports such as Vue-style `@/foo`.
// Anything not matched in another group.
"^",
// Relative imports.
// Anything that starts with a dot.
String.raw`^\.`,
],
],
},
],
"simple-import-sort/exports": "error", "simple-import-sort/exports": "error",
/* eslint-plugin-unicorn */ /* eslint-plugin-unicorn */
-2
View File
@@ -1,7 +1,5 @@
import path from "node:path"; import path from "node:path";
import createEsmUtils from "esm-utils"; import createEsmUtils from "esm-utils";
import installPrettier from "./tests/config/install-prettier.js"; import installPrettier from "./tests/config/install-prettier.js";
const { dirname: PROJECT_ROOT } = createEsmUtils(import.meta); const { dirname: PROJECT_ROOT } = createEsmUtils(import.meta);
-2
View File
@@ -3,11 +3,9 @@
import fs from "node:fs/promises"; import fs from "node:fs/promises";
import path from "node:path"; import path from "node:path";
import url from "node:url"; import url from "node:url";
import createEsmUtils from "esm-utils"; import createEsmUtils from "esm-utils";
import { execa } from "execa"; import { execa } from "execa";
import fastGlob from "fast-glob"; import fastGlob from "fast-glob";
import { format } from "../src/index.js"; import { format } from "../src/index.js";
import { import {
copyFile, copyFile,
-2
View File
@@ -1,11 +1,9 @@
import path from "node:path"; import path from "node:path";
import url from "node:url"; import url from "node:url";
import browserslistToEsbuild from "browserslist-to-esbuild"; import browserslistToEsbuild from "browserslist-to-esbuild";
import esbuild from "esbuild"; import esbuild from "esbuild";
import { nodeModulesPolyfillPlugin as esbuildPluginNodeModulePolyfills } from "esbuild-plugins-node-modules-polyfill"; import { nodeModulesPolyfillPlugin as esbuildPluginNodeModulePolyfills } from "esbuild-plugins-node-modules-polyfill";
import createEsmUtils from "esm-utils"; import createEsmUtils from "esm-utils";
import { DIST_DIR, PROJECT_ROOT } from "../utils/index.js"; import { DIST_DIR, PROJECT_ROOT } from "../utils/index.js";
import esbuildPluginAddDefaultExport from "./esbuild-plugins/add-default-export.js"; import esbuildPluginAddDefaultExport from "./esbuild-plugins/add-default-export.js";
import esbuildPluginEvaluate from "./esbuild-plugins/evaluate.js"; import esbuildPluginEvaluate from "./esbuild-plugins/evaluate.js";
-2
View File
@@ -1,9 +1,7 @@
import fs from "node:fs/promises"; import fs from "node:fs/promises";
import path from "node:path"; import path from "node:path";
import { outdent } from "outdent"; import { outdent } from "outdent";
import rollupPluginLicense from "rollup-plugin-license"; import rollupPluginLicense from "rollup-plugin-license";
import { DIST_DIR, PROJECT_ROOT } from "../utils/index.js"; import { DIST_DIR, PROJECT_ROOT } from "../utils/index.js";
const PROJECT_LICENSE_FILE = path.join(PROJECT_ROOT, "LICENSE"); const PROJECT_LICENSE_FILE = path.join(PROJECT_ROOT, "LICENSE");
-1
View File
@@ -1,5 +1,4 @@
import path from "node:path"; import path from "node:path";
import { DIST_DIR, PROJECT_ROOT, readJson, writeJson } from "../utils/index.js"; import { DIST_DIR, PROJECT_ROOT, readJson, writeJson } from "../utils/index.js";
const keysToKeep = [ const keysToKeep = [
-2
View File
@@ -1,10 +1,8 @@
import fs from "node:fs"; import fs from "node:fs";
import path from "node:path"; import path from "node:path";
import url from "node:url"; import url from "node:url";
import { isValidIdentifier } from "@babel/types"; import { isValidIdentifier } from "@babel/types";
import { outdent } from "outdent"; import { outdent } from "outdent";
import { DIST_DIR, PROJECT_ROOT, writeFile } from "../utils/index.js"; import { DIST_DIR, PROJECT_ROOT, writeFile } from "../utils/index.js";
async function typesFileBuilder({ file }) { async function typesFileBuilder({ file }) {
-2
View File
@@ -3,11 +3,9 @@
import fs from "node:fs/promises"; import fs from "node:fs/promises";
import path from "node:path"; import path from "node:path";
import readline from "node:readline"; import readline from "node:readline";
import chalk from "chalk"; import chalk from "chalk";
import createEsmUtils from "esm-utils"; import createEsmUtils from "esm-utils";
import prettyBytes from "pretty-bytes"; import prettyBytes from "pretty-bytes";
import { DIST_DIR } from "../utils/index.js"; import { DIST_DIR } from "../utils/index.js";
import files from "./config.js"; import files from "./config.js";
import parseArguments from "./parse-arguments.js"; import parseArguments from "./parse-arguments.js";
-2
View File
@@ -1,10 +1,8 @@
import fs from "node:fs"; import fs from "node:fs";
import path from "node:path"; import path from "node:path";
import url from "node:url"; import url from "node:url";
import createEsmUtils from "esm-utils"; import createEsmUtils from "esm-utils";
import { outdent } from "outdent"; import { outdent } from "outdent";
import { copyFile, DIST_DIR, PROJECT_ROOT } from "../utils/index.js"; import { copyFile, DIST_DIR, PROJECT_ROOT } from "../utils/index.js";
import buildJavascriptModule from "./build-javascript-module.js"; import buildJavascriptModule from "./build-javascript-module.js";
import buildLicense from "./build-license.js"; import buildLicense from "./build-license.js";
@@ -1,5 +1,4 @@
import fs from "node:fs"; import fs from "node:fs";
import { outdent } from "outdent"; import { outdent } from "outdent";
export default function esbuildPluginShimCommonjsObjects() { export default function esbuildPluginShimCommonjsObjects() {
-1
View File
@@ -1,5 +1,4 @@
import fs from "node:fs"; import fs from "node:fs";
import camelCase from "camelcase"; import camelCase from "camelcase";
import { outdent } from "outdent"; import { outdent } from "outdent";
@@ -1,5 +1,4 @@
import fs from "node:fs/promises"; import fs from "node:fs/promises";
import { visualizer as esbuildVisualizer } from "esbuild-visualizer/dist/plugin/index.js"; import { visualizer as esbuildVisualizer } from "esbuild-visualizer/dist/plugin/index.js";
export default function esbuildPluginVisualizer({ formats }) { export default function esbuildPluginVisualizer({ formats }) {
@@ -1,9 +1,7 @@
/* Transform `@typescript-eslint/*` module to ESM */ /* Transform `@typescript-eslint/*` module to ESM */
import * as path from "node:path"; import * as path from "node:path";
import { outdent } from "outdent"; import { outdent } from "outdent";
import { PROJECT_ROOT, writeFile } from "../utils/index.js"; import { PROJECT_ROOT, writeFile } from "../utils/index.js";
function esmifyTypescriptEslint(text) { function esmifyTypescriptEslint(text) {
@@ -1,9 +1,7 @@
import path from "node:path"; import path from "node:path";
import escapeStringRegexp from "escape-string-regexp"; import escapeStringRegexp from "escape-string-regexp";
import MagicString from "magic-string"; import MagicString from "magic-string";
import { outdent } from "outdent"; import { outdent } from "outdent";
import { PROJECT_ROOT, writeFile } from "../utils/index.js"; import { PROJECT_ROOT, writeFile } from "../utils/index.js";
import UNUSED_SPECIFIERS from "./typescript-unused-specifiers.js"; import UNUSED_SPECIFIERS from "./typescript-unused-specifiers.js";
-1
View File
@@ -1,6 +1,5 @@
import path from "node:path"; import path from "node:path";
import { parseArgs } from "node:util"; import { parseArgs } from "node:util";
import { DIST_DIR } from "../utils/index.js"; import { DIST_DIR } from "../utils/index.js";
function parseArguments() { function parseArguments() {
-2
View File
@@ -1,10 +1,8 @@
import path from "node:path"; import path from "node:path";
import babelGenerator from "@babel/generator"; import babelGenerator from "@babel/generator";
import { parse } from "@babel/parser"; import { parse } from "@babel/parser";
import { traverseFast as traverse } from "@babel/types"; import { traverseFast as traverse } from "@babel/types";
import { outdent } from "outdent"; import { outdent } from "outdent";
import { PROJECT_ROOT, SOURCE_DIR } from "../../utils/index.js"; import { PROJECT_ROOT, SOURCE_DIR } from "../../utils/index.js";
import allTransforms from "./transforms/index.js"; import allTransforms from "./transforms/index.js";
-1
View File
@@ -1,6 +1,5 @@
import fs from "node:fs"; import fs from "node:fs";
import path from "node:path"; import path from "node:path";
import { PROJECT_ROOT } from "../utils/index.js"; import { PROJECT_ROOT } from "../utils/index.js";
function getPackageFile(file) { function getPackageFile(file) {
-1
View File
@@ -1,5 +1,4 @@
import fs from "node:fs/promises"; import fs from "node:fs/promises";
import eslintPluginCompat from "eslint-plugin-compat"; import eslintPluginCompat from "eslint-plugin-compat";
const { browserslist: targets } = JSON.parse( const { browserslist: targets } = JSON.parse(
-2
View File
@@ -1,10 +1,8 @@
#!/usr/bin/env node #!/usr/bin/env node
import path from "node:path"; import path from "node:path";
import minimist from "minimist"; import minimist from "minimist";
import semver from "semver"; import semver from "semver";
import { import {
changelogUnreleasedDirPath, changelogUnreleasedDirPath,
changelogUnreleasedDirs, changelogUnreleasedDirs,
-1
View File
@@ -1,5 +1,4 @@
import fs from "node:fs/promises"; import fs from "node:fs/promises";
import chalk from "chalk"; import chalk from "chalk";
const packageJson = JSON.parse( const packageJson = JSON.parse(
-1
View File
@@ -1,7 +1,6 @@
#!/usr/bin/env node #!/usr/bin/env node
import fs from "node:fs/promises"; import fs from "node:fs/promises";
import { execa } from "execa"; import { execa } from "execa";
const CSPELL_CONFIG_FILE = new URL("../cspell.json", import.meta.url); const CSPELL_CONFIG_FILE = new URL("../cspell.json", import.meta.url);
@@ -7,7 +7,6 @@ Remove revs without actual file change
*/ */
import fs from "node:fs/promises"; import fs from "node:fs/promises";
import { execa } from "execa"; import { execa } from "execa";
const FILE = new URL("../.git-blame-ignore-revs", import.meta.url); const FILE = new URL("../.git-blame-ignore-revs", import.meta.url);
-2
View File
@@ -2,11 +2,9 @@
import fs from "node:fs"; import fs from "node:fs";
import path from "node:path"; import path from "node:path";
import createEsmUtils from "esm-utils"; import createEsmUtils from "esm-utils";
import fg from "fast-glob"; import fg from "fast-glob";
import semver from "semver"; import semver from "semver";
import { import {
changelogUnreleasedDirPath, changelogUnreleasedDirPath,
changelogUnreleasedDirs, changelogUnreleasedDirs,
-2
View File
@@ -11,10 +11,8 @@
import fs from "node:fs/promises"; import fs from "node:fs/promises";
import path from "node:path"; import path from "node:path";
import enquirer from "enquirer"; import enquirer from "enquirer";
import createEsmUtils from "esm-utils"; import createEsmUtils from "esm-utils";
import { CHANGELOG_CATEGORIES } from "./utils/changelog-categories.js"; import { CHANGELOG_CATEGORIES } from "./utils/changelog-categories.js";
const { __dirname } = createEsmUtils(import.meta); const { __dirname } = createEsmUtils(import.meta);
@@ -1,11 +1,9 @@
import fs from "node:fs/promises"; import fs from "node:fs/promises";
import esbuild from "esbuild"; import esbuild from "esbuild";
import * as importMetaResolve from "import-meta-resolve"; import * as importMetaResolve from "import-meta-resolve";
import { outdent } from "outdent"; import { outdent } from "outdent";
import * as prettier from "prettier"; import * as prettier from "prettier";
import * as typescript from "typescript"; import * as typescript from "typescript";
import { modifyTypescriptModule } from "./build/modify-typescript-module.js"; import { modifyTypescriptModule } from "./build/modify-typescript-module.js";
import UNUSED_SPECIFIERS from "./build/typescript-unused-specifiers.js"; import UNUSED_SPECIFIERS from "./build/typescript-unused-specifiers.js";
-2
View File
@@ -2,11 +2,9 @@
import fs from "node:fs"; import fs from "node:fs";
import path from "node:path"; import path from "node:path";
import createEsmUtils from "esm-utils"; import createEsmUtils from "esm-utils";
import { LinesAndColumns } from "lines-and-columns"; import { LinesAndColumns } from "lines-and-columns";
import { outdent } from "outdent"; import { outdent } from "outdent";
import { CHANGELOG_CATEGORIES } from "./utils/changelog-categories.js"; import { CHANGELOG_CATEGORIES } from "./utils/changelog-categories.js";
const { __dirname } = createEsmUtils(import.meta); const { __dirname } = createEsmUtils(import.meta);
-1
View File
@@ -1,5 +1,4 @@
import semver from "semver"; import semver from "semver";
import parseArguments from "./parse-arguments.js"; import parseArguments from "./parse-arguments.js";
import * as steps from "./steps/index.js"; import * as steps from "./steps/index.js";
import { logPromise, readJson, runGit } from "./utils.js"; import { logPromise, readJson, runGit } from "./utils.js";
-2
View File
@@ -1,7 +1,5 @@
import fs from "node:fs"; import fs from "node:fs";
import semver from "semver"; import semver from "semver";
import { logPromise, readJson, runGit, runYarn, writeJson } from "../utils.js"; import { logPromise, readJson, runGit, runYarn, writeJson } from "../utils.js";
async function format() { async function format() {
-2
View File
@@ -1,8 +1,6 @@
import fs from "node:fs/promises"; import fs from "node:fs/promises";
import { fileURLToPath } from "node:url"; import { fileURLToPath } from "node:url";
import fastGlob from "fast-glob"; import fastGlob from "fast-glob";
import { runGit } from "../utils.js"; import { runGit } from "../utils.js";
export default async function cleanChangelog({ repo }) { export default async function cleanChangelog({ repo }) {
@@ -1,5 +1,4 @@
import chalk from "chalk"; import chalk from "chalk";
import { logPromise, readJson, runYarn } from "../utils.js"; import { logPromise, readJson, runYarn } from "../utils.js";
export default async function generateBundles({ dry, version, manual }) { export default async function generateBundles({ dry, version, manual }) {
@@ -1,5 +1,4 @@
import { execa } from "execa"; import { execa } from "execa";
import { runGit, runYarn } from "../utils.js"; import { runGit, runYarn } from "../utils.js";
export default async function installDependencies() { export default async function installDependencies() {
@@ -1,6 +1,5 @@
import chalk from "chalk"; import chalk from "chalk";
import outdent from "outdent"; import outdent from "outdent";
import { fetchText, logPromise, writeFile } from "../utils.js"; import { fetchText, logPromise, writeFile } from "../utils.js";
const SCHEMA_REPO = "SchemaStore/schemastore"; const SCHEMA_REPO = "SchemaStore/schemastore";
-1
View File
@@ -1,6 +1,5 @@
import enquirer from "enquirer"; import enquirer from "enquirer";
import { execa } from "execa"; import { execa } from "execa";
import { waitForEnter } from "../utils.js"; import { waitForEnter } from "../utils.js";
export default async function publishToNpm({ dry }) { export default async function publishToNpm({ dry }) {
@@ -1,7 +1,6 @@
import chalk from "chalk"; import chalk from "chalk";
import outdent from "outdent"; import outdent from "outdent";
import semver from "semver"; import semver from "semver";
import { import {
getBlogPostInfo, getBlogPostInfo,
getChangelogContent, getChangelogContent,
@@ -1,9 +1,7 @@
import fs from "node:fs"; import fs from "node:fs";
import chalk from "chalk"; import chalk from "chalk";
import { execa } from "execa"; import { execa } from "execa";
import semver from "semver"; import semver from "semver";
import { import {
getBlogPostInfo, getBlogPostInfo,
getChangelogContent, getChangelogContent,
@@ -1,5 +1,4 @@
import chalk from "chalk"; import chalk from "chalk";
import { fetchText, logPromise, processFile, runGit } from "../utils.js"; import { fetchText, logPromise, processFile, runGit } from "../utils.js";
async function update() { async function update() {
@@ -1,6 +1,5 @@
import chalk from "chalk"; import chalk from "chalk";
import outdent from "outdent"; import outdent from "outdent";
import { logPromise, waitForEnter } from "../utils.js"; import { logPromise, waitForEnter } from "../utils.js";
export async function isVersionReleased(version) { export async function isVersionReleased(version) {
@@ -1,7 +1,6 @@
import assert from "node:assert/strict"; import assert from "node:assert/strict";
import { describe, it } from "node:test"; import { describe, it } from "node:test";
import { URLSearchParams } from "node:url"; import { URLSearchParams } from "node:url";
import { getReleaseUrl } from "../steps/show-instructions-after-npm-publish.js"; import { getReleaseUrl } from "../steps/show-instructions-after-npm-publish.js";
const RELEASE_URL_BASE = "https://github.com/prettier/prettier/releases/new?"; const RELEASE_URL_BASE = "https://github.com/prettier/prettier/releases/new?";
@@ -1,8 +1,6 @@
import assert from "node:assert/strict"; import assert from "node:assert/strict";
import { describe, it } from "node:test"; import { describe, it } from "node:test";
import chalk from "chalk"; import chalk from "chalk";
import validateNewVersion from "../steps/validate-new-version.js"; import validateNewVersion from "../steps/validate-new-version.js";
describe("validate-new-version", () => { describe("validate-new-version", () => {
@@ -1,6 +1,5 @@
import assert from "node:assert/strict"; import assert from "node:assert/strict";
import { describe, it } from "node:test"; import { describe, it } from "node:test";
import { isVersionReleased } from "../steps/wait-for-bot-release.js"; import { isVersionReleased } from "../steps/wait-for-bot-release.js";
describe("isVersionReleased", () => { describe("isVersionReleased", () => {
-2
View File
@@ -2,11 +2,9 @@ import fs from "node:fs";
import path from "node:path"; import path from "node:path";
import readline from "node:readline"; import readline from "node:readline";
import url from "node:url"; import url from "node:url";
import chalk from "chalk"; import chalk from "chalk";
import { execa } from "execa"; import { execa } from "execa";
import outdent from "outdent"; import outdent from "outdent";
import getFormattedDate from "./get-formatted-date.js"; import getFormattedDate from "./get-formatted-date.js";
readline.emitKeypressEvents(process.stdin); readline.emitKeypressEvents(process.stdin);
-2
View File
@@ -1,9 +1,7 @@
import { createRequire } from "node:module"; import { createRequire } from "node:module";
import path from "node:path"; import path from "node:path";
import url from "node:url"; import url from "node:url";
import webpack from "webpack"; import webpack from "webpack";
import files from "../../build/config.js"; import files from "../../build/config.js";
import { DIST_DIR } from "../../utils/index.js"; import { DIST_DIR } from "../../utils/index.js";
-1
View File
@@ -1,6 +1,5 @@
import fs from "node:fs"; import fs from "node:fs";
import path from "node:path"; import path from "node:path";
import createEsmUtils from "esm-utils"; import createEsmUtils from "esm-utils";
import semver from "semver"; import semver from "semver";
-1
View File
@@ -1,5 +1,4 @@
import { outdent } from "outdent"; import { outdent } from "outdent";
import { optionCategories } from "./prettier-internal.js"; import { optionCategories } from "./prettier-internal.js";
/** /**
-1
View File
@@ -1,5 +1,4 @@
import { outdent } from "outdent"; import { outdent } from "outdent";
import { optionCategories } from "./prettier-internal.js"; import { optionCategories } from "./prettier-internal.js";
const categoryOrder = [ const categoryOrder = [
-1
View File
@@ -1,5 +1,4 @@
import path from "node:path"; import path from "node:path";
import { fastGlob } from "./prettier-internal.js"; import { fastGlob } from "./prettier-internal.js";
import { lstatSafe, normalizeToPosix } from "./utils.js"; import { lstatSafe, normalizeToPosix } from "./utils.js";
-1
View File
@@ -1,5 +1,4 @@
import stringify from "fast-json-stable-stringify"; import stringify from "fast-json-stable-stringify";
import { format, getFileInfo } from "../index.js"; import { format, getFileInfo } from "../index.js";
import { printToScreen } from "./utils.js"; import { printToScreen } from "./utils.js";
-2
View File
@@ -1,9 +1,7 @@
import fs from "node:fs/promises"; import fs from "node:fs/promises";
import os from "node:os"; import os from "node:os";
import path from "node:path"; import path from "node:path";
import findCacheDir from "find-cache-dir"; import findCacheDir from "find-cache-dir";
import { isJson, statSafe } from "./utils.js"; import { isJson, statSafe } from "./utils.js";
/** /**
-1
View File
@@ -1,5 +1,4 @@
import path from "node:path"; import path from "node:path";
import { resolveConfigFile } from "../index.js"; import { resolveConfigFile } from "../index.js";
import { normalizeToPosix, printToScreen } from "./utils.js"; import { normalizeToPosix, printToScreen } from "./utils.js";
-1
View File
@@ -3,7 +3,6 @@
import stringify from "fast-json-stable-stringify"; import stringify from "fast-json-stable-stringify";
import fileEntryCache from "file-entry-cache"; import fileEntryCache from "file-entry-cache";
import { version as prettierVersion } from "../index.js"; import { version as prettierVersion } from "../index.js";
import { createHash } from "./utils.js"; import { createHash } from "./utils.js";
-2
View File
@@ -1,8 +1,6 @@
import fs from "node:fs/promises"; import fs from "node:fs/promises";
import path from "node:path"; import path from "node:path";
import chalk from "chalk"; import chalk from "chalk";
import * as prettier from "../index.js"; import * as prettier from "../index.js";
import { expandPatterns } from "./expand-patterns.js"; import { expandPatterns } from "./expand-patterns.js";
import findCacheFile from "./find-cache-file.js"; import findCacheFile from "./find-cache-file.js";
-1
View File
@@ -1,5 +1,4 @@
import readline from "node:readline"; import readline from "node:readline";
import chalk, { chalkStderr } from "chalk"; import chalk, { chalkStderr } from "chalk";
import stripAnsi from "strip-ansi"; import stripAnsi from "strip-ansi";
import wcwidth from "wcwidth.js"; import wcwidth from "wcwidth.js";
-1
View File
@@ -1,5 +1,4 @@
import dashify from "dashify"; import dashify from "dashify";
import { getSupportInfo } from "../../index.js"; import { getSupportInfo } from "../../index.js";
import cliOptions from "../cli-options.evaluate.js"; import cliOptions from "../cli-options.evaluate.js";
import { import {
-1
View File
@@ -1,5 +1,4 @@
import dashify from "dashify"; import dashify from "dashify";
import { resolveConfig } from "../../index.js"; import { resolveConfig } from "../../index.js";
import { normalizeOptions as normalizeApiOptions } from "../prettier-internal.js"; import { normalizeOptions as normalizeApiOptions } from "../prettier-internal.js";
import createMinimistOptions from "./create-minimist-options.js"; import createMinimistOptions from "./create-minimist-options.js";
-1
View File
@@ -1,6 +1,5 @@
import chalk from "chalk"; import chalk from "chalk";
import leven from "leven"; import leven from "leven";
import { normalizeOptions, vnopts } from "../prettier-internal.js"; import { normalizeOptions, vnopts } from "../prettier-internal.js";
const descriptor = { const descriptor = {
-1
View File
@@ -1,5 +1,4 @@
import camelCase from "camelcase"; import camelCase from "camelcase";
import { pick } from "../utils.js"; import { pick } from "../utils.js";
import createMinimistOptions from "./create-minimist-options.js"; import createMinimistOptions from "./create-minimist-options.js";
import { getContextOptionsWithoutPlugins } from "./get-context-options.js"; import { getContextOptionsWithoutPlugins } from "./get-context-options.js";
-1
View File
@@ -1,5 +1,4 @@
import stringify from "fast-json-stable-stringify"; import stringify from "fast-json-stable-stringify";
import { format, getSupportInfo } from "../index.js"; import { format, getSupportInfo } from "../index.js";
import { omit, printToScreen } from "./utils.js"; import { omit, printToScreen } from "./utils.js";
-1
View File
@@ -1,5 +1,4 @@
import camelCase from "camelcase"; import camelCase from "camelcase";
import { categoryOrder, usageSummary } from "./constants.evaluate.js"; import { categoryOrder, usageSummary } from "./constants.evaluate.js";
import { formatOptionsHiddenDefaults } from "./prettier-internal.js"; import { formatOptionsHiddenDefaults } from "./prettier-internal.js";
import { groupBy } from "./utils.js"; import { groupBy } from "./utils.js";
-2
View File
@@ -1,8 +1,6 @@
import fs from "node:fs/promises"; import fs from "node:fs/promises";
import path from "node:path"; import path from "node:path";
import sdbm from "sdbm"; import sdbm from "sdbm";
// @ts-expect-error // @ts-expect-error
import { __internal as sharedWithCli } from "../index.js"; import { __internal as sharedWithCli } from "../index.js";
-1
View File
@@ -1,5 +1,4 @@
import fs from "node:fs/promises"; import fs from "node:fs/promises";
import { isCI } from "ci-info"; import { isCI } from "ci-info";
import getStdin from "get-stdin"; import getStdin from "get-stdin";
-2
View File
@@ -1,7 +1,5 @@
import path from "node:path"; import path from "node:path";
import editorconfig from "editorconfig"; import editorconfig from "editorconfig";
import { import {
clearFindProjectRootCache, clearFindProjectRootCache,
findProjectRoot, findProjectRoot,
-1
View File
@@ -2,7 +2,6 @@
// https://github.com/kirstein/find-project-root/blob/master/index.js // https://github.com/kirstein/find-project-root/blob/master/index.js
import * as path from "node:path"; import * as path from "node:path";
import isDirectory from "../utils/is-directory.js"; import isDirectory from "../utils/is-directory.js";
import Searcher from "./searcher.js"; import Searcher from "./searcher.js";
-1
View File
@@ -1,5 +1,4 @@
import path from "node:path"; import path from "node:path";
import mockable from "../../common/mockable.js"; import mockable from "../../common/mockable.js";
import getConfigSearcher from "./config-searcher.js"; import getConfigSearcher from "./config-searcher.js";
import loadConfig from "./load-config.js"; import loadConfig from "./load-config.js";
@@ -1,5 +1,4 @@
import path from "node:path"; import path from "node:path";
import loadExternalConfig from "./load-external-config.js"; import loadExternalConfig from "./load-external-config.js";
import loaders, { import loaders, {
loadConfigFromPackageJson, loadConfigFromPackageJson,
+2 -2
View File
@@ -1,10 +1,10 @@
import { pathToFileURL } from "node:url"; import "fast-glob";
import { pathToFileURL } from "node:url";
import { load as parseYaml } from "js-yaml"; import { load as parseYaml } from "js-yaml";
import json5 from "json5"; import json5 from "json5";
import parseJson from "parse-json"; import parseJson from "parse-json";
import { parse as parseToml } from "smol-toml"; import { parse as parseToml } from "smol-toml";
import readFile from "../../utils/read-file.js"; import readFile from "../../utils/read-file.js";
async function readJson(file) { async function readJson(file) {
-2
View File
@@ -1,8 +1,6 @@
import path from "node:path"; import path from "node:path";
import micromatch from "micromatch"; import micromatch from "micromatch";
import { toPath } from "url-or-path"; import { toPath } from "url-or-path";
import partition from "../utils/partition.js"; import partition from "../utils/partition.js";
import { import {
clearEditorconfigCache, clearEditorconfigCache,
-1
View File
@@ -1,5 +1,4 @@
import path from "node:path"; import path from "node:path";
import iterateDirectoryUp from "iterate-directory-up"; import iterateDirectoryUp from "iterate-directory-up";
class Searcher { class Searcher {
-1
View File
@@ -2,7 +2,6 @@
import { createTwoFilesPatch } from "diff"; import { createTwoFilesPatch } from "diff";
import fastGlob from "fast-glob"; import fastGlob from "fast-glob";
import * as vnopts from "vnopts"; import * as vnopts from "vnopts";
import * as errors from "./common/errors.js"; import * as errors from "./common/errors.js";
import getFileInfoWithoutPlugins from "./common/get-file-info.js"; import getFileInfoWithoutPlugins from "./common/get-file-info.js";
import mockable from "./common/mockable.js"; import mockable from "./common/mockable.js";
-1
View File
@@ -1,5 +1,4 @@
import linguistLanguages from "linguist-languages"; import linguistLanguages from "linguist-languages";
import createLanguage from "../utils/create-language.js"; import createLanguage from "../utils/create-language.js";
const languages = [ const languages = [
@@ -1,5 +1,4 @@
import postcssMediaQueryParser from "postcss-media-query-parser"; import postcssMediaQueryParser from "postcss-media-query-parser";
import { addMissingType, addTypePrefix } from "./utils.js"; import { addMissingType, addTypePrefix } from "./utils.js";
const parse = postcssMediaQueryParser.default; const parse = postcssMediaQueryParser.default;
-1
View File
@@ -1,5 +1,4 @@
import PostcssSelectorParser from "postcss-selector-parser/dist/processor.js"; import PostcssSelectorParser from "postcss-selector-parser/dist/processor.js";
import { addTypePrefix } from "./utils.js"; import { addTypePrefix } from "./utils.js";
function parseSelector(selector) { function parseSelector(selector) {
-1
View File
@@ -1,5 +1,4 @@
import PostcssValuesParser from "postcss-values-parser/lib/parser.js"; import PostcssValuesParser from "postcss-values-parser/lib/parser.js";
import getFunctionArgumentsText from "../utils/get-function-arguments-text.js"; import getFunctionArgumentsText from "../utils/get-function-arguments-text.js";
import getValueRoot from "../utils/get-value-root.js"; import getValueRoot from "../utils/get-value-root.js";
import hasSCSSInterpolation from "../utils/has-scss-interpolation.js"; import hasSCSSInterpolation from "../utils/has-scss-interpolation.js";
-1
View File
@@ -1,7 +1,6 @@
import postcssParse from "postcss/lib/parse"; import postcssParse from "postcss/lib/parse";
import postcssLess from "postcss-less"; import postcssLess from "postcss-less";
import postcssScssParse from "postcss-scss/lib/scss-parse"; import postcssScssParse from "postcss-scss/lib/scss-parse";
import createError from "../common/parser-create-error.js"; import createError from "../common/parser-create-error.js";
import parseFrontMatter from "../utils/front-matter/parse.js"; import parseFrontMatter from "../utils/front-matter/parse.js";
import { import {
@@ -1,5 +1,4 @@
import linguistLanguages from "linguist-languages"; import linguistLanguages from "linguist-languages";
import createLanguage from "../utils/create-language.js"; import createLanguage from "../utils/create-language.js";
const languages = [ const languages = [
-1
View File
@@ -1,5 +1,4 @@
import { parse as parseGraphql } from "graphql/language/parser.mjs"; import { parse as parseGraphql } from "graphql/language/parser.mjs";
import createError from "../common/parser-create-error.js"; import createError from "../common/parser-create-error.js";
import { locEnd, locStart } from "./loc.js"; import { locEnd, locStart } from "./loc.js";
import { hasPragma } from "./pragma.js"; import { hasPragma } from "./pragma.js";
@@ -1,5 +1,4 @@
import linguistLanguages from "linguist-languages"; import linguistLanguages from "linguist-languages";
import createLanguage from "../utils/create-language.js"; import createLanguage from "../utils/create-language.js";
const languages = [ const languages = [
@@ -1,6 +1,5 @@
import { preprocess as parseGlimmer } from "@glimmer/syntax"; import { preprocess as parseGlimmer } from "@glimmer/syntax";
import { LinesAndColumns } from "lines-and-columns"; import { LinesAndColumns } from "lines-and-columns";
import createError from "../common/parser-create-error.js"; import createError from "../common/parser-create-error.js";
import { locEnd, locStart } from "./loc.js"; import { locEnd, locStart } from "./loc.js";
-1
View File
@@ -1,5 +1,4 @@
import parseSrcset from "@prettier/parse-srcset"; import parseSrcset from "@prettier/parse-srcset";
import { ifBreak, join, line } from "../../document/builders.js"; import { ifBreak, join, line } from "../../document/builders.js";
import { getUnescapedAttributeValue } from "../utils/index.js"; import { getUnescapedAttributeValue } from "../utils/index.js";
import { printExpand } from "./utils.js"; import { printExpand } from "./utils.js";
-1
View File
@@ -1,5 +1,4 @@
import linguistLanguages from "linguist-languages"; import linguistLanguages from "linguist-languages";
import createLanguage from "../utils/create-language.js"; import createLanguage from "../utils/create-language.js";
const languages = [ const languages = [
-1
View File
@@ -8,7 +8,6 @@ import {
TagContentType, TagContentType,
visitAll, visitAll,
} from "angular-html-parser"; } from "angular-html-parser";
import createError from "../common/parser-create-error.js"; import createError from "../common/parser-create-error.js";
import parseFrontMatter from "../utils/front-matter/parse.js"; import parseFrontMatter from "../utils/front-matter/parse.js";
import inferParser from "../utils/infer-parser.js"; import inferParser from "../utils/infer-parser.js";
-1
View File
@@ -1,5 +1,4 @@
import { ParseSourceSpan } from "angular-html-parser/lib/compiler/src/parse_util.js"; import { ParseSourceSpan } from "angular-html-parser/lib/compiler/src/parse_util.js";
import htmlWhitespaceUtils from "../utils/html-whitespace-utils.js"; import htmlWhitespaceUtils from "../utils/html-whitespace-utils.js";
import { import {
canHaveInterpolation, canHaveInterpolation,
-1
View File
@@ -3,7 +3,6 @@
*/ */
import assert from "node:assert"; import assert from "node:assert";
import { import {
hardline, hardline,
indent, indent,
-1
View File
@@ -1,5 +1,4 @@
import linguistLanguages from "linguist-languages"; import linguistLanguages from "linguist-languages";
import createLanguage from "../utils/create-language.js"; import createLanguage from "../utils/create-language.js";
const languages = [ const languages = [
-1
View File
@@ -1,6 +1,5 @@
import { Parser as AcornParser } from "acorn"; import { Parser as AcornParser } from "acorn";
import acornJsx from "acorn-jsx"; import acornJsx from "acorn-jsx";
import createError from "../../common/parser-create-error.js"; import createError from "../../common/parser-create-error.js";
import tryCombinations from "../../utils/try-combinations.js"; import tryCombinations from "../../utils/try-combinations.js";
import postprocess from "./postprocess/index.js"; import postprocess from "./postprocess/index.js";
-1
View File
@@ -4,7 +4,6 @@ import {
parseInterpolationExpression, parseInterpolationExpression,
parseTemplateBindings, parseTemplateBindings,
} from "angular-estree-parser"; } from "angular-estree-parser";
import { locEnd, locStart } from "../loc.js"; import { locEnd, locStart } from "../loc.js";
/** /**
-1
View File
@@ -1,5 +1,4 @@
import { parse as babelParse, parseExpression } from "@babel/parser"; import { parse as babelParse, parseExpression } from "@babel/parser";
import getNextNonSpaceNonCommentCharacterIndex from "../../utils/get-next-non-space-non-comment-character-index.js"; import getNextNonSpaceNonCommentCharacterIndex from "../../utils/get-next-non-space-non-comment-character-index.js";
import tryCombinations from "../../utils/try-combinations.js"; import tryCombinations from "../../utils/try-combinations.js";
import getShebang from "../utils/get-shebang.js"; import getShebang from "../utils/get-shebang.js";
-1
View File
@@ -1,5 +1,4 @@
import { parse as espreeParse } from "espree"; import { parse as espreeParse } from "espree";
import createError from "../../common/parser-create-error.js"; import createError from "../../common/parser-create-error.js";
import tryCombinations from "../../utils/try-combinations.js"; import tryCombinations from "../../utils/try-combinations.js";
import postprocess from "./postprocess/index.js"; import postprocess from "./postprocess/index.js";
-1
View File
@@ -1,5 +1,4 @@
import flowParser from "flow-parser"; import flowParser from "flow-parser";
import createError from "../../common/parser-create-error.js"; import createError from "../../common/parser-create-error.js";
import postprocess from "./postprocess/index.js"; import postprocess from "./postprocess/index.js";
import createParser from "./utils/create-parser.js"; import createParser from "./utils/create-parser.js";
-1
View File
@@ -1,5 +1,4 @@
import { parse as meriyahParse } from "meriyah"; import { parse as meriyahParse } from "meriyah";
import createError from "../../common/parser-create-error.js"; import createError from "../../common/parser-create-error.js";
import tryCombinations from "../../utils/try-combinations.js"; import tryCombinations from "../../utils/try-combinations.js";
import postprocess from "./postprocess/index.js"; import postprocess from "./postprocess/index.js";
-1
View File
@@ -1,5 +1,4 @@
import { parse as parseTypeScript } from "@typescript-eslint/typescript-estree"; import { parse as parseTypeScript } from "@typescript-eslint/typescript-estree";
import createError from "../../common/parser-create-error.js"; import createError from "../../common/parser-create-error.js";
import tryCombinations from "../../utils/try-combinations.js"; import tryCombinations from "../../utils/try-combinations.js";
import postprocess from "./postprocess/index.js"; import postprocess from "./postprocess/index.js";
-1
View File
@@ -1,5 +1,4 @@
import { extract, parseWithComments, print, strip } from "jest-docblock"; import { extract, parseWithComments, print, strip } from "jest-docblock";
import { normalizeEndOfLine } from "../common/end-of-line.js"; import { normalizeEndOfLine } from "../common/end-of-line.js";
import getShebang from "./utils/get-shebang.js"; import getShebang from "./utils/get-shebang.js";
-1
View File
@@ -1,7 +1,6 @@
/** @typedef {import("../../document/builders.js").Doc} Doc */ /** @typedef {import("../../document/builders.js").Doc} Doc */
import assert from "node:assert"; import assert from "node:assert";
import { replaceEndOfLine } from "../../document/utils.js"; import { replaceEndOfLine } from "../../document/utils.js";
import printNumber from "../../utils/print-number.js"; import printNumber from "../../utils/print-number.js";
import printString from "../../utils/print-string.js"; import printString from "../../utils/print-string.js";
-1
View File
@@ -1,5 +1,4 @@
import assert from "node:assert"; import assert from "node:assert";
import { import {
group, group,
hardline, hardline,
-1
View File
@@ -1,5 +1,4 @@
import isEs5IdentifierName from "@prettier/is-es5-identifier-name"; import isEs5IdentifierName from "@prettier/is-es5-identifier-name";
import { printComments } from "../../main/comments/print.js"; import { printComments } from "../../main/comments/print.js";
import printNumber from "../../utils/print-number.js"; import printNumber from "../../utils/print-number.js";
import printString from "../../utils/print-string.js"; import printString from "../../utils/print-string.js";
@@ -1,7 +1,6 @@
import { VISITOR_KEYS as babelVisitorKeys } from "@babel/types"; import { VISITOR_KEYS as babelVisitorKeys } from "@babel/types";
import { visitorKeys as tsVisitorKeys } from "@typescript-eslint/visitor-keys"; import { visitorKeys as tsVisitorKeys } from "@typescript-eslint/visitor-keys";
import flowVisitorKeys from "hermes-parser/dist/generated/ESTreeVisitorKeys.js"; import flowVisitorKeys from "hermes-parser/dist/generated/ESTreeVisitorKeys.js";
import unionVisitorKeys from "./union-visitor-keys.js"; import unionVisitorKeys from "./union-visitor-keys.js";
const angularVisitorKeys = { const angularVisitorKeys = {
@@ -1,5 +1,4 @@
import assert from "node:assert"; import assert from "node:assert";
import { locEnd, locStart } from "../loc.js"; import { locEnd, locStart } from "../loc.js";
function getTextWithoutComments(options, start, end) { function getTextWithoutComments(options, start, end) {
-1
View File
@@ -1,5 +1,4 @@
import linguistLanguages from "linguist-languages"; import linguistLanguages from "linguist-languages";
import createLanguage from "../utils/create-language.js"; import createLanguage from "../utils/create-language.js";
const languages = [ const languages = [
-1
View File
@@ -1,5 +1,4 @@
import { parseExpression } from "@babel/parser"; import { parseExpression } from "@babel/parser";
import createError from "../common/parser-create-error.js"; import createError from "../common/parser-create-error.js";
import createBabelParseError from "../language-js/parse/utils/create-babel-parse-error.js"; import createBabelParseError from "../language-js/parse/utils/create-babel-parse-error.js";
import createParser from "../language-js/parse/utils/create-parser.js"; import createParser from "../language-js/parse/utils/create-parser.js";
-1
View File
@@ -1,5 +1,4 @@
import collapseWhiteSpace from "collapse-white-space"; import collapseWhiteSpace from "collapse-white-space";
import isFrontMatter from "../utils/front-matter/is-front-matter.js"; import isFrontMatter from "../utils/front-matter/is-front-matter.js";
import { startWithPragma } from "./pragma.js"; import { startWithPragma } from "./pragma.js";
@@ -1,5 +1,4 @@
import linguistLanguages from "linguist-languages"; import linguistLanguages from "linguist-languages";
import createLanguage from "../utils/create-language.js"; import createLanguage from "../utils/create-language.js";
const languages = [ const languages = [
Loaded 100 of 147 files, more files were not shown because too many files have changed in this diff. Show more