Skip to content

Commit 61a61ab

Browse files
authored
Merge pull request #444 from TobyAndToby/tb/prettier-sort-imports
Sort prettier imports
2 parents 9e3b3e5 + 473471e commit 61a61ab

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+110
-90
lines changed

src/.prettierignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,6 @@
66
/tmp
77

88
/.nx/cache
9-
/.nx/workspace-data
9+
/.nx/workspace-data
10+
11+
pnpm-lock.yaml

src/.prettierrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,5 @@ module.exports = {
1717
arrowParens: "avoid",
1818
singleQuote: false,
1919
trailingComma: "all",
20+
plugins: ["prettier-plugin-organize-imports"],
2021
};

src/package-lock.json

Lines changed: 14 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"jest-when": "^3.5.2",
4949
"nx": "19.3.1",
5050
"prettier": "^3.0.0",
51-
"prettier-plugin-organize-imports": "^3.0.0",
51+
"prettier-plugin-organize-imports": "^3.2.4",
5252
"ts-jest": "29.1.5",
5353
"ts-node": "10.9.2",
5454
"typescript": "~4.9.0"
Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
/* istanbul ignore file */
22
export { generateLicenseFile } from "./lib/generateLicenseFile";
33
export type { GenerateLicenseFileOptions } from "./lib/generateLicenseFile";
4-
54
export { getLicenseFileText } from "./lib/getLicenseFileText";
65
export type { GetLicenseFileTextOptions } from "./lib/getLicenseFileText";
7-
86
export { getProjectLicenses } from "./lib/getProjectLicenses";
97
export type { GetProjectLicensesOptions } from "./lib/getProjectLicenses";
10-
118
export type { LineEnding } from "./lib/lineEndings";
129
export type { ILicense } from "./lib/models/license";

src/packages/generate-license-file/src/lib/cli/args/eol.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { isLineEnding, LineEnding } from "../../lineEndings";
2-
import { Argument, MultipleChoiceOptions } from "./argument";
32
import { CombinedConfig } from "../commands/main";
3+
import { Argument, MultipleChoiceOptions } from "./argument";
44

55
export class Eol extends Argument<LineEnding | undefined> {
66
private readonly choices: MultipleChoiceOptions<LineEnding | undefined> = {

src/packages/generate-license-file/src/lib/cli/args/inputs.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { doesFileExist } from "../../utils/file.utils";
2-
import { Argument } from "./argument";
32
import { CombinedConfig } from "../commands/main";
43
import { spinner } from "../spinner";
4+
import { Argument } from "./argument";
55

66
export class Inputs extends Argument<string[]> {
77
private question = "Package.json location: ";

src/packages/generate-license-file/src/lib/cli/args/output.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { doesFileExist } from "../../utils/file.utils";
2-
import { Argument } from "./argument";
32
import { CombinedConfig } from "../commands/main";
3+
import { Argument } from "./argument";
44

55
export class Output extends Argument<string> {
66
private question = "Output location: ";

src/packages/generate-license-file/src/lib/cli/commands/main.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import { Command } from "@commander-js/extra-typings";
2-
import { loadConfigFile } from "../config";
3-
import { Inputs } from "../args/inputs";
4-
import { Output } from "../args/output";
5-
import { Eol } from "../args/eol";
6-
import { LineEnding } from "../../lineEndings";
7-
import { generateLicenseFile } from "../../generateLicenseFile";
8-
import { spinner } from "../spinner";
92
import { join } from "path";
3+
import { generateLicenseFile } from "../../generateLicenseFile";
4+
import { LineEnding } from "../../lineEndings";
105
import logger from "../../utils/console.utils";
116
import { readPackageJson } from "../../utils/packageJson.utils";
7+
import { Eol } from "../args/eol";
8+
import { Inputs } from "../args/inputs";
9+
import { Output } from "../args/output";
10+
import { loadConfigFile } from "../config";
11+
import { spinner } from "../spinner";
1212

1313
export type CombinedConfig = {
1414
inputs?: string[];

src/packages/generate-license-file/src/lib/cli/config/configFile.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Options as CosmiconfigOptions, cosmiconfig } from "cosmiconfig";
1+
import { cosmiconfig, Options as CosmiconfigOptions } from "cosmiconfig";
22
import { json5Parse } from "./parsers/json5";
33

44
export type ConfigFile = { path: string; config: unknown };

0 commit comments

Comments
 (0)