rebuiltron 4.0.1 → 4.1.0

package/README.md

@@ -44,8 +44,6 @@ Rebuiltron expects the following folder structure:
 
 ```shell
 my-app
-├── electron/
-│   └── # Main and preload files
 ├── public/
 │   └── # Renderer HTML file(s)
 ├── src/
@@ -92,8 +90,8 @@ At the root of your project, create a `rebuiltron.config.cjs` file.
 
 | Option | Type | Required | Description |
 | --- | :---: | :---: | --- |
-| `renderers` | `object` | ✓ | Renderer entries. It takes the name of the entries as keys and their paths as values. |
-| `preloads` | `object` | ✓ | Preload entries. It takes the name of the entries as keys and their paths as values. |
+| `renderers` | `object` | ✓ | Renderer entries. It takes the name of the entries as keys and their paths as values. All paths must be relative. |
+| `preloads` | `object` | ✓ | Preload entries. It takes the name of the entries as keys and their paths as values. All paths must be relative. |
 | `srcAlias` | `string` | ✗ | Custom [alias](https://webpack.js.org/configuration/resolve/#resolvealias) to the `src` folder.
 | `sassOptions` | `object` | ✗ | Custom SASS options for [`sass-loader`](https://github.com/webpack-contrib/sass-loader). |
 | `sassOptions.additionalData` | `object` | ✗* | Configuration of [`additionalData`](https://webpack.js.org/loaders/sass-loader/#additionaldata). |

package/configurations/base.js

@@ -44,11 +44,11 @@ module.exports = {
 		level: "none"
 	},
 	resolve: {
-		modules: ["node_modules", paths.appNodeModules, paths.appSrc],
+		modules: ["node_modules", paths.appNodeModules, paths.src],
 		extensions: [".web.js", ".js", ".json", ".jsx", ".node"],
 		...emptyOr(srcAlias, {
 			alias: {
-				[srcAlias]: paths.appSrc
+				[srcAlias]: paths.src
 			}
 		})
 	},

package/helpers/paths.js

@@ -14,8 +14,7 @@ module.exports = {
 	appBuild: resolveApp(rebuiltronConfig.appDirs.build),
 	appPublic: resolveApp(rebuiltronConfig.appDirs.public),
 	appPackageJson: packageJsonPath,
-	appSrc: resolveApp(rebuiltronConfig.appDirs.appSrc),
-	electronSrc: resolveApp(rebuiltronConfig.appDirs.electronSrc),
+	src: resolveApp(rebuiltronConfig.appDirs.src),
 	appNodeModules: resolveApp("node_modules"),
 	appWebpackCache: resolveApp("node_modules/.cache"),
 	basePath: isEnvDevelopment ? "/" : "./"

package/loaders/javascript.js

@@ -6,7 +6,7 @@ module.exports = [
 	{
 		// Converts `import.meta.url` before SWC transpiles so paths using it stay dynamic
 		test: /\.js$/,
-		include: [paths.electronSrc],
+		include: [paths.electronMain],
 		loader: require.resolve("string-replace-loader"),
 		options: {
 			search: "import.meta.url",

package/loaders/style.js

@@ -71,7 +71,7 @@ module.exports = [
 				loader: require.resolve("resolve-url-loader"),
 				options: {
 					sourceMap: shouldUseSourceMap,
-					root: paths.appSrc
+					root: paths.src
 				}
 			},
 			{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rebuiltron",
-  "version": "4.0.1",
+  "version": "4.1.0",
   "author": "Arkellys",
   "license": "MIT",
   "bin": "bin/index.js",

package/rebuiltronConfig.js

@@ -11,8 +11,7 @@ module.exports = {
 	},
 	appDirs: {
 		public: "public",
-		electronSrc: "electron",
-		appSrc: "src",
+		src: "src",
 		build: "build"
 	}
 };

package/webpackDevServer.config.js

@@ -11,7 +11,7 @@ module.exports = {
 		directory: paths.appPublic,
 		publicPath: [paths.basePath],
 		watch: {
-			ignored: ignoredFiles(paths.appSrc)
+			ignored: ignoredFiles(paths.src)
 		}
 	},
 	client: {