Merge pull request #20983 from dannon/plugin-cleanup-before-stage

Simplify plugin staging with explicit clean step

Author: mvdbeek

client/gulpfile.js

@@ -1,6 +1,5 @@
 const path = require("path");
 const fs = require("fs-extra");
-const del = require("del");
 const { parallel, series } = require("gulp");
 const child_process = require("child_process");
 const { globSync } = require("glob");
@@ -51,7 +50,7 @@ function stageLibs(callback) {
             const p1 = path.resolve(path.join(PATHS.nodeModules, lib, PATHS.stagedLibraries[lib][0]));
             const p2 = path.resolve(path.join("src", "libs", PATHS.stagedLibraries[lib][1]));
             if (fs.existsSync(p1)) {
-                del.sync(p2);
+                fs.removeSync(p2);
                 fs.createReadStream(p1).pipe(fs.createWriteStream(p2));
             } else {
                 throw new Error(
@@ -69,22 +68,29 @@ async function icons() {
     await buildIcons("./src/assets/icons.json");
 }
 
+function cleanPlugins(callback) {
+    if (SKIP_VIZ) {
+        console.log("Skipping plugin cleanup (SKIP_VIZ is set)");
+        return callback();
+    }
+
+    const vizStagingDir = path.join(staticPluginDir, "visualizations");
+    console.log(`Cleaning visualization staging directory: ${vizStagingDir}`);
+    fs.removeSync(vizStagingDir);
+    callback();
+}
+
 function stagePlugins(callback) {
     if (SKIP_VIZ) {
         console.log("Skipping plugin staging (SKIP_VIZ is set)");
         return callback();
     }
 
-    fs.ensureDirSync(path.join(staticPluginDir));
+    fs.ensureDirSync(path.join(staticPluginDir, "visualizations"));
 
     // Get visualization directories
-    const visualizationDirs = [
-        path.join(PATHS.pluginBaseDir, "visualizations/*/static"),
-        path.join(PATHS.pluginBaseDir, "visualizations/*/*/static"),
-    ];
-
-    // Flatten the glob patterns to actual directory paths
-    const dirs = [...globSync(visualizationDirs)];
+    const visualizationDirs = path.join(PATHS.pluginBaseDir, "visualizations/*/static");
+    const dirs = globSync(visualizationDirs);
 
     // Process each directory
     const copyPromises = dirs.map((sourceDir) => {
@@ -201,11 +207,12 @@ function forceInstallVisualizations(callback) {
 }
 
 const client = parallel(stageLibs, icons);
-const plugins = series(installVisualizations, stagePlugins);
-const pluginsRebuild = series(forceInstallVisualizations, stagePlugins);
+const plugins = series(installVisualizations, cleanPlugins, stagePlugins);
+const pluginsRebuild = series(forceInstallVisualizations, cleanPlugins, stagePlugins);
 
 module.exports.client = client;
 module.exports.plugins = plugins;
 module.exports.default = parallel(client, plugins);
 module.exports.installVisualizations = installVisualizations;
+module.exports.cleanPlugins = cleanPlugins;
 module.exports.pluginsRebuild = pluginsRebuild;

client/package.json

@@ -183,7 +183,6 @@
     "cpy-cli": "^5.0.0",
     "css-loader": "^7.1.2",
     "css-minimizer-webpack-plugin": "^5.0.1",
-    "del": "^6.0.0",
     "eslint": "^8.52.0",
     "eslint-plugin-compat": "^4.2.0",
     "eslint-plugin-import": "^2.28.1",