Skip to content

Commit

Permalink
Merge pull request #1231 from valadas/nuke903
Browse files Browse the repository at this point in the history
Bumped nuke to v9.0.3
  • Loading branch information
valadas authored Dec 16, 2024
2 parents 87dd101 + 5eeae04 commit fe79d04
Show file tree
Hide file tree
Showing 19 changed files with 199 additions and 57 deletions.
36 changes: 21 additions & 15 deletions .nuke/build.schema.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,5 @@
{
"$schema": "http://json-schema.org/draft-04/schema#",
"properties": {
"Configuration": {
"type": "string",
"description": "Configuration to build - Default is 'Debug' (local) or 'Release' (server)",
"enum": [
"Debug",
"Release"
]
},
"GithubToken": {
"type": "string",
"description": "Github Token"
}
},
"definitions": {
"Host": {
"type": "string",
Expand Down Expand Up @@ -118,5 +104,25 @@
}
}
},
"$ref": "#/definitions/NukeBuild"
"allOf": [
{
"properties": {
"Configuration": {
"type": "string",
"description": "Configuration to build - Default is 'Debug' (local) or 'Release' (server)",
"enum": [
"Debug",
"Release"
]
},
"GithubToken": {
"type": "string",
"description": "Github Token"
}
}
},
{
"$ref": "#/definitions/NukeBuild"
}
]
}
22 changes: 0 additions & 22 deletions _build/Build.cs
Original file line number Diff line number Diff line change
Expand Up @@ -109,24 +109,6 @@ class Build : NukeBuild
.DependsOn(Clean)
.Executes(() =>
{
NpmLogger = (type, output) =>
{
if (type == OutputType.Std)
{
Serilog.Log.Information(output);
}
if (type == OutputType.Err)
{
if (output.StartsWith("npm WARN", StringComparison.OrdinalIgnoreCase))
{
Serilog.Log.Warning(output);
}
else
{
Serilog.Log.Error(output);
}
}
};
var version = gitRepository.IsOnMainOrMasterBranch() ? GitVersion.MajorMinorPatch : GitVersion.SemVer;
Npm($"version {version} --allow-same-version --git-tag-version false --workspaces", RootDirectory);

Expand Down Expand Up @@ -182,9 +164,6 @@ class Build : NukeBuild
.DependsOn(SetupGithubActor)
.Executes(() =>
{
// Prevents a bug where git sends ok message to the error output sink
GitLogger = (type, output) => Serilog.Log.Information(output);

// Because in CI we are in detached head,
// we create a local deploy branch to track our commit.
Git("switch -c deploy");
Expand All @@ -211,7 +190,6 @@ class Build : NukeBuild
.Executes(() =>
{
var version = gitRepository.IsOnMainOrMasterBranch() ? GitVersion.MajorMinorPatch : GitVersion.SemVer;
GitLogger = (type, output) => Serilog.Log.Information(output);
Git($"tag v{version}");
Git($"push origin --tags");
});
Expand Down
4 changes: 2 additions & 2 deletions _build/_build.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace></RootNamespace>
<NoWarn>CS0649;CS0169</NoWarn>
<NukeRootDirectory>..</NukeRootDirectory>
Expand All @@ -11,7 +11,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Nuke.Common" Version="8.1.2" />
<PackageReference Include="Nuke.Common" Version="9.0.3" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "8.0.403",
"version": "9.0.100",
"rollForward": "latestMajor"
}
}
33 changes: 19 additions & 14 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,4 @@ export const DnnToggle = /*@__PURE__*/createReactComponent<JSX.DnnToggle, HTMLDn
export const DnnTreeviewItem = /*@__PURE__*/createReactComponent<JSX.DnnTreeviewItem, HTMLDnnTreeviewItemElement>('dnn-treeview-item');
export const DnnVerticalOverflowMenu = /*@__PURE__*/createReactComponent<JSX.DnnVerticalOverflowMenu, HTMLDnnVerticalOverflowMenuElement>('dnn-vertical-overflow-menu');
export const DnnVerticalSplitview = /*@__PURE__*/createReactComponent<JSX.DnnVerticalSplitview, HTMLDnnVerticalSplitviewElement>('dnn-vertical-splitview');
export const TestForm = /*@__PURE__*/createReactComponent<JSX.TestForm, HTMLTestFormElement>('test-form');
2 changes: 1 addition & 1 deletion packages/react-library/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dnncommunity/dnn-elements-react",
"version": "0.25.0-alpha.9",
"version": "0.24.2-beta.1",
"description": "Dnn themed custom elements with react wrappers.",
"homepage": "https://github.com/valadas/dnn-elements",
"license": "MIT",
Expand Down
18 changes: 18 additions & 0 deletions packages/stencil-library/custom-elements.json
Original file line number Diff line number Diff line change
Expand Up @@ -2424,6 +2424,24 @@
"cssParts": []
}
]
},
{
"kind": "javascript-module",
"path": "src/components/test-form/test-form.tsx",
"declarations": [
{
"kind": "class",
"name": "test-form.tsx",
"tagName": "test-form",
"description": "",
"attributes": [],
"members": [],
"events": [],
"slots": [],
"cssProperties": [],
"cssParts": []
}
]
}
]
}
2 changes: 1 addition & 1 deletion packages/stencil-library/licenses.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"@dnncommunity/dnn-elements@0.25.0-alpha.9": {
"@dnncommunity/dnn-elements@0.24.2-beta.1": {
"licenses": "MIT",
"repository": "https://github.com/dnncommunity/dnn-elements",
"path": "",
Expand Down
2 changes: 1 addition & 1 deletion packages/stencil-library/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dnncommunity/dnn-elements",
"version": "0.25.0-alpha.9",
"version": "0.24.2-beta.1",
"description": "Dnn themed custom elements.",
"repository": "https://github.com/dnncommunity/dnn-elements",
"homepage": "https://dnncommunity.github.io/dnn-elements",
Expand Down
13 changes: 13 additions & 0 deletions packages/stencil-library/src/components.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -752,6 +752,8 @@ export namespace Components {
*/
"splitterWidth": number;
}
interface TestForm {
}
}
export interface DnnAutocompleteCustomEvent<T> extends CustomEvent<T> {
detail: T;
Expand Down Expand Up @@ -1275,6 +1277,12 @@ declare global {
prototype: HTMLDnnVerticalSplitviewElement;
new (): HTMLDnnVerticalSplitviewElement;
};
interface HTMLTestFormElement extends Components.TestForm, HTMLStencilElement {
}
var HTMLTestFormElement: {
prototype: HTMLTestFormElement;
new (): HTMLTestFormElement;
};
interface HTMLElementTagNameMap {
"dnn-autocomplete": HTMLDnnAutocompleteElement;
"dnn-button": HTMLDnnButtonElement;
Expand Down Expand Up @@ -1303,6 +1311,7 @@ declare global {
"dnn-treeview-item": HTMLDnnTreeviewItemElement;
"dnn-vertical-overflow-menu": HTMLDnnVerticalOverflowMenuElement;
"dnn-vertical-splitview": HTMLDnnVerticalSplitviewElement;
"test-form": HTMLTestFormElement;
}
}
declare namespace LocalJSX {
Expand Down Expand Up @@ -2071,6 +2080,8 @@ declare namespace LocalJSX {
*/
"splitterWidth"?: number;
}
interface TestForm {
}
interface IntrinsicElements {
"dnn-autocomplete": DnnAutocomplete;
"dnn-button": DnnButton;
Expand Down Expand Up @@ -2099,6 +2110,7 @@ declare namespace LocalJSX {
"dnn-treeview-item": DnnTreeviewItem;
"dnn-vertical-overflow-menu": DnnVerticalOverflowMenu;
"dnn-vertical-splitview": DnnVerticalSplitview;
"test-form": TestForm;
}
}
export { LocalJSX as JSX };
Expand Down Expand Up @@ -2164,6 +2176,7 @@ declare module "@stencil/core" {
*/
"dnn-vertical-overflow-menu": LocalJSX.DnnVerticalOverflowMenu & JSXBase.HTMLAttributes<HTMLDnnVerticalOverflowMenuElement>;
"dnn-vertical-splitview": LocalJSX.DnnVerticalSplitview & JSXBase.HTMLAttributes<HTMLDnnVerticalSplitviewElement>;
"test-form": LocalJSX.TestForm & JSXBase.HTMLAttributes<HTMLTestFormElement>;
}
}
}
2 changes: 2 additions & 0 deletions packages/stencil-library/src/components/dnn-button/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@
- [dnn-color-input](../dnn-color-input)
- [dnn-example-form](../examples/dnn-example-form)
- [dnn-permissions-grid](../dnn-permissions-grid)
- [test-form](../test-form)

### Depends on

Expand All @@ -100,6 +101,7 @@ graph TD;
dnn-color-input --> dnn-button
dnn-example-form --> dnn-button
dnn-permissions-grid --> dnn-button
test-form --> dnn-button
style dnn-button fill:#f9f,stroke:#333,stroke-width:4px
```

Expand Down
2 changes: 2 additions & 0 deletions packages/stencil-library/src/components/dnn-select/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ Type: `Promise<ValidityState>`
### Used by

- [dnn-example-form](../examples/dnn-example-form)
- [test-form](../test-form)

### Depends on

Expand All @@ -66,6 +67,7 @@ Type: `Promise<ValidityState>`
graph TD;
dnn-select --> dnn-fieldset
dnn-example-form --> dnn-select
test-form --> dnn-select
style dnn-select fill:#f9f,stroke:#333,stroke-width:4px
```

Expand Down
28 changes: 28 additions & 0 deletions packages/stencil-library/src/components/test-form/readme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# test-form



<!-- Auto Generated Below -->


## Dependencies

### Depends on

- [dnn-select](../dnn-select)
- [dnn-button](../dnn-button)

### Graph
```mermaid
graph TD;
test-form --> dnn-select
test-form --> dnn-button
dnn-select --> dnn-fieldset
dnn-button --> dnn-modal
dnn-button --> dnn-button
style test-form fill:#f9f,stroke:#333,stroke-width:4px
```

----------------------------------------------

*Built with [StencilJS](https://stenciljs.com/)*
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
:host {
display: block;
}
Loading

0 comments on commit fe79d04

Please sign in to comment.