diff --git a/.eslintrc.js b/.eslintrc.js index 60a687baa..52604dc5f 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -8,7 +8,7 @@ module.exports = { }, project: `./tsconfig.json`, }, - plugins: ["@typescript-eslint", "import", "unicorn"], + plugins: ["@typescript-eslint", "import", "unicorn", "simple-import-sort"], extends: ["react-app"], rules: { "react/react-in-jsx-scope": "off", // React is always in scope with Blitz @@ -30,6 +30,26 @@ module.exports = { // note you must disable the base rule as it can report incorrect errors "no-redeclare": "off", "@typescript-eslint/no-redeclare": ["error"], + "simple-import-sort/sort": [ + "warn", + { + groups: [ + [ + // Side effect imports. + "^\\u0000", + // Packages. + // Things that start with a letter (or digit or underscore), or `@` followed by a letter. + "^@?\\w", + // Absolute imports and other imports such as Vue-style `@/foo`. + // Anything that does not start with a dot. + "^[^.]", + // Relative imports. + // Anything that starts with a dot. + "^\\.", + ], + ], + }, + ], }, ignorePatterns: ["packages/cli/", "packages/generator/templates", ".eslintrc.js"], overrides: [ diff --git a/package.json b/package.json index 003c6576c..69f4cf1ea 100644 --- a/package.json +++ b/package.json @@ -103,6 +103,7 @@ "eslint-plugin-prettier": "3.1.4", "eslint-plugin-react": "7.20.6", "eslint-plugin-react-hooks": "4.1.0", + "eslint-plugin-simple-import-sort": "5.0.3", "eslint-plugin-unicorn": "21.0.0", "husky": "4.2.5", "isomorphic-unfetch": "3.0.0", diff --git a/packages/blitz/rollup.config.js b/packages/blitz/rollup.config.js index 480710451..9edf8057c 100644 --- a/packages/blitz/rollup.config.js +++ b/packages/blitz/rollup.config.js @@ -1,9 +1,9 @@ -import pkg from "./package.json" import typescript from "@wessberg/rollup-plugin-ts" import commonjs from "rollup-plugin-commonjs" -import external from "rollup-plugin-peer-deps-external" -import resolve from "rollup-plugin-node-resolve" import json from "rollup-plugin-json" +import resolve from "rollup-plugin-node-resolve" +import external from "rollup-plugin-peer-deps-external" +import pkg from "./package.json" const common = { external: [ diff --git a/packages/blitz/src/bin/cli.ts b/packages/blitz/src/bin/cli.ts index 863c5d8ec..6a2396d51 100755 --- a/packages/blitz/src/bin/cli.ts +++ b/packages/blitz/src/bin/cli.ts @@ -1,7 +1,7 @@ -import * as path from "path" -import resolveFrom from "resolve-from" -import pkgDir from "pkg-dir" import chalk from "chalk" +import * as path from "path" +import pkgDir from "pkg-dir" +import resolveFrom from "resolve-from" import {parseSemver} from "../utils/parse-semver" async function main() { diff --git a/packages/config/src/index.ts b/packages/config/src/index.ts index f82b7d1d8..5b617f738 100644 --- a/packages/config/src/index.ts +++ b/packages/config/src/index.ts @@ -1,7 +1,7 @@ -import pkgDir from "pkg-dir" -import {join} from "path" import {existsSync} from "fs" import {PHASE_DEVELOPMENT_SERVER, PHASE_PRODUCTION_SERVER} from "next/constants" +import {join} from "path" +import pkgDir from "pkg-dir" const configFiles = ["blitz.config.js", "next.config.js"] /** diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts index c6f990a5c..bb9dbd32b 100644 --- a/packages/core/src/index.ts +++ b/packages/core/src/index.ts @@ -1,4 +1,4 @@ -import {NextPage, NextComponentType, NextPageContext} from "next" +import {NextComponentType, NextPage, NextPageContext} from "next" import {AppProps as NextAppProps} from "next/app" export * from "./types" diff --git a/packages/core/src/invoke.test.ts b/packages/core/src/invoke.test.ts index 67a1ca83d..d18ede2d3 100644 --- a/packages/core/src/invoke.test.ts +++ b/packages/core/src/invoke.test.ts @@ -1,8 +1,7 @@ -import http, {IncomingMessage, ServerResponse} from "http" -import listen from "test-listen" -import fetch from "isomorphic-unfetch" import delay from "delay" - +import http, {IncomingMessage, ServerResponse} from "http" +import fetch from "isomorphic-unfetch" +import listen from "test-listen" import {invokeWithMiddleware} from "./invoke" import {EnhancedResolver} from "./types" diff --git a/packages/core/src/invoke.ts b/packages/core/src/invoke.ts index c06f4985e..54331d6f8 100644 --- a/packages/core/src/invoke.ts +++ b/packages/core/src/invoke.ts @@ -1,17 +1,17 @@ -import { - QueryFn, - FirstParam, - PromiseReturnType, - Resolver, - EnhancedResolver, - EnhancedResolverRpcClient, - MiddlewareResponse, - InvokeWithMiddlewareConfig, -} from "./types" -import {isClient} from "./utils" -import {baseLogger, log as displayLog, chalk} from "@blitzjs/display" +import {baseLogger, chalk, log as displayLog} from "@blitzjs/display" import prettyMs from "pretty-ms" import {getAllMiddlewareForModule, handleRequestWithMiddleware} from "./middleware" +import { + EnhancedResolver, + EnhancedResolverRpcClient, + FirstParam, + InvokeWithMiddlewareConfig, + MiddlewareResponse, + PromiseReturnType, + QueryFn, + Resolver, +} from "./types" +import {isClient} from "./utils" export function invoke, TResult = PromiseReturnType>( queryFn: T, diff --git a/packages/core/src/middleware.test.ts b/packages/core/src/middleware.test.ts index c0e63ab34..47de0888a 100644 --- a/packages/core/src/middleware.test.ts +++ b/packages/core/src/middleware.test.ts @@ -1,8 +1,7 @@ import http from "http" -import listen from "test-listen" import fetch from "isomorphic-unfetch" import {apiResolver} from "next/dist/next-server/server/api-utils" - +import listen from "test-listen" import {BlitzApiRequest, BlitzApiResponse} from "." import {handleRequestWithMiddleware} from "./middleware" import {Middleware} from "./types" diff --git a/packages/core/src/middleware.ts b/packages/core/src/middleware.ts index 3c3e0ee50..04276d38f 100644 --- a/packages/core/src/middleware.ts +++ b/packages/core/src/middleware.ts @@ -1,15 +1,15 @@ /* eslint-disable es5/no-es6-methods -- file only used on the server */ -import {BlitzApiRequest, BlitzApiResponse} from "." -import {IncomingMessage, ServerResponse} from "http" import {getConfig} from "@blitzjs/config" -import {log, baseLogger} from "@blitzjs/display" +import {baseLogger, log} from "@blitzjs/display" +import {IncomingMessage, ServerResponse} from "http" +import {BlitzApiRequest, BlitzApiResponse} from "." import { + ConnectMiddleware, EnhancedResolver, Middleware, MiddlewareNext, MiddlewareRequest, MiddlewareResponse, - ConnectMiddleware, } from "./types" export interface DefaultCtx {} diff --git a/packages/core/src/passport-adapter.ts b/packages/core/src/passport-adapter.ts index c13fbb7c3..db9bdd966 100644 --- a/packages/core/src/passport-adapter.ts +++ b/packages/core/src/passport-adapter.ts @@ -1,18 +1,18 @@ /* eslint-disable es5/no-for-of -- file only used on the server */ /* eslint-disable es5/no-es6-methods -- file only used on the server */ +import {log} from "@blitzjs/display" +import cookieSession from "cookie-session" +import passport from "passport" import {BlitzApiRequest, BlitzApiResponse, ConnectMiddleware} from "." import { + connectMiddleware, getAllMiddlewareForModule, handleRequestWithMiddleware, - connectMiddleware, } from "./middleware" -import {SessionContext} from "./supertokens" -import {log} from "@blitzjs/display" -import passport from "passport" -import cookieSession from "cookie-session" -import {isLocalhost} from "./utils/index" import {secureProxyMiddleware} from "./secure-proxy-middleware" -import {VerifyCallbackResult, BlitzPassportConfig, Middleware} from "./types" +import {SessionContext} from "./supertokens" +import {BlitzPassportConfig, Middleware, VerifyCallbackResult} from "./types" +import {isLocalhost} from "./utils/index" function assert(condition: any, message: string): asserts condition { if (!condition) throw new Error(message) diff --git a/packages/core/src/public-data-store.test.ts b/packages/core/src/public-data-store.test.ts index 9350bb9c0..0004e526d 100644 --- a/packages/core/src/public-data-store.test.ts +++ b/packages/core/src/public-data-store.test.ts @@ -1,7 +1,7 @@ -import {publicDataStore} from "./public-data-store" -import {COOKIE_PUBLIC_DATA_TOKEN} from "./constants" -import {deleteCookie, readCookie} from "./utils/cookie" import {queryCache} from "react-query" +import {COOKIE_PUBLIC_DATA_TOKEN} from "./constants" +import {publicDataStore} from "./public-data-store" +import {deleteCookie, readCookie} from "./utils/cookie" import {parsePublicDataToken} from "./utils/tokens" jest.mock("./utils/tokens", () => ({ diff --git a/packages/core/src/public-data-store.ts b/packages/core/src/public-data-store.ts index 161bdc280..cb240dd35 100644 --- a/packages/core/src/public-data-store.ts +++ b/packages/core/src/public-data-store.ts @@ -1,9 +1,9 @@ -import {LOCALSTORAGE_PREFIX, COOKIE_PUBLIC_DATA_TOKEN} from "./constants" -import {readCookie, deleteCookie} from "./utils/cookie" import BadBehavior from "bad-behavior" import {queryCache} from "react-query" -import {parsePublicDataToken} from "./utils/tokens" +import {COOKIE_PUBLIC_DATA_TOKEN, LOCALSTORAGE_PREFIX} from "./constants" import {PublicData} from "./types" +import {deleteCookie, readCookie} from "./utils/cookie" +import {parsePublicDataToken} from "./utils/tokens" class PublicDataStore { private eventKey = `${LOCALSTORAGE_PREFIX}publicDataUpdated` diff --git a/packages/core/src/rpc.ts b/packages/core/src/rpc.ts index d619b2135..9c43b5b50 100644 --- a/packages/core/src/rpc.ts +++ b/packages/core/src/rpc.ts @@ -1,26 +1,26 @@ -import {deserializeError} from "serialize-error" import {queryCache} from "react-query" -import {isClient, isServer, clientDebug} from "./utils" -import {getAntiCSRFToken} from "./supertokens" +import {deserializeError} from "serialize-error" +import {deserialize, serialize} from "superjson" +import {SuperJSONResult} from "superjson/dist/types" import { HEADER_CSRF, - HEADER_SESSION_REVOKED, HEADER_CSRF_ERROR, HEADER_PUBLIC_DATA_TOKEN, + HEADER_SESSION_REVOKED, } from "./constants" -import {publicDataStore} from "./public-data-store" import {CSRFTokenMismatchError} from "./errors" -import {serialize, deserialize} from "superjson" +import {publicDataStore} from "./public-data-store" +import {getAntiCSRFToken} from "./supertokens" import { - ResolverType, - ResolverModule, + CancellablePromise, EnhancedResolver, EnhancedResolverRpcClient, - CancellablePromise, + ResolverModule, ResolverRpc, + ResolverType, RpcOptions, } from "./types" -import {SuperJSONResult} from "superjson/dist/types" +import {clientDebug, isClient, isServer} from "./utils" import {getQueryKeyFromUrlAndParams} from "./utils/react-query-utils" export const executeRpcCall = ( diff --git a/packages/core/src/secure-proxy-middleware.test.ts b/packages/core/src/secure-proxy-middleware.test.ts index cc3f9884a..086d6d95f 100644 --- a/packages/core/src/secure-proxy-middleware.test.ts +++ b/packages/core/src/secure-proxy-middleware.test.ts @@ -1,8 +1,7 @@ // @ts-ignore import {Request} from "express" - -import {secureProxyMiddleware} from "./secure-proxy-middleware" import {Socket} from "net" +import {secureProxyMiddleware} from "./secure-proxy-middleware" // @ts-ignore let reqSecure: Request = { diff --git a/packages/core/src/secure-proxy-middleware.ts b/packages/core/src/secure-proxy-middleware.ts index f32e777c3..5e4b6991c 100644 --- a/packages/core/src/secure-proxy-middleware.ts +++ b/packages/core/src/secure-proxy-middleware.ts @@ -1,4 +1,4 @@ -import {MiddlewareRequest, MiddlewareResponse, Middleware} from "./types" +import {Middleware, MiddlewareRequest, MiddlewareResponse} from "./types" export const secureProxyMiddleware: Middleware = function ( req: MiddlewareRequest, diff --git a/packages/core/src/supertokens.ts b/packages/core/src/supertokens.ts index 240c476fd..cc0cde86b 100644 --- a/packages/core/src/supertokens.ts +++ b/packages/core/src/supertokens.ts @@ -1,9 +1,9 @@ import {useState} from "react" -import {publicDataStore} from "./public-data-store" -import {useIsomorphicLayoutEffect} from "./utils/hooks" -import {readCookie} from "./utils/cookie" -import {PublicData} from "./types" import {COOKIE_CSRF_TOKEN} from "./constants" +import {publicDataStore} from "./public-data-store" +import {PublicData} from "./types" +import {readCookie} from "./utils/cookie" +import {useIsomorphicLayoutEffect} from "./utils/hooks" export interface SessionModel extends Record { handle: string diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts index 424bbb2ec..2159be932 100644 --- a/packages/core/src/types.ts +++ b/packages/core/src/types.ts @@ -1,7 +1,7 @@ -import {BlitzApiRequest, BlitzApiResponse} from "." import {IncomingMessage, ServerResponse} from "http" import {AuthenticateOptions, Strategy} from "passport" -import {MutationResult, MutateConfig} from "react-query" +import {MutateConfig, MutationResult} from "react-query" +import {BlitzApiRequest, BlitzApiResponse} from "." export interface DefaultPublicData { userId: any diff --git a/packages/core/src/use-mutation.ts b/packages/core/src/use-mutation.ts index f4e7f461b..c5aed70d6 100644 --- a/packages/core/src/use-mutation.ts +++ b/packages/core/src/use-mutation.ts @@ -1,6 +1,6 @@ -import {useMutation as useReactQueryMutation, MutationConfig} from "react-query" -import {sanitize} from "./utils/react-query-utils" +import {MutationConfig, useMutation as useReactQueryMutation} from "react-query" import {MutationFunction, MutationResultPair} from "./types" +import {sanitize} from "./utils/react-query-utils" /* * We have to override react-query's MutationFunction and MutationResultPair diff --git a/packages/core/src/use-params.ts b/packages/core/src/use-params.ts index 3fd67ba16..5b754fd69 100644 --- a/packages/core/src/use-params.ts +++ b/packages/core/src/use-params.ts @@ -1,8 +1,8 @@ -import {useMemo} from "react" import {fromPairs} from "lodash" import {useRouter} from "next/router" -import {useRouterQuery} from "./use-router-query" +import {useMemo} from "react" import {ParsedUrlQueryValue} from "./types" +import {useRouterQuery} from "./use-router-query" export interface ParsedUrlQuery { [key: string]: ParsedUrlQueryValue diff --git a/packages/core/src/use-query-hooks.ts b/packages/core/src/use-query-hooks.ts index 6ecf31c83..082d065df 100644 --- a/packages/core/src/use-query-hooks.ts +++ b/packages/core/src/use-query-hooks.ts @@ -1,24 +1,24 @@ +import Router from "next/router" import { - useQuery as useReactQuery, - QueryResult, - QueryConfig, - usePaginatedQuery as usePaginatedReactQuery, - PaginatedQueryResult, - PaginatedQueryConfig, - useInfiniteQuery as useInfiniteReactQuery, - InfiniteQueryResult, InfiniteQueryConfig as RQInfiniteQueryConfig, + InfiniteQueryResult, + PaginatedQueryConfig, + PaginatedQueryResult, queryCache, + QueryConfig, + QueryResult, + useInfiniteQuery as useInfiniteReactQuery, + usePaginatedQuery as usePaginatedReactQuery, + useQuery as useReactQuery, } from "react-query" -import {FirstParam, QueryFn, PromiseReturnType} from "./types" +import {FirstParam, PromiseReturnType, QueryFn} from "./types" import { - QueryCacheFunctions, + defaultQueryConfig, getQueryCacheFunctions, getQueryKey, + QueryCacheFunctions, sanitize, - defaultQueryConfig, } from "./utils/react-query-utils" -import Router from "next/router" Router.events.on("routeChangeComplete", async () => { await queryCache.invalidateQueries() diff --git a/packages/core/src/use-router-query.ts b/packages/core/src/use-router-query.ts index 1ab4824d5..4ef2bbbdd 100644 --- a/packages/core/src/use-router-query.ts +++ b/packages/core/src/use-router-query.ts @@ -1,5 +1,5 @@ -import {useMemo} from "react" import {useRouter} from "next/router" +import {useMemo} from "react" import {parse} from "url" export function useRouterQuery() { diff --git a/packages/core/src/use-router.ts b/packages/core/src/use-router.ts index 8420f16a8..6643ec2f2 100644 --- a/packages/core/src/use-router.ts +++ b/packages/core/src/use-router.ts @@ -1,5 +1,5 @@ +import {NextRouter, useRouter as useNextRouter} from "next/router" import {useMemo} from "react" -import {useRouter as useNextRouter, NextRouter} from "next/router" import {useParams} from "./use-params" import {useRouterQuery} from "./use-router-query" diff --git a/packages/core/src/utils/index.ts b/packages/core/src/utils/index.ts index 22ae0e23d..01b90f1d3 100644 --- a/packages/core/src/utils/index.ts +++ b/packages/core/src/utils/index.ts @@ -1,5 +1,5 @@ -import {BlitzApiRequest} from "../" import {IncomingMessage} from "http" +import {BlitzApiRequest} from "../" export const isServer = typeof window === "undefined" export const isClient = typeof window !== "undefined" diff --git a/packages/core/src/utils/react-query-utils.ts b/packages/core/src/utils/react-query-utils.ts index e6fb14b63..2de11db88 100644 --- a/packages/core/src/utils/react-query-utils.ts +++ b/packages/core/src/utils/react-query-utils.ts @@ -1,7 +1,7 @@ import {queryCache, QueryKey} from "react-query" import {serialize} from "superjson" -import {Resolver, EnhancedResolverRpcClient, QueryFn} from "../types" -import {isServer, isClient} from "." +import {EnhancedResolverRpcClient, QueryFn, Resolver} from "../types" +import {isClient, isServer} from "." import {requestIdleCallback} from "./request-idle-callback" type MutateOptions = { diff --git a/packages/core/src/utils/tokens.test.ts b/packages/core/src/utils/tokens.test.ts index e3d5add23..921ba3a9b 100644 --- a/packages/core/src/utils/tokens.test.ts +++ b/packages/core/src/utils/tokens.test.ts @@ -1,9 +1,9 @@ -import {TOKEN_SEPARATOR} from "../constants" -import {parsePublicDataToken} from "./tokens" -import {useSession} from "../supertokens" -import {renderHook} from "../../test/test-utils" -import {publicDataStore} from "../public-data-store" import {act} from "@testing-library/react-hooks" +import {renderHook} from "../../test/test-utils" +import {TOKEN_SEPARATOR} from "../constants" +import {publicDataStore} from "../public-data-store" +import {useSession} from "../supertokens" +import {parsePublicDataToken} from "./tokens" describe("supertokens", () => { describe("parsePublicDataToken", () => { diff --git a/packages/core/src/with-router.tsx b/packages/core/src/with-router.tsx index 0f01a8e1e..dc5dbd778 100644 --- a/packages/core/src/with-router.tsx +++ b/packages/core/src/with-router.tsx @@ -1,7 +1,7 @@ -import React from "react" -import {withRouter as withNextRouter, NextRouter} from "next/router" import {WithRouterProps as WithNextRouterProps} from "next/dist/client/with-router" -import {useParams, extractRouterParams} from "./use-params" +import {NextRouter, withRouter as withNextRouter} from "next/router" +import React from "react" +import {extractRouterParams, useParams} from "./use-params" import {useRouterQuery} from "./use-router-query" export {RouterContext} from "next/dist/next-server/lib/router-context" diff --git a/packages/core/test/react-query-utils.test.ts b/packages/core/test/react-query-utils.test.ts index 422dde96e..657b39d47 100644 --- a/packages/core/test/react-query-utils.test.ts +++ b/packages/core/test/react-query-utils.test.ts @@ -1,5 +1,5 @@ -import {getQueryCacheFunctions, invalidateQuery, setQueryData} from "../src/utils/react-query-utils" import {queryCache} from "react-query" +import {getQueryCacheFunctions, invalidateQuery, setQueryData} from "../src/utils/react-query-utils" import {enhanceQueryFn} from "./test-utils" jest.mock("react-query") diff --git a/packages/core/test/test-utils.tsx b/packages/core/test/test-utils.tsx index 42bdea6f5..97d22ace2 100644 --- a/packages/core/test/test-utils.tsx +++ b/packages/core/test/test-utils.tsx @@ -1,8 +1,8 @@ -import React from "react" import {render as defaultRender} from "@testing-library/react" import {renderHook as defaultRenderHook} from "@testing-library/react-hooks" import {RouterContext} from "next/dist/next-server/lib/router-context" import {NextRouter} from "next/router" +import React from "react" import {deserialize} from "superjson" export * from "@testing-library/react" diff --git a/packages/core/test/use-mutation.test.tsx b/packages/core/test/use-mutation.test.tsx index 768a64324..daa4bebbb 100644 --- a/packages/core/test/use-mutation.test.tsx +++ b/packages/core/test/use-mutation.test.tsx @@ -1,6 +1,6 @@ import React from "react" -import {act, render, screen} from "./test-utils" import {useMutation} from "../src/use-mutation" +import {act, render, screen} from "./test-utils" // This enhance fn does what getIsomorphicEnhancedResolver does during build time const enhance = (fn: any) => { diff --git a/packages/core/test/use-params.test.ts b/packages/core/test/use-params.test.ts index 141bbc355..78818f246 100644 --- a/packages/core/test/use-params.test.ts +++ b/packages/core/test/use-params.test.ts @@ -1,4 +1,4 @@ -import {extractRouterParams, useParams, useParam} from "../src/use-params" +import {extractRouterParams, useParam, useParams} from "../src/use-params" import {renderHook} from "./test-utils" describe("extractRouterParams", () => { diff --git a/packages/core/test/use-query.test.tsx b/packages/core/test/use-query.test.tsx index c783c2b17..b5d9c6cd5 100644 --- a/packages/core/test/use-query.test.tsx +++ b/packages/core/test/use-query.test.tsx @@ -1,7 +1,7 @@ import React from "react" import {queryCache} from "react-query" -import {act, render, waitForElementToBeRemoved, screen, waitFor} from "./test-utils" import {useQuery} from "../src/use-query-hooks" +import {act, render, screen, waitFor, waitForElementToBeRemoved} from "./test-utils" import {enhanceQueryFn} from "./test-utils" beforeEach(() => { diff --git a/packages/file-pipeline/src/display.ts b/packages/file-pipeline/src/display.ts index d91eef289..17522379e 100644 --- a/packages/file-pipeline/src/display.ts +++ b/packages/file-pipeline/src/display.ts @@ -1,8 +1,8 @@ -import {through} from "./streams" -import File from "vinyl" import {log} from "@blitzjs/display" import chalk from "chalk" -import {Event, FILE_WRITTEN, INIT, ERROR_THROWN, READY} from "./events" +import File from "vinyl" +import {ERROR_THROWN, Event, FILE_WRITTEN, INIT, READY} from "./events" +import {through} from "./streams" /** * Display is a stream that converts build status events and prepares them for the console. diff --git a/packages/file-pipeline/src/helpers/agnostic-source/agnostic-source.test.ts b/packages/file-pipeline/src/helpers/agnostic-source/agnostic-source.test.ts index b04a25868..b56dcd028 100644 --- a/packages/file-pipeline/src/helpers/agnostic-source/agnostic-source.test.ts +++ b/packages/file-pipeline/src/helpers/agnostic-source/agnostic-source.test.ts @@ -1,7 +1,7 @@ import fs from "fs" import {resolve} from "path" -import {agnosticSource} from "." import {testStreamItems} from "../../test-utils" +import {agnosticSource} from "." const cwd = resolve(__dirname, "fixtures") diff --git a/packages/file-pipeline/src/helpers/agnostic-source/index.ts b/packages/file-pipeline/src/helpers/agnostic-source/index.ts index 84a62a9d1..9a65d2fe5 100644 --- a/packages/file-pipeline/src/helpers/agnostic-source/index.ts +++ b/packages/file-pipeline/src/helpers/agnostic-source/index.ts @@ -1,12 +1,11 @@ -import {through} from "../../streams" -import vfs from "vinyl-fs" -import mergeStream from "merge-stream" - -import File from "vinyl" import chokidar from "chokidar" -import vinyl from "vinyl-file" import {Stats} from "fs" -import {normalize, resolve, isAbsolute} from "path" +import mergeStream from "merge-stream" +import {isAbsolute, normalize, resolve} from "path" +import File from "vinyl" +import vinyl from "vinyl-file" +import vfs from "vinyl-fs" +import {through} from "../../streams" export const watch = (includePaths: string[] | string, options: chokidar.WatchOptions) => { function resolveFilepath(filepath: string) { diff --git a/packages/file-pipeline/src/helpers/file-cache.ts b/packages/file-pipeline/src/helpers/file-cache.ts index 8bc2caaa4..5af41128c 100644 --- a/packages/file-pipeline/src/helpers/file-cache.ts +++ b/packages/file-pipeline/src/helpers/file-cache.ts @@ -1,7 +1,7 @@ -import {transform} from "../transform" import File from "vinyl" +import {transform} from "../transform" +import {FileCacheEntry, FileCacheInterface} from "../types" import {isEvent} from "../utils" -import {FileCacheInterface, FileCacheEntry} from "../types" export class FileCache implements FileCacheInterface { fileCache: Record = {} diff --git a/packages/file-pipeline/src/helpers/idle-handler/idle-handler.test.ts b/packages/file-pipeline/src/helpers/idle-handler/idle-handler.test.ts index 0e34b6aae..604dcea3e 100644 --- a/packages/file-pipeline/src/helpers/idle-handler/idle-handler.test.ts +++ b/packages/file-pipeline/src/helpers/idle-handler/idle-handler.test.ts @@ -1,7 +1,7 @@ -import {createIdleHandler} from "." +import {IDLE, READY} from "../../events" import {pipeline, through} from "../../streams" import {testStreamItems} from "../../test-utils" -import {IDLE, READY} from "../../events" +import {createIdleHandler} from "." const sleep = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms)) diff --git a/packages/file-pipeline/src/helpers/idle-handler/index.ts b/packages/file-pipeline/src/helpers/idle-handler/index.ts index af9282b79..61e1f8ee7 100644 --- a/packages/file-pipeline/src/helpers/idle-handler/index.ts +++ b/packages/file-pipeline/src/helpers/idle-handler/index.ts @@ -1,6 +1,6 @@ -import {through} from "../../streams" -import {READY, IDLE} from "../../events" import {Writable} from "stream" +import {IDLE, READY} from "../../events" +import {through} from "../../streams" import {isEvent} from "../../utils" /** diff --git a/packages/file-pipeline/src/helpers/unlink/index.ts b/packages/file-pipeline/src/helpers/unlink/index.ts index 7907abadf..11b5012c8 100644 --- a/packages/file-pipeline/src/helpers/unlink/index.ts +++ b/packages/file-pipeline/src/helpers/unlink/index.ts @@ -1,8 +1,7 @@ import * as fs from "fs-extra" - import {relative, resolve} from "path" -import {transform} from "../../transform" import {EventedFile} from "types" +import {transform} from "../../transform" function getDestPath(folder: string, file: EventedFile) { return resolve(folder, relative(file.cwd, file.path)) diff --git a/packages/file-pipeline/src/helpers/unlink/unlink.test.ts b/packages/file-pipeline/src/helpers/unlink/unlink.test.ts index 41a874a0f..78ea43df9 100644 --- a/packages/file-pipeline/src/helpers/unlink/unlink.test.ts +++ b/packages/file-pipeline/src/helpers/unlink/unlink.test.ts @@ -1,7 +1,7 @@ -import {unlink} from "." import {normalize, resolve} from "path" -import {take} from "../../test-utils" import File from "vinyl" +import {take} from "../../test-utils" +import {unlink} from "." describe("unlink", () => { it("should unlink the correct path", async () => { diff --git a/packages/file-pipeline/src/helpers/work-optimizer/index.ts b/packages/file-pipeline/src/helpers/work-optimizer/index.ts index 396a39ff8..36feeb6a8 100644 --- a/packages/file-pipeline/src/helpers/work-optimizer/index.ts +++ b/packages/file-pipeline/src/helpers/work-optimizer/index.ts @@ -1,11 +1,11 @@ // Mostly concerned with solving the Dirty Sync problem import {log} from "@blitzjs/display" +import {existsSync, readFileSync, writeFile} from "fs-extra" +import debounce from "lodash/debounce" +import {relative, resolve} from "path" +import File from "vinyl" import {transform} from "../../transform" import {hash} from "../../utils" -import debounce from "lodash/debounce" -import {writeFile, existsSync, readFileSync} from "fs-extra" -import {resolve, relative} from "path" -import File from "vinyl" const defaultSaveCache = debounce((filePath: string, data: object) => { return writeFile(filePath, Buffer.from(JSON.stringify(data, null, 2))) diff --git a/packages/file-pipeline/src/helpers/work-optimizer/work-optimizer.test.ts b/packages/file-pipeline/src/helpers/work-optimizer/work-optimizer.test.ts index 159cb05ac..fa0a128f7 100644 --- a/packages/file-pipeline/src/helpers/work-optimizer/work-optimizer.test.ts +++ b/packages/file-pipeline/src/helpers/work-optimizer/work-optimizer.test.ts @@ -1,9 +1,9 @@ -import {createWorkOptimizer} from "." -import {take} from "../../test-utils" -import {hash} from "../../utils" -import {pipeline} from "../../streams" import {normalize, resolve} from "path" import File from "vinyl" +import {pipeline} from "../../streams" +import {take} from "../../test-utils" +import {hash} from "../../utils" +import {createWorkOptimizer} from "." const pathToOneHash = hash(normalize("to/one")) const pathToTwoHash = hash(normalize("to/two")) diff --git a/packages/file-pipeline/src/helpers/writer/index.ts b/packages/file-pipeline/src/helpers/writer/index.ts index 36f7dc197..73b121e14 100644 --- a/packages/file-pipeline/src/helpers/writer/index.ts +++ b/packages/file-pipeline/src/helpers/writer/index.ts @@ -1,12 +1,12 @@ -import {pipeline} from "../../streams" import gulpIf from "gulp-if" -import {unlink} from "../unlink" -import {dest} from "vinyl-fs" -import File from "vinyl" -import {FILE_WRITTEN, FILE_DELETED} from "../../events" import {Writable} from "stream" -import {isFile} from "../../utils" +import File from "vinyl" +import {dest} from "vinyl-fs" +import {FILE_DELETED, FILE_WRITTEN} from "../../events" +import {pipeline} from "../../streams" import {transform} from "../../transform" +import {isFile} from "../../utils" +import {unlink} from "../unlink" const isUnlinkFile = (file: File) => { return file.event === "unlink" || file.event === "unlinkDir" diff --git a/packages/file-pipeline/src/helpers/writer/write.test.ts b/packages/file-pipeline/src/helpers/writer/write.test.ts index 232537413..439b211e4 100644 --- a/packages/file-pipeline/src/helpers/writer/write.test.ts +++ b/packages/file-pipeline/src/helpers/writer/write.test.ts @@ -1,9 +1,9 @@ -import {createWrite} from "." -import {through} from "../../streams" -import {testStreamItems} from "../../test-utils" import {normalize} from "path" import File from "vinyl" import {FILE_DELETED, FILE_WRITTEN} from "../../events" +import {through} from "../../streams" +import {testStreamItems} from "../../test-utils" +import {createWrite} from "." describe("writer", () => { it("should write files", async () => { diff --git a/packages/file-pipeline/src/pipeline.ts b/packages/file-pipeline/src/pipeline.ts index 62c003c1e..aefb12fba 100644 --- a/packages/file-pipeline/src/pipeline.ts +++ b/packages/file-pipeline/src/pipeline.ts @@ -1,14 +1,14 @@ +import {Stats} from "fs" import {Writable} from "stream" import File from "vinyl" -import {pipeline, through} from "./streams" -import {Stage, StageArgs, StageConfig, EventedFile} from "./types" import {agnosticSource} from "./helpers/agnostic-source" import {createEnrichFiles} from "./helpers/enrich-files" import {createFileCache, FileCache} from "./helpers/file-cache" import {createIdleHandler} from "./helpers/idle-handler" import {createWorkOptimizer} from "./helpers/work-optimizer" import {createWrite} from "./helpers/writer" -import {Stats} from "fs" +import {pipeline, through} from "./streams" +import {EventedFile, Stage, StageArgs, StageConfig} from "./types" export function isSourceFile(file: File) { return file.hash?.indexOf(":") === -1 } diff --git a/packages/file-pipeline/src/streams.ts b/packages/file-pipeline/src/streams.ts index 954d843fc..f6b5f733d 100644 --- a/packages/file-pipeline/src/streams.ts +++ b/packages/file-pipeline/src/streams.ts @@ -1,9 +1,8 @@ // The following are a loose collaction of stream // helpers based on the missisippi library -import {Stream} from "stream" - import pipe from "pump" +import {Stream} from "stream" export {pipe} import through from "through2" diff --git a/packages/file-pipeline/src/test-utils.ts b/packages/file-pipeline/src/test-utils.ts index 134322e5b..c5f40d98a 100644 --- a/packages/file-pipeline/src/test-utils.ts +++ b/packages/file-pipeline/src/test-utils.ts @@ -1,4 +1,4 @@ -import {through, pipeline} from "./streams" +import {pipeline, through} from "./streams" const defaultLogger = (file: any) => (typeof file === "string" ? file : file.path) diff --git a/packages/file-pipeline/src/transform-files/highwatermark.test.ts b/packages/file-pipeline/src/transform-files/highwatermark.test.ts index 579dcca02..4233f70d3 100644 --- a/packages/file-pipeline/src/transform-files/highwatermark.test.ts +++ b/packages/file-pipeline/src/transform-files/highwatermark.test.ts @@ -1,8 +1,8 @@ -import through2 from "through2" -import {testStreamItems} from "../test-utils" -import File from "vinyl" -import {transformFiles} from "." import {normalize} from "path" +import through2 from "through2" +import File from "vinyl" +import {testStreamItems} from "../test-utils" +import {transformFiles} from "." function logFile(file: File | string) { const out = typeof file === "string" ? file : file.path diff --git a/packages/file-pipeline/src/transform-files/transform-files.test.ts b/packages/file-pipeline/src/transform-files/transform-files.test.ts index 6d43a236e..1dc55a375 100644 --- a/packages/file-pipeline/src/transform-files/transform-files.test.ts +++ b/packages/file-pipeline/src/transform-files/transform-files.test.ts @@ -1,8 +1,8 @@ -import through2 from "through2" -import {testStreamItems} from "../test-utils" -import File from "vinyl" -import {transformFiles} from "." import {normalize} from "path" +import through2 from "through2" +import File from "vinyl" +import {testStreamItems} from "../test-utils" +import {transformFiles} from "." function logFile(file: File | string) { if (typeof file === "string") { return file diff --git a/packages/file-pipeline/src/transform.test.ts b/packages/file-pipeline/src/transform.test.ts index 90f507220..0fd2d6c2e 100644 --- a/packages/file-pipeline/src/transform.test.ts +++ b/packages/file-pipeline/src/transform.test.ts @@ -1,10 +1,10 @@ -import {transform} from "./transform" -import {testStreamItems} from "./test-utils" -import {PipelineItem} from "types" -import {isFile, isEvent} from "./utils" -import File from "vinyl" -import through2 from "through2" import {normalize} from "path" +import through2 from "through2" +import {PipelineItem} from "types" +import File from "vinyl" +import {testStreamItems} from "./test-utils" +import {transform} from "./transform" +import {isEvent, isFile} from "./utils" describe("transform", () => { describe("when it uses the files filter", () => { diff --git a/packages/file-pipeline/src/transform.ts b/packages/file-pipeline/src/transform.ts index 801c6f9ac..4216bae5f 100644 --- a/packages/file-pipeline/src/transform.ts +++ b/packages/file-pipeline/src/transform.ts @@ -1,8 +1,7 @@ -import {through} from "./streams" - -import {isEvent} from "./utils" -import {EventedFile, PipelineItem} from "./types" import {DuplexOptions, Transform} from "stream" +import {through} from "./streams" +import {EventedFile, PipelineItem} from "./types" +import {isEvent} from "./utils" /** * Stream API for utilizing stream functions diff --git a/packages/file-pipeline/src/utils.ts b/packages/file-pipeline/src/utils.ts index 8a4c6e207..1beeb097f 100644 --- a/packages/file-pipeline/src/utils.ts +++ b/packages/file-pipeline/src/utils.ts @@ -1,6 +1,6 @@ -import File from "vinyl" -import {PipelineEvent, EventedFile} from "./types" import crypto from "crypto" +import File from "vinyl" +import {EventedFile, PipelineEvent} from "./types" export function isFile(file: any): file is EventedFile { return File.isVinyl(file) diff --git a/packages/generator/src/conflict-checker.ts b/packages/generator/src/conflict-checker.ts index 445fe7c9c..1874a9759 100644 --- a/packages/generator/src/conflict-checker.ts +++ b/packages/generator/src/conflict-checker.ts @@ -1,10 +1,10 @@ -import {Transform, TransformCallback} from "stream" -import * as path from "path" -import File from "vinyl" -import {diffLines, Change} from "diff" -import * as fs from "fs-extra" import chalk from "chalk" +import {Change, diffLines} from "diff" import enquirer from "enquirer" +import * as fs from "fs-extra" +import * as path from "path" +import {Transform, TransformCallback} from "stream" +import File from "vinyl" import {PromptAbortedError} from "./errors/prompt-aborted" interface PromptAnswer { diff --git a/packages/generator/src/generator.ts b/packages/generator/src/generator.ts index 3ff92a639..169232a46 100644 --- a/packages/generator/src/generator.ts +++ b/packages/generator/src/generator.ts @@ -1,19 +1,19 @@ -import * as fs from "fs-extra" -import * as path from "path" -import {EventEmitter} from "events" -import {create as createStore, Store} from "mem-fs" -import {create as createEditor, Editor} from "mem-fs-editor" -import Enquirer from "enquirer" -import {log} from "@blitzjs/display" -import readDirRecursive from "fs-readdir-recursive" import * as babel from "@babel/core" // @ts-ignore TS wants types for this module but none exist import babelTransformTypescript from "@babel/plugin-transform-typescript" -import {ConflictChecker} from "./conflict-checker" +import {log} from "@blitzjs/display" +import Enquirer from "enquirer" +import {EventEmitter} from "events" +import * as fs from "fs-extra" +import readDirRecursive from "fs-readdir-recursive" import j from "jscodeshift" import {Collection} from "jscodeshift/src/Collection" -import * as babelParser from "recast/parsers/babel" +import {create as createStore, Store} from "mem-fs" +import {create as createEditor, Editor} from "mem-fs-editor" +import * as path from "path" import getBabelOptions, {Overrides} from "recast/parsers/_babel_options" +import * as babelParser from "recast/parsers/babel" +import {ConflictChecker} from "./conflict-checker" import {pipe} from "./utils/pipe" export const customTsParser = { diff --git a/packages/generator/src/generators/app-generator.ts b/packages/generator/src/generators/app-generator.ts index 2d39bfec5..61407f7d2 100644 --- a/packages/generator/src/generators/app-generator.ts +++ b/packages/generator/src/generators/app-generator.ts @@ -1,11 +1,11 @@ -import {Generator, GeneratorOptions} from "../generator" -import spawn from "cross-spawn" -import chalk from "chalk" -import username from "username" -import {readJSONSync, writeJson} from "fs-extra" -import {resolve, join} from "path" -import {fetchLatestVersionsFor} from "../utils/fetch-latest-version-for" import {log} from "@blitzjs/display" +import chalk from "chalk" +import spawn from "cross-spawn" +import {readJSONSync, writeJson} from "fs-extra" +import {join, resolve} from "path" +import username from "username" +import {Generator, GeneratorOptions} from "../generator" +import {fetchLatestVersionsFor} from "../utils/fetch-latest-version-for" import {getBlitzDependencyVersion} from "../utils/get-blitz-dependency-version" export interface AppGeneratorOptions extends GeneratorOptions { diff --git a/packages/generator/src/generators/form-generator.ts b/packages/generator/src/generators/form-generator.ts index 496ac8185..5d6500ccf 100644 --- a/packages/generator/src/generators/form-generator.ts +++ b/packages/generator/src/generators/form-generator.ts @@ -1,5 +1,5 @@ -import {Generator, GeneratorOptions} from "../generator" import {join} from "path" +import {Generator, GeneratorOptions} from "../generator" export interface FormGeneratorOptions extends GeneratorOptions { ModelName: string diff --git a/packages/generator/src/generators/model-generator.ts b/packages/generator/src/generators/model-generator.ts index dc2516628..2d838169a 100644 --- a/packages/generator/src/generators/model-generator.ts +++ b/packages/generator/src/generators/model-generator.ts @@ -1,8 +1,8 @@ -import {Generator, GeneratorOptions} from "../generator" -import path from "path" -import {Model} from "../prisma/model" -import {Field} from "../prisma/field" import {log} from "@blitzjs/display" +import path from "path" +import {Generator, GeneratorOptions} from "../generator" +import {Field} from "../prisma/field" +import {Model} from "../prisma/model" import {matchBetween} from "../utils/match-between" export interface ModelGeneratorOptions extends GeneratorOptions { diff --git a/packages/generator/src/generators/mutation-generator.ts b/packages/generator/src/generators/mutation-generator.ts index cf373b543..ce592c8fb 100644 --- a/packages/generator/src/generators/mutation-generator.ts +++ b/packages/generator/src/generators/mutation-generator.ts @@ -1,5 +1,5 @@ -import {Generator, GeneratorOptions} from "../generator" import {join} from "path" +import {Generator, GeneratorOptions} from "../generator" export interface MutationGeneratorOptions extends GeneratorOptions { ModelName: string diff --git a/packages/generator/src/generators/page-generator.ts b/packages/generator/src/generators/page-generator.ts index ca7ef11e8..af97be537 100644 --- a/packages/generator/src/generators/page-generator.ts +++ b/packages/generator/src/generators/page-generator.ts @@ -1,5 +1,5 @@ -import {Generator, GeneratorOptions} from "../generator" import {join} from "path" +import {Generator, GeneratorOptions} from "../generator" import {camelCaseToKebabCase} from "../utils/kebab-case" export interface PageGeneratorOptions extends GeneratorOptions { diff --git a/packages/generator/src/generators/queries-generator.ts b/packages/generator/src/generators/queries-generator.ts index 0a0532501..d841e4a8a 100644 --- a/packages/generator/src/generators/queries-generator.ts +++ b/packages/generator/src/generators/queries-generator.ts @@ -1,5 +1,5 @@ -import {Generator, GeneratorOptions} from "../generator" import {join} from "path" +import {Generator, GeneratorOptions} from "../generator" export interface QueriesGeneratorOptions extends GeneratorOptions { ModelName: string diff --git a/packages/generator/src/generators/query-generator.ts b/packages/generator/src/generators/query-generator.ts index c16226b17..29d44d08c 100644 --- a/packages/generator/src/generators/query-generator.ts +++ b/packages/generator/src/generators/query-generator.ts @@ -1,5 +1,5 @@ -import {Generator, GeneratorOptions} from "../generator" import {join} from "path" +import {Generator, GeneratorOptions} from "../generator" export interface QueryGeneratorOptions extends GeneratorOptions { rawInput: string diff --git a/packages/generator/src/prisma/field.ts b/packages/generator/src/prisma/field.ts index 041e9b5e5..b23ce4e16 100644 --- a/packages/generator/src/prisma/field.ts +++ b/packages/generator/src/prisma/field.ts @@ -1,5 +1,5 @@ -import {singlePascal, uncapitalize, capitalize} from "../utils/plurals" import {log} from "@blitzjs/display" +import {capitalize, singlePascal, uncapitalize} from "../utils/plurals" export enum FieldType { Boolean = "Boolean", diff --git a/packages/generator/src/prisma/model.ts b/packages/generator/src/prisma/model.ts index 72432936c..c6790212f 100644 --- a/packages/generator/src/prisma/model.ts +++ b/packages/generator/src/prisma/model.ts @@ -1,5 +1,5 @@ -import {Field, FieldType} from "./field" import {singlePascal} from "../utils/plurals" +import {Field, FieldType} from "./field" function stringifyFieldsForPrinting(fields: Field[]) { let maxNameLength = 1 diff --git a/packages/generator/src/utils/fetch-latest-version-for.ts b/packages/generator/src/utils/fetch-latest-version-for.ts index 73bdfbc65..ed81acb46 100644 --- a/packages/generator/src/utils/fetch-latest-version-for.ts +++ b/packages/generator/src/utils/fetch-latest-version-for.ts @@ -1,5 +1,5 @@ -import {getLatestVersion} from "./get-latest-version" import {Fallbackable} from "./fallbackable" +import {getLatestVersion} from "./get-latest-version" function fromEntries(entries: [K, V][]): Record { return entries.reduce>((result, [key, value]) => { diff --git a/packages/generator/src/utils/get-blitz-dependency-version.ts b/packages/generator/src/utils/get-blitz-dependency-version.ts index a54988332..fb9df121a 100644 --- a/packages/generator/src/utils/get-blitz-dependency-version.ts +++ b/packages/generator/src/utils/get-blitz-dependency-version.ts @@ -1,6 +1,6 @@ -import {fetchDistTags} from "./npm-fetch" import {Fallbackable} from "./fallbackable" import {logFailedVersionFetch} from "./get-latest-version" +import {fetchDistTags} from "./npm-fetch" export const getBlitzDependencyVersion = async ( cliVersion: string, diff --git a/packages/generator/src/utils/get-latest-version.ts b/packages/generator/src/utils/get-latest-version.ts index 466933780..595affc8d 100644 --- a/packages/generator/src/utils/get-latest-version.ts +++ b/packages/generator/src/utils/get-latest-version.ts @@ -1,7 +1,7 @@ -import {fetchAllVersions, fetchLatestDistVersion} from "./npm-fetch" import {log} from "@blitzjs/display" -import {Fallbackable} from "./fallbackable" import chalk from "chalk" +import {Fallbackable} from "./fallbackable" +import {fetchAllVersions, fetchLatestDistVersion} from "./npm-fetch" export const logFailedVersionFetch = (dependency: string, fallback: string) => { log.clearLine( diff --git a/packages/generator/test/generators/app-generator.test.ts b/packages/generator/test/generators/app-generator.test.ts index b9bdd9aa6..021a1b078 100644 --- a/packages/generator/test/generators/app-generator.test.ts +++ b/packages/generator/test/generators/app-generator.test.ts @@ -1,6 +1,5 @@ -import spawn from "cross-spawn" import {log} from "@blitzjs/display" - +import spawn from "cross-spawn" import {AppGenerator} from "../../src/generators/app-generator" // Spies process to avoid trying to chdir to a non existing folder diff --git a/packages/generator/test/prisma/model.test.ts b/packages/generator/test/prisma/model.test.ts index 36d974a43..7543dff67 100644 --- a/packages/generator/test/prisma/model.test.ts +++ b/packages/generator/test/prisma/model.test.ts @@ -1,5 +1,5 @@ -import {Model} from "../../src/prisma/model" import {Field} from "../../src/prisma/field" +import {Model} from "../../src/prisma/model" describe("Prisma Model", () => { it("generates a proper model", () => { diff --git a/packages/installer/src/components/newline.tsx b/packages/installer/src/components/newline.tsx index c49f29922..767fe672a 100644 --- a/packages/installer/src/components/newline.tsx +++ b/packages/installer/src/components/newline.tsx @@ -1,5 +1,5 @@ -import * as React from "react" import {Box} from "ink" +import * as React from "react" export const Newline: React.FC<{count?: number}> = ({count = 1}) => { return diff --git a/packages/installer/src/executors/add-dependency-executor.tsx b/packages/installer/src/executors/add-dependency-executor.tsx index 98a8d8dd0..a3667d2b3 100644 --- a/packages/installer/src/executors/add-dependency-executor.tsx +++ b/packages/installer/src/executors/add-dependency-executor.tsx @@ -1,12 +1,12 @@ -import {ExecutorConfig, executorArgument, getExecutorArgument, Executor} from "./executor" -import * as fs from "fs-extra" -import * as path from "path" import {spawn} from "cross-spawn" -import * as React from "react" +import * as fs from "fs-extra" import {Box, Text} from "ink" -import {Newline} from "../components/newline" import Spinner from "ink-spinner" +import * as path from "path" +import * as React from "react" +import {Newline} from "../components/newline" import {useEnterToContinue} from "../utils/use-enter-to-continue" +import {Executor, executorArgument, ExecutorConfig, getExecutorArgument} from "./executor" interface NpmPackage { name: string diff --git a/packages/installer/src/executors/executor.tsx b/packages/installer/src/executors/executor.tsx index 66bcd5ea4..d9ee94550 100644 --- a/packages/installer/src/executors/executor.tsx +++ b/packages/installer/src/executors/executor.tsx @@ -1,5 +1,5 @@ -import * as React from "react" import {Box, Text} from "ink" +import * as React from "react" import {Newline} from "../components/newline" export interface ExecutorConfig { @@ -38,9 +38,15 @@ export function Frontmatter({executor}: {executor: ExecutorConfig}) { - {verticalBorder} - ⎪   {executor.stepName}   ⎪ - {verticalBorder} + + {verticalBorder} + + + ⎪   {executor.stepName}   ⎪ + + + {verticalBorder} + {executor.explanation} diff --git a/packages/installer/src/executors/file-transform-executor.tsx b/packages/installer/src/executors/file-transform-executor.tsx index fb7c9993c..93cec8103 100644 --- a/packages/installer/src/executors/file-transform-executor.tsx +++ b/packages/installer/src/executors/file-transform-executor.tsx @@ -1,13 +1,13 @@ -import {ExecutorConfig, executorArgument, getExecutorArgument, Executor} from "./executor" -import {filePrompt} from "./file-prompt" -import {processFile, transform, Transformer, TransformStatus} from "../utils/transform" import {createPatch} from "diff" import * as fs from "fs-extra" -import * as React from "react" -import Spinner from "ink-spinner" import {Box, Text} from "ink" +import Spinner from "ink-spinner" +import * as React from "react" import {Newline} from "../components/newline" +import {processFile, transform, Transformer, TransformStatus} from "../utils/transform" import {useEnterToContinue} from "../utils/use-enter-to-continue" +import {Executor, executorArgument, ExecutorConfig, getExecutorArgument} from "./executor" +import {filePrompt} from "./file-prompt" export interface Config extends ExecutorConfig { selectTargetFiles?(cliArgs: any): any[] diff --git a/packages/installer/src/executors/new-file-executor.tsx b/packages/installer/src/executors/new-file-executor.tsx index 6f8770a68..d0f448298 100644 --- a/packages/installer/src/executors/new-file-executor.tsx +++ b/packages/installer/src/executors/new-file-executor.tsx @@ -1,11 +1,11 @@ -import {ExecutorConfig, executorArgument, getExecutorArgument, Executor} from "./executor" import {Generator, GeneratorOptions} from "@blitzjs/generator" -import {useEnterToContinue} from "../utils/use-enter-to-continue" +import {Box, Text} from "ink" +import Spinner from "ink-spinner" import {useEffect, useState} from "react" import * as React from "react" -import {Box, Text} from "ink" import {Newline} from "../components/newline" -import Spinner from "ink-spinner" +import {useEnterToContinue} from "../utils/use-enter-to-continue" +import {Executor, executorArgument, ExecutorConfig, getExecutorArgument} from "./executor" export interface Config extends ExecutorConfig { targetDirectory?: executorArgument diff --git a/packages/installer/src/recipe-builder.ts b/packages/installer/src/recipe-builder.ts index 7ccbc5c87..a23e0ba42 100644 --- a/packages/installer/src/recipe-builder.ts +++ b/packages/installer/src/recipe-builder.ts @@ -1,7 +1,7 @@ -import {RecipeExecutor, ExecutorConfigUnion} from "./recipe-executor" import * as AddDependencyExecutor from "./executors/add-dependency-executor" -import * as NewFileExecutor from "./executors/new-file-executor" import * as TransformFileExecutor from "./executors/file-transform-executor" +import * as NewFileExecutor from "./executors/new-file-executor" +import {ExecutorConfigUnion, RecipeExecutor} from "./recipe-executor" import {RecipeMeta} from "./types" export interface IRecipeBuilder { diff --git a/packages/installer/src/recipe-executor.tsx b/packages/installer/src/recipe-executor.tsx index 60c66fb19..450609012 100644 --- a/packages/installer/src/recipe-executor.tsx +++ b/packages/installer/src/recipe-executor.tsx @@ -1,9 +1,9 @@ -import React from "react" -import * as AddDependencyExecutor from "./executors/add-dependency-executor" -import * as NewFileExecutor from "./executors/new-file-executor" -import * as FileTransformExecutor from "./executors/file-transform-executor" import {log} from "@blitzjs/display" import {render} from "ink" +import React from "react" +import * as AddDependencyExecutor from "./executors/add-dependency-executor" +import * as FileTransformExecutor from "./executors/file-transform-executor" +import * as NewFileExecutor from "./executors/new-file-executor" import {RecipeRenderer} from "./recipe-renderer" import {RecipeMeta} from "./types" diff --git a/packages/installer/src/recipe-renderer.tsx b/packages/installer/src/recipe-renderer.tsx index 660426932..15610a2c4 100644 --- a/packages/installer/src/recipe-renderer.tsx +++ b/packages/installer/src/recipe-renderer.tsx @@ -1,12 +1,12 @@ +import {Box, Static, Text, useApp} from "ink" import React from "react" -import {Box, Text, useApp, Static} from "ink" -import {ExecutorConfig, Executor, Frontmatter} from "./executors/executor" -import {RecipeMeta} from "./types" import {Newline} from "./components/newline" -import {useEnterToContinue} from "./utils/use-enter-to-continue" import * as AddDependencyExecutor from "./executors/add-dependency-executor" -import * as NewFileExecutor from "./executors/new-file-executor" +import {Executor, ExecutorConfig, Frontmatter} from "./executors/executor" import * as FileTransformExecutor from "./executors/file-transform-executor" +import * as NewFileExecutor from "./executors/new-file-executor" +import {RecipeMeta} from "./types" +import {useEnterToContinue} from "./utils/use-enter-to-continue" enum Action { SkipStep, diff --git a/packages/installer/src/utils/transform.ts b/packages/installer/src/utils/transform.ts index acb4710db..625ad15a0 100644 --- a/packages/installer/src/utils/transform.ts +++ b/packages/installer/src/utils/transform.ts @@ -1,8 +1,8 @@ import * as fs from "fs-extra" import j from "jscodeshift" import {Collection} from "jscodeshift/src/Collection" -import * as babel from "recast/parsers/babel" import getBabelOptions, {Overrides} from "recast/parsers/_babel_options" +import * as babel from "recast/parsers/babel" export const customTsParser = { parse(source: string, options?: Overrides) { diff --git a/packages/installer/test/executors/add-dependency-executor.test.ts b/packages/installer/test/executors/add-dependency-executor.test.ts index 9e2ba84a1..e9f75f40e 100644 --- a/packages/installer/test/executors/add-dependency-executor.test.ts +++ b/packages/installer/test/executors/add-dependency-executor.test.ts @@ -1,7 +1,7 @@ -import * as AddDependencyExecutor from "../../src/executors/add-dependency-executor" -import {existsSync} from "fs-extra" import {spawn} from "cross-spawn" +import {existsSync} from "fs-extra" import {mocked} from "ts-jest/utils" +import * as AddDependencyExecutor from "../../src/executors/add-dependency-executor" jest.mock("fs-extra") jest.mock("cross-spawn") diff --git a/packages/repl/src/repl.ts b/packages/repl/src/repl.ts index 7e645a7eb..57dd121c7 100644 --- a/packages/repl/src/repl.ts +++ b/packages/repl/src/repl.ts @@ -1,11 +1,10 @@ -import * as REPL from "repl" -import path from "path" -import fs from "fs" -import {REPLCommand, REPLServer} from "repl" import {watch} from "chokidar" -import pkgDir from "pkg-dir" +import fs from "fs" import os from "os" - +import path from "path" +import pkgDir from "pkg-dir" +import * as REPL from "repl" +import {REPLCommand, REPLServer} from "repl" // import {loadDependencies} from '../utils/load-dependencies' import {getBlitzModulePaths, loadBlitz} from "./utils/load-blitz" diff --git a/packages/repl/src/utils/load-blitz.ts b/packages/repl/src/utils/load-blitz.ts index 6c7e1760f..5015ff11c 100644 --- a/packages/repl/src/utils/load-blitz.ts +++ b/packages/repl/src/utils/load-blitz.ts @@ -1,8 +1,8 @@ -import {forceRequire} from "./module" -import path from "path" import globby from "globby" +import path from "path" import pkgDir from "pkg-dir" import ProgressBar from "progress" +import {forceRequire} from "./module" const projectRoot = pkgDir.sync() || process.cwd() diff --git a/packages/repl/test/repl.test.ts b/packages/repl/test/repl.test.ts index 8d030f261..f236381e8 100644 --- a/packages/repl/test/repl.test.ts +++ b/packages/repl/test/repl.test.ts @@ -1,10 +1,9 @@ -import * as repl from "repl" import * as chokidar from "chokidar" -import {REPLServer} from "repl" import {FSWatcher} from "chokidar" - -import * as loadBlitzFunctions from "../src/utils/load-blitz" +import * as repl from "repl" +import {REPLServer} from "repl" import {runRepl} from "../src/repl" +import * as loadBlitzFunctions from "../src/utils/load-blitz" jest.spyOn(global.console, "log").mockImplementation() diff --git a/packages/server/src/next-utils.ts b/packages/server/src/next-utils.ts index 2ed4a7aec..1cf0cff3f 100644 --- a/packages/server/src/next-utils.ts +++ b/packages/server/src/next-utils.ts @@ -1,9 +1,9 @@ +import {log} from "@blitzjs/display" +import {ServerConfig} from "config" import {spawn} from "cross-spawn" import detect from "detect-port" import {Manifest} from "./stages/manifest" import {through} from "./streams" -import {ServerConfig} from "config" -import {log} from "@blitzjs/display" function createOutputTransformer(manifest: Manifest, devFolder: string) { const stream = through((data, _, next) => { diff --git a/packages/server/src/parse-chokidar-rules-from-gitignore.ts b/packages/server/src/parse-chokidar-rules-from-gitignore.ts index 18f80fd14..291e9f21b 100644 --- a/packages/server/src/parse-chokidar-rules-from-gitignore.ts +++ b/packages/server/src/parse-chokidar-rules-from-gitignore.ts @@ -1,10 +1,10 @@ -import parseGitignore from "parse-gitignore" +import {log} from "@blitzjs/display" +import spawn from "cross-spawn" +import expandTilde from "expand-tilde" +import fastGlob from "fast-glob" import fs from "fs" import partition from "lodash/partition" -import fastGlob from "fast-glob" -import spawn from "cross-spawn" -import {log} from "@blitzjs/display" -import expandTilde from "expand-tilde" +import parseGitignore from "parse-gitignore" const {GIT_DIR = ".git"} = process.env diff --git a/packages/server/src/prod.ts b/packages/server/src/prod.ts index 78d69b1a4..4fe99425a 100644 --- a/packages/server/src/prod.ts +++ b/packages/server/src/prod.ts @@ -1,7 +1,7 @@ -import {ServerConfig, normalize} from "./config" -import {nextStart} from "./next-utils" import {build} from "./build" import {alreadyBuilt} from "./build-hash" +import {normalize, ServerConfig} from "./config" +import {nextStart} from "./next-utils" export async function prod( config: ServerConfig, diff --git a/packages/server/src/resolve-bin-async.ts b/packages/server/src/resolve-bin-async.ts index 41d0b9f93..f22af0740 100644 --- a/packages/server/src/resolve-bin-async.ts +++ b/packages/server/src/resolve-bin-async.ts @@ -1,6 +1,6 @@ -import resolveCwd from "resolve-cwd" -import pkgDir from "pkg-dir" import path from "path" +import pkgDir from "pkg-dir" +import resolveCwd from "resolve-cwd" export async function resolveBinAsync(pkg: string, executable = pkg) { const packageDir = await pkgDir(resolveCwd(pkg)) diff --git a/packages/server/src/rpc.ts b/packages/server/src/rpc.ts index a57277dd6..32c73ae0b 100644 --- a/packages/server/src/rpc.ts +++ b/packages/server/src/rpc.ts @@ -1,15 +1,15 @@ import { - Middleware, BlitzApiRequest, BlitzApiResponse, EnhancedResolver, handleRequestWithMiddleware, + Middleware, } from "@blitzjs/core" -import {serializeError} from "serialize-error" -import {serialize, deserialize} from "superjson" +import {baseLogger, log as displayLog} from "@blitzjs/display" import chalk from "chalk" import prettyMs from "pretty-ms" -import {baseLogger, log as displayLog} from "@blitzjs/display" +import {serializeError} from "serialize-error" +import {deserialize, serialize} from "superjson" const rpcMiddleware = ( resolver: EnhancedResolver, diff --git a/packages/server/src/stages/config/index.ts b/packages/server/src/stages/config/index.ts index e8f60fa19..090fd8d3a 100644 --- a/packages/server/src/stages/config/index.ts +++ b/packages/server/src/stages/config/index.ts @@ -1,10 +1,9 @@ +import {transform} from "@blitzjs/file-pipeline" +import {Stage} from "@blitzjs/file-pipeline" import {pathExistsSync} from "fs-extra" import {resolve} from "path" import File from "vinyl" -import {transform} from "@blitzjs/file-pipeline" -import {Stage} from "@blitzjs/file-pipeline" - const isNextConfigPath = (p: string) => /next\.config\.(js|ts)/.test(p) const isNowBuild = () => process.env.NOW_BUILDER || process.env.VERCEL_BUILDER /** diff --git a/packages/server/src/stages/manifest/index.ts b/packages/server/src/stages/manifest/index.ts index 0223ce6a0..ce9f432d6 100644 --- a/packages/server/src/stages/manifest/index.ts +++ b/packages/server/src/stages/manifest/index.ts @@ -1,6 +1,6 @@ -import File from "vinyl" -import {Stage, PipelineItem, transform} from "@blitzjs/file-pipeline" +import {PipelineItem, Stage, transform} from "@blitzjs/file-pipeline" import debounce from "lodash/debounce" +import File from "vinyl" type ManifestVO = { keys: {[k: string]: string} diff --git a/packages/server/src/stages/pages/errors.ts b/packages/server/src/stages/pages/errors.ts index d34e25a51..c6f7969aa 100644 --- a/packages/server/src/stages/pages/errors.ts +++ b/packages/server/src/stages/pages/errors.ts @@ -1,6 +1,6 @@ import {log} from "@blitzjs/display" -import {Writable} from "stream" import {ERROR_THROWN} from "@blitzjs/file-pipeline" +import {Writable} from "stream" export type Event = {type: string; payload: T} diff --git a/packages/server/src/stages/pages/find-duplicates.test.ts b/packages/server/src/stages/pages/find-duplicates.test.ts index 13bc91f35..c209d983c 100644 --- a/packages/server/src/stages/pages/find-duplicates.test.ts +++ b/packages/server/src/stages/pages/find-duplicates.test.ts @@ -1,5 +1,5 @@ -import {fullTransformer, findDuplicates, filterBy} from "." import {normalize} from "path" +import {filterBy, findDuplicates, fullTransformer} from "." test("should filter by path", () => { expect(fullTransformer(normalize("app/foo/pages/api/bar.ts"))).toBe(normalize("pages/api/bar.ts")) diff --git a/packages/server/src/stages/pages/index.ts b/packages/server/src/stages/pages/index.ts index 9de3d4a7e..3816289c7 100644 --- a/packages/server/src/stages/pages/index.ts +++ b/packages/server/src/stages/pages/index.ts @@ -1,8 +1,8 @@ +import {Stage, transform} from "@blitzjs/file-pipeline" +import flow from "lodash/flow" import {join} from "path" import {absolutePathTransform} from "../utils" -import {Stage, transform} from "@blitzjs/file-pipeline" -import {handleErrors, DuplicatePathError} from "./errors" -import flow from "lodash/flow" +import {DuplicatePathError, handleErrors} from "./errors" export function pagesPathTransformer(path: string) { const regex = /(?:[\\/]?app[\\/].*?[\\/]?)(pages[\\/].+(? { test("test relative stream", async () => { const expected = [ diff --git a/packages/server/src/streams.ts b/packages/server/src/streams.ts index 6529dcbbd..f960aea31 100644 --- a/packages/server/src/streams.ts +++ b/packages/server/src/streams.ts @@ -2,11 +2,9 @@ // helpers based on the missisippi library import {Stream} from "stream" - // Remove error 'default' is imported from external module 'pump' but never used // import pipe from 'pump' // export {pipe} - import through from "through2" export {through} diff --git a/packages/server/src/supertokens.test.ts b/packages/server/src/supertokens.test.ts index 7a461cf0b..441a7b9d8 100644 --- a/packages/server/src/supertokens.test.ts +++ b/packages/server/src/supertokens.test.ts @@ -1,21 +1,20 @@ -import {apiResolver} from "next/dist/next-server/server/api-utils" -import http from "http" -import listen from "test-listen" -import fetch from "isomorphic-unfetch" import { + COOKIE_ANONYMOUS_SESSION_TOKEN, + COOKIE_PUBLIC_DATA_TOKEN, + COOKIE_REFRESH_TOKEN, + COOKIE_SESSION_TOKEN, EnhancedResolver, HEADER_CSRF, HEADER_PUBLIC_DATA_TOKEN, - COOKIE_ANONYMOUS_SESSION_TOKEN, - COOKIE_SESSION_TOKEN, - COOKIE_REFRESH_TOKEN, - COOKIE_PUBLIC_DATA_TOKEN, - TOKEN_SEPARATOR, SessionContext, + TOKEN_SEPARATOR, } from "@blitzjs/core" -import {rpcApiHandler} from "./rpc" import {atob} from "b64-lite" - +import http from "http" +import fetch from "isomorphic-unfetch" +import {apiResolver} from "next/dist/next-server/server/api-utils" +import listen from "test-listen" +import {rpcApiHandler} from "./rpc" import {sessionMiddleware, unstable_simpleRolesIsAuthorized} from "./supertokens" const isIsoDate = (str: string) => { diff --git a/packages/server/src/supertokens.ts b/packages/server/src/supertokens.ts index 885e0d769..e799402b4 100644 --- a/packages/server/src/supertokens.ts +++ b/packages/server/src/supertokens.ts @@ -1,42 +1,42 @@ -import hasha, {HashaInput} from "hasha" -import cookie from "cookie" -import {nanoid} from "nanoid" -import {sign as jwtSign, verify as jwtVerify} from "jsonwebtoken" +import {getConfig} from "@blitzjs/config" import { - BlitzApiRequest, - BlitzApiResponse, - Middleware, AuthenticationError, AuthorizationError, - CSRFTokenMismatchError, - SessionConfig, - PublicData, - SessionContext, - TOKEN_SEPARATOR, - HANDLE_SEPARATOR, - SESSION_TYPE_OPAQUE_TOKEN_SIMPLE, - SESSION_TYPE_ANONYMOUS_JWT, - SESSION_TOKEN_VERSION_0, + BlitzApiRequest, + BlitzApiResponse, COOKIE_ANONYMOUS_SESSION_TOKEN, - COOKIE_SESSION_TOKEN, - COOKIE_REFRESH_TOKEN, COOKIE_CSRF_TOKEN, COOKIE_PUBLIC_DATA_TOKEN, + COOKIE_REFRESH_TOKEN, + COOKIE_SESSION_TOKEN, + CSRFTokenMismatchError, + HANDLE_SEPARATOR, HEADER_CSRF, - HEADER_SESSION_REVOKED, HEADER_CSRF_ERROR, HEADER_PUBLIC_DATA_TOKEN, - MiddlewareResponse, + HEADER_SESSION_REVOKED, isLocalhost, + Middleware, + MiddlewareResponse, + PublicData, + SESSION_TOKEN_VERSION_0, + SESSION_TYPE_ANONYMOUS_JWT, + SESSION_TYPE_OPAQUE_TOKEN_SIMPLE, + SessionConfig, + SessionContext, + TOKEN_SEPARATOR, } from "@blitzjs/core" -import {getConfig} from "@blitzjs/config" -import pkgDir from "pkg-dir" -import {join} from "path" -import {addMinutes, addYears, isPast, differenceInMinutes} from "date-fns" -import {btoa, atob} from "b64-lite" -import {getCookieParser} from "next/dist/next-server/server/api-utils" -import {IncomingMessage, ServerResponse} from "http" import {log} from "@blitzjs/display" +import {atob, btoa} from "b64-lite" +import cookie from "cookie" +import {addMinutes, addYears, differenceInMinutes, isPast} from "date-fns" +import hasha, {HashaInput} from "hasha" +import {IncomingMessage, ServerResponse} from "http" +import {sign as jwtSign, verify as jwtVerify} from "jsonwebtoken" +import {nanoid} from "nanoid" +import {getCookieParser} from "next/dist/next-server/server/api-utils" +import {join} from "path" +import pkgDir from "pkg-dir" const debug = require("debug")("blitz:session") function assert(condition: any, message: string): asserts condition { diff --git a/packages/server/src/with-blitz.ts b/packages/server/src/with-blitz.ts index 78046cd77..f44a1118d 100644 --- a/packages/server/src/with-blitz.ts +++ b/packages/server/src/with-blitz.ts @@ -1,6 +1,6 @@ -import pkgDir from "pkg-dir" -import path from "path" import fs from "fs" +import path from "path" +import pkgDir from "pkg-dir" export function withBlitz(nextConfig: any) { return (phase: string, nextOpts: any = {}) => { diff --git a/packages/server/test/api-routes.test.ts b/packages/server/test/api-routes.test.ts index 3dec4b1f0..58d432a82 100644 --- a/packages/server/test/api-routes.test.ts +++ b/packages/server/test/api-routes.test.ts @@ -1,7 +1,7 @@ /* eslint-disable import/first */ -import {multiMock} from "./utils/multi-mock" import {resolve} from "path" +import {multiMock} from "./utils/multi-mock" const mocks = multiMock( { diff --git a/packages/server/test/build.test.ts b/packages/server/test/build.test.ts index 2509c900c..a62e17fb5 100644 --- a/packages/server/test/build.test.ts +++ b/packages/server/test/build.test.ts @@ -1,6 +1,6 @@ /* eslint-disable import/first */ -import {multiMock} from "./utils/multi-mock" import {resolve} from "path" +import {multiMock} from "./utils/multi-mock" const mocks = multiMock( { diff --git a/packages/server/test/dev.test.ts b/packages/server/test/dev.test.ts index 3e3efd00e..143271ca6 100644 --- a/packages/server/test/dev.test.ts +++ b/packages/server/test/dev.test.ts @@ -1,7 +1,7 @@ /* eslint-disable import/first */ +import {join, resolve} from "path" import {multiMock} from "./utils/multi-mock" -import {resolve, join} from "path" const mocks = multiMock( { "next-utils": { diff --git a/packages/server/test/parse-chokidar-rules-from-gitignore.test.ts b/packages/server/test/parse-chokidar-rules-from-gitignore.test.ts index ac8afffe6..acda80041 100644 --- a/packages/server/test/parse-chokidar-rules-from-gitignore.test.ts +++ b/packages/server/test/parse-chokidar-rules-from-gitignore.test.ts @@ -1,11 +1,11 @@ +import spawn from "cross-spawn" +import {resolve} from "path" import { chokidarRulesFromGitignore, - isControlledByUser, getAllGitIgnores, + isControlledByUser, } from "../src/parse-chokidar-rules-from-gitignore" -import spawn from "cross-spawn" import {multiMock} from "./utils/multi-mock" -import {resolve} from "path" const mocks = multiMock({}, resolve(__dirname, "..")) const originalSync = spawn.sync diff --git a/packages/server/test/prod.test.ts b/packages/server/test/prod.test.ts index 6273fd94b..faa75245c 100644 --- a/packages/server/test/prod.test.ts +++ b/packages/server/test/prod.test.ts @@ -1,7 +1,7 @@ /* eslint-disable import/first */ -import {multiMock} from "./utils/multi-mock" import {resolve} from "path" +import {multiMock} from "./utils/multi-mock" const mocks = multiMock( { @@ -18,9 +18,9 @@ const mocks = multiMock( ) // Import with mocks applied -import {prod} from "../src/prod" import {ensureDir, writeFile} from "fs-extra" import {getInputArtefactsHash} from "../src/build-hash" +import {prod} from "../src/prod" describe("Prod command", () => { const rootFolder = resolve("build") diff --git a/packages/server/test/rpc.test.ts b/packages/server/test/rpc.test.ts index 3c62a78ce..2a5a6caa6 100644 --- a/packages/server/test/rpc.test.ts +++ b/packages/server/test/rpc.test.ts @@ -1,9 +1,9 @@ -import http from "http" -import fetch from "isomorphic-unfetch" -import listen from "test-listen" -import {apiResolver} from "next/dist/next-server/server/api-utils" import {connectMiddleware, EnhancedResolver} from "@blitzjs/core" import delay from "delay" +import http from "http" +import fetch from "isomorphic-unfetch" +import {apiResolver} from "next/dist/next-server/server/api-utils" +import listen from "test-listen" import {rpcApiHandler} from "../src/rpc" describe("rpcMiddleware", () => { diff --git a/packages/server/test/rules.test.ts b/packages/server/test/rules.test.ts index ae7156fe8..69722b7a3 100644 --- a/packages/server/test/rules.test.ts +++ b/packages/server/test/rules.test.ts @@ -1,7 +1,7 @@ /* eslint-disable import/first */ -import {multiMock} from "./utils/multi-mock" import {resolve} from "path" +import {multiMock} from "./utils/multi-mock" const mocks = multiMock( { "next-utils": { diff --git a/packages/server/test/vercel-now.test.ts b/packages/server/test/vercel-now.test.ts index b4640c16c..e52472226 100644 --- a/packages/server/test/vercel-now.test.ts +++ b/packages/server/test/vercel-now.test.ts @@ -1,7 +1,7 @@ /* eslint-disable import/first */ -import {multiMock} from "./utils/multi-mock" import {resolve} from "path" +import {multiMock} from "./utils/multi-mock" const mocks = multiMock( { "next-utils": { diff --git a/recipes/base-web/index.ts b/recipes/base-web/index.ts index e9cfa88e3..2d3b73cee 100644 --- a/recipes/base-web/index.ts +++ b/recipes/base-web/index.ts @@ -1,4 +1,4 @@ -import {RecipeBuilder, paths, addImport} from "@blitzjs/installer" +import {addImport, paths, RecipeBuilder} from "@blitzjs/installer" import j from "jscodeshift" import {Collection} from "jscodeshift/src/Collection" import {join} from "path" diff --git a/recipes/chakra/index.ts b/recipes/chakra/index.ts index 1137a4927..b45c021db 100644 --- a/recipes/chakra/index.ts +++ b/recipes/chakra/index.ts @@ -1,6 +1,6 @@ -import {RecipeBuilder, paths, addImport} from "@blitzjs/installer" -import j from "jscodeshift" +import {addImport, paths, RecipeBuilder} from "@blitzjs/installer" import {NodePath} from "ast-types/lib/node-path" +import j from "jscodeshift" import {Collection} from "jscodeshift/src/Collection" // Copied from https://github.com/blitz-js/blitz/pull/805, let's add this to the @blitzjs/installer diff --git a/recipes/emotion/index.ts b/recipes/emotion/index.ts index 05878caaf..a4fd74228 100644 --- a/recipes/emotion/index.ts +++ b/recipes/emotion/index.ts @@ -1,7 +1,7 @@ -import {RecipeBuilder, paths, addImport} from "@blitzjs/installer" -import {join} from "path" +import {addImport, paths, RecipeBuilder} from "@blitzjs/installer" import j from "jscodeshift" import {Collection} from "jscodeshift/src/Collection" +import {join} from "path" function wrapComponentWithCacheProvider(program: Collection) { program diff --git a/recipes/material-ui/index.ts b/recipes/material-ui/index.ts index bfaf3c059..8ac9d4e4a 100644 --- a/recipes/material-ui/index.ts +++ b/recipes/material-ui/index.ts @@ -1,4 +1,4 @@ -import {RecipeBuilder, paths, addImport} from "@blitzjs/installer" +import {addImport, paths, RecipeBuilder} from "@blitzjs/installer" import j from "jscodeshift" import {Collection} from "jscodeshift/src/Collection" diff --git a/recipes/tailwind/index.ts b/recipes/tailwind/index.ts index 209de3631..3bff4637d 100644 --- a/recipes/tailwind/index.ts +++ b/recipes/tailwind/index.ts @@ -1,7 +1,7 @@ -import {RecipeBuilder, paths, addImport} from "@blitzjs/installer" -import {join} from "path" +import {addImport, paths, RecipeBuilder} from "@blitzjs/installer" import j from "jscodeshift" import {Collection} from "jscodeshift/src/Collection" +import {join} from "path" export default RecipeBuilder() .setName("Tailwind CSS") diff --git a/yarn.lock b/yarn.lock index ae1e5857a..24fd7ca97 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8997,6 +8997,11 @@ eslint-plugin-react@^7.14.3: string.prototype.matchall "^4.0.2" xregexp "^4.3.0" +eslint-plugin-simple-import-sort@5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-5.0.3.tgz#9ae258ddada6efffc55e47a134afbd279eb31fc6" + integrity sha512-1rf3AWiHeWNCQdAq0iXNnlccnH1UDnelGgrPbjBBHE8d2hXVtOudcmy0vTF4hri3iJ0MKz8jBhmH6lJ0ZWZLHQ== + eslint-plugin-unicorn@21.0.0: version "21.0.0" resolved "https://registry.yarnpkg.com/eslint-plugin-unicorn/-/eslint-plugin-unicorn-21.0.0.tgz#7e3a8b0f725f003619e1f40d769939ecd8d708d0"