fix: remove deprecated script-ext-html-webpack-plugin

Fixes #9714
vaadin · Jan 21, 2021 · c06d15f · c06d15f
1 parent ef14999
commit c06d15f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 42 deletions.
diff --git a/flow-server/form/package.json b/flow-server/form/package.json
@@ -0,0 +1,7 @@
+{
+  "name": "@vaadin/form",
+  "license": "UNLICENSED",
+  "main": "index",
+  "version": "1.0.0",
+  "sideEffects": false
+}
diff --git a/flow-server/src/main/java/com/vaadin/flow/server/frontend/NodeUpdater.java b/flow-server/src/main/java/com/vaadin/flow/server/frontend/NodeUpdater.java
@@ -291,8 +291,7 @@ static Map<String, String> getDefaultDependencies() {
     static Map<String, String> getDefaultDevDependencies() {
         Map<String, String> defaults = new HashMap<>();
 
-        defaults.put("html-webpack-plugin", "3.2.0");
-        defaults.put("script-ext-html-webpack-plugin", "2.1.4");
+        defaults.put("html-webpack-plugin", "4.5.1");
         defaults.put("typescript", "4.0.3");
         defaults.put("ts-loader", "8.0.12");
 

diff --git a/flow-server/src/main/resources/webpack.generated.js b/flow-server/src/main/resources/webpack.generated.js
@@ -6,7 +6,6 @@
  */
 const fs = require('fs');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
-const ScriptExtHtmlWebpackPlugin = require('script-ext-html-webpack-plugin');
 const CompressionPlugin = require('compression-webpack-plugin');
 const { InjectManifest } = require('workbox-webpack-plugin');
 const { DefinePlugin } = require('webpack');
@@ -322,11 +321,9 @@ module.exports = {
       template: clientSideIndexHTML,
       filename: indexHtmlPath,
       inject: 'head',
+      scriptLoading: 'defer',
       chunks: ['bundle', ...(devMode ? ['devmodeGizmo'] : [])]
     }),
-    useClientSideIndexFileForBootstrapping && new ScriptExtHtmlWebpackPlugin({
-      defaultAttribute: 'defer'
-    }),
 
     // Service worker for offline
     pwaEnabled && serviceWorkerPlugin,

diff --git a/flow/pom.xml b/flow/pom.xml