Merge pull request #1836 from pkarw/develop

Hotfix - webpack templates clean up

Author: pkarw

core/build/webpack.base.config.js

@@ -48,15 +48,18 @@ module.exports = {
     // generate output HTML
     new HTMLPlugin({
       template: fs.existsSync(themedIndex) ? themedIndex : 'src/index.template.html',
-      filename: 'index.html'
+      filename: 'index.html',
+      inject: false
     }),
     new HTMLPlugin({
       template: fs.existsSync(themedIndex) ? themedIndexMinimal : 'src/index.minimal.template.html',
-      filename: 'index.minimal.html'
+      filename: 'index.minimal.html',
+      inject: false
     }),
     new HTMLPlugin({
       template: fs.existsSync(themedIndex) ? themedIndexBasic: 'src/index.basic.template.html',
-      filename: 'index.basic.html'
+      filename: 'index.basic.html',
+      inject: false
     })    
   ],
   devtool: 'source-map',
@@ -108,7 +111,6 @@ module.exports = {
         test: /\.vue$/,
         loader: 'vue-loader',
         options: {
-          optimizeSSR: false,
           preserveWhitespace: false,
           postcss: [autoprefixer()],
         }

core/client-entry.ts

@@ -54,6 +54,8 @@ function _ssrHydrateSubcomponents (components, next, to) {
         store,
         route: to
       })
+    } else {
+      return Promise.resolve(null)
     }
   })).then(() => {
     next()

core/server-entry.ts

@@ -23,6 +23,8 @@ function _ssrHydrateSubcomponents (components, store, router, resolve, reject, a
         route: router.currentRoute,
         context
       })
+    } else {
+      return Promise.resolve(null)
     }
   })).then(() => {
     if (buildTimeConfig.ssr.useInitialStateFilter) {

src/index.template.html

@@ -18,11 +18,6 @@
 				s.parentNode.insertBefore(wf, s);
 			})(); 
 		</script>
-
-    <% for (var chunk of webpack.chunks) {
-        for (var file of chunk.files) {
-          if (file.match(/\.(js|css)$/)) { %>
-    <link rel="<%= chunk.initial?'preload':'prefetch' %>" href="<%= htmlWebpackPlugin.files.publicPath + file %>" as="<%= file.match(/\.css$/)?'style':'script' %>"><% }}} %>
 		{{{ renderResourceHints() }}}
     {{{ renderStyles() }}}
 	</head>

src/themes/default/index.template.html

@@ -20,10 +20,6 @@
 				s.parentNode.insertBefore(wf, s);
 			})(); 
 		</script>
-    <% for (var chunk of webpack.chunks) {
-        for (var file of chunk.files) {
-          if (file.match(/\.(js|css)$/)) { %>
-    <link rel="<%= chunk.initial?'preload':'prefetch' %>" href="<%= htmlWebpackPlugin.files.publicPath + file %>" as="<%= file.match(/\.css$/)?'style':'script' %>"><% }}} %>
 		{{{ renderResourceHints() }}}
     {{{ renderStyles() }}}
 	</head>