Skip to content

Commit

Permalink
Run skuba format
Browse files Browse the repository at this point in the history
  • Loading branch information
seek-oss-ci committed Aug 11, 2023
1 parent d9d78a8 commit facaea4
Show file tree
Hide file tree
Showing 15 changed files with 30 additions and 38 deletions.
6 changes: 2 additions & 4 deletions src/api/git/commitAllChanges.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
import fs from 'fs-extra';
import git from 'isomorphic-git';

import { commit } from './commit';
import type { Identity } from './commit';
import type { ChangedFile } from './getChangedFiles';
import { getChangedFiles } from './getChangedFiles';
import { type Identity, commit } from './commit';
import { type ChangedFile, getChangedFiles } from './getChangedFiles';

interface CommitAllParameters {
dir: string;
Expand Down
3 changes: 1 addition & 2 deletions src/api/github/checkRun.test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { Octokit } from '@octokit/rest';
import type { Endpoints } from '@octokit/types';
import type { ReadCommitResult } from 'isomorphic-git';
import git from 'isomorphic-git';
import git, type { ReadCommitResult } from 'isomorphic-git';

import type * as GitHub from '../github';

Expand Down
3 changes: 1 addition & 2 deletions src/api/github/push.test.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { graphql } from '@octokit/graphql';
import type { FileChanges } from '@octokit/graphql-schema';
import fs from 'fs-extra';
import type { ReadCommitResult } from 'isomorphic-git';
import git from 'isomorphic-git';
import git, type { ReadCommitResult } from 'isomorphic-git';

import { apiTokenFromEnvironment } from './environment';
import {
Expand Down
3 changes: 1 addition & 2 deletions src/api/net/waitFor.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { resolveComposeAddress } from './compose';
import type { SocketAddress } from './socket';
import { pollSocket } from './socket';
import { type SocketAddress, pollSocket } from './socket';

/**
* Wait for a resource to start listening on a socket address.
Expand Down
6 changes: 2 additions & 4 deletions src/cli/adapter/eslint.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
import path from 'path';

import chalk from 'chalk';
import type { Linter } from 'eslint';
import { ESLint } from 'eslint';
import { ESLint, type Linter } from 'eslint';

import type { Logger } from '../../utils/logging';
import { pluralise } from '../../utils/logging';
import { type Logger, pluralise } from '../../utils/logging';

const symbolForResult = (result: ESLint.LintResult) => {
if (result.errorCount) {
Expand Down
13 changes: 9 additions & 4 deletions src/cli/adapter/prettier.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
import path from 'path';

import fs from 'fs-extra';
import type { Options, SupportLanguage } from 'prettier';
import { check, format, getSupportInfo, resolveConfig } from 'prettier';
import {
type Options,
type SupportLanguage,
check,
format,
getSupportInfo,
resolveConfig,
} from 'prettier';

import { crawlDirectory } from '../../utils/dir';
import type { Logger } from '../../utils/logging';
import { pluralise } from '../../utils/logging';
import { type Logger, pluralise } from '../../utils/logging';
import { getConsumerManifest } from '../../utils/manifest';
import { formatPackage, parsePackage } from '../configure/processing/package';

Expand Down
3 changes: 1 addition & 2 deletions src/cli/build/assets.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import path from 'path';

import type { Color } from 'chalk';
import chalk from 'chalk';
import chalk, type { Color } from 'chalk';
import fs from 'fs-extra';

import { copyFile } from '../../utils/copy';
Expand Down
3 changes: 1 addition & 2 deletions src/cli/configure/analyseDependencies.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ import path from 'path';
import fs from 'fs-extra';
import type { NormalizedReadResult } from 'read-pkg-up';

import type { TextProcessor } from '../../utils/copy';
import { copyFiles } from '../../utils/copy';
import { type TextProcessor, copyFiles } from '../../utils/copy';
import { log } from '../../utils/logging';
import type { ProjectType } from '../../utils/manifest';
import { getSkubaVersion, latestNpmVersion } from '../../utils/version';
Expand Down
6 changes: 4 additions & 2 deletions src/cli/configure/ensureTemplateCompletion.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@ import type { NormalizedReadResult } from 'read-pkg-up';

import { copyFiles, createEjsRenderer } from '../../utils/copy';
import { log } from '../../utils/logging';
import type { TemplateConfig } from '../../utils/template';
import { ensureTemplateConfigDeletion } from '../../utils/template';
import {
type TemplateConfig,
ensureTemplateConfigDeletion,
} from '../../utils/template';
import { hasStringProp } from '../../utils/validation';
import { getTemplateConfig, runForm } from '../init/getConfig';

Expand Down
8 changes: 3 additions & 5 deletions src/cli/init/getConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,16 @@ import {
} from '../../utils/template';

import { downloadGitHubTemplate } from './git';
import type { BaseFields } from './prompts';
import {
BASE_PROMPT_PROPS,
type BaseFields,
GIT_PATH_PROMPT,
SHOULD_CONTINUE_PROMPT,
TEMPLATE_PROMPT,
} from './prompts';
import type { InitConfig } from './types';
import { InitConfigInput } from './types';
import { type InitConfig, InitConfigInput } from './types';

import { Form } from 'enquirer';
import type { FormChoice } from 'enquirer';
import { Form, type FormChoice } from 'enquirer';

export const runForm = <T = Record<string, string>>(props: {
choices: Readonly<FormChoice[]>;
Expand Down
2 changes: 1 addition & 1 deletion src/cli/init/prompts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import { pathExists } from 'fs-extra';

import { TEMPLATE_NAMES_WITH_BYO } from '../../utils/template';

import type { Platform } from './validation';
import {
PLATFORM_OPTIONS,
type Platform,
isGitHubOrg,
isGitHubRepo,
isGitHubTeam,
Expand Down
3 changes: 1 addition & 2 deletions src/cli/lint/eslint.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ import chalk from 'chalk';

import { createLogger } from '../../utils/logging';
import { execWorkerThread, postWorkerOutput } from '../../utils/worker';
import type { ESLintOutput } from '../adapter/eslint';
import { runESLint } from '../adapter/eslint';
import { type ESLintOutput, runESLint } from '../adapter/eslint';

import type { Input } from './types';

Expand Down
3 changes: 1 addition & 2 deletions src/cli/lint/prettier.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ import chalk from 'chalk';

import { createLogger } from '../../utils/logging';
import { execWorkerThread, postWorkerOutput } from '../../utils/worker';
import type { PrettierOutput } from '../adapter/prettier';
import { runPrettier } from '../adapter/prettier';
import { type PrettierOutput, runPrettier } from '../adapter/prettier';

import type { Input } from './types';

Expand Down
3 changes: 1 addition & 2 deletions src/utils/exec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ import util from 'util';

import type { Color } from 'chalk';
import concurrently from 'concurrently';
import type { ExecaChildProcess } from 'execa';
import execa from 'execa';
import execa, type { ExecaChildProcess } from 'execa';
import npmRunPath from 'npm-run-path';
import npmWhich from 'npm-which';

Expand Down
3 changes: 1 addition & 2 deletions src/utils/manifest.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/* eslint-disable new-cap */

import type { NormalizedPackageJson } from 'read-pkg-up';
import readPkgUp from 'read-pkg-up';
import readPkgUp, type { NormalizedPackageJson } from 'read-pkg-up';

Check failure on line 3 in src/utils/manifest.ts

View workflow job for this annotation

GitHub Actions / Integrate (greeter)

'{' expected.

Check failure on line 3 in src/utils/manifest.ts

View workflow job for this annotation

GitHub Actions / Integrate (greeter)

';' expected.

Check failure on line 3 in src/utils/manifest.ts

View workflow job for this annotation

GitHub Actions / Integrate (greeter)

Unexpected keyword or identifier.

Check failure on line 3 in src/utils/manifest.ts

View workflow job for this annotation

GitHub Actions / Lint & Test

'{' expected.

Check failure on line 3 in src/utils/manifest.ts

View workflow job for this annotation

GitHub Actions / Lint & Test

';' expected.

Check failure on line 3 in src/utils/manifest.ts

View workflow job for this annotation

GitHub Actions / Lint & Test

Unexpected keyword or identifier.

Check failure on line 3 in src/utils/manifest.ts

View workflow job for this annotation

GitHub Actions / Integrate (lambda-sqs-worker-cdk)

'{' expected.

Check failure on line 3 in src/utils/manifest.ts

View workflow job for this annotation

GitHub Actions / Integrate (lambda-sqs-worker-cdk)

';' expected.

Check failure on line 3 in src/utils/manifest.ts

View workflow job for this annotation

GitHub Actions / Integrate (lambda-sqs-worker-cdk)

Unexpected keyword or identifier.

Check failure on line 3 in src/utils/manifest.ts

View workflow job for this annotation

GitHub Actions / Integrate (private-npm-package)

'{' expected.

Check failure on line 3 in src/utils/manifest.ts

View workflow job for this annotation

GitHub Actions / Integrate (private-npm-package)

';' expected.

Check failure on line 3 in src/utils/manifest.ts

View workflow job for this annotation

GitHub Actions / Integrate (private-npm-package)

Unexpected keyword or identifier.

Check failure on line 3 in src/utils/manifest.ts

View workflow job for this annotation

GitHub Actions / Integrate (express-rest-api)

'{' expected.

Check failure on line 3 in src/utils/manifest.ts

View workflow job for this annotation

GitHub Actions / Integrate (express-rest-api)

';' expected.

Check failure on line 3 in src/utils/manifest.ts

View workflow job for this annotation

GitHub Actions / Integrate (express-rest-api)

Unexpected keyword or identifier.

Check failure on line 3 in src/utils/manifest.ts

View workflow job for this annotation

GitHub Actions / Integrate (lambda-sqs-worker)

'{' expected.

Check failure on line 3 in src/utils/manifest.ts

View workflow job for this annotation

GitHub Actions / Integrate (lambda-sqs-worker)

';' expected.

Check failure on line 3 in src/utils/manifest.ts

View workflow job for this annotation

GitHub Actions / Integrate (lambda-sqs-worker)

Unexpected keyword or identifier.

Check failure on line 3 in src/utils/manifest.ts

View workflow job for this annotation

GitHub Actions / Integrate (oss-npm-package)

'{' expected.

Check failure on line 3 in src/utils/manifest.ts

View workflow job for this annotation

GitHub Actions / Integrate (oss-npm-package)

';' expected.

Check failure on line 3 in src/utils/manifest.ts

View workflow job for this annotation

GitHub Actions / Integrate (oss-npm-package)

Unexpected keyword or identifier.

Check failure on line 3 in src/utils/manifest.ts

View workflow job for this annotation

GitHub Actions / Integrate (koa-rest-api)

'{' expected.

Check failure on line 3 in src/utils/manifest.ts

View workflow job for this annotation

GitHub Actions / Integrate (koa-rest-api)

';' expected.

Check failure on line 3 in src/utils/manifest.ts

View workflow job for this annotation

GitHub Actions / Integrate (koa-rest-api)

Unexpected keyword or identifier.

Check failure on line 3 in src/utils/manifest.ts

View workflow job for this annotation

GitHub Actions / Lint & Test

'{' expected.

Check failure on line 3 in src/utils/manifest.ts

View workflow job for this annotation

GitHub Actions / Lint & Test

';' expected.

Check failure on line 3 in src/utils/manifest.ts

View workflow job for this annotation

GitHub Actions / Lint & Test

Unexpected keyword or identifier.

Check failure on line 3 in src/utils/manifest.ts

View workflow job for this annotation

GitHub Actions / Integrate (express-rest-api)

'{' expected.

Check failure on line 3 in src/utils/manifest.ts

View workflow job for this annotation

GitHub Actions / Integrate (express-rest-api)

';' expected.

Check failure on line 3 in src/utils/manifest.ts

View workflow job for this annotation

GitHub Actions / Integrate (express-rest-api)

Unexpected keyword or identifier.

Check failure on line 3 in src/utils/manifest.ts

View workflow job for this annotation

GitHub Actions / Integrate (koa-rest-api)

'{' expected.

Check failure on line 3 in src/utils/manifest.ts

View workflow job for this annotation

GitHub Actions / Integrate (koa-rest-api)

';' expected.

Check failure on line 3 in src/utils/manifest.ts

View workflow job for this annotation

GitHub Actions / Integrate (koa-rest-api)

Unexpected keyword or identifier.

Check failure on line 3 in src/utils/manifest.ts

View workflow job for this annotation

GitHub Actions / Integrate (lambda-sqs-worker-cdk)

'{' expected.

Check failure on line 3 in src/utils/manifest.ts

View workflow job for this annotation

GitHub Actions / Integrate (lambda-sqs-worker-cdk)

';' expected.

Check failure on line 3 in src/utils/manifest.ts

View workflow job for this annotation

GitHub Actions / Integrate (lambda-sqs-worker-cdk)

Unexpected keyword or identifier.

Check failure on line 3 in src/utils/manifest.ts

View workflow job for this annotation

GitHub Actions / Integrate (private-npm-package)

'{' expected.

Check failure on line 3 in src/utils/manifest.ts

View workflow job for this annotation

GitHub Actions / Integrate (private-npm-package)

';' expected.

Check failure on line 3 in src/utils/manifest.ts

View workflow job for this annotation

GitHub Actions / Integrate (private-npm-package)

Unexpected keyword or identifier.

Check failure on line 3 in src/utils/manifest.ts

View workflow job for this annotation

GitHub Actions / Integrate (greeter)

'{' expected.

Check failure on line 3 in src/utils/manifest.ts

View workflow job for this annotation

GitHub Actions / Integrate (greeter)

';' expected.

Check failure on line 3 in src/utils/manifest.ts

View workflow job for this annotation

GitHub Actions / Integrate (greeter)

Unexpected keyword or identifier.

Check failure on line 3 in src/utils/manifest.ts

View workflow job for this annotation

GitHub Actions / Integrate (lambda-sqs-worker)

'{' expected.

Check failure on line 3 in src/utils/manifest.ts

View workflow job for this annotation

GitHub Actions / Integrate (lambda-sqs-worker)

';' expected.

Check failure on line 3 in src/utils/manifest.ts

View workflow job for this annotation

GitHub Actions / Integrate (lambda-sqs-worker)

Unexpected keyword or identifier.
import * as t from 'runtypes';

import { hasProp } from './validation';
Expand Down

0 comments on commit facaea4

Please sign in to comment.