fix: tests

web-infra-dev · Dec 19, 2023 · 4f6cc8d · 4f6cc8d
1 parent 594022a
commit 4f6cc8d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 32 deletions.
diff --git a/packages/server/server/src/server/devServerOld.ts b/packages/server/server/src/server/devServerOld.ts
@@ -26,6 +26,7 @@ import type {
 import type { SSR } from '@modern-js/server-core';
 import { merge as deepMerge } from '@modern-js/utils/lodash';
 import { RenderHandler } from '@modern-js/prod-server/src/libs/render';
+import { fileReader } from '@modern-js/runtime-utils/fileReader';
 import { getDefaultDevOptions } from '../constants';
 import { createMockHandler } from '../dev-tools/mock';
 import { enableRegister } from '../dev-tools/register';
@@ -277,7 +278,8 @@ export class ModernDevServer extends ModernServer {
     this.cleanSSRCache();
 
     // reset static file
-    this.reader.updateFile();
+
+    fileReader.reset();
 
     this.runner.repack();
 
@@ -306,34 +308,6 @@ export class ModernDevServer extends ModernServer {
     // not warmup ssr bundle on development
   }
 
-  protected initReader() {
-    let isInit = false;
-    if (this.devMiddleware && this.dev?.devMiddleware?.writeToDisk === false) {
-      this.addHandler((ctx, next) => {
-        if (isInit) {
-          return next();
-        }
-        isInit = true;
-
-        if (!ctx.res.locals!.webpack) {
-          this.reader.init();
-          return next();
-        }
-
-        const { devMiddleware: webpackDevMid } = ctx.res.locals!.webpack;
-        const { outputFileSystem } = webpackDevMid;
-        if (outputFileSystem) {
-          this.reader.init(outputFileSystem);
-        } else {
-          this.reader.init();
-        }
-        return next();
-      });
-    } else {
-      super.initReader();
-    }
-  }
-
   protected async onServerChange({
     filepath,
     event,

diff --git a/packages/solutions/app-tools/src/plugins/serverBuild.ts b/packages/solutions/app-tools/src/plugins/serverBuild.ts
@@ -23,10 +23,11 @@ export default (): CliPlugin<AppTools> => ({
         const sourceDirs = [];
         if (fs.existsSync(serverDir)) {
           sourceDirs.push(serverDir);
-        }
 
-        if (fs.existsSync(sharedDir)) {
-          sourceDirs.push(sharedDir);
+          // compile the sharedDir only when serverDir exists
+          if (fs.existsSync(sharedDir)) {
+            sourceDirs.push(sharedDir);
+          }
         }
 
         const { server } = modernConfig;