From 82c4177cb956fc71b6a3a501c996e414afae3956 Mon Sep 17 00:00:00 2001
From: Jari Kolehmainen <jari.kolehmainen@gmail.com>
Date: Tue, 29 Sep 2020 16:45:42 +0300
Subject: [PATCH] Move in-tree extensions to top-level folder (#993)

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>
---
 .../example-extension/README.md                      |  0
 .../example-extension/example-extension.tsx          |  0
 .../example-extension/package.json                   |  0
 .../example-extension/tsconfig.json                  |  4 ++--
 package.json                                         | 12 ++++++++----
 src/extensions/extension-store.ts                    |  4 ----
 6 files changed, 10 insertions(+), 10 deletions(-)
 rename {src/extensions => extensions}/example-extension/README.md (100%)
 rename {src/extensions => extensions}/example-extension/example-extension.tsx (100%)
 rename {src/extensions => extensions}/example-extension/package.json (100%)
 rename {src/extensions => extensions}/example-extension/tsconfig.json (74%)

diff --git a/src/extensions/example-extension/README.md b/extensions/example-extension/README.md
similarity index 100%
rename from src/extensions/example-extension/README.md
rename to extensions/example-extension/README.md
diff --git a/src/extensions/example-extension/example-extension.tsx b/extensions/example-extension/example-extension.tsx
similarity index 100%
rename from src/extensions/example-extension/example-extension.tsx
rename to extensions/example-extension/example-extension.tsx
diff --git a/src/extensions/example-extension/package.json b/extensions/example-extension/package.json
similarity index 100%
rename from src/extensions/example-extension/package.json
rename to extensions/example-extension/package.json
diff --git a/src/extensions/example-extension/tsconfig.json b/extensions/example-extension/tsconfig.json
similarity index 74%
rename from src/extensions/example-extension/tsconfig.json
rename to extensions/example-extension/tsconfig.json
index 993992112a..595bfda02f 100644
--- a/src/extensions/example-extension/tsconfig.json
+++ b/extensions/example-extension/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
     "outDir": ".",
     "module": "CommonJS",
@@ -7,7 +7,7 @@
     "declaration": false
   },
   "include": [
-    "../../../types",
+    "../../types",
     "./example-extension.tsx"
   ]
 }
diff --git a/package.json b/package.json
index 7d52e4588d..20b5740e58 100644
--- a/package.json
+++ b/package.json
@@ -15,11 +15,12 @@
     "dev-run": "nodemon --watch static/build/main.js --exec \"electron --inspect .\"",
     "dev:main": "yarn compile:main --watch",
     "dev:renderer": "yarn compile:renderer --watch",
-    "dev:extensions": "rollup --config src/extensions/rollup.config.js --watch",
+    "dev:extensions": "yarn compile:extensions --watch",
     "compile": "env NODE_ENV=production concurrently yarn:compile:*",
     "compile:main": "webpack --config webpack.main.ts",
     "compile:renderer": "webpack --config webpack.renderer.ts",
     "compile:i18n": "lingui compile",
+    "compile:extensions": "rollup --config src/extensions/rollup.config.js",
     "build:linux": "yarn compile && electron-builder --linux --dir -c.productName=Lens",
     "build:mac": "yarn compile && electron-builder --mac --dir -c.productName=Lens",
     "build:win": "yarn compile && electron-builder --win --dir -c.productName=Lens",
@@ -34,7 +35,7 @@
     "download:kubectl": "yarn run ts-node build/download_kubectl.ts",
     "download:helm": "yarn run ts-node build/download_helm.ts",
     "lint": "eslint $@ --ext js,ts,tsx --max-warnings=0  src/",
-    "extensions:example": "tsc --project src/extensions/example-extension/tsconfig.json --watch"
+    "extensions:example": "tsc --project extensions/example-extension/tsconfig.json --watch"
   },
   "config": {
     "bundledKubectlVersion": "1.17.11",
@@ -94,9 +95,12 @@
         "filter": "!**/main.js"
       },
       {
-        "from": "src/extensions/",
+        "from": "extensions/",
         "to": "./extensions/",
-        "filter": "**/*.js*"
+        "filter": [
+          "**/*.js*",
+          "!**/node_modules"
+        ]
       },
       "LICENSE"
     ],
diff --git a/src/extensions/extension-store.ts b/src/extensions/extension-store.ts
index 13be1eb927..a563535a38 100644
--- a/src/extensions/extension-store.ts
+++ b/src/extensions/extension-store.ts
@@ -4,7 +4,6 @@ import path from "path";
 import fs from "fs-extra";
 import { action, observable, reaction, toJS, } from "mobx";
 import { BaseStore } from "../common/base-store";
-import { isDevelopment } from "../common/vars";
 import logger from "../main/logger";
 
 export interface ExtensionStoreModel {
@@ -44,9 +43,6 @@ export class ExtensionStore extends BaseStore<ExtensionStoreModel> {
   @observable installed = observable.map<ExtensionId, InstalledExtension>([], { deep: false });
 
   get folderPath(): string {
-    if (isDevelopment) {
-      return path.resolve(__static, "../src/extensions");
-    }
     return path.resolve(__static, "../extensions");
   }