From 81d3ccab4cb45639abff9868f870b722be55b536 Mon Sep 17 00:00:00 2001 From: rusconn Date: Thu, 1 Jun 2023 16:36:09 +0900 Subject: [PATCH] chore(deps): upgrade @ianvs/prettier-plugin-sort-imports --- app/encoders-decoders/url/page.tsx | 2 +- app/layout.tsx | 1 + components/ui/button.tsx | 2 +- contexts/search-text.tsx | 2 +- package.json | 2 +- pnpm-lock.yaml | 24 +++++------------------- prettier.config.js | 7 ++----- types/route.ts | 1 + 8 files changed, 13 insertions(+), 28 deletions(-) diff --git a/app/encoders-decoders/url/page.tsx b/app/encoders-decoders/url/page.tsx index 74aa062..eac521a 100644 --- a/app/encoders-decoders/url/page.tsx +++ b/app/encoders-decoders/url/page.tsx @@ -1,8 +1,8 @@ "use client"; import { useCallback, useMemo, useState } from "react"; -import * as O from "fp-ts/lib/Option"; import { constant } from "fp-ts/lib/function"; +import * as O from "fp-ts/lib/Option"; import { toolGroups } from "@/config/tools"; import { safeDecodeURIComponent, safeEncodeURIComponent } from "@/lib/uri"; diff --git a/app/layout.tsx b/app/layout.tsx index 630891a..277bfd0 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -1,4 +1,5 @@ import "@/styles/globals.css"; + import { Metadata } from "next"; import { SearchTextProvider } from "@/contexts/search-text"; diff --git a/components/ui/button.tsx b/components/ui/button.tsx index 4630d96..d7964cd 100644 --- a/components/ui/button.tsx +++ b/components/ui/button.tsx @@ -1,5 +1,5 @@ import * as React from "react"; -import { VariantProps, cva } from "class-variance-authority"; +import { cva, VariantProps } from "class-variance-authority"; import { cn } from "@/lib/style"; diff --git a/contexts/search-text.tsx b/contexts/search-text.tsx index 7e19de8..1283908 100644 --- a/contexts/search-text.tsx +++ b/contexts/search-text.tsx @@ -1,6 +1,6 @@ "use client"; -import { PropsWithChildren, createContext, useContext, useState } from "react"; +import { createContext, PropsWithChildren, useContext, useState } from "react"; const SearchTextContext = createContext(""); const SetSearchTextContext = createContext<(text: string) => void>(() => {}); diff --git a/package.json b/package.json index 426c588..d8d6f94 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "yaml": "^2.3.1" }, "devDependencies": { - "@ianvs/prettier-plugin-sort-imports": "^3.7.2", + "@ianvs/prettier-plugin-sort-imports": "^4.0.1", "@types/create-hash": "^1.2.2", "@types/node": "~18.16.16", "@types/react": "~18.2.7", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e9a6454..40de0f9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -91,8 +91,8 @@ dependencies: devDependencies: '@ianvs/prettier-plugin-sort-imports': - specifier: ^3.7.2 - version: 3.7.2(prettier@2.8.8) + specifier: ^4.0.1 + version: 4.0.1(prettier@2.8.8) '@types/create-hash': specifier: ^1.2.2 version: 1.2.2 @@ -422,8 +422,8 @@ packages: resolution: {integrity: sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==} dev: true - /@ianvs/prettier-plugin-sort-imports@3.7.2(prettier@2.8.8): - resolution: {integrity: sha512-bVckKToJM8XV2wTOG1VpeXrSmfAG49esVrikbxeFbY51RJdNke9AdMANJtGuACB59uo+pGlz0wBdWFrRzWyO1A==} + /@ianvs/prettier-plugin-sort-imports@4.0.1(prettier@2.8.8): + resolution: {integrity: sha512-xFpOSzroyJRSxgJSNc3beLIrRgrCzh8TjtFL7iPFyX7VMR57jsnPieKIctAehbWST4Z3uHKAd1iLrSWBf9rILQ==} peerDependencies: '@vue/compiler-sfc': '>=3.0.0' prettier: 2.x @@ -436,10 +436,8 @@ packages: '@babel/parser': 7.22.4 '@babel/traverse': 7.22.4 '@babel/types': 7.22.4 - javascript-natural-sort: 0.7.1 - lodash.clone: 4.5.0 - lodash.isequal: 4.5.0 prettier: 2.8.8 + semver: 7.5.1 transitivePeerDependencies: - supports-color dev: true @@ -3219,10 +3217,6 @@ packages: resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==} dev: true - /javascript-natural-sort@0.7.1: - resolution: {integrity: sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw==} - dev: true - /jiti@1.18.2: resolution: {integrity: sha512-QAdOptna2NYiSSpv0O/BwoHBSmz4YhpzJHyi+fnMRTXFjp7B8i/YG5Z8IfusxB1ufjcD2Sre1F3R+nX3fvy7gg==} hasBin: true @@ -3310,14 +3304,6 @@ packages: p-locate: 5.0.0 dev: true - /lodash.clone@4.5.0: - resolution: {integrity: sha512-GhrVeweiTD6uTmmn5hV/lzgCQhccwReIVRLHp7LT4SopOjqEZ5BbX8b5WWEtAKasjmy8hR7ZPwsYlxRCku5odg==} - dev: true - - /lodash.isequal@4.5.0: - resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==} - dev: true - /lodash.merge@4.6.2: resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==} dev: true diff --git a/prettier.config.js b/prettier.config.js index 93e94b0..16d8ec7 100644 --- a/prettier.config.js +++ b/prettier.config.js @@ -3,6 +3,8 @@ module.exports = { printWidth: 100, arrowParens: "avoid", importOrder: [ + "", + "", "^(react/(.*)$)|^(react$)", "^(next/(.*)$)|^(next$)", "", @@ -19,11 +21,6 @@ module.exports = { "", "^[./]", ], - importOrderSeparation: false, - importOrderSortSpecifiers: true, - importOrderBuiltinModulesToTop: true, importOrderParserPlugins: ["typescript", "jsx", "decorators-legacy"], - importOrderMergeDuplicateImports: true, - importOrderCombineTypeAndValueImports: true, plugins: ["@ianvs/prettier-plugin-sort-imports"], }; diff --git a/types/route.ts b/types/route.ts index 4623fb0..7bbad11 100644 --- a/types/route.ts +++ b/types/route.ts @@ -1,4 +1,5 @@ import { UrlObject } from "url"; + import { LinkProps } from "next/link"; export type ValidHref = Exclude["href"], UrlObject>;