Revert "minor refactor"

This reverts commit 85d7152.
vikejs · Feb 21, 2025 · 1756757 · 1756757
1 parent 85d7152
commit 1756757
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 20 deletions.
diff --git a/vike/node/plugin/index.ts b/vike/node/plugin/index.ts
@@ -9,7 +9,7 @@ export type { VikeVitePluginOptions }
 
 import type { Plugin } from 'vite'
 import { assertUsage } from './utils.js'
-import { buildConfig } from './plugins/buildConfig/assetsManifestPlugin.js'
+import { buildConfig } from './plugins/buildConfig.js'
 import { previewConfig } from './plugins/previewConfig.js'
 import { autoFullBuild } from './plugins/autoFullBuild.js'
 import { devConfig } from './plugins/devConfig/index.js'

diff --git a/vike/node/plugin/plugins/autoFullBuild.ts b/vike/node/plugin/plugins/autoFullBuild.ts
@@ -13,7 +13,7 @@ import type { VikeConfigObject } from './importUserCode/v1-design/getVikeConfig.
 import { isViteCliCall, getViteConfigFromCli } from '../shared/isViteCliCall.js'
 import pc from '@brillout/picocolors'
 import { logErrorHint } from '../../runtime/renderPage/logErrorHint.js'
-import { manifestTempFile } from './buildConfig/assetsManifestPlugin.js'
+import { manifestTempFile } from './buildConfig.js'
 import { getVikeConfig } from './importUserCode/v1-design/getVikeConfig.js'
 import { isVikeCliOrApi } from '../../api/context.js'
 

diff --git a/...ugins/buildConfig/assetsManifestPlugin.ts → vike/node/plugin/plugins/buildConfig.ts b/...ugins/buildConfig/assetsManifestPlugin.ts → vike/node/plugin/plugins/buildConfig.ts
@@ -13,14 +13,14 @@ import {
   normalizeRollupInput,
   onSetupBuild,
   assertIsNpmPackageImport
-} from '../../utils.js'
-import { getVikeConfig, isV1Design } from '../importUserCode/v1-design/getVikeConfig.js'
-import { findPageFiles } from '../../shared/findPageFiles.js'
+} from '../utils.js'
+import { getVikeConfig, isV1Design } from './importUserCode/v1-design/getVikeConfig.js'
+import { findPageFiles } from '../shared/findPageFiles.js'
 import type { ResolvedConfig, Plugin, UserConfig } from 'vite'
-import { getVirtualFileIdPageConfigValuesAll } from '../../../shared/virtual-files/virtualFilePageConfigValuesAll.js'
-import type { PageConfigBuildTime } from '../../../../shared/page-configs/PageConfig.js'
-import type { FileType } from '../../../../shared/getPageFiles/fileTypes.js'
-import { extractAssetsAddQuery } from '../../../shared/extractAssetsQuery.js'
+import { getVirtualFileIdPageConfigValuesAll } from '../../shared/virtual-files/virtualFilePageConfigValuesAll.js'
+import type { PageConfigBuildTime } from '../../../shared/page-configs/PageConfig.js'
+import type { FileType } from '../../../shared/getPageFiles/fileTypes.js'
+import { extractAssetsAddQuery } from '../../shared/extractAssetsQuery.js'
 import { createRequire } from 'module'
 import fs from 'fs/promises'
 import path from 'path'
@@ -29,14 +29,14 @@ import {
   fixServerAssets_assertCssCodeSplit,
   fixServerAssets_assertCssTarget,
   fixServerAssets_isEnabled
-} from './assetsManifestPlugin/fixServerAssets.js'
-import { set_macro_ASSETS_MANIFEST } from '../buildEntry/index.js'
-import { prependEntriesDir } from '../../../shared/prependEntriesDir.js'
-import { getFilePathResolved } from '../../shared/getFilePath.js'
-import { getConfigValueBuildTime } from '../../../../shared/page-configs/getConfigValueBuildTime.js'
-import { getOutDirs, type OutDirs, resolveOutDir } from '../../shared/getOutDirs.js'
-import { viteIsSSR } from '../../shared/viteIsSSR.js'
-import { getVikeConfigPublic } from '../commonConfig.js'
+} from './buildConfig/assetsManifestPlugin/fixServerAssets.js'
+import { set_macro_ASSETS_MANIFEST } from './buildEntry/index.js'
+import { prependEntriesDir } from '../../shared/prependEntriesDir.js'
+import { getFilePathResolved } from '../shared/getFilePath.js'
+import { getConfigValueBuildTime } from '../../../shared/page-configs/getConfigValueBuildTime.js'
+import { getOutDirs, type OutDirs, resolveOutDir } from '../shared/getOutDirs.js'
+import { viteIsSSR } from '../shared/viteIsSSR.js'
+import { getVikeConfigPublic } from './commonConfig.js'
 // @ts-ignore import.meta.url is shimmed at dist/cjs by dist-cjs-fixup.js.
 const importMetaUrl: string = import.meta.url
 const require_ = createRequire(importMetaUrl)

diff --git a/vike/node/plugin/plugins/buildConfig/assetsManifestPlugin/fixServerAssets.ts b/vike/node/plugin/plugins/buildConfig/assetsManifestPlugin/fixServerAssets.ts
@@ -10,7 +10,7 @@ import { existsSync } from 'fs'
 import { ViteManifest, ViteManifestEntry } from '../../../../shared/ViteManifest.js'
 import { assert, assertWarning, isEqualStringList, pLimit, unique } from '../../../utils.js'
 import { isVirtualFileIdPageConfigValuesAll } from '../../../../shared/virtual-files/virtualFilePageConfigValuesAll.js'
-import { manifestTempFile } from '../assetsManifestPlugin.js'
+import { manifestTempFile } from '../../buildConfig.js'
 import { ResolvedConfig } from 'vite'
 import { getAssetsDir } from '../../../shared/getAssetsDir.js'
 import pc from '@brillout/picocolors'

diff --git a/vike/node/plugin/plugins/commonConfig.ts b/vike/node/plugin/plugins/commonConfig.ts
@@ -12,7 +12,7 @@ import {
   isDocker,
   isObject
 } from '../utils.js'
-import { assertRollupInput } from './buildConfig/assetsManifestPlugin.js'
+import { assertRollupInput } from './buildConfig.js'
 import { installRequireShim_setUserRootDir } from '@brillout/require-shim'
 import pc from '@brillout/picocolors'
 import path from 'path'

diff --git a/vike/node/plugin/plugins/devConfig/determineOptimizeDeps.ts b/vike/node/plugin/plugins/devConfig/determineOptimizeDeps.ts
@@ -4,7 +4,7 @@ import type { ResolvedConfig } from 'vite'
 import { findPageFiles } from '../../shared/findPageFiles.js'
 import { assert, assertIsNpmPackageImport, createDebugger, isArray, unique } from '../../utils.js'
 import { getVikeConfig } from '../importUserCode/v1-design/getVikeConfig.js'
-import { analyzeClientEntries } from '../buildConfig/assetsManifestPlugin.js'
+import { analyzeClientEntries } from '../buildConfig.js'
 import type { PageConfigBuildTime } from '../../../../shared/page-configs/PageConfig.js'
 import {
   virtualFileIdImportUserCodeClientCR,