Merge pull request #26 from kalcifer/featue/configuration

Feat - Adds -loader suffix after loader manipulation
webpack · Dec 27, 2016 · e782316 · e782316
2 parents 2c7df85 + b001c3b
commit e782316
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/lib/transformations/loaders/__testfixtures__/loaders.input.js b/lib/transformations/loaders/__testfixtures__/loaders.input.js
@@ -2,24 +2,24 @@ export default [{
 	module: {
 		loaders: [{
 			test: /\.js$/,
-			loader: 'babel-loader'
+			loader: 'babel'
 		}]
 	}
 }, {
 	module: {
 		loaders: [{
 			test: /\.css$/,
-			loader: 'style-loader!css-loader?modules=true'
+			loader: 'style!css?modules=true'
 		}]
 	}
 }, {
 	module: {
 		loaders: [{
 			test: /\.css$/,
 			loaders: [{
-				loader: 'style-loader'
+				loader: 'style'
 			}, {
-				loader: 'css-loader',
+				loader: 'css',
 				query: {
 					modules: true
 				}
@@ -30,14 +30,14 @@ export default [{
 	module: {
 		preLoaders:[{
 			test: /\.js$/,
-			loader: 'eslint-loader'
+			loader: 'eslint'
 		}]
 	}
 }, {
 	module: {
 		postLoaders:[{
 			test: /\.js$/,
-			loader: 'my-post-loader'
+			loader: 'my-post'
 		}]
 	}
 }, {

diff --git a/lib/transformations/loaders/loaders.js b/lib/transformations/loaders/loaders.js
@@ -107,7 +107,11 @@ module.exports = function(fileInfo, api) {
     .filter(p => p.value.name === 'query')  
     .replaceWith(j.identifier('options'));
 
-	const transforms = [ prepostLoaders, loadersToRules, loaderToUse, loadersInArray, loaderWithQueryParam, loaderWithQueryProp];
+	const addLoaderSuffix = () => ast.find(j.ObjectExpression)
+    .forEach(path => path.value.properties.map(prop => {if((prop.key.name === 'loader' || prop.key.name ==='use') && safeTraverse(prop, ['value', 'value']) && prop.value.value.indexOf('-loader') === -1) prop.value = j.literal(prop.value.value + '-loader');}))
+    .toSource();
+
+	const transforms = [ prepostLoaders, loadersToRules, loaderToUse, loadersInArray, loaderWithQueryParam, loaderWithQueryProp, addLoaderSuffix];
 	transforms.forEach(t => t());
 
 	return ast.toSource({quote:'single'});