Skip to content

Commit fd900d3

Browse files
OlliTietavainenVaadinOlliTietavainenVaadin
committed
refactor: updated versions to be V24 compatible, new web component version, maven config
1 parent af6687a commit fd900d3

File tree

114 files changed

+24886
-15
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+24886
-15
lines changed

‎pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<groupId>org.vaadin.addons.componentfactory</groupId>
55
<artifactId>vcf-pdf-viewer-root</artifactId>
6-
<version>2.7.3-SNAPSHOT</version>
6+
<version>2.8.0</version>
77
<packaging>pom</packaging>
88
<modules>
99
<module>vcf-pdf-viewer</module>
@@ -13,9 +13,9 @@
1313
<description>Pdf Viewer component based on pdf.js library</description>
1414

1515
<properties>
16-
<vaadin.version>22.0.17</vaadin.version>
17-
<maven.compiler.source>1.8</maven.compiler.source>
18-
<maven.compiler.target>1.8</maven.compiler.target>
16+
<vaadin.version>24.1.12</vaadin.version>
17+
<maven.compiler.source>17</maven.compiler.source>
18+
<maven.compiler.target>17</maven.compiler.target>
1919
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2020
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
2121
</properties>

‎pom.xml.versionsBackup‎

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<modelVersion>4.0.0</modelVersion>
3+
4+
<groupId>org.vaadin.addons.componentfactory</groupId>
5+
<artifactId>vcf-pdf-viewer-root</artifactId>
6+
<version>2.7.3-SNAPSHOT</version>
7+
<packaging>pom</packaging>
8+
<modules>
9+
<module>vcf-pdf-viewer</module>
10+
<module>vcf-pdf-viewer-demo</module>
11+
</modules>
12+
<name>Pdf Viewer</name>
13+
<description>Pdf Viewer component based on pdf.js library</description>
14+
15+
<properties>
16+
<vaadin.version>22.0.17</vaadin.version>
17+
<maven.compiler.source>1.8</maven.compiler.source>
18+
<maven.compiler.target>1.8</maven.compiler.target>
19+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
20+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
21+
</properties>
22+
<inceptionYear>2021</inceptionYear>
23+
<organization>
24+
<name>Vaadin Ltd</name>
25+
<url>https://vaadin.com/</url>
26+
</organization>
27+
28+
<dependencyManagement>
29+
<dependencies>
30+
<dependency>
31+
<groupId>${project.groupId}</groupId>
32+
<artifactId>vcf-pdf-viewer</artifactId>
33+
<version>${vcf-pdf-viewer.version}</version>
34+
</dependency>
35+
<dependency>
36+
<groupId>com.vaadin</groupId>
37+
<artifactId>vaadin-bom</artifactId>
38+
<type>pom</type>
39+
<scope>import</scope>
40+
<version>${vaadin.version}</version>
41+
</dependency>
42+
</dependencies>
43+
</dependencyManagement>
44+
<repositories>
45+
<repository>
46+
<id>Vaadin Directory</id>
47+
<url>https://maven.vaadin.com/vaadin-addons</url>
48+
</repository>
49+
<!-- Repository needed for prerelease versions of Vaadin -->
50+
<repository>
51+
<id>Vaadin prereleases</id>
52+
<url>https://maven.vaadin.com/vaadin-prereleases</url>
53+
</repository>
54+
<!-- Repository needed for the snapshot versions of Vaadin -->
55+
<repository>
56+
<id>vaadin-snapshots</id>
57+
<url>https://oss.sonatype.org/content/repositories/vaadin-snapshots/</url>
58+
</repository>
59+
</repositories>
60+
61+
<pluginRepositories>
62+
<!-- Repository needed for prerelease versions of Vaadin -->
63+
<pluginRepository>
64+
<id>Vaadin prereleases</id>
65+
<url>https://maven.vaadin.com/vaadin-prereleases</url>
66+
</pluginRepository>
67+
<pluginRepository>
68+
<id>vaadin-snapshots</id>
69+
<url>https://oss.sonatype.org/content/repositories/vaadin-snapshots/</url>
70+
<releases><enabled>false</enabled></releases>
71+
</pluginRepository>
72+
</pluginRepositories>
73+
</project>

‎vcf-pdf-viewer-demo/.npmrc‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#
2+
# NOTICE: this is an auto-generated file
3+
#
4+
# This file sets the default parameters for manual `pnpm install`.
5+
#
6+
shamefully-hoist=true

‎vcf-pdf-viewer-demo/frontend/generated/flow/generated-flow-imports.d.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export {}

‎vcf-pdf-viewer-demo/frontend/generated/flow/generated-flow-imports.js‎

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
import { injectGlobalCss } from 'Frontend/generated/jar-resources/theme-util.js';
2+
3+
import { css, unsafeCSS, registerStyles } from '@vaadin/vaadin-themable-mixin';
4+
import $cssFromFile_0 from 'Frontend/generated/jar-resources/styles/toolbar-button.css?inline';
5+
const $css_0 = typeof $cssFromFile_0 === 'string' ? unsafeCSS($cssFromFile_0) : $cssFromFile_0;
6+
registerStyles('vaadin-button', $css_0, {moduleId: 'flow_css_mod_0'});
7+
import $cssFromFile_1 from 'print-js/dist/print.css?inline';
8+
9+
injectGlobalCss($cssFromFile_1.toString(), 'CSSImport end', document);
10+
import '@vaadin/polymer-legacy-adapter/style-modules.js';
11+
import '@vaadin/vaadin-lumo-styles/color-global.js';
12+
import '@vaadin/vaadin-lumo-styles/typography-global.js';
13+
import '@vaadin/vaadin-lumo-styles/sizing.js';
14+
import '@vaadin/vaadin-lumo-styles/spacing.js';
15+
import '@vaadin/vaadin-lumo-styles/style.js';
16+
import '@vaadin/vaadin-lumo-styles/vaadin-iconset.js';
17+
import '@vaadin/app-layout/theme/lumo/vaadin-app-layout.js';
18+
import '@vaadin-component-factory/vcf-pdf-viewer/vcf-pdf-viewer.js';
19+
import 'Frontend/generated/jar-resources/src/pdf-print.js';
20+
import '@vaadin/common-frontend/ConnectionIndicator.js';
21+
import '@vaadin/accordion/theme/lumo/vaadin-accordion.js';
22+
import '@vaadin/details/theme/lumo/vaadin-details.js';
23+
import '@vaadin/accordion/theme/lumo/vaadin-accordion-panel.js';
24+
import '@vaadin/button/theme/lumo/vaadin-button.js';
25+
import 'Frontend/generated/jar-resources/buttonFunctions.js';
26+
import '@vaadin/app-layout/theme/lumo/vaadin-drawer-toggle.js';
27+
import '@vaadin/avatar/theme/lumo/vaadin-avatar.js';
28+
import '@vaadin/avatar-group/theme/lumo/vaadin-avatar-group.js';
29+
import '@vaadin/checkbox/theme/lumo/vaadin-checkbox.js';
30+
import '@vaadin/checkbox-group/theme/lumo/vaadin-checkbox-group.js';
31+
import '@vaadin/combo-box/theme/lumo/vaadin-combo-box.js';
32+
import 'Frontend/generated/jar-resources/flow-component-renderer.js';
33+
import 'Frontend/generated/jar-resources/comboBoxConnector.js';
34+
import '@vaadin/multi-select-combo-box/theme/lumo/vaadin-multi-select-combo-box.js';
35+
import '@vaadin/confirm-dialog/theme/lumo/vaadin-confirm-dialog.js';
36+
import '@vaadin/context-menu/theme/lumo/vaadin-context-menu.js';
37+
import 'Frontend/generated/jar-resources/contextMenuConnector.js';
38+
import 'Frontend/generated/jar-resources/contextMenuTargetConnector.js';
39+
import '@vaadin/custom-field/theme/lumo/vaadin-custom-field.js';
40+
import '@vaadin/date-picker/theme/lumo/vaadin-date-picker.js';
41+
import 'Frontend/generated/jar-resources/datepickerConnector.js';
42+
import '@vaadin/date-time-picker/theme/lumo/vaadin-date-time-picker.js';
43+
import '@vaadin/time-picker/theme/lumo/vaadin-time-picker.js';
44+
import 'Frontend/generated/jar-resources/vaadin-time-picker/timepickerConnector.js';
45+
import '@vaadin/dialog/theme/lumo/vaadin-dialog.js';
46+
import 'Frontend/generated/jar-resources/dndConnector.js';
47+
import '@vaadin/field-highlighter/theme/lumo/vaadin-field-highlighter.js';
48+
import '@vaadin/form-layout/theme/lumo/vaadin-form-layout.js';
49+
import '@vaadin/form-layout/theme/lumo/vaadin-form-item.js';
50+
import '@vaadin/grid/theme/lumo/vaadin-grid-column-group.js';
51+
import '@vaadin/grid/theme/lumo/vaadin-grid.js';
52+
import '@vaadin/grid/theme/lumo/vaadin-grid-column.js';
53+
import '@vaadin/grid/theme/lumo/vaadin-grid-sorter.js';
54+
import 'Frontend/generated/jar-resources/gridConnector.js';
55+
import '@vaadin/tooltip/theme/lumo/vaadin-tooltip.js';
56+
import 'Frontend/generated/jar-resources/vaadin-grid-flow-selection-column.js';
57+
import '@vaadin/icons/vaadin-iconset.js';
58+
import '@vaadin/icon/theme/lumo/vaadin-icon.js';
59+
import '@vaadin/list-box/theme/lumo/vaadin-list-box.js';
60+
import '@vaadin/item/theme/lumo/vaadin-item.js';
61+
import '@vaadin/login/theme/lumo/vaadin-login-form.js';
62+
import '@vaadin/login/theme/lumo/vaadin-login-overlay.js';
63+
import 'Frontend/generated/jar-resources/menubarConnector.js';
64+
import '@vaadin/menu-bar/theme/lumo/vaadin-menu-bar.js';
65+
import '@vaadin/message-input/theme/lumo/vaadin-message-input.js';
66+
import 'Frontend/generated/jar-resources/messageListConnector.js';
67+
import '@vaadin/message-list/theme/lumo/vaadin-message-list.js';
68+
import '@vaadin/notification/theme/lumo/vaadin-notification.js';
69+
import '@vaadin/horizontal-layout/theme/lumo/vaadin-horizontal-layout.js';
70+
import '@vaadin/scroller/theme/lumo/vaadin-scroller.js';
71+
import '@vaadin/vertical-layout/theme/lumo/vaadin-vertical-layout.js';
72+
import '@vaadin/progress-bar/theme/lumo/vaadin-progress-bar.js';
73+
import '@vaadin/radio-group/theme/lumo/vaadin-radio-button.js';
74+
import '@vaadin/radio-group/theme/lumo/vaadin-radio-group.js';
75+
import '@vaadin/select/theme/lumo/vaadin-select.js';
76+
import 'Frontend/generated/jar-resources/selectConnector.js';
77+
import 'Frontend/generated/jar-resources/tooltip.ts';
78+
import '@vaadin/side-nav/theme/lumo/vaadin-side-nav.js';
79+
import '@vaadin/side-nav/theme/lumo/vaadin-side-nav-item.js';
80+
import '@vaadin/split-layout/theme/lumo/vaadin-split-layout.js';
81+
import '@vaadin/tabs/theme/lumo/vaadin-tab.js';
82+
import '@vaadin/tabsheet/theme/lumo/vaadin-tabsheet.js';
83+
import '@vaadin/tabs/theme/lumo/vaadin-tabs.js';
84+
import 'Frontend/generated/jar-resources/vaadin-big-decimal-field.js';
85+
import '@vaadin/email-field/theme/lumo/vaadin-email-field.js';
86+
import '@vaadin/integer-field/theme/lumo/vaadin-integer-field.js';
87+
import '@vaadin/number-field/theme/lumo/vaadin-number-field.js';
88+
import '@vaadin/password-field/theme/lumo/vaadin-password-field.js';
89+
import '@vaadin/text-area/theme/lumo/vaadin-text-area.js';
90+
import '@vaadin/text-field/theme/lumo/vaadin-text-field.js';
91+
import 'Frontend/generated/jar-resources/lit-renderer.ts';
92+
import '@vaadin/grid/theme/lumo/vaadin-grid-tree-toggle.js';
93+
import '@vaadin/upload/theme/lumo/vaadin-upload.js';
94+
import '@vaadin/virtual-list/theme/lumo/vaadin-virtual-list.js';
95+
import 'Frontend/generated/jar-resources/virtualListConnector.js';
96+
import 'Frontend/generated/jar-resources/src/script/prism.js';
97+
const loadOnDemand = (key) => { return Promise.resolve(0); }
98+
window.Vaadin = window.Vaadin || {};
99+
window.Vaadin.Flow = window.Vaadin.Flow || {};
100+
window.Vaadin.Flow.loadOnDemand = loadOnDemand;

‎vcf-pdf-viewer-demo/frontend/generated/jar-resources/Flow.d.ts‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
export interface FlowConfig {
2+
imports?: () => void;
3+
}
4+
interface AppConfig {
5+
productionMode: boolean;
6+
appId: string;
7+
uidl: any;
8+
}
9+
interface AppInitResponse {
10+
appConfig: AppConfig;
11+
pushScript?: string;
12+
}
13+
interface Router {
14+
render: (ctx: NavigationParameters, shouldUpdateHistory: boolean) => Promise<void>;
15+
}
16+
interface HTMLRouterContainer extends HTMLElement {
17+
onBeforeEnter?: (ctx: NavigationParameters, cmd: PreventAndRedirectCommands, router: Router) => void | Promise<any>;
18+
onBeforeLeave?: (ctx: NavigationParameters, cmd: PreventCommands, router: Router) => void | Promise<any>;
19+
serverConnected?: (cancel: boolean, url?: NavigationParameters) => void;
20+
serverPaused?: () => void;
21+
}
22+
interface FlowRoute {
23+
action: (params: NavigationParameters) => Promise<HTMLRouterContainer>;
24+
path: string;
25+
}
26+
export interface NavigationParameters {
27+
pathname: string;
28+
search: string;
29+
}
30+
export interface PreventCommands {
31+
prevent: () => any;
32+
}
33+
export interface PreventAndRedirectCommands extends PreventCommands {
34+
redirect: (route: string) => any;
35+
}
36+
/**
37+
* Client API for flow UI operations.
38+
*/
39+
export declare class Flow {
40+
config: FlowConfig;
41+
response?: AppInitResponse;
42+
pathname: string;
43+
container: HTMLRouterContainer;
44+
private isActive;
45+
private baseRegex;
46+
private appShellTitle;
47+
private navigation;
48+
constructor(config?: FlowConfig);
49+
/**
50+
* Return a `route` object for vaadin-router in an one-element array.
51+
*
52+
* The `FlowRoute` object `path` property handles any route,
53+
* and the `action` returns the flow container without updating the content,
54+
* delaying the actual Flow server call to the `onBeforeEnter` phase.
55+
*
56+
* This is a specific API for its use with `vaadin-router`.
57+
*/
58+
get serverSideRoutes(): [FlowRoute];
59+
loadingStarted(): void;
60+
loadingFinished(): void;
61+
private get action();
62+
private flowLeave;
63+
private flowNavigate;
64+
private getFlowRoutePath;
65+
private getFlowRouteQuery;
66+
private flowInit;
67+
private loadScript;
68+
private injectAppIdScript;
69+
private flowInitClient;
70+
private flowInitUi;
71+
private addConnectionIndicator;
72+
private offlineStubAction;
73+
private isFlowClientLoaded;
74+
}
75+
export {};

0 commit comments

Comments
 (0)