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.

Sign up for GitHub

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

V23 githubbranch #17

Merged
merged 2 commits into from
Oct 10, 2024
Merged

V23 githubbranch #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a180d4c
build: upgrade vaadin version to 23.3.35
javier-godoy Oct 10, 2024
4719920
chore(demo): add GithubBranch annotation
javier-godoy Oct 10, 2024
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
4 changes: 2 additions & 2 deletions frontend/generated/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
import { Router } from '@vaadin/router';

// import Flow module to enable navigation to Vaadin server-side views
import { Flow } from '@vaadin/flow-frontend/Flow';
import { Flow } from 'Frontend/generated/jar-resources/Flow.js';

const { serverSideRoutes } = new Flow({
imports: () => import('../../target/frontend/generated-flow-imports')
imports: () => import('../../target/frontend/generated-flow-imports.js')
});

const routes = [
Expand Down
11 changes: 6 additions & 5 deletions frontend/generated/vaadin-featureflags.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
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;
window.Vaadin.featureFlags.hillaEngine = false;
window.Vaadin.featureFlags.oldLicenseChecker = false;
window.Vaadin.featureFlags.collaborationEngineBackend = false;
window.Vaadin.featureFlags.webpackForFrontendBuild = false;
window.Vaadin.featureFlags.enforceFieldValidation = false;
export {};
2 changes: 1 addition & 1 deletion frontend/generated/vaadin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ import './vaadin-featureflags.ts';

import './index';

import '@vaadin/flow-frontend/vaadin-dev-tools.js';
import 'Frontend/generated/jar-resources/vaadin-dev-tools.js';
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<description>Whatsapp Button Add-on</description>

<properties>
<vaadin.version>23.1.7</vaadin.version>
<vaadin.version>23.3.35</vaadin.version>
<selenium.version>4.1.2</selenium.version>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
Expand Down Expand Up @@ -52,7 +52,7 @@
<dependency>
<groupId>com.flowingcode.vaadin.addons.demo</groupId>
<artifactId>commons-demo</artifactId>
<version>3.5.1</version>
<version>3.10.0</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down
2 changes: 2 additions & 0 deletions src/test/java/com/flowingcode/vaadin/addons/whatsappbutton/WhatsappButtonDemoView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
package com.flowingcode.vaadin.addons.whatsappbutton;

import com.flowingcode.vaadin.addons.DemoLayout;
import com.flowingcode.vaadin.addons.GithubBranch;
import com.flowingcode.vaadin.addons.GithubLink;
import com.flowingcode.vaadin.addons.demo.TabbedDemo;
import com.vaadin.flow.component.dependency.StyleSheet;
Expand All @@ -30,6 +31,7 @@
@ParentLayout(DemoLayout.class)
@Route("whatsappbutton")
@GithubLink("https://github.com/FlowingCode/WhatsappButton")
@GithubBranch("v23")
@StyleSheet("context://frontend/styles/whatsapp-button-demo-styles.css")
public class WhatsappButtonDemoView extends TabbedDemo {

Expand Down
Loading