Move v2 modules and components

src/components/v2/AttributeIcon.tsx

@@ -1,6 +1,6 @@
 import { Image, ThemeUIStyleObject } from 'theme-ui'
 import { assetsBucketBaseUrl } from '../../lib/consts'
-import { AttributeType } from '../../lib/v2-pre/data/types'
+import { AttributeType } from '../../lib/v2/data/types'
 
 interface AttributeIconProps {
   attributeType: AttributeType

src/components/v2/BattlesuitAvatarIcon.tsx

@@ -1,6 +1,6 @@
 import { Box } from 'theme-ui'
 import { assetsBucketBaseUrl } from '../../lib/consts'
-import { AttributeType, BattlesuitCatalogItem } from '../../lib/v2-pre/data/types'
+import { AttributeType, BattlesuitCatalogItem } from '../../lib/v2/data/types'
 
 interface BattlesuitAvatarIconProps {
   battlesuit: BattlesuitCatalogItem

src/components/v2/BattlesuitCatalogItemCard.tsx

@@ -1,5 +1,5 @@
 import { Box } from 'theme-ui'
-import { BattlesuitCatalogItem } from '../../lib/v2-pre/data/types'
+import { BattlesuitCatalogItem } from '../../lib/v2/data/types'
 import BattlesuitAvatarIcon from './BattlesuitAvatarIcon'
 
 interface BattlesuitCatalogItemCardProps {

src/components/v2/BattlesuitSmallIcon.tsx

@@ -1,6 +1,6 @@
 import { Box, Flex, Image } from 'theme-ui'
 import { assetsBucketBaseUrl } from '../../lib/consts'
-import { AttributeType, BattlesuitCatalogItem } from '../../lib/v2-pre/data/types'
+import { AttributeType, BattlesuitCatalogItem } from '../../lib/v2/data/types'
 
 interface BattlesuitAvatarIconProps {
   battlesuit: BattlesuitCatalogItem

src/components/v2/ChibiIcon.tsx

@@ -1,6 +1,6 @@
 import { Box } from 'theme-ui'
 import { assetsBucketBaseUrl } from '../../lib/consts'
-import { CharacterType } from '../../lib/v2-pre/data/types'
+import { CharacterType } from '../../lib/v2/data/types'
 
 interface ChibiIconProps {
   id: string

src/components/v2/FormattedText.tsx

@@ -1,5 +1,5 @@
 import { Text } from 'theme-ui'
-import { FormattedTextToken, tokenize } from '../../lib/v2-pre/formattedText/tokenize'
+import { FormattedTextToken, tokenize } from '../../lib/v2/formattedText/tokenize'
 
 interface FormattedTextProps {
   children: string

src/components/v2/StarIcon.tsx

@@ -1,6 +1,6 @@
 import { Box } from 'theme-ui'
 import { assetsBucketBaseUrl } from '../../lib/consts'
-import { StarRank } from '../../lib/v2-pre/data/types'
+import { StarRank } from '../../lib/v2/data/types'
 
 interface StarIconProps {
   star: StarRank

src/components/v2/StigmaTypeIcon.tsx

@@ -1,6 +1,6 @@
 import { Box } from 'theme-ui'
 import { assetsBucketBaseUrl } from '../../lib/consts'
-import { StigmaType } from '../../lib/v2-pre/data/types'
+import { StigmaType } from '../../lib/v2/data/types'
 
 interface StigmaTypeIconProps {
   type: StigmaType

src/components/v2/TagIcon.tsx

@@ -1,6 +1,6 @@
 import { Box } from 'theme-ui'
 import { assetsBucketBaseUrl } from '../../lib/consts'
-import { TagType } from '../../lib/v2-pre/data/types'
+import { TagType } from '../../lib/v2/data/types'
 
 interface TagIconProps {
   type: TagType

src/components/v2/WeaponTypeIcon.tsx

@@ -1,6 +1,6 @@
 import { Box } from 'theme-ui'
 import { assetsBucketBaseUrl } from '../../lib/consts'
-import { WeaponType } from '../../lib/v2-pre/data/types'
+import { WeaponType } from '../../lib/v2/data/types'
 
 interface WeaponTypeIconProps {
   type: WeaponType

src/pages/honkai3rd/v2/battlesuits/[battlesuitId].tsx

@@ -1,27 +1,27 @@
 import { NextPageContext } from 'next'
 import { Box, Card, Flex, Heading } from 'theme-ui'
-import AttributeIcon from '../../../../components/v2-pre/AttributeIcon'
+import AttributeIcon from '../../../../components/v2/AttributeIcon'
-import AvatarFigureImage from '../../../../components/v2-pre/AvatarFigureImage'
+import AvatarFigureImage from '../../../../components/v2/AvatarFigureImage'
-import AvatarSkillIcon from '../../../../components/v2-pre/AvatarSkillIcon'
+import AvatarSkillIcon from '../../../../components/v2/AvatarSkillIcon'
-import AvatarSubSkillIcon from '../../../../components/v2-pre/AvatarSubSkillIcon'
+import AvatarSubSkillIcon from '../../../../components/v2/AvatarSubSkillIcon'
-import BattlesuitAvatarIcon from '../../../../components/v2-pre/BattlesuitAvatarIcon'
+import BattlesuitAvatarIcon from '../../../../components/v2/BattlesuitAvatarIcon'
-import FormattedText from '../../../../components/v2-pre/FormattedText'
+import FormattedText from '../../../../components/v2/FormattedText'
-import { formatSkillInfo, formatSubSkillInfo } from '../../../../lib/v2-pre/data/formatText'
+import { formatSkillInfo, formatSubSkillInfo } from '../../../../lib/v2/data/formatText'
-import { loadBattlesuitCatalog, loadBattlesuitData } from '../../../../lib/v2-pre/server/loadData'
+import { loadBattlesuitCatalog, loadBattlesuitData } from '../../../../lib/v2/server/loadData'
-import { Battlesuit, SkillTagItem } from '../../../../lib/v2-pre/data/types'
+import { Battlesuit, SkillTagItem } from '../../../../lib/v2/data/types'
 import { Fragment } from 'react'
-import TagIcon from '../../../../components/v2-pre/TagIcon'
+import TagIcon from '../../../../components/v2/TagIcon'
 import {
   getAttributeLabel,
   getCharacterTypeLabel,
   getSkillTypeLabel,
   getTagTypeLabel,
   getWeaponTypeLabel
-} from '../../../../lib/v2-pre/data/text'
+} from '../../../../lib/v2/data/text'
-import StarIcon from '../../../../components/v2-pre/StarIcon'
+import StarIcon from '../../../../components/v2/StarIcon'
-import ChibiIcon from '../../../../components/v2-pre/ChibiIcon'
+import ChibiIcon from '../../../../components/v2/ChibiIcon'
-import WeaponTypeIcon from '../../../../components/v2-pre/WeaponTypeIcon'
+import WeaponTypeIcon from '../../../../components/v2/WeaponTypeIcon'
-import { sortBattlesuitSkill } from '../../../../lib/v2-pre/data/utils'
+import { sortBattlesuitSkill } from '../../../../lib/v2/data/utils'
 
 interface BattlesuitShowPageProps {
   battlesuit: Battlesuit

src/pages/honkai3rd/v2/battlesuits/index.tsx

@@ -2,9 +2,9 @@
 import { Box } from '@theme-ui/components'
 import { NextPageContext } from 'next'
 import { Flex, Link } from 'theme-ui'
-import { loadBattlesuitCatalog } from '../../../../lib/v2-pre/server/loadData'
+import { loadBattlesuitCatalog } from '../../../../lib/v2/server/loadData'
-import { BattlesuitCatalogItem } from '../../../../lib/v2-pre/data/types'
+import { BattlesuitCatalogItem } from '../../../../lib/v2/data/types'
-import BattlesuitCatalogItemCard from '../../../../components/v2-pre/BattlesuitCatalogItemCard'
+import BattlesuitCatalogItemCard from '../../../../components/v2/BattlesuitCatalogItemCard'
 
 interface BattlesuitListPageProps {
   battlesuitCatalog: BattlesuitCatalogItem[]

src/pages/honkai3rd/v2/elfs/[elfId].tsx

@@ -1,14 +1,14 @@
 import { NextPageContext } from 'next'
 import { Box, Card, Flex, Heading } from 'theme-ui'
 import { useMemo } from 'react'
-import { Elf, ElfSkill } from '../../../../lib/v2-pre/data/types'
+import { Elf, ElfSkill } from '../../../../lib/v2/data/types'
-import { loadElfCatalog, loadElfData } from '../../../../lib/v2-pre/server/loadData'
+import { loadElfCatalog, loadElfData } from '../../../../lib/v2/server/loadData'
-import SquareImage from '../../../../components/v2-pre/SquareImage'
+import SquareImage from '../../../../components/v2/SquareImage'
-import TagIcon from '../../../../components/v2-pre/TagIcon'
+import TagIcon from '../../../../components/v2/TagIcon'
 import { assetsBucketBaseUrl } from '../../../../lib/consts'
 import { ListMap } from '../../../../lib/utils'
-import FormattedText from '../../../../components/v2-pre/FormattedText'
+import FormattedText from '../../../../components/v2/FormattedText'
-import { formatSubSkillInfo } from '../../../../lib/v2-pre/data/formatText'
+import { formatSubSkillInfo } from '../../../../lib/v2/data/formatText'
 
 interface ElfShowPageProps {
   elf: Elf

src/pages/honkai3rd/v2/elfs/index.tsx

@@ -2,10 +2,10 @@
 import { Box, Card } from '@theme-ui/components'
 import { NextPageContext } from 'next'
 import { Flex, Link } from 'theme-ui'
-import { ElfCatalogItem } from '../../../../lib/v2-pre/data/types'
+import { ElfCatalogItem } from '../../../../lib/v2/data/types'
-import { loadElfCatalog } from '../../../../lib/v2-pre/server/loadData'
+import { loadElfCatalog } from '../../../../lib/v2/server/loadData'
-import RarityBar from '../../../../components/v2-pre/RarityBar'
+import RarityBar from '../../../../components/v2/RarityBar'
-import ElfIcon from '../../../../components/v2-pre/ElfIcon'
+import ElfIcon from '../../../../components/v2/ElfIcon'
 
 interface ElfListPageProps {
   elfs: ElfCatalogItem[]

src/pages/honkai3rd/v2/er/battlesuits/[battlesuitId].tsx

@@ -1,12 +1,8 @@
 import { NextPageContext } from 'next'
 import { Box, Card, Flex, Heading, Image } from 'theme-ui'
-import AvatarFigureImage from '../../../../../components/v2-pre/AvatarFigureImage'
+import AvatarFigureImage from '../../../../../components/v2/AvatarFigureImage'
-import {
+import { loadBattlesuitData, loadErBattlesuit, loadErBattlesuitCatalog } from '../../../../../lib/v2/server/loadData'
-  loadBattlesuitData,
+import { Battlesuit, ErBattlesuit, ErSignet } from '../../../../../lib/v2/data/types'
-  loadErBattlesuit,
-  loadErBattlesuitCatalog
-} from '../../../../../lib/v2-pre/server/loadData'
-import { Battlesuit, ErBattlesuit, ErSignet } from '../../../../../lib/v2-pre/data/types'
 import { Fragment, useMemo } from 'react'
 import { assetsBucketBaseUrl } from '../../../../../lib/consts'
 

src/pages/honkai3rd/v2/er/index.tsx

@@ -6,15 +6,15 @@ import {
   loadErBattlesuitCatalog,
   loadErSigils,
   loadErSupports
-} from '../../../../lib/v2-pre/server/loadData'
+} from '../../../../lib/v2/server/loadData'
-import { BattlesuitCatalogItem, ErBattlesuitCatalogItem } from '../../../../lib/v2-pre/data/types'
+import { BattlesuitCatalogItem, ErBattlesuitCatalogItem } from '../../../../lib/v2/data/types'
 import { useMemo } from 'react'
-import BattlesuitCatalogItemCard from '../../../../components/v2-pre/BattlesuitCatalogItemCard'
+import BattlesuitCatalogItemCard from '../../../../components/v2/BattlesuitCatalogItemCard'
 import { assetsBucketBaseUrl } from '../../../../lib/consts'
-import SquareImage from '../../../../components/v2-pre/SquareImage'
+import SquareImage from '../../../../components/v2/SquareImage'
-import { signetGroups } from '../../../../lib/v2-pre/data/er'
+import { signetGroups } from '../../../../lib/v2/data/er'
-import BattlesuitSmallIcon from '../../../../components/v2-pre/BattlesuitSmallIcon'
+import BattlesuitSmallIcon from '../../../../components/v2/BattlesuitSmallIcon'
-import MaterialIcon from '../../../../components/v2-pre/MaterialIcon'
+import MaterialIcon from '../../../../components/v2/MaterialIcon'
 
 interface ErPageProps {
   erBattlesuitCatalog: ErBattlesuitCatalogItem[]

src/pages/honkai3rd/v2/er/sigils.tsx

@@ -1,8 +1,8 @@
 import { NextPageContext } from 'next'
 import { Box, Card, Flex, Heading } from 'theme-ui'
-import MaterialIcon from '../../../../components/v2-pre/MaterialIcon'
+import MaterialIcon from '../../../../components/v2/MaterialIcon'
-import { ErSigil } from '../../../../lib/v2-pre/data/types'
+import { ErSigil } from '../../../../lib/v2/data/types'
-import { loadErSigils } from '../../../../lib/v2-pre/server/loadData'
+import { loadErSigils } from '../../../../lib/v2/server/loadData'
 
 interface SigilsPageProps {
   erSigils: ErSigil[]

src/pages/honkai3rd/v2/er/signets/[groupId].tsx

@@ -1,12 +1,12 @@
 import { NextPageContext } from 'next'
 import { Box, Card, Flex, Heading } from 'theme-ui'
-import { loadErSignets } from '../../../../../lib/v2-pre/server/loadData'
+import { loadErSignets } from '../../../../../lib/v2/server/loadData'
-import { ErSignet, ErSignetGroup } from '../../../../../lib/v2-pre/data/types'
+import { ErSignet, ErSignetGroup } from '../../../../../lib/v2/data/types'
 import { Fragment, useMemo } from 'react'
 import { assetsBucketBaseUrl } from '../../../../../lib/consts'
-import { signetGroups } from '../../../../../lib/v2-pre/data/er'
+import { signetGroups } from '../../../../../lib/v2/data/er'
-import SquareImage from '../../../../../components/v2-pre/SquareImage'
+import SquareImage from '../../../../../components/v2/SquareImage'
-import { getErSignetTypeLabel } from '../../../../../lib/v2-pre/data/text'
+import { getErSignetTypeLabel } from '../../../../../lib/v2/data/text'
 
 interface BattlesuitShowPageProps {
   group: ErSignetGroup

src/pages/honkai3rd/v2/er/supports.tsx

@@ -1,9 +1,9 @@
 import { NextPageContext } from 'next'
 import { useMemo } from 'react'
 import { Box, Card, Flex, Heading } from 'theme-ui'
-import BattlesuitSmallIcon from '../../../../components/v2-pre/BattlesuitSmallIcon'
+import BattlesuitSmallIcon from '../../../../components/v2/BattlesuitSmallIcon'
-import { BattlesuitCatalogItem, ErSupportBattlesuit } from '../../../../lib/v2-pre/data/types'
+import { BattlesuitCatalogItem, ErSupportBattlesuit } from '../../../../lib/v2/data/types'
-import { loadBattlesuitCatalog, loadErSupports } from '../../../../lib/v2-pre/server/loadData'
+import { loadBattlesuitCatalog, loadErSupports } from '../../../../lib/v2/server/loadData'
 
 interface SupportsPageProps {
   battlesuitCatalog: BattlesuitCatalogItem[]

src/pages/honkai3rd/v2/stigmata-sets/[stigmataSetId].tsx

@@ -1,12 +1,12 @@
 import { NextPageContext } from 'next'
 import { Box, Card, Flex, Heading, Link } from 'theme-ui'
-import FormattedText from '../../../../components/v2-pre/FormattedText'
+import FormattedText from '../../../../components/v2/FormattedText'
-import { formatSubSkillInfo } from '../../../../lib/v2-pre/data/formatText'
+import { formatSubSkillInfo } from '../../../../lib/v2/data/formatText'
-import { loadStigmaData, loadStigmataSetCatalog, loadStigmataSetData } from '../../../../lib/v2-pre/server/loadData'
+import { loadStigmaData, loadStigmataSetCatalog, loadStigmataSetData } from '../../../../lib/v2/server/loadData'
-import { RootStigma, StigmataSet } from '../../../../lib/v2-pre/data/types'
+import { RootStigma, StigmataSet } from '../../../../lib/v2/data/types'
 import { Fragment } from 'react'
-import StigmaIcon from '../../../../components/v2-pre/StigmaIcon'
+import StigmaIcon from '../../../../components/v2/StigmaIcon'
-import StigmaFigureImage from '../../../../components/v2-pre/StigmaFigureImage'
+import StigmaFigureImage from '../../../../components/v2/StigmaFigureImage'
 
 interface StigmataSetShowPage {
   stigmataSet: StigmataSet

src/pages/honkai3rd/v2/stigmata-sets/index.tsx

@@ -3,9 +3,9 @@ import { Box, Card } from '@theme-ui/components'
 import { NextPageContext } from 'next'
 import { Flex, Link } from 'theme-ui'
 
-import { StigmataSetCatalogItem } from '../../../../lib/v2-pre/data/types'
+import { StigmataSetCatalogItem } from '../../../../lib/v2/data/types'
-import { loadStigmataSetCatalog } from '../../../../lib/v2-pre/server/loadData'
+import { loadStigmataSetCatalog } from '../../../../lib/v2/server/loadData'
-import StigmaIcon from '../../../../components/v2-pre/StigmaIcon'
+import StigmaIcon from '../../../../components/v2/StigmaIcon'
 
 interface StigmataSetListPageProps {
   stigmataSetCatalog: StigmataSetCatalogItem[]

src/pages/honkai3rd/v2/stigmata/[stigmaId].tsx

@@ -1,14 +1,14 @@
 import { NextPageContext } from 'next'
 import { Box, Card, Flex, Heading, Link } from 'theme-ui'
-import FormattedText from '../../../../components/v2-pre/FormattedText'
+import FormattedText from '../../../../components/v2/FormattedText'
-import { formatSubSkillInfo, replaceNewLine } from '../../../../lib/v2-pre/data/formatText'
+import { formatSubSkillInfo, replaceNewLine } from '../../../../lib/v2/data/formatText'
-import { loadStigmaData, loadStigmataCatalog, loadStigmataSetData } from '../../../../lib/v2-pre/server/loadData'
+import { loadStigmaData, loadStigmataCatalog, loadStigmataSetData } from '../../../../lib/v2/server/loadData'
-import { RootStigma, StigmataSetCatalogItem } from '../../../../lib/v2-pre/data/types'
+import { RootStigma, StigmataSetCatalogItem } from '../../../../lib/v2/data/types'
 import { Fragment } from 'react'
-import { getStigmaTypeLabel } from '../../../../lib/v2-pre/data/text'
+import { getStigmaTypeLabel } from '../../../../lib/v2/data/text'
-import StigmaTypeIcon from '../../../../components/v2-pre/StigmaTypeIcon'
+import StigmaTypeIcon from '../../../../components/v2/StigmaTypeIcon'
-import StigmaIcon from '../../../../components/v2-pre/StigmaIcon'
+import StigmaIcon from '../../../../components/v2/StigmaIcon'
-import StigmaFigureImage from '../../../../components/v2-pre/StigmaFigureImage'
+import StigmaFigureImage from '../../../../components/v2/StigmaFigureImage'
 
 interface StigmaShowPageProps {
   rootStigma: RootStigma

src/pages/honkai3rd/v2/stigmata/index.tsx

@@ -3,9 +3,9 @@ import { Box, Card } from '@theme-ui/components'
 import { NextPageContext } from 'next'
 import { Flex, Link } from 'theme-ui'
 
-import { StigmataCatalogItem } from '../../../../lib/v2-pre/data/types'
+import { StigmataCatalogItem } from '../../../../lib/v2/data/types'
-import { loadStigmataCatalog } from '../../../../lib/v2-pre/server/loadData'
+import { loadStigmataCatalog } from '../../../../lib/v2/server/loadData'
-import StigmaIcon from '../../../../components/v2-pre/StigmaIcon'
+import StigmaIcon from '../../../../components/v2/StigmaIcon'
 
 interface StigmataListPageProps {
   stigmataCatalog: StigmataCatalogItem[]

src/pages/honkai3rd/v2/weapons/[weaponId].tsx

@@ -1,13 +1,13 @@
 import { NextPageContext } from 'next'
 import { Box, Card, Flex, Heading } from 'theme-ui'
-import FormattedText from '../../../../components/v2-pre/FormattedText'
+import FormattedText from '../../../../components/v2/FormattedText'
-import { formatSubSkillInfo, replaceNewLine } from '../../../../lib/v2-pre/data/formatText'
+import { formatSubSkillInfo, replaceNewLine } from '../../../../lib/v2/data/formatText'
-import { loadWeaponCatalog, loadWeaponData } from '../../../../lib/v2-pre/server/loadData'
+import { loadWeaponCatalog, loadWeaponData } from '../../../../lib/v2/server/loadData'
-import { RootWeaponData } from '../../../../lib/v2-pre/data/types'
+import { RootWeaponData } from '../../../../lib/v2/data/types'
 import { Fragment } from 'react'
-import { getWeaponTypeLabel } from '../../../../lib/v2-pre/data/text'
+import { getWeaponTypeLabel } from '../../../../lib/v2/data/text'
-import WeaponTypeIcon from '../../../../components/v2-pre/WeaponTypeIcon'
+import WeaponTypeIcon from '../../../../components/v2/WeaponTypeIcon'
-import WeaponIcon from '../../../../components/v2-pre/WeaponIcon'
+import WeaponIcon from '../../../../components/v2/WeaponIcon'
 
 interface WeaponShowPageProps {
   rootWeapon: RootWeaponData

src/pages/honkai3rd/v2/weapons/index.tsx

@@ -2,9 +2,9 @@
 import { Box, Card } from '@theme-ui/components'
 import { NextPageContext } from 'next'
 import { Flex, Link } from 'theme-ui'
-import { loadWeaponCatalog } from '../../../../lib/v2-pre/server/loadData'
+import { loadWeaponCatalog } from '../../../../lib/v2/server/loadData'
-import { WeaponCatalogItem } from '../../../../lib/v2-pre/data/types'
+import { WeaponCatalogItem } from '../../../../lib/v2/data/types'
-import WeaponIcon from '../../../../components/v2-pre/WeaponIcon'
+import WeaponIcon from '../../../../components/v2/WeaponIcon'
 
 interface WeaponListPageProps {
   weaponCatalog: WeaponCatalogItem[]

src/scripts/compileRawData.ts

@@ -1,5 +1,5 @@
 import path from 'path'
-import { createDirIfNotExist } from '../lib/v2-pre/server/fsUtils'
+import { createDirIfNotExist } from '../lib/v2/server/fsUtils'
 import fs from 'fs'
 import YAML from 'yaml'
 import { runScript } from './lib/utils'
@@ -20,19 +20,19 @@ import {
   stigmataSetsDir,
   weaopnCatalogPath,
   weaponsDir
-} from '../lib/v2-pre/server/loadData'
+} from '../lib/v2/server/loadData'
 import {
   BattlesuitCatalogItem,
   ElfCatalogItem,
   StigmataCatalogItem,
   StigmataSetCatalogItem,
   WeaponCatalogItem
-} from '../lib/v2-pre/data/types'
+} from '../lib/v2/data/types'
-import { compileBattlesuitData } from '../lib/v2-pre/server/compileData/compileBattlesuitData'
+import { compileBattlesuitData } from '../lib/v2/server/compileData/compileBattlesuitData'
-import { compileWeaponData } from '../lib/v2-pre/server/compileData/compileWeaponData'
+import { compileWeaponData } from '../lib/v2/server/compileData/compileWeaponData'
-import { compileStigmataData } from '../lib/v2-pre/server/compileData/compileStigmataData'
+import { compileStigmataData } from '../lib/v2/server/compileData/compileStigmataData'
-import { compileGodWarData } from '../lib/v2-pre/server/compileData/compileGodWarData'
+import { compileGodWarData } from '../lib/v2/server/compileData/compileGodWarData'
-import { compileElfData } from '../lib/v2-pre/server/compileData/compileElfData'
+import { compileElfData } from '../lib/v2/server/compileData/compileElfData'
 
 runScript(async () => {
   createDirIfNotExist(dataDir)