Merge branch 'main' into fix/ps/no-languages-message

Author: nul800sebastiaan

.eslintrc.json

@@ -39,7 +39,7 @@
 				"import/no-unresolved": "off",
 				"import/order": "warn",
 				"import/no-self-import": "error",
-				"import/no-cycle": ["error", { "maxDepth": 2, "allowUnsafeDynamicCyclicDependency": true }],
+				"import/no-cycle": ["error", { "maxDepth": 6, "allowUnsafeDynamicCyclicDependency": true }],
 				"local-rules/bad-type-import": "error",
 				"local-rules/enforce-element-suffix-on-element-class-name": "error",
 				"local-rules/enforce-umb-prefix-on-element-name": "error",
@@ -48,10 +48,11 @@
 				"local-rules/prefer-import-aliases": "error",
 				"local-rules/prefer-static-styles-last": "warn",
 				"local-rules/umb-class-prefix": "error",
+				"local-rules/no-relative-import-to-import-map-module": "error",
 				"local-rules/enforce-umbraco-external-imports": [
 					"error",
 					{
-						"exceptions": ["@umbraco-cms", "@open-wc/testing", "@storybook", "msw", "."]
+						"exceptions": ["@umbraco-cms", "@open-wc/testing", "@storybook", "msw", ".", "vite"]
 					}
 				],
 				"local-rules/exported-string-constant-naming": [

.github/workflows/azure-static-web-apps-ambitious-stone-0033b3603.yml

@@ -4,10 +4,12 @@ on:
   push:
     branches:
       - main
+      - release/*
   pull_request:
     types: [opened, synchronize, reopened, closed]
     branches:
       - main
+      - release/*
   workflow_dispatch:
     inputs:
       issue_number:

.github/workflows/build_test.yml

@@ -5,9 +5,13 @@ name: Build and test
 
 on:
   push:
-    branches: [main]
+    branches:
+      - main
+      - release/*
   pull_request:
-    branches: [main]
+    branches:
+      - main
+      - release/*
 
   # Allows GitHub to use this workflow to validate the merge queue
   merge_group:

.github/workflows/codeql.yml

@@ -9,14 +9,17 @@
 # the `language` matrix defined below to confirm you have the correct set of
 # supported CodeQL languages.
 #
-name: "CodeQL"
+name: 'CodeQL'
 
 on:
   push:
-    branches: [ "main" ]
+    branches:
+      - main
+      - release/*
   pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ "main" ]
+    branches:
+      - main
+      - release/*
   schedule:
     - cron: '33 2 * * 1'
 
@@ -32,25 +35,25 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: [ 'javascript' ]
+        language: ['javascript']
         # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
         # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
 
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v4
+      - name: Checkout repository
+        uses: actions/checkout@v4
 
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
-      with:
-        languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        
-        # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
-        # queries: security-extended,security-and-quality
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v3
+        with:
+          languages: ${{ matrix.language }}
+          # If you wish to specify custom queries, you can do so here or in a config file.
+          # By default, queries listed here will override any specified in a config file.
+          # Prefix the list here with "+" to use these queries and those in the config file.
 
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+          # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+          # queries: security-extended,security-and-quality
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v3

.github/workflows/devskim.yml

@@ -7,7 +7,9 @@ name: DevSkim
 
 on:
   push:
-    branches: [ "main" ]
+    branches:
+      - main
+      - release/*
   schedule:
     - cron: '19 14 * * 5'
 
@@ -28,7 +30,7 @@ jobs:
         with:
           directory-to-scan: src
           should-scan-archives: false
-          ignore-globs: "**/.git/**,*.md,*.mdx,*.stories.ts,*.js"
+          ignore-globs: '**/.git/**,*.md,*.mdx,*.stories.ts,*.js'
 
       - name: Upload DevSkim scan results to GitHub Security tab
         uses: github/codeql-action/upload-sarif@v3

devops/eslint/rules/no-relative-import-to-import-map-module.cjs

@@ -0,0 +1,56 @@
+const fs = require('fs');
+const path = require('path');
+
+const getDirectories = (source) =>
+	fs
+		.readdirSync(source, { withFileTypes: true })
+		.filter((dirent) => dirent.isDirectory())
+		.map((dirent) => dirent.name);
+
+// TODO: get the correct list of modules. This is a temporary solution where we assume that a directory is equivalent to a module
+// TODO: include package modules in this list
+const coreRoot = path.join(__dirname, '../../../', 'src/packages/core');
+const externalRoot = path.join(__dirname, '../../../', 'src/external');
+const libsRoot = path.join(__dirname, '../../../', 'src/libs');
+const coreModules = getDirectories(coreRoot).map((dir) => `/core/${dir}/`);
+const externalModules = getDirectories(externalRoot).map((dir) => `/${dir}/`);
+const libsModules = getDirectories(libsRoot).map((dir) => `/${dir}/`);
+
+const modulePathIdentifiers = [...coreModules, ...externalModules, ...libsModules];
+
+/** @type {import('eslint').Rule.RuleModule} */
+module.exports = {
+	meta: {
+		type: 'problem',
+		docs: {
+			description: 'Prevent relative import to a module that is in the import map.',
+			category: 'Best Practices',
+			recommended: true,
+		},
+		schema: [],
+		messages: {
+			unexpectedValue: 'Relative import paths should include "{{value}}".',
+		},
+	},
+	create: function (context) {
+		return {
+			ImportDeclaration(node) {
+				// exclude test  and story files
+				if (context.filename.endsWith('.test.ts') || context.filename.endsWith('.stories.ts')) {
+					return {};
+				}
+
+				const importPath = node.source.value;
+
+				if (importPath.startsWith('./') || importPath.startsWith('../')) {
+					if (modulePathIdentifiers.some((moduleName) => importPath.includes(moduleName))) {
+						context.report({
+							node,
+							message: 'Use the correct import map alias instead of a relative import path: ' + importPath,
+						});
+					}
+				}
+			},
+		};
+	},
+};

devops/localization/unused-language-keys.js

@@ -26,7 +26,7 @@ const mainMap = buildMap(mainKeys);
 const keys = Array.from(mainMap.keys());
 const usedKeys = new Set();
 
-const elementAndControllerFiles = await glob(`${__dirname}/../../src/**/*.ts`);
+const elementAndControllerFiles = await glob(`${__dirname}/../../src/**/*.ts`, { filesOnly: true });
 
 console.log(`Checking ${elementAndControllerFiles.length} files for unused keys`);
 

eslint-local-rules.cjs

@@ -10,6 +10,7 @@ const noDirectApiImportRule = require('./devops/eslint/rules/no-direct-api-impor
 const preferImportAliasesRule = require('./devops/eslint/rules/prefer-import-aliases.cjs');
 const preferStaticStylesLastRule = require('./devops/eslint/rules/prefer-static-styles-last.cjs');
 const umbClassPrefixRule = require('./devops/eslint/rules/umb-class-prefix.cjs');
+const noRelativeImportToImportMapModule = require('./devops/eslint/rules/no-relative-import-to-import-map-module.cjs');
 
 module.exports = {
 	'bad-type-import': badTypeImportRule,
@@ -22,4 +23,5 @@ module.exports = {
 	'prefer-import-aliases': preferImportAliasesRule,
 	'prefer-static-styles-last': preferStaticStylesLastRule,
 	'umb-class-prefix': umbClassPrefixRule,
+	'no-relative-import-to-import-map-module': noRelativeImportToImportMapModule,
 };

examples/workspace-context-counter/counter-workspace-context.ts

@@ -24,4 +24,7 @@ export class WorkspaceContextCounter extends UmbControllerBase {
 export const api = WorkspaceContextCounter;
 
 // Declare a Context Token that other elements can use to request the WorkspaceContextCounter:
-export const EXAMPLE_COUNTER_CONTEXT = new UmbContextToken<WorkspaceContextCounter>('example.workspaceContext.counter');
+export const EXAMPLE_COUNTER_CONTEXT = new UmbContextToken<WorkspaceContextCounter>(
+	'UmbWorkspaceContext',
+	'example.workspaceContext.counter',
+);