Merge branch 'migration/esmodule' into develop

Author: iamWing

.eslintrc.cjs

@@ -85,7 +85,12 @@ const jestConfig = {
 };
 
 const specialConfig = {
-  files: ['**/*.config.js', '**/*.config.*.js'],
+  files: [
+    '**/*.config.js',
+    '**/*.config.cjs',
+    '**/*.config.*.js',
+    '**/*.config.*.cjs',
+  ],
   rules: {
     ...baseConfig.rules,
     'import/no-extraneous-dependencies': 'off',

CHANGELOG_V4+.md

@@ -24,6 +24,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - `jest.config.js` & `webpack.config.js` are no longer ignored by ESLint.
 - Improved the readability of `webpack.config.js` by migrating to `webpack-merge`
   from using `lodash.deepClone()` for merging configuration objects.
+- Configured Node to resolve JavaScript files as ES modules (`"type": "module"`
+  in `package.json`).
+- Refactored Jest and Webpack config files as ES modules.
 
 ### Fixed
 - Module import order warnings in most modules.

jest.config.js

@@ -1,8 +1,10 @@
-const { pathsToModuleNameMapper } = require('ts-jest');
+import { createRequire } from 'module';
+import { pathsToModuleNameMapper } from 'ts-jest';
+
+const require = createRequire(import.meta.url);
 const { compilerOptions } = require('./tsconfig.json');
 
-/** @type {import('ts-jest/dist/types').InitialOptionsTsJest} */
-module.exports = {
+export default {
   testEnvironment: 'node',
   globals: {
     'ts-jest': {

package.json

@@ -2,6 +2,7 @@
   "name": "electron-react-typescript-webpack-boilerplate",
   "version": "4.0.0",
   "description": "Pre-configured boilerplate for Electron + React + TypeScript",
+  "type": "module",
   "main": "./dist/main.bundle.js",
   "scripts": {
     "start": "electron ./dist/main.bundle.js",

tsconfig.eslint.json

@@ -8,6 +8,8 @@
     "tests/**/*",
     ".eslintrc.cjs",
     "**/*.config.js",
+    "**/*.config.cjs",
     "**/*.config.*.js",
+    "**/*.config.*.cjs"
   ]
 }

webpack.config.js

@@ -1,20 +1,22 @@
-const path = require('path');
-const CopyPlugin = require('copy-webpack-plugin');
-const HtmlWebpackPlugin = require('html-webpack-plugin');
-const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin');
-const { merge } = require('webpack-merge');
+import path from 'path';
+import { fileURLToPath } from 'url';
+import CopyPlugin from 'copy-webpack-plugin';
+import HtmlWebpackPlugin from 'html-webpack-plugin';
+import TsconfigPathsPlugin from 'tsconfig-paths-webpack-plugin';
+import { merge } from 'webpack-merge';
 
-function srcPaths(src) {
-  return path.join(__dirname, src);
-}
+/* eslint-disable no-underscore-dangle */
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+/* eslint-enable */
 
 const isEnvProduction = process.env.NODE_ENV === 'production';
 const isEnvDevelopment = process.env.NODE_ENV === 'development';
 
 const commonConfig = {
   devtool: isEnvDevelopment ? 'source-map' : false,
   mode: isEnvProduction ? 'production' : 'development',
-  output: { path: srcPaths('dist') },
+  output: { path: path.join(__dirname, 'dist') },
   node: { __dirname: false, __filename: false },
   resolve: {
     extensions: ['.js', '.json', '.ts', '.tsx'],
@@ -59,6 +61,7 @@ const mainConfig = merge(commonConfig, {
             const jsonContent = JSON.parse(content);
             const electronVersion = jsonContent.devDependencies.electron;
 
+            delete jsonContent.type;
             delete jsonContent.devDependencies;
             delete jsonContent.optionalDependencies;
             delete jsonContent.scripts;
@@ -93,4 +96,4 @@ const rendererConfig = merge(commonConfig, {
   ],
 });
 
-module.exports = [mainConfig, preloadConfig, rendererConfig];
+export default [mainConfig, preloadConfig, rendererConfig];