From 7a052b0dadae051c9ebec50c22d618e17585fa48 Mon Sep 17 00:00:00 2001
From: Yukai Huang
Date: Wed, 2 Nov 2016 11:26:06 +0800
Subject: Require index stylesheets

---
 public/js/index.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'public/js')

diff --git a/public/js/index.js b/public/js/index.js
index 8080b9c7..183a81c8 100644
--- a/public/js/index.js
+++ b/public/js/index.js
@@ -1,6 +1,11 @@
 /* jquery and jquery plugins */
 require('../vendor/showup/showup');
 
+require('../css/index.css');
+require('../css/extra.css');
+require('../css/slide-preview.css');
+require('../css/site.css');
+
 var toMarkdown = require('to-markdown');
 
 var saveAs = require('file-saver').saveAs;
@@ -2306,7 +2311,7 @@ socket.on('delete', function () {
             saveHistory(newnotehistory);
             location.href = serverurl;
         });
-    }   
+    }
 });
 var retryTimer = null;
 socket.on('maintenance', function () {
-- 
cgit v1.3.1


From 55ddddd84bacfbf8b7693c2a9afbbc7f20b5a7dd Mon Sep 17 00:00:00 2001
From: Yukai Huang
Date: Wed, 2 Nov 2016 11:26:25 +0800
Subject: Require cover stylesheets

---
 public/js/cover.js     | 3 +++
 public/views/index.ejs | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'public/js')

diff --git a/public/js/cover.js b/public/js/cover.js
index c02f6c81..6bc55dd9 100644
--- a/public/js/cover.js
+++ b/public/js/cover.js
@@ -1,5 +1,8 @@
 require('./locale');
 
+require('../css/cover.css');
+require('../css/site.css');
+
 var common = require('./common');
 var checkIfAuth = common.checkIfAuth;
 var urlpath = common.urlpath;
diff --git a/public/views/index.ejs b/public/views/index.ejs
index 9b411bb8..1b04886a 100644
--- a/public/views/index.ejs
+++ b/public/views/index.ejs
@@ -30,8 +30,6 @@
     <% } %>
     <!-- Custom styles for this template -->
     <%- include build/cover-header %>
-    <link rel="stylesheet" href="<%- url %>/css/cover.css">
-    <link rel="stylesheet" href="<%- url %>/css/site.css">
 </head>
 
 <body>
-- 
cgit v1.3.1


From 58fedb01faf8175d8454ff7edcb531cf36cef5c4 Mon Sep 17 00:00:00 2001
From: Yukai Huang
Date: Wed, 2 Nov 2016 11:55:08 +0800
Subject: Require pretty stylesheets

---
 public/js/pretty.js     | 4 ++++
 public/views/pretty.ejs | 3 ---
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'public/js')

diff --git a/public/js/pretty.js b/public/js/pretty.js
index 59403586..f7d31902 100644
--- a/public/js/pretty.js
+++ b/public/js/pretty.js
@@ -1,3 +1,7 @@
+require('../css/extra.css');
+require('../css/slide-preview.css');
+require('../css/site.css');
+
 /* other vendors plugin */
 var S = require('string');
 
diff --git a/public/views/pretty.ejs b/public/views/pretty.ejs
index d03be9c4..c70553be 100644
--- a/public/views/pretty.ejs
+++ b/public/views/pretty.ejs
@@ -32,9 +32,6 @@
     <link rel="stylesheet" href='<%- url %>/css/markdown.css'>
     <link rel="stylesheet" href='<%- url %>/vendor/emojify.js/dist/css/basic/emojify.min.css'>
     <%- include build/pretty-header %>
-    <link rel="stylesheet" href='<%- url %>/css/extra.css'>
-    <link rel="stylesheet" href="<%- url %>/css/slide-preview.css">
-    <link rel="stylesheet" href='<%- url %>/css/site.css'>
     <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
 	<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
 	<!--[if lt IE 9]>
-- 
cgit v1.3.1


From 3e23009663d72526f393348f91e45fde93f67236 Mon Sep 17 00:00:00 2001
From: Yukai Huang
Date: Wed, 2 Nov 2016 11:59:45 +0800
Subject: Require slide mode stylesheets

---
 public/js/slide.js     | 3 +++
 public/views/slide.ejs | 5 ++---
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'public/js')

diff --git a/public/js/slide.js b/public/js/slide.js
index 16ea6b8f..b9521e64 100644
--- a/public/js/slide.js
+++ b/public/js/slide.js
@@ -1,3 +1,6 @@
+require('../css/extra.css');
+require('../css/site.css');
+require('../css/slide.css');
 
 /* other vendors plugin */
 var S = require('string');
diff --git a/public/views/slide.ejs b/public/views/slide.ejs
index 1fdb7f8f..4545ade7 100644
--- a/public/views/slide.ejs
+++ b/public/views/slide.ejs
@@ -36,9 +36,8 @@
         <link rel="stylesheet" href="<%- url %>/css/mermaid.css">
         <link rel="stylesheet" href='<%- url %>/css/markdown.css'>
         <link rel="stylesheet" href='<%- url %>/vendor/emojify.js/dist/css/basic/emojify.min.css'>
-        <link rel="stylesheet" href='<%- url %>/css/extra.css'>
-        <link rel="stylesheet" href="<%- url %>/css/site.css">
-        <link rel="stylesheet" href="<%- url %>/css/slide.css">
+
+        <%- include build/slide-header %>
 
         <!-- Printing and PDF exports -->
 		<script>
-- 
cgit v1.3.1


From f1f8846b0adc6dd330286d2edeb399215530a391 Mon Sep 17 00:00:00 2001
From: Yukai Huang
Date: Wed, 2 Nov 2016 18:01:26 +0800
Subject: Config extra entry for html.min.css

---
 public/js/extra.js      |  2 +-
 public/js/htmlExport.js |  5 +++++
 webpack.config.js       | 29 +++++++++++++++++++++++++++--
 webpack.production.js   | 33 +++++++++++++++++++++++++++++++--
 4 files changed, 64 insertions(+), 5 deletions(-)
 create mode 100644 public/js/htmlExport.js

(limited to 'public/js')

diff --git a/public/js/extra.js b/public/js/extra.js
index 01363886..81dd4a28 100644
--- a/public/js/extra.js
+++ b/public/js/extra.js
@@ -588,7 +588,7 @@ function exportToHTML(view) {
     var tocAffix = $('#ui-toc-affix').clone();
     tocAffix.find('*').removeClass('active').find("a[href^='#'][smoothhashscroll]").removeAttr('smoothhashscroll');
     //generate html via template
-    $.get(serverurl + '/css/html.min.css', function (css) {
+    $.get(serverurl + '/build/html.min.css', function (css) {
         $.get(serverurl + '/views/html.hbs', function (data) {
             var template = Handlebars.compile(data);
             var context = {
diff --git a/public/js/htmlExport.js b/public/js/htmlExport.js
new file mode 100644
index 00000000..e9fc41c6
--- /dev/null
+++ b/public/js/htmlExport.js
@@ -0,0 +1,5 @@
+require('../css/github-extract.css');
+require('../css/markdown.css');
+require('../css/extra.css');
+require('../css/slide-preview.css');
+require('../css/site.css');
diff --git a/webpack.config.js b/webpack.config.js
index 6a436f43..f9d9a6db 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,8 +1,33 @@
 var baseConfig = require('./webpackBaseConfig');
 var ExtractTextPlugin = require("extract-text-webpack-plugin");
+var path = require('path');
 
-module.exports = Object.assign({}, baseConfig, {
+module.exports = [Object.assign({}, baseConfig, {
     plugins: baseConfig.plugins.concat([
         new ExtractTextPlugin("[name].css")
     ])
-});
+}), {
+    entry: {
+        htmlExport: path.join(__dirname, 'public/js/htmlExport.js')
+    },
+    module: {
+        loaders: [{
+            test: /\.css$/,
+            loader: ExtractTextPlugin.extract('style-loader', 'css-loader')
+        }, {
+            test: /\.scss$/,
+            loader: ExtractTextPlugin.extract('style-loader', 'sass-loader')
+        }, {
+            test: /\.less$/,
+            loader: ExtractTextPlugin.extract('style-loader', 'less-loader')
+        }]
+    },
+    output: {
+        path: path.join(__dirname, 'public/build'),
+        publicPath: '/build/',
+        filename: '[name].js'
+    },
+    plugins: [
+        new ExtractTextPlugin("html.min.[hash].css")
+    ]
+}];
diff --git a/webpack.production.js b/webpack.production.js
index 1a55e615..a4dfd248 100644
--- a/webpack.production.js
+++ b/webpack.production.js
@@ -3,7 +3,7 @@ var webpack = require('webpack');
 var path = require('path');
 var ExtractTextPlugin = require("extract-text-webpack-plugin");
 
-module.exports = Object.assign({}, baseConfig, {
+module.exports = [Object.assign({}, baseConfig, {
     plugins: baseConfig.plugins.concat([
         new webpack.DefinePlugin({
             'process.env': {
@@ -25,4 +25,33 @@ module.exports = Object.assign({}, baseConfig, {
         publicPath: '/build/',
         filename: '[id].[name].[hash].js'
     }
-});
+}), {
+    entry: {
+        htmlExport: path.join(__dirname, 'public/js/htmlExport.js')
+    },
+    module: {
+        loaders: [{
+            test: /\.css$/,
+            loader: ExtractTextPlugin.extract('style-loader', 'css-loader')
+        }, {
+            test: /\.scss$/,
+            loader: ExtractTextPlugin.extract('style-loader', 'sass-loader')
+        }, {
+            test: /\.less$/,
+            loader: ExtractTextPlugin.extract('style-loader', 'less-loader')
+        }]
+    },
+    output: {
+        path: path.join(__dirname, 'public/build'),
+        publicPath: '/build/',
+        filename: '[name].js'
+    },
+    plugins: [
+        new webpack.DefinePlugin({
+            'process.env': {
+                'NODE_ENV': JSON.stringify('production')
+            }
+        }),
+        new ExtractTextPlugin("html.min.css")
+    ]
+}];
-- 
cgit v1.3.1