hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into extensions-list-page

Browse Source
This commit is contained in:
Alex Andreev 2020-10-28 14:45:12 +03:00
commit ea7ca07dff
3 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
extensions/telemetry/src/tracker.ts
View File

@ -38,8 +38,9 @@ export class Tracker extends Util.Singleton {
} }
this.eventHandlers.push(handler) this.eventHandlers.push(handler)
EventBus.appEventBus.addListener(handler) EventBus.appEventBus.addListener(handler)
this.reportInterval = setInterval(() => {
this.reportInterval = setInterval(this.reportData, 60 * 60 * 1000) // report every 1h this.reportData()
}, 60 * 60 * 1000) // report every 1h
} }
stop() { stop() {

20
src/extensions/extension-manager.ts
View File

@ -25,10 +25,18 @@ export class ExtensionManager {
return extensionPackagesRoot() return extensionPackagesRoot()
} }
get inTreeTargetPath() {
return path.join(this.extensionPackagesRoot, "extensions")
}
get inTreeFolderPath(): string { get inTreeFolderPath(): string {
return path.resolve(__static, "../extensions"); return path.resolve(__static, "../extensions");
} }
get nodeModulesPath(): string {
return path.join(this.extensionPackagesRoot, "node_modules")
}
get localFolderPath(): string { get localFolderPath(): string {
return path.join(os.homedir(), ".k8slens", "extensions"); return path.join(os.homedir(), ".k8slens", "extensions");
} }
@ -39,7 +47,13 @@ export class ExtensionManager {
async load() { async load() {
logger.info("[EXTENSION-MANAGER] loading extensions from " + this.extensionPackagesRoot) logger.info("[EXTENSION-MANAGER] loading extensions from " + this.extensionPackagesRoot)
await fs.ensureDir(path.join(this.extensionPackagesRoot, "node_modules")) if (this.inTreeFolderPath !== this.inTreeTargetPath) {
// we need to copy in-tree extensions so that we can symlink them properly on "npm install"
await fs.remove(this.inTreeTargetPath)
await fs.ensureDir(this.inTreeTargetPath)
await fs.copy(this.inTreeFolderPath, this.inTreeTargetPath)
}
await fs.ensureDir(this.nodeModulesPath)
await fs.ensureDir(this.localFolderPath) await fs.ensureDir(this.localFolderPath)
return await this.loadExtensions(); return await this.loadExtensions();
} }
@ -55,7 +69,7 @@ export class ExtensionManager {
id: manifestJson.name, id: manifestJson.name,
version: manifestJson.version, version: manifestJson.version,
name: manifestJson.name, name: manifestJson.name,
manifestPath: path.join(this.extensionPackagesRoot, "node_modules", manifestJson.name, "package.json"), manifestPath: path.join(this.nodeModulesPath, manifestJson.name, "package.json"),
manifest: manifestJson manifest: manifestJson
} }
} catch (err) { } catch (err) {
@ -87,7 +101,7 @@ export class ExtensionManager {
async loadBundledExtensions() { async loadBundledExtensions() {
const extensions: InstalledExtension[] = [] const extensions: InstalledExtension[] = []
const folderPath = this.inTreeFolderPath const folderPath = this.inTreeTargetPath
const bundledExtensions = getBundledExtensions() const bundledExtensions = getBundledExtensions()
const paths = await fs.readdir(folderPath); const paths = await fs.readdir(folderPath);
for (const fileName of paths) { for (const fileName of paths) {

3
src/extensions/npm/extensions/package.json
View File

@ -6,6 +6,9 @@
"copyright": "© 2020, Mirantis, Inc.", "copyright": "© 2020, Mirantis, Inc.",
"license": "MIT", "license": "MIT",
"types": "api.d.ts", "types": "api.d.ts",
"files": [
"api.d.ts"
],
"author": { "author": {
"name": "Mirantis, Inc.", "name": "Mirantis, Inc.",
"email": "info@k8slens.dev" "email": "info@k8slens.dev"