从早期 Hilla 版本升级

<properties>
-    <hilla.version>2.x</hilla.version>
+    <vaadin.version>24.4.0</vaadin.version>
</properties>

<dependencyManagement>
    <dependencies>
-        <dependency>
-            <groupId>dev.hilla</groupId>
-            <artifactId>hilla-bom</artifactId>
-            <version>${hilla.version}</version>
-            <type>pom</type>
-            <scope>import</scope>
-        </dependency>
+        <dependency>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-bom</artifactId>
+            <version>${vaadin.version}</version>
+            <type>pom</type>
+            <scope>import</scope>
+        </dependency>
    </dependencies>
</dependencyManagement>

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

<dependencies>
-    <dependency>
-        <groupId>dev.hilla</groupId>
-        <artifactId>hilla-spring-boot-starter</artifactId>
-    </dependency>
+    <dependency>
+        <groupId>com.vaadin</groupId>
+        <artifactId>vaadin-spring-boot-starter</artifactId>
+    </dependency>
</dependencies>

<dependencies>
-    <dependency>
-        <groupId>dev.hilla</groupId>
-        <artifactId>hilla-react-spring-boot-starter</artifactId>
-    </dependency>
+    <dependency>
+        <groupId>com.vaadin</groupId>
+        <artifactId>vaadin-spring-boot-starter</artifactId>
+    </dependency>
</dependencies>

<build>
    <plugins>
-       <plugin>
-           <groupId>dev.hilla</groupId>
-           <artifactId>hilla-maven-plugin</artifactId>
-       </plugin>
+       <plugin>
+           <groupId>com.vaadin</groupId>
+           <artifactId>vaadin-maven-plugin</artifactId>
+       </plugin>
    </plugins>
</build>

<dependencies>
    <!-- other dependencies -->
-   <dependency>
-       <groupId>dev.hilla</groupId>
-       <artifactId>hilla-react</artifactId>
-   </dependency>
    <!-- other dependencies -->
</dependencies>

- import dev.hilla.BrowserCallable;
- import dev.hilla.Nullable;
- import dev.hilla.crud.CrudRepositoryService;
+ import com.vaadin.hilla.BrowserCallable;
+ import com.vaadin.hilla.Nullable;
+ import com.vaadin.hilla.crud.CrudRepositoryService;

- import { Binder, field } from '@hilla/form';
+ import { Binder, field } from '@vaadin/hilla-lit-form';

- import { TextField } from '@hilla/react-components/TextField.js';
+ import { TextField } from '@vaadin/react-components/TextField.js';

- import { something } from '@hilla/some-module';
+ import { something } from '@vaadin/hilla-some-module';

- import type FilterUnion from 'Frontend/generated/dev/hilla/crud/filter/FilterUnion.js';
- import type OrFilter from 'Frontend/generated/dev/hilla/crud/filter/OrFilter.js';
+ import type FilterUnion from 'Frontend/generated/com/vaadin/hilla/crud/filter/FilterUnion.js';
+ import type OrFilter from 'Frontend/generated/com/vaadin/hilla/crud/filter/OrFilter.js';

- import { login as loginImpl, LoginResult, logout as logoutImpl } from '@vaadin/hilla-frontend';
+ import { login as loginImpl, LoginOptions, LoginResult, logout as logoutImpl, LogoutOptions } from '@vaadin/hilla-frontend';
import { appStore } from './stores/app-store';

// ...

/**
 * Login wrapper method that retrieves user information.
 */
export async function login(username: string, password: string, options: LoginOptions = {}): Promise<LoginResult> {
-   const result = await loginImpl(username, password);
-   if (!result.error) {
-     // Get user info from endpoint
-     await appStore.fetchUserInfo();
-   }
-   return result;
+   return await loginImpl(username, password, {
+     ...options,
+     async onSuccess() {
+       // Get user info from endpoint
+       await appStore.fetchUserInfo();
+     },
+   });
}

/**
 * Logout wrapper method that retrieves user information.
 */
export async function logout(options: LogoutOptions = {}) {
-   await logoutImpl();
-   appStore.clearUserInfo();
+   await logoutImpl({
+     ...options,
+     onSuccess() {
+       appStore.clearUserInfo();
+     },
+   });
}

// ...

export class LoginView extends LitElement implements AfterEnterObserver {
  // the url to redirect to after a successful login
  private returnUrl?: string;

-  private onSuccess = (result: LoginResult) => {
-    window.location.href = result.redirectUrl || this.returnUrl || result.defaultUrl || '/';
-  };
-

// ...

  async login(event: CustomEvent): Promise<LoginResult> {
    this.error = false;
    // use the login helper method from auth.ts, which in turn uses
    // Vaadin provided login helper method to obtain the LoginResult
-    const result = await login(event.detail.username, event.detail.password);
+    const result = await login(event.detail.username, event.detail.password, {
+      navigate: (toPath: string) => {
+        // Consider absolute path to be within the application context.
+        const serverUrl = toPath.startsWith('/') ? new URL(`.${toPath}`, document.baseURI) : toPath;
+
+        // If a login redirect was initiated by the client router, this.returnUrl contains the original destination.
+        // Otherwise, use the URL provided by the server.
+        // As we do not know if the target is a resource or a Hilla view or a Flow view, we cannot just use Router.go
+        window.location.replace(this.returnUrl ?? serverUrl);
+      }
+    });
    this.error = result.error;

-    if (!result.error) {
-      this.onSuccess(result);
-    }
-
    return result;
  }
}

export default function LoginView() {
  const hasError = useSignal<boolean>(false);

-  if (state.user && url.value) {
-    const path = new URL(url.value, document.baseURI).pathname;
-    return <NavigateAndReload to={path} />;
-  }
-
  return (
    <LoginOverlay
      opened
      error={hasError.value}
      noForgotPassword
      onLogin={async ({ detail: { username, password } }) => {
-        const { defaultUrl, error, redirectUrl } = await login(username, password);
-
-        if (error) {
-          hasError.value = true;
-        } else {
-          url.value = redirectUrl ?? defaultUrl ?? '/';
-        }
+        const { error } = await login(username, password);
+        hasError.value = Boolean(error);
      }}
    />
  );
}

- hillaVersion=2.x
+ vaadinVersion=24.4.x

dependencyManagement {
    imports {
-        implementation platform('dev.hilla:hilla-bom:${hillaVersion}')
+        implementation platform('com.vaadin:vaadin-bom:${vaadinVersion}')
    }
}

dependencies {
-    implementation 'dev.hilla:hilla'
+    implementation 'com.vaadin:vaadin'
}

dependencies {
-    implementation 'dev.hilla:hilla-spring-boot-starter'
+    implementation 'com.vaadin:vaadin-spring-boot-starter'
}

dependencies {
-    implementation 'dev.hilla:hilla-react-spring-boot-starter'
+    implementation 'com.vaadin:vaadin-spring-boot-starter'
}

plugins {
-    id 'dev.hilla' version '2.x'
+    id 'com.vaadin' version '24.4.0'
}

dependencies {
-    implementation 'dev.hilla:hilla-react'
}

./gradlew -Pvaadin.productionMode build

<hilla.version>2.0.0</hilla.version>

<dependency>
    <groupId>jakarta.servlet</groupId>
    <artifactId>jakarta.servlet-api</artifactId>
    <version>6.0.0</version>
</dependency>
<dependency>
    <groupId>jakarta.annotation</groupId>
    <artifactId>jakarta.annotation-api</artifactId>
    <version>2.1.0</version>
</dependency>
<dependency>
    <groupId>jakarta.enterprise</groupId>
    <artifactId>jakarta.enterprise.cdi-api</artifactId>
    <version>4.0.0</version>
</dependency>
<dependency>
    <groupId>jakarta.enterprise.concurrent</groupId>
    <artifactId>jakarta.enterprise.concurrent-api</artifactId>
    <version>3.0.0</version>
</dependency>

<parent>
    <groupId>org.springframework.boot</groupId>
    <artifactId>spring-boot-starter-parent</artifactId>
    <version>3.0.2</version>
</parent>

<groupId>com.vaadin.hilla</groupId>
<artifactId>hilla-maven-plugin</artifactId>
<version>${hilla.version}</version>