From 97551bb7f079af1476524d72d48ca5e8523ad721 Mon Sep 17 00:00:00 2001 From: Jari Kolehmainen Date: Fri, 23 Dec 2022 13:33:35 +0200 Subject: [PATCH] Allow to import app as a library (#6722) * unify build fs layout Signed-off-by: Jari Kolehmainen * use currentApp path for static files Signed-off-by: Jari Kolehmainen * lint fix Signed-off-by: Jari Kolehmainen * allow to import open-lens Signed-off-by: Jari Kolehmainen * allow to customize both main & renderer Signed-off-by: Jari Kolehmainen * fix compile-library script Signed-off-by: Jari Kolehmainen * remove bundled extensions Signed-off-by: Jari Kolehmainen * similar interface for both main & renderer Signed-off-by: Jari Kolehmainen * use startApp on both sides Signed-off-by: Jari Kolehmainen * fix startApp import Signed-off-by: Jari Kolehmainen * fix startApp import Signed-off-by: Jari Kolehmainen * Fix injection cycle (somehow) Signed-off-by: Sebastian Malton * use cwd in download_binaries Signed-off-by: Jari Kolehmainen * introduce applicationInformationToken Signed-off-by: Jari Kolehmainen * register applicationInformationInjectable in main & renderer Signed-off-by: Jari Kolehmainen * allow to define bundled extensions via appStart Signed-off-by: Jari Kolehmainen * compile node-fetch automatically via prepare Signed-off-by: Jari Kolehmainen * define peerDependencies Signed-off-by: Jari Kolehmainen * webpack fixes Signed-off-by: Jari Kolehmainen * rename application-information-token.injectable.ts -> application-information-token.ts Signed-off-by: Jari Kolehmainen * monaco-editor as externals Signed-off-by: Jari Kolehmainen * refactor application-information Signed-off-by: Jari Kolehmainen * introduce bundledExtensionInjectionToken Signed-off-by: Jari Kolehmainen * mark library exports as experimental Signed-off-by: Jari Kolehmainen * move extension npm package files & add release automation Signed-off-by: Jari Kolehmainen * add missing build files to package Signed-off-by: Jari Kolehmainen * fix bad merge conflict resolve Signed-off-by: Jari Kolehmainen * fix package.json name Signed-off-by: Jari Kolehmainen * allow to set mode via startApp Signed-off-by: Jari Kolehmainen * revert unnecessary changes Signed-off-by: Jari Kolehmainen * webpack: fix extensionOutDir Signed-off-by: Jari Kolehmainen * remove unnecessary peerDependencies Signed-off-by: Jari Kolehmainen * introduce nodeEnvInjectionToken Signed-off-by: Jari Kolehmainen * remove NODE_ENV from environmentVariablesInjectable Signed-off-by: Jari Kolehmainen * fix jest modulePathIgnorePatterns Signed-off-by: Jari Kolehmainen * fix duplicate injectable registration Signed-off-by: Jari Kolehmainen * fix build executableName Signed-off-by: Jari Kolehmainen Signed-off-by: Jari Kolehmainen Signed-off-by: Sebastian Malton Co-authored-by: Sebastian Malton --- .github/workflows/publish-master-npm.yml | 15 ++- .github/workflows/publish-release-npm.yml | 37 +++++- .gitignore | 4 - Makefile | 33 ++++-- build/download_binaries.ts | 2 +- build/generate-tray-icons.ts | 6 +- ...rsion.ts => set_extensions_npm_version.ts} | 4 +- package.json | 81 +++++++++++-- .../npm => packages}/extensions/.gitignore | 0 .../npm => packages}/extensions/package.json | 0 .../welcome-route-config.injectable.ts | 4 +- src/common/library.ts | 14 +++ .../utils/environment-variables.injectable.ts | 4 - .../vars/application-copyright.injectable.ts | 4 +- .../application-description.injectable.ts | 4 +- ... => application-information-injectable.ts} | 8 +- .../vars/application-information-token.ts | 17 +++ .../bundled-kubectl-version.injectable.ts | 4 +- .../content-security-policy.injectable.ts | 4 +- .../vars/extension-api-version.injectable.ts | 4 +- src/common/vars/is-production.injectable.ts | 4 +- src/common/vars/node-env-injection-token.ts | 11 ++ src/common/vars/product-name.injectable.ts | 4 +- src/common/vars/sentry-dsn-url.injectable.ts | 4 +- ...irectory.global-override-for-injectable.ts | 1 - .../store-migration-version.injectable.ts | 4 +- .../extension-loader/extension-loader.ts | 2 +- .../publish-is-configured.injectable.ts | 4 +- .../store-migrations/snap.injectable.ts | 4 +- src/main/create-app.ts | 36 ++++++ ...s-in-development-environment.injectable.ts | 4 +- src/main/extension-api.ts | 26 +++++ src/main/getDi.ts | 18 +-- src/main/getDiForUnitTesting.ts | 11 +- src/main/index.ts | 39 ++----- src/main/library.ts | 21 ++++ src/main/register-injectables.ts | 29 +++++ .../routes/files/development.injectable.ts | 6 +- .../routes/files/production.injectable.ts | 4 +- .../create-electron-window.injectable.ts | 4 +- ...ormation.global-override-for-injectable.ts | 7 +- .../migrations/currentVersion.injectable.ts | 4 +- src/renderer/bootstrap.tsx | 34 +----- src/renderer/create-app.ts | 34 ++++++ src/renderer/extension-api.ts | 33 ++++++ ...rame-layout-child-component.injectable.tsx | 81 +++++++------ src/renderer/getDi.tsx | 18 +-- src/renderer/getDiForUnitTesting.tsx | 13 ++- src/renderer/index.ts | 32 +++++ src/renderer/library.ts | 14 +++ src/renderer/register-injectables.ts | 30 +++++ ...ormation.global-override-for-injectable.ts | 24 ++++ webpack/library-bundle.ts | 109 ++++++++++++++++++ webpack/main.ts | 25 ++-- webpack/renderer.ts | 9 +- webpack/vars.ts | 2 +- yarn.lock | 21 ---- 57 files changed, 712 insertions(+), 263 deletions(-) rename build/{set_npm_version.ts => set_extensions_npm_version.ts} (75%) rename {src/extensions/npm => packages}/extensions/.gitignore (100%) rename {src/extensions/npm => packages}/extensions/package.json (100%) create mode 100644 src/common/library.ts rename src/common/vars/{application-information.injectable.ts => application-information-injectable.ts} (69%) create mode 100644 src/common/vars/application-information-token.ts create mode 100644 src/common/vars/node-env-injection-token.ts create mode 100644 src/main/create-app.ts create mode 100644 src/main/extension-api.ts create mode 100644 src/main/library.ts create mode 100644 src/main/register-injectables.ts rename src/{common => main}/vars/application-information.global-override-for-injectable.ts (76%) create mode 100644 src/renderer/create-app.ts create mode 100644 src/renderer/extension-api.ts create mode 100644 src/renderer/index.ts create mode 100644 src/renderer/library.ts create mode 100644 src/renderer/register-injectables.ts create mode 100644 src/renderer/vars/application-information.global-override-for-injectable.ts create mode 100644 webpack/library-bundle.ts diff --git a/.github/workflows/publish-master-npm.yml b/.github/workflows/publish-master-npm.yml index 620245dc70..7824dd1c84 100644 --- a/.github/workflows/publish-master-npm.yml +++ b/.github/workflows/publish-master-npm.yml @@ -1,17 +1,16 @@ name: Publish NPM Package `master` on: - push: - branches: - - master + pull_request: + types: + - closed concurrency: group: publish-master-npm cancel-in-progress: true jobs: publish: - name: Publish NPM Package `master` + name: Publish Extensions NPM Package `master` runs-on: ubuntu-latest - if: | - ${{ github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'area/extension') }} + if: ${{ github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'area/extension') }} strategy: matrix: node-version: [16.x] @@ -28,11 +27,11 @@ jobs: - name: Generate NPM package run: | - make build-npm + make build-extensions-npm - name: publish new release run: | - make publish-npm + make publish-extensions-npm env: NPM_TOKEN: ${{ secrets.NPM_TOKEN }} NPM_RELEASE_TAG: master diff --git a/.github/workflows/publish-release-npm.yml b/.github/workflows/publish-release-npm.yml index 8dbf9f52ba..18be26f4f3 100644 --- a/.github/workflows/publish-release-npm.yml +++ b/.github/workflows/publish-release-npm.yml @@ -12,8 +12,8 @@ on: type: string description: The version to release manually jobs: - publish: - name: Publish NPM Package Release + publish-extensions: + name: Publish Extensions NPM Package Release runs-on: ubuntu-latest strategy: matrix: @@ -32,10 +32,37 @@ jobs: - name: Generate NPM package run: | - make build-npm + make build-extensions-npm - - name: publish new release + - name: Publish NPM package run: | - make publish-npm + make publish-extensions-npm + env: + NPM_TOKEN: ${{ secrets.NPM_TOKEN }} + publish-library: + name: Publish Library NPM Package Release + runs-on: ubuntu-latest + strategy: + matrix: + node-version: [16.x] + steps: + - name: Checkout Release + uses: actions/checkout@v3 + with: + fetch-depth: 0 + ref: ${{ inputs.version }} + + - name: Using Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v3 + with: + node-version: ${{ matrix.node-version }} + + - name: Generate NPM package + run: | + make build-library-npm + + - name: Publish NPM package + run: | + make publish-library-npm env: NPM_TOKEN: ${{ secrets.NPM_TOKEN }} diff --git a/.gitignore b/.gitignore index 57139f691b..8e9d6f3fe4 100644 --- a/.gitignore +++ b/.gitignore @@ -10,10 +10,6 @@ static/build static/types binaries/client/ binaries/server/ -src/extensions/*/*.js -src/extensions/*/*.d.ts -types/extension-api.d.ts -types/extension-renderer-api.d.ts docs/extensions/api site/ build/webpack/ diff --git a/Makefile b/Makefile index 07caefd5d2..a6e79dbd12 100644 --- a/Makefile +++ b/Makefile @@ -61,24 +61,32 @@ endif src/extensions/npm/extensions/__mocks__: cp -r __mocks__ src/extensions/npm/extensions/ -src/extensions/npm/extensions/dist: src/extensions/npm/extensions/node_modules +packages/extensions/dist: packages/extensions/node_modules yarn compile:extension-types -src/extensions/npm/extensions/node_modules: src/extensions/npm/extensions/package.json - cd src/extensions/npm/extensions/ && ../../../../node_modules/.bin/npm install --no-audit --no-fund --no-save +packages/extensions/node_modules: packages/extensions/package.json + cd packages/extensions/ && ../../node_modules/.bin/npm install --no-audit --no-fund --no-save -.PHONY: build-npm -build-npm: build-extension-types src/extensions/npm/extensions/__mocks__ - yarn npm:fix-package-version +.PHONY: build-extensions-npm +build-extensions-npm: build-extension-types packages/extensions/__mocks__ + yarn npm:fix-extensions-package-version + +.PHONY: build-library-npm +build-library-npm: + yarn compile-library .PHONY: build-extension-types -build-extension-types: node_modules src/extensions/npm/extensions/dist +build-extension-types: node_modules packages/extensions/dist -.PHONY: publish-npm -publish-npm: node_modules build-npm +.PHONY: publish-extensions-npm +publish-extensions-npm: node_modules build-extensions-npm ./node_modules/.bin/npm config set '//registry.npmjs.org/:_authToken' "${NPM_TOKEN}" - cd src/extensions/npm/extensions && npm publish --access=public --tag=$(NPM_RELEASE_TAG) - git restore src/extensions/npm/extensions/package.json + cd packages/extensions && npm publish --access=public --tag=$(NPM_RELEASE_TAG) && git restore package.json + +.PHONY: publish-library-npm +publish-library-npm: node_modules build-library-npm + ./node_modules/.bin/npm config set '//registry.npmjs.org/:_authToken' "${NPM_TOKEN}" + npm publish --access=public --tag=$(NPM_RELEASE_TAG) .PHONY: build-docs build-docs: @@ -90,7 +98,8 @@ docs: build-docs .PHONY: clean-npm clean-npm: - rm -rf src/extensions/npm/extensions/{dist,__mocks__,node_modules} + rm -rf packages/extensions/{dist,__mocks__,node_modules} + rm -rf static/build/library/ .PHONY: clean clean: clean-npm diff --git a/build/download_binaries.ts b/build/download_binaries.ts index 826c713fd3..66b90dea95 100644 --- a/build/download_binaries.ts +++ b/build/download_binaries.ts @@ -208,7 +208,7 @@ async function main() { noTTYOutput: true, format: "[{bar}] {percentage}% | {downloadArch} {binaryName}", }); - const baseDir = path.join(__dirname, "..", "binaries", "client"); + const baseDir = path.join(process.cwd(), "binaries", "client"); const downloaders: BinaryDownloader[] = [ new LensK8sProxyDownloader(deps, { version: packageInfo.config.k8sProxyVersion, diff --git a/build/generate-tray-icons.ts b/build/generate-tray-icons.ts index e0471a3153..3e363ad13d 100644 --- a/build/generate-tray-icons.ts +++ b/build/generate-tray-icons.ts @@ -10,9 +10,9 @@ import sharp from "sharp"; const size = Number(process.env.OUTPUT_SIZE || "16"); const outputFolder = process.env.OUTPUT_DIR || "./static/build/tray"; -const inputFile = process.env.INPUT_SVG_PATH || "./src/renderer/components/icon/logo-lens.svg"; -const noticeFile = process.env.NOTICE_SVG_PATH || "./src/renderer/components/icon/notice.svg"; -const spinnerFile = process.env.SPINNER_SVG_PATH || "./src/renderer/components/icon/arrow-spinner.svg"; +const inputFile = process.env.INPUT_SVG_PATH || path.resolve(__dirname, "../src/renderer/components/icon/logo-lens.svg"); +const noticeFile = process.env.NOTICE_SVG_PATH || path.resolve(__dirname, "../src/renderer/components/icon/notice.svg"); +const spinnerFile = process.env.SPINNER_SVG_PATH || path.resolve(__dirname, "../src/renderer/components/icon/arrow-spinner.svg"); async function ensureOutputFoler() { await ensureDir(outputFolder); diff --git a/build/set_npm_version.ts b/build/set_extensions_npm_version.ts similarity index 75% rename from build/set_npm_version.ts rename to build/set_extensions_npm_version.ts index d2f7c9a0b6..ee04257f48 100644 --- a/build/set_npm_version.ts +++ b/build/set_extensions_npm_version.ts @@ -4,7 +4,7 @@ */ import * as fs from "fs"; import * as path from "path"; -import packageInfo from "../src/extensions/npm/extensions/package.json"; +import packageInfo from "../packages/extensions/package.json"; import appInfo from "../package.json"; import { SemVer } from "semver"; import { execSync } from "child_process"; @@ -22,4 +22,4 @@ if (NPM_RELEASE_TAG !== "latest") { packageInfo.version = version.format(); -fs.writeFileSync(path.join(__dirname, "../src/extensions/npm/extensions/package.json"), `${JSON.stringify(packageInfo, null, 2)}\n`); +fs.writeFileSync(path.join(__dirname, "../packages/extensions/package.json"), `${JSON.stringify(packageInfo, null, 2)}\n`); diff --git a/package.json b/package.json index 225bc82cbe..8e1c99811f 100644 --- a/package.json +++ b/package.json @@ -1,16 +1,51 @@ { - "name": "open-lens", + "name": "@k8slens/open-lens", "productName": "OpenLens", "description": "OpenLens - Open Source IDE for Kubernetes", "homepage": "https://github.com/lensapp/lens", "version": "6.4.0-alpha.0", + "repository": { + "type": "git", + "url": "git+https://github.com/lensapp/lens.git" + }, + "keywords": [], + "bugs": { + "url": "https://github.com/lensapp/lens/issues" + }, "main": "static/build/main.js", + "exports": { + "./main": "./static/build/library/main.js", + "./renderer": "./static/build/library/renderer.js", + "./common": "./static/build/library/common.js", + "./styles": "./static/build/library/renderer.css" + }, + "typesVersions": { + "*": { + "main": [ + "./src/main/library.ts" + ], + "renderer": [ + "./src/renderer/library.ts" + ], + "common": [ + "./src/common/library.ts" + ] + } + }, + "files": [ + "build/download_binaries.ts", + "build/*.plist", + "build/installer.nsh", + "build/notarize.js", + "src/**/*", + "static/build/library/**/*", + "templates/**/*", + "types/*", + "tsconfig.json" + ], "copyright": "© 2022 OpenLens Authors", "license": "MIT", - "author": { - "name": "OpenLens Authors", - "email": "info@k8slens.dev" - }, + "author": "OpenLens Authors ", "scripts": { "adr:create": "echo \"What is the title?\"; read title; adr new \"$title\"", "adr:change-status": "echo \"Decision number?:\"; read decision; adr status $decision", @@ -22,13 +57,14 @@ "dev-run": "nodemon --watch ./static/build/main.js --exec \"electron --remote-debugging-port=9223 --inspect .\"", "dev:main": "yarn run compile:main --watch --progress", "dev:renderer": "yarn run ts-node webpack/dev-server.ts", + "compile-library": "env NODE_ENV=production yarn run webpack --config webpack/library-bundle.ts", "compile": "env NODE_ENV=production concurrently yarn:compile:*", "compile:main": "yarn run webpack --config webpack/main.ts", "compile:renderer": "yarn run webpack --config webpack/renderer.ts", "compile:extension-types": "yarn run webpack --config webpack/extensions.ts", "compile:node-fetch": "yarn run webpack --config ./webpack/node-fetch.ts", - "postinstall": "yarn run compile:node-fetch", - "npm:fix-package-version": "yarn run ts-node build/set_npm_version.ts", + "prepare": "yarn run compile:node-fetch", + "npm:fix-extensions-package-version": "yarn run ts-node build/set_extensions_npm_version.ts", "build:linux": "yarn run compile && electron-builder --linux --dir", "build:mac": "yarn run compile && electron-builder --mac --dir", "build:win": "yarn run compile && electron-builder --win --dir", @@ -79,7 +115,7 @@ }, "modulePathIgnorePatterns": [ "/dist", - "/src/extensions/npm" + "/packages" ], "setupFiles": [ "/src/jest.setup.ts", @@ -106,6 +142,7 @@ "LICENSE" ], "linux": { + "executableName": "open-lens", "category": "Network", "artifactName": "${productName}-${version}.${arch}.${ext}", "target": [ @@ -134,6 +171,7 @@ ] }, "mac": { + "executableName": "OpenLens", "hardenedRuntime": true, "gatekeeperAssess": false, "entitlements": "build/entitlements.mac.plist", @@ -154,6 +192,7 @@ ] }, "win": { + "executableName": "OpenLens.exe", "target": [ "nsis" ], @@ -204,7 +243,6 @@ "@sentry/electron": "^3.0.8", "@sentry/integrations": "^6.19.3", "@side/jest-runtime": "^1.0.1", - "@types/circular-dependency-plugin": "5.0.5", "abort-controller": "^3.0.0", "auto-bind": "^4.0.0", "await-lock": "^2.2.2", @@ -238,8 +276,6 @@ "mock-fs": "^5.2.0", "moment": "^2.29.4", "moment-timezone": "^0.5.40", - "monaco-editor": "^0.29.1", - "monaco-editor-webpack-plugin": "^5.0.0", "node-fetch": "^3.3.0", "node-pty": "0.10.1", "npm": "^8.19.3", @@ -375,6 +411,8 @@ "memorystream": "^0.3.1", "mini-css-extract-plugin": "^2.7.2", "mock-http": "^1.1.0", + "monaco-editor": "^0.29.1", + "monaco-editor-webpack-plugin": "^5.0.0", "node-gyp": "^8.3.0", "node-loader": "^2.0.0", "nodemon": "^2.0.20", @@ -411,5 +449,26 @@ "webpack-node-externals": "^3.0.0", "xterm": "^4.19.0", "xterm-addon-fit": "^0.5.0" + }, + "peerDependencies": { + "@types/byline": "^4.2.33", + "@types/chart.js": "^2.9.36", + "@types/color": "^3.0.3", + "@types/crypto-js": "^3.1.47", + "@types/lodash": "^4.14.191", + "@types/proper-lockfile": "^4.1.2", + "@types/react-dom": "^17.0.16", + "@types/react-router-dom": "^5.3.3", + "@types/react-virtualized-auto-sizer": "^1.0.1", + "@types/react-window": "^1.8.5", + "@types/request-promise-native": "^1.0.18", + "@types/tar": "^6.1.3", + "@types/tcp-port-used": "^1.0.1", + "@types/url-parse": "^1.4.8", + "@types/uuid": "^8.3.4", + "monaco-editor": "^0.29.1", + "react-select": "^5.7.0", + "typed-emitter": "^1.4.0", + "xterm-addon-fit": "^0.5.0" } } diff --git a/src/extensions/npm/extensions/.gitignore b/packages/extensions/.gitignore similarity index 100% rename from src/extensions/npm/extensions/.gitignore rename to packages/extensions/.gitignore diff --git a/src/extensions/npm/extensions/package.json b/packages/extensions/package.json similarity index 100% rename from src/extensions/npm/extensions/package.json rename to packages/extensions/package.json diff --git a/src/common/front-end-routing/routes/welcome/welcome-route-config.injectable.ts b/src/common/front-end-routing/routes/welcome/welcome-route-config.injectable.ts index 4e16df5bb4..d46b816c50 100644 --- a/src/common/front-end-routing/routes/welcome/welcome-route-config.injectable.ts +++ b/src/common/front-end-routing/routes/welcome/welcome-route-config.injectable.ts @@ -3,12 +3,12 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import applicationInformationInjectable from "../../../vars/application-information.injectable"; +import applicationInformationToken from "../../../vars/application-information-token"; const welcomeRouteConfigInjectable = getInjectable({ id: "welcome-route-config", - instantiate: (di) => di.inject(applicationInformationInjectable).config.welcomeRoute, + instantiate: (di) => di.inject(applicationInformationToken).config.welcomeRoute, }); export default welcomeRouteConfigInjectable; diff --git a/src/common/library.ts b/src/common/library.ts new file mode 100644 index 0000000000..960cb47ca2 --- /dev/null +++ b/src/common/library.ts @@ -0,0 +1,14 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import applicationInformationToken from "./vars/application-information-token"; +import type { ApplicationInformation } from "./vars/application-information-token"; +import { bundledExtensionInjectionToken } from "../extensions/extension-discovery/bundled-extension-token"; + +// @experimental +export { + applicationInformationToken, + ApplicationInformation, + bundledExtensionInjectionToken, +}; diff --git a/src/common/utils/environment-variables.injectable.ts b/src/common/utils/environment-variables.injectable.ts index 897b349d56..899d012f78 100644 --- a/src/common/utils/environment-variables.injectable.ts +++ b/src/common/utils/environment-variables.injectable.ts @@ -8,15 +8,11 @@ const environmentVariablesInjectable = getInjectable({ id: "environment-variables", instantiate: () => { - // IMPORTANT: The syntax needs to be exactly this in order to make environment variable values - // hard-coded at compile-time by Webpack. - const NODE_ENV = process.env.NODE_ENV; const JEST_WORKER_ID = process.env.JEST_WORKER_ID; const CICD = process.env.CICD; return { // Compile-time environment variables - NODE_ENV, JEST_WORKER_ID, CICD, diff --git a/src/common/vars/application-copyright.injectable.ts b/src/common/vars/application-copyright.injectable.ts index cdac64855c..0233584225 100644 --- a/src/common/vars/application-copyright.injectable.ts +++ b/src/common/vars/application-copyright.injectable.ts @@ -3,11 +3,11 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import applicationInformationInjectable from "./application-information.injectable"; +import applicationInformationToken from "./application-information-token"; const applicationCopyrightInjectable = getInjectable({ id: "application-copyright", - instantiate: (di) => di.inject(applicationInformationInjectable).copyright, + instantiate: (di) => di.inject(applicationInformationToken).copyright, }); export default applicationCopyrightInjectable; diff --git a/src/common/vars/application-description.injectable.ts b/src/common/vars/application-description.injectable.ts index d6c4c9f79b..5d63a67aa5 100644 --- a/src/common/vars/application-description.injectable.ts +++ b/src/common/vars/application-description.injectable.ts @@ -3,11 +3,11 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import applicationInformationInjectable from "./application-information.injectable"; +import applicationInformationToken from "./application-information-token"; const applicationDescriptionInjectable = getInjectable({ id: "application-description", - instantiate: (di) => di.inject(applicationInformationInjectable).description, + instantiate: (di) => di.inject(applicationInformationToken).description, }); export default applicationDescriptionInjectable; diff --git a/src/common/vars/application-information.injectable.ts b/src/common/vars/application-information-injectable.ts similarity index 69% rename from src/common/vars/application-information.injectable.ts rename to src/common/vars/application-information-injectable.ts index 56dfcf9d7e..a73e311233 100644 --- a/src/common/vars/application-information.injectable.ts +++ b/src/common/vars/application-information-injectable.ts @@ -4,14 +4,12 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import packageJson from "../../../package.json"; - -export type ApplicationInformation = Pick & { - build: Partial & { publish?: unknown[] }; -}; +import applicationInformationToken from "../../common/vars/application-information-token"; const applicationInformationInjectable = getInjectable({ id: "application-information", - instantiate: (): ApplicationInformation => { + injectionToken: applicationInformationToken, + instantiate: () => { const { version, config, productName, build, copyright, description, name } = packageJson; return { version, config, productName, build, copyright, description, name }; diff --git a/src/common/vars/application-information-token.ts b/src/common/vars/application-information-token.ts new file mode 100644 index 0000000000..dcd56a3146 --- /dev/null +++ b/src/common/vars/application-information-token.ts @@ -0,0 +1,17 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ + +import { getInjectionToken } from "@ogre-tools/injectable"; +import type packageJson from "../../../package.json"; + +export type ApplicationInformation = Pick & { + build: Partial & { publish?: unknown[] }; +}; + +const applicationInformationToken = getInjectionToken({ + id: "application-information-token", +}); + +export default applicationInformationToken; diff --git a/src/common/vars/bundled-kubectl-version.injectable.ts b/src/common/vars/bundled-kubectl-version.injectable.ts index 9542a79834..f5817426fb 100644 --- a/src/common/vars/bundled-kubectl-version.injectable.ts +++ b/src/common/vars/bundled-kubectl-version.injectable.ts @@ -3,11 +3,11 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import applicationInformationInjectable from "./application-information.injectable"; +import applicationInformationToken from "./application-information-token"; const bundledKubectlVersionInjectable = getInjectable({ id: "bundled-kubectl-version", - instantiate: (di) => di.inject(applicationInformationInjectable).config.bundledKubectlVersion, + instantiate: (di) => di.inject(applicationInformationToken).config.bundledKubectlVersion, }); export default bundledKubectlVersionInjectable; diff --git a/src/common/vars/content-security-policy.injectable.ts b/src/common/vars/content-security-policy.injectable.ts index b6e1e0eb30..01ccee0980 100644 --- a/src/common/vars/content-security-policy.injectable.ts +++ b/src/common/vars/content-security-policy.injectable.ts @@ -3,11 +3,11 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import applicationInformationInjectable from "./application-information.injectable"; +import applicationInformationToken from "./application-information-token"; const contentSecurityPolicyInjectable = getInjectable({ id: "content-security-policy", - instantiate: (di) => di.inject(applicationInformationInjectable).config.contentSecurityPolicy, + instantiate: (di) => di.inject(applicationInformationToken).config.contentSecurityPolicy, }); export default contentSecurityPolicyInjectable; diff --git a/src/common/vars/extension-api-version.injectable.ts b/src/common/vars/extension-api-version.injectable.ts index 4f7f4d9930..9b84cf1177 100644 --- a/src/common/vars/extension-api-version.injectable.ts +++ b/src/common/vars/extension-api-version.injectable.ts @@ -4,12 +4,12 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { SemVer } from "semver"; -import applicationInformationInjectable from "./application-information.injectable"; +import applicationInformationToken from "./application-information-token"; const extensionApiVersionInjectable = getInjectable({ id: "extension-api-version", instantiate: (di) => { - const { major, minor, patch } = new SemVer(di.inject(applicationInformationInjectable).version); + const { major, minor, patch } = new SemVer(di.inject(applicationInformationToken).version); return `${major}.${minor}.${patch}`; }, diff --git a/src/common/vars/is-production.injectable.ts b/src/common/vars/is-production.injectable.ts index 085b091dfa..661cb397d1 100644 --- a/src/common/vars/is-production.injectable.ts +++ b/src/common/vars/is-production.injectable.ts @@ -3,13 +3,13 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import environmentVariablesInjectable from "../utils/environment-variables.injectable"; +import nodeEnvInjectionToken from "./node-env-injection-token"; const isProductionInjectable = getInjectable({ id: "is-production", instantiate: (di) => { - const { NODE_ENV: nodeEnv } = di.inject(environmentVariablesInjectable); + const nodeEnv = di.inject(nodeEnvInjectionToken); return nodeEnv === "production"; }, diff --git a/src/common/vars/node-env-injection-token.ts b/src/common/vars/node-env-injection-token.ts new file mode 100644 index 0000000000..9de463c1cb --- /dev/null +++ b/src/common/vars/node-env-injection-token.ts @@ -0,0 +1,11 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectionToken } from "@ogre-tools/injectable"; + +const nodeEnvInjectionToken = getInjectionToken({ + id: "node-env-injection-token", +}); + +export default nodeEnvInjectionToken; diff --git a/src/common/vars/product-name.injectable.ts b/src/common/vars/product-name.injectable.ts index 910c6afa48..7a5ba73f2d 100644 --- a/src/common/vars/product-name.injectable.ts +++ b/src/common/vars/product-name.injectable.ts @@ -3,11 +3,11 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import applicationInformationInjectable from "./application-information.injectable"; +import applicationInformationToken from "./application-information-token"; const productNameInjectable = getInjectable({ id: "product-name", - instantiate: (di) => di.inject(applicationInformationInjectable).productName, + instantiate: (di) => di.inject(applicationInformationToken).productName, }); export default productNameInjectable; diff --git a/src/common/vars/sentry-dsn-url.injectable.ts b/src/common/vars/sentry-dsn-url.injectable.ts index e33c2fd0de..7fd138ab0a 100644 --- a/src/common/vars/sentry-dsn-url.injectable.ts +++ b/src/common/vars/sentry-dsn-url.injectable.ts @@ -3,11 +3,11 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import applicationInformationInjectable from "./application-information.injectable"; +import applicationInformationToken from "./application-information-token"; const sentryDataSourceNameInjectable = getInjectable({ id: "sentry-data-source-name", - instantiate: (di) => di.inject(applicationInformationInjectable).config.sentryDsn, + instantiate: (di) => di.inject(applicationInformationToken).config.sentryDsn, }); export default sentryDataSourceNameInjectable; diff --git a/src/common/vars/static-files-directory.global-override-for-injectable.ts b/src/common/vars/static-files-directory.global-override-for-injectable.ts index cb4275caf6..3b8ec43046 100644 --- a/src/common/vars/static-files-directory.global-override-for-injectable.ts +++ b/src/common/vars/static-files-directory.global-override-for-injectable.ts @@ -5,5 +5,4 @@ import { getGlobalOverride } from "../test-utils/get-global-override"; import staticFilesDirectoryInjectable from "./static-files-directory.injectable"; - export default getGlobalOverride(staticFilesDirectoryInjectable, () => "/some-static-directory"); diff --git a/src/common/vars/store-migration-version.injectable.ts b/src/common/vars/store-migration-version.injectable.ts index 79ab1578a3..eb2b7aa8cc 100644 --- a/src/common/vars/store-migration-version.injectable.ts +++ b/src/common/vars/store-migration-version.injectable.ts @@ -3,11 +3,11 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import applicationInformationInjectable from "./application-information.injectable"; +import applicationInformationToken from "./application-information-token"; const storeMigrationVersionInjectable = getInjectable({ id: "store-migration-version", - instantiate: (di) => di.inject(applicationInformationInjectable).version, + instantiate: (di) => di.inject(applicationInformationToken).version, }); export default storeMigrationVersionInjectable; diff --git a/src/extensions/extension-loader/extension-loader.ts b/src/extensions/extension-loader/extension-loader.ts index 2c186ff38f..5dce874e54 100644 --- a/src/extensions/extension-loader/extension-loader.ts +++ b/src/extensions/extension-loader/extension-loader.ts @@ -404,7 +404,7 @@ export class ExtensionLoader { const extAbsolutePath = this.dependencies.joinPaths(this.dependencies.getDirnameOfPath(extension.manifestPath), extRelativePath); try { - return __non_webpack_require__(extAbsolutePath).default; + return require(/* webpackIgnore: true */ extAbsolutePath).default; } catch (error) { const message = (error instanceof Error ? error.stack : undefined) || error; diff --git a/src/features/application-update/main/updating-is-enabled/publish-is-configured/publish-is-configured.injectable.ts b/src/features/application-update/main/updating-is-enabled/publish-is-configured/publish-is-configured.injectable.ts index 4e4b01ef84..6b2f31380f 100644 --- a/src/features/application-update/main/updating-is-enabled/publish-is-configured/publish-is-configured.injectable.ts +++ b/src/features/application-update/main/updating-is-enabled/publish-is-configured/publish-is-configured.injectable.ts @@ -3,11 +3,11 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import applicationInformationInjectable from "../../../../../common/vars/application-information.injectable"; +import applicationInformationToken from "../../../../../common/vars/application-information-token"; const publishIsConfiguredInjectable = getInjectable({ id: "publish-is-configured", - instantiate: (di) => Boolean(di.inject(applicationInformationInjectable).build.publish?.length), + instantiate: (di) => Boolean(di.inject(applicationInformationToken).build.publish?.length), }); export default publishIsConfiguredInjectable; diff --git a/src/main/cluster/store-migrations/snap.injectable.ts b/src/main/cluster/store-migrations/snap.injectable.ts index b99de8a49f..f87ff4b6c2 100644 --- a/src/main/cluster/store-migrations/snap.injectable.ts +++ b/src/main/cluster/store-migrations/snap.injectable.ts @@ -6,7 +6,7 @@ // Fix embedded kubeconfig paths under snap config import { getInjectable } from "@ogre-tools/injectable"; -import applicationInformationInjectable from "../../../common/vars/application-information.injectable"; +import applicationInformationToken from "../../../common/vars/application-information-token"; import { clusterStoreMigrationInjectionToken } from "../../../common/cluster-store/migration-token"; import loggerInjectable from "../../../common/logger.injectable"; import isSnapPackageInjectable from "../../../common/vars/is-snap-package.injectable"; @@ -16,7 +16,7 @@ import pathExistsSyncInjectable from "../../../common/fs/path-exists-sync.inject const clusterStoreSnapMigrationInjectable = getInjectable({ id: "cluster-store-snap-migration", instantiate: (di) => { - const { version } = di.inject(applicationInformationInjectable); + const { version } = di.inject(applicationInformationToken); const logger = di.inject(loggerInjectable); const isSnapPackage = di.inject(isSnapPackageInjectable); const pathExistsSync = di.inject(pathExistsSyncInjectable); diff --git a/src/main/create-app.ts b/src/main/create-app.ts new file mode 100644 index 0000000000..d0cccae5f8 --- /dev/null +++ b/src/main/create-app.ts @@ -0,0 +1,36 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ + +import type { DiContainer } from "@ogre-tools/injectable"; +import { getInjectable } from "@ogre-tools/injectable"; +import { runInAction } from "mobx"; +import nodeEnvInjectionToken from "../common/vars/node-env-injection-token"; +import { registerInjectables } from "./register-injectables"; +import startMainApplicationInjectable from "./start-main-application/start-main-application.injectable"; + +interface AppConfig { + di: DiContainer; + mode: string; +} + +export function createApp(conf: AppConfig) { + const { di, mode } = conf; + + runInAction(() => { + di.register(getInjectable({ + id: "node-env", + instantiate: () => mode, + injectionToken: nodeEnvInjectionToken, + })); + + registerInjectables(di); + }); + + const startMainApplication = di.inject(startMainApplicationInjectable); + + return { + start: () => startMainApplication(), + }; +} diff --git a/src/main/electron-app/runnables/setup-developer-tools-in-development-environment.injectable.ts b/src/main/electron-app/runnables/setup-developer-tools-in-development-environment.injectable.ts index 07807a7965..5572887b06 100644 --- a/src/main/electron-app/runnables/setup-developer-tools-in-development-environment.injectable.ts +++ b/src/main/electron-app/runnables/setup-developer-tools-in-development-environment.injectable.ts @@ -3,6 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; +import nodeEnvInjectionToken from "../../../common/vars/node-env-injection-token"; import loggerInjectable from "../../../common/logger.injectable"; import { onLoadOfApplicationInjectionToken } from "../../start-main-application/runnable-tokens/on-load-of-application-injection-token"; @@ -11,11 +12,12 @@ const setupDeveloperToolsInDevelopmentEnvironmentInjectable = getInjectable({ instantiate: (di) => { const logger = di.inject(loggerInjectable); + const nodeEnv = di.inject(nodeEnvInjectionToken); return { id: "setup-developer-tools-in-development-environment", run: () => { - if (process.env.NODE_ENV !== "development") { + if (nodeEnv !== "development") { return; } diff --git a/src/main/extension-api.ts b/src/main/extension-api.ts new file mode 100644 index 0000000000..2fd6bfb5f1 --- /dev/null +++ b/src/main/extension-api.ts @@ -0,0 +1,26 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ + +import * as Mobx from "mobx"; +import { spawn } from "node-pty"; +import * as LensExtensionsCommonApi from "../extensions/common-api"; +import * as LensExtensionsMainApi from "../extensions/main-api"; + + +/** + * Exports for virtual package "@k8slens/extensions" for main-process. + * All exporting names available in global runtime scope: + * e.g. global.Mobx, global.LensExtensions + */ +const LensExtensions = { + Common: LensExtensionsCommonApi, + Main: LensExtensionsMainApi, +}; + +const Pty = { + spawn, +}; + +export { Mobx, LensExtensions, Pty }; diff --git a/src/main/getDi.ts b/src/main/getDi.ts index 8b71cca39b..db7decece8 100644 --- a/src/main/getDi.ts +++ b/src/main/getDi.ts @@ -3,28 +3,14 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { createContainer } from "@ogre-tools/injectable"; -import { autoRegister } from "@ogre-tools/injectable-extension-for-auto-registration"; -import { registerMobX } from "@ogre-tools/injectable-extension-for-mobx"; import { runInAction } from "mobx"; -import { Environments, setLegacyGlobalDiForExtensionApi } from "../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api"; +import applicationInformationInjectable from "../common/vars/application-information-injectable"; export const getDi = () => { const di = createContainer("main"); - setLegacyGlobalDiForExtensionApi(di, Environments.main); - runInAction(() => { - registerMobX(di); - - autoRegister({ - di, - requireContexts: [ - require.context("./", true, CONTEXT_MATCHER_FOR_NON_FEATURES), - require.context("../extensions", true, CONTEXT_MATCHER_FOR_NON_FEATURES), - require.context("../common", true, CONTEXT_MATCHER_FOR_NON_FEATURES), - require.context("../features", true, CONTEXT_MATCHER_FOR_FEATURES), - ], - }); + di.register(applicationInformationInjectable); }); return di; diff --git a/src/main/getDiForUnitTesting.ts b/src/main/getDiForUnitTesting.ts index 58bb386810..51c99b9ca3 100644 --- a/src/main/getDiForUnitTesting.ts +++ b/src/main/getDiForUnitTesting.ts @@ -5,7 +5,7 @@ import { kebabCase, noop, chunk } from "lodash/fp"; import type { DiContainer, Injectable } from "@ogre-tools/injectable"; -import { createContainer, isInjectable } from "@ogre-tools/injectable"; +import { createContainer, isInjectable, getInjectable } from "@ogre-tools/injectable"; import { Environments, setLegacyGlobalDiForExtensionApi } from "../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api"; import writeJsonFileInjectable from "../common/fs/write-json-file.injectable"; import readJsonFileInjectable from "../common/fs/read-json-file.injectable"; @@ -71,6 +71,8 @@ import kubectlDownloadingNormalizedArchInjectable from "./kubectl/normalized-arc import initializeClusterManagerInjectable from "./cluster/initialize-manager.injectable"; import addKubeconfigSyncAsEntitySourceInjectable from "./start-main-application/runnables/kube-config-sync/add-source.injectable"; import type { GlobalOverride } from "../common/test-utils/get-global-override"; +import applicationInformationInjectable from "../common/vars/application-information-injectable"; +import nodeEnvInjectionToken from "../common/vars/node-env-injection-token"; export function getDiForUnitTesting(opts: { doGeneralOverrides?: boolean } = {}) { const { @@ -79,6 +81,12 @@ export function getDiForUnitTesting(opts: { doGeneralOverrides?: boolean } = {}) const di = createContainer("main"); + di.register(getInjectable({ + id: "node-env", + instantiate: () => "test", + injectionToken: nodeEnvInjectionToken, + })); + setLegacyGlobalDiForExtensionApi(di, Environments.main); di.preventSideEffects(); @@ -93,6 +101,7 @@ export function getDiForUnitTesting(opts: { doGeneralOverrides?: boolean } = {}) runInAction(() => { registerMobX(di); + di.register(applicationInformationInjectable); chunk(100)(injectables).forEach(chunkInjectables => { di.register(...chunkInjectables); diff --git a/src/main/index.ts b/src/main/index.ts index 0d30c2ac56..e7e5aad291 100644 --- a/src/main/index.ts +++ b/src/main/index.ts @@ -5,38 +5,19 @@ // Main process -import * as Mobx from "mobx"; -import { spawn } from "node-pty"; -import process from "process"; -import * as LensExtensionsCommonApi from "../extensions/common-api"; -import * as LensExtensionsMainApi from "../extensions/main-api"; import { getDi } from "./getDi"; -import startMainApplicationInjectable from "./start-main-application/start-main-application.injectable"; +import { Mobx, LensExtensions, Pty } from "./extension-api"; +import { createApp } from "./create-app"; const di = getDi(); -const startMainApplication = di.inject(startMainApplicationInjectable); +const app = createApp({ + di, + mode: process.env.NODE_ENV || "development", +}); -(async () => { - try { - await startMainApplication(); - } catch (error) { - console.error(error); - process.exit(1); - } -})(); - -/** - * Exports for virtual package "@k8slens/extensions" for main-process. - * All exporting names available in global runtime scope: - * e.g. global.Mobx, global.LensExtensions - */ -const LensExtensions = { - Common: LensExtensionsCommonApi, - Main: LensExtensionsMainApi, -}; - -const Pty = { - spawn, -}; +app.start().catch((error) => { + console.error(error); + process.exit(1); +}); export { Mobx, LensExtensions, Pty }; diff --git a/src/main/library.ts b/src/main/library.ts new file mode 100644 index 0000000000..f10d36929d --- /dev/null +++ b/src/main/library.ts @@ -0,0 +1,21 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ + +import { afterApplicationIsLoadedInjectionToken } from "./start-main-application/runnable-tokens/after-application-is-loaded-injection-token"; +import { beforeApplicationIsLoadingInjectionToken } from "./start-main-application/runnable-tokens/before-application-is-loading-injection-token"; +import { beforeElectronIsReadyInjectionToken } from "./start-main-application/runnable-tokens/before-electron-is-ready-injection-token"; +import { onLoadOfApplicationInjectionToken } from "./start-main-application/runnable-tokens/on-load-of-application-injection-token"; +import * as extensionApi from "./extension-api"; +import { createApp } from "./create-app"; + +// @experimental +export { + createApp, + extensionApi, + afterApplicationIsLoadedInjectionToken, + beforeApplicationIsLoadingInjectionToken, + beforeElectronIsReadyInjectionToken, + onLoadOfApplicationInjectionToken, +}; diff --git a/src/main/register-injectables.ts b/src/main/register-injectables.ts new file mode 100644 index 0000000000..6d0117c512 --- /dev/null +++ b/src/main/register-injectables.ts @@ -0,0 +1,29 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import type { DiContainer } from "@ogre-tools/injectable"; +import { autoRegister } from "@ogre-tools/injectable-extension-for-auto-registration"; +import { registerMobX } from "@ogre-tools/injectable-extension-for-mobx"; +import { runInAction } from "mobx"; +import { Environments, setLegacyGlobalDiForExtensionApi } from "../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api"; + +export function registerInjectables(di: DiContainer) { + setLegacyGlobalDiForExtensionApi(di, Environments.main); + + runInAction(() => { + registerMobX(di); + + autoRegister({ + di, + requireContexts: [ + require.context("./", true, CONTEXT_MATCHER_FOR_NON_FEATURES), + require.context("../extensions", true, CONTEXT_MATCHER_FOR_NON_FEATURES), + require.context("../common", true, CONTEXT_MATCHER_FOR_NON_FEATURES), + require.context("../features", true, CONTEXT_MATCHER_FOR_FEATURES), + ], + }); + }); + + return di; +} diff --git a/src/main/routes/files/development.injectable.ts b/src/main/routes/files/development.injectable.ts index dcc6fce649..b632e9151d 100644 --- a/src/main/routes/files/development.injectable.ts +++ b/src/main/routes/files/development.injectable.ts @@ -6,19 +6,17 @@ import { getInjectable } from "@ogre-tools/injectable"; import httpProxy from "http-proxy"; import { webpackDevServerPort } from "../../../../webpack/vars"; import { publicPath } from "../../../common/vars"; -import appNameInjectable from "../../../common/vars/app-name.injectable"; import type { LensApiRequest, RouteResponse } from "../../router/route"; const devStaticFileRouteHandlerInjectable = getInjectable({ id: "dev-static-file-route-handler", - instantiate: (di) => { + instantiate: () => { const proxy = httpProxy.createProxy(); - const appName = di.inject(appNameInjectable); const proxyTarget = `http://127.0.0.1:${webpackDevServerPort}`; return async ({ raw: { req, res }}: LensApiRequest<"/{path*}">): Promise> => { if (req.url === "/" || !req.url) { - req.url = `${publicPath}/${appName}.html`; + req.url = `${publicPath}/index.html`; } else if (!req.url.startsWith("/build/")) { return { statusCode: 404 }; } diff --git a/src/main/routes/files/production.injectable.ts b/src/main/routes/files/production.injectable.ts index b6f9ca5e40..1e4c360138 100644 --- a/src/main/routes/files/production.injectable.ts +++ b/src/main/routes/files/production.injectable.ts @@ -6,7 +6,6 @@ import { getInjectable } from "@ogre-tools/injectable"; import readFileBufferInjectable from "../../../common/fs/read-file-buffer.injectable"; import joinPathsInjectable from "../../../common/path/join-paths.injectable"; import staticFilesDirectoryInjectable from "../../../common/vars/static-files-directory.injectable"; -import appNameInjectable from "../../../common/vars/app-name.injectable"; import type { LensApiRequest } from "../../router/route"; import path from "path"; import type { SupportedFileExtension } from "../../router/router-content-types"; @@ -20,7 +19,6 @@ const prodStaticFileRouteHandlerInjectable = getInjectable({ const readFileBuffer = di.inject(readFileBufferInjectable); const joinPaths = di.inject(joinPathsInjectable); const staticFilesDirectory = di.inject(staticFilesDirectoryInjectable); - const appName = di.inject(appNameInjectable); const logger = di.inject(loggerInjectable); return async ({ params }: LensApiRequest<"/{path*}">) => { @@ -49,7 +47,7 @@ const prodStaticFileRouteHandlerInjectable = getInjectable({ return { statusCode: 404 }; } - filePath = `${publicPath}/${appName}.html`; + filePath = `${publicPath}/index.html`; } } diff --git a/src/main/start-main-application/lens-window/application-window/create-electron-window.injectable.ts b/src/main/start-main-application/lens-window/application-window/create-electron-window.injectable.ts index bc2cbb889f..2d763c6361 100644 --- a/src/main/start-main-application/lens-window/application-window/create-electron-window.injectable.ts +++ b/src/main/start-main-application/lens-window/application-window/create-electron-window.injectable.ts @@ -12,7 +12,7 @@ import openLinkInBrowserInjectable from "../../../../common/utils/open-link-in-b import getAbsolutePathInjectable from "../../../../common/path/get-absolute-path.injectable"; import lensResourcesDirInjectable from "../../../../common/vars/lens-resources-dir.injectable"; import isLinuxInjectable from "../../../../common/vars/is-linux.injectable"; -import applicationInformationInjectable from "../../../../common/vars/application-information.injectable"; +import applicationInformationToken from "../../../../common/vars/application-information-token"; import pathExistsSyncInjectable from "../../../../common/fs/path-exists-sync.injectable"; @@ -54,7 +54,7 @@ const createElectronWindowInjectable = getInjectable({ const getAbsolutePath = di.inject(getAbsolutePathInjectable); const lensResourcesDir = di.inject(lensResourcesDirInjectable); const isLinux = di.inject(isLinuxInjectable); - const applicationInformation = di.inject(applicationInformationInjectable); + const applicationInformation = di.inject(applicationInformationToken); const pathExistsSync = di.inject(pathExistsSyncInjectable); return (configuration) => { diff --git a/src/common/vars/application-information.global-override-for-injectable.ts b/src/main/vars/application-information.global-override-for-injectable.ts similarity index 76% rename from src/common/vars/application-information.global-override-for-injectable.ts rename to src/main/vars/application-information.global-override-for-injectable.ts index 83b9559d73..acc47ce83d 100644 --- a/src/common/vars/application-information.global-override-for-injectable.ts +++ b/src/main/vars/application-information.global-override-for-injectable.ts @@ -3,14 +3,14 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getGlobalOverride } from "../test-utils/get-global-override"; -import applicationInformationInjectable from "./application-information.injectable"; +import { getGlobalOverride } from "../../common/test-utils/get-global-override"; +import applicationInformationInjectable from "../../common/vars/application-information-injectable"; export default getGlobalOverride(applicationInformationInjectable, () => ({ name: "some-product-name", productName: "some-product-name", version: "6.0.0", - build: {}, + build: {} as any, config: { k8sProxyVersion: "0.2.1", bundledKubectlVersion: "1.23.3", @@ -18,7 +18,6 @@ export default getGlobalOverride(applicationInformationInjectable, () => ({ sentryDsn: "", contentSecurityPolicy: "script-src 'unsafe-eval' 'self'; frame-src http://*.localhost:*/; img-src * data:", welcomeRoute: "/welcome", - extensions: [], }, copyright: "some-copyright-information", description: "some-descriptive-text", diff --git a/src/main/weblinks-store/migrations/currentVersion.injectable.ts b/src/main/weblinks-store/migrations/currentVersion.injectable.ts index 9a23a1a326..6c58de3b48 100644 --- a/src/main/weblinks-store/migrations/currentVersion.injectable.ts +++ b/src/main/weblinks-store/migrations/currentVersion.injectable.ts @@ -7,13 +7,13 @@ import { docsUrl, slackUrl } from "../../../common/vars"; import type { WeblinkData } from "../../../common/weblinks-store/weblink-store"; import { getInjectable } from "@ogre-tools/injectable"; import { weblinkStoreMigrationInjectionToken } from "../../../common/weblinks-store/migration-token"; -import applicationInformationInjectable from "../../../common/vars/application-information.injectable"; +import applicationInformationToken from "../../../common/vars/application-information-token"; import { lensDocumentationWeblinkId, lensSlackWeblinkId } from "../links"; const currentVersionWeblinkStoreMigrationInjectable = getInjectable({ id: "current-version-weblink-store-migration", instantiate: (di) => { - const { version } = di.inject(applicationInformationInjectable); + const { version } = di.inject(applicationInformationToken); return { version, // Run always after upgrade diff --git a/src/renderer/bootstrap.tsx b/src/renderer/bootstrap.tsx index 34474515fe..d37f561c05 100644 --- a/src/renderer/bootstrap.tsx +++ b/src/renderer/bootstrap.tsx @@ -6,15 +6,8 @@ import "./components/app.scss"; import React from "react"; -import ReactDOM, { render, unmountComponentAtNode } from "react-dom"; -import * as Mobx from "mobx"; -import * as MobxReact from "mobx-react"; -import * as ReactRouter from "react-router"; -import * as ReactRouterDom from "react-router-dom"; -import * as LensExtensionsCommonApi from "../extensions/common-api"; -import * as LensExtensionsRendererApi from "../extensions/renderer-api"; +import { render, unmountComponentAtNode } from "react-dom"; import { DefaultProps } from "./mui-base-theme"; -import { getDi } from "./getDi"; import { DiContextProvider } from "@ogre-tools/injectable-react"; import type { DiContainer } from "@ogre-tools/injectable"; import extensionLoaderInjectable from "../extensions/extension-loader/extension-loader.injectable"; @@ -80,28 +73,3 @@ export async function bootstrap(di: DiContainer) { rootElem, ); } - -const di = getDi(); - -// run -bootstrap(di); - -/** - * Exports for virtual package "@k8slens/extensions" for renderer-process. - * All exporting names available in global runtime scope: - * e.g. Devtools -> Console -> window.LensExtensions (renderer) - */ -const LensExtensions = { - Common: LensExtensionsCommonApi, - Renderer: LensExtensionsRendererApi, -}; - -export { - React, - ReactDOM, - ReactRouter, - ReactRouterDom, - Mobx, - MobxReact, - LensExtensions, -}; diff --git a/src/renderer/create-app.ts b/src/renderer/create-app.ts new file mode 100644 index 0000000000..3a511af5ec --- /dev/null +++ b/src/renderer/create-app.ts @@ -0,0 +1,34 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import "./components/app.scss"; + +import { bootstrap } from "./bootstrap"; +import type { DiContainer } from "@ogre-tools/injectable"; +import { getInjectable } from "@ogre-tools/injectable"; +import nodeEnvInjectionToken from "../common/vars/node-env-injection-token"; +import { runInAction } from "mobx"; +import { registerInjectables } from "./register-injectables"; + +interface AppConfig { + di: DiContainer; + mode: string; +} + +export function createApp(conf: AppConfig) { + const { di, mode } = conf; + + runInAction(() => { + di.register(getInjectable({ + id: "node-env", + instantiate: () => mode, + injectionToken: nodeEnvInjectionToken, + })); + registerInjectables(di); + }); + + return { + start: () => bootstrap(di), + }; +} diff --git a/src/renderer/extension-api.ts b/src/renderer/extension-api.ts new file mode 100644 index 0000000000..12cdcef5f9 --- /dev/null +++ b/src/renderer/extension-api.ts @@ -0,0 +1,33 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ + +import React from "react"; +import ReactDOM from "react-dom"; +import * as Mobx from "mobx"; +import * as MobxReact from "mobx-react"; +import * as ReactRouter from "react-router"; +import * as ReactRouterDom from "react-router-dom"; +import * as LensExtensionsCommonApi from "../extensions/common-api"; +import * as LensExtensionsRendererApi from "../extensions/renderer-api"; + +/** + * Exports for virtual package "@k8slens/extensions" for renderer-process. + * All exporting names available in global runtime scope: + * e.g. Devtools -> Console -> window.LensExtensions (renderer) + */ +const LensExtensions = { + Common: LensExtensionsCommonApi, + Renderer: LensExtensionsRendererApi, +}; + +export { + React, + ReactDOM, + ReactRouter, + ReactRouterDom, + Mobx, + MobxReact, + LensExtensions, +}; diff --git a/src/renderer/frames/cluster-frame/cluster-frame-layout-child-component.injectable.tsx b/src/renderer/frames/cluster-frame/cluster-frame-layout-child-component.injectable.tsx index 3f1f5c4a03..0cd23d67c5 100644 --- a/src/renderer/frames/cluster-frame/cluster-frame-layout-child-component.injectable.tsx +++ b/src/renderer/frames/cluster-frame/cluster-frame-layout-child-component.injectable.tsx @@ -9,51 +9,62 @@ import { MainLayout } from "../../components/layout/main-layout"; import { Sidebar } from "../../components/layout/sidebar"; import { Dock } from "../../components/dock"; import styles from "./cluster-frame.module.css"; +import type { IComputedValue } from "mobx"; import { computed } from "mobx"; import currentRouteComponentInjectable from "../../routes/current-route-component.injectable"; import { Redirect } from "react-router"; import startUrlInjectable from "./start-url.injectable"; import currentPathInjectable from "../../routes/current-path.injectable"; import { observer } from "mobx-react"; +import { withInjectables } from "@ogre-tools/injectable-react"; + +interface Dependencies { + currentRouteComponent: IComputedValue | undefined>; + startUrl: IComputedValue; + currentPath: IComputedValue; +} + +const NonInjectedClusterFrameLayout = observer((props: Dependencies) => { + const Component = props.currentRouteComponent.get(); + const starting = props.startUrl.get(); + const current = props.currentPath.get(); + + return ( + } footer={}> + {Component ? ( + + ) : // NOTE: this check is to prevent an infinite loop + starting !== current ? ( + + ) : ( +
+
+ An error has occured. No route can be found matching the + current route, which is also the starting route. +
+
+ )} + + ); +}); + +const ClusterFrameLayout = withInjectables(NonInjectedClusterFrameLayout, { + getProps: (di, props) => ({ + ...props, + currentRouteComponent: di.inject(currentRouteComponentInjectable), + startUrl: di.inject(startUrlInjectable), + currentPath: di.inject(currentPathInjectable), + }), +}); const clusterFrameLayoutChildComponentInjectable = getInjectable({ id: "cluster-frame-layout-child-component", - instantiate: (di) => { - const currentRouteComponent = di.inject(currentRouteComponentInjectable); - const startUrl = di.inject(startUrlInjectable); - const currentPath = di.inject(currentPathInjectable); - - return { - id: "cluster-frame-layout", - - shouldRender: computed(() => true), - - Component: observer(() => { - const Component = currentRouteComponent.get(); - const starting = startUrl.get(); - const current = currentPath.get(); - - return ( - } footer={}> - {Component ? ( - - ) : // NOTE: this check is to prevent an infinite loop - starting !== current ? ( - - ) : ( -
-
- An error has occured. No route can be found matching the - current route, which is also the starting route. -
-
- )} - - ); - }), - }; - }, + instantiate: () => ({ + id: "cluster-frame-layout", + shouldRender: computed(() => true), + Component: ClusterFrameLayout, + }), injectionToken: clusterFrameChildComponentInjectionToken, }); diff --git a/src/renderer/getDi.tsx b/src/renderer/getDi.tsx index 28e111bc97..de61d5ab67 100644 --- a/src/renderer/getDi.tsx +++ b/src/renderer/getDi.tsx @@ -4,28 +4,14 @@ */ import { createContainer } from "@ogre-tools/injectable"; -import { autoRegister } from "@ogre-tools/injectable-extension-for-auto-registration"; -import { registerMobX } from "@ogre-tools/injectable-extension-for-mobx"; import { runInAction } from "mobx"; -import { Environments, setLegacyGlobalDiForExtensionApi } from "../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api"; +import applicationInformationInjectable from "../common/vars/application-information-injectable"; export const getDi = () => { const di = createContainer("renderer"); - setLegacyGlobalDiForExtensionApi(di, Environments.renderer); - runInAction(() => { - registerMobX(di); - - autoRegister({ - di, - requireContexts: [ - require.context("./", true, CONTEXT_MATCHER_FOR_NON_FEATURES), - require.context("../common", true, CONTEXT_MATCHER_FOR_NON_FEATURES), - require.context("../extensions", true, CONTEXT_MATCHER_FOR_NON_FEATURES), - require.context("../features", true, CONTEXT_MATCHER_FOR_FEATURES), - ], - }); + di.register(applicationInformationInjectable); }); return di; diff --git a/src/renderer/getDiForUnitTesting.tsx b/src/renderer/getDiForUnitTesting.tsx index ffc531ec77..a2d7f30e0d 100644 --- a/src/renderer/getDiForUnitTesting.tsx +++ b/src/renderer/getDiForUnitTesting.tsx @@ -5,7 +5,7 @@ import { noop, chunk } from "lodash/fp"; import type { DiContainer, Injectable } from "@ogre-tools/injectable"; -import { createContainer, isInjectable } from "@ogre-tools/injectable"; +import { createContainer, isInjectable, getInjectable } from "@ogre-tools/injectable"; import { Environments, setLegacyGlobalDiForExtensionApi } from "../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api"; import requestFromChannelInjectable from "./utils/channel/request-from-channel.injectable"; import loggerInjectable from "../common/logger.injectable"; @@ -41,6 +41,8 @@ import legacyOnChannelListenInjectable from "./ipc/legacy-channel-listen.injecta import storageSaveDelayInjectable from "./utils/create-storage/storage-save-delay.injectable"; import environmentVariablesInjectable from "../common/utils/environment-variables.injectable"; import type { GlobalOverride } from "../common/test-utils/get-global-override"; +import applicationInformationInjectable from "../common/vars/application-information-injectable"; +import nodeEnvInjectionToken from "../common/vars/node-env-injection-token"; export const getDiForUnitTesting = ( opts: { doGeneralOverrides?: boolean } = {}, @@ -49,6 +51,12 @@ export const getDiForUnitTesting = ( const di = createContainer("renderer"); + di.register(getInjectable({ + id: "node-env", + instantiate: () => "test", + injectionToken: nodeEnvInjectionToken, + })); + di.preventSideEffects(); setLegacyGlobalDiForExtensionApi(di, Environments.renderer); @@ -63,7 +71,8 @@ export const getDiForUnitTesting = ( runInAction(() => { registerMobX(di); - + di.register(applicationInformationInjectable); + chunk(100)(injectables).forEach((chunkInjectables) => { di.register(...chunkInjectables); }); diff --git a/src/renderer/index.ts b/src/renderer/index.ts new file mode 100644 index 0000000000..4ccc568a2e --- /dev/null +++ b/src/renderer/index.ts @@ -0,0 +1,32 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ + +import "./components/app.scss"; + +import { getDi } from "./getDi"; +import { + React, ReactDOM, ReactRouter, + ReactRouterDom, Mobx, MobxReact, LensExtensions, +} from "./extension-api"; +import { createApp } from "./create-app"; + +const di = getDi(); +const app = createApp({ + di, + mode: process.env.NODE_ENV || "development", +}); + +// run +app.start(); + +export { + React, + ReactDOM, + ReactRouter, + ReactRouterDom, + Mobx, + MobxReact, + LensExtensions, +}; diff --git a/src/renderer/library.ts b/src/renderer/library.ts new file mode 100644 index 0000000000..6e3b2eada1 --- /dev/null +++ b/src/renderer/library.ts @@ -0,0 +1,14 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import "./components/app.scss"; + +import * as extensionApi from "./extension-api"; +import { createApp } from "./create-app"; + +// @experimental +export { + createApp, + extensionApi, +}; diff --git a/src/renderer/register-injectables.ts b/src/renderer/register-injectables.ts new file mode 100644 index 0000000000..d801e04625 --- /dev/null +++ b/src/renderer/register-injectables.ts @@ -0,0 +1,30 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ + +import type { DiContainer } from "@ogre-tools/injectable"; +import { autoRegister } from "@ogre-tools/injectable-extension-for-auto-registration"; +import { registerMobX } from "@ogre-tools/injectable-extension-for-mobx"; +import { runInAction } from "mobx"; +import { Environments, setLegacyGlobalDiForExtensionApi } from "../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api"; + +export function registerInjectables(di: DiContainer) { + setLegacyGlobalDiForExtensionApi(di, Environments.renderer); + + runInAction(() => { + registerMobX(di); + + autoRegister({ + di, + requireContexts: [ + require.context("./", true, CONTEXT_MATCHER_FOR_NON_FEATURES), + require.context("../common", true, CONTEXT_MATCHER_FOR_NON_FEATURES), + require.context("../extensions", true, CONTEXT_MATCHER_FOR_NON_FEATURES), + require.context("../features", true, CONTEXT_MATCHER_FOR_FEATURES), + ], + }); + }); + + return di; +} diff --git a/src/renderer/vars/application-information.global-override-for-injectable.ts b/src/renderer/vars/application-information.global-override-for-injectable.ts new file mode 100644 index 0000000000..acc47ce83d --- /dev/null +++ b/src/renderer/vars/application-information.global-override-for-injectable.ts @@ -0,0 +1,24 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ + +import { getGlobalOverride } from "../../common/test-utils/get-global-override"; +import applicationInformationInjectable from "../../common/vars/application-information-injectable"; + +export default getGlobalOverride(applicationInformationInjectable, () => ({ + name: "some-product-name", + productName: "some-product-name", + version: "6.0.0", + build: {} as any, + config: { + k8sProxyVersion: "0.2.1", + bundledKubectlVersion: "1.23.3", + bundledHelmVersion: "3.7.2", + sentryDsn: "", + contentSecurityPolicy: "script-src 'unsafe-eval' 'self'; frame-src http://*.localhost:*/; img-src * data:", + welcomeRoute: "/welcome", + }, + copyright: "some-copyright-information", + description: "some-descriptive-text", +})); diff --git a/webpack/library-bundle.ts b/webpack/library-bundle.ts new file mode 100644 index 0000000000..51a37877b0 --- /dev/null +++ b/webpack/library-bundle.ts @@ -0,0 +1,109 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import MiniCssExtractPlugin from "mini-css-extract-plugin"; +import { platform } from "os"; +import path from "path"; +import type { WebpackPluginInstance } from "webpack"; +import { DefinePlugin, optimize } from "webpack"; +import main from "./main"; +import renderer from "./renderer"; +import { buildDir } from "./vars"; +import CircularDependencyPlugin from "circular-dependency-plugin"; +import ForkTsCheckerPlugin from "fork-ts-checker-webpack-plugin"; + +const rendererConfig = renderer({ showVars: false }); + +const config = [ + { + ...main(), + entry: { + main: path.resolve(__dirname, "..", "src", "main", "library.ts"), + }, + output: { + library: { + type: "commonjs2", + }, + path: path.resolve(buildDir, "library"), + }, + optimization: { + minimize: false, + }, + plugins: [ + new DefinePlugin({ + CONTEXT_MATCHER_FOR_NON_FEATURES: `/\\.injectable(\\.${platform})?\\.tsx?$/`, + CONTEXT_MATCHER_FOR_FEATURES: `/\\/(main|common)\\/.+\\.injectable(\\.${platform})?\\.tsx?$/`, + }), + new CircularDependencyPlugin({ + cwd: __dirname, + exclude: /node_modules/, + failOnError: true, + }) as unknown as WebpackPluginInstance, + ], + }, + { + ...rendererConfig, + name: "lens-app-common", + entry: { + common: path.resolve(__dirname, "..", "src", "common", "library.ts"), + }, + output: { + library: { + type: "commonjs2", + }, + path: path.resolve(buildDir, "library"), + }, + optimization: { + minimize: false, + }, + plugins: [ + new ForkTsCheckerPlugin(), + new CircularDependencyPlugin({ + cwd: __dirname, + exclude: /node_modules/, + failOnError: true, + }) as unknown as WebpackPluginInstance, + ], + }, + { + ...rendererConfig, + entry: { + renderer: path.resolve(__dirname, "..", "src", "renderer", "library.ts"), + }, + output: { + library: { + type: "commonjs2", + }, + path: path.resolve(buildDir, "library"), + }, + optimization: { + minimize: false, + }, + externals: { + ...(rendererConfig.externals as any), + "monaco-editor": "commonjs monaco-editor", + }, + plugins: [ + new DefinePlugin({ + CONTEXT_MATCHER_FOR_NON_FEATURES: `/\\.injectable(\\.${platform})?\\.tsx?$/`, + CONTEXT_MATCHER_FOR_FEATURES: `/\\/(renderer|common)\\/.+\\.injectable(\\.${platform})?\\.tsx?$/`, + }), + new MiniCssExtractPlugin({ + filename: "[name].css", + runtime: false, + }), + new optimize.LimitChunkCountPlugin({ + maxChunks: 1, + }), + new ForkTsCheckerPlugin(), + new CircularDependencyPlugin({ + cwd: __dirname, + exclude: /node_modules/, + failOnError: true, + }) as unknown as WebpackPluginInstance, + ], + }, +]; + +export default config; diff --git a/webpack/main.ts b/webpack/main.ts index 84efd63f22..a57e9ccd9c 100755 --- a/webpack/main.ts +++ b/webpack/main.ts @@ -15,14 +15,14 @@ import { DefinePlugin } from "webpack"; import { buildDir, isDevelopment, mainDir } from "./vars"; import { platform } from "process"; -const configs: { (): webpack.Configuration }[] = []; - -configs.push((): webpack.Configuration => { - console.info("WEBPACK:main", { - isDevelopment, - mainDir, - buildDir, - }); +const main = ({ showVars = true } = {}): webpack.Configuration => { + if (showVars) { + console.info("WEBPACK:main", { + isDevelopment, + mainDir, + buildDir, + }); + } return { name: "lens-app-main", @@ -45,6 +45,11 @@ configs.push((): webpack.Configuration => { nodeExternals(), ], module: { + parser: { + javascript: { + commonjsMagicComments: true, + }, + }, rules: [ { test: /\.node$/, @@ -67,6 +72,6 @@ configs.push((): webpack.Configuration => { }) as unknown as WebpackPluginInstance, ], }; -}); +}; -export default configs; +export default main; diff --git a/webpack/renderer.ts b/webpack/renderer.ts index 6bad203ca7..6836591add 100755 --- a/webpack/renderer.ts +++ b/webpack/renderer.ts @@ -38,7 +38,7 @@ export function webpackLensRenderer({ showVars = true } = {}): webpack.Configura devtool: isDevelopment ? "cheap-module-source-map" : "source-map", cache: isDevelopment ? { type: "filesystem" } : false, entry: { - [appName]: path.resolve(rendererDir, "bootstrap.tsx"), + [appName]: path.resolve(rendererDir, "index.ts"), }, output: { libraryTarget: "global", @@ -70,6 +70,11 @@ export function webpackLensRenderer({ showVars = true } = {}): webpack.Configura minimize: false, }, module: { + parser: { + javascript: { + commonjsMagicComments: true, + }, + }, rules: [ { test: /\.node$/, @@ -102,7 +107,7 @@ export function webpackLensRenderer({ showVars = true } = {}): webpack.Configura }), new HtmlWebpackPlugin({ - filename: `${appName}.html`, + filename: "index.html", template: htmlTemplate, inject: true, hash: true, diff --git a/webpack/vars.ts b/webpack/vars.ts index fd0b4bcee9..b0245dedae 100644 --- a/webpack/vars.ts +++ b/webpack/vars.ts @@ -11,7 +11,7 @@ export const isDevelopment = process.env.NODE_ENV !== "production"; export const mainDir = path.join(process.cwd(), "src", "main"); export const buildDir = path.join(process.cwd(), "static", "build"); export const extensionEntry = path.join(process.cwd(), "src", "extensions", "extension-api.ts"); -export const extensionOutDir = path.join(process.cwd(), "src", "extensions", "npm", "extensions", "dist"); +export const extensionOutDir = path.join(process.cwd(), "packages", "extensions", "dist"); export const assetsFolderName = "assets"; export const rendererDir = path.join(process.cwd(), "src", "renderer"); export const appName = isDevelopment diff --git a/yarn.lock b/yarn.lock index 9a876289b3..27ab4129b2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8415,9 +8415,6 @@ klona@^2.0.4, klona@^2.0.5: resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.5.tgz#d166574d90076395d9963aa7a928fabb8d76afbc" integrity sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ== -"kube-object-event-status@file:./extensions/kube-object-event-status": - version "6.1.1" - kuler@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/kuler/-/kuler-2.0.0.tgz#e2c570a3800388fb44407e851531c1d670b061b3" @@ -8435,15 +8432,6 @@ lazy-val@^1.0.4, lazy-val@^1.0.5: resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.5.tgz#6cf3b9f5bc31cee7ee3e369c0832b7583dcd923d" integrity sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q== -"lens-metrics-cluster-feature@file:./extensions/metrics-cluster-feature": - version "6.1.0" - -"lens-node-menu@file:./extensions/node-menu": - version "6.1.0" - -"lens-pod-menu@file:./extensions/pod-menu": - version "6.1.0" - less@^4.1.1: version "4.1.2" resolved "https://registry.yarnpkg.com/less/-/less-4.1.2.tgz#6099ee584999750c2624b65f80145f8674e4b4b0" @@ -9004,9 +8992,6 @@ methods@~1.1.2: resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= -"metrics-cluster-feature@file:./extensions/metrics-cluster-feature": - version "6.1.0" - micromatch@^4.0.0, micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5: version "4.0.5" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" @@ -9453,9 +9438,6 @@ node-loader@^2.0.0: dependencies: loader-utils "^2.0.0" -"node-menu@file:./extensions/node-menu": - version "6.1.0" - node-pty@0.10.1: version "0.10.1" resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-0.10.1.tgz#cd05d03a2710315ec40221232ec04186f6ac2c6d" @@ -10261,9 +10243,6 @@ plist@^3.0.1, plist@^3.0.4: base64-js "^1.5.1" xmlbuilder "^9.0.7" -"pod-menu@file:./extensions/pod-menu": - version "6.1.0" - popper.js@1.16.1-lts: version "1.16.1-lts" resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1-lts.tgz#cf6847b807da3799d80ee3d6d2f90df8a3f50b05"