From b19d01578d2ef15304be6ab549050407d5657563 Mon Sep 17 00:00:00 2001
From: evilebottnawi <sheo13666q@gmail.com>
Date: Mon, 1 Feb 2021 21:04:32 +0300
Subject: [PATCH] tests: fix

---
 package.json                                       |  2 +-
 .../commonjs-default.test.js}                      |  9 +++------
 test/config-format/commonjs-default/main.js        |  1 +
 .../commonjs-default/webpack.config.cjs            | 12 ++++++++++++
 .../typescript-commonjs-default/webpack.config.ts  | 14 --------------
 test/config-format/typescript-commonjs/main.ts     |  1 -
 .../typescript-commonjs/tsconfig.json              |  5 -----
 .../main.ts                                        |  0
 .../tsconfig.json                                  |  0
 .../typescript-commonjs.test.js                    |  0
 .../webpack.config.ts                              |  0
 11 files changed, 17 insertions(+), 27 deletions(-)
 rename test/config-format/{typescript-commonjs-default/typescript-commonjs-default.test.js => commonjs-default/commonjs-default.test.js} (53%)
 create mode 100644 test/config-format/commonjs-default/main.js
 create mode 100644 test/config-format/commonjs-default/webpack.config.cjs
 delete mode 100644 test/config-format/typescript-commonjs-default/webpack.config.ts
 delete mode 100644 test/config-format/typescript-commonjs/main.ts
 delete mode 100644 test/config-format/typescript-commonjs/tsconfig.json
 rename test/config-format/{typescript-commonjs-default => typescript}/main.ts (100%)
 rename test/config-format/{typescript-commonjs-default => typescript}/tsconfig.json (100%)
 rename test/config-format/{typescript-commonjs => typescript}/typescript-commonjs.test.js (100%)
 rename test/config-format/{typescript-commonjs => typescript}/webpack.config.ts (100%)

diff --git a/package.json b/package.json
index 27753e6f735..9eb2b192424 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "pretest": "yarn build && yarn lint && yarn prepsuite",
     "test": "jest --reporters=default",
     "test:smoketests": "nyc node smoketests",
-    "test:coverage": "nyc jest --forceExit",
+    "test:coverage": "nyc --require ts-node/register jest --forceExit",
     "test:cli": "jest test --reporters=default --forceExit",
     "test:packages": "jest packages/ --reporters=default --forceExit",
     "test:ci": "yarn test:cli && yarn test:packages",
diff --git a/test/config-format/typescript-commonjs-default/typescript-commonjs-default.test.js b/test/config-format/commonjs-default/commonjs-default.test.js
similarity index 53%
rename from test/config-format/typescript-commonjs-default/typescript-commonjs-default.test.js
rename to test/config-format/commonjs-default/commonjs-default.test.js
index b511e69843e..b31d62a3655 100644
--- a/test/config-format/typescript-commonjs-default/typescript-commonjs-default.test.js
+++ b/test/config-format/commonjs-default/commonjs-default.test.js
@@ -1,14 +1,11 @@
 const { run } = require('../../utils/test-utils');
-const { existsSync } = require('fs');
-const { resolve } = require('path');
 
 describe('webpack cli', () => {
-    it('should support typescript file', () => {
-        const { exitCode, stderr, stdout } = run(__dirname, ['-c', './webpack.config.ts']);
+    it('should support CommonJS file', () => {
+        const { exitCode, stderr, stdout } = run(__dirname, ['-c', 'webpack.config.cjs'], false);
 
+        expect(exitCode).toBe(0);
         expect(stderr).toBeFalsy();
         expect(stdout).toBeTruthy();
-        expect(exitCode).toBe(0);
-        expect(existsSync(resolve(__dirname, 'dist/foo.bundle.js'))).toBeTruthy();
     });
 });
diff --git a/test/config-format/commonjs-default/main.js b/test/config-format/commonjs-default/main.js
new file mode 100644
index 00000000000..8ed93e41fb2
--- /dev/null
+++ b/test/config-format/commonjs-default/main.js
@@ -0,0 +1 @@
+console.log('Hoshiumi');
diff --git a/test/config-format/commonjs-default/webpack.config.cjs b/test/config-format/commonjs-default/webpack.config.cjs
new file mode 100644
index 00000000000..415d965a247
--- /dev/null
+++ b/test/config-format/commonjs-default/webpack.config.cjs
@@ -0,0 +1,12 @@
+const path = require('path');
+
+const config = {
+    mode: 'production',
+    entry: './main.js',
+    output: {
+        path: path.resolve(__dirname, 'dist'),
+        filename: 'foo.bundle.js',
+    },
+};
+
+module.exports.default = config;
diff --git a/test/config-format/typescript-commonjs-default/webpack.config.ts b/test/config-format/typescript-commonjs-default/webpack.config.ts
deleted file mode 100644
index 4a17fa148c6..00000000000
--- a/test/config-format/typescript-commonjs-default/webpack.config.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/* eslint-disable node/no-unsupported-features/es-syntax */
-/** eslint-disable **/
-import * as path from 'path';
-
-const config = {
-    mode: 'production',
-    entry: './main.ts',
-    output: {
-        path: path.resolve(__dirname, 'dist'),
-        filename: 'foo.bundle.js',
-    },
-};
-
-export default config;
diff --git a/test/config-format/typescript-commonjs/main.ts b/test/config-format/typescript-commonjs/main.ts
deleted file mode 100644
index 5dbd072a4f6..00000000000
--- a/test/config-format/typescript-commonjs/main.ts
+++ /dev/null
@@ -1 +0,0 @@
-console.log('Main typescript file');
diff --git a/test/config-format/typescript-commonjs/tsconfig.json b/test/config-format/typescript-commonjs/tsconfig.json
deleted file mode 100644
index 391488ab17f..00000000000
--- a/test/config-format/typescript-commonjs/tsconfig.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "compilerOptions": {
-    "module": "commonjs"
-  }
-}
diff --git a/test/config-format/typescript-commonjs-default/main.ts b/test/config-format/typescript/main.ts
similarity index 100%
rename from test/config-format/typescript-commonjs-default/main.ts
rename to test/config-format/typescript/main.ts
diff --git a/test/config-format/typescript-commonjs-default/tsconfig.json b/test/config-format/typescript/tsconfig.json
similarity index 100%
rename from test/config-format/typescript-commonjs-default/tsconfig.json
rename to test/config-format/typescript/tsconfig.json
diff --git a/test/config-format/typescript-commonjs/typescript-commonjs.test.js b/test/config-format/typescript/typescript-commonjs.test.js
similarity index 100%
rename from test/config-format/typescript-commonjs/typescript-commonjs.test.js
rename to test/config-format/typescript/typescript-commonjs.test.js
diff --git a/test/config-format/typescript-commonjs/webpack.config.ts b/test/config-format/typescript/webpack.config.ts
similarity index 100%
rename from test/config-format/typescript-commonjs/webpack.config.ts
rename to test/config-format/typescript/webpack.config.ts