refactor(utils): categorize utils functions

vuepress · Sep 11, 2023 · 3a3b8d6 · 3a3b8d6
1 parent ee27c1f
commit 3a3b8d6
Show file tree

Hide file tree

Showing 17 changed files with 16 additions and 13 deletions.
diff --git a/packages/utils/src/formatMs.ts → packages/utils/src/console/formatMs.ts b/packages/utils/src/formatMs.ts → packages/utils/src/console/formatMs.ts
diff --git a/packages/utils/src/console/index.ts b/packages/utils/src/console/index.ts
@@ -0,0 +1,3 @@
+export * from './formatMs.js'
+export * from './logger.js'
+export * from './withSpinner.js'
diff --git a/packages/utils/src/logger.ts → packages/utils/src/console/logger.ts b/packages/utils/src/logger.ts → packages/utils/src/console/logger.ts
diff --git a/packages/utils/src/withSpinner.ts → packages/utils/src/console/withSpinner.ts b/packages/utils/src/withSpinner.ts → packages/utils/src/console/withSpinner.ts
diff --git a/packages/utils/src/index.ts b/packages/utils/src/index.ts
@@ -8,12 +8,6 @@ import path from 'upath'
 
 export { debug, colors, fs, globby, hash, ora, path }
 
-export * from './getDirname.js'
-export * from './importFile.js'
-export * from './formatMs.js'
-export * from './isChildPath.js'
-export * from './logger.js'
-export * from './renderHead.js'
-export * from './renderHeadAttrs.js'
-export * from './sanitizeFileName.js'
-export * from './withSpinner.js'
+export * from './console/index.js'
+export * from './module/index.js'
+export * from './ssr/index.js'
diff --git a/packages/utils/src/getDirname.ts → packages/utils/src/module/getDirname.ts b/packages/utils/src/getDirname.ts → packages/utils/src/module/getDirname.ts
diff --git a/packages/utils/src/importFile.ts → packages/utils/src/module/importFile.ts b/packages/utils/src/importFile.ts → packages/utils/src/module/importFile.ts
diff --git a/packages/utils/src/module/index.ts b/packages/utils/src/module/index.ts
@@ -0,0 +1,4 @@
+export * from './getDirname.js'
+export * from './importFile.js'
+export * from './isChildPath.js'
+export * from './sanitizeFileName.js'
diff --git a/packages/utils/src/isChildPath.ts → packages/utils/src/module/isChildPath.ts b/packages/utils/src/isChildPath.ts → packages/utils/src/module/isChildPath.ts
diff --git a/packages/utils/src/sanitizeFileName.ts → ...ages/utils/src/module/sanitizeFileName.ts b/packages/utils/src/sanitizeFileName.ts → ...ages/utils/src/module/sanitizeFileName.ts
diff --git a/packages/utils/src/ssr/index.ts b/packages/utils/src/ssr/index.ts
@@ -0,0 +1,2 @@
+export * from './renderHead.js'
+export * from './renderHeadAttrs.js'
diff --git a/packages/utils/src/renderHead.ts → packages/utils/src/ssr/renderHead.ts b/packages/utils/src/renderHead.ts → packages/utils/src/ssr/renderHead.ts
diff --git a/packages/utils/src/renderHeadAttrs.ts → packages/utils/src/ssr/renderHeadAttrs.ts b/packages/utils/src/renderHeadAttrs.ts → packages/utils/src/ssr/renderHeadAttrs.ts
diff --git a/packages/utils/tests/logger.spec.ts → packages/utils/tests/console/logger.spec.ts b/packages/utils/tests/logger.spec.ts → packages/utils/tests/console/logger.spec.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it, vi } from 'vitest'
-import { logger } from '../src/index.js'
+import { logger } from '../../src/index.js'
 
 const methods = [
   ['info', 'log'],

diff --git a/packages/utils/tests/isChildPath.spec.ts → ...es/utils/tests/module/isChildPath.spec.ts b/packages/utils/tests/isChildPath.spec.ts → ...es/utils/tests/module/isChildPath.spec.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest'
-import { isChildPath } from '../src/index.js'
+import { isChildPath } from '../../src/index.js'
 
 const testCases: [[string, string], boolean][] = [
   [['/foo', '/foo'], true],

diff --git a/packages/utils/tests/renderHead.spec.ts → packages/utils/tests/ssr/renderHead.spec.ts b/packages/utils/tests/renderHead.spec.ts → packages/utils/tests/ssr/renderHead.spec.ts
@@ -1,6 +1,6 @@
 import type { HeadConfig } from '@vuepress/shared'
 import { describe, expect, it } from 'vitest'
-import { renderHead } from '../src/index.js'
+import { renderHead } from '../../src/index.js'
 
 const testCases: [HeadConfig, string][] = [
   [['title', {}, 'vuepress site title'], `<title>vuepress site title</title>`],

diff --git a/packages/utils/tests/renderHeadAttrs.spec.ts → ...s/utils/tests/ssr/renderHeadAttrs.spec.ts b/packages/utils/tests/renderHeadAttrs.spec.ts → ...s/utils/tests/ssr/renderHeadAttrs.spec.ts
@@ -1,6 +1,6 @@
 import type { HeadAttrsConfig } from '@vuepress/shared'
 import { describe, expect, it } from 'vitest'
-import { renderHeadAttrs } from '../src/index.js'
+import { renderHeadAttrs } from '../../src/index.js'
 
 const testCases: [HeadAttrsConfig, string][] = [
   [