Skip to content

Commit

Permalink
chore: lint with biome (#2525)
Browse files Browse the repository at this point in the history
  • Loading branch information
pi0 authored Jun 13, 2024
1 parent 93d002b commit 7e1a70a
Show file tree
Hide file tree
Showing 140 changed files with 482 additions and 462 deletions.
29 changes: 27 additions & 2 deletions biome.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,35 @@
"ignore": ["**/*.gen.ts", "./package.json"]
},
"linter": {
"enabled": false
"enabled": true,
"rules": {
"suspicious": {
"noExplicitAny": "off",
"noImplicitAnyLet": "off",
"noAssignInExpressions": "off",
"noConfusingVoidType": "off",
"noEmptyInterface": "off"
},
"style": {
"noNonNullAssertion": "off",
"noArguments": "off",
"useTemplate": "off",
"noUnusedTemplateLiteral": "off",
"noParameterAssign": "off",
"useShorthandFunctionType": "off"
},
"complexity": {
"noBannedTypes": "off",
"useArrowFunction": "off",
"noUselessEmptyExport": "off"
},
"performance": {
"noDelete": "off"
}
}
},
"organizeImports": {
"enabled": false
"enabled": true
},
"javascript": {
"formatter": {
Expand Down
6 changes: 3 additions & 3 deletions build.config.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { defineBuildConfig } from "unbuild";
import { resolve } from "pathe";
import { writeFile } from "node:fs/promises";
import { fileURLToPath } from "node:url";
import { resolve } from "pathe";
import { normalize } from "pathe";
import { writeFile } from "node:fs/promises";
import { defineBuildConfig } from "unbuild";

const srcDir = fileURLToPath(new URL("src", import.meta.url));

Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@
"dev": "pnpm nitro dev playground",
"dev:build": "pnpm nitro build playground",
"dev:start": "node playground/.output/server/index.mjs",
"lint": "eslint --cache . && biome format .",
"lint:fix": "eslint --cache --fix . && biome format . --write",
"lint": "eslint --cache . && biome check .",
"lint:fix": "eslint --cache --fix . && biome check . --write",
"nitro": "JITI_ESM_RESOLVE=1 NODE_OPTIONS=\"--enable-source-maps\" jiti ./src/cli/index.ts",
"prepack": "pnpm build",
"gen-mirror": "JITI_ESM_RESOLVE=1 pnpm jiti scripts/gen-mirror.ts",
Expand Down
2 changes: 1 addition & 1 deletion scripts/bump-nightly.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { promises as fsp } from "node:fs";
import { execaCommand } from "execa";
import { resolve } from "pathe";
import { globby } from "globby";
import { resolve } from "pathe";

const nightlyPackages = {
h3: "h3-nightly",
Expand Down
7 changes: 3 additions & 4 deletions scripts/gen-mirror.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import { subpaths } from "../build.config";
import { cp, mkdir, rm, writeFile } from "node:fs/promises";
import { fileURLToPath } from "mlly";
import { PackageJson, readPackageJSON } from "pkg-types";
import { writeFile, mkdir, rm, cp } from "node:fs/promises";
import { join } from "pathe";
import { e } from "crossws/dist/shared/crossws.381454fe";
import { type PackageJson, readPackageJSON } from "pkg-types";
import { subpaths } from "../build.config";

const copyPkgFields = [
"description",
Expand Down
10 changes: 5 additions & 5 deletions scripts/gen-presets.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import createJITI from "jiti";
import { consola } from "consola";
import { kebabCase, camelCase, pascalCase, snakeCase } from "scule";
import { readdirSync, existsSync, writeFileSync, readFileSync } from "node:fs";
import { existsSync, readFileSync, readdirSync, writeFileSync } from "node:fs";
import { resolve } from "node:path";
import { fileURLToPath } from "node:url";
import type { NitroPreset, NitroPresetMeta } from "nitropack/types";
import { consola } from "consola";
import createJITI from "jiti";
import { findTypeExports } from "mlly";
import type { NitroPreset, NitroPresetMeta } from "nitropack/types";
import { camelCase, kebabCase, pascalCase, snakeCase } from "scule";
import { subpaths } from "../build.config";

const autoGenHeader = /* ts */ `// Auto-generated using gen-presets script\n`;
Expand Down
10 changes: 5 additions & 5 deletions src/cli/commands/build.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { defineCommand } from "citty";
import { resolve } from "pathe";
import type { DateString } from "compatx";
import {
createNitro,
prerender,
build,
prepare,
copyPublicAssets,
createNitro,
prepare,
prerender,
} from "nitropack/core";
import { resolve } from "pathe";
import { commonArgs } from "../common";
import type { DateString } from "compatx";

export default defineCommand({
meta: {
Expand Down
6 changes: 3 additions & 3 deletions src/cli/commands/dev.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { defineCommand } from "citty";
import { resolve } from "pathe";
import { consola } from "consola";
import { getArgs, parseArgs } from "listhen/cli";
import { createNitro, build, prepare, createDevServer } from "nitropack/core";
import { commonArgs } from "../common";
import { build, createDevServer, createNitro, prepare } from "nitropack/core";
import type { Nitro } from "nitropack/types";
import { resolve } from "pathe";
import { commonArgs } from "../common";

const hmrKeyRe = /^runtimeConfig\.|routeRules\./;

Expand Down
2 changes: 1 addition & 1 deletion src/cli/commands/prepare.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { defineCommand } from "citty";
import { resolve } from "pathe";
import { createNitro, writeTypes } from "nitropack/core";
import { resolve } from "pathe";
import { commonArgs } from "../common";

export default defineCommand({
Expand Down
2 changes: 1 addition & 1 deletion src/cli/commands/task/list.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { defineCommand } from "citty";
import { resolve } from "pathe";
import { consola } from "consola";
import { listTasks } from "nitropack/core";
import { resolve } from "pathe";

export default defineCommand({
meta: {
Expand Down
4 changes: 2 additions & 2 deletions src/cli/commands/task/run.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { defineCommand } from "citty";
import { resolve } from "pathe";
import destr from "destr";
import { consola } from "consola";
import destr from "destr";
import { runTask } from "nitropack/core";
import { resolve } from "pathe";

export default defineCommand({
meta: {
Expand Down
4 changes: 2 additions & 2 deletions src/core/build/assets.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { existsSync, promises as fsp } from "node:fs";
import { relative, resolve, join } from "pathe";
import { globby } from "globby";
import { prettyPath, isDirectory } from "nitropack/kit";
import { isDirectory, prettyPath } from "nitropack/kit";
import type { Nitro } from "nitropack/types";
import { join, relative, resolve } from "pathe";
import { compressPublicAssets } from "../utils/compress";

const NEGATION_RE = /^(!?)(.*)$/;
Expand Down
12 changes: 6 additions & 6 deletions src/core/build/dev.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { join } from "pathe";
import * as rollup from "rollup";
import { watch } from "chokidar";
import defu from "defu";
import type { Nitro, RollupConfig } from "nitropack/types";
import { join } from "pathe";
import { debounce } from "perfect-debounce";
import * as rollup from "rollup";
import { GLOB_SCAN_PATTERN, scanHandlers } from "../scan";
import type { Nitro, RollupConfig } from "nitropack/types";
import { writeTypes } from "./types";
import defu from "defu";
import { formatRollupError } from "./error";
import { nitroServerName } from "../utils/nitro";
import { formatRollupError } from "./error";
import { writeTypes } from "./types";

export async function watchDev(nitro: Nitro, rollupConfig: RollupConfig) {
let rollupWatcher: rollup.RollupWatcher;
Expand Down
14 changes: 7 additions & 7 deletions src/core/build/prod.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import { promises as fsp } from "node:fs";
import { relative, resolve, join, dirname } from "pathe";
import * as rollup from "rollup";
import { generateFSTree } from "../utils/fs-tree";
import { formatCompatibilityDate } from "compatx";
import { writeFile } from "nitropack/kit";
import { scanHandlers } from "../scan";
import type { Nitro, NitroBuildInfo, RollupConfig } from "nitropack/types";
import { version as nitroVersion } from "nitropack/meta";
import type { Nitro, NitroBuildInfo, RollupConfig } from "nitropack/types";
import { dirname, join, relative, resolve } from "pathe";
import * as rollup from "rollup";
import { scanHandlers } from "../scan";
import { generateFSTree } from "../utils/fs-tree";
import { nitroServerName } from "../utils/nitro";
import { snapshotStorage } from "../utils/storage";
import { formatRollupError } from "./error";
import { writeTypes } from "./types";
import { nitroServerName } from "../utils/nitro";
import { formatCompatibilityDate } from "compatx";

export async function buildProduction(
nitro: Nitro,
Expand Down
14 changes: 7 additions & 7 deletions src/core/build/types.ts
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
import { existsSync, promises as fsp } from "node:fs";
import { resolve, join, dirname, isAbsolute } from "pathe";
import { resolveAlias } from "pathe/utils";
import { defu } from "defu";
import { genTypeImport } from "knitwork";
import type { TSConfig } from "pkg-types";
import {
lookupNodeModuleSubpath,
parseNodeModulePath,
resolvePath,
} from "mlly";
import { JSValue, generateTypes, resolveSchema } from "untyped";
import { writeFile, isDirectory, resolveNitroPath } from "nitropack/kit";
import type { Nitro, NitroTypes } from "nitropack/types";
import { isDirectory, resolveNitroPath, writeFile } from "nitropack/kit";
import { runtimeDir } from "nitropack/runtime/meta";
import type { Nitro, NitroTypes } from "nitropack/types";
import { dirname, isAbsolute, join, resolve } from "pathe";
import { relative } from "pathe";
import { resolveAlias } from "pathe/utils";
import type { TSConfig } from "pkg-types";
import { type JSValue, generateTypes, resolveSchema } from "untyped";

export async function writeTypes(nitro: Nitro) {
const types: NitroTypes = {
Expand Down Expand Up @@ -43,7 +43,7 @@ export async function writeTypes(nitro: Nitro) {
}

let autoImportedTypes: string[] = [];
let autoImportExports: string = "";
let autoImportExports = "";

if (nitro.unimport) {
await nitro.unimport.init();
Expand Down
6 changes: 3 additions & 3 deletions src/core/config/defaults.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { isTest, isDebug } from "std-env";
import type { NitroConfig } from "nitropack/types";
import { resolve, join } from "pathe";
import { runtimeDir } from "nitropack/runtime/meta";
import type { NitroConfig } from "nitropack/types";
import { join, resolve } from "pathe";
import { isDebug, isTest } from "std-env";

export const NitroDefaults: NitroConfig = {
// General
Expand Down
16 changes: 8 additions & 8 deletions src/core/config/loader.ts
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
import { loadConfig, watchConfig } from "c12";
import { type CompatibilityDateSpec, resolveCompatibilityDates } from "compatx";
import { klona } from "klona/full";
import { CompatibilityDateSpec, resolveCompatibilityDates } from "compatx";
import type { PresetName } from "nitropack/presets";
import type {
LoadConfigOptions,
NitroConfig,
NitroOptions,
NitroPresetMeta,
} from "nitropack/types";
import type { PresetName } from "nitropack/presets";

import { NitroDefaults } from "./defaults";

import { resolveAssetsOptions } from "./resolvers/assets";
// Resolvers
import {
fallbackCompatibilityDate,
resolveCompatibilityOptions,
} from "./resolvers/compatibility";
import { resolvePathOptions } from "./resolvers/paths";
import { resolveImportsOptions } from "./resolvers/imports";
import { resolveRouteRulesOptions } from "./resolvers/route-rules";
import { resolveDatabaseOptions } from "./resolvers/database";
import { resolveFetchOptions } from "./resolvers/fetch";
import { resolveExportConditionsOptions } from "./resolvers/export-conditions";
import { resolveRuntimeConfigOptions } from "./resolvers/runtime-config";
import { resolveFetchOptions } from "./resolvers/fetch";
import { resolveImportsOptions } from "./resolvers/imports";
import { resolveOpenAPIOptions } from "./resolvers/open-api";
import { resolveAssetsOptions } from "./resolvers/assets";
import { resolvePathOptions } from "./resolvers/paths";
import { resolveRouteRulesOptions } from "./resolvers/route-rules";
import { resolveRuntimeConfigOptions } from "./resolvers/runtime-config";
import { resolveURLOptions } from "./resolvers/url";

const configResolvers = [
Expand Down
4 changes: 2 additions & 2 deletions src/core/config/resolvers/assets.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { resolve } from "pathe";
import { existsSync } from "node:fs";
import { withLeadingSlash, withoutTrailingSlash } from "ufo";
import { defu } from "defu";
import type { NitroOptions } from "nitropack/types";
import { resolve } from "pathe";
import { withLeadingSlash, withoutTrailingSlash } from "ufo";

export async function resolveAssetsOptions(options: NitroOptions) {
// Public Assets
Expand Down
8 changes: 4 additions & 4 deletions src/core/config/resolvers/compatibility.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {
resolveCompatibilityDatesFromEnv,
type DateString,
formatDate,
DateString,
resolveCompatibilityDatesFromEnv,
} from "compatx";
import _consola from "consola";
import { colorize } from "consola/utils";
Expand All @@ -26,8 +26,8 @@ export async function resolveCompatibilityOptions(options: NitroOptions) {
}
}

let _fallbackInfoShown: boolean = false;
let _promptedUserToUpdate: boolean = false;
let _fallbackInfoShown = false;
let _promptedUserToUpdate = false;

async function _resolveDefault(options: NitroOptions): Promise<DateString> {
const _todayDate = formatDate(new Date());
Expand Down
4 changes: 2 additions & 2 deletions src/core/config/resolvers/export-conditions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ import type { NitroOptions } from "nitropack/types";

export async function resolveExportConditionsOptions(options: NitroOptions) {
options.exportConditions = _resolveExportConditions(
options.exportConditions,
options.exportConditions || [],
{ dev: options.dev, node: options.node, wasm: options.experimental.wasm }
);
}

function _resolveExportConditions(
conditions: string[] = [],
conditions: string[],
opts: { dev: boolean; node: boolean; wasm?: boolean }
) {
const resolvedConditions: string[] = [];
Expand Down
2 changes: 1 addition & 1 deletion src/core/config/resolvers/imports.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { NitroOptions } from "nitropack/types";
import escapeRE from "escape-string-regexp";
import { resolveModuleExportNames } from "mlly";
import type { NitroOptions } from "nitropack/types";
import { join } from "pathe";
import type { Preset } from "unimport";

Expand Down
2 changes: 1 addition & 1 deletion src/core/config/resolvers/open-api.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { NitroOptions } from "nitropack/types";
import { runtimeDir } from "nitropack/runtime/meta";
import type { NitroOptions } from "nitropack/types";
import { join } from "pathe";

export async function resolveOpenAPIOptions(options: NitroOptions) {
Expand Down
8 changes: 4 additions & 4 deletions src/core/config/resolvers/paths.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { findWorkspaceDir } from "pkg-types";
import { existsSync } from "node:fs";
import { resolveNitroPath } from "nitropack/kit";
import { pkgDir } from "nitropack/runtime/meta";
import type { NitroOptions } from "nitropack/types";
import { resolve, join } from "pathe";
import { join, resolve } from "pathe";
import { findWorkspaceDir } from "pkg-types";
import { NitroDefaults } from "../defaults";
import { pkgDir } from "nitropack/runtime/meta";
import { existsSync } from "node:fs";

export async function resolvePathOptions(options: NitroOptions) {
options.rootDir = resolve(options.rootDir || ".");
Expand Down
2 changes: 1 addition & 1 deletion src/core/config/resolvers/runtime-config.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import defu from "defu";
import type {
NitroOptions,
NitroConfig,
NitroOptions,
NitroRuntimeConfig,
} from "nitropack/types";

Expand Down
2 changes: 1 addition & 1 deletion src/core/config/update.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import consola from "consola";
import type { Nitro, NitroDynamicConfig } from "nitropack/types";
import { normalizeRouteRules } from "./resolvers/route-rules";
import { normalizeRuntimeConfig } from "./resolvers/runtime-config";
import consola from "consola";

export async function updateNitroConfig(
nitro: Nitro,
Expand Down
Loading

0 comments on commit 7e1a70a

Please sign in to comment.