Merge branch 'main' into feature/structure-manager-expose-content-typ…

…e-aliases

.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",

.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

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',
+);

index.html

@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en-us" dir="ltr">
 	<head>
 		<base href="/" />
@@ -7,6 +7,7 @@
 		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
 		<title>Umbraco</title>
 		<script src="node_modules/msw/lib/iife/index.js"></script>
+		<link rel="stylesheet" href="src/css/user-defined.css" />
 		<link rel="stylesheet" href="node_modules/@umbraco-ui/uui-css/dist/uui-css.css" />
 		<link rel="stylesheet" href="src/css/umb-css.css" />
 		<script type="module" src="index.ts"></script>