Skip to content

Commit f5c91e7

Browse files
authored
Package verify check (#1622)
2 parents 507d75d + 2d445f6 commit f5c91e7

File tree

10 files changed

+30
-10
lines changed

10 files changed

+30
-10
lines changed

.github/workflows/BuildJobs.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ jobs:
5959
run: pnpm install
6060
- name: Lint code
6161
run: pnpm run lint ${{ env.since_flag }}
62+
- name: Verify package format
63+
run: pnpm run verify ${{ env.since_flag }}
6264
- name: Run unit tests
6365
run: pnpm run test ${{ env.since_flag }}
6466

automation/utils/bin/rui-verify-package-format.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import {
1010
} from "../src";
1111
import { verify as verifyWidget } from "../src/verify-widget-manifest";
1212
import { fgCyan, fgGreen, fgYellow } from "../src/ansi-colors";
13+
import { getModuleChangelog, getWidgetChangelog } from "../src";
1314

1415
async function main(): Promise<void> {
1516
const path = process.cwd();
@@ -44,6 +45,17 @@ async function main(): Promise<void> {
4445
}
4546
}
4647

48+
switch (info.mxpackage.changelogType ?? info.mxpackage.type) {
49+
case "widget": {
50+
getWidgetChangelog(path);
51+
break;
52+
}
53+
case "module": {
54+
getModuleChangelog(path, info.mxpackage.name);
55+
break;
56+
}
57+
}
58+
4759
if (!info.private) {
4860
// .private is not true - assume package is published at marketplace
4961
PublishedPackageSchema.parse(target);

automation/utils/src/changelog-parser/parser/module/module.pegjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ OtherNotes
2121

2222
// Module
2323
WidgetSection
24-
= _ "###" _ type:(SectionType) _ logs:LogLine* { return { type, logs } }
24+
= _ "###" _ type:(SectionType) _ logs:LogLine+ { return { type, logs } }
2525

2626

2727
// Subwidgets

automation/utils/src/changelog-parser/parser/widget/widget.pegjs

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,13 @@
33
//
44

55
ChangelogFile
6-
= header:ChangelogHead _ content:(VersionEntry/OtherNotes)+ _ { return { header, content } }
6+
= header:ChangelogHead _ content:(UnreleasedVersionEntry/ReleasedVersionEntry/OtherNotes)+ _ { return { header, content } }
77

8-
VersionEntry
9-
= header:(VersionHeader/UnreleasedVersionHeader) _ sections:WidgetSection* _ { return { ...header, sections } }
8+
UnreleasedVersionEntry
9+
= header:(UnreleasedVersionHeader) _ sections:WidgetSection* _ { return { ...header, sections } }
10+
11+
ReleasedVersionEntry
12+
= header:(VersionHeader/UnreleasedVersionHeader) _ sections:WidgetSection+ _ { return { ...header, sections } }
1013

1114
VersionHeader
1215
= "##" _ "[" version:SemVer "]" _ "-" _ date:Date { return { type: "normal", version, date }}
@@ -15,11 +18,11 @@ UnreleasedVersionHeader
1518
= "##" _ "[Unreleased]" _ { return { type: "unreleased" }}
1619

1720
OtherNotes
18-
= "##" _ title:OneLineSentence _ txt:OneLineSentence _ { return { type: "note", title, text: txt }}
21+
= "##" _ title:"Older releases" _ txt:OneLineSentence+ _ { return { type: "note", title, text: txt }}
1922

20-
// Logs section #### Changed and its entries
23+
// Logs section ### Changed, Added, etc and its entries
2124
WidgetSection
22-
= _ "###" _ type:(SectionType) _ logs:LogLine* { return { type, logs } }
25+
= _ "###" _ type:(SectionType) _ logs:LogLine+ { return { type, logs } }
2326

2427
LogLine
2528
= _ "-" _ log:OneLineSentence _ { return log }

automation/utils/src/package-info.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ export const MxPackageTypeSchema = z.enum([MODULE, WIDGET, JSACTIONS]);
5353
export const MxPackageSchema = z.object({
5454
name: MxPackageNameSchema,
5555
type: MxPackageTypeSchema,
56+
changelogType: z.enum([MODULE, WIDGET]).optional(),
5657
mpkName: z.string().endsWith(".mpk"),
5758
dependencies: z.string().array().optional().default([])
5859
});

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"prepare": "husky install",
1111
"lint": "turbo run lint --continue --concurrency 1",
1212
"test": "turbo run test --continue --concurrency 1",
13+
"verify": "turbo run verify --continue --concurrency 1",
1314
"build": "turbo run build",
1415
"release": "turbo run release",
1516
"create-gh-release": "turbo run create-gh-release --concurrency 1",

packages/pluggableWidgets/charts-web/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -532,6 +532,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
532532

533533
- Update `fast-json-patch` dependency.
534534

535-
## Previous versions
535+
## Older releases
536536

537537
See [marketplace](https://marketplace.mendix.com/link/component/105695) notes.

packages/pluggableWidgets/charts-web/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"mxpackage": {
1313
"name": "Charts",
1414
"type": "widget",
15+
"changelogType": "module",
1516
"mpkName": "Charts.mpk",
1617
"dependencies": [
1718
"@mendix/area-chart-web",

packages/pluggableWidgets/combobox-web/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
154154

155155
- We added lazy loading feature. By default it is turned off. When turned on, the items will be loaded in batches when scrolling.
156156

157-
## # Breaking
157+
### Breaking changes
158158

159159
- The Combo box now uses Atlas variables for its styling. This may change how the widget looks depending on the custom variables.
160160

packages/pluggableWidgets/maps-web/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
104104

105105
## [2.0.3] - 2021-08-04
106106

107-
## Changed
107+
### Changed
108108

109109
- We renamed Markers and Marker list properties to Static and Dynamic markers.
110110

0 commit comments

Comments
 (0)