Skip to content

Commit a1ced8e

Browse files
committed
Merge branch 'main' into temp/16511
2 parents d527963 + 6e21fce commit a1ced8e

File tree

3,198 files changed

+43475
-28310
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,198 files changed

+43475
-28310
lines changed

.github/RELEASE_INSTRUCTION.md

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# Bellissima release instructions
2+
3+
4+
## Build
5+
6+
> _See internal documentation on the build/release workflow._
7+
8+
9+
## GitHub Release Notes
10+
11+
To generate release notes on GitHub.
12+
13+
- Go to the [**Releases** area](https://github.com/umbraco/Umbraco.CMS.Backoffice/releases)
14+
- Press the [**"Draft a new release"** button](https://github.com/umbraco/Umbraco.CMS.Backoffice/releases/new)
15+
- In the combobox for "Choose a tag", expand then select or enter the next version number, e.g. `v14.2.0`
16+
- If the tag does not already exist, an option labelled "Create new tag: v14.2.0 on publish" will appear, select that option
17+
- In the combobox for "Target: main", expand then select the release branch for the next version, e.g. `release/14.2`
18+
- In the combobox for "Previous tag: auto":
19+
- If the next release is an RC, then you can leave as `auto`
20+
- Otherwise, select the previous stable version, e.g. `v14.1.1`
21+
- Press the **"Generate release notes"** button, this will populate the main textarea
22+
- Check the details, view in the "Preview" tab
23+
- What type of release is this?
24+
- If it's an RC, then check "Set as a pre-release"
25+
- If it's stable, then check "Set as the latest release"
26+
- Once you're happy with the contents and ready to save...
27+
- If you need more time to review, press the **"Save draft"** button and you can come back to it later
28+
- If you are ready to make the release notes public, then press **"Publish release"** button! :tada:
29+
30+
> If you're curious about how the content is generated, take a look at the `release.yml` configuration:
31+
> https://github.com/umbraco/Umbraco.CMS.Backoffice/blob/main/.github/release.yml

.github/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ changelog:
99
categories:
1010
- title: 🙌 Notable Changes
1111
labels:
12-
- notable
12+
- category/notable
1313
- title: 💥 Breaking Changes
1414
labels:
1515
- category/breaking

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@ on:
55
branches:
66
- main
77
- release/*
8+
- v*/dev
89
pull_request:
910
types: [opened, synchronize, reopened, closed]
1011
branches:
1112
- main
1213
- release/*
14+
- v*/dev
1315
workflow_dispatch:
1416
inputs:
1517
issue_number:

.github/workflows/build_test.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,12 @@ on:
88
branches:
99
- main
1010
- release/*
11+
- v*/dev
1112
pull_request:
1213
branches:
1314
- main
1415
- release/*
16+
- v*/dev
1517

1618
# Allows GitHub to use this workflow to validate the merge queue
1719
merge_group:

.github/workflows/codeql.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,12 @@ on:
1616
branches:
1717
- main
1818
- release/*
19+
- v*/dev
1920
pull_request:
2021
branches:
2122
- main
2223
- release/*
24+
- v*/dev
2325
schedule:
2426
- cron: '33 2 * * 1'
2527

.madgerc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"tsConfig": "tsconfig.json",
3+
"detectiveOptions": {
4+
"ts": {
5+
"skipTypeImports": true,
6+
"skipAsyncImports": true
7+
}
8+
}
9+
}

.sonarlint/connectedMode.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"sonarCloudOrganization": "umbraco",
3+
"projectKey": "umbraco_Umbraco.CMS.Backoffice"
4+
}

.vscode/settings.json

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
"combobox",
77
"ctrls",
88
"devs",
9+
"Dropcursor",
910
"Elementable",
11+
"Gapcursor",
1012
"iframes",
1113
"invariantable",
1214
"lucide",
@@ -19,13 +21,20 @@
1921
"svgs",
2022
"templating",
2123
"tinymce",
24+
"tiptap",
2225
"umbraco",
2326
"Uncategorized",
2427
"uninitialize",
28+
"unprovide",
29+
"unpublishing",
2530
"variantable"
2631
],
2732
"exportall.config.folderListener": [],
2833
"exportall.config.relExclusion": [],
2934
"conventionalCommits.scopes": ["partial views"],
30-
"typescript.tsdk": "node_modules/typescript/lib"
35+
"typescript.tsdk": "node_modules/typescript/lib",
36+
"sonarlint.connectedMode.project": {
37+
"connectionId": "umbraco",
38+
"projectKey": "umbraco_Umbraco.CMS.Backoffice"
39+
}
3140
}

devops/icons/index.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -124,16 +124,14 @@ const collectDiskIcons = async (icons) => {
124124
iconPaths.forEach((path) => {
125125
const rawData = readFileSync(path);
126126
const svg = rawData.toString();
127-
const pattern = /\/([^/]+)\.svg$/;
127+
const parsed = pathModule.parse(path);
128128

129-
const match = path.match(pattern);
130-
131-
if (!match) {
132-
console.log('No match found.');
129+
if (!parsed) {
130+
console.log('No match found for: ', path);
133131
return;
134132
}
135133

136-
const SVGFileName = match[1];
134+
const SVGFileName = parsed.name;
137135
const iconFileName = SVGFileName.replace('.svg', '');
138136
const iconName = iconFileName;
139137

devops/json-schema-generator/index.js

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
import { writeFileSync } from 'fs';
2+
import { createImportMap } from '../importmap/index.js';
3+
4+
const tsPath = './src/json-schema/all-packages.ts';
5+
6+
const importmap = createImportMap({
7+
rootDir: './src',
8+
replaceModuleExtensions: true,
9+
});
10+
11+
const paths = Object.keys(importmap.imports);
12+
13+
const content = `
14+
${
15+
paths.map(path => `import '${path}';`).join('\n')
16+
}
17+
`;
18+
19+
//const config = await resolveConfig('./.prettierrc.json');
20+
//const formattedContent = await format(content, { ...config, parser: 'json' });
21+
22+
writeFileSync(tsPath, content);

0 commit comments

Comments
 (0)