Merge branch 'main' into feature/multiple-text-string-property-editor

src/Umbraco.Web.UI.Client/.eslintrc.json

@@ -35,6 +35,7 @@
 				"import/order": "warn",
 				"local-rules/bad-type-import": "error",
 				"local-rules/no-direct-api-import": "warn",
+				"local-rules/prefer-import-aliases": "warn",
 				"@typescript-eslint/no-non-null-assertion": "off"
 			},
 			"settings": {

src/Umbraco.Web.UI.Client/.gitignore

@@ -12,6 +12,7 @@ dist
 dist-ssr
 types
 *.local
+*.tgz
 
 ## testing
 /coverage/

src/Umbraco.Web.UI.Client/.storybook/main.js

@@ -2,7 +2,7 @@ const tsconfigPaths = require('vite-tsconfig-paths').default;
 const { mergeConfig } = require('vite');
 
 module.exports = {
-	stories: ['../src/**/*.stories.mdx', '../src/**/*.stories.@(js|jsx|ts|tsx)'],
+	stories: ['../@(src|libs)/**/*.stories.@(js|jsx|ts|tsx|mdx)'],
 	addons: ['@storybook/addon-links', '@storybook/addon-essentials', '@storybook/addon-a11y'],
 	framework: '@storybook/web-components',
 	features: {

src/Umbraco.Web.UI.Client/.storybook/preview.js

@@ -11,10 +11,11 @@ import { html } from 'lit-html';
 import { initialize, mswDecorator } from 'msw-storybook-addon';
 import { setCustomElements } from '@storybook/web-components';
 
+import { UMB_DATA_TYPE_DETAIL_STORE_CONTEXT_TOKEN, UmbDataTypeDetailStore } from '../src/backoffice/settings/data-types/data-type.detail.store';
+import { UMB_DOCUMENT_TYPE_DETAIL_STORE_CONTEXT_TOKEN, UmbDocumentTypeDetailStore } from '../src/backoffice/documents/document-types/document-type.detail.store';
+
 import customElementManifests from '../custom-elements.json';
-import { STORE_ALIAS as dataTypeAlias, UmbDataTypeStore } from '../src/backoffice/settings/data-types/data-type.store';
-import { UmbDocumentTypeStore } from '../src/backoffice/documents/document-types/document-type.store';
-import { UmbIconStore } from '../src/core/stores/icon/icon.store';
+import { UmbIconStore } from '../libs/store/icon/icon.store';
 import { onUnhandledRequest } from '../src/core/mocks/browser';
 import { handlers } from '../src/core/mocks/browser-handlers';
 import { LitElement } from 'lit';
@@ -22,9 +23,10 @@ import { UmbModalService } from '../src/core/modal';
 
 // TODO: Fix storybook manifest registrations.
 
-import { umbExtensionsRegistry } from '../src/core/extensions-registry';
+import { umbExtensionsRegistry } from '../libs/extensions-registry';
 
-import '../src/core/context-api/provide/context-provider.element';
+import '../src/backoffice/shared/components/backoffice-frame/backoffice-notification-container.element';
+import '../libs/element/context-provider.element';
 import '../src/backoffice/shared/components/backoffice-frame/backoffice-modal-container.element';
 import '../src/backoffice/shared/components/code-block/code-block.element';
 
@@ -53,11 +55,11 @@ customElements.define('umb-storybook', UmbStoryBookElement);
 const storybookProvider = (story) => html` <umb-storybook>${story()}</umb-storybook> `;
 
 const dataTypeStoreProvider = (story) => html`
-	<umb-context-provider key=${dataTypeAlias} .value=${new UmbDataTypeStore()}>${story()}</umb-context-provider>
+	<umb-context-provider key=${UMB_DATA_TYPE_DETAIL_STORE_CONTEXT_TOKEN.toString()} .value=${new UmbDataTypeDetailStore()}>${story()}</umb-context-provider>
 `;
 
 const documentTypeStoreProvider = (story) => html`
-	<umb-context-provider key="umbDocumentTypeStore" .value=${new UmbDocumentTypeStore()}
+	<umb-context-provider key=${UMB_DOCUMENT_TYPE_DETAIL_STORE_CONTEXT_TOKEN.toString()} .value=${new UmbDocumentTypeDetailStore()}
 		>${story()}</umb-context-provider
 	>
 `;

src/Umbraco.Web.UI.Client/.vscode/launch.json

@@ -5,7 +5,7 @@
 	"version": "0.2.0",
 	"configurations": [
 		{
-			"command": "npx eslint",
+			"command": "npx eslint src",
 			"name": "Debug eslint",
 			"request": "launch",
 			"type": "node-terminal"

src/Umbraco.Web.UI.Client/eslint-local-rules.cjs

@@ -64,5 +64,30 @@ module.exports = {
 			};
 
 		},
-	}
+	},
+
+	/** @type {import('eslint').Rule.RuleModule} */
+	'prefer-import-aliases': {
+		meta: {
+			type: 'suggestion',
+			docs: {
+				description: 'Ensures that the application does not rely on file system paths for imports. Instead, use import aliases or relative imports. This also solves a problem where GitHub fails on the test runner step.',
+				category: 'Best Practices',
+				recommended: true
+			},
+			schema: [],
+		},
+		create: function (context) {
+			return {
+				ImportDeclaration: function (node) {
+					if (node.source.value.startsWith('src/')) {
+						context.report({
+							node,
+							message: 'Prefer using import aliases or relative imports instead of absolute imports. Example: `import { MyComponent } from "src/components/MyComponent";` should be `import { MyComponent } from "@components/MyComponent";`'
+						});
+					}
+				},
+			};
+		}
+	},
 };

src/Umbraco.Web.UI.Client/libs/backend-api/index.ts

@@ -0,0 +1 @@
+export * from './src';

src/Umbraco.Web.UI.Client/libs/backend-api/rollup.config.js

@@ -0,0 +1,4 @@
+import config from '../../utils/rollup.config.js';
+export default {
+	...config,
+};