Merge pull request #728 from lakatostamas/fix/bin-extensions

fix(bin): extension detection (#724)

bin/convert-argv.js

@@ -69,15 +69,17 @@ module.exports = function(...args) {
 		const configArgList = Array.isArray(argv.config) ? argv.config : [argv.config];
 		configFiles = configArgList.map(mapConfigArg);
 	} else {
-		const defaultConfigFiles = ["webpack.config", "webpackfile"];
-		const webpackConfigFileRegExp = `(${defaultConfigFiles.join("|")})(${extensions.join("|")})`;
+		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: resolvedPath.split(".").pop()
+				ext,
 			});
 		}
 	}

package.json

@@ -152,6 +152,7 @@
     "rimraf": "^2.6.2",
     "schema-utils": "^1.0.0",
     "ts-jest": "^23.10.4",
+    "ts-node": "^7.0.1",
     "tslint": "^5.11.0",
     "typedoc": "^0.13.0",
     "typedoc-plugin-monorepo": "^0.1.0",

test/binCases/config-location/webpack-babel-config/.babelrc

@@ -0,0 +1,3 @@
+{
+	"presets": ["env"]
+}

test/binCases/config-location/webpack-babel-config/index2.js

@@ -0,0 +1 @@
+module.exports = "webpack-babel-config";

test/binCases/config-location/webpack-babel-config/webpack-babel-config.test.js

@@ -0,0 +1,17 @@
+"use strict";
+
+const { run } = require("../../../testUtils");
+
+test("webpack-babel-config", () => {
+	const { code, stdout, stderr } = run(__dirname, [
+		"--output-filename",
+		"[name].js",
+		"--output-chunk-filename",
+		"[id].chunk.js",
+		"--target",
+		"async-node",
+	]);
+	expect(code).toBe(0);
+	expect(stdout).toContain("./index2.js");
+	expect(stderr).toHaveLength(0);
+});

test/binCases/config-location/webpack-babel-config/webpack.config.babel.js

@@ -0,0 +1,9 @@
+// eslint-disable-next-line node/no-unsupported-features, node/no-unsupported-features/es-syntax
+import path from "path";
+
+const config = {
+	entry: path.resolve(__dirname, "./index2")
+};
+
+// eslint-disable-next-line node/no-unsupported-features, node/no-unsupported-features/es-syntax
+export default config;

test/binCases/config-location/webpack-ts-config/index2.js

@@ -0,0 +1 @@
+module.exports = "webpack-ts-config";

test/binCases/config-location/webpack-ts-config/tsconfig.json

@@ -0,0 +1,5 @@
+{
+  "compilerOptions": {
+    "esModuleInterop": true
+  }
+}

test/binCases/config-location/webpack-ts-config/webpack-ts-config.test.js

@@ -0,0 +1,17 @@
+"use strict";
+
+const { run } = require("../../../testUtils");
+
+test("webpack-ts-config", () => {
+	const { code, stdout, stderr } = run(__dirname, [
+		"--output-filename",
+		"[name].js",
+		"--output-chunk-filename",
+		"[id].chunk.js",
+		"--target",
+		"async-node",
+	]);
+	expect(code).toBe(0);
+	expect(stdout).toContain("./index2.js");
+	expect(stderr).toHaveLength(0);
+});

test/binCases/config-location/webpack-ts-config/webpack.config.ts

@@ -0,0 +1,8 @@
+import path from "path";
+import webpack from "webpack";
+
+const config: webpack.Configuration = {
+	entry: path.resolve(__dirname, "./index2"),
+};
+
+export default config;