From d2983df93a40017817969ad80c608cd33e9f1e5d Mon Sep 17 00:00:00 2001 From: Javier Godoy <11554739+javier-godoy@users.noreply.github.com> Date: Wed, 3 Jul 2024 16:01:24 -0300 Subject: [PATCH 1/2] chore: ignore frontend/generated --- .gitignore | 1 + frontend/generated/index.ts | 32 ----------------------- frontend/generated/vaadin-featureflags.ts | 10 ------- frontend/generated/vaadin.ts | 5 ---- 4 files changed, 1 insertion(+), 47 deletions(-) delete mode 100644 frontend/generated/index.ts delete mode 100644 frontend/generated/vaadin-featureflags.ts delete mode 100644 frontend/generated/vaadin.ts diff --git a/.gitignore b/.gitignore index 1efccc9..c6178b4 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ types.d.ts /frontend/generated/index.ts /frontend/generated/vaadin.ts /frontend/index.html +/frontend/generated diff --git a/frontend/generated/index.ts b/frontend/generated/index.ts deleted file mode 100644 index 4d3647d..0000000 --- a/frontend/generated/index.ts +++ /dev/null @@ -1,32 +0,0 @@ -/****************************************************************************** - * 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); diff --git a/frontend/generated/vaadin-featureflags.ts b/frontend/generated/vaadin-featureflags.ts deleted file mode 100644 index 0f81f16..0000000 --- a/frontend/generated/vaadin-featureflags.ts +++ /dev/null @@ -1,10 +0,0 @@ -// @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; -window.Vaadin.featureFlags.spreadsheetComponent = false; -window.Vaadin.featureFlags.hillaPush = false; -window.Vaadin.featureFlags.newLicenseChecker = false; -window.Vaadin.featureFlags.collaborationEngineBackend = false; \ No newline at end of file diff --git a/frontend/generated/vaadin.ts b/frontend/generated/vaadin.ts deleted file mode 100644 index b25c68c..0000000 --- a/frontend/generated/vaadin.ts +++ /dev/null @@ -1,5 +0,0 @@ -import './vaadin-featureflags.ts'; - -import './index'; - -import '@vaadin/flow-frontend/vaadin-dev-tools.js'; From e89c546bdbafc0c5aec067363f831a392d251a7b Mon Sep 17 00:00:00 2001 From: Javier Godoy <11554739+javier-godoy@users.noreply.github.com> Date: Wed, 3 Jul 2024 16:07:33 -0300 Subject: [PATCH 2/2] ci: update github workflows for Vaadin 23 branch --- .github/workflows/vaadin-23.yml | 30 +++++++++++++++++++ .../workflows/{maven.yml => vaadin-24.yml} | 15 +--------- 2 files changed, 31 insertions(+), 14 deletions(-) create mode 100644 .github/workflows/vaadin-23.yml rename .github/workflows/{maven.yml => vaadin-24.yml} (69%) diff --git a/.github/workflows/vaadin-23.yml b/.github/workflows/vaadin-23.yml new file mode 100644 index 0000000..5cc21e8 --- /dev/null +++ b/.github/workflows/vaadin-23.yml @@ -0,0 +1,30 @@ +# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time +# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven + +# This workflow uses actions that are not certified by GitHub. +# They are provided by a third-party and are governed by +# separate terms of service, privacy policy, and support +# documentation. + +name: Java CI with Maven + +on: + push: + branches: [ "v23" ] + pull_request: + branches: [ "v23" ] + +jobs: + + build-vaadin23: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Set up JDK + uses: actions/setup-java@v3 + with: + java-version: '11' + distribution: 'temurin' + cache: maven + - name: Build (Vaadin 23) + run: mvn -B package --file pom.xml diff --git a/.github/workflows/maven.yml b/.github/workflows/vaadin-24.yml similarity index 69% rename from .github/workflows/maven.yml rename to .github/workflows/vaadin-24.yml index 66dc277..95c3fe2 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/vaadin-24.yml @@ -15,19 +15,6 @@ on: branches: [ "master" ] jobs: - - build-vaadin23: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: Set up JDK - uses: actions/setup-java@v3 - with: - java-version: '11' - distribution: 'temurin' - cache: maven - - name: Build (Vaadin 23) - run: mvn -B package --file pom.xml build-vaadin24: runs-on: ubuntu-latest @@ -40,4 +27,4 @@ jobs: distribution: 'temurin' cache: maven - name: Build (Vaadin 24) - run: mvn -B package --file pom.xml -Pv24 \ No newline at end of file + run: mvn -B package --file pom.xml \ No newline at end of file