Skip to content

Commit

Permalink
fix: regression for custom configurations (#3834)
Browse files Browse the repository at this point in the history
  • Loading branch information
alexander-akait authored Jun 4, 2023
1 parent 14b9c18 commit bb4f8eb
Show file tree
Hide file tree
Showing 11 changed files with 1,059 additions and 17 deletions.
3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@
"webpack": "5.x.x"
},
"devDependencies": {
"@babel/core": "^7.22.1",
"@babel/preset-env": "^7.22.4",
"@babel/register": "^7.15.8",
"@commitlint/cli": "^17.1.2",
"@commitlint/config-conventional": "^17.1.0",
"@types/jest": "^29.4.0",
Expand Down
3 changes: 1 addition & 2 deletions packages/webpack-cli/src/webpack-cli.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1802,8 +1802,7 @@ class WebpackCLI implements IWebpackCLI {
const interpret = require("interpret");
const loadConfigByPath = async (configPath: string, argv: Argv = {}) => {
const ext = path.extname(configPath).toLowerCase();
let interpreted = interpret.jsVariants[ext];

let interpreted = Object.keys(interpret.jsVariants).find((variant) => variant === ext);
// Fallback `.cts` to `.ts`
// TODO implement good `.mts` support after https://github.com/gulpjs/rechoir/issues/43
// For ESM and `.mts` you need to use: 'NODE_OPTIONS="--loader ts-node/esm" webpack-cli --config ./webpack.config.mts'
Expand Down
14 changes: 14 additions & 0 deletions test/build/config-format/babel-commonjs/babel-esm.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
// eslint-disable-next-line node/no-unpublished-require
const { run } = require("../../../utils/test-utils");

describe("webpack cli", () => {
it("should support mjs config format", async () => {
const { exitCode, stderr, stdout } = await run(__dirname, ["-c", "webpack.config.babel.js"]);

console.log(stderr);

expect(exitCode).toBe(0);
expect(stderr).toBeFalsy();
expect(stdout).toBeTruthy();
});
});
1 change: 1 addition & 0 deletions test/build/config-format/babel-commonjs/main.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
console.log("You know who");
5 changes: 5 additions & 0 deletions test/build/config-format/babel-commonjs/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"engines": {
"node": ">=14.15.0"
}
}
10 changes: 10 additions & 0 deletions test/build/config-format/babel-commonjs/webpack.config.babel.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
const path = require("path");

module.exports = {
mode: "development",
entry: "./main.js",
output: {
path: path.resolve(__dirname, "dist"),
filename: "foo.bundle.js",
},
};
12 changes: 12 additions & 0 deletions test/build/config-format/babel-esm/babel-esm.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
// eslint-disable-next-line node/no-unpublished-require
const { run } = require("../../../utils/test-utils");

describe("webpack cli", () => {
it("should support mjs config format", async () => {
const { exitCode, stderr, stdout } = await run(__dirname, ["-c", "webpack.config.babel.js"]);

expect(exitCode).toBe(0);
expect(stderr).toBeFalsy();
expect(stdout).toBeTruthy();
});
});
1 change: 1 addition & 0 deletions test/build/config-format/babel-esm/main.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
console.log("You know who");
6 changes: 6 additions & 0 deletions test/build/config-format/babel-esm/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"type": "module",
"engines": {
"node": ">=14.15.0"
}
}
12 changes: 12 additions & 0 deletions test/build/config-format/babel-esm/webpack.config.babel.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/* eslint-disable */
import { fileURLToPath } from "url";
import path from "path";

export default {
mode: "development",
entry: "./main.js",
output: {
path: path.resolve(path.dirname(fileURLToPath(import.meta.url)), "dist"),
filename: "foo.bundle.js",
},
};
1,009 changes: 994 additions & 15 deletions yarn.lock

Large diffs are not rendered by default.

0 comments on commit bb4f8eb

Please sign in to comment.