From 9b0318b493fe2e49a34b8a4cb3d0bef1600759b8 Mon Sep 17 00:00:00 2001
From: Sebastian Malton <sebastian@malton.name>
Date: Wed, 5 Apr 2023 14:37:34 -0400
Subject: [PATCH] fix: remove platform specific injectable file names

- Causes issues due to a single platform being used to build the library

Signed-off-by: Sebastian Malton <sebastian@malton.name>
---
 packages/core/src/jest.setup.ts        | 4 ++--
 packages/core/webpack/main.ts          | 4 ++--
 packages/core/webpack/renderer.ts      | 5 ++---
 packages/open-lens/webpack/main.ts     | 4 ++--
 packages/open-lens/webpack/renderer.ts | 4 ++--
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/packages/core/src/jest.setup.ts b/packages/core/src/jest.setup.ts
index 4e9b86ba22..bfc5d42cb7 100644
--- a/packages/core/src/jest.setup.ts
+++ b/packages/core/src/jest.setup.ts
@@ -70,10 +70,10 @@ const getInjectables = (environment: "renderer" | "main", filePathGlob: string)
 global.injectablePaths = {
   renderer: {
     globalOverridePaths: getInjectables("renderer", "*.global-override-for-injectable.{ts,tsx}"),
-    paths: getInjectables("renderer", "*.{injectable,injectable.testing-env}.{ts,tsx}"),
+    paths: getInjectables("renderer", "*.injectable.{ts,tsx}"),
   },
   main: {
     globalOverridePaths: getInjectables("main", "*.global-override-for-injectable.{ts,tsx}"),
-    paths: getInjectables("main", "*.{injectable,injectable.testing-env}.{ts,tsx}"),
+    paths: getInjectables("main", "*.injectable.{ts,tsx}"),
   },
 };
diff --git a/packages/core/webpack/main.ts b/packages/core/webpack/main.ts
index 2460ac3c8d..9a73fb3a0b 100755
--- a/packages/core/webpack/main.ts
+++ b/packages/core/webpack/main.ts
@@ -67,8 +67,8 @@ const webpackLensMain = (): webpack.Configuration => {
     },
     plugins: [
       new DefinePlugin({
-        CONTEXT_MATCHER_FOR_NON_FEATURES: `/\\.injectable(\\.${platform})?\\.tsx?$/`,
-        CONTEXT_MATCHER_FOR_FEATURES: `/\\/(main|common)\\/.+\\.injectable(\\.${platform})?\\.tsx?$/`,
+        CONTEXT_MATCHER_FOR_NON_FEATURES: `/\\.injectable\\.tsx?$/`,
+        CONTEXT_MATCHER_FOR_FEATURES: `/\\/(main|common)\\/.+\\.injectable\\.tsx?$/`,
       }),
       new ForkTsCheckerPlugin({
         typescript: {
diff --git a/packages/core/webpack/renderer.ts b/packages/core/webpack/renderer.ts
index 3b133f8f50..a64fc2d3c3 100755
--- a/packages/core/webpack/renderer.ts
+++ b/packages/core/webpack/renderer.ts
@@ -12,7 +12,6 @@ import type { WebpackPluginInstance } from "webpack";
 import { optimize, DefinePlugin } from "webpack";
 import nodeExternals from "webpack-node-externals";
 import { isDevelopment, buildDir, sassCommonVars } from "./vars";
-import { platform } from "process";
 
 export function webpackLensRenderer(): webpack.Configuration {
   return {
@@ -84,8 +83,8 @@ export function webpackLensRenderer(): webpack.Configuration {
 
     plugins: [
       new DefinePlugin({
-        CONTEXT_MATCHER_FOR_NON_FEATURES: `/\\.injectable(\\.${platform})?\\.tsx?$/`,
-        CONTEXT_MATCHER_FOR_FEATURES: `/\\/(renderer|common)\\/.+\\.injectable(\\.${platform})?\\.tsx?$/`,
+        CONTEXT_MATCHER_FOR_NON_FEATURES: `/\\.injectable\\.tsx?$/`,
+        CONTEXT_MATCHER_FOR_FEATURES: `/\\/(renderer|common)\\/.+\\.injectable\\.tsx?$/`,
       }),
       new ForkTsCheckerPlugin({}),
 
diff --git a/packages/open-lens/webpack/main.ts b/packages/open-lens/webpack/main.ts
index a94f45a794..277fc1b785 100644
--- a/packages/open-lens/webpack/main.ts
+++ b/packages/open-lens/webpack/main.ts
@@ -50,8 +50,8 @@ const main: webpack.Configuration = ({
   },
   plugins: [
     new DefinePlugin({
-      CONTEXT_MATCHER_FOR_NON_FEATURES: `/\\.injectable(\\.${platform})?\\.tsx?$/`,
-      CONTEXT_MATCHER_FOR_FEATURES: `/\\/(renderer|common)\\/.+\\.injectable(\\.${platform})?\\.tsx?$/`,
+      CONTEXT_MATCHER_FOR_NON_FEATURES: `/\\.injectable\\.tsx?$/`,
+      CONTEXT_MATCHER_FOR_FEATURES: `/\\/(renderer|common)\\/.+\\.injectable\\.tsx?$/`,
     }),
   ],
 });
diff --git a/packages/open-lens/webpack/renderer.ts b/packages/open-lens/webpack/renderer.ts
index e46487c6de..a17511db30 100644
--- a/packages/open-lens/webpack/renderer.ts
+++ b/packages/open-lens/webpack/renderer.ts
@@ -81,8 +81,8 @@
 
   plugins: [
     new DefinePlugin({
-      CONTEXT_MATCHER_FOR_NON_FEATURES: `/\\.injectable(\\.${platform})?\\.tsx?$/`,
-      CONTEXT_MATCHER_FOR_FEATURES: `/\\/(renderer|common)\\/.+\\.injectable(\\.${platform})?\\.tsx?$/`,
+      CONTEXT_MATCHER_FOR_NON_FEATURES: `/\\.injectable\\.tsx?$/`,
+      CONTEXT_MATCHER_FOR_FEATURES: `/\\/(renderer|common)\\/.+\\.injectable\\.tsx?$/`,
     }),
     new ForkTsCheckerPlugin(),