Merge remote-tracking branch 'remotes/origin/feature/forge' into develop

Author: LinneyS

.check-licenses.yml

@@ -0,0 +1,73 @@
+---
+- - :approve
+  - "@atlaskit/forge-react-types"
+  - :who:
+    :why: The Unlicense
+    :versions: []
+    :when: 2025-11-11 11:56:14.425456100 Z
+- - :approve
+  - "@atlaskit/navigation-system"
+  - :who:
+    :why: The Unlicense
+    :versions: []
+    :when: 2025-11-11 11:56:27.116344100 Z
+- - :approve
+  - "@forge/api"
+  - :who:
+    :why: Atlassian
+    :versions: []
+    :when: 2025-11-11 11:57:50.405959500 Z
+- - :approve
+  - "@forge/auth"
+  - :who:
+    :why: Atlassian
+    :versions: []
+    :when: 2025-11-11 11:57:50.405959500 Z
+- - :approve
+  - "@forge/bridge"
+  - :who:
+    :why: Atlassian
+    :versions: []
+    :when: 2025-11-11 11:57:50.405959500 Z
+- - :approve
+  - "@forge/egress"
+  - :who:
+    :why: Atlassian
+    :versions: []
+    :when: 2025-11-11 11:57:50.405959500 Z
+- - :approve
+  - "@forge/i18n"
+  - :who:
+    :why: Atlassian
+    :versions: []
+    :when: 2025-11-11 11:57:50.405959500 Z
+- - :approve
+  - "@forge/kvs"
+  - :who:
+    :why: Atlassian
+    :versions: []
+    :when: 2025-11-11 11:57:50.405959500 Z
+- - :approve
+  - "@forge/manifest"
+  - :who:
+    :why: Atlassian
+    :versions: []
+    :when: 2025-11-11 11:57:50.405959500 Z
+- - :approve
+  - "@forge/react"
+  - :who:
+    :why: Atlassian
+    :versions: []
+    :when: 2025-11-11 11:57:50.405959500 Z
+- - :approve
+  - "@forge/resolver"
+  - :who:
+    :why: Atlassian
+    :versions: []
+    :when: 2025-11-11 11:57:50.405959500 Z
+- - :approve
+  - "@forge/storage"
+  - :who:
+    :why: Atlassian
+    :versions: []
+    :when: 2025-11-11 11:57:50.405959500 Z

.config/source-license-header.js

@@ -0,0 +1,17 @@
+/**
+ *
+ * (c) Copyright Ascensio System SIA 2026
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */

.dockerignore

@@ -0,0 +1,51 @@
+const path = require("path");
+
+module.exports = {
+  parser: "@typescript-eslint/parser",
+  parserOptions: {
+    ecmaVersion: "latest",
+    sourceType: "module",
+    ecmaFeatures: { jsx: true }
+  },
+  env: {
+    browser: true,
+    es2021: true
+  },
+  plugins: ["@typescript-eslint", "react", "import", "prettier", "license-header"],
+  extends: [
+    "eslint:recommended",
+    "plugin:@typescript-eslint/recommended",
+    "plugin:react/recommended",
+    "prettier"
+  ],
+  rules: {
+    "quotes": ["error", "double", { "avoidEscape": true }],
+
+    "import/order": [
+      "error",
+      {
+        groups: ["builtin", "external", "internal", "parent", "sibling", "index"],
+        pathGroups: [
+          {
+            pattern: "react",
+            group: "external",
+            position: "before"
+          }
+        ],
+        pathGroupsExcludedImportTypes: ["react"],
+        "newlines-between": "always",
+        alphabetize: { order: "asc", caseInsensitive: true }
+      }
+    ],
+    "prettier/prettier": "error",
+    "license-header/header": [
+      "error",
+      path.resolve(__dirname, ".config/source-license-header.js")
+    ]
+  },
+  settings: {
+    react: {
+      version: "detect"
+    }
+  }
+};

.env.docker.example

@@ -9,6 +9,9 @@ on:
       - '**/LICENSE'
       - '**/README.md'
 
+permissions:
+  contents: write
+
 jobs:
   create-tag:
     runs-on: ubuntu-latest

.eslintrc.js

@@ -7,6 +7,9 @@ on:
   pull_request:
     branches: [master, develop]
 
+permissions:
+  contents: read
+
 jobs:
   licences:
     runs-on: ubuntu-latest
@@ -19,7 +22,21 @@ jobs:
           node-version: 22
       - name: Install Dependencies
         run: npm install
+      - name: Install Dependencies - Custom UI
+        run: npm install
+        working-directory: ./static/onlyoffice-confluence-cloud-custom-ui
+      - name: Get Repository License
+        id: license
+        run: |
+          license="${{ (github.event.repository.license.spdx_id) || (github.event.repository.licenses[0]) }}"
+          echo "License detected: $license"
+          echo "license=$license" >> $GITHUB_OUTPUT
       - name: Check Licenses
         uses: ONLYOFFICE/check-licenses@v1
         with:
-          project_license: Apache-2.0
+          project_license: ${{ steps.license.outputs.license }}
+      - name: Check Licenses - Custom UI
+        uses: ONLYOFFICE/check-licenses@v1
+        with:
+          project_license: ${{ steps.license.outputs.license }}
+          working_directory: ./static/onlyoffice-confluence-cloud-custom-ui

.github/workflows/build.yaml

@@ -2,10 +2,22 @@ name: Lint
 
 on:
   workflow_dispatch:
-  push:
-    branches: [master]
   pull_request:
+    types: [opened, reopened]
+    branches: [master, develop]
+    paths:
+      - '**/*.ts'
+      - '**/*.tsx'
+      - '**/*.yml'
+  push:
     branches: [master, develop]
+    paths:
+      - '**/*.ts'
+      - '**/*.tsx'
+      - '**/*.yml'
+
+permissions:
+  contents: read
 
 jobs:
   lint:
@@ -18,10 +30,10 @@ jobs:
       - name: Install NodeJS
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 22
 
       - name: Install Dependencies
         run: npm install
 
       - name: Code Linting
-        run: npm run lint
+        run: npm run eslint

.github/workflows/create-tag.yml

@@ -14,13 +14,36 @@ jobs:
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4
+      - name: Install NodeJS
+        uses: actions/setup-node@v4
+        with:
+          node-version: 22
+      - name: Install Forge CLI
+        run: npm install -g @forge/cli
+      - name: Disable Forge usage analytics
+        run: forge settings set usage-analytics false
+      - name: Install dependencies in Forge Root Project
+        run: npm install
+      - name: Install dependencies in Forge Custom UI Project
+        run: npm install
+        working-directory: ./static/onlyoffice-confluence-cloud-custom-ui
+      - name: Build Forge Custom UI Project
+        run: npm run build
+        working-directory:  ./static/onlyoffice-confluence-cloud-custom-ui
+      - name: Deploy Forge app
+        run: forge deploy --environment production --non-interactive
+        env:
+          FORGE_EMAIL: ${{ secrets.FORGE_EMAIL }}
+          FORGE_API_TOKEN: ${{ secrets.FORGE_API_TOKEN }}
+          FORGE_APP_ID: ${{ secrets.FORGE_APP_ID }}
+          FORGE_REMOTE_APP_URL: ${{ secrets.FORGE_REMOTE_APP_URL }}
       - name: Get Info
         run: |
           echo "version=$(grep -Eo '[0-9]+(\.[0-9]+)+' CHANGELOG.md | head -n 1)" >> $GITHUB_OUTPUT
         id: info
       - name: Generate Changelog
         run: |
-          awk 'BEGIN {found=0} /^## [0-9]/ {if (!found) {found=1; next} else exit} found {print}' CHANGELOG.md > RELEASE.md
+          awk '/## [0-9]/{p++} p; /## [0-9]/{if (p > 1) exit}' CHANGELOG.md | awk 'NR>2 {print last} {last=$0}' > RELEASE.md
       - name: Create Release
         uses: ncipollo/release-action@v1
         id: create_release