Merge pull request #274 from gadget-inc/depfu/update/yarn/vite-2.7.12

Update vite: 2.3.4 → 2.7.12 (minor)

Author: airhorns

.gitignore

@@ -44,3 +44,5 @@ jspm_packages/
 BUILD_SHA
 
 tsconfig.tsbuildinfo
+
+dist/

packages/fastify-renderer/package.json

@@ -65,7 +65,7 @@
     "path-to-regexp": "^6.2.0",
     "sanitize-filename": "^1.6.3",
     "stream-template": "^0.0.10",
-    "vite": "^2.2.2",
+    "vite": "^2.7.12",
     "wouter": "^2.7.5"
   },
   "peerDependencies": {

packages/fastify-renderer/src/node/index.ts

@@ -6,7 +6,15 @@ import fastifyStatic from 'fastify-static'
 import { promises as fs } from 'fs'
 import 'middie'
 import path from 'path'
-import { build as viteBuild, createServer, InlineConfig, resolveConfig, ResolvedConfig, ViteDevServer } from 'vite'
+import {
+  build as viteBuild,
+  createServer,
+  InlineConfig,
+  resolveConfig,
+  ResolvedConfig,
+  SSROptions,
+  ViteDevServer,
+} from 'vite'
 import { DefaultDocumentTemplate } from './DocumentTemplate'
 import { FastifyRendererOptions, FastifyRendererPlugin } from './Plugin'
 import { PartialRenderOptions, Render, RenderableRoute, RenderOptions } from './renderers/Renderer'
@@ -19,7 +27,7 @@ import { mapFilepathToEntrypointName } from './utils'
 declare module 'fastify' {
   interface FastifyInstance {
     [kRendererPlugin]: FastifyRendererPlugin
-    [kRendererViteOptions]: InlineConfig
+    [kRendererViteOptions]: InlineConfig & { ssr?: SSROptions }
     [kRenderOptions]: RenderOptions
     setRenderConfig(options: PartialRenderOptions): void
   }
@@ -136,6 +144,9 @@ const FastifyRenderer = fp<FastifyRendererOptions>(
           middlewareMode: true,
           ...plugin.vite?.server,
         },
+        ssr: {
+          noExternal: ['fastify-renderer'],
+        },
       }
 
       let config: ResolvedConfig
@@ -152,9 +163,8 @@ const FastifyRenderer = fp<FastifyRendererOptions>(
       await plugin.renderer.prepare(plugin.routes, config, devServer)
     })
 
-    fastify.addHook('onClose', async (_, done) => {
+    fastify.addHook('onClose', async () => {
       await devServer?.close()
-      done()
     })
   },
   {
@@ -181,7 +191,6 @@ export const build = async (fastify: FastifyInstance) => {
     const entrypointName = mapFilepathToEntrypointName(renderableRoute.renderable, renderableRoute.base)
     clientEntrypoints[entrypointName] = plugin.renderer.buildVirtualClientEntrypointModuleID(renderableRoute)
     serverEntrypoints[entrypointName] = plugin.renderer.buildVirtualServerEntrypointModuleID(renderableRoute)
-    serverEntrypoints[mapFilepathToEntrypointName(renderableRoute.layout)] = renderableRoute.layout
   }
 
   const vite = fastify[kRendererViteOptions]

packages/fastify-renderer/src/node/renderers/react/ReactRenderer.tsx

@@ -285,7 +285,6 @@ export class ReactRenderer implements Renderer {
 
           return `
           // client side hydration entrypoint for a particular route generated by fastify-renderer
-          import 'vite/dynamic-import-polyfill'
           import React from 'react'
           import ReactDOM from 'react-dom'
           import { routes } from ${JSON.stringify(ReactRenderer.ROUTE_TABLE_ID + '?' + querystring.stringify({ base }))}

packages/fastify-renderer/test/FastifyRenderer.spec.ts

@@ -72,17 +72,6 @@ describe('FastifyRenderer', () => {
     expect(closeSpy).toHaveBeenCalled()
   })
 
-  test('should prepare routes', async () => {
-    const server = await newFastify()
-    const prepareSpy = jest.spyOn(ReactRenderer.prototype, 'prepare')
-
-    await server.register(FastifyRenderer)
-    await server.listen(0)
-    await server.close()
-
-    expect(prepareSpy).toHaveBeenCalled()
-  })
-
   test('should do nothing if the registered route is not renderable', async () => {
     const server = await newFastify()
     const registerRouteSpy = jest.spyOn(FastifyRendererPlugin.prototype, 'registerRoute')

packages/fastify-renderer/test/Plugin.spec.ts

@@ -3,18 +3,19 @@ import path from 'path'
 import { DefaultDocumentTemplate } from '../src/node/DocumentTemplate'
 import { FastifyRendererOptions } from '../src/node/Plugin'
 import { RenderBus } from '../src/node/RenderBus'
-// import * as ReactRendererModule from '../src/node/renderers/react/ReactRenderer';
 import { ReactRenderer } from '../src/node/renderers/react/ReactRenderer'
 import { RenderableRoute } from '../src/node/renderers/Renderer'
 import { newFastifyRendererPlugin } from './helpers'
 
-jest.mock('fs')
+jest.mock('fs', () => ({
+  ...jest.requireActual('fs'), // import and retain the original functionalities
+  readFileSync: jest.fn().mockImplementation(() => '{ "test": "value" }'),
+}))
 jest.mock('../src/node/renderers/react/ReactRenderer')
 
 describe('FastifyRendererPlugin', () => {
   beforeEach(() => {
     jest.clearAllMocks()
-    fs.readFileSync = jest.fn().mockImplementation(() => '{ "test": "value" }')
   })
 
   test('should create a new instance with default options', async () => {

packages/test-apps/simple-react/test/build.spec.ts

@@ -0,0 +1,10 @@
+import { build } from '../../../fastify-renderer/src/node'
+import { server as getServer } from '../server'
+
+describe('simple-react building assets', () => {
+  test('can run the build', async () => {
+    const server = await getServer()
+    await server.ready()
+    await build(server)
+  })
+})