2 Commits

Author	SHA1	Message	Date
Sebastian Malton	e2872fb9d8	imerge 'issue-3498': manual merge 1-1 ... # Conflicts: # package.json # packages/core/src/common/catalog/__tests__/helpers.test.ts # packages/core/src/common/catalog/helpers.ts # packages/core/src/common/cluster-store/migration-version.injectable.ts # packages/core/src/common/hotbars/migration-version.injectable.ts # packages/core/src/common/ipc/catalog.ts # packages/core/src/common/user-store/migration-version.injectable.ts # packages/core/src/common/vars/store-migration-version.injectable.ts # packages/core/src/common/weblinks-store/migration-version.injectable.ts # packages/core/src/extensions/extension-loader/file-system-provisioner-store/migration-version.injectable.ts # packages/core/src/extensions/extensions-store/migration-version.injectable.ts # packages/core/src/features/entity-settings/__snapshots__/limit-short-name-length.test.tsx.snap # packages/core/src/features/entity-settings/limit-short-name-length.test.tsx # packages/core/src/features/hotbar/__snapshots__/shows-custom-entity-names.test.tsx.snap # packages/core/src/features/hotbar/shows-custom-entity-names.test.tsx # packages/core/src/main/catalog-sync-to-renderer/broadcaster.global-override-for-injectable.ts # packages/core/src/main/catalog-sync-to-renderer/broadcaster.injectable.ts # packages/core/src/main/catalog-sync-to-renderer/push-catalog-to-renderer.injectable.ts # packages/core/src/main/catalog/index.ts # packages/core/src/renderer/components/+entity-settings/internal-kubernetes-cluster/general-settings.injectable.tsx # packages/core/src/renderer/components/+entity-settings/internal-kubernetes-cluster/metrics-settings.injectable.tsx # packages/core/src/renderer/components/+entity-settings/internal-kubernetes-cluster/namespace-settings.injectable.tsx # packages/core/src/renderer/components/+entity-settings/internal-kubernetes-cluster/node-shell-settings.injectable.tsx # packages/core/src/renderer/components/+entity-settings/internal-kubernetes-cluster/proxy-settings.injectable.tsx # packages/core/src/renderer/components/+entity-settings/internal-kubernetes-cluster/terminal-settings.injectable.tsx # packages/core/src/renderer/components/animate/is-enabled.global-override-for-injectable.ts # packages/core/src/renderer/components/animate/is-enabled.injectable.ts # packages/core/src/renderer/components/avatar/compute-random-color.global-override-for-injectable.ts # packages/core/src/renderer/components/avatar/compute-random-color.injectable.ts # src/main/catalog/index.ts # src/renderer/components/+entity-settings/internal-kubernetes-cluster/general-settings.injectable.tsx # src/renderer/components/+entity-settings/internal-kubernetes-cluster/metrics-settings.injectable.tsx # src/renderer/components/+entity-settings/internal-kubernetes-cluster/namespace-settings.injectable.tsx # src/renderer/components/+entity-settings/internal-kubernetes-cluster/node-shell-settings.injectable.tsx # src/renderer/components/+entity-settings/internal-kubernetes-cluster/proxy-settings.injectable.tsx # src/renderer/components/+entity-settings/internal-kubernetes-cluster/terminal-settings.injectable.tsx # src/renderer/components/+entity-settings/internal/kubernetes-cluster/general-settings.injectable.tsx # src/renderer/components/+entity-settings/internal/kubernetes-cluster/metrics-settings.injectable.tsx # src/renderer/components/+entity-settings/internal/kubernetes-cluster/namespace-settings.injectable.tsx # src/renderer/components/+entity-settings/internal/kubernetes-cluster/node-shell-settings.injectable.tsx # src/renderer/components/+entity-settings/internal/kubernetes-cluster/proxy-settings.injectable.tsx # src/renderer/components/+entity-settings/internal/kubernetes-cluster/terminal-settings.injectable.tsx # src/renderer/components/entity-icon/index.ts # yarn.lock	2023-01-24 15:12:32 -05:00
Jari Kolehmainen	2657df2293	Restructure to monorepo (#6907) ... * wip: restructure to monorepo Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com> * refactor create-release-pr to a package Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com> * build fixes Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com> * github workflow fixes Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com> * fix typo Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com> * add webpack-env types to core Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com> * fix github workflows Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com> * refactor/fix integration tests Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com> * lint fix Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com> * yarn run dev Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com> * eslint settings for vscode Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com> * move templates to right package Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com> * open-lens build fixes Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com> * integration test fix Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com> * fix nx task dependencies Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com> * use bash shell for unit tests in test workflow Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com> * fix test:unit for windows Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com> * fix win-ca webpack error in open-lens Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com> * fix win-ca webpack error in open-lens Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com> * fix build:app on windows Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com> * remove ELECTRON_BUILDER_EXTRA_ARGS Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com> * sync src/ from master Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com> * remove Makefile from core Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com> Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>	2023-01-24 10:46:26 -08:00