mirror of
https://github.com/kochetkov-ma/allure-server.git
synced 2024-11-21 16:46:43 +02:00
update Vaadin UI version up to 23 release
This commit is contained in:
kochetkov-ma
parent
c1b122d343
commit
ecdb5fd6bb
7
.npmrc
Normal file
7
.npmrc
Normal file
@ -0,0 +1,7 @@
|
||||
#
|
||||
# NOTICE: this is an auto-generated file
|
||||
#
|
||||
# This file sets the default parameters for manual `pnpm install`.
|
||||
#
|
||||
shamefully-hoist=true
|
||||
strict-peer-dependencies=false
|
||||
42
.pnpmfile.cjs
Normal file
42
.pnpmfile.cjs
Normal file
@ -0,0 +1,42 @@
|
||||
/**
|
||||
* NOTICE: this is an auto-generated file
|
||||
*
|
||||
* This file has been generated for `pnpm install` task.
|
||||
* It is used to pin client side dependencies.
|
||||
* This file will be overwritten on every run.
|
||||
*/
|
||||
|
||||
const fs = require('fs');
|
||||
|
||||
const versionsFile = require('path').resolve(__dirname, 'build/frontend/versions.json');
|
||||
|
||||
if (!fs.existsSync(versionsFile)) {
|
||||
return;
|
||||
}
|
||||
const versions = JSON.parse(fs.readFileSync(versionsFile, 'utf-8'));
|
||||
|
||||
module.exports = {
|
||||
hooks: {
|
||||
readPackage
|
||||
}
|
||||
};
|
||||
|
||||
function readPackage(pkg) {
|
||||
const { dependencies } = pkg;
|
||||
|
||||
if (dependencies) {
|
||||
for (let k in versions) {
|
||||
if (dependencies[k] && dependencies[k] !== versions[k]) {
|
||||
pkg.dependencies[k] = versions[k];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Forcing chokidar version for now until new babel version is available
|
||||
// check out https://github.com/babel/babel/issues/11488
|
||||
if (pkg.dependencies.chokidar) {
|
||||
pkg.dependencies.chokidar = '^3.4.0';
|
||||
}
|
||||
|
||||
return pkg;
|
||||
}
|
||||
@ -13,7 +13,7 @@ plugins {
|
||||
id 'org.springframework.boot' version '2.7.1'
|
||||
id 'io.spring.dependency-management' version '1.0.12.RELEASE'
|
||||
|
||||
id "com.vaadin" version "0.7.0"
|
||||
id "com.vaadin" version "23.1.3"
|
||||
}
|
||||
apply from: './gradle/dependencies.gradle'
|
||||
apply from: './gradle/checking.gradle'
|
||||
@ -44,6 +44,7 @@ wrapper {
|
||||
}
|
||||
}
|
||||
vaadin {
|
||||
pnpmEnable = true
|
||||
productionMode = true
|
||||
}
|
||||
classes {
|
||||
|
||||
32
frontend/generated/index.ts
Normal file
32
frontend/generated/index.ts
Normal file
@ -0,0 +1,32 @@
|
||||
/******************************************************************************
|
||||
* This file is auto-generated by Vaadin.
|
||||
* If you want to customize the entry point, you can copy this file or create
|
||||
* your own `index.ts` in your frontend directory.
|
||||
* By default, the `index.ts` file should be in `./frontend/` folder.
|
||||
*
|
||||
* NOTE:
|
||||
* - You need to restart the dev-server after adding the new `index.ts` file.
|
||||
* After that, all modifications to `index.ts` are recompiled automatically.
|
||||
* - `index.js` is also supported if you don't want to use TypeScript.
|
||||
******************************************************************************/
|
||||
|
||||
// import Vaadin client-router to handle client-side and server-side navigation
|
||||
import { Router } from '@vaadin/router';
|
||||
|
||||
// import Flow module to enable navigation to Vaadin server-side views
|
||||
import { Flow } from '@vaadin/flow-frontend/Flow';
|
||||
|
||||
const { serverSideRoutes } = new Flow({
|
||||
imports: () => import('../../build/frontend/generated-flow-imports')
|
||||
});
|
||||
|
||||
const routes = [
|
||||
// for client-side, place routes below (more info https://vaadin.com/docs/v15/flow/typescript/creating-routes.html)
|
||||
|
||||
// for server-side, the next magic line sends all unmatched routes:
|
||||
...serverSideRoutes // IMPORTANT: this must be the last entry in the array
|
||||
];
|
||||
|
||||
// Vaadin router needs an outlet in the index.html page to display views
|
||||
const router = new Router(document.querySelector('#outlet'));
|
||||
router.setRoutes(routes);
|
||||
10
frontend/generated/vaadin-featureflags.ts
Normal file
10
frontend/generated/vaadin-featureflags.ts
Normal file
@ -0,0 +1,10 @@
|
||||
// @ts-nocheck
|
||||
window.Vaadin = window.Vaadin || {};
|
||||
window.Vaadin.featureFlags = window.Vaadin.featureFlags || {};
|
||||
window.Vaadin.featureFlags.exampleFeatureFlag = false;
|
||||
window.Vaadin.featureFlags.viteForFrontendBuild = false;
|
||||
window.Vaadin.featureFlags.mapComponent = false;
|
||||
window.Vaadin.featureFlags.spreadsheetComponent = false;
|
||||
window.Vaadin.featureFlags.hillaPush = false;
|
||||
window.Vaadin.featureFlags.newLicenseChecker = false;
|
||||
window.Vaadin.featureFlags.collaborationEngineBackend = false;
|
||||
3
frontend/generated/vaadin.ts
Normal file
3
frontend/generated/vaadin.ts
Normal file
@ -0,0 +1,3 @@
|
||||
import './vaadin-featureflags.ts';
|
||||
|
||||
import './index';
|
||||
23
frontend/index.html
Normal file
23
frontend/index.html
Normal file
@ -0,0 +1,23 @@
|
||||
<!DOCTYPE html>
|
||||
<!--
|
||||
This file is auto-generated by Vaadin.
|
||||
-->
|
||||
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8"/>
|
||||
<meta content="width=device-width, initial-scale=1" name="viewport"/>
|
||||
<style>
|
||||
body, #outlet {
|
||||
height: 100vh;
|
||||
width: 100%;
|
||||
margin: 0;
|
||||
}
|
||||
</style>
|
||||
<!-- index.ts is included here automatically (either by the dev server or during the build) -->
|
||||
</head>
|
||||
<body>
|
||||
<!-- This outlet div is where the views are rendered -->
|
||||
<div id="outlet"></div>
|
||||
</body>
|
||||
</html>
|
||||
@ -3,7 +3,7 @@ repositories {
|
||||
}
|
||||
ext {
|
||||
qaLibVersion = '1.2.0'
|
||||
vaadinVersion = '14.2.0'
|
||||
vaadinVersion = '23.1.3'
|
||||
guavaVersion = '31.1-jre'
|
||||
apacheIoVersion = '2.11.0'
|
||||
openApiVersion = '1.6.9'
|
||||
|
||||
8779
pnpm-lock.yaml
Normal file
8779
pnpm-lock.yaml
Normal file
File diff suppressed because it is too large
Load Diff
@ -1,6 +1,6 @@
|
||||
package ru.iopump.qa.allure.security;
|
||||
|
||||
import com.vaadin.flow.server.ServletHelper;
|
||||
import com.vaadin.flow.server.HandlerHelper;
|
||||
import com.vaadin.flow.shared.ApplicationConstants;
|
||||
import lombok.experimental.UtilityClass;
|
||||
|
||||
@ -12,9 +12,8 @@ public class SecurityUtils {
|
||||
|
||||
boolean isFrameworkInternalRequest(HttpServletRequest request) {
|
||||
final String parameterValue = request.getParameter(ApplicationConstants.REQUEST_TYPE_PARAMETER);
|
||||
//noinspection deprecation
|
||||
return parameterValue != null
|
||||
&& Stream.of(ServletHelper.RequestType.values())
|
||||
&& Stream.of(HandlerHelper.RequestType.values())
|
||||
.anyMatch(r -> r.getIdentifier().equals(parameterValue));
|
||||
}
|
||||
}
|
||||
35
tsconfig.json
Normal file
35
tsconfig.json
Normal file
@ -0,0 +1,35 @@
|
||||
// This TypeScript configuration file is generated by vaadin-maven-plugin.
|
||||
// This is needed for TypeScript compiler to compile your TypeScript code in the project.
|
||||
// It is recommended to commit this file to the VCS.
|
||||
// You might want to change the configurations to fit your preferences
|
||||
// For more information about the configurations, please refer to http://www.typescriptlang.org/docs/handbook/tsconfig-json.html
|
||||
{
|
||||
"compilerOptions": {
|
||||
"sourceMap": true,
|
||||
"inlineSources": true,
|
||||
"module": "esNext",
|
||||
"target": "es2019",
|
||||
"moduleResolution": "node",
|
||||
"strict": true,
|
||||
"skipDefaultLibCheck": true,
|
||||
"noFallthroughCasesInSwitch": true,
|
||||
"noImplicitReturns": true,
|
||||
"noImplicitAny": true,
|
||||
"noImplicitThis": true,
|
||||
"noUnusedLocals": false,
|
||||
"noUnusedParameters": false,
|
||||
"experimentalDecorators": true,
|
||||
"baseUrl": "frontend",
|
||||
"paths": {
|
||||
"Frontend/*": [
|
||||
"*"
|
||||
]
|
||||
}
|
||||
},
|
||||
"include": [
|
||||
"frontend/**/*.ts",
|
||||
"frontend/index.js",
|
||||
"types.d.ts"
|
||||
],
|
||||
"exclude": []
|
||||
}
|
||||
10
types.d.ts
vendored
Normal file
10
types.d.ts
vendored
Normal file
@ -0,0 +1,10 @@
|
||||
// This TypeScript modules definition file is generated by vaadin-maven-plugin.
|
||||
// You can not directly import your different static files into TypeScript,
|
||||
// This is needed for TypeScript compiler to declare and export as a TypeScript module.
|
||||
// It is recommended to commit this file to the VCS.
|
||||
// You might want to change the configurations to fit your preferences
|
||||
declare module '*.css' {
|
||||
import { CSSResultGroup } from 'lit';
|
||||
const content: CSSResultGroup;
|
||||
export default content;
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user