diff --git a/client/dcwebui.js b/client/dcwebui.js index c73bf9d..11ce24d 100644 --- a/client/dcwebui.js +++ b/client/dcwebui.js @@ -1,6 +1,6 @@ /* dcwebui.js */ - require("./dcwebui.css"); + require("./dcwebui.less"); require("./socket.io-1.7.2.js"); "use strict"; diff --git a/client/dcwebui.css b/client/dcwebui.less similarity index 100% rename from client/dcwebui.css rename to client/dcwebui.less diff --git a/package-lock.json b/package-lock.json index e0ecfdd..916024c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2087,6 +2087,23 @@ "source-map": "0.5.7" } }, + "less-loader": { + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-4.0.5.tgz", + "integrity": "sha1-rhVadAbKxqzSk9eFWH/P8PR4xN0=", + "requires": { + "clone": "2.1.1", + "loader-utils": "1.1.0", + "pify": "2.3.0" + }, + "dependencies": { + "clone": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.1.tgz", + "integrity": "sha1-0hfR6WERjjrJpLi7oyhVU79kfNs=" + } + } + }, "less-plugin-clean-css": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/less-plugin-clean-css/-/less-plugin-clean-css-1.5.1.tgz", diff --git a/package.json b/package.json index a37e920..3c1ad95 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "css-loader": "^0.28.7", "html-minifier": "^3.5.6", "less": "^2.7.3", + "less-loader": "^4.0.5", "less-plugin-clean-css": "^1.5.1", "style-loader": "^0.19.0", "uglify-js": "^3.1.8", diff --git a/webpack.config.js b/webpack.config.js index 024c2dc..e7f1aa3 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,4 +1,7 @@ -var webpack = require("webpack"); +/*! webpack.config.js */ + +const webpack = require("webpack"); +const CleanCSSPlugin = require("less-plugin-clean-css"); module.exports = { entry: "./client/dcwebui.js", @@ -8,7 +11,28 @@ module.exports = { }, module: { loaders: [ - { test: /\.css$/, loader: "style-loader!css-loader" } + + // Plain CSS files (no longer present) + { test: /\.css$/, loader: "style-loader!css-loader" }, + + // LESS CSS files + { + test: /\.less$/, + use: [ + { loader: "style-loader" }, + { loader: "css-loader" }, + { + loader: "less-loader", + options: { + noIeCompat: false, + plugins: [ + new CleanCSSPlugin({ advanced: true }) + ] + } + } + ] + } + ] }, plugins: [