Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/nuget/prototypes/multi-module-pro…
Browse files Browse the repository at this point in the history
…totype/examples/multi-module-example/ModulesPrototype/Grpc.AspNetCore-and-Google.Protobuf-2.61.0
  • Loading branch information
bingenito authored Mar 6, 2024
2 parents 0fc84a5 + 3f0afe5 commit b51bfb9
Show file tree
Hide file tree
Showing 58 changed files with 22,700 additions and 51 deletions.
103 changes: 58 additions & 45 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,70 +7,83 @@

version: 2
updates:

- package-ecosystem: "nuget"
directory: "/" # Location of package manifests
- package-ecosystem: 'nuget'
directory: '/' # Location of package manifests
schedule:
interval: "monthly"
interval: 'monthly'

# Dependabot doesn't support glob syntax. Every solution needs an entry
# Dependabot doesn't support glob syntax. Every solution needs an entry

- package-ecosystem: "nuget"
directory: "/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent"
- package-ecosystem: 'nuget'
directory: '/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent'
schedule:
interval: "monthly"
interval: 'monthly'

- package-ecosystem: "nuget"
directory: "/src/messaging/dotnet/src/Client"
- package-ecosystem: 'nuget'
directory: '/src/messaging/dotnet/src/Client'
schedule:
interval: "monthly"
interval: 'monthly'

- package-ecosystem: "nuget"
directory: "/src/messaging/dotnet/src/Core"
- package-ecosystem: 'nuget'
directory: '/src/messaging/dotnet/src/Core'
schedule:
interval: "monthly"
- package-ecosystem: "nuget"
directory: "/src/messaging/dotnet/src/Host"
interval: 'monthly'

- package-ecosystem: 'nuget'
directory: '/src/messaging/dotnet/src/Host'
schedule:
interval: "monthly"
interval: 'monthly'

- package-ecosystem: "nuget"
directory: "/src/messaging/dotnet/src/Server"
- package-ecosystem: 'nuget'
directory: '/src/messaging/dotnet/src/Server'
schedule:
interval: "monthly"
- package-ecosystem: "nuget"
directory: "/src/shell/dotnet/Shell"
interval: 'monthly'

- package-ecosystem: 'nuget'
directory: '/src/shell/dotnet/Shell'
schedule:
interval: "monthly"
interval: 'monthly'

- package-ecosystem: "nuget"
directory: "/prototypes/multi-module-prototype/examples/multi-module-example/ModulesPrototype"
- package-ecosystem: 'nuget'
directory: '/prototypes/multi-module-prototype/examples/multi-module-example/ModulesPrototype'
schedule:
interval: "monthly"
interval: 'monthly'

- package-ecosystem: "npm"
directory: "/"
- package-ecosystem: 'npm'
directory: '/'
schedule:
interval: "monthly"
interval: 'monthly'
groups:
react:
patterns:
- 'react*'
gatsby:
patterns:
- 'gatsby*'
angular: # group all angular updates together
patterns:
- "@angular*"
patterns:
- '@angular*'
update-types: # group angular where highest version is minor or patch
- "minor"
- "patch"
- 'minor'
- 'patch'
rollup: # group all rollup updates together
patterns:
- "@rollup*"
- "rollup*"
patterns:
- '@rollup*'
- 'rollup*'
testing: # group all dev testing updates together
patterns:
- "@types/jasmine"
- "jasmine*"
- "karma*"
patterns:
- '@types/jasmine'
- 'jasmine*'
- 'karma*'
ignore:
- dependency-name: "@angular*"
update-types: ["version-update:semver-major"]

- dependency-name: '@angular*'
update-types: ['version-update:semver-major']

- package-ecosystem: github-actions
directory: /
schedule:
interval: 'monthly'
groups:
artifact-actions:
patterns:
- 'actions/*-artifact*' # Upload/Download usually need to be updated together
2 changes: 1 addition & 1 deletion .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
run: npx lerna run test

- name: Setup .NET Core SDK ${{ matrix.dotnet-version }}
uses: actions/setup-dotnet@v2
uses: actions/setup-dotnet@v4
with:
dotnet-version: ${{ matrix.dotnet-version }}

Expand Down
35 changes: 35 additions & 0 deletions .github/workflows/deploy-site.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: GH Page Deploy

on:
push:
branches:
- main

defaults:
run:
working-directory: ./site

permissions:
contents: write

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: 20
cache: 'npm'
cache-dependency-path: './site/package-lock.json'
- run: npm ci
- run: npm run build
- name: Deploy
uses: crazy-max/ghaction-github-pages@v4
with:
target_branch: gh-pages
build_dir: docs
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
25 changes: 25 additions & 0 deletions .github/workflows/pr-build-site.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: GH Page PR Build

on:
pull_request:
branches:
- main

defaults:
run:
working-directory: ./site

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'
cache-dependency-path: './site/package-lock.json'
- run: npm ci
- run: npm run build
2 changes: 1 addition & 1 deletion .github/workflows/scorecard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
persist-credentials: false

- name: "Run analysis"
uses: ossf/scorecard-action@e38b1902ae4f44df626f11ba0734b14fb91f8f86 # v2.1.2
uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1
with:
results_file: results.sarif
results_format: sarif
Expand Down
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -1386,3 +1386,9 @@ $RECYCLE.BIN/
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json

##
## gatsby files
##
.cache/
public
6 changes: 3 additions & 3 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="6.0.1" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
<PackageVersion Include="Microsoft.Extensions.Http" Version="6.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.4" />
Expand All @@ -48,9 +48,9 @@
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
<PackageVersion Include="System.Reactive.Async" Version="6.0.0-alpha.18" />
<PackageVersion Include="System.Reactive" Version="6.0.0" />
<PackageVersion Include="System.ServiceModel.Primitives" Version="6.0.0" />
<PackageVersion Include="System.ServiceModel.Primitives" Version="6.2.0" />
<PackageVersion Include="System.Text.Json" Version="8.0.2" />
<PackageVersion Include="TestableIO.System.IO.Abstractions.Wrappers" Version="19.2.69" />
<PackageVersion Include="TestableIO.System.IO.Abstractions.Wrappers" Version="20.0.15" />
<PackageVersion Include="TestableIO.System.IO.Abstractions" Version="20.0.15" />
<PackageVersion Include="Testably.Abstractions.Testing" Version="2.4.1" />
<PackageVersion Include="Xunit.Combinatorial" Version="1.6.24" />
Expand Down
2 changes: 1 addition & 1 deletion site/content/documentation/examples.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ To run the example:
--url http://localhost:4200 --FDC3:AppDirectory:Source $(ComposeUIRepositoryRoot)/examples/fdc3-appdirectory/apps.json
```

(you'll have to manually substitute `$(ComposeUIRepositoryRoot)` with the actual root path of the repo).
(you'll have to manually substitute `$(ComposeUIRepositoryRoot)` with the actual root path of the repo).
6 changes: 6 additions & 0 deletions site/content/news/components.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
date: 2023-07-15
title: Example news page
---

Example news page
8 changes: 8 additions & 0 deletions site/gatsby-browser.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import './src/styles/fonts.css';
import './src/styles/global.css';
import './src/styles/prismjs.css';
import './src/styles/style.css';
import './src/styles/header.css';
import './src/styles/footer.css';
import './src/styles/hero.css';
import './src/styles/card.css';
13 changes: 13 additions & 0 deletions site/gatsby-config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
const { plugins } = require('./src/config/base-gatsby-plugins');

module.exports = {
siteMetadata: {
title: `ComposeUI`,
description: `ComposeUI is a .NET based general UI Container and Unified UI and App host which enables the hosting of Web and desktop content.`,
siteUrl: 'http://opensource.morganstanley.com/ComposeUI',
documentationUrl: false,
// documentationUrl: url-of.documentation.site,
},
pathPrefix: `/`, // put GitHub project url slug here e.g. github.com/morganstanley/<project url slug>
plugins,
};
90 changes: 90 additions & 0 deletions site/gatsby-node.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
const path = require(`path`);
const { createFilePath } = require(`gatsby-source-filesystem`);

exports.createPages = async ({ graphql, actions }) => {
const { createPage } = actions;

const result = await graphql(
`
{
allMdx {
nodes {
id
tableOfContents
frontmatter {
date
title
}
internal {
contentFilePath
}
fields {
slug
}
}
}
}
`
);

if (result.errors) {
throw result.errors;
}

// Create pages.
const pages = result.data.allMdx.nodes;
const newsTemplate = path.resolve(`./src/templates/news.js`);
const documentationTemplate = path.resolve(
`./src/templates/documentation.js`
);
const pageTemplate = path.resolve(`./src/templates/page.js`);

function getCategory(page) {
const path = page.internal.contentFilePath;

return path
? path.includes('news')
? 'news'
: path.includes('documentation')
? 'documentation'
: ''
: '';
}

function getTemplate(category) {
return category
? category.includes('news')
? newsTemplate
: category.includes('documentation')
? documentationTemplate
: pageTemplate
: pageTemplate;
}

pages.forEach((page, index) => {
const category = getCategory(page);
createPage({
path: page.fields.slug,
component: `${getTemplate(category)}?__contentFilePath=${
page.internal.contentFilePath
}`,
context: {
id: page.id,
category,
},
});
});
};

exports.onCreateNode = ({ node, actions, getNode }) => {
const { createNodeField } = actions;

if (node.internal.type === `Mdx`) {
const value = createFilePath({ node, getNode });
createNodeField({
name: `slug`,
node,
value,
});
}
};
Loading

0 comments on commit b51bfb9

Please sign in to comment.