From 3eb065cde27434574dff866e3d3f917394d9696f Mon Sep 17 00:00:00 2001
From: Frederic Schwarz <schwarz@archilogic.com>
Date: Thu, 9 Jul 2020 14:44:17 +0200
Subject: [PATCH] Improve CanvasRenderer support and fix filter imports (#22)

* Fix import syntax for filter packages

* Register InteractionManager also for CanvasRenderer

* Avoid duplicate class imports for CanvasRenderer plugins
---
 src/CodeUtils.ts  | 8 +++++++-
 src/packages.json | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/CodeUtils.ts b/src/CodeUtils.ts
index 632becc..19bb713 100644
--- a/src/CodeUtils.ts
+++ b/src/CodeUtils.ts
@@ -38,6 +38,12 @@ function rendererPlugin(rendererName:string, {name, rendererPlugin, canvasPlugin
             `${rendererName}.registerPlugin('${apiName}', ${namespace}.${className})`
         ];
     }
+    // avoid duplicate class imports for CanvasRenderer plugins
+    else if (rendererName === 'CanvasRenderer' && rendererPlugin && rendererPlugin[1] === className) {
+        return [
+            `${rendererName}.registerPlugin('${apiName}', ${className})`
+        ];
+    }
     else {
         return [
             `import { ${className} } from '${name}'`,
@@ -113,7 +119,7 @@ export function createBundleCode(packages:string[]) {
         filters.forEach(pkg => {
             const imports = pkg.filter.join(', ');
             filterNames.push(imports);
-            lines.push(`import { ${imports} } from '${pkg.name}' }`);
+            lines.push(`import { ${imports} } from '${pkg.name}'`);
         });
         lines.push(`export const filters = {\n  ${filterNames.join(',\n  ')}\n}`);
     }
diff --git a/src/packages.json b/src/packages.json
index f4bd6bf..f7ce703 100644
--- a/src/packages.json
+++ b/src/packages.json
@@ -40,6 +40,7 @@
         {
             "name": "@pixi/interaction",
             "rendererPlugin": ["interaction", "InteractionManager"],
+            "canvasPlugin": ["interaction", "InteractionManager"],
             "dependencies": ["@pixi/display"]
         },
         {