add ResolveLoader distinguished from resolve

Author: evenstensberg

lib/init/transformations/index.js

@@ -33,6 +33,7 @@ const pluginsTransform = require("./plugins/plugins");
 const topScopeTransform = require("./top-scope/top-scope");
 const devServerTransform = require("./devServer/devServer");
 const modeTransform = require("./mode/mode");
+const resolveLoaderTransform = require("./resolveLoader/resolveLoader");
 
 /**
  *
@@ -70,7 +71,8 @@ const transformsObject = {
 	parallelismTransform,
 	recordsInputPathTransform,
 	recordsOutputPathTransform,
-	recordsPathTransform
+	recordsPathTransform,
+	resolveLoaderTransform
 };
 
 module.exports = function runTransform(webpackProperties, action) {

lib/init/transformations/resolveLoader/__testfixtures__/resolveLoader-0.input.js

@@ -0,0 +1,6 @@
+module.exports = {
+	entry: 'index.js',
+	output: {
+		filename: 'bundle.js'
+	}
+}

lib/init/transformations/resolveLoader/__testfixtures__/resolveLoader-1.input.js

@@ -0,0 +1,9 @@
+module.exports = {
+	entry: 'index.js',
+	output: {
+		filename: 'bundle.js'
+	},
+	resolveLoader: {
+		moduleExtensions: [ '-loader' ]
+	}
+}

lib/init/transformations/resolveLoader/resolveLoader.js

@@ -0,0 +1,96 @@
+"use strict";
+
+const utils = require("../../../utils/ast-utils");
+
+/**
+ *
+ * Transform for resolveLoader. Finds the resolveLoader property from yeoman and creates a
+ * property based on what the user has given us.
+ *
+ * @param j — jscodeshift API
+ * @param ast - jscodeshift API
+ * @param {any} webpackProperties - transformation object to scaffold
+ * @param {String} action - action that indicates what to be done to the AST
+ * @returns ast - jscodeshift API
+ */
+
+module.exports = function resolveLoaderTransform(
+	j,
+	ast,
+	webpackProperties,
+	action
+) {
+	function createResolveLoaderProperty(p) {
+		utils.pushCreateProperty(j, p, "resolveLoader", j.objectExpression([]));
+		return utils.pushObjectKeys(j, p, webpackProperties, "resolveLoader");
+	}
+	if (webpackProperties) {
+		if (action === "init" && typeof webpackProperties === "object") {
+			return ast
+				.find(j.ObjectExpression)
+				.filter(p => utils.isAssignment(null, p, createResolveLoaderProperty));
+		} else if (action === "init" && webpackProperties.length) {
+			return ast
+				.find(j.ObjectExpression)
+				.filter(p =>
+					utils.isAssignment(
+						j,
+						p,
+						utils.pushCreateProperty,
+						"resolveLoader",
+						webpackProperties
+					)
+				);
+		} else if (action === "add") {
+			const resolveLoaderNode = utils.findRootNodesByName(
+				j,
+				ast,
+				"resolveLoader"
+			);
+			if (
+				resolveLoaderNode.size() !== 0 &&
+				typeof webpackProperties === "object"
+			) {
+				return ast
+					.find(j.ObjectExpression)
+					.filter(
+						p =>
+							utils.safeTraverse(p, ["parentPath", "value", "key", "name"]) ===
+							"resolveLoader"
+					)
+					.filter(p => {
+						Object.keys(webpackProperties).forEach(prop => {
+							utils.checkIfExistsAndAddValue(
+								j,
+								p,
+								prop,
+								utils.createIdentifierOrLiteral(j, webpackProperties[prop])
+							);
+						});
+						return ast;
+					});
+			} else if (resolveLoaderNode.size() !== 0 && webpackProperties.length) {
+				return ast
+					.find(j.ObjectExpression)
+					.filter(
+						p =>
+							utils.safeTraverse(p, ["parentPath", "value", "key", "name"]) ===
+							"resolveLoader"
+					)
+					.forEach(p => {
+						j(p).replaceWith(
+							utils.createIdentifierOrLiteral(j, webpackProperties)
+						);
+					});
+			} else {
+				return resolveLoaderTransform(j, ast, webpackProperties, "init");
+			}
+		} else if (action === "remove") {
+			// TODO
+		} else if (action === "update") {
+			// TODO
+		}
+	} else {
+		return ast;
+	}
+};

lib/init/transformations/resolveLoader/resolveLoader.test.js

@@ -0,0 +1,27 @@
+"use strict";
+
+const defineTest = require("../../../utils/defineTest");
+
+defineTest(
+	__dirname,
+	"resolve",
+	"resolveLoader-0",
+	{
+		modules: ["'ok'", "mode_nodules"],
+		mainFields: ["no", "'main'"],
+		moduleExtensions: ["'-kn'", "ok"]
+	},
+	"init"
+);
+
+defineTest(
+	__dirname,
+	"resolve",
+	"resolveLoader-1",
+	{
+		modules: ["'ok'", "mode_nodules"],
+		mainFields: ["no", "'main'"],
+		moduleExtensions: ["'-kn'", "ok"]
+	},
+	"add"
+);

lib/utils/prop-types.js

@@ -30,5 +30,6 @@ module.exports = new Set([
 	"parallelism",
 	"recordsInputPath",
 	"recordsOutputPath",
-	"recordsPath"
+	"recordsPath",
+	"resolveLoader"
 ]);

webpack.config.js

@@ -1,3 +1,27 @@
+const webpack = require('webpack');
 module.exports = {
-	plugins: []
+	resolve: {
+		alias: {
+			inject: "{{#isdf_eq buildasda 'staasdndalone'}}",
+			hello: "'worlasdd'",
+			inject_1: '{{/asd}}',
+			world: 'asdc'
+		},
+
+		aliasFields: ["'as'"],
+		descriptionFiles: ["'d'", 'e', 'f'],
+		enforceExtension: true,
+		extensions: ['ok', "'ho'"],
+		mainFields: ['ok', "'story'"],
+		mainFiles: ["'noMainFileHere'", 'niGuess'],
+
+		resolveLoader: {
+			modules: ["'ok'", 'mode_nodules'],
+			mainFields: ['no', "'main'"],
+			moduleExtensions: ["'-kn'", 'ok']
+		},
+
+		plugins: ['somePlugin', "'stringVal'"],
+		symlinks: false,
+	}
 };