nav tabs on admin dashboard

node_modules/css-loader/lib/compile-exports.js

@@ -1,4 +1,4 @@
-var camelCase = require("lodash.camelcase");
+var camelCase = require("lodash/camelCase");
 
 function dashesCamelCase(str) {
   return str.replace(/-+(\w)/g, function(match, firstLetter) {

node_modules/css-loader/lib/createResolver.js

@@ -1,36 +0,0 @@
-module.exports = function createResolver(alias) {
-	if(typeof alias !== "object" || Array.isArray(alias)) {
-		return function(url) {
-			return url
-		};
-	}
-
-	alias = Object.keys(alias).map(function(key) {
-		var onlyModule = false;
-		var obj = alias[key];
-		if(/\$$/.test(key)) {
-			onlyModule = true;
-			key = key.substr(0, key.length - 1);
-		}
-		if(typeof obj === "string") {
-			obj = {
-				alias: obj
-			};
-		}
-		obj = Object.assign({
-			name: key,
-			onlyModule: onlyModule
-		}, obj);
-		return obj;
-	});
-
-	return function(url) {
-		alias.forEach(function(obj) {
-			var name = obj.name;
-			if(url === name || (!obj.onlyModule && url.startsWith(name + "/"))) {
-				url = obj.alias + url.substr(name.length);
-			}
-		});
-		return url;
-	}
-}

node_modules/css-loader/lib/loader.js

@@ -6,18 +6,14 @@ var loaderUtils = require("loader-utils");
 var processCss = require("./processCss");
 var getImportPrefix = require("./getImportPrefix");
 var compileExports = require("./compile-exports");
-var createResolver = require("./createResolver");
 
 
 module.exports = function(content, map) {
-	if(this.cacheable) this.cacheable();
 	var callback = this.async();
 	var query = loaderUtils.getOptions(this) || {};
-	var root = query.root;
-	var moduleMode = query.modules || query.module;
-	var camelCaseKeys = query.camelCase || query.camelcase;
+	var moduleMode = query.modules;
+	var camelCaseKeys = query.camelCase;
 	var sourceMap = query.sourceMap || false;
-	var resolve = createResolver(query.alias);
 
 	if(sourceMap) {
 		if (map) {
@@ -42,8 +38,6 @@ module.exports = function(content, map) {
 		from: loaderUtils.getRemainingRequest(this).split("!").pop(),
 		to: loaderUtils.getCurrentRequest(this).split("!").pop(),
 		query: query,
-		resolve: resolve,
-		minimize: this.minimize,
 		loaderContext: this,
 		sourceMap: sourceMap
 	}, function(err, result) {
@@ -55,7 +49,11 @@ module.exports = function(content, map) {
 		var importUrlPrefix = getImportPrefix(this, query);
 
 		var alreadyImported = {};
-		var importJs = result.importItems.filter(function(imp) {
+		var importJs = result.importItems.map(function(imp) {
+			// fixes #781 when importing `url(filename.css )`
+			imp.url = imp.url.trim();
+			return imp;
+		}).filter(function(imp) {
 			if(!imp.mediaQuery) {
 				if(alreadyImported[imp.url])
 					return false;
@@ -63,7 +61,7 @@ module.exports = function(content, map) {
 			}
 			return true;
 		}).map(function(imp) {
-			if(!loaderUtils.isUrlRequest(imp.url, root)) {
+			if(!loaderUtils.isUrlRequest(imp.url)) {
 				return "exports.push([module.id, " +
 					JSON.stringify("@import url(" + imp.url + ");") + ", " +
 					JSON.stringify(imp.mediaQuery) + "]);";
@@ -94,7 +92,7 @@ module.exports = function(content, map) {
 				var match = result.urlItemRegExp.exec(item);
 				var idx = +match[1];
 				var urlItem = result.urlItems[idx];
-				var url = resolve(urlItem.url);
+				var url = urlItem.url;
 				idx = url.indexOf("?#");
 				if(idx < 0) idx = url.indexOf("#");
 				var urlRequest;
@@ -108,7 +106,7 @@ module.exports = function(content, map) {
 				return "\" + escape(require(" + loaderUtils.stringifyRequest(this, urlRequest) + ")) + \"";
 			}.bind(this));
 		}
-		
+
 		var exportJs = compileExports(result, importItemMatcher.bind(this), camelCaseKeys);
 		if (exportJs) {
 			exportJs = "exports.locals = " + exportJs + ";";

node_modules/css-loader/lib/localsLoader.js

@@ -6,23 +6,18 @@ var loaderUtils = require("loader-utils");
 var processCss = require("./processCss");
 var getImportPrefix = require("./getImportPrefix");
 var compileExports = require("./compile-exports");
-var createResolver = require("./createResolver");
 
 
 module.exports = function(content) {
-	if(this.cacheable) this.cacheable();
 	var callback = this.async();
 	var query = loaderUtils.getOptions(this) || {};
-	var moduleMode = query.modules || query.module;
-	var camelCaseKeys = query.camelCase || query.camelcase;
-	var resolve = createResolver(query.alias);
+	var moduleMode = query.modules;
+	var camelCaseKeys = query.camelCase;
 
 	processCss(content, null, {
 		mode: moduleMode ? "local" : "global",
 		query: query,
-		minimize: this.minimize,
 		loaderContext: this,
-		resolve: resolve
 	}, function(err, result) {
 		if(err) return callback(err);
 

node_modules/css-loader/lib/processCss.js

@@ -6,7 +6,6 @@ var formatCodeFrame = require("babel-code-frame");
 var Tokenizer = require("css-selector-tokenizer");
 var postcss = require("postcss");
 var loaderUtils = require("loader-utils");
-var assign = require("object-assign");
 var getLocalIdent = require("./getLocalIdent");
 
 var icssUtils = require('icss-utils');
@@ -56,8 +55,8 @@ var parserPlugin = postcss.plugin("css-loader-parser", function(options) {
 				values.nodes[0].nodes.shift();
 				var mediaQuery = Tokenizer.stringifyValues(values);
 
-				if(loaderUtils.isUrlRequest(url, options.root)) {
-					url = loaderUtils.urlToRequest(url, options.root);
+				if(loaderUtils.isUrlRequest(url)) {
+					url = loaderUtils.urlToRequest(url);
 				}
 
 				importItems.push({
@@ -85,11 +84,6 @@ var parserPlugin = postcss.plugin("css-loader-parser", function(options) {
 			exports[exportName] = replaceImportsInString(exports[exportName]);
 		});
 
-		function isAlias(url) {
-			// Handle alias starting by / and root disabled
-			return url !== options.resolve(url)
-		}
-
 		function processNode(item) {
 			switch (item.type) {
 				case "value":
@@ -105,7 +99,7 @@ var parserPlugin = postcss.plugin("css-loader-parser", function(options) {
 					}
 					break;
 				case "url":
-					if (options.url && item.url.replace(/\s/g, '').length && !/^#/.test(item.url) && (isAlias(item.url) || loaderUtils.isUrlRequest(item.url, options.root))) {
+					if (options.url && item.url.replace(/\s/g, '').length && !/^#/.test(item.url) && loaderUtils.isUrlRequest(item.url)) {
 						// Strip quotes, they will be re-added if the module needs them
 						item.stringType = "";
 						delete item.innerSpacingBefore;
@@ -141,17 +135,13 @@ var parserPlugin = postcss.plugin("css-loader-parser", function(options) {
 
 module.exports = function processCss(inputSource, inputMap, options, callback) {
 	var query = options.query;
-	var root = query.root && query.root.length > 0 ? query.root.replace(/\/$/, "") : query.root;
 	var context = query.context;
 	var localIdentName = query.localIdentName || "[hash:base64]";
 	var localIdentRegExp = query.localIdentRegExp;
-	var forceMinimize = query.minimize;
-	var minimize = typeof forceMinimize !== "undefined" ? !!forceMinimize : options.minimize;
 
 	var customGetLocalIdent = query.getLocalIdent || getLocalIdent;
 
 	var parserOptions = {
-		root: root,
 		mode: options.mode,
 		url: query.url !== false,
 		import: query.import !== false,
@@ -166,11 +156,11 @@ module.exports = function processCss(inputSource, inputMap, options, callback) {
 				if(parserOptions.url){
                     url = url.trim();
 
-					if(!url.replace(/\s/g, '').length || !loaderUtils.isUrlRequest(url, root)) {
+					if(!url.replace(/\s/g, '').length || !loaderUtils.isUrlRequest(url)) {
 						return url;
 					}
 					if(global) {
-						return loaderUtils.urlToRequest(url, root);
+						return loaderUtils.urlToRequest(url);
 					}
 				}
 				return url;
@@ -189,16 +179,6 @@ module.exports = function processCss(inputSource, inputMap, options, callback) {
 		parserPlugin(parserOptions)
 	]);
 
-	if(minimize) {
-		var cssnano = require("cssnano");
-		var minimizeOptions = assign({}, query.minimize);
-		["zindex", "normalizeUrl", "discardUnused", "mergeIdents", "reduceIdents", "autoprefixer"].forEach(function(name) {
-			if(typeof minimizeOptions[name] === "undefined")
-				minimizeOptions[name] = false;
-		});
-		pipeline.use(cssnano(minimizeOptions));
-	}
-
 	pipeline.process(inputSource, {
 		// we need a prefix to avoid path rewriting of PostCSS
 		from: "/css-loader!" + options.from,