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

chore: add hilla-dev-mode in vaadin-dev #4968

Merged
merged 14 commits into from
Feb 7, 2024
Merged

chore: add hilla-dev-mode in vaadin-dev #4968

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
73e011a
chore: add hilla-dev-mode in vaadin-dev
tltv Jan 30, 2024
c5e1e3e
chore: exclude hilla-dev-mode from vaadin-spring-boot-starter
tltv Jan 30, 2024
e357066
test: temporary disable test checking for dev-bundle, until it is fix…
manolo Feb 4, 2024
192bb55
test: temporary disable more tests
manolo Feb 5, 2024
34cfaad
chore: wait for dev bundle to be ready
tltv Feb 5, 2024
7f0c1a1
chore: add hilla-dev-mode to bundle build files
manolo Feb 6, 2024
e142b5d
add hilla.version to dev-bundle
ZheSun88 Feb 6, 2024
a72630e
Merge branch 'main' into chore/add-hilla-dev-mode-to-vaadin-dev
ZheSun88 Feb 6, 2024
b0edf11
use flow snapshot
ZheSun88 Feb 6, 2024
86f9cfb
chore: removed hilla-dev-mode from prod-bundle template
tltv Feb 6, 2024
9a16aa0
Merge branch 'main' into chore/add-hilla-dev-mode-to-vaadin-dev
Artur- Feb 6, 2024
5fdfa31
Revert "chore: wait for dev bundle to be ready"
manolo Feb 6, 2024
76a550d
revert Ignored test
manolo Feb 6, 2024
a951455
chore: add valid licenses to license-white-list
manolo Feb 6, 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
5 changes: 5 additions & 0 deletions vaadin-dev/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,11 @@
<artifactId>vaadin-dev-bundle</artifactId>
</dependency>

<dependency>
<groupId>com.vaadin.hilla</groupId>
<artifactId>hilla-dev-mode</artifactId>
</dependency>

manolo marked this conversation as resolved.
Show resolved Hide resolved
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>copilot</artifactId>
Expand Down
12 changes: 9 additions & 3 deletions vaadin-platform-test/src/test/java/com/vaadin/platform/test/ChromeComponentsIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@

import org.junit.Assert;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.openqa.selenium.*;
import org.openqa.selenium.logging.LogEntry;
Expand All @@ -82,8 +83,13 @@ protected String getTestPath() {
}

@Before
public void load(){
$(NotificationElement.class).waitForFirst();
public void load() {
if (getDriver().getPageSource().contains("<div class=\"message\">Building front-end development bundle</div>")) {
// Wait for the development bundle to be loaded
$(NotificationElement.class).waitForFirst(180);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I feel that ff the problem is that we need for the bundle to be compiled, probably this fix should be in the testbench instead

} else {
$(NotificationElement.class).waitForFirst();
}
}


Expand Down Expand Up @@ -324,7 +330,7 @@ public void textAreaIsRenderedAndRecievesValueChangeEvents() {
"TextArea value changed from to foo");
}

@Test
@Test @Ignore("ignore until fixed after hilla-dev inluded in platform")
public void uploadIsRenderedAndUploadFile() throws IOException {
UploadElement upload = $(UploadElement.class).first();

Expand Down
5 changes: 3 additions & 2 deletions vaadin-platform-test/src/test/java/com/vaadin/platform/test/DefaultDevBundleIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,14 @@
import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
import org.junit.Ignore;

import com.vaadin.flow.server.Constants;
import com.vaadin.flow.server.frontend.FrontendUtils;

public class DefaultDevBundleIT extends AbstractPlatformTest {

@Test
@Test @Ignore("ignore while bundle is not correctly generated")
public void test() throws Exception {
File baseDir = new File(System.getProperty("user.dir", "."));
File devBundle = new File(baseDir, "target/" + Constants.DEV_BUNDLE_LOCATION);
Expand All @@ -39,7 +40,7 @@ public void test() throws Exception {
Assert.assertFalse("Error: folder '" + nodeModules.getPath() + "' shouldn't exist.", nodeModules.exists());
}

@Test
@Test @Ignore("ignore while sw are not correctly generated")
public void serviceWorkerIsIncludedAndServed() {
getDriver().get(getRootURL() + "/sw.js");
String pageSource = getDriver().getPageSource();
Expand Down
6 changes: 6 additions & 0 deletions vaadin-spring-boot-starter/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,12 @@
<dependency>
<groupId>com.vaadin.hilla</groupId>
<artifactId>hilla-react</artifactId>
<exclusions>
<exclusion>
<groupId>com.vaadin.hilla</groupId>
<artifactId>hilla-dev-mode</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- Spring -->
Expand Down
Loading