diff --git a/package-lock.json b/package-lock.json index fcb28724fe..46f74bea61 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4634,8 +4634,8 @@ "resolved": "packages/node-fetch", "link": true }, - "node_modules/@k8slens/react-application-root": { - "resolved": "packages/technical-features/react-application-root", + "node_modules/@k8slens/react-application": { + "resolved": "packages/technical-features/react-application", "link": true }, "node_modules/@k8slens/react-testing-library-discovery": { @@ -34374,8 +34374,8 @@ "@k8slens/react-testing-library-discovery": "^1.0.0-alpha.0" }, "peerDependencies": { - "@k8slens/application": "6.5.0-alpha.2", "@k8slens/feature-core": "^6.5.0-alpha.0", + "@k8slens/react-application": "^1.0.0-alpha.0", "@ogre-tools/fp": "^15.1.2", "@ogre-tools/injectable": "^15.1.2", "@ogre-tools/injectable-extension-for-auto-registration": "^15.1.2", @@ -34411,7 +34411,7 @@ "@hapi/subtext": "^7.1.0", "@k8slens/cluster-settings": "^6.5.0-alpha.1", "@k8slens/node-fetch": "^6.5.0-alpha.1", - "@k8slens/react-application-root": "^1.0.0-alpha.0", + "@k8slens/react-application": "^1.0.0-alpha.0", "@kubernetes/client-node": "^0.18.1", "@material-ui/styles": "^4.11.5", "@ogre-tools/fp": "^15.1.2", @@ -37622,7 +37622,7 @@ "@k8slens/messaging": "^1.0.0-alpha.1", "@k8slens/messaging-for-main": "^1.0.0-alpha.1", "@k8slens/messaging-for-renderer": "^1.0.0-alpha.1", - "@k8slens/react-application-root": "^1.0.0-alpha.0", + "@k8slens/react-application": "^1.0.0-alpha.0", "@k8slens/run-many": "^1.0.0-alpha.1", "@k8slens/startable-stoppable": "^1.0.0-alpha.1", "@k8slens/test-utils": "^1.0.0-alpha.1", @@ -39201,9 +39201,34 @@ "lodash": "^4.17.21" } }, + "packages/technical-features/react-application": { + "name": "@k8slens/react-application", + "version": "1.0.0-alpha.0", + "license": "MIT", + "devDependencies": { + "@async-fn/jest": "^1.6.4", + "@k8slens/eslint-config": "6.5.0-alpha.1", + "@k8slens/react-testing-library-discovery": "*", + "@testing-library/react": "^12.1.5" + }, + "peerDependencies": { + "@k8slens/application": "^6.5.0-alpha.2", + "@k8slens/feature-core": "^6.5.0-alpha.0", + "@ogre-tools/fp": "^15.1.2", + "@ogre-tools/injectable": "^15.1.2", + "@ogre-tools/injectable-extension-for-auto-registration": "^15.1.2", + "@ogre-tools/injectable-extension-for-mobx": "^15.1.2", + "@ogre-tools/injectable-react": "^15.1.2", + "lodash": "^4.17.15", + "mobx": "^6.8.0", + "react": "^17.0.2", + "react-dom": "^17.0.2" + } + }, "packages/technical-features/react-application-root": { "name": "@k8slens/react-application-root", "version": "1.0.0-alpha.0", + "extraneous": true, "license": "MIT", "devDependencies": { "@async-fn/jest": "^1.6.4", diff --git a/packages/core/package.json b/packages/core/package.json index 6244974381..121cb33bee 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -122,7 +122,7 @@ "@hapi/subtext": "^7.1.0", "@k8slens/cluster-settings": "^6.5.0-alpha.1", "@k8slens/node-fetch": "^6.5.0-alpha.1", - "@k8slens/react-application-root": "^1.0.0-alpha.0", + "@k8slens/react-application": "^1.0.0-alpha.0", "@kubernetes/client-node": "^0.18.1", "@material-ui/styles": "^4.11.5", "@ogre-tools/fp": "^15.1.2", diff --git a/packages/core/src/renderer/frames/frame-application-root.injectable.ts b/packages/core/src/renderer/frames/frame-application-root.injectable.ts index 6813fbfacb..afae5a5fb3 100644 --- a/packages/core/src/renderer/frames/frame-application-root.injectable.ts +++ b/packages/core/src/renderer/frames/frame-application-root.injectable.ts @@ -5,7 +5,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import { reactApplicationChildrenInjectionToken, -} from "@k8slens/react-application-root"; +} from "@k8slens/react-application"; import { computed } from "mobx"; const frameApplicationRootInjectable = getInjectable({ diff --git a/packages/core/src/renderer/frames/routing-react-application-hoc.injectable.tsx b/packages/core/src/renderer/frames/routing-react-application-hoc.injectable.tsx index 0b41e30945..6853b0eaed 100644 --- a/packages/core/src/renderer/frames/routing-react-application-hoc.injectable.tsx +++ b/packages/core/src/renderer/frames/routing-react-application-hoc.injectable.tsx @@ -9,7 +9,7 @@ import React from "react"; import { reactApplicationHigherOrderComponentInjectionToken, -} from "@k8slens/react-application-root"; +} from "@k8slens/react-application"; const routingReactApplicationHocInjectable = getInjectable({ id: "routing-react-application-hoc", diff --git a/packages/core/src/renderer/frames/theme-provider-react-application-hoc.injectable.tsx b/packages/core/src/renderer/frames/theme-provider-react-application-hoc.injectable.tsx index fc87fa7cc3..45f94c6404 100644 --- a/packages/core/src/renderer/frames/theme-provider-react-application-hoc.injectable.tsx +++ b/packages/core/src/renderer/frames/theme-provider-react-application-hoc.injectable.tsx @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import React from "react"; -import { reactApplicationHigherOrderComponentInjectionToken } from "@k8slens/react-application-root"; +import { reactApplicationHigherOrderComponentInjectionToken } from "@k8slens/react-application"; import { ThemeProvider } from "@material-ui/core"; import { defaultMuiBaseTheme } from "../mui-base-theme"; diff --git a/packages/open-lens/package.json b/packages/open-lens/package.json index 8f8da66c10..2a53aa6629 100644 --- a/packages/open-lens/package.json +++ b/packages/open-lens/package.json @@ -206,7 +206,7 @@ "@k8slens/messaging": "^1.0.0-alpha.1", "@k8slens/messaging-for-main": "^1.0.0-alpha.1", "@k8slens/messaging-for-renderer": "^1.0.0-alpha.1", - "@k8slens/react-application-root": "^1.0.0-alpha.0", + "@k8slens/react-application": "^1.0.0-alpha.0", "@k8slens/run-many": "^1.0.0-alpha.1", "@k8slens/startable-stoppable": "^1.0.0-alpha.1", "@k8slens/test-utils": "^1.0.0-alpha.1", diff --git a/packages/open-lens/src/renderer/index.ts b/packages/open-lens/src/renderer/index.ts index eb371f1e27..2d5dda2f04 100644 --- a/packages/open-lens/src/renderer/index.ts +++ b/packages/open-lens/src/renderer/index.ts @@ -15,7 +15,7 @@ import { createContainer } from "@ogre-tools/injectable"; import { registerMobX } from "@ogre-tools/injectable-extension-for-mobx"; import { registerInjectableReact } from "@ogre-tools/injectable-react"; import { messagingFeatureForRenderer } from "@k8slens/messaging-for-renderer"; -import { reactApplicationRootFeature } from "@k8slens/react-application-root"; +import { reactApplicationFeature } from "@k8slens/react-application"; const environment = "renderer"; @@ -30,7 +30,7 @@ runInAction(() => { di, applicationFeature, messagingFeatureForRenderer, - reactApplicationRootFeature + reactApplicationFeature ); autoRegister({ diff --git a/packages/technical-features/react-application-root/.eslintrc.json b/packages/technical-features/react-application/.eslintrc.json similarity index 100% rename from packages/technical-features/react-application-root/.eslintrc.json rename to packages/technical-features/react-application/.eslintrc.json diff --git a/packages/technical-features/react-application-root/.prettierrc b/packages/technical-features/react-application/.prettierrc similarity index 100% rename from packages/technical-features/react-application-root/.prettierrc rename to packages/technical-features/react-application/.prettierrc diff --git a/packages/technical-features/react-application-root/README.md b/packages/technical-features/react-application/README.md similarity index 64% rename from packages/technical-features/react-application-root/README.md rename to packages/technical-features/react-application/README.md index 3e5f581636..2650d6f527 100644 --- a/packages/technical-features/react-application-root/README.md +++ b/packages/technical-features/react-application/README.md @@ -1,13 +1,13 @@ -# @k8slens/react-application-root +# @k8slens/react-application # Usage ```bash -$ npm install @k8slens/react-application-root +$ npm install @k8slens/react-application ``` ```typescript -import { reactApplicationRootFeature } from "@k8slens/application"; +import { reactApplicationFeature } from "@k8slens/react-application"; import { registerFeature } from "@k8slens/feature-core"; import { createContainer } from "@ogre-tools/injectable"; diff --git a/packages/technical-features/react-application-root/index.ts b/packages/technical-features/react-application/index.ts similarity index 91% rename from packages/technical-features/react-application-root/index.ts rename to packages/technical-features/react-application/index.ts index f85fb3816d..e3f5236d54 100644 --- a/packages/technical-features/react-application-root/index.ts +++ b/packages/technical-features/react-application/index.ts @@ -7,4 +7,4 @@ export type { ReactApplicationChildren } from "./src/react-application/react-app export { reactApplicationHigherOrderComponentInjectionToken } from "./src/react-application/react-application-higher-order-component-injection-token"; export type { ReactApplicationHigherOrderComponent } from "./src/react-application/react-application-higher-order-component-injection-token"; -export { reactApplicationRootFeature } from "./src/feature"; +export { reactApplicationFeature } from "./src/feature"; diff --git a/packages/technical-features/react-application-root/jest.config.js b/packages/technical-features/react-application/jest.config.js similarity index 100% rename from packages/technical-features/react-application-root/jest.config.js rename to packages/technical-features/react-application/jest.config.js diff --git a/packages/technical-features/react-application-root/package.json b/packages/technical-features/react-application/package.json similarity index 93% rename from packages/technical-features/react-application-root/package.json rename to packages/technical-features/react-application/package.json index c9370ae5da..e3ca7956a8 100644 --- a/packages/technical-features/react-application-root/package.json +++ b/packages/technical-features/react-application/package.json @@ -1,8 +1,8 @@ { - "name": "@k8slens/react-application-root", + "name": "@k8slens/react-application", "private": false, "version": "1.0.0-alpha.0", - "description": "Package for Application Root in React", + "description": "Package for React Application", "type": "commonjs", "files": [ "dist" diff --git a/packages/technical-features/react-application-root/src/__snapshots__/react-application.test.tsx.snap b/packages/technical-features/react-application/src/__snapshots__/react-application.test.tsx.snap similarity index 100% rename from packages/technical-features/react-application-root/src/__snapshots__/react-application.test.tsx.snap rename to packages/technical-features/react-application/src/__snapshots__/react-application.test.tsx.snap diff --git a/packages/technical-features/react-application-root/src/feature.ts b/packages/technical-features/react-application/src/feature.ts similarity index 82% rename from packages/technical-features/react-application-root/src/feature.ts rename to packages/technical-features/react-application/src/feature.ts index 4fb7034006..96860c90df 100644 --- a/packages/technical-features/react-application-root/src/feature.ts +++ b/packages/technical-features/react-application/src/feature.ts @@ -2,8 +2,8 @@ import { getFeature } from "@k8slens/feature-core"; import { autoRegister } from "@ogre-tools/injectable-extension-for-auto-registration"; import { applicationFeature } from "@k8slens/application"; -export const reactApplicationRootFeature = getFeature({ - id: "react-application-root", +export const reactApplicationFeature = getFeature({ + id: "react-application", register: (di) => { autoRegister({ diff --git a/packages/technical-features/react-application-root/src/react-application.test.tsx b/packages/technical-features/react-application/src/react-application.test.tsx similarity index 97% rename from packages/technical-features/react-application-root/src/react-application.test.tsx rename to packages/technical-features/react-application/src/react-application.test.tsx index db55313745..12fcdb6bac 100644 --- a/packages/technical-features/react-application-root/src/react-application.test.tsx +++ b/packages/technical-features/react-application/src/react-application.test.tsx @@ -2,7 +2,7 @@ import { registerFeature } from "@k8slens/feature-core"; import { createContainer, DiContainer, getInjectable } from "@ogre-tools/injectable"; import { registerMobX } from "@ogre-tools/injectable-extension-for-mobx"; import { registerInjectableReact } from "@ogre-tools/injectable-react"; -import { reactApplicationRootFeature } from "./feature"; +import { reactApplicationFeature } from "./feature"; import { runInAction, computed, observable, IObservableValue } from "mobx"; import { startApplicationInjectionToken } from "@k8slens/application"; import type { RenderResult } from "@testing-library/react"; @@ -31,7 +31,7 @@ describe("react-application", () => { registerMobX(di); runInAction(() => { - registerFeature(di, reactApplicationRootFeature); + registerFeature(di, reactApplicationFeature); }); di.override(renderInjectable, () => (application) => { diff --git a/packages/technical-features/react-application-root/src/react-application/react-application-children-injection-token.ts b/packages/technical-features/react-application/src/react-application/react-application-children-injection-token.ts similarity index 100% rename from packages/technical-features/react-application-root/src/react-application/react-application-children-injection-token.ts rename to packages/technical-features/react-application/src/react-application/react-application-children-injection-token.ts diff --git a/packages/technical-features/react-application-root/src/react-application/react-application-content.tsx b/packages/technical-features/react-application/src/react-application/react-application-content.tsx similarity index 100% rename from packages/technical-features/react-application-root/src/react-application/react-application-content.tsx rename to packages/technical-features/react-application/src/react-application/react-application-content.tsx diff --git a/packages/technical-features/react-application-root/src/react-application/react-application-higher-order-component-injection-token.ts b/packages/technical-features/react-application/src/react-application/react-application-higher-order-component-injection-token.ts similarity index 100% rename from packages/technical-features/react-application-root/src/react-application/react-application-higher-order-component-injection-token.ts rename to packages/technical-features/react-application/src/react-application/react-application-higher-order-component-injection-token.ts diff --git a/packages/technical-features/react-application-root/src/react-application/react-application.tsx b/packages/technical-features/react-application/src/react-application/react-application.tsx similarity index 100% rename from packages/technical-features/react-application-root/src/react-application/react-application.tsx rename to packages/technical-features/react-application/src/react-application/react-application.tsx diff --git a/packages/technical-features/react-application-root/src/render-application/render-application-when-application-is-ready.injectable.tsx b/packages/technical-features/react-application/src/render-application/render-application-when-application-is-ready.injectable.tsx similarity index 100% rename from packages/technical-features/react-application-root/src/render-application/render-application-when-application-is-ready.injectable.tsx rename to packages/technical-features/react-application/src/render-application/render-application-when-application-is-ready.injectable.tsx diff --git a/packages/technical-features/react-application-root/src/render-application/render.injectable.tsx b/packages/technical-features/react-application/src/render-application/render.injectable.tsx similarity index 100% rename from packages/technical-features/react-application-root/src/render-application/render.injectable.tsx rename to packages/technical-features/react-application/src/render-application/render.injectable.tsx diff --git a/packages/technical-features/react-application-root/tsconfig.json b/packages/technical-features/react-application/tsconfig.json similarity index 100% rename from packages/technical-features/react-application-root/tsconfig.json rename to packages/technical-features/react-application/tsconfig.json diff --git a/packages/technical-features/react-application-root/webpack.config.js b/packages/technical-features/react-application/webpack.config.js similarity index 100% rename from packages/technical-features/react-application-root/webpack.config.js rename to packages/technical-features/react-application/webpack.config.js