@nordicsemiconductor/pc-nrfconnect-shared 219.0.0 → 220.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Changelog.md +11 -0
- package/README.md +28 -0
- package/config/tsconfig.json +0 -2
- package/dist/bootstrap.css +1 -1
- package/package.json +11 -12
- package/release_notes.md +8 -0
- package/scripts/check-app-properties.ts +4 -10
- package/scripts/check-for-typescript.ts +1 -1
- package/scripts/create-source.ts +1 -1
- package/scripts/esbuild.ts +1 -1
- package/scripts/get-release-numbers.ts +25 -0
- package/scripts/installHusky.ts +1 -1
- package/scripts/is-releasable.ts +68 -0
- package/scripts/latest-changelog-entry.test.ts +80 -0
- package/scripts/latest-changelog-entry.ts +25 -0
- package/scripts/nordic-publish.js +20 -19
- package/scripts/nordic-publish.ts +1 -1
- package/scripts/nrfconnect-license.ts +1 -1
- package/scripts/postinstall.ts +1 -1
- package/scripts/prepare-shared-release.ts +10 -8
- package/src/Group/Group.tsx +28 -2
- package/src/index.ts +2 -0
- package/src/utils/persistentStore.ts +17 -0
- package/typings/generated/scripts/check-app-properties.d.ts +1 -1
- package/typings/generated/scripts/check-app-properties.d.ts.map +1 -1
- package/typings/generated/scripts/check-for-typescript.d.ts +1 -1
- package/typings/generated/scripts/create-source.d.ts +1 -1
- package/typings/generated/scripts/esbuild.d.ts +1 -1
- package/typings/generated/scripts/get-release-numbers.d.ts +6 -0
- package/typings/generated/scripts/get-release-numbers.d.ts.map +1 -0
- package/typings/generated/scripts/installHusky.d.ts +1 -1
- package/typings/generated/scripts/is-releasable.d.ts +3 -0
- package/typings/generated/scripts/is-releasable.d.ts.map +1 -0
- package/typings/generated/scripts/latest-changelog-entry.d.ts +6 -0
- package/typings/generated/scripts/latest-changelog-entry.d.ts.map +1 -0
- package/typings/generated/scripts/latest-changelog-entry.test.d.ts +2 -0
- package/typings/generated/scripts/latest-changelog-entry.test.d.ts.map +1 -0
- package/typings/generated/scripts/nordic-publish.d.ts +1 -1
- package/typings/generated/scripts/nrfconnect-license.d.ts +1 -1
- package/typings/generated/scripts/postinstall.d.ts +1 -1
- package/typings/generated/scripts/prepare-shared-release.d.ts +1 -1
- package/typings/generated/src/Group/Group.d.ts +3 -1
- package/typings/generated/src/Group/Group.d.ts.map +1 -1
- package/typings/generated/src/index.d.ts +1 -1
- package/typings/generated/src/index.d.ts.map +1 -1
- package/typings/generated/src/utils/persistentStore.d.ts +3 -0
- package/typings/generated/src/utils/persistentStore.d.ts.map +1 -1
- package/scripts/release-shared.test.ts +0 -132
- package/scripts/release-shared.ts +0 -213
- package/typings/generated/scripts/release-shared.d.ts +0 -30
- package/typings/generated/scripts/release-shared.d.ts.map +0 -1
- package/typings/generated/scripts/release-shared.test.d.ts +0 -2
- package/typings/generated/scripts/release-shared.test.d.ts.map +0 -1
package/scripts/postinstall.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
#!/usr/bin/env
|
|
1
|
+
#!/usr/bin/env -S npx tsx
|
|
2
2
|
|
|
3
3
|
/*
|
|
4
4
|
* Copyright (c) 2023 Nordic Semiconductor ASA
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
import { spawnSync } from 'node:child_process';
|
|
21
21
|
import { readFileSync, writeFileSync } from 'node:fs';
|
|
22
22
|
|
|
23
|
-
import
|
|
23
|
+
import getReleaseNumbers from './get-release-numbers';
|
|
24
24
|
|
|
25
25
|
const parseJson = <Result>(jsonString: string) =>
|
|
26
26
|
JSON.parse(jsonString) as Result;
|
|
@@ -101,19 +101,21 @@ const updateChangelog = (nextReleaseNumber: string) => {
|
|
|
101
101
|
};
|
|
102
102
|
|
|
103
103
|
const main = () => {
|
|
104
|
-
const
|
|
104
|
+
const releaseNumbers = getReleaseNumbers();
|
|
105
105
|
|
|
106
|
-
|
|
106
|
+
console.log(
|
|
107
|
+
`The currently released version is ${releaseNumbers.latest}, so the next one will be ${releaseNumbers.next}.\n`
|
|
108
|
+
);
|
|
109
|
+
|
|
110
|
+
const updatedPackageJson = updatePackageJson(releaseNumbers.next);
|
|
107
111
|
const { updated: updatedChangelog, error } = updateChangelog(
|
|
108
|
-
`${
|
|
112
|
+
`${releaseNumbers.next}.0.0`
|
|
109
113
|
);
|
|
110
114
|
|
|
111
115
|
if (!updatedPackageJson && !updatedChangelog) {
|
|
112
116
|
console.log('\nEverything already up-to-date.');
|
|
113
117
|
} else if (!error) {
|
|
114
|
-
console.log(
|
|
115
|
-
'\nUpdated everything needed. You still need to bring these changes into main.'
|
|
116
|
-
);
|
|
118
|
+
console.log('\nUpdated everything needed.');
|
|
117
119
|
}
|
|
118
120
|
};
|
|
119
121
|
|
package/src/Group/Group.tsx
CHANGED
|
@@ -7,6 +7,10 @@
|
|
|
7
7
|
import React, { useRef, useState } from 'react';
|
|
8
8
|
|
|
9
9
|
import classNames from '../utils/classNames';
|
|
10
|
+
import {
|
|
11
|
+
getPersistedGroupCollapseState,
|
|
12
|
+
persistGroupCollapseState,
|
|
13
|
+
} from '../utils/persistentStore';
|
|
10
14
|
|
|
11
15
|
const collapseSection = (element: HTMLDivElement) => {
|
|
12
16
|
const sectionHeight = element.scrollHeight;
|
|
@@ -81,6 +85,7 @@ export const Group = ({
|
|
|
81
85
|
collapsible = false,
|
|
82
86
|
defaultCollapsed = !!collapsible,
|
|
83
87
|
onToggled,
|
|
88
|
+
collapseStatePersistanceId,
|
|
84
89
|
}: {
|
|
85
90
|
className?: string;
|
|
86
91
|
heading: React.ReactNode;
|
|
@@ -91,8 +96,22 @@ export const Group = ({
|
|
|
91
96
|
collapsible?: boolean;
|
|
92
97
|
defaultCollapsed?: boolean;
|
|
93
98
|
onToggled?: (isNowExpanded: boolean) => void;
|
|
99
|
+
/** Unique identifier for persisting the group's collapse state across sessions. When provided, enables state persistence. */
|
|
100
|
+
collapseStatePersistanceId?: string;
|
|
94
101
|
}) => {
|
|
95
|
-
const
|
|
102
|
+
const getInitialCollapseState = () => {
|
|
103
|
+
if (collapseStatePersistanceId) {
|
|
104
|
+
const persistedState = getPersistedGroupCollapseState(
|
|
105
|
+
collapseStatePersistanceId
|
|
106
|
+
);
|
|
107
|
+
if (persistedState !== undefined) {
|
|
108
|
+
return persistedState;
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
return defaultCollapsed;
|
|
112
|
+
};
|
|
113
|
+
|
|
114
|
+
const [collapsed, setCollapsed] = useState(getInitialCollapseState);
|
|
96
115
|
const collapsibleDivRef = useRef<HTMLDivElement | null>(null);
|
|
97
116
|
const initStateSet = useRef(false);
|
|
98
117
|
|
|
@@ -126,6 +145,13 @@ export const Group = ({
|
|
|
126
145
|
|
|
127
146
|
onToggled?.(collapsed);
|
|
128
147
|
setCollapsed(!collapsed);
|
|
148
|
+
|
|
149
|
+
if (collapseStatePersistanceId) {
|
|
150
|
+
persistGroupCollapseState(
|
|
151
|
+
collapseStatePersistanceId,
|
|
152
|
+
!collapsed
|
|
153
|
+
);
|
|
154
|
+
}
|
|
129
155
|
}}
|
|
130
156
|
>
|
|
131
157
|
<p
|
|
@@ -146,7 +172,7 @@ export const Group = ({
|
|
|
146
172
|
<div
|
|
147
173
|
ref={ref => {
|
|
148
174
|
if (!initStateSet.current && ref) {
|
|
149
|
-
if (
|
|
175
|
+
if (collapsed) {
|
|
150
176
|
collapseSection(ref);
|
|
151
177
|
} else {
|
|
152
178
|
expandSection(ref);
|
package/src/index.ts
CHANGED
|
@@ -104,6 +104,8 @@ export {
|
|
|
104
104
|
getPersistedNickname,
|
|
105
105
|
getPersistedApiKey,
|
|
106
106
|
persistApiKey,
|
|
107
|
+
persistGroupCollapseState,
|
|
108
|
+
getPersistedGroupCollapseState,
|
|
107
109
|
} from './utils/persistentStore';
|
|
108
110
|
|
|
109
111
|
export { default as launcherConfig } from './utils/launcherConfig';
|
|
@@ -141,6 +141,7 @@ interface SharedAppSpecificStoreSchema {
|
|
|
141
141
|
isLogVisible?: boolean;
|
|
142
142
|
isLoggingVerbose?: boolean;
|
|
143
143
|
currentPaneName?: string;
|
|
144
|
+
groupCollapseStates?: Record<string, boolean>;
|
|
144
145
|
}
|
|
145
146
|
|
|
146
147
|
export const getAppSpecificStore = <
|
|
@@ -197,3 +198,19 @@ export const doNotResetVerboseLogginOnRestart = () =>
|
|
|
197
198
|
|
|
198
199
|
export const getPersistedLogVisible = () =>
|
|
199
200
|
getAppSpecificStore<SharedAppSpecificStoreSchema>().get(`isLogVisible`);
|
|
201
|
+
|
|
202
|
+
export const persistGroupCollapseState = (
|
|
203
|
+
groupId: string,
|
|
204
|
+
collapsed: boolean
|
|
205
|
+
) =>
|
|
206
|
+
getAppSpecificStore<SharedAppSpecificStoreSchema>().set(
|
|
207
|
+
`groupCollapseStates.${groupId}`,
|
|
208
|
+
collapsed
|
|
209
|
+
);
|
|
210
|
+
|
|
211
|
+
export const getPersistedGroupCollapseState = (
|
|
212
|
+
groupId: string
|
|
213
|
+
): boolean | undefined =>
|
|
214
|
+
getAppSpecificStore<SharedAppSpecificStoreSchema>().get(
|
|
215
|
+
`groupCollapseStates.${groupId}`
|
|
216
|
+
);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"check-app-properties.d.ts","sourceRoot":"","sources":["../../../scripts/check-app-properties.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"check-app-properties.d.ts","sourceRoot":"","sources":["../../../scripts/check-app-properties.ts"],"names":[],"mappings":";AA+KA,QAAA,MAAM,SAAS;mCAGoB,OAAO;UAMzC,CAAC;AAOF,eAAe,SAAS,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"get-release-numbers.d.ts","sourceRoot":"","sources":["../../../scripts/get-release-numbers.ts"],"names":[],"mappings":";;;;AAiBA,wBAOE"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"is-releasable.d.ts","sourceRoot":"","sources":["../../../scripts/is-releasable.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"latest-changelog-entry.d.ts","sourceRoot":"","sources":["../../../scripts/latest-changelog-entry.ts"],"names":[],"mappings":";AAYA,eAAO,MAAM,cAAc;;;CAO1B,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"latest-changelog-entry.test.d.ts","sourceRoot":"","sources":["../../../scripts/latest-changelog-entry.test.ts"],"names":[],"mappings":""}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
export declare const Group: ({ className, heading, title, children, gap, headingFullWidth, collapsible, defaultCollapsed, onToggled, }: {
|
|
2
|
+
export declare const Group: ({ className, heading, title, children, gap, headingFullWidth, collapsible, defaultCollapsed, onToggled, collapseStatePersistanceId, }: {
|
|
3
3
|
className?: string | undefined;
|
|
4
4
|
heading: React.ReactNode;
|
|
5
5
|
headingFullWidth?: boolean | undefined;
|
|
@@ -9,5 +9,7 @@ export declare const Group: ({ className, heading, title, children, gap, heading
|
|
|
9
9
|
collapsible?: boolean | undefined;
|
|
10
10
|
defaultCollapsed?: boolean | undefined;
|
|
11
11
|
onToggled?: ((isNowExpanded: boolean) => void) | undefined;
|
|
12
|
+
/** Unique identifier for persisting the group's collapse state across sessions. When provided, enables state persistence. */
|
|
13
|
+
collapseStatePersistanceId?: string | undefined;
|
|
12
14
|
}) => JSX.Element;
|
|
13
15
|
//# sourceMappingURL=Group.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Group.d.ts","sourceRoot":"","sources":["../../../../src/Group/Group.tsx"],"names":[],"mappings":"AAMA,OAAO,KAA2B,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"Group.d.ts","sourceRoot":"","sources":["../../../../src/Group/Group.tsx"],"names":[],"mappings":"AAMA,OAAO,KAA2B,MAAM,OAAO,CAAC;AAuEhD,eAAO,MAAM,KAAK;;aAaL,MAAM,SAAS;;;eAGb,MAAM,SAAS;;;;iCAIE,OAAO,KAAK,IAAI;IAC5C,6HAA6H;;iBA0GhI,CAAC"}
|
|
@@ -59,7 +59,7 @@ export { default as useHotKey } from './utils/useHotKey';
|
|
|
59
59
|
export { isDevelopment } from './utils/environment';
|
|
60
60
|
export { currentPane, setCurrentPane, setPaneHidden, setPaneDisabled, } from './App/appLayout';
|
|
61
61
|
export { isLoggingVerbose } from './Log/logSlice';
|
|
62
|
-
export { getAppSpecificStore as getPersistentStore, persistTerminalSettings, getPersistedTerminalSettings, persistNickname, getPersistedNickname, getPersistedApiKey, persistApiKey, } from './utils/persistentStore';
|
|
62
|
+
export { getAppSpecificStore as getPersistentStore, persistTerminalSettings, getPersistedTerminalSettings, persistNickname, getPersistedNickname, getPersistedApiKey, persistApiKey, persistGroupCollapseState, getPersistedGroupCollapseState, } from './utils/persistentStore';
|
|
63
63
|
export { default as launcherConfig } from './utils/launcherConfig';
|
|
64
64
|
export { jprogDeviceSetup } from './Device/jprogOperations';
|
|
65
65
|
export { sdfuDeviceSetup } from './Device/sdfuOperations';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,6 +32,7 @@ interface SharedAppSpecificStoreSchema {
|
|
|
32
32
|
isLogVisible?: boolean;
|
|
33
33
|
isLoggingVerbose?: boolean;
|
|
34
34
|
currentPaneName?: string;
|
|
35
|
+
groupCollapseStates?: Record<string, boolean>;
|
|
35
36
|
}
|
|
36
37
|
export declare const getAppSpecificStore: <StoreSchema extends Record<string, any>>(options?: Store.Options<any>) => Store<StoreSchema & SharedAppSpecificStoreSchema>;
|
|
37
38
|
export declare const persistCurrentPane: (currentPane: string) => void;
|
|
@@ -41,5 +42,7 @@ export declare const persistIsLoggingVerbose: (value: boolean) => void;
|
|
|
41
42
|
export declare const getIsLoggingVerbose: () => boolean;
|
|
42
43
|
export declare const doNotResetVerboseLogginOnRestart: () => void;
|
|
43
44
|
export declare const getPersistedLogVisible: () => boolean | undefined;
|
|
45
|
+
export declare const persistGroupCollapseState: (groupId: string, collapsed: boolean) => void;
|
|
46
|
+
export declare const getPersistedGroupCollapseState: (groupId: string) => boolean | undefined;
|
|
44
47
|
export {};
|
|
45
48
|
//# sourceMappingURL=persistentStore.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"persistentStore.d.ts","sourceRoot":"","sources":["../../../../src/utils/persistentStore.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,KAAK,MAAM,gBAAgB,CAAC;AACnC,OAAO,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAInD,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAIpD,MAAM,WAAW,cAAc;IAC3B,iBAAiB,EAAE,IAAI,CAAC,qBAAqB,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC,CAAC;IACxE,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,gBAAgB;IAC7B,QAAQ,EAAE,OAAO,CAAC;IAClB,WAAW,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,OAAO,CAAC;CACxB;AAWD,eAAO,MAAM,eAAe,iBAAkB,MAAM,YAAY,MAAM,SACjB,CAAC;AACtD,eAAO,MAAM,oBAAoB,iBAAkB,MAAM,WACA,CAAC;AAE1D,eAAO,MAAM,iBAAiB,iBAAkB,MAAM,SAAS,OAAO,SACrB,CAAC;AAClD,eAAO,MAAM,sBAAsB,iBAAkB,MAAM,YACC,CAAC;AAE7D,eAAO,MAAM,aAAa,YAAmB,MAAM,UAAU,MAAM,kBAQlE,CAAC;AACF,eAAO,MAAM,kBAAkB,YAAmB,MAAM,oBAcvD,CAAC;AAEF,eAAO,MAAM,yBAAyB,iBACpB,MAAM,sBACA,KAAK,cAAc,EAAE,aAAa,CAAC,SAKrD,CAAC;AACP,eAAO,MAAM,8BAA8B,iBACzB,MAAM,KACrB,cAAc,GAAG,SAMnB,CAAC;AACF,eAAO,MAAM,uBAAuB,WACxB,MAAM,aACH,MAAM,oBACC,gBAAgB,SAQrC,CAAC;AACF,eAAO,MAAM,4BAA4B,WAC7B,MAAM,aACH,MAAM,KAClB,gBAAgB,GAAG,SAUrB,CAAC;AAEF,eAAO,MAAM,+BAA+B,UAAW,OAAO,SACd,CAAC;AACjD,eAAO,MAAM,2BAA2B,2BACmC,CAAC;AAC5E,eAAO,MAAM,8BAA8B,YACC,CAAC;AAS7C,eAAO,MAAM,oBAAoB,cACwB,CAAC;AAM1D,UAAU,4BAA4B;IAClC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"persistentStore.d.ts","sourceRoot":"","sources":["../../../../src/utils/persistentStore.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,KAAK,MAAM,gBAAgB,CAAC;AACnC,OAAO,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAInD,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAIpD,MAAM,WAAW,cAAc;IAC3B,iBAAiB,EAAE,IAAI,CAAC,qBAAqB,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC,CAAC;IACxE,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,gBAAgB;IAC7B,QAAQ,EAAE,OAAO,CAAC;IAClB,WAAW,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,OAAO,CAAC;CACxB;AAWD,eAAO,MAAM,eAAe,iBAAkB,MAAM,YAAY,MAAM,SACjB,CAAC;AACtD,eAAO,MAAM,oBAAoB,iBAAkB,MAAM,WACA,CAAC;AAE1D,eAAO,MAAM,iBAAiB,iBAAkB,MAAM,SAAS,OAAO,SACrB,CAAC;AAClD,eAAO,MAAM,sBAAsB,iBAAkB,MAAM,YACC,CAAC;AAE7D,eAAO,MAAM,aAAa,YAAmB,MAAM,UAAU,MAAM,kBAQlE,CAAC;AACF,eAAO,MAAM,kBAAkB,YAAmB,MAAM,oBAcvD,CAAC;AAEF,eAAO,MAAM,yBAAyB,iBACpB,MAAM,sBACA,KAAK,cAAc,EAAE,aAAa,CAAC,SAKrD,CAAC;AACP,eAAO,MAAM,8BAA8B,iBACzB,MAAM,KACrB,cAAc,GAAG,SAMnB,CAAC;AACF,eAAO,MAAM,uBAAuB,WACxB,MAAM,aACH,MAAM,oBACC,gBAAgB,SAQrC,CAAC;AACF,eAAO,MAAM,4BAA4B,WAC7B,MAAM,aACH,MAAM,KAClB,gBAAgB,GAAG,SAUrB,CAAC;AAEF,eAAO,MAAM,+BAA+B,UAAW,OAAO,SACd,CAAC;AACjD,eAAO,MAAM,2BAA2B,2BACmC,CAAC;AAC5E,eAAO,MAAM,8BAA8B,YACC,CAAC;AAS7C,eAAO,MAAM,oBAAoB,cACwB,CAAC;AAM1D,UAAU,4BAA4B;IAClC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,mBAAmB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACjD;AAED,eAAO,MAAM,mBAAmB,sDAKlB,MAAM,OAAO,CAAC,GAAG,CAAC,sDAe/B,CAAC;AAEF,eAAO,MAAM,kBAAkB,gBAAiB,MAAM,SAIjD,CAAC;AACN,eAAO,MAAM,uBAAuB,0BAC0C,CAAC;AAE/E,eAAO,MAAM,iBAAiB,YAAa,OAAO,SAI7C,CAAC;AAEN,eAAO,MAAM,uBAAuB,UAAW,OAAO,SAIjD,CAAC;AACN,eAAO,MAAM,mBAAmB,eAI3B,CAAC;AAIN,eAAO,MAAM,gCAAgC,YAC8B,CAAC;AAE5E,eAAO,MAAM,sBAAsB,2BACwC,CAAC;AAE5E,eAAO,MAAM,yBAAyB,YACzB,MAAM,aACJ,OAAO,SAKjB,CAAC;AAEN,eAAO,MAAM,8BAA8B,YAC9B,MAAM,KAChB,OAAO,GAAG,SAGR,CAAC"}
|
|
@@ -1,132 +0,0 @@
|
|
|
1
|
-
/*
|
|
2
|
-
* Copyright (c) 2023 Nordic Semiconductor ASA
|
|
3
|
-
*
|
|
4
|
-
* SPDX-License-Identifier: LicenseRef-Nordic-4-Clause
|
|
5
|
-
*/
|
|
6
|
-
|
|
7
|
-
import {
|
|
8
|
-
changelogIsCorrect,
|
|
9
|
-
getLatestEntry,
|
|
10
|
-
getNextReleaseNumber,
|
|
11
|
-
latestEntryIsNotEmpty,
|
|
12
|
-
latestHeaderIsCorrect,
|
|
13
|
-
packageJsonIsCorrect,
|
|
14
|
-
} from './release-shared';
|
|
15
|
-
|
|
16
|
-
const noop = () => {};
|
|
17
|
-
|
|
18
|
-
test('determinding the next release number', () => {
|
|
19
|
-
expect(getNextReleaseNumber('v34', { log: noop })).toBe(35);
|
|
20
|
-
});
|
|
21
|
-
|
|
22
|
-
describe('checking package.json', () => {
|
|
23
|
-
test('no errors', () => {
|
|
24
|
-
expect(
|
|
25
|
-
packageJsonIsCorrect(34, {
|
|
26
|
-
fail: noop,
|
|
27
|
-
packageJson: '{"version": "34.0.0"}',
|
|
28
|
-
})
|
|
29
|
-
).toBe(true);
|
|
30
|
-
});
|
|
31
|
-
test('version is wrong', () => {
|
|
32
|
-
expect(
|
|
33
|
-
packageJsonIsCorrect(34, {
|
|
34
|
-
fail: noop,
|
|
35
|
-
packageJson: '{"version": "33.0.0"}',
|
|
36
|
-
})
|
|
37
|
-
).toBe(false);
|
|
38
|
-
});
|
|
39
|
-
test('format is wrong', () => {
|
|
40
|
-
expect(
|
|
41
|
-
packageJsonIsCorrect(34, {
|
|
42
|
-
fail: noop,
|
|
43
|
-
packageJson: '{"version": "34"}',
|
|
44
|
-
})
|
|
45
|
-
).toBe(false);
|
|
46
|
-
});
|
|
47
|
-
});
|
|
48
|
-
|
|
49
|
-
describe('checking Changelod.md', () => {
|
|
50
|
-
test('no errors', () => {
|
|
51
|
-
const correctChangelog = `# Changelog
|
|
52
|
-
|
|
53
|
-
All notable changes to this project will be documented in this file.
|
|
54
|
-
|
|
55
|
-
## 34.0.0 - 2022-03-10
|
|
56
|
-
|
|
57
|
-
### Changed
|
|
58
|
-
|
|
59
|
-
- Something`;
|
|
60
|
-
|
|
61
|
-
expect(
|
|
62
|
-
changelogIsCorrect(34, {
|
|
63
|
-
fail: noop,
|
|
64
|
-
now: new Date('2022-03-10T12:38:37.267Z'),
|
|
65
|
-
changelog: correctChangelog,
|
|
66
|
-
})
|
|
67
|
-
).toBe(true);
|
|
68
|
-
});
|
|
69
|
-
|
|
70
|
-
test('Unreleased entry', () => {
|
|
71
|
-
const outdatedChangelog = `# Changelog
|
|
72
|
-
|
|
73
|
-
All notable changes to this project will be documented in this file.
|
|
74
|
-
|
|
75
|
-
## 33.0.0 - 2022-02-01
|
|
76
|
-
|
|
77
|
-
### Changed
|
|
78
|
-
|
|
79
|
-
- Something`;
|
|
80
|
-
|
|
81
|
-
expect(
|
|
82
|
-
latestHeaderIsCorrect(34, {
|
|
83
|
-
fail: noop,
|
|
84
|
-
now: new Date('2022-03-10T12:38:37.267Z'),
|
|
85
|
-
changelog: outdatedChangelog,
|
|
86
|
-
})
|
|
87
|
-
).toBe(false);
|
|
88
|
-
});
|
|
89
|
-
|
|
90
|
-
test('Empty entry', () => {
|
|
91
|
-
const emptyLatestEntry = `# Changelog
|
|
92
|
-
|
|
93
|
-
All notable changes to this project will be documented in this file.
|
|
94
|
-
|
|
95
|
-
## 34.0.0 - 2022-03-10
|
|
96
|
-
|
|
97
|
-
## 33.0.0 - 2022-02-01`;
|
|
98
|
-
|
|
99
|
-
expect(
|
|
100
|
-
latestEntryIsNotEmpty({
|
|
101
|
-
fail: noop,
|
|
102
|
-
changelog: emptyLatestEntry,
|
|
103
|
-
})
|
|
104
|
-
).toBe(false);
|
|
105
|
-
});
|
|
106
|
-
});
|
|
107
|
-
|
|
108
|
-
describe('Parsing Changelog.md', () => {
|
|
109
|
-
const changelog = `# Changelog
|
|
110
|
-
|
|
111
|
-
All notable changes to this project will be documented in this file.
|
|
112
|
-
|
|
113
|
-
## 34.0.0 - 2023-04-20
|
|
114
|
-
|
|
115
|
-
### Changed
|
|
116
|
-
|
|
117
|
-
- Something
|
|
118
|
-
|
|
119
|
-
## 33.0.0 - 2023-04-19
|
|
120
|
-
|
|
121
|
-
### Added
|
|
122
|
-
|
|
123
|
-
- Something else
|
|
124
|
-
`;
|
|
125
|
-
|
|
126
|
-
test('Extracting the latest entry', () => {
|
|
127
|
-
expect(getLatestEntry(changelog)).toMatchObject({
|
|
128
|
-
header: '34.0.0 - 2023-04-20',
|
|
129
|
-
content: '### Changed\n\n- Something',
|
|
130
|
-
});
|
|
131
|
-
});
|
|
132
|
-
});
|