Skip to content

Commit

Permalink
Upgrade to Vaadin 23.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
alejandro-du committed Mar 10, 2022
1 parent d79e2a0 commit d54cfa4
Show file tree
Hide file tree
Showing 12 changed files with 25,915 additions and 5 deletions.
4 changes: 2 additions & 2 deletions add-on/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<groupId>org.vaadin.crudui</groupId>
<artifactId>crudui</artifactId>
<packaging>jar</packaging>
<version>5.1.0</version>
<version>6.0.0</version>
<name>Crud UI Add-on</name>

<properties>
Expand All @@ -16,7 +16,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<vaadin.version>22.0.2</vaadin.version>
<vaadin.version>23.0.1</vaadin.version>

<drivers.dir>${project.basedir}/drivers</drivers.dir>
<maven.deploy.skip>true</maven.deploy.skip>
Expand Down
32 changes: 32 additions & 0 deletions crud-ui-demo/frontend/generated/index.ts
Original file line number Diff line number Diff line change
@@ -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('../../target/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);
6 changes: 6 additions & 0 deletions crud-ui-demo/frontend/generated/vaadin-featureflags.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
// @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;
5 changes: 5 additions & 0 deletions crud-ui-demo/frontend/generated/vaadin.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import './vaadin-featureflags.ts';

import './index';

import '@vaadin/flow-frontend/VaadinDevmodeGizmo.js';
31 changes: 31 additions & 0 deletions crud-ui-demo/frontend/generated/vite-devmode.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
// @ts-ignore
if (import.meta.hot) {
// @ts-ignore
const hot = import.meta.hot;

const isLiveReloadDisabled = () => {
// Checks if live reload is disabled in the debug window
return sessionStorage.getItem('vaadin.live-reload.active') === 'false';
};

const preventViteReload = (payload: any) => {
// Changing the path prevents Vite from reloading
payload.path = '/_fake/path.html';
};

let pendingNavigationTo: string | undefined = undefined;

window.addEventListener('vaadin-router-go', (routerEvent: any) => {
pendingNavigationTo = routerEvent.detail.pathname + routerEvent.detail.search;
});
hot.on('vite:beforeFullReload', (payload: any) => {
if (isLiveReloadDisabled()) {
preventViteReload(payload);
}
if (pendingNavigationTo) {
// Force reload with the new URL
location.href = pendingNavigationTo;
preventViteReload(payload);
}
});
}
23 changes: 23 additions & 0 deletions crud-ui-demo/frontend/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<!DOCTYPE html>
<!--
This file is auto-generated by Vaadin.
-->

<html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<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>
Loading

0 comments on commit d54cfa4

Please sign in to comment.