You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ga...@apache.org on 2017/02/20 07:44:12 UTC
fauxton commit: updated refs/heads/master to 6c9f2f8
Repository: couchdb-fauxton
Updated Branches:
refs/heads/master 9f733f299 -> 6c9f2f8af
extract css to separate file in production
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/6c9f2f8a
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/6c9f2f8a
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/6c9f2f8a
Branch: refs/heads/master
Commit: 6c9f2f8aff73e151a90b7538cf53f690892c2038
Parents: 9f733f2
Author: Nolan Lawson <no...@gmail.com>
Authored: Tue Feb 14 20:18:01 2017 -0800
Committer: Garren Smith <ga...@gmail.com>
Committed: Mon Feb 20 09:43:53 2017 +0200
----------------------------------------------------------------------
assets/index.underscore | 3 +++
package.json | 3 +++
webpack.config.release.js | 10 +++++-----
3 files changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/6c9f2f8a/assets/index.underscore
----------------------------------------------------------------------
diff --git a/assets/index.underscore b/assets/index.underscore
index 2c1109c..8763a82 100644
--- a/assets/index.underscore
+++ b/assets/index.underscore
@@ -21,6 +21,9 @@
<link rel="shortcut icon" type="image/png" href="dashboard.assets/img/couchdb-logo.png"/>
<title>Project Fauxton</title>
+ <% if (!development) { %>
+ <link rel="stylesheet" href="styles.css"/>
+ <% } %>
<!-- Application styles. -->
<style>
.noscript-warning {
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/6c9f2f8a/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 5b56d0d..dfd0c6a 100644
--- a/package.json
+++ b/package.json
@@ -20,8 +20,11 @@
"bootstrap": "^3.3.7",
"enzyme": "^2.7.1",
"es5-shim": "4.5.4",
+ "extract-text-webpack-plugin": "^1.0.1",
"fetch-mock": "^5.9.3",
"jest": "^18.1.0",
+ "less": "^2.7.2",
+ "less-loader": "^2.2.3",
"mocha": "~3.1.2",
"mocha-loader": "^1.1.0",
"mocha-phantomjs": "git+https://github.com/garrensmith/mocha-phantomjs.git",
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/6c9f2f8a/webpack.config.release.js
----------------------------------------------------------------------
diff --git a/webpack.config.release.js b/webpack.config.release.js
index 9956894..1030782 100644
--- a/webpack.config.release.js
+++ b/webpack.config.release.js
@@ -10,6 +10,7 @@
// License for the specific language governing permissions and limitations under
// the License.
var webpack = require('webpack');
+var ExtractTextPlugin = require("extract-text-webpack-plugin");
var path = require('path');
module.exports = {
@@ -35,8 +36,8 @@ module.exports = {
compress: {
warnings: false
}
- })
-
+ }),
+ new ExtractTextPlugin("styles.css")
],
resolve: {
@@ -65,9 +66,8 @@ module.exports = {
{ test: require.resolve("backbone"),
loader: "expose?Backbone"
},
- {
- test: /\.less$/,
- loader: 'style!css!less'
+ { test: /\.less/,
+ loader: ExtractTextPlugin.extract("style-loader", "css-loader!less-loader")
},
{ test: /\.css$/, loader: 'style!css' },
{