From 473471e997a0fc94966d5b3cd31a70dcaededa8f Mon Sep 17 00:00:00 2001 From: Toby Bessant Date: Sat, 22 Jun 2024 17:32:25 +0100 Subject: [PATCH] Sort prettier imports --- src/.prettierignore | 4 +++- src/.prettierrc.js | 1 + src/package-lock.json | 18 ++++++++++++++---- src/package.json | 2 +- .../generate-license-file/src/index.ts | 3 --- .../src/lib/cli/args/eol.ts | 2 +- .../src/lib/cli/args/inputs.ts | 2 +- .../src/lib/cli/args/output.ts | 2 +- .../src/lib/cli/commands/main.ts | 14 +++++++------- .../src/lib/cli/config/configFile.ts | 2 +- .../src/lib/cli/config/index.ts | 4 ++-- .../src/lib/getProjectLicenses.ts | 2 +- .../lib/internal/resolveDependencies/index.ts | 6 +++--- .../resolveNpmDependencies.ts | 6 +++--- .../resolvePnpmDependencies.ts | 8 ++++---- .../internal/resolveLicenseContent/index.ts | 4 ++-- .../resolveLicenseContent/licenseFile.ts | 5 ++--- .../packageJsonLicense.ts | 6 +++--- .../resolveLicenseContent/replacementFile.ts | 2 +- .../resolveLicenseContent/spdxExpression.ts | 2 +- .../src/lib/utils/exec.utils.ts | 2 +- .../src/lib/utils/pnpmCli.utils.ts | 2 +- .../test/cli/args/eol.spec.ts | 2 +- .../test/cli/args/inputs.spec.ts | 2 +- .../test/cli/args/output.spec.ts | 2 +- .../test/getLicenseFileText.spec.ts | 4 ++-- .../test/getProjectLicenses.spec.ts | 2 +- .../internal/resolveDependencies/index.spec.ts | 8 ++++---- .../resolveNpmDependencies.spec.ts | 8 ++++---- .../resolvePnpmDependencies.spec.ts | 18 +++++++++--------- .../resolveLicenseContent/index.spec.ts | 4 ++-- .../resolveLicenseContent/licenseFile.spec.ts | 4 ++-- .../packageJsonLicense.spec.ts | 6 +++--- .../replacementFile.spec.ts | 2 +- .../spdxExpression.spec.ts | 2 +- .../test/utils/console.utils.spec.ts | 2 +- .../test/utils/pnpmCli.utils.spec.ts | 4 ++-- src/packages/webpack-plugin/src/index.ts | 4 ++-- .../src/lib/asyncProcessAssetTapFactory.ts | 2 +- .../src/lib/compilationTapFactory.ts | 2 +- src/tools/scripts/version.mjs | 2 +- website/.prettierrc.js | 1 + website/package-lock.json | 18 ++++++++++++++---- website/package.json | 2 +- 44 files changed, 110 insertions(+), 90 deletions(-) diff --git a/src/.prettierignore b/src/.prettierignore index 3374f42d..ff7dfc45 100644 --- a/src/.prettierignore +++ b/src/.prettierignore @@ -6,4 +6,6 @@ /tmp /.nx/cache -/.nx/workspace-data \ No newline at end of file +/.nx/workspace-data + +pnpm-lock.yaml diff --git a/src/.prettierrc.js b/src/.prettierrc.js index 186a753c..974ff637 100644 --- a/src/.prettierrc.js +++ b/src/.prettierrc.js @@ -17,4 +17,5 @@ module.exports = { arrowParens: "avoid", singleQuote: false, trailingComma: "all", + plugins: ["prettier-plugin-organize-imports"], }; diff --git a/src/package-lock.json b/src/package-lock.json index eca45f75..e7d0f2a3 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -47,7 +47,7 @@ "jest-when": "^3.5.2", "nx": "19.3.1", "prettier": "^3.0.0", - "prettier-plugin-organize-imports": "^3.0.0", + "prettier-plugin-organize-imports": "^3.2.4", "ts-jest": "29.1.5", "ts-node": "10.9.2", "typescript": "~4.9.0" @@ -11067,13 +11067,23 @@ } }, "node_modules/prettier-plugin-organize-imports": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/prettier-plugin-organize-imports/-/prettier-plugin-organize-imports-3.0.0.tgz", - "integrity": "sha512-juSCJs5TMOqGGPaN/A/1xzWFzRPH2LG1LPLCr64dzKaVnPafJdtgDNmDVlU+8A4LbQzVJg0DTvgA8swBuIUhlg==", + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/prettier-plugin-organize-imports/-/prettier-plugin-organize-imports-3.2.4.tgz", + "integrity": "sha512-6m8WBhIp0dfwu0SkgfOxJqh+HpdyfqSSLfKKRZSFbDuEQXDDndb8fTpRWkUrX/uBenkex3MgnVk0J3b3Y5byog==", "dev": true, "peerDependencies": { + "@volar/vue-language-plugin-pug": "^1.0.4", + "@volar/vue-typescript": "^1.0.4", "prettier": ">=2.0", "typescript": ">=2.9" + }, + "peerDependenciesMeta": { + "@volar/vue-language-plugin-pug": { + "optional": true + }, + "@volar/vue-typescript": { + "optional": true + } } }, "node_modules/pretty-format": { diff --git a/src/package.json b/src/package.json index 0834fd99..8af0c275 100644 --- a/src/package.json +++ b/src/package.json @@ -48,7 +48,7 @@ "jest-when": "^3.5.2", "nx": "19.3.1", "prettier": "^3.0.0", - "prettier-plugin-organize-imports": "^3.0.0", + "prettier-plugin-organize-imports": "^3.2.4", "ts-jest": "29.1.5", "ts-node": "10.9.2", "typescript": "~4.9.0" diff --git a/src/packages/generate-license-file/src/index.ts b/src/packages/generate-license-file/src/index.ts index 42c439e2..84cecb0e 100644 --- a/src/packages/generate-license-file/src/index.ts +++ b/src/packages/generate-license-file/src/index.ts @@ -1,12 +1,9 @@ /* istanbul ignore file */ export { generateLicenseFile } from "./lib/generateLicenseFile"; export type { GenerateLicenseFileOptions } from "./lib/generateLicenseFile"; - export { getLicenseFileText } from "./lib/getLicenseFileText"; export type { GetLicenseFileTextOptions } from "./lib/getLicenseFileText"; - export { getProjectLicenses } from "./lib/getProjectLicenses"; export type { GetProjectLicensesOptions } from "./lib/getProjectLicenses"; - export type { LineEnding } from "./lib/lineEndings"; export type { ILicense } from "./lib/models/license"; diff --git a/src/packages/generate-license-file/src/lib/cli/args/eol.ts b/src/packages/generate-license-file/src/lib/cli/args/eol.ts index 9dc318bf..18f9c51a 100644 --- a/src/packages/generate-license-file/src/lib/cli/args/eol.ts +++ b/src/packages/generate-license-file/src/lib/cli/args/eol.ts @@ -1,6 +1,6 @@ import { isLineEnding, LineEnding } from "../../lineEndings"; -import { Argument, MultipleChoiceOptions } from "./argument"; import { CombinedConfig } from "../commands/main"; +import { Argument, MultipleChoiceOptions } from "./argument"; export class Eol extends Argument { private readonly choices: MultipleChoiceOptions = { diff --git a/src/packages/generate-license-file/src/lib/cli/args/inputs.ts b/src/packages/generate-license-file/src/lib/cli/args/inputs.ts index 66c753a3..8c26d4df 100644 --- a/src/packages/generate-license-file/src/lib/cli/args/inputs.ts +++ b/src/packages/generate-license-file/src/lib/cli/args/inputs.ts @@ -1,7 +1,7 @@ import { doesFileExist } from "../../utils/file.utils"; -import { Argument } from "./argument"; import { CombinedConfig } from "../commands/main"; import { spinner } from "../spinner"; +import { Argument } from "./argument"; export class Inputs extends Argument { private question = "Package.json location: "; diff --git a/src/packages/generate-license-file/src/lib/cli/args/output.ts b/src/packages/generate-license-file/src/lib/cli/args/output.ts index 15150690..aa70d73e 100644 --- a/src/packages/generate-license-file/src/lib/cli/args/output.ts +++ b/src/packages/generate-license-file/src/lib/cli/args/output.ts @@ -1,6 +1,6 @@ import { doesFileExist } from "../../utils/file.utils"; -import { Argument } from "./argument"; import { CombinedConfig } from "../commands/main"; +import { Argument } from "./argument"; export class Output extends Argument { private question = "Output location: "; diff --git a/src/packages/generate-license-file/src/lib/cli/commands/main.ts b/src/packages/generate-license-file/src/lib/cli/commands/main.ts index bbad10bb..5b3c945a 100644 --- a/src/packages/generate-license-file/src/lib/cli/commands/main.ts +++ b/src/packages/generate-license-file/src/lib/cli/commands/main.ts @@ -1,14 +1,14 @@ import { Command } from "@commander-js/extra-typings"; -import { loadConfigFile } from "../config"; -import { Inputs } from "../args/inputs"; -import { Output } from "../args/output"; -import { Eol } from "../args/eol"; -import { LineEnding } from "../../lineEndings"; -import { generateLicenseFile } from "../../generateLicenseFile"; -import { spinner } from "../spinner"; import { join } from "path"; +import { generateLicenseFile } from "../../generateLicenseFile"; +import { LineEnding } from "../../lineEndings"; import logger from "../../utils/console.utils"; import { readPackageJson } from "../../utils/packageJson.utils"; +import { Eol } from "../args/eol"; +import { Inputs } from "../args/inputs"; +import { Output } from "../args/output"; +import { loadConfigFile } from "../config"; +import { spinner } from "../spinner"; export type CombinedConfig = { inputs?: string[]; diff --git a/src/packages/generate-license-file/src/lib/cli/config/configFile.ts b/src/packages/generate-license-file/src/lib/cli/config/configFile.ts index 3d748408..0466be69 100644 --- a/src/packages/generate-license-file/src/lib/cli/config/configFile.ts +++ b/src/packages/generate-license-file/src/lib/cli/config/configFile.ts @@ -1,4 +1,4 @@ -import { Options as CosmiconfigOptions, cosmiconfig } from "cosmiconfig"; +import { cosmiconfig, Options as CosmiconfigOptions } from "cosmiconfig"; import { json5Parse } from "./parsers/json5"; export type ConfigFile = { path: string; config: unknown }; diff --git a/src/packages/generate-license-file/src/lib/cli/config/index.ts b/src/packages/generate-license-file/src/lib/cli/config/index.ts index b3cd0d8b..f6d10183 100644 --- a/src/packages/generate-license-file/src/lib/cli/config/index.ts +++ b/src/packages/generate-license-file/src/lib/cli/config/index.ts @@ -1,7 +1,7 @@ -import { ConfigSchema, parseSchema } from "./schema"; +import { dirname, isAbsolute, join } from "path"; import { doesFileExist } from "../../utils/file.utils"; import { ConfigFile, findConfig, loadConfig } from "./configFile"; -import { dirname, isAbsolute, join } from "path"; +import { ConfigSchema, parseSchema } from "./schema"; export const loadConfigFile = async (path?: string): Promise => { if (path && (await doesFileExist(path))) { diff --git a/src/packages/generate-license-file/src/lib/getProjectLicenses.ts b/src/packages/generate-license-file/src/lib/getProjectLicenses.ts index a80e1c5f..493b7516 100644 --- a/src/packages/generate-license-file/src/lib/getProjectLicenses.ts +++ b/src/packages/generate-license-file/src/lib/getProjectLicenses.ts @@ -1,8 +1,8 @@ import { resolveLicenses } from "./internal/resolveLicenses"; import { ILicense } from "./models/license"; import { ExcludeOption } from "./options/exclude"; -import { IntersectionExpander } from "./options/optionsExpander"; import { OmitVersionsOption } from "./options/omitVersions"; +import { IntersectionExpander } from "./options/optionsExpander"; import { ReplaceOption } from "./options/replace"; export type GetProjectLicensesOptions = IntersectionExpander< diff --git a/src/packages/generate-license-file/src/lib/internal/resolveDependencies/index.ts b/src/packages/generate-license-file/src/lib/internal/resolveDependencies/index.ts index fbbf480f..89df75be 100644 --- a/src/packages/generate-license-file/src/lib/internal/resolveDependencies/index.ts +++ b/src/packages/generate-license-file/src/lib/internal/resolveDependencies/index.ts @@ -1,8 +1,8 @@ -import { resolveDependenciesForNpmProject } from "./resolveNpmDependencies"; -import { resolveDependenciesForPnpmProject } from "./resolvePnpmDependencies"; -import { dirname, join } from "path"; +import { dirname, join } from "path"; import { doesFileExist } from "../../utils/file.utils"; import { Dependency, LicenseContent } from "../resolveLicenses"; +import { resolveDependenciesForNpmProject } from "./resolveNpmDependencies"; +import { resolveDependenciesForPnpmProject } from "./resolvePnpmDependencies"; type ResolveLicensesOptions = { replace?: Record; diff --git a/src/packages/generate-license-file/src/lib/internal/resolveDependencies/resolveNpmDependencies.ts b/src/packages/generate-license-file/src/lib/internal/resolveDependencies/resolveNpmDependencies.ts index 71b25b84..e11341d6 100644 --- a/src/packages/generate-license-file/src/lib/internal/resolveDependencies/resolveNpmDependencies.ts +++ b/src/packages/generate-license-file/src/lib/internal/resolveDependencies/resolveNpmDependencies.ts @@ -1,9 +1,9 @@ import Arborist, { Link, Node } from "@npmcli/arborist"; -import { resolveLicenseContent } from "../resolveLicenseContent"; import { dirname, isAbsolute, join } from "path"; -import { Dependency, LicenseContent } from "../resolveLicenses"; -import { readPackageJson } from "../../utils/packageJson.utils"; import logger from "../../utils/console.utils"; +import { readPackageJson } from "../../utils/packageJson.utils"; +import { resolveLicenseContent } from "../resolveLicenseContent"; +import { Dependency, LicenseContent } from "../resolveLicenses"; type ResolveLicensesOptions = { replace?: Record; diff --git a/src/packages/generate-license-file/src/lib/internal/resolveDependencies/resolvePnpmDependencies.ts b/src/packages/generate-license-file/src/lib/internal/resolveDependencies/resolvePnpmDependencies.ts index eb3f69c6..095c8c26 100644 --- a/src/packages/generate-license-file/src/lib/internal/resolveDependencies/resolvePnpmDependencies.ts +++ b/src/packages/generate-license-file/src/lib/internal/resolveDependencies/resolvePnpmDependencies.ts @@ -1,9 +1,9 @@ -import { resolveLicenseContent } from "../resolveLicenseContent"; -import { dirname, join } from "path"; +import { dirname, join } from "path"; +import logger from "../../utils/console.utils"; +import { readPackageJson } from "../../utils/packageJson.utils"; import { getPnpmProjectDependencies, getPnpmVersion } from "../../utils/pnpmCli.utils"; +import { resolveLicenseContent } from "../resolveLicenseContent"; import { Dependency, LicenseContent } from "../resolveLicenses"; -import { readPackageJson } from "../../utils/packageJson.utils"; -import logger from "../../utils/console.utils"; type ResolveLicensesOptions = { replace?: Record; diff --git a/src/packages/generate-license-file/src/lib/internal/resolveLicenseContent/index.ts b/src/packages/generate-license-file/src/lib/internal/resolveLicenseContent/index.ts index 30592864..2530a14f 100644 --- a/src/packages/generate-license-file/src/lib/internal/resolveLicenseContent/index.ts +++ b/src/packages/generate-license-file/src/lib/internal/resolveLicenseContent/index.ts @@ -1,9 +1,9 @@ import { PackageJson } from "../../utils/packageJson.utils"; -import { packageJsonLicense } from "./packageJsonLicense"; import { licenseFile } from "./licenseFile"; -import { spdxExpression } from "./spdxExpression"; +import { packageJsonLicense } from "./packageJsonLicense"; import { replacementFile } from "./replacementFile"; import { replacementHttp } from "./replacementHttp"; +import { spdxExpression } from "./spdxExpression"; export interface ResolutionInputs { directory: string; diff --git a/src/packages/generate-license-file/src/lib/internal/resolveLicenseContent/licenseFile.ts b/src/packages/generate-license-file/src/lib/internal/resolveLicenseContent/licenseFile.ts index 55b3a73f..5c9f5477 100644 --- a/src/packages/generate-license-file/src/lib/internal/resolveLicenseContent/licenseFile.ts +++ b/src/packages/generate-license-file/src/lib/internal/resolveLicenseContent/licenseFile.ts @@ -1,9 +1,8 @@ import { glob } from "glob"; -import { relative } from "path"; -import { Resolution } from "./index"; +import { extname, relative } from "path"; import logger from "../../utils/console.utils"; import { readFile } from "../../utils/file.utils"; -import { extname } from "path"; +import { Resolution } from "./index"; // This file specifically handles cases where we're able to find // a license file on disk that is a part of the package but it's diff --git a/src/packages/generate-license-file/src/lib/internal/resolveLicenseContent/packageJsonLicense.ts b/src/packages/generate-license-file/src/lib/internal/resolveLicenseContent/packageJsonLicense.ts index f9ee335c..068eb678 100644 --- a/src/packages/generate-license-file/src/lib/internal/resolveLicenseContent/packageJsonLicense.ts +++ b/src/packages/generate-license-file/src/lib/internal/resolveLicenseContent/packageJsonLicense.ts @@ -1,8 +1,8 @@ -import { doesFileExist, readFile } from "../../utils/file.utils"; -import logger from "../../utils/console.utils"; import { join } from "path"; -import { Resolution } from "./index"; +import logger from "../../utils/console.utils"; +import { doesFileExist, readFile } from "../../utils/file.utils"; import { PackageJson, PackageJsonLicense } from "../../utils/packageJson.utils"; +import { Resolution } from "./index"; // This file specifically handles cases where the package.json links // to a license file that is on disk and is a part of the package. diff --git a/src/packages/generate-license-file/src/lib/internal/resolveLicenseContent/replacementFile.ts b/src/packages/generate-license-file/src/lib/internal/resolveLicenseContent/replacementFile.ts index ef9479f0..fd93958b 100644 --- a/src/packages/generate-license-file/src/lib/internal/resolveLicenseContent/replacementFile.ts +++ b/src/packages/generate-license-file/src/lib/internal/resolveLicenseContent/replacementFile.ts @@ -1,5 +1,5 @@ import { ReplacementResolution } from "."; -import { readFile, doesFileExist } from "../../utils/file.utils"; +import { doesFileExist, readFile } from "../../utils/file.utils"; export const replacementFile: ReplacementResolution = async location => { if (!(await doesFileExist(location))) { diff --git a/src/packages/generate-license-file/src/lib/internal/resolveLicenseContent/spdxExpression.ts b/src/packages/generate-license-file/src/lib/internal/resolveLicenseContent/spdxExpression.ts index a291cd88..f076c29a 100644 --- a/src/packages/generate-license-file/src/lib/internal/resolveLicenseContent/spdxExpression.ts +++ b/src/packages/generate-license-file/src/lib/internal/resolveLicenseContent/spdxExpression.ts @@ -1,6 +1,6 @@ -import { Resolution } from "./index"; import logger from "../../utils/console.utils"; import { PackageJson, PackageJsonLicense } from "../../utils/packageJson.utils"; +import { Resolution } from "./index"; // This file specifically handles cases where the package.json contains an SPDX license expression. diff --git a/src/packages/generate-license-file/src/lib/utils/exec.utils.ts b/src/packages/generate-license-file/src/lib/utils/exec.utils.ts index 0e7aaa2f..03f82ea4 100644 --- a/src/packages/generate-license-file/src/lib/utils/exec.utils.ts +++ b/src/packages/generate-license-file/src/lib/utils/exec.utils.ts @@ -1,6 +1,6 @@ // istanbul ignore file -import { promisify } from "util"; import { exec } from "child_process"; +import { promisify } from "util"; export const execAsync = promisify(exec); diff --git a/src/packages/generate-license-file/src/lib/utils/pnpmCli.utils.ts b/src/packages/generate-license-file/src/lib/utils/pnpmCli.utils.ts index e1c678c0..ea8c8748 100644 --- a/src/packages/generate-license-file/src/lib/utils/pnpmCli.utils.ts +++ b/src/packages/generate-license-file/src/lib/utils/pnpmCli.utils.ts @@ -1,6 +1,6 @@ import { z } from "zod"; -import { execAsync } from "./exec.utils"; import consoleUtils from "./console.utils"; +import { execAsync } from "./exec.utils"; export type PnpmVersion = { major: number; diff --git a/src/packages/generate-license-file/test/cli/args/eol.spec.ts b/src/packages/generate-license-file/test/cli/args/eol.spec.ts index 745ed48c..e672361e 100644 --- a/src/packages/generate-license-file/test/cli/args/eol.spec.ts +++ b/src/packages/generate-license-file/test/cli/args/eol.spec.ts @@ -1,7 +1,7 @@ import { prompt } from "enquirer"; import { Eol } from "../../../src/lib/cli/args/eol"; -import { lineEndings } from "../../../src/lib/lineEndings"; import { CombinedConfig } from "../../../src/lib/cli/commands/main"; +import { lineEndings } from "../../../src/lib/lineEndings"; jest.mock("enquirer", () => ({ prompt: jest.fn(), diff --git a/src/packages/generate-license-file/test/cli/args/inputs.spec.ts b/src/packages/generate-license-file/test/cli/args/inputs.spec.ts index c0f078d1..fee8d673 100644 --- a/src/packages/generate-license-file/test/cli/args/inputs.spec.ts +++ b/src/packages/generate-license-file/test/cli/args/inputs.spec.ts @@ -1,8 +1,8 @@ import { prompt } from "enquirer"; import { Inputs } from "../../../src/lib/cli/args/inputs"; +import { CombinedConfig } from "../../../src/lib/cli/commands/main"; import { spinner } from "../../../src/lib/cli/spinner"; import { doesFileExist } from "../../../src/lib/utils/file.utils"; -import { CombinedConfig } from "../../../src/lib/cli/commands/main"; jest.mock("../../../src/lib/utils/file.utils", () => ({ doesFileExist: jest.fn(), diff --git a/src/packages/generate-license-file/test/cli/args/output.spec.ts b/src/packages/generate-license-file/test/cli/args/output.spec.ts index 88cce479..b1126715 100644 --- a/src/packages/generate-license-file/test/cli/args/output.spec.ts +++ b/src/packages/generate-license-file/test/cli/args/output.spec.ts @@ -1,7 +1,7 @@ import { prompt } from "enquirer"; import { Output } from "../../../src/lib/cli/args/output"; -import { doesFileExist } from "../../../src/lib/utils/file.utils"; import { CombinedConfig } from "../../../src/lib/cli/commands/main"; +import { doesFileExist } from "../../../src/lib/utils/file.utils"; jest.mock("../../../src/lib/utils/file.utils", () => ({ doesFileExist: jest.fn(), diff --git a/src/packages/generate-license-file/test/getLicenseFileText.spec.ts b/src/packages/generate-license-file/test/getLicenseFileText.spec.ts index 5888c06d..c190042a 100644 --- a/src/packages/generate-license-file/test/getLicenseFileText.spec.ts +++ b/src/packages/generate-license-file/test/getLicenseFileText.spec.ts @@ -1,7 +1,7 @@ -import { GetLicenseFileTextOptions, getLicenseFileText } from "../src/lib/getLicenseFileText"; +import { when } from "jest-when"; +import { getLicenseFileText, GetLicenseFileTextOptions } from "../src/lib/getLicenseFileText"; import { ResolvedLicense, resolveLicenses } from "../src/lib/internal/resolveLicenses"; import { readFile } from "../src/lib/utils/file.utils"; -import { when } from "jest-when"; jest.mock("../src/lib/internal/resolveLicenses", () => ({ resolveLicenses: jest.fn(), diff --git a/src/packages/generate-license-file/test/getProjectLicenses.spec.ts b/src/packages/generate-license-file/test/getProjectLicenses.spec.ts index b860634f..4961037d 100644 --- a/src/packages/generate-license-file/test/getProjectLicenses.spec.ts +++ b/src/packages/generate-license-file/test/getProjectLicenses.spec.ts @@ -1,4 +1,4 @@ -import { GetProjectLicensesOptions, getProjectLicenses } from "../src/lib/getProjectLicenses"; +import { getProjectLicenses, GetProjectLicensesOptions } from "../src/lib/getProjectLicenses"; import { ResolvedLicense, resolveLicenses } from "../src/lib/internal/resolveLicenses"; jest.mock("../src/lib/internal/resolveLicenses", () => ({ diff --git a/src/packages/generate-license-file/test/internal/resolveDependencies/index.spec.ts b/src/packages/generate-license-file/test/internal/resolveDependencies/index.spec.ts index 65619d4d..53315249 100644 --- a/src/packages/generate-license-file/test/internal/resolveDependencies/index.spec.ts +++ b/src/packages/generate-license-file/test/internal/resolveDependencies/index.spec.ts @@ -1,9 +1,9 @@ -import { doesFileExist } from "../../../src/lib/utils/file.utils"; +import { when } from "jest-when"; +import { join } from "path"; +import { resolveDependencies } from "../../../src/lib/internal/resolveDependencies"; import { resolveDependenciesForNpmProject } from "../../../src/lib/internal/resolveDependencies/resolveNpmDependencies"; import { resolveDependenciesForPnpmProject } from "../../../src/lib/internal/resolveDependencies/resolvePnpmDependencies"; -import { when } from "jest-when"; -import { resolveDependencies } from "../../../src/lib/internal/resolveDependencies"; -import { join } from "path"; +import { doesFileExist } from "../../../src/lib/utils/file.utils"; jest.mock("../../../src/lib/utils/file.utils", () => ({ doesFileExist: jest.fn(), diff --git a/src/packages/generate-license-file/test/internal/resolveDependencies/resolveNpmDependencies.spec.ts b/src/packages/generate-license-file/test/internal/resolveDependencies/resolveNpmDependencies.spec.ts index 4a1870f9..be1f281b 100644 --- a/src/packages/generate-license-file/test/internal/resolveDependencies/resolveNpmDependencies.spec.ts +++ b/src/packages/generate-license-file/test/internal/resolveDependencies/resolveNpmDependencies.spec.ts @@ -1,12 +1,12 @@ import Arborist from "@npmcli/arborist"; +import { when } from "jest-when"; +import { join } from "path"; import { resolveDependenciesForNpmProject } from "../../../src/lib/internal/resolveDependencies/resolveNpmDependencies"; import { resolveLicenseContent } from "../../../src/lib/internal/resolveLicenseContent"; -import { when } from "jest-when"; import { Dependency, LicenseContent } from "../../../src/lib/internal/resolveLicenses"; -import { PackageJson } from "../../../src/lib/utils/packageJson.utils"; -import { join } from "path"; -import { doesFileExist, readFile } from "../../../src/lib/utils/file.utils"; import logger from "../../../src/lib/utils/console.utils"; +import { doesFileExist, readFile } from "../../../src/lib/utils/file.utils"; +import { PackageJson } from "../../../src/lib/utils/packageJson.utils"; jest.mock("@npmcli/arborist", () => ({ __esModule: true, diff --git a/src/packages/generate-license-file/test/internal/resolveDependencies/resolvePnpmDependencies.spec.ts b/src/packages/generate-license-file/test/internal/resolveDependencies/resolvePnpmDependencies.spec.ts index 37bdf870..c1d0cee1 100644 --- a/src/packages/generate-license-file/test/internal/resolveDependencies/resolvePnpmDependencies.spec.ts +++ b/src/packages/generate-license-file/test/internal/resolveDependencies/resolvePnpmDependencies.spec.ts @@ -1,16 +1,16 @@ -import { - getPnpmVersion, - getPnpmProjectDependencies, - PnpmDependency, -} from "../../../src/lib/utils/pnpmCli.utils"; +import { when } from "jest-when"; +import { join } from "path"; import { resolveDependenciesForPnpmProject } from "../../../src/lib/internal/resolveDependencies/resolvePnpmDependencies"; import { resolveLicenseContent } from "../../../src/lib/internal/resolveLicenseContent"; -import { when } from "jest-when"; +import { Dependency, LicenseContent } from "../../../src/lib/internal/resolveLicenses"; +import logger from "../../../src/lib/utils/console.utils"; import { doesFileExist, readFile } from "../../../src/lib/utils/file.utils"; import { PackageJson } from "../../../src/lib/utils/packageJson.utils"; -import logger from "../../../src/lib/utils/console.utils"; -import { join } from "path"; -import { Dependency, LicenseContent } from "../../../src/lib/internal/resolveLicenses"; +import { + getPnpmProjectDependencies, + getPnpmVersion, + PnpmDependency, +} from "../../../src/lib/utils/pnpmCli.utils"; jest.mock("../../../src/lib/utils/pnpmCli.utils", () => ({ getPnpmVersion: jest.fn(), diff --git a/src/packages/generate-license-file/test/internal/resolveLicenseContent/index.spec.ts b/src/packages/generate-license-file/test/internal/resolveLicenseContent/index.spec.ts index 186562c7..fdf9c800 100644 --- a/src/packages/generate-license-file/test/internal/resolveLicenseContent/index.spec.ts +++ b/src/packages/generate-license-file/test/internal/resolveLicenseContent/index.spec.ts @@ -1,9 +1,9 @@ import { when } from "jest-when"; import { resolveLicenseContent } from "../../../src/lib/internal/resolveLicenseContent"; +import { licenseFile } from "../../../src/lib/internal/resolveLicenseContent/licenseFile"; +import { packageJsonLicense } from "../../../src/lib/internal/resolveLicenseContent/packageJsonLicense"; import { replacementFile } from "../../../src/lib/internal/resolveLicenseContent/replacementFile"; import { replacementHttp } from "../../../src/lib/internal/resolveLicenseContent/replacementHttp"; -import { packageJsonLicense } from "../../../src/lib/internal/resolveLicenseContent/packageJsonLicense"; -import { licenseFile } from "../../../src/lib/internal/resolveLicenseContent/licenseFile"; import { spdxExpression } from "../../../src/lib/internal/resolveLicenseContent/spdxExpression"; import { PackageJson } from "../../../src/lib/utils/packageJson.utils"; diff --git a/src/packages/generate-license-file/test/internal/resolveLicenseContent/licenseFile.spec.ts b/src/packages/generate-license-file/test/internal/resolveLicenseContent/licenseFile.spec.ts index 921d3fc2..ced5e7c9 100644 --- a/src/packages/generate-license-file/test/internal/resolveLicenseContent/licenseFile.spec.ts +++ b/src/packages/generate-license-file/test/internal/resolveLicenseContent/licenseFile.spec.ts @@ -1,11 +1,11 @@ import { glob } from "glob"; +import { when } from "jest-when"; +import { ResolutionInputs } from "../../../src/lib/internal/resolveLicenseContent"; import { extensionDenyList, licenseFile, } from "../../../src/lib/internal/resolveLicenseContent/licenseFile"; -import { when } from "jest-when"; import { readFile } from "../../../src/lib/utils/file.utils"; -import { ResolutionInputs } from "../../../src/lib/internal/resolveLicenseContent"; jest.mock("glob", () => ({ glob: jest.fn(), diff --git a/src/packages/generate-license-file/test/internal/resolveLicenseContent/packageJsonLicense.spec.ts b/src/packages/generate-license-file/test/internal/resolveLicenseContent/packageJsonLicense.spec.ts index 31d3058e..8f4cf811 100644 --- a/src/packages/generate-license-file/test/internal/resolveLicenseContent/packageJsonLicense.spec.ts +++ b/src/packages/generate-license-file/test/internal/resolveLicenseContent/packageJsonLicense.spec.ts @@ -1,9 +1,9 @@ +import { when } from "jest-when"; import { join } from "path"; -import { packageJsonLicense } from "../../../src/lib/internal/resolveLicenseContent/packageJsonLicense"; import { ResolutionInputs } from "../../../src/lib/internal/resolveLicenseContent"; -import { doesFileExist, readFile } from "../../../src/lib/utils/file.utils"; +import { packageJsonLicense } from "../../../src/lib/internal/resolveLicenseContent/packageJsonLicense"; import logger from "../../../src/lib/utils/console.utils"; -import { when } from "jest-when"; +import { doesFileExist, readFile } from "../../../src/lib/utils/file.utils"; jest.mock("../../../src/lib/utils/file.utils"); jest.mock("../../../src/lib/utils/console.utils"); diff --git a/src/packages/generate-license-file/test/internal/resolveLicenseContent/replacementFile.spec.ts b/src/packages/generate-license-file/test/internal/resolveLicenseContent/replacementFile.spec.ts index 241d2797..67232980 100644 --- a/src/packages/generate-license-file/test/internal/resolveLicenseContent/replacementFile.spec.ts +++ b/src/packages/generate-license-file/test/internal/resolveLicenseContent/replacementFile.spec.ts @@ -1,5 +1,5 @@ import { replacementFile } from "../../../src/lib/internal/resolveLicenseContent/replacementFile"; -import { readFile, doesFileExist } from "../../../src/lib/utils/file.utils"; +import { doesFileExist, readFile } from "../../../src/lib/utils/file.utils"; jest.mock("../../../src/lib/utils/file.utils"); diff --git a/src/packages/generate-license-file/test/internal/resolveLicenseContent/spdxExpression.spec.ts b/src/packages/generate-license-file/test/internal/resolveLicenseContent/spdxExpression.spec.ts index bb80ba4f..e54da96e 100644 --- a/src/packages/generate-license-file/test/internal/resolveLicenseContent/spdxExpression.spec.ts +++ b/src/packages/generate-license-file/test/internal/resolveLicenseContent/spdxExpression.spec.ts @@ -1,5 +1,5 @@ -import { spdxExpression } from "../../../src/lib/internal/resolveLicenseContent/spdxExpression"; import { ResolutionInputs } from "../../../src/lib/internal/resolveLicenseContent"; +import { spdxExpression } from "../../../src/lib/internal/resolveLicenseContent/spdxExpression"; import logger from "../../../src/lib/utils/console.utils"; jest.mock("../../../src/lib/utils/console.utils"); diff --git a/src/packages/generate-license-file/test/utils/console.utils.spec.ts b/src/packages/generate-license-file/test/utils/console.utils.spec.ts index 76b84d6f..f4389c39 100644 --- a/src/packages/generate-license-file/test/utils/console.utils.spec.ts +++ b/src/packages/generate-license-file/test/utils/console.utils.spec.ts @@ -1,5 +1,5 @@ -import consoleUtils from "../../src/lib/utils/console.utils"; import { spinner } from "../../src/lib/cli/spinner"; +import consoleUtils from "../../src/lib/utils/console.utils"; jest.mock("../../src/lib/cli/spinner", () => ({ spinner: { diff --git a/src/packages/generate-license-file/test/utils/pnpmCli.utils.spec.ts b/src/packages/generate-license-file/test/utils/pnpmCli.utils.spec.ts index d4a28046..b2da3971 100644 --- a/src/packages/generate-license-file/test/utils/pnpmCli.utils.spec.ts +++ b/src/packages/generate-license-file/test/utils/pnpmCli.utils.spec.ts @@ -1,5 +1,5 @@ -import { getPnpmProjectDependencies, getPnpmVersion } from "../../src/lib/utils/pnpmCli.utils"; -import { execAsync } from "../../src/lib/utils/exec.utils"; +import { execAsync } from "../../src/lib/utils/exec.utils"; +import { getPnpmProjectDependencies, getPnpmVersion } from "../../src/lib/utils/pnpmCli.utils"; jest.mock("../../src/lib/utils/exec.utils", () => ({ execAsync: jest.fn(), diff --git a/src/packages/webpack-plugin/src/index.ts b/src/packages/webpack-plugin/src/index.ts index 206ec74d..9123e82f 100644 --- a/src/packages/webpack-plugin/src/index.ts +++ b/src/packages/webpack-plugin/src/index.ts @@ -1,3 +1,3 @@ -export { LicenseFilePlugin } from "./lib/licenseFilePlugin"; -export { defaultOptions } from "./lib/defaultOptions"; export { LineEnding } from "generate-license-file"; +export { defaultOptions } from "./lib/defaultOptions"; +export { LicenseFilePlugin } from "./lib/licenseFilePlugin"; diff --git a/src/packages/webpack-plugin/src/lib/asyncProcessAssetTapFactory.ts b/src/packages/webpack-plugin/src/lib/asyncProcessAssetTapFactory.ts index ebff544f..3485f41f 100644 --- a/src/packages/webpack-plugin/src/lib/asyncProcessAssetTapFactory.ts +++ b/src/packages/webpack-plugin/src/lib/asyncProcessAssetTapFactory.ts @@ -1,8 +1,8 @@ import { getLicenseFileText, GetLicenseFileTextOptions } from "generate-license-file"; import { join } from "path/posix"; import { Compilation, Compiler, WebpackError } from "webpack"; -import { LicenseFilePlugin } from "./licenseFilePlugin"; import { devImplementation } from "./devImplementation"; +import { LicenseFilePlugin } from "./licenseFilePlugin"; import { Options } from "./options"; export type AssetProcessingAsyncTap = (_: unknown, resolve: (error?: WebpackError) => void) => void; diff --git a/src/packages/webpack-plugin/src/lib/compilationTapFactory.ts b/src/packages/webpack-plugin/src/lib/compilationTapFactory.ts index 819348d7..ff1492bd 100644 --- a/src/packages/webpack-plugin/src/lib/compilationTapFactory.ts +++ b/src/packages/webpack-plugin/src/lib/compilationTapFactory.ts @@ -1,6 +1,6 @@ import { Compilation, Compiler } from "webpack"; -import { LicenseFilePlugin } from "./licenseFilePlugin"; import { asyncProcessAssetTapFactory } from "./asyncProcessAssetTapFactory"; +import { LicenseFilePlugin } from "./licenseFilePlugin"; import { Options } from "./options"; export type CompilationTap = (compilation: Compilation) => void; diff --git a/src/tools/scripts/version.mjs b/src/tools/scripts/version.mjs index e1787152..dda1d94d 100644 --- a/src/tools/scripts/version.mjs +++ b/src/tools/scripts/version.mjs @@ -1,7 +1,7 @@ import devkit from "@nx/devkit"; import chalk from "chalk"; -import { join } from "path"; import fs from "fs/promises"; +import { join } from "path"; const { createProjectGraphAsync, readCachedProjectGraph } = devkit; diff --git a/website/.prettierrc.js b/website/.prettierrc.js index 186a753c..974ff637 100644 --- a/website/.prettierrc.js +++ b/website/.prettierrc.js @@ -17,4 +17,5 @@ module.exports = { arrowParens: "avoid", singleQuote: false, trailingComma: "all", + plugins: ["prettier-plugin-organize-imports"], }; diff --git a/website/package-lock.json b/website/package-lock.json index 57e71636..785755bd 100644 --- a/website/package-lock.json +++ b/website/package-lock.json @@ -31,7 +31,7 @@ "eslint-config-prettier": "^9.0.0", "eslint-plugin-react": "^7.30.1", "prettier": "^3.0.0", - "prettier-plugin-organize-imports": "^3.0.0", + "prettier-plugin-organize-imports": "^3.2.4", "typescript": "^5.3.2" } }, @@ -12929,13 +12929,23 @@ } }, "node_modules/prettier-plugin-organize-imports": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/prettier-plugin-organize-imports/-/prettier-plugin-organize-imports-3.0.0.tgz", - "integrity": "sha512-juSCJs5TMOqGGPaN/A/1xzWFzRPH2LG1LPLCr64dzKaVnPafJdtgDNmDVlU+8A4LbQzVJg0DTvgA8swBuIUhlg==", + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/prettier-plugin-organize-imports/-/prettier-plugin-organize-imports-3.2.4.tgz", + "integrity": "sha512-6m8WBhIp0dfwu0SkgfOxJqh+HpdyfqSSLfKKRZSFbDuEQXDDndb8fTpRWkUrX/uBenkex3MgnVk0J3b3Y5byog==", "dev": true, "peerDependencies": { + "@volar/vue-language-plugin-pug": "^1.0.4", + "@volar/vue-typescript": "^1.0.4", "prettier": ">=2.0", "typescript": ">=2.9" + }, + "peerDependenciesMeta": { + "@volar/vue-language-plugin-pug": { + "optional": true + }, + "@volar/vue-typescript": { + "optional": true + } } }, "node_modules/pretty-error": { diff --git a/website/package.json b/website/package.json index beca5087..6763abe5 100644 --- a/website/package.json +++ b/website/package.json @@ -40,7 +40,7 @@ "eslint-config-prettier": "^9.0.0", "eslint-plugin-react": "^7.30.1", "prettier": "^3.0.0", - "prettier-plugin-organize-imports": "^3.0.0", + "prettier-plugin-organize-imports": "^3.2.4", "typescript": "^5.3.2" }, "browserslist": {