fix: fix extra file being build with spa target

shuvijs · Jun 19, 2020 · 5a6bb13 · 5a6bb13
1 parent 8dd2139
commit 5a6bb13
Show file tree

Hide file tree

Showing 7 changed files with 74 additions and 21 deletions.
diff --git a/packages/app/core/application-spa-server.d.ts b/packages/app/core/application-spa-server.d.ts
@@ -0,0 +1,5 @@
+import { Runtime } from '@shuvi/types';
+
+import IApplicationModule = Runtime.IApplicationModule;
+
+export const create: IApplicationModule['create'];
diff --git a/packages/core/src/app/components/ApplicationFile.tsx b/packages/core/src/app/components/ApplicationFile.tsx
@@ -1,9 +1,8 @@
 import React from 'react';
-import { observer } from 'mobx-react';
 import { File } from '@shuvi/react-fs';
 
 function ApplicationFile() {
-  const template = `
+  const app = `
 import AppComponent from "@shuvi/app/core/app";
 import routes from "@shuvi/app/core/routes";
 import { Application } from "@shuvi/runtime-core/lib/lib/application";
@@ -42,7 +41,26 @@ if (module.hot) {
 }
 `;
 
-  return <File name="application.js" content={template} />;
+  const emptyApp = `
+import { Application } from "@shuvi/runtime-core/lib/lib/application";
+
+export function create(context, options) {
+  return new Application({
+    AppComponent: null,
+    routes: [],
+    context,
+    render: options.render
+  });
+  return app;
+}
+`;
+
+  return (
+    <>
+      <File name="application.js" content={app} />
+      <File name="application-spa-server.js" content={emptyApp} />
+    </>
+  );
 }
 
-export default observer(ApplicationFile);
+export default ApplicationFile;
diff --git a/packages/react-fs/src/__tests__/renderer.test.tsx b/packages/react-fs/src/__tests__/renderer.test.tsx
@@ -53,5 +53,26 @@ describe('renderer', () => {
       const files = await recursiveReadDir('/');
       expect(files).toEqual(['a/a1', 'a/a2']);
     });
+
+    test('shuold support fragment in dir', async () => {
+      const Child = () => (
+        <>
+          <File name="b1" content="test" />
+          <File name="b2" content="test" />
+        </>
+      );
+      await renderOnce(
+        <>
+          <File name="a" content="test" />
+          <Dir name="b">
+            <Child />
+          </Dir>
+        </>,
+        '/'
+      );
+
+      const files = await recursiveReadDir('/');
+      expect(files).toEqual(['a', 'b/b1', 'b/b2']);
+    });
   });
 });
diff --git a/...s/runtime-react/src/bootstrap.browser.tsx → ...untime-react/src/clientRender.browser.tsx b/...s/runtime-react/src/bootstrap.browser.tsx → ...untime-react/src/clientRender.browser.tsx
diff --git a/...ages/runtime-react/src/bootstrap.hash.tsx → ...s/runtime-react/src/clientRender.hash.tsx b/...ages/runtime-react/src/bootstrap.hash.tsx → ...s/runtime-react/src/clientRender.hash.tsx
diff --git a/packages/runtime-react/src/index.ts b/packages/runtime-react/src/index.ts
@@ -70,10 +70,10 @@ loadRouteComponent(() => import(/* webpackChunkName: "page-${route.id}" */"${com
     }
 
     if (history === 'hash') {
-      return resolveDist('bootstrap.hash');
+      return resolveDist('clientRender.hash');
     }
 
-    return resolveDist('bootstrap.browser');
+    return resolveDist('clientRender.browser');
   }
 
   getAppModulePath(): string {

diff --git a/packages/shuvi/src/api/setupApp.ts b/packages/shuvi/src/api/setupApp.ts
@@ -141,22 +141,31 @@ export async function setupApp(api: Api) {
 
   api.addAppFile(
     File.module('server.js', {
-      exports: {
-        [api.resolveAppFile('core', 'document')]: {
-          imported: '*',
-          local: 'document'
-        },
-        [api.resolveAppFile('core', 'application')]: {
-          imported: '*',
-          local: 'application'
-        },
-        ...(api.config.ssr && {
-          [runtime.getServerRendererModulePath()]: {
-            imported: 'default',
-            local: 'renderer'
+      exports: api.config.ssr
+        ? {
+            [api.resolveAppFile('core', 'document')]: {
+              imported: '*',
+              local: 'document'
+            },
+            [api.resolveAppFile('core', 'application')]: {
+              imported: '*',
+              local: 'application'
+            },
+            [runtime.getServerRendererModulePath()]: {
+              imported: 'default',
+              local: 'renderer'
+            }
+          }
+        : {
+            [api.resolveAppFile('core', 'document')]: {
+              imported: '*',
+              local: 'document'
+            },
+            [api.resolveAppFile('core', 'application-spa-server')]: {
+              imported: '*',
+              local: 'application'
+            }
           }
-        })
-      }
     })
   );