Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Chore(deps): Bump serve-static and express #3353

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/release-please.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
manifest: true
primaryBranch: dev
handleGHRelease: true
3 changes: 3 additions & 0 deletions .release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
".": "10.4.0"
}
1,034 changes: 500 additions & 534 deletions package-lock.json

Large diffs are not rendered by default.

40 changes: 20 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@
"private": true,
"dependencies": {
"@augloop/types-core": "file:packages/types-core-2.16.189.tgz",
"@axe-core/webdriverjs": "4.8.5",
"@axe-core/webdriverjs": "4.10.0",
"@azure/msal-browser": "3.14.0",
"@babel/core": "7.24.6",
"@babel/runtime": "7.24.5",
"@fluentui/react": "8.117.7",
"@babel/core": "7.25.2",
"@babel/runtime": "7.25.6",
"@fluentui/react": "8.120.7",
"@fluentui/react-icons-mdl2": "1.3.63",
"@microsoft/applicationinsights-react-js": "17.2.0",
"@microsoft/applicationinsights-web": "3.2.1",
"@microsoft/applicationinsights-react-js": "17.3.1",
"@microsoft/applicationinsights-web": "3.3.1",
"@microsoft/microsoft-graph-client": "3.0.7",
"@monaco-editor/react": "4.6.0",
"@ms-ofb/officebrowserfeedbacknpm": "file:packages/officebrowserfeedbacknpm-1.6.6.tgz",
"@reduxjs/toolkit": "2.2.5",
"adaptive-expressions": "4.22.2",
"adaptivecards": "3.0.2",
"adaptivecards-templating": "2.3.1",
"ajv": "8.12.0",
"ajv": "8.17.1",
"ajv-keywords": "5.1.0",
"apg-js": "4.3.0",
"babel-loader": "9.1.3",
Expand All @@ -33,15 +33,15 @@
"eslint-config-react-app": "7.0.1",
"eslint-plugin-react": "7.33.2",
"eslint-webpack-plugin": "4.1.0",
"express": "4.19.2",
"express": "4.21.0",
"expvariantassignmentsdk": "file:packages/expvariantassignmentsdk-1.0.0.tgz",
"file-loader": "6.2.0",
"fork-ts-checker-webpack-plugin": "9.0.2",
"fs-extra": "11.2.0",
"guid-typescript": "1.0.9",
"isomorphic-fetch": "3.0.0",
"localforage": "1.10.0",
"mini-css-extract-plugin": "2.9.0",
"mini-css-extract-plugin": "2.9.1",
"monaco-editor": "0.30.1",
"monaco-editor-webpack-plugin": "6.0.0",
"office-ui-fabric-core": "11.1.0",
Expand All @@ -57,10 +57,10 @@
"sass": "1.72.0",
"sass-loader": "14.2.1",
"style-loader": "4.0.0",
"typescript": "5.4.5",
"typescript": "5.5.4",
"url": "0.11.3",
"url-loader": "4.1.1",
"webpack": "5.91.0",
"webpack": "5.94.0",
"webpack-dev-server": "5.0.4",
"webpack-manifest-plugin": "5.0.0",
"workbox-webpack-plugin": "7.0.0"
Expand Down Expand Up @@ -89,24 +89,24 @@
"not op_mini all"
],
"devDependencies": {
"@axe-core/playwright": "4.7.3",
"@playwright/test": "1.43.1",
"@axe-core/playwright": "4.10.0",
"@playwright/test": "1.46.1",
"@types/chromedriver": "81.0.1",
"@types/isomorphic-fetch": "0.0.39",
"@types/jest": "29.5.12",
"@types/lodash.debounce": "4.0.9",
"@types/markdown-it": "14.1.1",
"@types/markdown-it": "14.1.2",
"@types/react": "18.2.55",
"@types/react-dom": "18.2.19",
"@types/react-redux": "7.1.30",
"@types/redux-logger": "3.0.11",
"@types/redux-mock-store": "1.0.3",
"@types/selenium-webdriver": "4.1.21",
"@types/selenium-webdriver": "4.1.26",
"@typescript-eslint/eslint-plugin": "7.0.0",
"@typescript-eslint/parser": "6.17.0",
"acorn": "8.11.3",
"acorn": "8.12.1",
"babel-jest": "29.7.0",
"chromedriver": "124.0.1",
"chromedriver": "128.0.1",
"eslint": "8.56.0",
"html-webpack-plugin": "5.6.0",
"jest": "29.7.0",
Expand All @@ -120,9 +120,9 @@
"react-dev-utils": "12.0.1",
"redux-logger": "3.0.6",
"redux-mock-store": "1.5.4",
"selenium-webdriver": "4.18.1",
"start-server-and-test": "2.0.3",
"ts-jest": "29.1.2"
"selenium-webdriver": "4.24.0",
"start-server-and-test": "2.0.5",
"ts-jest": "29.2.5"
},
"jestSonar": {
"reportPath": "reports",
Expand Down
18 changes: 18 additions & 0 deletions release-please-config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json",
"pull-request-header": ":rocket: A new Graph Explorer release is coming up!",
"include-component-in-tag": false,
"bootstrap-sha": "439726b8e93371c61bb3ad76836603b1e822481f",
"packages": {
".": {
"changelog-path": "CHANGELOG.md",
"release-type": "node",
"bump-minor-pre-major": false,
"bump-patch-for-minor-pre-major": false,
"include-v-in-tag": true,
"draft": false,
"prerelease": false
}
},
"extra-files": [ "package.json", "sonar-project.properties" ]
}
4 changes: 3 additions & 1 deletion sonar-project.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
sonar.projectKey=microsoftgraph_microsoft-graph-explorer-v4
sonar.organization=microsoftgraph2
sonar.projectName=microsoft-graph-explorer-v4
sonar.projectVersion=4.14.0
// x-release-please-start-version
sonar.projectVersion=10.4.0
// x-release-please-end
sonar.host.url=https://sonarcloud.io


Expand Down
5 changes: 3 additions & 2 deletions src/app/utils/open-api-parser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export function parseOpenApiResponse(
params: IOpenApiParseContent
): IParsedOpenApiResponse {
const {
response: { paths },
response: { paths, info },
url
} = params;

Expand All @@ -29,8 +29,9 @@ export function parseOpenApiResponse(
});
});

const version = info?.version || '';
const createdAt = new Date().toISOString();
return { url, parameters, createdAt };
return { url, parameters, version, createdAt };
} catch (error: any) {
throw new Error(error);
}
Expand Down
9 changes: 5 additions & 4 deletions src/app/utils/resources/resources-filter.ts
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
import { IResource } from '../../../types/resources';
import { hasPlaceHolders } from '../sample-url-generation';

function searchResources(haystack: IResource[], needle: string): IResource[] {
function searchResources(resources: IResource[], needle: string): IResource[] {
const foundResources: IResource[] = [];
haystack.forEach((resource: IResource) => {
resources.forEach((resource: IResource) => {
if (resource.segment.contains(needle)) {
foundResources.push(resource);
return;
}
if (resource.children) {
const foundChildResources = searchResources(resource.children, needle);
if (foundChildResources.length > 0) {
resource.children = foundChildResources;
foundResources.push(resource);
const res = Object.assign({}, resource)
res.children = foundChildResources;
foundResources.push(res);
}
}
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,8 @@ const AutoComplete = (props: IAutoCompleteProps) => {
const requestForAutocompleteOptions = (url: string, context: SignContext) => {
const signature = sanitizeQueryUrl(url);
const { requestUrl, queryVersion } = parseSampleUrl(signature);
const urlExistsInStore = autoCompleteOptions && requestUrl === autoCompleteOptions.url;
const urlExistsInStore = autoCompleteOptions && requestUrl === autoCompleteOptions.url &&
queryVersion === autoCompleteOptions.version;
if (urlExistsInStore) {
displayAutoCompleteSuggestions(autoCompleteOptions.url);
return;
Expand Down
1 change: 1 addition & 0 deletions src/modules/suggestions/cache-provider.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ describe('Cache provider should', () => {
links: []
}
],
version: 'v1',
createdAt: '2020-04-01T00:00:00.000Z'
}

Expand Down
1 change: 1 addition & 0 deletions src/modules/suggestions/suggestions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ class Suggestions implements ISuggestions {
private createOpenApiResponse(versionedResources: IResource[], url: string): IParsedOpenApiResponse {
const response: IParsedOpenApiResponse = {
createdAt: '',
version: '',
parameters: [{
verb: 'get',
values: [],
Expand Down
21 changes: 21 additions & 0 deletions src/types/open-api.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,27 @@
export interface IOpenApiResponse {
paths: any;
info: IOpenApiInfo;
}

export interface IOpenApiInfo {
version: string;
title: string;
description?: string;
termsOfService?: string;
contact?: IOpenApiContact;
license?: IOpenApiLicense;
}

export interface IOpenApiContact {
name: string;
url: string;
email: string;
}

export interface IOpenApiLicense {
name: string;
url: string;
}
export interface IOpenApiParseContent {
response: IOpenApiResponse;
url: string;
Expand All @@ -10,6 +30,7 @@ export interface IOpenApiParseContent {
export interface IParsedOpenApiResponse {
url: string;
parameters: IParameters[];
version: string;
createdAt: string;
}

Expand Down
Loading