chore: more utils import re-org (#1134)

* chore: hide PagedArticles tmply

* chore: downgrade cypress

* chore: debug

* chore: abs import re-org

* chore: bring e2e tests back

* chore: debug net err

* chore: retest cy 4.2.0

* chore: try NO_PROXY

* chore: alright, use latest

* chore: try cy official example

* chore: try cy official example

* chore: try cy official example

* chore: try cy official example

* chore: debug actions

* chore: debug actions

* chore: debug actions

* chore: debug actions

* chore: debug actions aaa

Author: mydearxym

.github/workflows/ci.yml

@@ -87,9 +87,24 @@ jobs:
       - name: (Frontend) Build Project
         working-directory: ./frontend_server
         run: npm run build.ci
-      - name: (Frontend) Check Bundle Size
+      - name: check /etc/hosts
         working-directory: ./frontend_server
-        run: BUNDLEWATCH_GITHUB_TOKEN=${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }} npm run size.check
-      - name: (Frontend) Run e2e Tests
+        run: echo "#>>>>#"; cat /etc/hosts; pwd; echo "#>>>>#"
+      # - name: (Frontend) Check Bundle Size
+      #   working-directory: ./frontend_server
+      #   run: BUNDLEWATCH_GITHUB_TOKEN=${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }} npm run size.check
+      # - name: (Frontend) Run e2e Tests
+      #   working-directory: ./frontend_server
+      #   run: npm run test:ci
+  cypress-run:
+    name: run cypress
+    runs-on: ubuntu-latest
+    steps:
+      - name: Cypress run
         working-directory: ./frontend_server
-        run: npm run test:ci
+        uses: cypress-io/github-action@v2
+        with:
+          browser: chrome
+          # build: npm run build
+          start: npm run ci
+          wait-on: http://localhost:3000

package.json

@@ -6,7 +6,7 @@
     "dev": "cross-env NODE_ENV=dev node server.js",
     "prod": "cross-env NODE_ENV=production run-p server",
     "local": "cross-env NODE_ENV=local node server",
-    "ci": "cross-env NODE_ENV=ci node server --inspect",
+    "ci": "cross-env NODE_ENV=ci node server",
     "server": "npm run clean && node server.js",
     "build": "next build",
     "build:clean": "run-s dist clean",
@@ -149,7 +149,7 @@
     "bundlewatch": "^0.2.7",
     "commitizen": "3.1.2",
     "coveralls": "3.0.14",
-    "cypress": "4.2.0",
+    "cypress": "^8.1.0",
     "cz-conventional-changelog": "^3.0.0",
     "enzyme": "3.11.0",
     "enzyme-adapter-react-16": "1.15.2",

src/components/FormItem/index.js

@@ -8,7 +8,8 @@ import React from 'react'
 import T from 'prop-types'
 import { isEmpty } from 'ramda'
 
-import { buildLog, hasValue } from '@/utils'
+import { buildLog } from '@/utils/logger'
+import { hasValue } from '@/utils/validator'
 import { SIZE } from '@/constant'
 import Maybe from '@/components/Maybe'
 

src/components/Modal/Belt.js

@@ -1,6 +1,6 @@
 import React from 'react'
 
-import { useScript } from '@/hooks'
+import useScript from '@/hooks/useScript'
 
 import { Wrapper, Holder } from './styles/belt'
 

src/components/Modal/index.tsx

@@ -10,7 +10,7 @@ import usePortal from 'react-useportal'
 import { ICON_CMD } from '@/config'
 import { toggleGlobalBlur } from '@/utils/dom'
 import { buildLog } from '@/utils/logger'
-import { useShortcut } from '@/hooks'
+import useShortcut from '@/hooks/useShortcut'
 
 import ViewportTracker from '@/components/ViewportTracker'
 import Belt from './Belt'

src/components/NaviCatalog/index.tsx

@@ -8,13 +8,11 @@ import { FC, useState, useCallback, useEffect, memo } from 'react'
 import { find, findIndex, propEq, last } from 'ramda'
 
 import { URL_QUERY } from '@/constant'
-import {
-  buildLog,
-  nilOrEmpty,
-  getQueryFromUrl,
-  markRoute,
-  findDeepMatch,
-} from '@/utils'
+
+import { findDeepMatch } from '@/utils/helper'
+import { buildLog } from '@/utils/logger'
+import { nilOrEmpty } from '@/utils/validator'
+import { getQueryFromUrl, markRoute } from '@/utils/route'
 
 import type { TMenuItem, TMenuMode } from './spec'
 import { ROOT_MENU, CHILD_MENU } from './constant'

src/components/PostItem/ListView.tsx

@@ -3,7 +3,8 @@ import TimeAgo from 'timeago-react'
 
 import type { TPost } from '@/spec'
 import { ICON_CMD } from '@/config'
-import { cutRest, parseDomain } from '@/utils'
+import { cutRest } from '@/utils/helper'
+import { parseDomain } from '@/utils/route'
 
 import InlineTags from '@/components/InlineTags'
 

src/components/Switcher/Tabs/TabIcon.tsx

@@ -1,7 +1,7 @@
-import React, { FC, useCallback } from 'react'
+import { FC, useCallback } from 'react'
+import dynamic from 'next/dynamic'
 
 import type { TTabItem } from '@/spec'
-import LocalIcon from './LocalIcon'
 import { Wrapper, Icon } from '../styles/tabs/tab_icon'
 
 type TProps = {
@@ -12,6 +12,10 @@ type TProps = {
   active: boolean
 }
 
+export const LocalIcon = dynamic(() => import('./LocalIcon'), {
+  ssr: false,
+})
+
 const TabIcon: FC<TProps> = ({ item, clickableRef, active }) => {
   const { localIcon, icon } = item
 

src/components/Switcher/Tabs/TabItem.tsx

@@ -7,7 +7,9 @@
 import { FC, useEffect, useCallback, useRef, memo } from 'react'
 
 import type { TSIZE_SM, TTabItem } from '@/spec'
-import { buildLog, isString, Trans } from '@/utils'
+import { Trans } from '@/utils/i18n'
+import { isString } from '@/utils/validator'
+import { buildLog } from '@/utils/logger'
 
 import TabIcon from './TabIcon'
 import {

src/components/ThemeSelector/styles/index.ts

@@ -1,7 +1,8 @@
 import styled from 'styled-components'
 
 import type { TActive, TThemeName } from '@/spec'
-import { theme, themeCoverMap, themeCoverIndexMap, css } from '@/utils'
+import { theme, themeCoverMap, themeCoverIndexMap } from '@/utils/themes'
+import css from '@/utils/css'
 
 type TDot = TActive & { name: TThemeName }
 export const Dot = styled.div<TDot>`