Merge remote-tracking branch 'origin/main' into epic/esl-media-manager

exadel-inc · Feb 4, 2025 · c22564f · c22564f
2 parents d495053 + 1f7b8dc
commit c22564f
Show file tree

Hide file tree

Showing 12 changed files with 165 additions and 146 deletions.
diff --git a/.github/workflows/release-pr.yml b/.github/workflows/release-pr.yml
@@ -3,6 +3,7 @@ name: Release PR
 on:
   push:
     branches: [ main ]
+  workflow_dispatch:
 
 permissions:
   contents: write
@@ -17,49 +18,65 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: google-github-actions/release-please-action@v4
-        id: ReleasePR
+      - id: ReleasePR
+        uses: google-github-actions/release-please-action@v4
         with:
-          default-branch: main
-          package-name: '@exadel/esl'
-          versioning-strategy: default
-          release-type: node
-          command: release-pr
-          changelog-types: '[
-            {"type":"feat", "section":"Features", "hidden":false},
-            {"type":"fix", "section":"Bug Fixes", "hidden":false},
-            {"type":"refactor", "section":"Refactoring", "hidden":false}
-          ]'
-          pull-request-title-pattern: 'chore${scope}: release ${component} v${version}'
-          labels: 'release: processed'
-          release-labels: 'released'
+          token: ${{ secrets.GITHUB_TOKEN }}
+          target-branch: main
+          skip-github-release: true
+          manifest-file: .release/manifest.json
+          config-file: .release/config-main.json
 
-      # The logic below handles the npm publication:
-      - if: ${{ steps.ReleasePR.outputs.release_created }}
+      # Fix version update process by running original node version process
+      - name: Extract SHA of the release PR
+        if: ${{ steps.ReleasePR.outputs.prs_created }}
+        run: echo "release_sha=$(echo '${{ steps.ReleasePR.outputs.pr }}' | jq -r '.sha')" >> $GITHUB_ENV
+      - if: ${{ steps.ReleasePR.outputs.prs_created }}
         uses: actions/checkout@v4
         with:
+          ref: ${{ env.release_sha }}
           persist-credentials: false
-
-      - if: ${{ steps.ReleasePR.outputs.release_created }}
+      - if: ${{ steps.ReleasePR.outputs.prs_created }}
         name: Use Node v${{ env.node-version }}
         uses: actions/setup-node@v4
         with:
           cache: 'npm'
           node-version: ${{ env.node-version }}
-
-      - if: ${{ steps.ReleasePR.outputs.release_created }}
+      - if: ${{ steps.ReleasePR.outputs.prs_created }}
         name: Install NPM Dependencies
         run: npm ci
 
-      - if: ${{ steps.ReleasePR.outputs.release_created }}
-        run: npm pack
+      #      - if: ${{ steps.ReleasePR.outputs.prs_created }}
+#        name: Update NPM Version
+#        run: 'npm version ${{ steps.ReleasePR.outputs.major}}.${{ steps.ReleasePR.outputs.minor}}.${{ steps.ReleasePR.outputs.patch}} --no-git-tag-version'
+
 
-      - if: ${{ steps.ReleasePR.outputs.release_created }}
-        name: Upload Release Artifact
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run:
-          gh release upload ${{ steps.ReleasePR.outputs.tag_name }} ./exadel-esl-${{steps.ReleasePR.outputs.major}}.${{steps.ReleasePR.outputs.minor}}.${{steps.ReleasePR.outputs.patch}}.tgz
+      # The logic below handles the npm publication:
+#      - if: ${{ steps.ReleasePR.outputs.release_created }}
+#        uses: actions/checkout@v4
+#        with:
+#          persist-credentials: false
+#
+#      - if: ${{ steps.ReleasePR.outputs.release_created }}
+#        name: Use Node v${{ env.node-version }}
+#        uses: actions/setup-node@v4
+#        with:
+#          cache: 'npm'
+#          node-version: ${{ env.node-version }}
+#
+#      - if: ${{ steps.ReleasePR.outputs.release_created }}
+#        name: Install NPM Dependencies
+#        run: npm ci
+#
+#      - if: ${{ steps.ReleasePR.outputs.release_created }}
+#        run: npm pack
+#
+#      - if: ${{ steps.ReleasePR.outputs.release_created }}
+#        name: Upload Release Artifact
+#        env:
+#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#        run:
+#          gh release upload ${{ steps.ReleasePR.outputs.tag_name }} ./exadel-esl-${{steps.ReleasePR.outputs.major}}.${{steps.ReleasePR.outputs.minor}}.${{steps.ReleasePR.outputs.patch}}.tgz
 
 #      - if: ${{ steps.ReleasePR.outputs.release_created }}
 #        name: Provide NPM Token

diff --git a/.release/config-main.json b/.release/config-main.json
@@ -0,0 +1,16 @@
+{
+  "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json",
+  "bootstrap-sha": "5015e1a3fd8040bc25d8332ab0aeb6659459b3dd",
+  "always-update": true,
+  "plugins": [],
+  "include-v-in-tag": true,
+  "pull-request-header": "chore: release ${version}",
+  "group-pull-request-title-pattern": "chore: release ${version}",
+  "packages": {
+    ".": {
+      "update-type": "node",
+      "changelog-path": "CHANGELOG.md",
+      "updateAllPackages": true
+    }
+  }
+}
diff --git a/.release/manifest.json b/.release/manifest.json
@@ -0,0 +1,3 @@
+{
+  ".": "5.0.0"
+}
diff --git a/e2e/package.json b/e2e/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "@exadel/esl-snapshot-tests",
-  "version": "5.0.1-beta.2",
+  "version": "5.0.0",
   "description": "Integration snapshot tests for ESL",
   "homepage": "https://esl-ui.com/",
   "license": "MIT",

diff --git a/eslint-config/package.json b/eslint-config/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@exadel/eslint-config-esl",
   "private": false,
-  "version": "5.0.1-beta.2",
+  "version": "5.0.0",
   "keywords": [
     "eslint",
     "eslint-config",
@@ -23,12 +23,12 @@
   },
   "dependencies": {
     "@eslint/js": "^9.19.0",
-    "@stylistic/eslint-plugin": "^3.0.0",
+    "@stylistic/eslint-plugin": "^3.0.1",
     "eslint-plugin-editorconfig": "^4.0.3",
     "eslint-plugin-import-x": "^4.6.1",
     "eslint-plugin-sonarjs": "^1.0.4",
     "eslint-plugin-tsdoc": "^0.4.0",
-    "typescript-eslint": "^8.22.0"
+    "typescript-eslint": "^8.23.0"
   },
   "peerDependencies": {
     "eslint": ">=9.0.0"

diff --git a/eslint-plugin/package.json b/eslint-plugin/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@exadel/eslint-plugin-esl",
   "private": false,
-  "version": "5.0.1-beta.2",
+  "version": "5.0.0",
   "keywords": [
     "eslint",
     "eslint-plugin",
@@ -26,7 +26,7 @@
   },
   "dependencies": {
     "kleur": "^4.1.5",
-    "semver": "^7.6.3"
+    "semver": "^7.7.1"
   },
   "devDependencies": {
     "@types/eslint": "^9.6.1"