diff --git a/packages/utils/src/formatMs.ts b/packages/utils/src/console/formatMs.ts similarity index 100% rename from packages/utils/src/formatMs.ts rename to packages/utils/src/console/formatMs.ts diff --git a/packages/utils/src/console/index.ts b/packages/utils/src/console/index.ts new file mode 100644 index 0000000000..e33be7af8d --- /dev/null +++ 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 b/packages/utils/src/console/logger.ts similarity index 100% rename from packages/utils/src/logger.ts rename to packages/utils/src/console/logger.ts diff --git a/packages/utils/src/withSpinner.ts b/packages/utils/src/console/withSpinner.ts similarity index 100% rename from packages/utils/src/withSpinner.ts rename to packages/utils/src/console/withSpinner.ts diff --git a/packages/utils/src/index.ts b/packages/utils/src/index.ts index 3fba4a9017..d8b8955fb5 100644 --- 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 b/packages/utils/src/module/getDirname.ts similarity index 100% rename from packages/utils/src/getDirname.ts rename to packages/utils/src/module/getDirname.ts diff --git a/packages/utils/src/importFile.ts b/packages/utils/src/module/importFile.ts similarity index 100% rename from packages/utils/src/importFile.ts rename to packages/utils/src/module/importFile.ts diff --git a/packages/utils/src/module/index.ts b/packages/utils/src/module/index.ts new file mode 100644 index 0000000000..a08487239b --- /dev/null +++ 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 b/packages/utils/src/module/isChildPath.ts similarity index 100% rename from packages/utils/src/isChildPath.ts rename to packages/utils/src/module/isChildPath.ts diff --git a/packages/utils/src/sanitizeFileName.ts b/packages/utils/src/module/sanitizeFileName.ts similarity index 100% rename from packages/utils/src/sanitizeFileName.ts rename to packages/utils/src/module/sanitizeFileName.ts diff --git a/packages/utils/src/ssr/index.ts b/packages/utils/src/ssr/index.ts new file mode 100644 index 0000000000..b4b83086a3 --- /dev/null +++ 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 b/packages/utils/src/ssr/renderHead.ts similarity index 100% rename from packages/utils/src/renderHead.ts rename to packages/utils/src/ssr/renderHead.ts diff --git a/packages/utils/src/renderHeadAttrs.ts b/packages/utils/src/ssr/renderHeadAttrs.ts similarity index 100% rename from packages/utils/src/renderHeadAttrs.ts rename to packages/utils/src/ssr/renderHeadAttrs.ts diff --git a/packages/utils/tests/logger.spec.ts b/packages/utils/tests/console/logger.spec.ts similarity index 94% rename from packages/utils/tests/logger.spec.ts rename to packages/utils/tests/console/logger.spec.ts index 2b23ce4c7d..f5bcaab326 100644 --- a/packages/utils/tests/logger.spec.ts +++ b/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 b/packages/utils/tests/module/isChildPath.spec.ts similarity index 95% rename from packages/utils/tests/isChildPath.spec.ts rename to packages/utils/tests/module/isChildPath.spec.ts index fbe1d4b5ee..508793f48a 100644 --- a/packages/utils/tests/isChildPath.spec.ts +++ b/packages/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 b/packages/utils/tests/ssr/renderHead.spec.ts similarity index 97% rename from packages/utils/tests/renderHead.spec.ts rename to packages/utils/tests/ssr/renderHead.spec.ts index 118ad43077..5d9a7dd3b4 100644 --- a/packages/utils/tests/renderHead.spec.ts +++ b/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'], `vuepress site title`], diff --git a/packages/utils/tests/renderHeadAttrs.spec.ts b/packages/utils/tests/ssr/renderHeadAttrs.spec.ts similarity index 91% rename from packages/utils/tests/renderHeadAttrs.spec.ts rename to packages/utils/tests/ssr/renderHeadAttrs.spec.ts index 724fbae5db..aa268a2ec4 100644 --- a/packages/utils/tests/renderHeadAttrs.spec.ts +++ b/packages/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][] = [ [