chore: merge master

.github/workflows/docker-images-nightly.yml

@@ -64,7 +64,7 @@ jobs:
           [[ "${{github.event.inputs.merge-master}}" == "true" ]] && git remote add upstream https://github.com/n8n-io/n8n.git -f; git merge upstream/master --allow-unrelated-histories || echo ""
         shell: bash
 
-      - name: Build and push
+      - name: Build and push to DockerHub
         uses: docker/[email protected]
         with:
           context: .
@@ -78,6 +78,21 @@ jobs:
           cache-to: type=gha,mode=max
           tags: ${{ secrets.DOCKER_USERNAME }}/n8n:${{ github.event.inputs.tag || 'nightly' }}
 
+      - name: Login to GitHub Container Registry
+        if: github.event.inputs.tag == 'nightly'
+        uses: docker/[email protected]
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Push image to GHCR
+        if: github.event.inputs.tag == 'nightly'
+        run: |
+          docker buildx imagetools create \
+            --tag ghcr.io/${{ github.repository_owner }}/n8n:nightly \
+            ${{ secrets.DOCKER_USERNAME }}/n8n:nightly
+
       - name: Call Success URL - optionally
         run: |
           [[ "${{github.event.inputs.success-url}}" != "" ]] && curl -v ${{github.event.inputs.success-url}} || echo ""

.github/workflows/release-publish.yml

@@ -13,6 +13,8 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event.pull_request.merged == true
     timeout-minutes: 10
+    permissions:
+      id-token: write
     env:
       NPM_CONFIG_PROVENANCE: true
     outputs:

.vscode/extensions.json

@@ -5,6 +5,7 @@
 		"dbaeumer.vscode-eslint",
 		"EditorConfig.EditorConfig",
 		"esbenp.prettier-vscode",
+		"mjmlio.vscode-mjml",
 		"Vue.volar"
 	]
 }

CHANGELOG.md

@@ -1,3 +1,34 @@
+# [1.57.0](https://github.com/n8n-io/n8n/compare/[email protected]@1.57.0) (2024-08-28)
+
+
+### Bug Fixes
+
+* **AI Agent Node:** Allow AWS Bedrock Chat to be used with conversational agent ([#10489](https://github.com/n8n-io/n8n/issues/10489)) ([bdcc657](https://github.com/n8n-io/n8n/commit/bdcc657965af5f604aac1eaff7d937f69a08ce1c))
+* **core:** Make boolean config value parsing backward-compatible ([#10560](https://github.com/n8n-io/n8n/issues/10560)) ([70b410f](https://github.com/n8n-io/n8n/commit/70b410f4b00dd599fcd4249aa105098aa262da66))
+* **core:** Restore Redis cache key ([#10520](https://github.com/n8n-io/n8n/issues/10520)) ([873056a](https://github.com/n8n-io/n8n/commit/873056a92e52cc629d2873c960656d5f06d4728e))
+* **core:** Scheduler tasks should not trigger on follower instances ([#10507](https://github.com/n8n-io/n8n/issues/10507)) ([3428f28](https://github.com/n8n-io/n8n/commit/3428f28a732f79e067b3cb515cc59d835de246a6))
+* **core:** Stop explicit redis client disconnect on shutdown ([#10551](https://github.com/n8n-io/n8n/issues/10551)) ([f712812](https://github.com/n8n-io/n8n/commit/f71281221efb79d65d8d7610c292bc90cef13d7a))
+* **editor:** Ensure `Datatable` component renders `All` option ([#10525](https://github.com/n8n-io/n8n/issues/10525)) ([bc27beb](https://github.com/n8n-io/n8n/commit/bc27beb6629883003a8991d7e840ffaa066d41ac))
+* **editor:** Prevent Safari users from accessing the frontend over insecure contexts ([#10510](https://github.com/n8n-io/n8n/issues/10510)) ([a73b9a3](https://github.com/n8n-io/n8n/commit/a73b9a38d6c48e2f78593328e7d9933f2493dbb6))
+* **editor:** Scale output item selector input width with value ([#10555](https://github.com/n8n-io/n8n/issues/10555)) ([52c574d](https://github.com/n8n-io/n8n/commit/52c574d83f344f03b0e39984bbc3ac0402e50791))
+* **Google Sheets Trigger Node:** Show sheet name is too long error ([#10542](https://github.com/n8n-io/n8n/issues/10542)) ([4e15007](https://github.com/n8n-io/n8n/commit/4e1500757700ec984cdad8b9cfcd76ee00ae127e))
+* **Wait Node:** Prevent waiting until invalid date ([#10523](https://github.com/n8n-io/n8n/issues/10523)) ([c0e7620](https://github.com/n8n-io/n8n/commit/c0e7620036738f8d0b382d0d0610b981dcbc29e0))
+
+
+### Features
+
+* Add new credentials for the HTTP Request node ([#9833](https://github.com/n8n-io/n8n/issues/9833)) ([26f1af3](https://github.com/n8n-io/n8n/commit/26f1af397b2b25e3394fc2dae91a5c281bf33d66))
+* **AI Agent Node:** Add tutorial link to agent node ([#10493](https://github.com/n8n-io/n8n/issues/10493)) ([5c7cc36](https://github.com/n8n-io/n8n/commit/5c7cc36c23e58a47a1e71911e7303a1bd54f167e))
+* **core:** Expose queue metrics for Prometheus ([#10559](https://github.com/n8n-io/n8n/issues/10559)) ([008c510](https://github.com/n8n-io/n8n/commit/008c510b7623fefb8c60730c7eac54dd9bb2e3fc))
+* **editor:** Implement workflowSelector parameter type ([#10482](https://github.com/n8n-io/n8n/issues/10482)) ([84e54be](https://github.com/n8n-io/n8n/commit/84e54beac763f25399c9687f695f1e658e3ce434))
+
+
+### Performance Improvements
+
+* **core:** Make execution queries faster ([#9817](https://github.com/n8n-io/n8n/issues/9817)) ([dc7dc99](https://github.com/n8n-io/n8n/commit/dc7dc995d5e2ea8fbd0dcb54cfa8aa93ecb437c9))
+
+
+
 # [1.56.0](https://github.com/n8n-io/n8n/compare/[email protected]@1.56.0) (2024-08-21)
 
 

cypress/e2e/17-sharing.cy.ts

@@ -7,7 +7,7 @@ import {
 	WorkflowSharingModal,
 	WorkflowsPage,
 } from '../pages';
-import { getVisibleDropdown, getVisibleSelect } from '../utils';
+import { getVisibleDropdown, getVisiblePopper, getVisibleSelect } from '../utils';
 import * as projects from '../composables/projects';
 
 /**
@@ -180,7 +180,8 @@ describe('Sharing', { disableAutoLogin: true }, () => {
 		).should('be.visible');
 
 		credentialsModal.getters.usersSelect().click();
-		cy.getByTestId('project-sharing-info')
+		getVisiblePopper()
+			.find('[data-test-id="project-sharing-info"]')
 			.filter(':visible')
 			.should('have.length', 3)
 			.contains(INSTANCE_ADMIN.email)

cypress/e2e/45-ai-assistant.cy.ts

@@ -34,7 +34,7 @@ describe('AI Assistant::enabled', () => {
 		aiAssistant.getters.chatInputWrapper().should('not.exist');
 		aiAssistant.getters.closeChatButton().should('be.visible');
 		aiAssistant.getters.closeChatButton().click();
-		aiAssistant.getters.askAssistantChat().should('not.exist');
+		aiAssistant.getters.askAssistantChat().should('not.be.visible');
 	});
 
 	it('should resize assistant chat up', () => {
@@ -162,13 +162,13 @@ describe('AI Assistant::enabled', () => {
 		cy.createFixtureWorkflow('aiAssistant/test_workflow.json');
 		wf.actions.openNode('Edit Fields');
 		ndv.getters.nodeExecuteButton().click();
-		aiAssistant.getters.nodeErrorViewAssistantButton().click();
+		aiAssistant.getters.nodeErrorViewAssistantButton().click({ force: true });
 		cy.wait('@chatRequest');
 		aiAssistant.getters.closeChatButton().click();
 		ndv.getters.backToCanvas().click();
 		wf.actions.openNode('Stop and Error');
 		ndv.getters.nodeExecuteButton().click();
-		aiAssistant.getters.nodeErrorViewAssistantButton().click();
+		aiAssistant.getters.nodeErrorViewAssistantButton().click({ force: true });
 		// Since we already have an active session, a warning should be shown
 		aiAssistant.getters.newAssistantSessionModal().should('be.visible');
 		aiAssistant.getters

cypress/e2e/5-ndv.cy.ts

@@ -199,7 +199,7 @@ describe('NDV', () => {
 					.contains(key)
 					.should('be.visible');
 			});
-			getObjectValueItem().find('label').click();
+			getObjectValueItem().find('label').click({ force: true });
 			expandedObjectProps.forEach((key) => {
 				ndv.getters
 					.outputPanel()

package.json

@@ -1,6 +1,6 @@
 {
   "name": "n8n-monorepo",
-  "version": "1.56.0",
+  "version": "1.57.0",
   "private": true,
   "engines": {
     "node": ">=20.15",

packages/@n8n/benchmark/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@n8n/n8n-benchmark",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Cli for running benchmark tests for n8n",
   "main": "dist/index",
   "scripts": {

packages/@n8n/config/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@n8n/config",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "scripts": {
     "clean": "rimraf dist .turbo",
     "dev": "pnpm watch",

packages/@n8n/config/src/configs/user-management.config.ts

@@ -49,19 +49,19 @@ class SmtpConfig {
 export class TemplateConfig {
 	/** Overrides default HTML template for inviting new people (use full path) */
 	@Env('N8N_UM_EMAIL_TEMPLATES_INVITE')
-	invite: string = '';
+	'user-invited': string = '';
 
 	/** Overrides default HTML template for resetting password (use full path) */
 	@Env('N8N_UM_EMAIL_TEMPLATES_PWRESET')
-	passwordReset: string = '';
+	'password-reset-requested': string = '';
 
 	/** Overrides default HTML template for notifying that a workflow was shared (use full path) */
 	@Env('N8N_UM_EMAIL_TEMPLATES_WORKFLOW_SHARED')
-	workflowShared: string = '';
+	'workflow-shared': string = '';
 
 	/** Overrides default HTML template for notifying that credentials were shared (use full path) */
 	@Env('N8N_UM_EMAIL_TEMPLATES_CREDENTIALS_SHARED')
-	credentialsShared: string = '';
+	'credentials-shared': string = '';
 }
 
 @Config

packages/@n8n/config/test/config.test.ts

@@ -89,10 +89,10 @@ describe('GlobalConfig', () => {
 					},
 				},
 				template: {
-					credentialsShared: '',
-					invite: '',
-					passwordReset: '',
-					workflowShared: '',
+					'credentials-shared': '',
+					'user-invited': '',
+					'password-reset-requested': '',
+					'workflow-shared': '',
 				},
 			},
 		},

packages/@n8n/nodes-langchain/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@n8n/n8n-nodes-langchain",
-  "version": "1.56.0",
+  "version": "1.57.0",
   "description": "",
   "main": "index.js",
   "scripts": {

packages/cli/.eslintrc.js

@@ -19,6 +19,8 @@ module.exports = {
 	],
 
 	rules: {
+		'unicorn/filename-case': ['error', { case: 'kebabCase' }],
+
 		'n8n-local-rules/no-dynamic-import-template': 'error',
 		'n8n-local-rules/misplaced-n8n-typeorm-import': 'error',
 		'n8n-local-rules/no-type-unsafe-event-emitter': 'error',
@@ -39,6 +41,12 @@ module.exports = {
 	},
 
 	overrides: [
+		{
+			files: ['./src/databases/migrations/**/*.ts'],
+			rules: {
+				'unicorn/filename-case': 'off',
+			},
+		},
 		{
 			files: ['./src/databases/**/*.ts', './test/**/*.ts', './src/**/__tests__/**/*.ts'],
 			rules: {

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n8n",
-  "version": "1.56.0",
+  "version": "1.57.0",
   "description": "n8n Workflow Automation Tool",
   "main": "dist/index",
   "types": "dist/index.d.ts",
@@ -78,6 +78,7 @@
     "chokidar": "^3.5.2",
     "concurrently": "^8.2.0",
     "ioredis-mock": "^8.8.1",
+    "mjml": "^4.15.3",
     "ts-essentials": "^7.0.3"
   },
   "dependencies": {

packages/cli/scripts/build.mjs

@@ -3,44 +3,54 @@ import { writeFileSync } from 'fs';
 import { fileURLToPath } from 'url';
 import shell from 'shelljs';
 import { rawTimeZones } from '@vvo/tzdb';
+import glob from 'fast-glob';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
 const ROOT_DIR = path.resolve(__dirname, '..');
 const SPEC_FILENAME = 'openapi.yml';
-const SPEC_THEME_FILENAME = 'swaggerTheme.css';
+const SPEC_THEME_FILENAME = 'swagger-theme.css';
 
 const publicApiEnabled = process.env.N8N_PUBLIC_API_DISABLED !== 'true';
 
-copyUserManagementEmailTemplates();
+generateUserManagementEmailTemplates();
 generateTimezoneData();
 
 if (publicApiEnabled) {
 	copySwaggerTheme();
 	bundleOpenApiSpecs();
 }
 
-function copyUserManagementEmailTemplates() {
-	const templates = {
-		source: path.resolve(ROOT_DIR, 'src', 'user-management', 'email', 'templates'),
-		destination: path.resolve(ROOT_DIR, 'dist', 'user-management', 'email'),
-	};
+function generateUserManagementEmailTemplates() {
+	const sourceDir = path.resolve(ROOT_DIR, 'src', 'user-management', 'email', 'templates');
+	const destinationDir = path.resolve(ROOT_DIR, 'dist', 'user-management', 'email', 'templates');
+
+	shell.mkdir('-p', destinationDir);
+
+	const templates = glob.sync('*.mjml', { cwd: sourceDir });
+	templates.forEach((template) => {
+		if (template.startsWith('_')) return;
+		const source = path.resolve(sourceDir, template);
+		const destination = path.resolve(destinationDir, template.replace(/\.mjml$/, '.handlebars'));
+		const command = `pnpm mjml --output ${destination} ${source}`;
+		shell.exec(command, { silent: false });
+	});
 
-	shell.cp('-r', templates.source, templates.destination);
+	shell.cp(path.resolve(sourceDir, 'n8n-logo.png'), destinationDir);
 }
 
 function copySwaggerTheme() {
 	const swaggerTheme = {
-		source: path.resolve(ROOT_DIR, 'src', 'PublicApi', SPEC_THEME_FILENAME),
-		destination: path.resolve(ROOT_DIR, 'dist', 'PublicApi'),
+		source: path.resolve(ROOT_DIR, 'src', 'public-api', SPEC_THEME_FILENAME),
+		destination: path.resolve(ROOT_DIR, 'dist', 'public-api'),
 	};
 
 	shell.cp('-r', swaggerTheme.source, swaggerTheme.destination);
 }
 
 function bundleOpenApiSpecs() {
-	const publicApiDir = path.resolve(ROOT_DIR, 'src', 'PublicApi');
+	const publicApiDir = path.resolve(ROOT_DIR, 'src', 'public-api');
 
 	shell
 		.find(publicApiDir)

packages/cli/src/__tests__/active-executions.test.ts

@@ -3,7 +3,7 @@ import PCancelable from 'p-cancelable';
 import { v4 as uuid } from 'uuid';
 import type { IExecuteResponsePromiseData, IRun } from 'n8n-workflow';
 import { createDeferredPromise } from 'n8n-workflow';
-import type { IWorkflowExecutionDataProcess } from '@/Interfaces';
+import type { IWorkflowExecutionDataProcess } from '@/interfaces';
 import type { ExecutionRepository } from '@/databases/repositories/execution.repository';
 import { mock } from 'jest-mock-extended';
 import { ConcurrencyControlService } from '@/concurrency/concurrency-control.service';

packages/cli/src/__tests__/wait-tracker.test.ts

@@ -1,9 +1,9 @@
 import { WaitTracker } from '@/wait-tracker';
 import { mock } from 'jest-mock-extended';
 import type { ExecutionRepository } from '@/databases/repositories/execution.repository';
-import type { IExecutionResponse } from '@/Interfaces';
+import type { IExecutionResponse } from '@/interfaces';
 import { OrchestrationService } from '@/services/orchestration.service';
-import type { MultiMainSetup } from '@/services/orchestration/main/MultiMainSetup.ee';
+import type { MultiMainSetup } from '@/services/orchestration/main/multi-main-setup.ee';
 
 jest.useFakeTimers();
 

packages/cli/src/__tests__/workflow-helpers.test.ts

@@ -1,6 +1,6 @@
 import { type Workflow } from 'n8n-workflow';
 import { getExecutionStartNode } from '@/workflow-helpers';
-import type { IWorkflowExecutionDataProcess } from '@/Interfaces';
+import type { IWorkflowExecutionDataProcess } from '@/interfaces';
 
 describe('WorkflowHelpers', () => {
 	describe('getExecutionStartNode', () => {

packages/cli/src/__tests__/workflow-runner.test.ts

@@ -1,10 +1,10 @@
 import Container from 'typedi';
 import { WorkflowHooks, type ExecutionError, type IWorkflowExecuteHooks } from 'n8n-workflow';
-import type { User } from '@/databases/entities/User';
+import type { User } from '@/databases/entities/user';
 import { WorkflowRunner } from '@/workflow-runner';
 import config from '@/config';
 
-import * as testDb from '@test-integration/testDb';
+import * as testDb from '@test-integration/test-db';
 import { setupTestServer } from '@test-integration/utils';
 import { createUser } from '@test-integration/db/users';
 import { createWorkflow } from '@test-integration/db/workflows';

packages/cli/src/abstract-server.ts

@@ -8,8 +8,8 @@ import isbot from 'isbot';
 
 import config from '@/config';
 import { N8N_VERSION, TEMPLATES_DIR, inDevelopment, inTest } from '@/constants';
-import * as Db from '@/Db';
-import { N8nInstanceType } from '@/Interfaces';
+import * as Db from '@/db';
+import { N8nInstanceType } from '@/interfaces';
 import { ExternalHooks } from '@/external-hooks';
 import { send, sendErrorResponse } from '@/response-helper';
 import { rawBodyReader, bodyParser, corsMiddleware } from '@/middlewares';

packages/cli/src/active-executions.ts

@@ -20,7 +20,7 @@ import type {
 	IExecutionDb,
 	IExecutionsCurrentSummary,
 	IWorkflowExecutionDataProcess,
-} from '@/Interfaces';
+} from '@/interfaces';
 import { isWorkflowIdValid } from '@/utils';
 import { ExecutionRepository } from '@/databases/repositories/execution.repository';
 import { Logger } from '@/logger';

packages/cli/src/active-workflow-manager.ts

@@ -26,7 +26,7 @@ import {
 	ApplicationError,
 } from 'n8n-workflow';
 
-import type { IWorkflowDb } from '@/Interfaces';
+import type { IWorkflowDb } from '@/interfaces';
 import * as WebhookHelpers from '@/webhooks/webhook-helpers';
 import * as WorkflowExecuteAdditionalData from '@/workflow-execute-additional-data';
 
@@ -45,7 +45,7 @@ import { Logger } from './logger';
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 import { OrchestrationService } from '@/services/orchestration.service';
 import { ActivationErrorsService } from '@/activation-errors.service';
-import { ActiveWorkflowsService } from '@/services/activeWorkflows.service';
+import { ActiveWorkflowsService } from '@/services/active-workflows.service';
 import { WorkflowExecutionService } from '@/workflows/workflow-execution.service';
 import { WorkflowStaticDataService } from '@/workflows/workflow-static-data.service';
 import { OnShutdown } from '@/decorators/on-shutdown';

packages/cli/src/auth/__tests__/auth.service.test.ts

@@ -5,7 +5,7 @@ import type { NextFunction, Response } from 'express';
 import { AuthService } from '@/auth/auth.service';
 import config from '@/config';
 import { AUTH_COOKIE_NAME, Time } from '@/constants';
-import type { User } from '@/databases/entities/User';
+import type { User } from '@/databases/entities/user';
 import type { InvalidAuthTokenRepository } from '@/databases/repositories/invalid-auth-token.repository';
 import type { UserRepository } from '@/databases/repositories/user.repository';
 import { JwtService } from '@/services/jwt.service';