Merge: next → feat/new-admin-ui

.github/labeler-config.yml

@@ -4,4 +4,4 @@
 
 new-admin-ui:
   - changed-files:
-      - any-glob-to-any-file: 'packages/admin-ui/**'
+      - any-glob-to-any-file: "packages/admin-ui/**"

.github/workflows/chromaticStorybook.yml

@@ -1,4 +1,4 @@
-name: 'Chromatic - Storybook Preview'
+name: "Chromatic - Storybook Preview"
 
 # The events that will trigger the action
 on:

.github/workflows/cleanup.yml

@@ -4,7 +4,7 @@ name: Cloud infrastructure Cleanup
 on:
   workflow_dispatch:
   repository_dispatch:
-    types: [ cleanup-infrastructure ]
+    types: [cleanup-infrastructure]
   schedule:
     - cron: "0 2 * * *" # Every day at 2AM.
 

.github/workflows/codeql-analysis.yml

@@ -12,7 +12,7 @@ on:
     # The branches below must be a subset of the branches above
     branches: [next]
   schedule:
-    - cron: '0 15 * * 2'
+    - cron: "0 15 * * 2"
 
 jobs:
   analyze:
@@ -24,48 +24,48 @@ jobs:
       matrix:
         # Override automatic language detection by changing the below list
         # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
-        language: ['javascript']
+        language: ["javascript"]
         # Learn more...
         # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
 
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v4
-      with:
-        # We must fetch at least the immediate parents so that if this is
-        # a pull request then we can checkout the head.
-        fetch-depth: 2
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          # We must fetch at least the immediate parents so that if this is
+          # a pull request then we can checkout the head.
+          fetch-depth: 2
 
-    # If this run was triggered by a pull request event, then checkout
-    # the head of the pull request instead of the merge commit.
-    - run: git checkout HEAD^2
-      if: ${{ github.event_name == 'pull_request' }}
+      # If this run was triggered by a pull request event, then checkout
+      # the head of the pull request instead of the merge commit.
+      - run: git checkout HEAD^2
+        if: ${{ github.event_name == 'pull_request' }}
 
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
-      with:
-        languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file. 
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v1
+        with:
+          languages: ${{ matrix.language }}
+          # If you wish to specify custom queries, you can do so here or in a config file.
+          # By default, queries listed here will override any specified in a config file.
+          # Prefix the list here with "+" to use these queries and those in the config file.
+          # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+      # If this step fails, then you should remove it and run the build manually (see below)
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v1
 
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
+      # ℹ️ Command-line programs to run using the OS shell.
+      # 📚 https://git.io/JvXDl
 
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
+      # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+      #    and modify them (or add more) to build your code if your project
+      #    uses a compiled language
 
-    #- run: |
-    #   make bootstrap
-    #   make release
+      #- run: |
+      #   make bootstrap
+      #   make release
 
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v1

.github/workflows/labeler.yml

@@ -15,4 +15,4 @@ jobs:
       - uses: actions/labeler@v5
         with:
           repo-token: ${{ secrets.GH_TOKEN }}
-          configuration-path: .github/labeler-config.yml
+          configuration-path: .github/labeler-config.yml

.github/workflows/pullRequests.yml

@@ -192,6 +192,39 @@ jobs:
     env:
       NODE_OPTIONS: '--max_old_space_size=4096'
       YARN_ENABLE_IMMUTABLE_INSTALLS: false
+  staticCodeAnalysisVerifyDependencies:
+    needs:
+      - constants
+      - build
+    name: Static code analysis (verify dependencies)
+    steps:
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+      - uses: actions/checkout@v4
+        with:
+          path: ${{ github.base_ref }}
+      - uses: actions/cache@v4
+        with:
+          path: ${{ github.base_ref }}/.yarn/cache
+          key: yarn-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
+      - uses: actions/cache@v4
+        with:
+          path: ${{ github.base_ref }}/.webiny/cached-packages
+          key: ${{ needs.constants.outputs.run-cache-key }}
+      - name: Install dependencies
+        run: yarn --immutable
+        working-directory: ${{ github.base_ref }}
+      - name: Build packages
+        run: yarn build:quick
+        working-directory: ${{ github.base_ref }}
+      - name: Sync Dependencies Verification
+        run: yarn webiny verify-dependencies
+        working-directory: ${{ github.base_ref }}
+    runs-on: ubuntu-latest
+    env:
+      NODE_OPTIONS: '--max_old_space_size=4096'
+      YARN_ENABLE_IMMUTABLE_INSTALLS: false
   staticCodeAnalysisTs:
     name: Static code analysis (TypeScript)
     runs-on: webiny-build-packages

.github/workflows/pushDev.yml

@@ -99,6 +99,36 @@ jobs:
       - name: ESLint
         run: yarn eslint
         working-directory: dev
+    runs-on: ubuntu-latest
+    env:
+      NODE_OPTIONS: '--max_old_space_size=4096'
+      YARN_ENABLE_IMMUTABLE_INSTALLS: false
+  staticCodeAnalysisVerifyDependencies:
+    needs:
+      - constants
+      - build
+    name: Static code analysis (verify dependencies)
+    steps:
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+      - uses: actions/checkout@v4
+        with:
+          path: dev
+      - uses: actions/cache@v4
+        with:
+          path: dev/.yarn/cache
+          key: yarn-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
+      - uses: actions/cache@v4
+        with:
+          path: dev/.webiny/cached-packages
+          key: ${{ needs.constants.outputs.run-cache-key }}
+      - name: Install dependencies
+        run: yarn --immutable
+        working-directory: dev
+      - name: Build packages
+        run: yarn build:quick
+        working-directory: dev
       - name: Sync Dependencies Verification
         run: yarn webiny verify-dependencies
         working-directory: dev

.github/workflows/pushNext.yml

@@ -99,6 +99,36 @@ jobs:
       - name: ESLint
         run: yarn eslint
         working-directory: next
+    runs-on: ubuntu-latest
+    env:
+      NODE_OPTIONS: '--max_old_space_size=4096'
+      YARN_ENABLE_IMMUTABLE_INSTALLS: false
+  staticCodeAnalysisVerifyDependencies:
+    needs:
+      - constants
+      - build
+    name: Static code analysis (verify dependencies)
+    steps:
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+      - uses: actions/checkout@v4
+        with:
+          path: next
+      - uses: actions/cache@v4
+        with:
+          path: next/.yarn/cache
+          key: yarn-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
+      - uses: actions/cache@v4
+        with:
+          path: next/.webiny/cached-packages
+          key: ${{ needs.constants.outputs.run-cache-key }}
+      - name: Install dependencies
+        run: yarn --immutable
+        working-directory: next
+      - name: Build packages
+        run: yarn build:quick
+        working-directory: next
       - name: Sync Dependencies Verification
         run: yarn webiny verify-dependencies
         working-directory: next

.github/workflows/wac/pullRequests.wac.ts

@@ -280,6 +280,25 @@ export const pullRequests = createWorkflow({
                 )
             ]
         }),
+
+        // We couldn't add the `verify-dependencies` script to the `staticCodeAnalysis` job
+        // because it requires the `build` job to run first. To not slow down the `staticCodeAnalysis`
+        // and not to run the `build` job twice, we've created a separate job for this.
+        staticCodeAnalysisVerifyDependencies: createJob({
+            needs: ["constants", "build"],
+            name: "Static code analysis (verify dependencies)",
+            checkout: { path: DIR_WEBINY_JS },
+            steps: [
+                ...yarnCacheSteps,
+                ...runBuildCacheSteps,
+                ...installBuildSteps,
+                {
+                    name: "Sync Dependencies Verification",
+                    run: "yarn webiny verify-dependencies",
+                    "working-directory": DIR_WEBINY_JS
+                }
+            ]
+        }),
         staticCodeAnalysisTs: createJob({
             name: "Static code analysis (TypeScript)",
             "runs-on": BUILD_PACKAGES_RUNNER,

.github/workflows/wac/push.wac.ts

@@ -319,16 +319,30 @@ const createPushWorkflow = (branchName: string) => {
                             { name: "Check code formatting", run: "yarn prettier:check" },
                             { name: "Check dependencies", run: "yarn adio" },
                             { name: "Check TS configs", run: "yarn check-ts-configs" },
-                            { name: "ESLint", run: "yarn eslint" },
-                            {
-                                name: "Sync Dependencies Verification",
-                                run: "yarn webiny verify-dependencies"
-                            }
+                            { name: "ESLint", run: "yarn eslint" }
                         ],
                         { "working-directory": DIR_WEBINY_JS }
                     )
                 ]
             }),
+            // We couldn't add the `verify-dependencies` script to the `staticCodeAnalysis` job
+            // because it requires the `build` job to run first. To not slow down the `staticCodeAnalysis`
+            // and not to run the `build` job twice, we've created a separate job for this.
+            staticCodeAnalysisVerifyDependencies: createJob({
+                needs: ["constants", "build"],
+                name: "Static code analysis (verify dependencies)",
+                checkout: { path: DIR_WEBINY_JS },
+                steps: [
+                    ...yarnCacheSteps,
+                    ...runBuildCacheSteps,
+                    ...installBuildSteps,
+                    {
+                        name: "Sync Dependencies Verification",
+                        run: "yarn webiny verify-dependencies",
+                        "working-directory": DIR_WEBINY_JS
+                    }
+                ]
+            }),
             staticCodeAnalysisTs: createJob({
                 name: "Static code analysis (TypeScript)",
                 "runs-on": BUILD_PACKAGES_RUNNER,

.prettierignore

@@ -1,3 +1,4 @@
+.nx/
 .webiny/
 .verdaccio/
 **/build/
@@ -9,7 +10,9 @@
 packages/ui/src/RichTextEditor/editorjs/**
 packages/cli-plugin-deploy-pulumi/commands/newWatch/handler/mqtt.js
 packages/admin-ui/scripts/importFromFigma/exports/Alias tokens.json
+packages/cli-plugin-scaffold-ci/src/githubActions/files/workflows/
 lerna.json
 coverage/**
 packages/cli/files/**/*.json
 packages/create-webiny-project/utils/binaries/**
+.github/workflows/**/*.yml

.yarn/patches/aws-elasticsearch-connector-npm-9.2.0-e1245671b1.patch

@@ -0,0 +1,29 @@
+diff --git a/index.d.ts b/index.d.ts
+index 4238da8770e14cabd912c10c8a3b6dee4692209c..beebec01b3e212df0aaf911ded6f1a629f7ac1ae 100644
+--- a/index.d.ts
++++ b/index.d.ts
+@@ -1,11 +1,22 @@
+ import { Connection, Transport } from '@elastic/elasticsearch';
+-import AWS from 'aws-sdk';
++
++
++export interface ConnectorConfigCredentials {
++  accessKeyId?: string;
++  secretAccessKey?: string;
++  sessionToken?: string;
++}
++
++export interface ConnectorConfig {
++  region: string;
++  credentials: ConnectorConfigCredentials;
++}
+
+ export type Connector = {
+   Connection: typeof Connection;
+   Transport: typeof Transport;
+ };
+
+-export const ConnectorFactory: (awsConfig: AWS.Config) => Connector;
++export const ConnectorFactory: (awsConfig: ConnectorConfig) => Connector;
+
+ export default ConnectorFactory;

apps/admin/package.json

@@ -3,10 +3,10 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@editorjs/delimiter": "^1.3.0",
-    "@editorjs/list": "^1.8.0",
-    "@editorjs/quote": "^2.5.0",
-    "@editorjs/underline": "^1.1.0",
+    "@editorjs/delimiter": "^1.4.2",
+    "@editorjs/list": "^1.10.0",
+    "@editorjs/quote": "^2.7.2",
+    "@editorjs/underline": "^1.2.1",
     "@types/react": "18.2.79",
     "@webiny/app-admin": "0.0.0",
     "@webiny/app-admin-users-cognito": "0.0.0",

cypress-tests/package.json

@@ -19,7 +19,7 @@
     "lodash": "^4.17.21",
     "nanoid": "^3.3.8",
     "node-fetch": "2.6.7",
-    "typescript": "4.9.5",
+    "typescript": "5.3.3",
     "uniqid": "^5.4.0"
   },
   "scripts": {