commit node_modules and generated files

node_modules/webpack-cli/bin/utils/constants.js

@@ -0,0 +1,28 @@
+const NON_COMPILATION_ARGS = ["init", "migrate", "serve", "generate-loader", "generate-plugin", "info"];
+
+const CONFIG_GROUP = "Config options:";
+const BASIC_GROUP = "Basic options:";
+const MODULE_GROUP = "Module options:";
+const OUTPUT_GROUP = "Output options:";
+const ADVANCED_GROUP = "Advanced options:";
+const RESOLVE_GROUP = "Resolving options:";
+const OPTIMIZE_GROUP = "Optimizing options:";
+const DISPLAY_GROUP = "Stats options:";
+const GROUPS = {
+	CONFIG_GROUP,
+	BASIC_GROUP,
+	MODULE_GROUP,
+	OUTPUT_GROUP,
+	ADVANCED_GROUP,
+	RESOLVE_GROUP,
+	OPTIMIZE_GROUP,
+	DISPLAY_GROUP
+};
+
+const WEBPACK_OPTIONS_FLAG = "WEBPACK_OPTIONS";
+
+module.exports = {
+	NON_COMPILATION_ARGS,
+	GROUPS,
+	WEBPACK_OPTIONS_FLAG
+};

node_modules/webpack-cli/bin/utils/convert-argv.js

@@ -0,0 +1,562 @@
+const path = require("path");
+const fs = require("fs");
+fs.existsSync = fs.existsSync || path.existsSync;
+const interpret = require("interpret");
+const prepareOptions = require("./prepareOptions");
+const findup = require("findup-sync");
+const validateOptions = require("./validate-options");
+
+module.exports = function(...args) {
+	const argv = args[1] || args[0];
+	const options = [];
+	// Shortcuts
+	if (argv.d) {
+		argv.debug = true;
+		argv["output-pathinfo"] = true;
+		if (!argv.devtool) {
+			argv.devtool = "eval-cheap-module-source-map";
+		}
+		if (!argv.mode) {
+			argv.mode = "development";
+		}
+	}
+	if (argv.p) {
+		argv["optimize-minimize"] = true;
+		// eslint-disable-next-line quotes
+		argv["define"] = [].concat(argv["define"] || []).concat('process.env.NODE_ENV="production"');
+		if (!argv.mode) {
+			argv.mode = "production";
+		}
+	}
+
+	if (argv.output) {
+		let output = argv.output;
+		if (!path.isAbsolute(argv.o)) {
+			output = path.resolve(process.cwd(), output);
+		}
+		argv["output-filename"] = path.basename(output);
+		argv["output-path"] = path.dirname(output);
+	}
+
+	let configFileLoaded = false;
+	let configFiles = [];
+	const extensions = Object.keys(interpret.extensions).sort(function(a, b) {
+		return a === ".js" ? -1 : b === ".js" ? 1 : a.length - b.length;
+	});
+
+	let i;
+	if (argv.config) {
+		const getConfigExtension = function getConfigExtension(configPath) {
+			for (i = extensions.length - 1; i >= 0; i--) {
+				const tmpExt = extensions[i];
+				if (configPath.indexOf(tmpExt, configPath.length - tmpExt.length) > -1) {
+					return tmpExt;
+				}
+			}
+			return path.extname(configPath);
+		};
+
+		const mapConfigArg = function mapConfigArg(configArg) {
+			const resolvedPath = path.resolve(configArg);
+			const extension = getConfigExtension(resolvedPath);
+			return {
+				path: resolvedPath,
+				ext: extension
+			};
+		};
+
+		const configArgList = Array.isArray(argv.config) ? argv.config : [argv.config];
+		configFiles = configArgList.map(mapConfigArg);
+	} else {
+		const defaultConfigFileNames = ["webpack.config", "webpackfile"].join("|");
+		const webpackConfigFileRegExp = `(${defaultConfigFileNames})(${extensions.join("|")})`;
+		const pathToWebpackConfig = findup(webpackConfigFileRegExp);
+
+		if (pathToWebpackConfig) {
+			const resolvedPath = path.resolve(pathToWebpackConfig);
+			const actualConfigFileName = path.basename(resolvedPath);
+			const ext = actualConfigFileName.replace(new RegExp(defaultConfigFileNames), "");
+			configFiles.push({
+				path: resolvedPath,
+				ext
+			});
+		}
+	}
+	if (configFiles.length > 0) {
+		const registerCompiler = function registerCompiler(moduleDescriptor) {
+			if (moduleDescriptor) {
+				if (typeof moduleDescriptor === "string") {
+					require(moduleDescriptor);
+				} else if (!Array.isArray(moduleDescriptor)) {
+					moduleDescriptor.register(require(moduleDescriptor.module));
+				} else {
+					for (let i = 0; i < moduleDescriptor.length; i++) {
+						try {
+							registerCompiler(moduleDescriptor[i]);
+							break;
+						} catch (e) {
+							// do nothing
+						}
+					}
+				}
+			}
+		};
+
+		const requireConfig = function requireConfig(configPath) {
+			let options = (function WEBPACK_OPTIONS() {
+				if (argv.configRegister && argv.configRegister.length) {
+					module.paths.unshift(path.resolve(process.cwd(), "node_modules"), process.cwd());
+					argv.configRegister.forEach(dep => {
+						require(dep);
+					});
+					return require(path.resolve(process.cwd(), configPath));
+				} else {
+					return require(path.resolve(process.cwd(), configPath));
+				}
+			})();
+			options = prepareOptions(options, argv);
+			return options;
+		};
+
+		configFiles.forEach(function(file) {
+			registerCompiler(interpret.extensions[file.ext]);
+			options.push(requireConfig(file.path));
+		});
+		configFileLoaded = true;
+	}
+
+	if (!configFileLoaded) {
+		return processConfiguredOptions();
+	} else if (options.length === 1) {
+		return processConfiguredOptions(options[0]);
+	} else {
+		return processConfiguredOptions(options);
+	}
+
+	function processConfiguredOptions(options) {
+		if (options) {
+			validateOptions(options);
+		} else {
+			options = {};
+		}
+
+		// process Promise
+		if (typeof options.then === "function") {
+			return options.then(processConfiguredOptions);
+		}
+
+		// process ES6 default
+		if (typeof options === "object" && typeof options.default === "object") {
+			return processConfiguredOptions(options.default);
+		}
+
+		// filter multi-config by name
+		if (Array.isArray(options) && argv["config-name"]) {
+			const namedOptions = options.filter(function(opt) {
+				return opt.name === argv["config-name"];
+			});
+			if (namedOptions.length === 0) {
+				console.error("Configuration with name '" + argv["config-name"] + "' was not found.");
+				process.exit(-1); // eslint-disable-line
+			} else if (namedOptions.length === 1) {
+				return processConfiguredOptions(namedOptions[0]);
+			}
+			options = namedOptions;
+		}
+
+		if (Array.isArray(options)) {
+			options.forEach(processOptions);
+		} else {
+			processOptions(options);
+		}
+
+		if (argv.context) {
+			options.context = path.resolve(argv.context);
+		}
+		if (!options.context) {
+			options.context = process.cwd();
+		}
+
+		if (argv.watch) {
+			options.watch = true;
+		}
+
+		if (argv["watch-aggregate-timeout"]) {
+			options.watchOptions = options.watchOptions || {};
+			options.watchOptions.aggregateTimeout = +argv["watch-aggregate-timeout"];
+		}
+
+		if (typeof argv["watch-poll"] !== "undefined") {
+			options.watchOptions = options.watchOptions || {};
+			if (argv["watch-poll"] === "true" || argv["watch-poll"] === "") options.watchOptions.poll = true;
+			else if (!isNaN(argv["watch-poll"])) options.watchOptions.poll = +argv["watch-poll"];
+		}
+
+		if (argv["watch-stdin"]) {
+			options.watchOptions = options.watchOptions || {};
+			options.watchOptions.stdin = true;
+			options.watch = true;
+		}
+
+		return options;
+	}
+
+	function processOptions(options) {
+		function ifArg(name, fn, init, finalize) {
+			const isArray = Array.isArray(argv[name]);
+			const isSet = typeof argv[name] !== "undefined" && argv[name] !== null;
+			if (!isArray && !isSet) return;
+
+			init && init();
+			if (isArray) argv[name].forEach(fn);
+			else if (isSet) fn(argv[name], -1);
+			finalize && finalize();
+		}
+
+		function ifArgPair(name, fn, init, finalize) {
+			ifArg(
+				name,
+				function(content, idx) {
+					const i = content.indexOf("=");
+					if (i < 0) {
+						return fn(null, content, idx);
+					} else {
+						return fn(content.substr(0, i), content.substr(i + 1), idx);
+					}
+				},
+				init,
+				finalize
+			);
+		}
+
+		function ifBooleanArg(name, fn) {
+			ifArg(name, function(bool) {
+				if (bool) {
+					fn();
+				}
+			});
+		}
+
+		function mapArgToBoolean(name, optionName) {
+			ifArg(name, function(bool) {
+				if (bool === true) options[optionName || name] = true;
+				else if (bool === false) options[optionName || name] = false;
+			});
+		}
+
+		function loadPlugin(name) {
+			const loadUtils = require("loader-utils");
+			let args;
+			try {
+				const p = name && name.indexOf("?");
+				if (p > -1) {
+					args = loadUtils.parseQuery(name.substring(p));
+					name = name.substring(0, p);
+				}
+			} catch (e) {
+				console.log("Invalid plugin arguments " + name + " (" + e + ").");
+				process.exit(-1); // eslint-disable-line
+			}
+
+			let path;
+			try {
+				const resolve = require("enhanced-resolve");
+				path = resolve.sync(process.cwd(), name);
+			} catch (e) {
+				console.log("Cannot resolve plugin " + name + ".");
+				process.exit(-1); // eslint-disable-line
+			}
+			let Plugin;
+			try {
+				Plugin = require(path);
+			} catch (e) {
+				console.log("Cannot load plugin " + name + ". (" + path + ")");
+				throw e;
+			}
+			try {
+				return new Plugin(args);
+			} catch (e) {
+				console.log("Cannot instantiate plugin " + name + ". (" + path + ")");
+				throw e;
+			}
+		}
+
+		function ensureObject(parent, name, force) {
+			if (force || typeof parent[name] !== "object" || parent[name] === null) {
+				parent[name] = {};
+			}
+		}
+
+		function ensureArray(parent, name) {
+			if (!Array.isArray(parent[name])) {
+				parent[name] = [];
+			}
+		}
+
+		function addPlugin(options, plugin) {
+			ensureArray(options, "plugins");
+			options.plugins.unshift(plugin);
+		}
+
+		ifArg("mode", function(value) {
+			options.mode = value;
+		});
+
+		ifArgPair(
+			"entry",
+			function(name, entry) {
+				if (typeof options.entry[name] !== "undefined" && options.entry[name] !== null) {
+					options.entry[name] = [].concat(options.entry[name]).concat(entry);
+				} else {
+					options.entry[name] = entry;
+				}
+			},
+			function() {
+				ensureObject(options, "entry", true);
+			}
+		);
+
+		function bindRules(arg) {
+			ifArgPair(
+				arg,
+				function(name, binding) {
+					if (name === null) {
+						name = binding;
+						binding += "-loader";
+					}
+					const rule = {
+						test: new RegExp("\\." + name.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&") + "$"), // eslint-disable-line no-useless-escape
+						loader: binding
+					};
+					if (arg === "module-bind-pre") {
+						rule.enforce = "pre";
+					} else if (arg === "module-bind-post") {
+						rule.enforce = "post";
+					}
+					options.module.rules.push(rule);
+				},
+				function() {
+					ensureObject(options, "module");
+					ensureArray(options.module, "rules");
+				}
+			);
+		}
+		bindRules("module-bind");
+		bindRules("module-bind-pre");
+		bindRules("module-bind-post");
+
+		let defineObject;
+		ifArgPair(
+			"define",
+			function(name, value) {
+				if (name === null) {
+					name = value;
+					value = true;
+				}
+				defineObject[name] = value;
+			},
+			function() {
+				defineObject = {};
+			},
+			function() {
+				const DefinePlugin = require("webpack").DefinePlugin;
+				addPlugin(options, new DefinePlugin(defineObject));
+			}
+		);
+
+		ifArg("output-path", function(value) {
+			ensureObject(options, "output");
+			options.output.path = path.resolve(value);
+		});
+
+		ifArg("output-filename", function(value) {
+			ensureObject(options, "output");
+
+			options.output.filename = value;
+		});
+
+		ifArg("output-chunk-filename", function(value) {
+			ensureObject(options, "output");
+			options.output.chunkFilename = value;
+		});
+
+		ifArg("output-source-map-filename", function(value) {
+			ensureObject(options, "output");
+			options.output.sourceMapFilename = value;
+		});
+
+		ifArg("output-public-path", function(value) {
+			ensureObject(options, "output");
+			options.output.publicPath = value;
+		});
+
+		ifArg("output-jsonp-function", function(value) {
+			ensureObject(options, "output");
+			options.output.jsonpFunction = value;
+		});
+
+		ifBooleanArg("output-pathinfo", function() {
+			ensureObject(options, "output");
+			options.output.pathinfo = true;
+		});
+
+		ifArg("output-library", function(value) {
+			ensureObject(options, "output");
+			ensureArray(options.output, "library");
+			options.output.library.push(value);
+		});
+
+		ifArg("output-library-target", function(value) {
+			ensureObject(options, "output");
+			options.output.libraryTarget = value;
+		});
+
+		ifArg("records-input-path", function(value) {
+			options.recordsInputPath = path.resolve(value);
+		});
+
+		ifArg("records-output-path", function(value) {
+			options.recordsOutputPath = path.resolve(value);
+		});
+
+		ifArg("records-path", function(value) {
+			options.recordsPath = path.resolve(value);
+		});
+
+		ifArg("target", function(value) {
+			options.target = value;
+		});
+
+		mapArgToBoolean("cache");
+
+		ifBooleanArg("hot", function() {
+			const HotModuleReplacementPlugin = require("webpack").HotModuleReplacementPlugin;
+			addPlugin(options, new HotModuleReplacementPlugin());
+		});
+
+		ifBooleanArg("no-cache", function() {
+			options.cache = false;
+		});
+
+		ifBooleanArg("debug", function() {
+			const LoaderOptionsPlugin = require("webpack").LoaderOptionsPlugin;
+			addPlugin(
+				options,
+				new LoaderOptionsPlugin({
+					debug: true
+				})
+			);
+		});
+
+		ifArg("devtool", function(value) {
+			options.devtool = value;
+		});
+
+		function processResolveAlias(arg, key) {
+			ifArgPair(arg, function(name, value) {
+				if (!name) {
+					throw new Error("--" + arg + " <string>=<string>");
+				}
+				ensureObject(options, key);
+				ensureObject(options[key], "alias");
+				options[key].alias[name] = value;
+			});
+		}
+		processResolveAlias("resolve-alias", "resolve");
+		processResolveAlias("resolve-loader-alias", "resolveLoader");
+
+		ifArg("resolve-extensions", function(value) {
+			ensureObject(options, "resolve");
+			if (Array.isArray(value)) {
+				options.resolve.extensions = value;
+			} else {
+				options.resolve.extensions = value.split(/,\s*/);
+			}
+		});
+
+		ifArg("optimize-max-chunks", function(value) {
+			const LimitChunkCountPlugin = require("webpack").optimize.LimitChunkCountPlugin;
+			addPlugin(
+				options,
+				new LimitChunkCountPlugin({
+					maxChunks: parseInt(value, 10)
+				})
+			);
+		});
+
+		ifArg("optimize-min-chunk-size", function(value) {
+			const MinChunkSizePlugin = require("webpack").optimize.MinChunkSizePlugin;
+			addPlugin(
+				options,
+				new MinChunkSizePlugin({
+					minChunkSize: parseInt(value, 10)
+				})
+			);
+		});
+
+		ifBooleanArg("optimize-minimize", function() {
+			const LoaderOptionsPlugin = require("webpack").LoaderOptionsPlugin;
+			addPlugin(
+				options,
+				new LoaderOptionsPlugin({
+					minimize: true
+				})
+			);
+		});
+
+		ifArg("prefetch", function(request) {
+			const PrefetchPlugin = require("webpack").PrefetchPlugin;
+			addPlugin(options, new PrefetchPlugin(request));
+		});
+
+		ifArg("provide", function(value) {
+			const idx = value.indexOf("=");
+			let name;
+			if (idx >= 0) {
+				name = value.substr(0, idx);
+				value = value.substr(idx + 1);
+			} else {
+				name = value;
+			}
+			const ProvidePlugin = require("webpack").ProvidePlugin;
+			addPlugin(options, new ProvidePlugin(name, value));
+		});
+
+		ifArg("plugin", function(value) {
+			addPlugin(options, loadPlugin(value));
+		});
+
+		mapArgToBoolean("bail");
+
+		mapArgToBoolean("profile");
+
+		if (argv._.length > 0) {
+			ensureObject(options, "entry", true);
+
+			const addTo = function addTo(name, entry) {
+				if (options.entry[name]) {
+					if (!Array.isArray(options.entry[name])) {
+						options.entry[name] = [options.entry[name]];
+					}
+					options.entry[name].push(entry);
+				} else {
+					options.entry[name] = entry;
+				}
+			};
+			argv._.forEach(function(content) {
+				const i = content.indexOf("=");
+				const j = content.indexOf("?");
+				if (i < 0 || (j >= 0 && j < i)) {
+					const resolved = path.resolve(content);
+					if (fs.existsSync(resolved)) {
+						addTo("main", `${resolved}${fs.statSync(resolved).isDirectory() ? path.sep : ""}`);
+					} else {
+						addTo("main", content);
+					}
+				} else {
+					addTo(content.substr(0, i), content.substr(i + 1));
+				}
+			});
+		}
+	}
+};

node_modules/webpack-cli/bin/utils/errorHelpers.js

@@ -0,0 +1,33 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const { WEBPACK_OPTIONS_FLAG } = require("./constants");
+
+exports.cutOffByFlag = (stack, flag) => {
+	stack = stack.split("\n");
+	for (let i = 0; i < stack.length; i++) if (stack[i].indexOf(flag) >= 0) stack.length = i;
+	return stack.join("\n");
+};
+
+exports.cutOffWebpackOptions = stack => exports.cutOffByFlag(stack, WEBPACK_OPTIONS_FLAG);
+
+exports.cutOffMultilineMessage = (stack, message) => {
+	stack = stack.split("\n");
+	message = message.split("\n");
+
+	return stack
+		.reduce(
+			(acc, line, idx) => (line === message[idx] || line === `Error: ${message[idx]}` ? acc : acc.concat(line)),
+			[]
+		)
+		.join("\n");
+};
+
+exports.cleanUpWebpackOptions = (stack, message) => {
+	stack = exports.cutOffWebpackOptions(stack);
+	stack = exports.cutOffMultilineMessage(stack, message);
+	return stack;
+};

node_modules/webpack-cli/bin/utils/prepareOptions.js

@@ -0,0 +1,24 @@
+"use strict";
+
+module.exports = function prepareOptions(options, argv) {
+	argv = argv || {};
+	options = handleExport(options);
+
+	return Array.isArray(options)
+		? options.map(_options => handleFunction(_options, argv))
+		: handleFunction(options, argv);
+};
+
+function handleExport(options) {
+	const isES6DefaultExported =
+		typeof options === "object" && options !== null && typeof options.default !== "undefined";
+
+	return isES6DefaultExported ? options.default : options;
+}
+
+function handleFunction(options, argv) {
+	if (typeof options === "function") {
+		options = options(argv.env, argv);
+	}
+	return options;
+}

node_modules/webpack-cli/bin/utils/prompt-command.js

@@ -0,0 +1,142 @@
+// based on https://github.com/webpack/webpack/blob/master/bin/webpack.js
+
+/**
+ * @param {string} command process to run
+ * @param {string[]} args commandline arguments
+ * @returns {Promise<void>} promise
+ */
+const runCommand = (command, args) => {
+	const cp = require("child_process");
+	return new Promise((resolve, reject) => {
+		const executedCommand = cp.spawn(command, args, {
+			stdio: "inherit",
+			shell: true
+		});
+
+		executedCommand.on("error", error => {
+			reject(error);
+		});
+
+		executedCommand.on("exit", code => {
+			if (code === 0) {
+				resolve();
+			} else {
+				reject();
+			}
+		});
+	});
+};
+
+const npmGlobalRoot = () => {
+	const cp = require("child_process");
+	return new Promise((resolve, reject) => {
+		const command = cp.spawn("npm", ["root", "-g"]);
+		command.on("error", error => reject(error));
+		command.stdout.on("data", data => resolve(data.toString()));
+		command.stderr.on("data", data => reject(data));
+	});
+};
+
+const runWhenInstalled = (packages, pathForCmd, ...args) => {
+	const currentPackage = require(pathForCmd);
+	const func = currentPackage.default;
+	if (typeof func !== "function") {
+		throw new Error(`@webpack-cli/${packages} failed to export a default function`);
+	}
+	return func(...args);
+};
+
+module.exports = function promptForInstallation(packages, ...args) {
+	const nameOfPackage = "@webpack-cli/" + packages;
+	let packageIsInstalled = false;
+	let pathForCmd;
+	try {
+		const path = require("path");
+		const fs = require("fs");
+		pathForCmd = path.resolve(process.cwd(), "node_modules", "@webpack-cli", packages);
+		if (!fs.existsSync(pathForCmd)) {
+			const globalModules = require("global-modules");
+			pathForCmd = globalModules + "/@webpack-cli/" + packages;
+			require.resolve(pathForCmd);
+		} else {
+			require.resolve(pathForCmd);
+		}
+		packageIsInstalled = true;
+	} catch (err) {
+		packageIsInstalled = false;
+	}
+	if (!packageIsInstalled) {
+		const path = require("path");
+		const fs = require("fs");
+		const readLine = require("readline");
+		const isYarn = fs.existsSync(path.resolve(process.cwd(), "yarn.lock"));
+
+		const packageManager = isYarn ? "yarn" : "npm";
+		const options = ["install", "-D", nameOfPackage];
+
+		if (isYarn) {
+			options[0] = "add";
+		}
+
+		if (packages === "init") {
+			if (isYarn) {
+				options.splice(1, 1); // remove '-D'
+				options.splice(0, 0, "global");
+			} else {
+				options[1] = "-g";
+			}
+		}
+
+		const commandToBeRun = `${packageManager} ${options.join(" ")}`;
+
+		const question = `Would you like to install ${packages}? (That will run ${commandToBeRun}) (yes/NO) : `;
+
+		console.error(`The command moved into a separate package: ${nameOfPackage}`);
+		const questionInterface = readLine.createInterface({
+			input: process.stdin,
+			output: process.stdout
+		});
+		questionInterface.question(question, answer => {
+			questionInterface.close();
+			switch (answer.toLowerCase()) {
+				case "y":
+				case "yes":
+				case "1": {
+					runCommand(packageManager, options)
+						.then(_ => {
+							if (packages === "init") {
+								npmGlobalRoot()
+									.then(root => {
+										const pathtoInit = path.resolve(root.trim(), "@webpack-cli", "init");
+										return pathtoInit;
+									})
+									.then(pathForInit => {
+										return require(pathForInit).default(...args);
+									})
+									.catch(error => {
+										console.error(error);
+										process.exitCode = 1;
+									});
+								return;
+							}
+
+							pathForCmd = path.resolve(process.cwd(), "node_modules", "@webpack-cli", packages);
+							return runWhenInstalled(packages, pathForCmd, ...args);
+						})
+						.catch(error => {
+							console.error(error);
+							process.exitCode = 1;
+						});
+					break;
+				}
+				default: {
+					console.error(`${nameOfPackage} needs to be installed in order to run the command.`);
+					process.exitCode = 1;
+					break;
+				}
+			}
+		});
+	} else {
+		return runWhenInstalled(packages, pathForCmd, ...args);
+	}
+};

node_modules/webpack-cli/bin/utils/validate-options.js

@@ -0,0 +1,21 @@
+const webpackConfigurationSchema = require("../config/webpackConfigurationSchema.json");
+const validateSchema = require("webpack").validateSchema;
+
+module.exports = function validateOptions(options) {
+	let error;
+	try {
+		const errors = validateSchema(webpackConfigurationSchema, options);
+		if (errors && errors.length > 0) {
+			const { WebpackOptionsValidationError } = require("webpack");
+			error = new WebpackOptionsValidationError(errors);
+		}
+	} catch (err) {
+		error = err;
+	}
+
+	if (error) {
+		console.error(error.message);
+		// eslint-disable-next-line no-process-exit
+		process.exit(-1);
+	}
+};