@grafana/create-plugin 0.6.2-canary.158.e2fc550.0 → 0.6.2-canary.158.fc9b4e5.0

package/dist/commands/generate.plopfile.js

@@ -105,15 +105,15 @@ function default_1(plop) {
             var backendActions = hasBackend
                 ? getActionsForTemplateFolder({ folderPath: backendFolderPath, exportPath: exportPath })
                 : [];
-            var pluginActions = __spreadArray(__spreadArray(__spreadArray([], commonActions, true), pluginTypeSpecificActions, true), backendActions, true).reduceRight(function (acc, file) {
-                var exists = acc.some(function (f) { return f.path === file.path; });
-                if (exists && file.type !== 'modify') {
+            var pluginActions = __spreadArray(__spreadArray(__spreadArray([], backendActions, true), pluginTypeSpecificActions, true), commonActions, true).reduce(function (acc, file) {
+                var actionExists = acc.find(function (f) { return f.path === file.path; });
+                if (actionExists && actionExists.type === 'add' && file.type === 'add') {
                     return acc;
                 }
                 acc.push(file);
                 return acc;
-            }, [])
-                .reverse();
+            }, []);
+            console.log(__spreadArray(__spreadArray(__spreadArray([], backendActions, true), pluginTypeSpecificActions, true), commonActions, true).length, pluginActions.length);
             var ciWorkflowActions = hasGithubWorkflows
                 ? getActionsForTemplateFolder({ folderPath: constants_1.TEMPLATE_PATHS.ciWorkflows, exportPath: exportPath })
                 : [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grafana/create-plugin",
-  "version": "0.6.2-canary.158.e2fc550.0",
+  "version": "0.6.2-canary.158.fc9b4e5.0",
   "main": "index.js",
   "repository": {
     "directory": "packages/create-plugin",
@@ -60,5 +60,5 @@
   "engines": {
     "node": ">=16"
   },
-  "gitHead": "e2fc5503dc5eb38c10ff0db191f57c0eda0d5fcd"
+  "gitHead": "fc9b4e51d5ea2ae865f253553b571ba5710cf2b2"
 }

package/src/commands/generate.plopfile.ts

@@ -113,20 +113,21 @@ export default function (plop: NodePlopAPI) {
         ? getActionsForTemplateFolder({ folderPath: backendFolderPath, exportPath })
         : [];
 
-      // Common, pluginType and backend actions can contain the same destination filenames.
-      // This filtering allows overriding templates by removing the duplication destinations
-      const pluginActions = [...commonActions, ...pluginTypeSpecificActions, ...backendActions]
-        .reduceRight((acc, file) => {
-          const exists = acc.some((f) => f.path === file.path);
-          // if the file.path already exists and isn't a modification exclude it.
-          if (exists && file.type !== 'modify') {
-            return acc;
-          }
-
-          acc.push(file);
+      // Common, pluginType and backend actions can contain different templates for the same destination.
+      // This filtering removes the duplicate file additions to prevent plop erroring and makes sure the
+      // correct template is scaffolded.
+      // Note that the order is reversed so backend > pluginType > common
+      const pluginActions = [...backendActions, ...pluginTypeSpecificActions, ...commonActions].reduce((acc, file) => {
+        const actionExists = acc.find((f) => f.path === file.path);
+        // return early to prevent multiple add type actions being added to the array
+        if (actionExists && actionExists.type === 'add' && file.type === 'add') {
           return acc;
-        }, [])
-        .reverse();
+        }
+        acc.push(file);
+        return acc;
+      }, []);
+
+      console.log([...backendActions, ...pluginTypeSpecificActions, ...commonActions].length, pluginActions.length);
 
       // Copy over Github workflow files (if selected)
       const ciWorkflowActions = hasGithubWorkflows