fix: document is not found when generate pha manifest (#360)

* fix: document is not found when generate pha manifest * chore: fix test case
ice-lab · Jul 14, 2022 · 1bc10c5 · 1bc10c5
1 parent c18cc8c
commit 1bc10c5
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 8 deletions.
diff --git a/examples/with-pha/ice.config.ts → examples/with-pha/ice.config.mts b/examples/with-pha/ice.config.ts → examples/with-pha/ice.config.mts
@@ -2,5 +2,5 @@ import { defineConfig } from '@ice/app';
 import pha from '@ice/plugin-pha';
 
 export default defineConfig({
-  plugins: [pha()],
+  plugins: [pha({ template: true })],
 });
diff --git a/packages/plugin-pha/src/generateManifest.ts b/packages/plugin-pha/src/generateManifest.ts
@@ -10,6 +10,7 @@ export interface Options {
   outputDir: string;
   parseOptions: Partial<ParseOptions>;
   compiler: Compiler;
+  compileTask?: () => Promise<{ serverEntry: string}>;
 }
 
 export async function getAppWorkerContent(

diff --git a/packages/plugin-pha/src/index.ts b/packages/plugin-pha/src/index.ts
@@ -28,7 +28,7 @@ function getDevPath(url: string): string {
   return url.startsWith('http') ? `${new URL(url).origin}/` : url;
 }
 
-const plugin: Plugin<PluginOptions> = ({ onGetConfig, onHook, context, generator }, options) => {
+const plugin: Plugin<PluginOptions> = ({ onGetConfig, onHook, context, generator, serverCompileTask }, options) => {
   const { template } = options || {};
   const { command, rootDir } = context;
 
@@ -118,6 +118,7 @@ const plugin: Plugin<PluginOptions> = ({ onGetConfig, onHook, context, generator
         compiler,
         rootDir,
         outputDir,
+        compileTask: () => serverCompileTask.get(),
         parseOptions: {
           publicPath,
           urlPrefix,

diff --git a/packages/plugin-pha/src/manifestHelpers.ts b/packages/plugin-pha/src/manifestHelpers.ts
@@ -109,7 +109,7 @@ async function getPageConfig(routeId: string, configEntry: string): Promise<Mixe
 async function renderPageDocument(routeId: string, serverEntry: string): Promise<string> {
   const serverContext = {
     req: {
-      url: routeId,
+      url: `/${routeId}`,
     },
   };
   const serverModule = await import(serverEntry);

diff --git a/packages/plugin-pha/src/phaMiddleware.ts b/packages/plugin-pha/src/phaMiddleware.ts
@@ -14,6 +14,7 @@ function sendResponse(res: ServerResponse, content: string, mime: string): void
 const createPHAMiddleware = ({
   rootDir,
   outputDir,
+  compileTask,
   parseOptions,
   compiler,
 }: Options): ExpressRequestHandler => {
@@ -25,7 +26,7 @@ const createPHAMiddleware = ({
     const requestAppWorker = req.url === '/app-worker.js';
     if (requestManifest || requestAppWorker) {
       // Get serverEntry from middleware of server-compile.
-      const { serverEntry } = req as any;
+      const { serverEntry } = await compileTask();
       const [manifestEntry, routesConfigEntry] = await compileEntires(compiler, { rootDir, outputDir });
       let manifest: Manifest = (await import(manifestEntry)).default;
       const appWorkerPath = getAppWorkerUrl(manifest, path.join(rootDir, 'src'));

diff --git a/packages/plugin-pha/tests/manifestHelper.test.ts b/packages/plugin-pha/tests/manifestHelper.test.ts
@@ -281,9 +281,9 @@ describe('parse manifest', () => {
       template: true,
     });
 
-    expect(manifest?.pages![0].document).toBe('<html><body>home-document</body></html>');
-    expect(manifest?.pages![1].document).toBe('<html><body>about-document</body></html>');
-    expect(manifest?.pages![2]?.frames![0].document).toBe('<html><body>home-document</body></html>');
+    expect(manifest?.pages![0].document).toBe('<html><body>/home-document</body></html>');
+    expect(manifest?.pages![1].document).toBe('<html><body>/about-document</body></html>');
+    expect(manifest?.pages![2]?.frames![0].document).toBe('<html><body>/home-document</body></html>');
   });
 
 
@@ -387,7 +387,7 @@ describe('parse manifest', () => {
     const manifest = await parseManifest(phaManifest, options);
 
     expect(manifest.pages![0]?.tab_header?.url).toBe('https://url-prefix.com/header');
-    expect(manifest.pages![0]?.tab_header?.html).toBe('<html><body>header-document</body></html>');
+    expect(manifest.pages![0]?.tab_header?.html).toBe('<html><body>/header-document</body></html>');
     expect(manifest?.tab_bar?.url).toBe('https://url-prefix.com/CustomTabBar');
   });