rebuiltron 6.0.0 → 6.0.2

package/configurations/base.js

@@ -1,29 +1,18 @@
 const { createHash } = require("crypto");
 
-const HtmlWebpackPlugin = require("html-webpack-plugin");
 const CaseSensitivePathsPlugin = require("case-sensitive-paths-webpack-plugin");
-const InlineChunkHtmlPlugin = require("react-dev-utils/InlineChunkHtmlPlugin");
 const TerserPlugin = require("terser-webpack-plugin");
-const MiniCssExtractPlugin = require("mini-css-extract-plugin");
-const CssMinimizerPlugin = require("css-minimizer-webpack-plugin");
 const ModuleNotFoundPlugin = require("react-dev-utils/ModuleNotFoundPlugin");
-const ReactRefreshWebpackPlugin = require("@pmmmwh/react-refresh-webpack-plugin");
-const CopyPlugin = require("copy-webpack-plugin");
 
 const paths = require("../helpers/paths");
-const { shouldUseSourceMap, isEnvDevelopment, isEnvProduction } = require("../helpers/environment");
+const { isEnvDevelopment, isEnvProduction } = require("../helpers/environment");
 const { emptyOr } = require("../helpers/utils");
-const imageLoaders = require("../loaders/images");
-const styleLoaders = require("../loaders/style");
-const javascriptLoaders = require("../loaders/javascript");
-const rebuiltronConfig = require("../rebuiltronConfig");
 
 
 const { srcAlias } = require(paths.appConfig);
 
 
 module.exports = {
-	mode: isEnvProduction ? "production" : "development",
 	stats: "errors-warnings",
 	bail: isEnvProduction,
 	output: {
@@ -72,55 +61,14 @@ module.exports = {
 						comments: false
 					}
 				}
-			}),
-			new CssMinimizerPlugin()
+			})
 		]
 	},
 	module: {
-		strictExportPresence: true,
-		rules: [
-			// Handles `node_modules` packages that contain sourcemaps
-			...emptyOr(shouldUseSourceMap, [{
-				enforce: "pre",
-				exclude: /@babel(?:\/|\\{1,2})runtime/,
-				test: /\.(js|mjs|jsx|ts|tsx|css)$/,
-				loader: require.resolve("source-map-loader")
-			}]),
-			{
-				oneOf: [
-					...imageLoaders,
-					...javascriptLoaders,
-					...styleLoaders,
-					{
-						// Makes sure the assets get served by `WebpackDevServer`
-						exclude: [/^$/, /\.(js|mjs|jsx|ts|tsx)$/, /\.html$/, /\.json$/],
-						type: "asset/resource"
-					}
-				]
-			}
-		]
+		strictExportPresence: true
 	},
 	plugins: [
-		...emptyOr(isEnvProduction, [
-			new InlineChunkHtmlPlugin(HtmlWebpackPlugin, [/runtime-.+[.]js/]), // Injects scripts into HTML
-			new MiniCssExtractPlugin({
-				filename: `${rebuiltronConfig.buildDirs.css}/[name].[contenthash:8].css`,
-				chunkFilename: `${rebuiltronConfig.buildDirs.css}/[name].[contenthash:8].chunk.css`
-			}),
-			new CopyPlugin({
-				patterns: [{
-					from: paths.appPublic,
-					to: paths.appBuild,
-					globOptions: {
-						ignore: ["**/*.html"]
-					}
-				}]
-			})
-		]),
-		...emptyOr(isEnvDevelopment, [
-			new ReactRefreshWebpackPlugin({ overlay: false }),
-			new CaseSensitivePathsPlugin() // Detects case errors in import paths
-		]),
+		...emptyOr(isEnvDevelopment, [new CaseSensitivePathsPlugin()]), // Detects case errors in import paths
 		new ModuleNotFoundPlugin(paths.appPath) // Gives some necessary context to module not found errors
 	],
 	performance: false // Performance processing is already handled via `FileSizeReporter`

package/configurations/main.js

@@ -1,6 +1,7 @@
 const paths = require("../helpers/paths");
 const rebuiltronConfig = require("../rebuiltronConfig");
 const baseConfig = require("./base");
+const javascriptLoaders = require("../loaders/javascript");
 
 
 const { main } = require(paths.appConfig);
@@ -8,6 +9,7 @@ const { main } = require(paths.appConfig);
 
 module.exports = {
 	...baseConfig,
+	mode: "production",
 	target: "electron-main",
 	entry: {
 		[rebuiltronConfig.buildFileNames.main]: main
@@ -15,5 +17,13 @@ module.exports = {
 	output: {
 		...baseConfig.output,
 		filename: `${rebuiltronConfig.buildDirs.js}/[name].js`
+	},
+	module: {
+		...baseConfig.module,
+		rules: [
+			{
+				oneOf: javascriptLoaders
+			}
+		]
 	}
 };

package/configurations/preloads.js

@@ -3,6 +3,7 @@ const { mapKeys } = require("lodash");
 const paths = require("../helpers/paths");
 const rebuiltronConfig = require("../rebuiltronConfig");
 const baseConfig = require("./base");
+const javascriptLoaders = require("../loaders/javascript");
 
 
 const { preloads } = require(paths.appConfig);
@@ -10,6 +11,7 @@ const { preloads } = require(paths.appConfig);
 
 module.exports = {
 	...baseConfig,
+	mode: "production",
 	target: "electron-preload",
 	entry: mapKeys(preloads, (_value, entryName) => (
 		`${rebuiltronConfig.buildFileNames.preload}.${entryName}`
@@ -17,5 +19,11 @@ module.exports = {
 	output: {
 		...baseConfig.output,
 		filename: `${rebuiltronConfig.buildDirs.js}/[name].js`
+	},
+	module: {
+		...baseConfig.module,
+		rules: [{
+			oneOf: javascriptLoaders
+		}]
 	}
 };

package/configurations/renderers.js

@@ -1,13 +1,21 @@
 const path = require("path");
 
 const HtmlWebpackPlugin = require("html-webpack-plugin");
+const CopyPlugin = require("copy-webpack-plugin");
+const MiniCssExtractPlugin = require("mini-css-extract-plugin");
+const InlineChunkHtmlPlugin = require("react-dev-utils/InlineChunkHtmlPlugin");
+const ReactRefreshWebpackPlugin = require("@pmmmwh/react-refresh-webpack-plugin");
+const CssMinimizerPlugin = require("css-minimizer-webpack-plugin");
 const { keys } = require("lodash");
 
 const paths = require("../helpers/paths");
-const { isEnvProduction, shouldUseSourceMap } = require("../helpers/environment");
+const { isEnvProduction, isEnvDevelopment, shouldUseSourceMap } = require("../helpers/environment");
 const { emptyOr } = require("../helpers/utils");
 const rebuiltronConfig = require("../rebuiltronConfig");
 const baseConfig = require("./base");
+const imageLoaders = require("../loaders/images");
+const styleLoaders = require("../loaders/style");
+const javascriptLoaders = require("../loaders/javascript");
 
 
 const { renderers } = require(paths.appConfig);
@@ -15,6 +23,7 @@ const { renderers } = require(paths.appConfig);
 
 module.exports = {
 	...baseConfig,
+	mode: isEnvProduction ? "production" : "development",
 	target: "browserslist",
 	devtool: shouldUseSourceMap && (isEnvProduction ? "source-map" : "cheap-module-source-map"),
 	entry: renderers,
@@ -24,8 +33,58 @@ module.exports = {
 		chunkFilename: `${rebuiltronConfig.buildDirs.js}/${isEnvProduction ? "[name].[contenthash:8].chunk.js" : "[name].chunk.js"}`,
 		assetModuleFilename: `${rebuiltronConfig.buildDirs.media}/[name].[hash][ext]`
 	},
+	optimization: {
+		...baseConfig.optimization,
+		minimizer: [
+			...baseConfig.optimization.minimizer,
+			new CssMinimizerPlugin()
+		]
+	},
+	module: {
+		...baseConfig.module,
+		rules: [
+			// Handles `node_modules` packages that contain sourcemaps
+			...emptyOr(shouldUseSourceMap, [{
+				enforce: "pre",
+				exclude: /@babel(?:\/|\\{1,2})runtime/,
+				test: /\.(js|mjs|jsx|ts|tsx|css)$/,
+				loader: require.resolve("source-map-loader")
+			}]),
+			{
+				oneOf: [
+					...imageLoaders,
+					...javascriptLoaders,
+					...styleLoaders,
+					{
+						// Makes sure the assets get served by `WebpackDevServer`
+						exclude: [/^$/, /\.(js|mjs|jsx|ts|tsx)$/, /\.html$/, /\.json$/],
+						type: "asset/resource"
+					}
+				]
+			}
+		]
+	},
 	plugins: [
 		...baseConfig.plugins,
+		...emptyOr(isEnvProduction, [
+			new InlineChunkHtmlPlugin(HtmlWebpackPlugin, [/runtime-.+[.]js/]), // Injects scripts into HTML
+			new MiniCssExtractPlugin({
+				filename: `${rebuiltronConfig.buildDirs.css}/[name].[contenthash:8].css`,
+				chunkFilename: `${rebuiltronConfig.buildDirs.css}/[name].[contenthash:8].chunk.css`
+			}),
+			new CopyPlugin({
+				patterns: [{
+					from: paths.appPublic,
+					to: paths.appBuild,
+					globOptions: {
+						ignore: ["**/*.html"]
+					}
+				}]
+			})
+		]),
+		...emptyOr(isEnvDevelopment, [
+			new ReactRefreshWebpackPlugin({ overlay: false })
+		]),
 		...keys(renderers).map((renderer) => (
 			new HtmlWebpackPlugin({
 				inject: true,

package/package.json

@@ -1,9 +1,11 @@
 {
   "name": "rebuiltron",
-  "version": "6.0.0",
+  "version": "6.0.2",
   "author": "Arkellys",
   "license": "MIT",
-  "bin": "bin/index.js",
+  "bin": {
+    "rebuiltron": "bin/index.js"
+  },
   "scripts": {
     "lint": "eslint ."
   },

package/tasks/startDevServer.js

@@ -13,28 +13,33 @@ const spinnies = require("../helpers/spinnies");
  * @returns {Promise<WebpackDevServer>} Development server instance
  */
 
-module.exports = async (port) => {
-	let isFirstRun = true;
-	const rendererCompiler = webpack(webpackConfig.development.renderers);
+module.exports = (port) => (
+	new Promise(async (resolve) => {
+		let devServer;
+		let isFirstRun = true;
 
-	spinnies.add("devServer", { text: "Starting the development server" });
+		const rendererCompiler = webpack(webpackConfig.development.renderers);
 
-	rendererCompiler.hooks.invalid.tap("invalid", () => {
-		clearConsole();
-		spinnies.add("compile", { text: "Compiling..." });
-	});
+		spinnies.add("devServer", { text: "Starting the development server" });
 
-	rendererCompiler.hooks.done.tap("done", () => {
-		if (isFirstRun) return isFirstRun = false;
+		rendererCompiler.hooks.invalid.tap("invalid", () => {
+			clearConsole();
+			spinnies.add("compile", { text: "Compiling..." });
+		});
 
-		clearConsole();
-		spinnies.remove("compile");
-	});
+		rendererCompiler.hooks.done.tap("done", () => {
+			if (isFirstRun) {
+				isFirstRun = false;
 
-	const devServer = new WebpackDevServer({ ...devServerConfig, port }, rendererCompiler);
-	await devServer.start();
+				spinnies.succeed("devServer", { text: `Development server running on port ${bold(port)}` });
+				return resolve(devServer);
+			}
 
-	spinnies.succeed("devServer", { text: `Development server running on port ${bold(port)}` });
+			clearConsole();
+			spinnies.remove("compile");
+		});
 
-	return devServer;
-};
+		devServer = new WebpackDevServer({ ...devServerConfig, port }, rendererCompiler);
+		await devServer.start();
+	})
+);

package/tasks/startElectron.js

@@ -8,6 +8,7 @@ const spinnies = require("../helpers/spinnies");
 /**
  * Starts Electron.
  * @param {number} port - Port on which the renderer is served
+ * @returns {Promise<void>} Promise resolving when compilation is successful
  */
 
 module.exports = (port) => (