feat: Always enable SSR in dev (#404)

saberland · Aug 30, 2019 · 442c990 · 442c990
1 parent 75203df
commit 442c990
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 38 deletions.
diff --git a/packages/saber/lib/cli-commands/dev.js b/packages/saber/lib/cli-commands/dev.js
@@ -9,21 +9,18 @@ module.exports = function(cli) {
     .option('--lazy', 'Enable lazy page compilation')
     .option('--port <port>', 'Server port', { default: 3000 })
     .option('--host <host>', 'Server host', { default: '0.0.0.0' })
-    .option('--ssr', 'Enable server-side rendering')
     .option('--inspect-webpack', 'Inspect webpack config in your editor')
     .action((cwd = '.', options) => {
       setNodeEnv('development')
 
-      const { host, port, lazy, ssr } = options
+      const { host, port, lazy } = options
       delete options.host
       delete options.port
       delete options.lazy
-      delete options.ssr
       return require('..')(Object.assign({ cwd, dev: true }, options), {
         server: {
           host,
-          port,
-          ssr
+          port
         },
         build: {
           lazy

diff --git a/packages/saber/lib/utils/validateConfig.js b/packages/saber/lib/utils/validateConfig.js
@@ -52,8 +52,7 @@ module.exports = (config, { dev }) => {
   const server = struct(
     {
       host: 'string?',
-      port: 'number?',
-      ssr: 'boolean?'
+      port: 'number?'
     },
     {
       host: '0.0.0.0',

diff --git a/packages/saber/vue-renderer/lib/index.js b/packages/saber/vue-renderer/lib/index.js
@@ -393,37 +393,35 @@ class VueRenderer {
       event.emit('done', stats.hasErrors())
     })
 
-    if (this.api.config.server.ssr) {
-      const serverConfig = this.api.getWebpackConfig({ type: 'server' })
-      const serverCompiler = webpack(serverConfig)
-      const mfs = new webpack.MemoryOutputFileSystem()
-      serverCompiler.outputFileSystem = mfs
-
-      let serverBundle
-      let clientManifest
-
-      serverCompiler.hooks.done.tap('init-renderer', stats => {
-        if (!stats.hasErrors()) {
-          serverBundle = readJSON(
-            this.api.resolveCache('bundle-manifest/server.json'),
-            mfs.readFileSync.bind(mfs)
-          )
-          this.initRenderer({ serverBundle, clientManifest })
-        }
-      })
-      clientCompiler.hooks.done.tap('init-renderer', stats => {
-        if (!stats.hasErrors()) {
-          clientManifest = readJSON(
-            this.api.resolveCache('bundle-manifest/client.json'),
-            clientCompiler.outputFileSystem.readFileSync.bind(
-              clientCompiler.outputFileSystem
-            )
+    const serverConfig = this.api.getWebpackConfig({ type: 'server' })
+    const serverCompiler = webpack(serverConfig)
+    const mfs = new webpack.MemoryOutputFileSystem()
+    serverCompiler.outputFileSystem = mfs
+
+    let serverBundle
+    let clientManifest
+
+    serverCompiler.hooks.done.tap('init-renderer', stats => {
+      if (!stats.hasErrors()) {
+        serverBundle = readJSON(
+          this.api.resolveCache('bundle-manifest/server.json'),
+          mfs.readFileSync.bind(mfs)
+        )
+        this.initRenderer({ serverBundle, clientManifest })
+      }
+    })
+    clientCompiler.hooks.done.tap('init-renderer', stats => {
+      if (!stats.hasErrors()) {
+        clientManifest = readJSON(
+          this.api.resolveCache('bundle-manifest/client.json'),
+          clientCompiler.outputFileSystem.readFileSync.bind(
+            clientCompiler.outputFileSystem
           )
-          this.initRenderer({ serverBundle, clientManifest })
-        }
-      })
-      serverCompiler.watch({}, () => {})
-    }
+        )
+        this.initRenderer({ serverBundle, clientManifest })
+      }
+    })
+    serverCompiler.watch({}, () => {})
 
     server.get('/_saber/visit-page', async (req, res) => {
       let [, pathname, hash] = /^([^#]+)(#.+)?$/.exec(req.query.route) || []
@@ -469,7 +467,7 @@ class VueRenderer {
         return res.end('404')
       }
 
-      if (this.api.config.server.ssr && !this.renderer) {
+      if (!this.renderer) {
         return res.end(`Please wait for compilation and refresh..`)
       }