Merge branch 'lts-2025' into lts-2025_merge

.github/workflows/cleanup.yaml

@@ -4,7 +4,7 @@ on:
   pull_request:
     types: [closed, unlabeled]
     branches:
-      - maintenance-3.1.x
+      - lts-2025
 
 env:
   GKE_CLUSTER: jx-prod
@@ -52,6 +52,6 @@ jobs:
           repo: nuxeo-web-ui
           workflow-id: clean.yaml
           access-token: ${{ secrets.WEBUI_ACCESS_TOKEN_PERSONAL }}
-          branch-name: maintenance-3.1.x
+          branch-name: lts-2025
           inputs: |
             branch_name: ${{ env.BRANCH_NAME }}

.github/workflows/cross-repo.yaml

@@ -3,12 +3,12 @@ name: Web UI
 on:
   pull_request:
     branches:
-      - maintenance-3.1.x
+      - lts-2025
   workflow_call:
     inputs:
       branch:
         description: 'The current branch'
-        default: maintenance-3.1.x
+        default: lts-2025
         type: string
         required: false
     secrets:
@@ -17,7 +17,7 @@ on:
         required: true
 
 env:
-  BRANCH_NAME: ${{ github.head_ref || inputs.branch || 'maintenance-3.1.x' }}
+  BRANCH_NAME: ${{ github.head_ref || inputs.branch || 'lts-2025' }}
 
 jobs:
   web-ui:
@@ -32,7 +32,7 @@ jobs:
           repo: nuxeo-web-ui
           workflow-id: cross-repo.yaml
           access-token: ${{ secrets.WEBUI_ACCESS_TOKEN_PERSONAL }}
-          branch-name: maintenance-3.1.x
+          branch-name: lts-2025
           inputs: |
             branch_name: ${{ env.BRANCH_NAME }}
             sauce_labs: true

.github/workflows/crowdin.yaml

@@ -6,10 +6,10 @@ on:
   schedule:
     - cron: '0 0 * * *'
 
-  # Sync when a commit is done on maintenance-3.1.x
+  # Sync when a commit is done on lts-2025
   push:
     branches:
-      - maintenance-3.1.x
+      - lts-2025
     paths:
       - 'ui/i18n/messages.json'
 

.github/workflows/lint.yaml

@@ -3,12 +3,12 @@ name: Lint
 on:
   pull_request:
     branches:
-      - maintenance-3.1.x
+      - lts-2025
   workflow_call:
     inputs:
       branch:
         description: 'The current branch'
-        default: maintenance-3.1.x
+        default: lts-2025
         type: string
         required: false
     secrets:
@@ -17,7 +17,7 @@ on:
         required: true
 
 env:
-  BRANCH_NAME: ${{ github.head_ref || inputs.branch || 'maintenance-3.1.x' }}
+  BRANCH_NAME: ${{ github.head_ref || inputs.branch || 'lts-2025' }}
 
 jobs:
   lint:

.github/workflows/main.yaml

@@ -3,7 +3,7 @@ name: Build
 on:
   push:
     branches:
-      - maintenance-3.1.x
+      - lts-2025
 
   # Manually trigger the workflow
   workflow_dispatch:
@@ -14,24 +14,24 @@ env:
 
 jobs:
   lint:
-    uses: nuxeo/nuxeo-elements/.github/workflows/lint.yaml@maintenance-3.1.x
+    uses: nuxeo/nuxeo-elements/.github/workflows/lint.yaml@lts-2025
     secrets:
       NPM_PACKAGES_TOKEN: ${{ secrets.NPM_PACKAGES_TOKEN }}
 
   test:
-    uses: nuxeo/nuxeo-elements/.github/workflows/test.yaml@maintenance-3.1.x
+    uses: nuxeo/nuxeo-elements/.github/workflows/test.yaml@lts-2025
     secrets:
       NPM_PACKAGES_TOKEN: ${{ secrets.NPM_PACKAGES_TOKEN }}
       SAUCE_ACCESS_KEY: ${{ secrets.SAUCE_ACCESS_KEY }}
     with:
-      branch: maintenance-3.1.x
+      branch: lts-2025
 
   storybook:
-    uses: nuxeo/nuxeo-elements/.github/workflows/storybook.yaml@maintenance-3.1.x
+    uses: nuxeo/nuxeo-elements/.github/workflows/storybook.yaml@lts-2025
     secrets:
       NPM_PACKAGES_TOKEN: ${{ secrets.NPM_PACKAGES_TOKEN }}
     with:
-      branch: maintenance-3.1.x
+      branch: lts-2025
 
   build:
     runs-on: ubuntu-latest

.github/workflows/preview.yaml

@@ -4,7 +4,7 @@ on:
   pull_request:
     types: [opened, synchronize, reopened, labeled]
     branches:
-      - maintenance-3.1.x
+      - lts-2025
 
 env:
   DOCKER_REGISTRY: us-east1-docker.pkg.dev
@@ -134,7 +134,7 @@ jobs:
           repo: nuxeo-web-ui
           workflow-id: preview.yaml
           access-token: ${{ secrets.WEBUI_ACCESS_TOKEN_PERSONAL }}
-          branch-name: maintenance-3.1.x
+          branch-name: lts-2025
           inputs: |
             branch_name: ${{ env.BRANCH_NAME }}
 

.github/workflows/promote.yaml

@@ -4,12 +4,12 @@ on:
   workflow_dispatch:
     inputs:
       version:
-        description: 'Version to promote'     
+        description: 'Version to promote (eg: 2025.1.0-rc.1)'
         required: true
       referenceBranch:
         description: 'Branch to be updated after the promotion'
         required: true
-        default: 'maintenance-3.1.x'
+        default: 'lts-2025'
       dryRun:
         description: 'Run the workflow without pushing code or publishing artifacts'
         type: boolean
@@ -34,7 +34,8 @@ jobs:
 
       - run: git config user.name "nuxeo-webui-jx-bot" && git config user.email "[email protected]"
 
-      - run: echo "VERSION=$(echo '${{ github.event.inputs.version }}' | sed -e 's/-rc.[0-9]*//')" >> $GITHUB_ENV
+      # Extract VERSION from the new format 2025.x.0-rc.y to get 2025.x.0
+      - run: echo "VERSION=$(echo '${{ github.event.inputs.version }}' | sed -E 's/-rc\.[0-9]+//')" >> $GITHUB_ENV
 
       - name: Update Nuxeo Elements version to ${{ env.VERSION }}
         run: |
@@ -81,7 +82,7 @@ jobs:
         run: echo "NEW_VERSION=$(npx semver -i minor $VERSION)-SNAPSHOT" >> $GITHUB_ENV
 
       - if: ${{ github.event.inputs.referenceBranch != 'master' }}
-        run: echo "NEW_VERSION=$(npx semver -i patch $VERSION)-SNAPSHOT" >> $GITHUB_ENV
+        run: echo "NEW_VERSION=$(npx semver -i minor $VERSION)-SNAPSHOT" >> $GITHUB_ENV
 
       - name: Align ${{ github.event.inputs.referenceBranch }} branch on next version ${{ env.NEW_VERSION }}
         run: |

.github/workflows/storybook.yaml

@@ -3,12 +3,12 @@ name: Storybook
 on:
   pull_request:
     branches:
-      - maintenance-3.1.x
+      - lts-2025
   workflow_call:
     inputs:
       branch:
         description: 'The current branch'
-        default: maintenance-3.1.x
+        default: lts-2025
         type: string
         required: false
     secrets:
@@ -17,7 +17,7 @@ on:
         required: true
 
 env:
-  BRANCH_NAME: ${{ github.head_ref || inputs.branch || 'maintenance-3.1.x' }}
+  BRANCH_NAME: ${{ github.head_ref || inputs.branch || 'lts-2025' }}
 
 jobs:
   storybook:
@@ -51,7 +51,7 @@ jobs:
           npx build-storybook -o dist -s ./public
 
       - name: Deploy
-        if: ${{ env.BRANCH_NAME == 'maintenance-3.1.x' }}
+        if: ${{ env.BRANCH_NAME == 'lts-2025' }}
         env:
           GH_TOKEN: ${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}
           NODE_OPTIONS: --openssl-legacy-provider

.github/workflows/test.yaml

@@ -3,12 +3,12 @@ name: Test
 on:
   pull_request:
     branches:
-      - maintenance-3.1.x
+      - lts-2025
   workflow_call:
     inputs:
       branch:
         description: 'The current branch'
-        default: maintenance-3.1.x
+        default: lts-2025
         type: string
         required: false
     secrets:
@@ -20,7 +20,7 @@ on:
         required: true
 
 env:
-  BRANCH_NAME: ${{ github.head_ref || inputs.branch || 'maintenance-3.1.x' }}
+  BRANCH_NAME: ${{ github.head_ref || inputs.branch || 'lts-2025' }}
 
 jobs:
   test:

core/package.json

@@ -7,7 +7,7 @@
   ],
   "repository": "nuxeo/nuxeo-elements.git",
   "name": "@nuxeo/nuxeo-elements",
-  "version": "3.1.16-SNAPSHOT",
+  "version": "2025.1.0-SNAPSHOT",
   "author": "Nuxeo",
   "license": "Apache-2.0",
   "scripts": {
@@ -21,7 +21,7 @@
   },
   "devDependencies": {
     "@nuxeo/moment": "^2.24.0-nx.0",
-    "@nuxeo/testing-helpers": "^3.1.16-SNAPSHOT",
+    "@nuxeo/testing-helpers": "^2025.1.0-SNAPSHOT",
     "@polymer/iron-component-page": "^4.0.0",
     "polymer-cli": "^1.8.0"
   },

dataviz/package.json

@@ -9,15 +9,15 @@
   ],
   "repository": "nuxeo/nuxeo-elements.git",
   "name": "@nuxeo/nuxeo-dataviz-elements",
-  "version": "3.1.16-SNAPSHOT",
+  "version": "2025.1.0-SNAPSHOT",
   "author": "Nuxeo",
   "license": "Apache-2.0",
   "scripts": {
     "docs": "polymer analyze . > analysis.json && npm run serve",
     "serve": "polymer serve --npm -c ../node_modules"
   },
   "devDependencies": {
-    "@nuxeo/testing-helpers": "^3.1.16-SNAPSHOT",
+    "@nuxeo/testing-helpers": "^2025.1.0-SNAPSHOT",
     "@polymer/iron-component-page": "^4.0.0",
     "@polymer/test-fixture": "^4.0.2",
     "@webcomponents/webcomponentsjs": "^2.0.0",
@@ -32,7 +32,7 @@
   "main": "nuxeo-dataviz-elements.js",
   "dependencies": {
     "@nuxeo/moment": "^2.24.0-nx.0",
-    "@nuxeo/nuxeo-elements": "^3.1.16-SNAPSHOT",
+    "@nuxeo/nuxeo-elements": "^2025.1.0-SNAPSHOT",
     "@polymer/polymer": "^3.0.0",
     "moment": "2.30.1"
   }

lerna.json

@@ -2,6 +2,6 @@
   "packages": [
     "*"
   ],
-  "version": "3.1.16-SNAPSHOT",
+  "version": "2025.1.0-SNAPSHOT",
   "hoist": true
 }

package.json

@@ -3,7 +3,7 @@
   "repository": "nuxeo/nuxeo-elements.git",
   "name": "nuxeo-elements",
   "private": true,
-  "version": "3.1.16-SNAPSHOT",
+  "version": "2025.1.0-SNAPSHOT",
   "author": "Nuxeo",
   "license": "Apache-2.0",
   "engines": {

storybook/package.json

@@ -2,15 +2,15 @@
   "description": "Nuxeo Web Components Storybook",
   "repository": "nuxeo/nuxeo-elements.git",
   "name": "@nuxeo/nuxeo-elements-storybook",
-  "version": "3.1.16-SNAPSHOT",
+  "version": "2025.1.0-SNAPSHOT",
   "author": "Nuxeo",
   "license": "Apache-2.0",
   "private": true,
   "dependencies": {
     "@babel/core": "^7.3.4",
-    "@nuxeo/nuxeo-elements": "^3.1.16-SNAPSHOT",
-    "@nuxeo/nuxeo-ui-elements": "^3.1.16-SNAPSHOT",
-    "@nuxeo/testing-helpers": "^3.1.16-SNAPSHOT",
+    "@nuxeo/nuxeo-elements": "^2025.1.0-SNAPSHOT",
+    "@nuxeo/nuxeo-ui-elements": "^2025.1.0-SNAPSHOT",
+    "@nuxeo/testing-helpers": "^2025.1.0-SNAPSHOT",
     "@polymer/iron-icon": "^3.0.0",
     "@polymer/iron-meta": "^3.0.1",
     "@polymer/polymer": "^3.0.0",

testing-helpers/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxeo/testing-helpers",
-  "version": "3.1.16-SNAPSHOT",
+  "version": "2025.1.0-SNAPSHOT",
   "description": "Nuxeo Web Components Testing Helpers",
   "keywords": [
     "nuxeo",

ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxeo/nuxeo-ui-elements",
-  "version": "3.1.16-SNAPSHOT",
+  "version": "2025.1.0-SNAPSHOT",
   "description": "Nuxeo UI Web Components.",
   "keywords": [
     "nuxeo",
@@ -18,15 +18,15 @@
     "serve": "polymer serve --npm -c ../node_modules"
   },
   "devDependencies": {
-    "@nuxeo/testing-helpers": "^3.1.16-SNAPSHOT",
+    "@nuxeo/testing-helpers": "^2025.1.0-SNAPSHOT",
     "@polymer/iron-component-page": "^4.0.0",
     "@webcomponents/webcomponentsjs": "^2.0.0",
     "polymer-cli": "^1.8.0"
   },
   "main": "nuxeo-ui-elements.js",
   "dependencies": {
     "@nuxeo/moment": "^2.24.0-nx.0",
-    "@nuxeo/nuxeo-elements": "^3.1.16-SNAPSHOT",
+    "@nuxeo/nuxeo-elements": "^2025.1.0-SNAPSHOT",
     "@nuxeo/paper-typeahead": "^0.6.0-nx.0",
     "@nuxeo/quill": "^2.0.0-dev.3-nx.3",
     "@polymer/iron-autogrow-textarea": "^3.0.1",