refactor: move ssr code into dedicated dir

vitejs · Jan 18, 2021 · e9b0d28 · e9b0d28
1 parent 6cb04fa
commit e9b0d28
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/packages/vite/src/node/build.ts b/packages/vite/src/node/build.ts
@@ -28,7 +28,7 @@ import { TransformOptions } from 'esbuild'
 import { CleanCSS } from 'types/clean-css'
 import { dataURIPlugin } from './plugins/dataUri'
 import { buildImportAnalysisPlugin } from './plugins/importAnaysisBuild'
-import { resolveSSRExternal } from './ssrExternal'
+import { resolveSSRExternal } from './ssr/ssrExternal'
 
 export interface BuildOptions {
   /**

diff --git a/packages/vite/src/node/server/index.ts b/packages/vite/src/node/server/index.ts
@@ -41,9 +41,9 @@ import {
 } from '../plugins/esbuild'
 import { TransformOptions as EsbuildTransformOptions } from 'esbuild'
 import { DepOptimizationMetadata, optimizeDeps } from '../optimizer'
-import { ssrLoadModule } from './ssrModuleLoader'
-import { resolveSSRExternal } from '../ssrExternal'
-import { ssrRewriteStacktrace } from './ssrStacktrace'
+import { ssrLoadModule } from '../ssr/ssrModuleLoader'
+import { resolveSSRExternal } from '../ssr/ssrExternal'
+import { ssrRewriteStacktrace } from '../ssr/ssrStacktrace'
 
 export interface ServerOptions {
   host?: string

diff --git a/packages/vite/src/node/server/transformRequest.ts b/packages/vite/src/node/server/transformRequest.ts
@@ -13,7 +13,7 @@ import {
   timeFrom
 } from '../utils'
 import { checkPublicFile } from '../plugins/asset'
-import { ssrTransform } from './ssrTransform'
+import { ssrTransform } from '../ssr/ssrTransform'
 
 const debugLoad = createDebugger('vite:load')
 const debugTransform = createDebugger('vite:transform')

diff --git a/packages/vite/src/node/ssrExternal.ts → packages/vite/src/node/ssr/ssrExternal.ts b/packages/vite/src/node/ssrExternal.ts → packages/vite/src/node/ssr/ssrExternal.ts
@@ -1,7 +1,7 @@
 import fs from 'fs'
 import path from 'path'
-import { tryNodeResolve } from './plugins/resolve'
-import { lookupFile, resolveFrom } from './utils'
+import { tryNodeResolve } from '../plugins/resolve'
+import { lookupFile, resolveFrom } from '../utils'
 
 /**
  * Heuristics for determining whether a dependency should be externalized for

diff --git a/...s/vite/src/node/server/ssrModuleLoader.ts → ...ages/vite/src/node/ssr/ssrModuleLoader.ts b/...s/vite/src/node/server/ssrModuleLoader.ts → ...ages/vite/src/node/ssr/ssrModuleLoader.ts
@@ -9,7 +9,7 @@ import {
   ssrImportMetaKey,
   ssrDynamicImportKey
 } from './ssrTransform'
-import { transformRequest } from './transformRequest'
+import { transformRequest } from '../server/transformRequest'
 
 export async function ssrLoadModule(
   url: string,

diff --git a/...ges/vite/src/node/server/ssrStacktrace.ts → packages/vite/src/node/ssr/ssrStacktrace.ts b/...ges/vite/src/node/server/ssrStacktrace.ts → packages/vite/src/node/ssr/ssrStacktrace.ts
@@ -1,5 +1,5 @@
 import { SourceMapConsumer, RawSourceMap } from 'source-map'
-import { ModuleGraph } from './moduleGraph'
+import { ModuleGraph } from '../server/moduleGraph'
 
 export function ssrRewriteStacktrace(stack: string, moduleGraph: ModuleGraph) {
   return stack

diff --git a/...ages/vite/src/node/server/ssrTransform.ts → packages/vite/src/node/ssr/ssrTransform.ts b/...ages/vite/src/node/server/ssrTransform.ts → packages/vite/src/node/ssr/ssrTransform.ts
@@ -1,7 +1,7 @@
 import MagicString from 'magic-string'
 import { SourceMap } from 'rollup'
-import { TransformResult } from './transformRequest'
-import { parser } from './pluginContainer'
+import { TransformResult } from '../server/transformRequest'
+import { parser } from '../server/pluginContainer'
 import {
   Identifier,
   Node as _Node,
@@ -91,7 +91,7 @@ export async function ssrTransform(
         } else {
           // export const foo = 1, bar = 2
           for (const decl of node.declaration.declarations) {
-            const names = extractNames(decl)
+            const names = extractNames(decl.id)
             for (const name of names) {
               defineExport(name)
             }