Merge pull request #2727 from AlchemyCMS/depfu/update/yarn/tinymce-6.8.3

[js] Update tinymce 6.8.2 → 6.8.3 (patch)

.github/workflows/brakeman-analysis.yml

@@ -19,7 +19,7 @@ jobs:
     steps:
       # Checkout the repository to the GitHub Actions runner
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # Customize the ruby version depending on your needs
       - name: Set up Ruby

.github/workflows/test.yml → .github/workflows/build_test.yml

@@ -1,10 +1,67 @@
-name: Test
+name: Build & Test
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - main
+      - 7.1-stable
+      - 7.0-stable
+      - 6.1-stable
+  pull_request:
 
 jobs:
+  check_yarn_lock:
+    runs-on: ubuntu-latest
+    name: Check yarn.lock
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Get changed files
+        id: changed-yarn-lock
+        uses: tj-actions/changed-files@v41
+        with:
+          files: yarn.lock
+    outputs:
+      yarn_lock_changed: ${{ steps.changed-yarn-lock.outputs.any_changed }}
+
+  Build:
+    runs-on: ubuntu-latest
+    name: Build JS packages
+    needs: check_yarn_lock
+    if: ${{ needs.check_yarn_lock.outputs.yarn_lock_changed }}
+    permissions:
+      contents: write
+      pull-requests: read
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.head_ref }}
+          persist-credentials: false
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          cache: "yarn"
+      - name: Restore node_modules cache
+        uses: actions/cache@v4
+        with:
+          path: node_modules
+          key: ${{ runner.os }}-node-modules-${{ hashFiles('yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-node-modules
+      - name: Install dependencies
+        run: yarn install
+      - name: YARN build
+        run: yarn build
+      - uses: actions/upload-artifact@v4
+        if: success()
+        with:
+          name: Javascripts
+          path: vendor/javascript
+
   RSpec:
     runs-on: ubuntu-latest
+    needs: Build
     strategy:
       fail-fast: false
       matrix:
@@ -56,15 +113,15 @@ jobs:
           MARIADB_ROOT_PASSWORD: password
         options: --health-cmd="mariadb-admin ping" --health-interval=10s --health-timeout=5s --health-retries=5
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
       - name: Restore apt cache
         id: apt-cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: /home/runner/apt/cache
           key: ${{ runner.os }}-apt-${{ matrix.database }}
@@ -84,14 +141,6 @@ jobs:
           sudo apt update -qq
           sudo apt install -qq --fix-missing libmysqlclient-dev -o dir::cache::archives="/home/runner/apt/cache"
           sudo chown -R runner /home/runner/apt/cache
-      - name: Restore node modules cache
-        id: yarn-cache
-        uses: actions/cache@v3
-        with:
-          path: spec/dummy/node_modules
-          key: ${{ runner.os }}-yarn-dummy-${{ hashFiles('./package.json') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-dummy-
       - name: Prepare database
         run: |
           bundle exec rake alchemy:spec:prepare
@@ -101,19 +150,20 @@ jobs:
           CC_TEST_REPORTER_ID: bca4349e32f97919210ac8a450b04904b90683fcdd57d65a22c0f5065482bc22
         with:
           coverageCommand: bundle exec rspec
-      - uses: actions/upload-artifact@main
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: Screenshots
           path: spec/dummy/tmp/screenshots
+
   Jest:
     runs-on: ubuntu-latest
     env:
       NODE_ENV: test
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Restore node modules cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: node_modules
           key: ${{ runner.os }}-yarn-${{ hashFiles('./package.json') }}

.github/workflows/lint.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install Ruby and gems
         uses: ruby/setup-ruby@v1
         with:
@@ -19,13 +19,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: "18"
       - name: Restore node_modules cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: node_modules
           key: ${{ runner.os }}-node-modules-${{ hashFiles('package.json') }}
@@ -39,13 +39,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: "18"
       - name: Restore node_modules cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: node_modules
           key: ${{ runner.os }}-node-modules-${{ hashFiles('package.json') }}

.github/workflows/update_js.yml

@@ -0,0 +1,42 @@
+name: Update JS packages
+
+on:
+  push:
+    branches:
+      - main
+      - 7.1-stable
+      - 7.0-stable
+      - 6.1-stable
+
+jobs:
+  update_js_packages:
+    runs-on: ubuntu-latest
+    name: Update JS packages
+    permissions:
+      contents: write
+      pull-requests: read
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.ref }}
+          persist-credentials: false
+      - uses: actions/download-artifact@v4
+        with:
+          name: Javascripts
+          path: vendor/javascript
+      - name: Check git status
+        id: git-status
+        run: git diff --quiet || echo "changed=true" >> $GITHUB_OUTPUT
+      - name: git commit
+        if: steps.git-status.outputs.changed == 'true'
+        run: |
+          git config --local user.name 'AlchemyCMS - CI Bot'
+          git config --local user.email 'alchemy@blish.cloud'
+          git add vendor/javascript
+          git commit -m "Update JS packages" -m "Rebuilt packages due to updated dependencies. [skip ci]"
+      - name: Push changes
+        if: steps.git-status.outputs.changed == 'true'
+        uses: ad-m/github-push-action@master
+        with:
+          github_token: ${{ secrets.ALCHEMY_CI_BOT_ACCESS_TOKEN }}
+          branch: ${{ github.ref }}

package.json

@@ -17,7 +17,7 @@
     "flatpickr": "^4.6.13",
     "keymaster": "^1.6.2",
     "sortablejs": "^1.15.2",
-    "tinymce": "^6.8.2"
+    "tinymce": "^6.8.3"
   },
   "devDependencies": {
     "@babel/core": "^7.23.7",

yarn.lock

@@ -4042,10 +4042,10 @@ tiny-emitter@^2.0.0:
   resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz#1d1a56edfc51c43e863cbb5382a72330e3555423"
   integrity sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==
 
-tinymce@^6.8.2:
-  version "6.8.2"
-  resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-6.8.2.tgz#567b1a0d922555b535de4c74b7c74af6964016ea"
-  integrity sha512-Lho79o2Y1Yn+XdlTEkHTEkEmzwYWTXz7IUsvPwxJF3VTtgHUIAAuBab29kik+f2KED3rZvQavr9D7sHVMJ9x4A==
+tinymce@^6.8.3:
+  version "6.8.3"
+  resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-6.8.3.tgz#0025a4aaa4c24dc2a3e32e83dfda705d196fd802"
+  integrity sha512-3fCHKAeqT+xNwBVESf6iDbDV0VNwZNmfrkx9c/6Gz5iB8piMfaO6s7FvoiTrj1hf1gVbfyLTnz1DooI6DhgINQ==
 
 tmpl@1.0.5:
   version "1.0.5"