Merge branch 'mediamonks:master' into master

cli/displayDevServer.js

@@ -18,6 +18,7 @@ program
   .option('-o, --outputDir <data>', 'output dir', './build')
   .option('--skipBuild', 'skip compiling ads phase', false)
   .option('--skipPreview', 'skip preview building phase', false)
+  .option('-p, --parallel [data]', 'run webpack in parallel')
   .parse(process.argv);
 
 const options = program.opts();

package.json

@@ -1,9 +1,10 @@
 {
   "name": "@mediamonks/display-dev-server",
-  "version": "11.0.11",
+  "version": "11.6.2",
   "description": "This is the Display.Monks development server, which handles previewing and compiling ads via webpack.",
   "scripts": {
-    "preview-dev": "cd ./src/preview && npm run dev"
+    "preview-dev": "cd ./src/preview && npm run dev",
+    "preview-build": "cd ./src/preview && npm run build"
   },
   "engines": {
     "node": ">= 16",
@@ -66,6 +67,7 @@
     "webpack": "^5.75.0",
     "webpack-dev-middleware": "^6.0.1",
     "webpack-hot-middleware": "^2.25.3",
-    "webpack-virtual-modules": "^0.5.0"
+    "webpack-virtual-modules": "^0.5.0",
+    "worker-farm": "^1.7.0"
   }
 }

src/index.js

@@ -1,18 +1,30 @@
 const getWebpackConfigs = require("./webpack/getWebpackConfigs");
 const devServer = require("./webpack/devServer");
+const devServerParallel = require("./webpack/devServerParallel");
 const buildFiles = require("./webpack/buildFiles");
+const buildFilesParallel = require("./webpack/buildFilesParallel");
 const buildPreview = require("./webpack/buildPreview");
+const deleteAllGooglesheetFiles = require("./util/deleteAllGooglesheetFiles");
 
 module.exports = async function (options) {
   // {mode = "development", glob = "./**/.richmediarc*", choices = null, stats = null, outputDir = "./build", configOverride = {}}
-  let {mode, glob, choices, stats, outputDir, skipBuild, skipPreview} = options;
+  let {mode, glob, choices, stats, outputDir, skipBuild, skipPreview, parallel} = options;
+
+  if (mode == "cleanup") {
+    return await deleteAllGooglesheetFiles()
+  }
 
   const webpackConfigs = !skipBuild ? await getWebpackConfigs(options) : null;
 
   if (mode === "development") {
-    await devServer(webpackConfigs.result, webpackConfigs.choices.openLocation);
+    if (parallel) await devServerParallel(webpackConfigs.result, webpackConfigs.choices.openLocation, options);
+    else          await devServer(webpackConfigs.result, webpackConfigs.choices.openLocation);
   } else {
-    if (!skipBuild) await buildFiles(webpackConfigs.result, outputDir);
-    if (!skipPreview) await buildPreview(outputDir);
+    let qualities
+    if (!skipBuild) {
+      if (parallel) qualities = await buildFilesParallel(webpackConfigs.result, options);
+      else          qualities = await buildFiles(webpackConfigs.result, outputDir);
+    }
+    if (!skipPreview) await buildPreview(webpackConfigs?.result, qualities?.ads, outputDir);
   }
 };

src/preview/dist/index.html

@@ -36,4 +36,6 @@
       To create a production bundle, use `npm run build` or `yarn build`.
     -->
   </body>
+  <script src="static/gsap.min.js"></script>
+  <script src="static/GSDevTools.min.js"></script>
 </html>