Switch out electron-webpack to be able to upgrade to webpack v5

2025-08-14 07:09:21 -04:00 · 2025-02-10 20:04:08 +02:00 · 2025-02-10 20:04:08 +02:00 · ce97c9ecec
commit ce97c9ecec
parent 650c21e8d5
10 changed files with 711 additions and 1284 deletions
--- a/webpack.renderer.js
+++ b/webpack.renderer.js
@ -1,4 +1,7 @@
 const path = require('path');
+const fsExtra = require("fs-extra");
+
+const HtmlWebpackPlugin = require('html-webpack-plugin')

 const CopyWebpackPlugin = require('copy-webpack-plugin');

@ -6,45 +9,91 @@ const makeConfig = require('./webpack.makeConfig.js');

 const getModulePath = moduleName => path.dirname(require.resolve(`${moduleName}/package.json`));

-module.exports = defaultConfig =>
-    makeConfig(
-        defaultConfig,
-        {
-            name: 'renderer',
-            useReact: true,
-            disableDefaultRulesForExtensions: ['js', 'jsx', 'css', 'svg', 'png', 'wav', 'gif', 'jpg', 'ttf'],
-            babelPaths: [
-                path.resolve(__dirname, 'src', 'renderer'),
-                /node_modules[\\/]+scratch-[^\\/]+[\\/]+src/,
-                /node_modules[\\/]+pify/,
-                /node_modules[\\/]+@vernier[\\/]+godirect/
-            ],
-            plugins: [
-                new CopyWebpackPlugin([
-                    {
-                        from: path.join(getModulePath('scratch-blocks'), 'media'),
-                        to: 'static/blocks-media/default'
-                    },
-                    {
-                        from: path.join(getModulePath('scratch-blocks'), 'media'),
-                        to: 'static/blocks-media/high-contrast'
-                    },
-                    {
-                        from: path.join(getModulePath('scratch-gui'),
-                            'src', 'lib', 'themes', 'high-contrast', 'blocks-media'),
-                        to: 'static/blocks-media/high-contrast',
-                        force: true
-                    },
-                    {
-                        from: 'extension-worker.{js,js.map}',
-                        context: path.join(getModulePath('scratch-vm'), 'dist', 'web')
-                    },
-                    {
-                        from: path.join(getModulePath('scratch-gui'), 'src', 'lib', 'libraries', '*.json'),
-                        to: 'static/libraries',
-                        flatten: true
-                    }
-                ])
+
+function generateIndexFile(template) {
+	let html = template;
+
+	html = html.replace("</head>", '<script>require("source-map-support/source-map-support.js").install()</script></head>')
+
+	const filePath = path.join("dist", ".renderer-index-template.html");
+	fsExtra.outputFileSync(filePath, html);
+	return `!!html-loader?minimize=false&attributes=false!${filePath}`
+}
+
+let template = fsExtra.readFileSync("src/renderer/index.html", {encoding: "utf8"});
+
+module.exports = makeConfig(
+    {
+        target: "electron-renderer",
+        entry: {
+            renderer: './src/renderer/index.js'
+        },
+        context : path.resolve(__dirname),
+        externals: [
+            'source-map-support',
+            'electron',
+            'webpack',
+        ],
+        output: {
+            filename: '[name].js',
+            chunkFilename: '[name].bundle.js',
+            libraryTarget: 'commonjs2',
+            path: path.resolve(__dirname, "dist/renderer"),
+        },
+        module: { 
+            rules: [
+                {
+                    test: /\.node$/,
+                    use: "node-loader"
+                },
+                {
+                    test: /\.(html)$/,
+                    use: { "loader": "html-loader" }
+                },
            ]
-        }
-    );
+        },
+    },
+    {
+        name: 'renderer',
+        useReact: true,
+        disableDefaultRulesForExtensions: ['js', 'jsx', 'css', 'svg', 'png', 'wav', 'gif', 'jpg', 'ttf'],
+        babelPaths: [
+            path.resolve(__dirname, 'src', 'renderer'),
+            /node_modules[\\/]+scratch-[^\\/]+[\\/]+src/,
+            /node_modules[\\/]+pify/,
+            /node_modules[\\/]+@vernier[\\/]+godirect/
+        ],
+        plugins: [
+            new HtmlWebpackPlugin({
+                filename: "index.html",
+                template: generateIndexFile(template),
+                minify: false,
+            }),
+            new CopyWebpackPlugin([
+                {
+                    from: path.join(getModulePath('scratch-blocks'), 'media'),
+                    to: 'static/blocks-media/default'
+                },
+                {
+                    from: path.join(getModulePath('scratch-blocks'), 'media'),
+                    to: 'static/blocks-media/high-contrast'
+                },
+                {
+                    from: path.join(getModulePath('scratch-gui'),
+                        'src', 'lib', 'themes', 'high-contrast', 'blocks-media'),
+                    to: 'static/blocks-media/high-contrast',
+                    force: true
+                },
+                {
+                    from: 'extension-worker.{js,js.map}',
+                    context: path.join(getModulePath('scratch-vm'), 'dist', 'web')
+                },
+                {
+                    from: path.join(getModulePath('scratch-gui'), 'src', 'lib', 'libraries', '*.json'),
+                    to: 'static/libraries',
+                    flatten: true
+                }
+            ])
+        ]
+    }
+);