Merge remote-tracking branch 'origin/master' into suboctopus

webpack.common.js

@@ -1,5 +1,13 @@
 const path = require("path");
+const { CleanWebpackPlugin} = require("clean-webpack-plugin");
 const CopyPlugin = require("copy-webpack-plugin");
+const Assets = [
+    "alameda/alameda.js",
+    "requirejs/require.js",
+    "libass-wasm/dist/subtitles-octopus-worker.js",
+    "libass-wasm/dist/subtitles-octopus-worker.data",
+    "libass-wasm/dist/subtitles-octopus-worker.wasm"
+];
 
 module.exports = {
     context: path.resolve(__dirname, "src"),
@@ -10,15 +18,18 @@ module.exports = {
         ]
     },
     plugins: [
-        new CopyPlugin([
-            {
-                from: "**/*",
-                to: "."
-            },
-            {
-                context: path.resolve(__dirname),
-                from: "node_modules/libass-wasm/dist/subtitles-octopus-worker.*",
-            }
-        ])
+        new CleanWebpackPlugin(),
+        new CopyPlugin([{
+            from: "**/*",
+            to: "."
+        }]),
+        new CopyPlugin(
+            Assets.map(asset => {
+                return {
+                    from: path.resolve(__dirname, `./node_modules/${asset}`),
+                    to: path.resolve(__dirname, './dist/libraries')
+                };
+            })
+        )
     ]
 };