pwa support

liuliquan · ThomasKranitsas · commit 9e01fa2de111 · 2018-08-16T11:08:25.000+03:00
diff --git a/__tests__/server/__snapshots__/renderer.jsx.snap b/__tests__/server/__snapshots__/renderer.jsx.snap
@@ -2,10 +2,12 @@
 
 exports[`Base rendering of HTML template 1`] = `
 "<!DOCTYPE html>
-        <html>
+        <html lang=\\"en\\">
           <head>
             
             
+            <meta name=\\"theme-color\\" content=\\"#FFFFFF\\"/>
+            <link rel=\\"manifest\\" href=\\"/test/public/path/manifest.json\\">
             <link
               href=\\"/test/public/path/main-1511941200000.css\\"
               id=\\"tru-style\\"
@@ -40,10 +42,12 @@ exports[`Base rendering of HTML template 1`] = `
 
 exports[`Config overriding for injection 1`] = `
 "<!DOCTYPE html>
-        <html>
+        <html lang=\\"en\\">
           <head>
             
             
+            <meta name=\\"theme-color\\" content=\\"#FFFFFF\\"/>
+            <link rel=\\"manifest\\" href=\\"/test/public/path/manifest.json\\">
             <link
               href=\\"/test/public/path/main-1511941200000.css\\"
               id=\\"tru-style\\"
@@ -78,10 +82,12 @@ exports[`Config overriding for injection 1`] = `
 
 exports[`Hemlet integration works 1`] = `
 "<!DOCTYPE html>
-        <html>
+        <html lang=\\"en\\">
           <head>
             <title data-react-helmet=\\"true\\">Test Page Title</title>
             <meta data-react-helmet=\\"true\\" property=\\"description\\" content=\\"Test Page Description\\"/>
+            <meta name=\\"theme-color\\" content=\\"#FFFFFF\\"/>
+            <link rel=\\"manifest\\" href=\\"/test/public/path/manifest.json\\">
             <link
               href=\\"/test/public/path/main-1511941200000.css\\"
               id=\\"tru-style\\"
@@ -116,10 +122,12 @@ exports[`Hemlet integration works 1`] = `
 
 exports[`Injection of additional JS scripts 1`] = `
 "<!DOCTYPE html>
-        <html>
+        <html lang=\\"en\\">
           <head>
             
             
+            <meta name=\\"theme-color\\" content=\\"#FFFFFF\\"/>
+            <link rel=\\"manifest\\" href=\\"/test/public/path/manifest.json\\">
             <link
               href=\\"/test/public/path/main-1511941200000.css\\"
               id=\\"tru-style\\"
@@ -154,10 +162,12 @@ exports[`Injection of additional JS scripts 1`] = `
 
 exports[`Server-side rendering (SSR); injection of CSS chunks & Redux state 1`] = `
 "<!DOCTYPE html>
-        <html>
+        <html lang=\\"en\\">
           <head>
             <title data-react-helmet=\\"true\\"></title>
             
+            <meta name=\\"theme-color\\" content=\\"#FFFFFF\\"/>
+            <link rel=\\"manifest\\" href=\\"/test/public/path/manifest.json\\">
             <link
               href=\\"/test/public/path/main-1511941200000.css\\"
               id=\\"tru-style\\"
@@ -193,10 +203,12 @@ exports[`Server-side rendering (SSR); injection of CSS chunks & Redux state 1`]
 exports[`Setting of response HTTP status the server-side rendering 1`] = `
 "HTTP STATUS: 404
 <!DOCTYPE html>
-        <html>
+        <html lang=\\"en\\">
           <head>
             <title data-react-helmet=\\"true\\"></title>
             
+            <meta name=\\"theme-color\\" content=\\"#FFFFFF\\"/>
+            <link rel=\\"manifest\\" href=\\"/test/public/path/manifest.json\\">
             <link
               href=\\"/test/public/path/main-1511941200000.css\\"
               id=\\"tru-style\\"
diff --git a/src/server/renderer.jsx b/src/server/renderer.jsx
@@ -184,10 +184,12 @@ export default function factory(webpackConfig, options) {
 
       res.send((
         `<!DOCTYPE html>
-        <html>
+        <html lang="en">
           <head>
             ${helmet ? helmet.title.toString() : ''}
             ${helmet ? helmet.meta.toString() : ''}
+            <meta name="theme-color" content="#FFFFFF"/>
+            <link rel="manifest" href="${publicPath}manifest.json">
             <link
               href="${publicPath}main-${timestamp}.css"
               id="tru-style"
diff --git a/src/server/server.js b/src/server/server.js
@@ -44,6 +44,14 @@ export default async function factory(webpackConfig, options) {
     }),
   }));
 
+  const exludeSW = middleware => (req, res, next) => {
+    if (req.url.indexOf('/sw.js') > -1) {
+      next();
+      return;
+    }
+    middleware(req, res, next);
+  };
+
   /* Setup of Hot Module Reloading for development environment.
    * These dependencies are not used, nor installed for production use,
    * hence we should violate some import-related lint rules. */
@@ -56,18 +64,19 @@ export default async function factory(webpackConfig, options) {
     const webpackHotMiddleware = require('webpack-hot-middleware');
     const compiler = webpack(webpackConfig);
     compiler.apply(new webpack.ProgressPlugin());
-    server.use(webpackDevMiddleware(compiler, {
+    server.use(exludeSW(webpackDevMiddleware(compiler, {
       name: 'main.js',
       publicPath,
       serverSideRender: true,
-    }));
-    server.use(webpackHotMiddleware(compiler));
+    })));
+    server.use(exludeSW(webpackHotMiddleware(compiler)));
   }
   /* eslint-enable global-require */
   /* eslint-enable import/no-extraneous-dependencies */
   /* eslint-enable import/no-unresolved */
 
-  server.use(publicPath, express.static(webpackConfig.output.path));
+  server.use(publicPath, exludeSW(express.static(webpackConfig.output.path)));
+
   if (options.onExpressJsSetup) {
     await options.onExpressJsSetup(server);
   }
