🔀 Merge branch 'master' into user-management-p2

.eslintrc.js

@@ -22,6 +22,7 @@ module.exports = {
 		'**/templates/**',
 		'**/ormconfig.ts',
 		'**/migrations/**',
+		'*.mjs',
 	],
 
 	overrides: [
@@ -84,7 +85,7 @@ module.exports = {
 				// The following rule enables eslint-plugin-prettier
 				// See: https://github.com/prettier/eslint-plugin-prettier#recommended-configuration
 
-				'prettier/prettier': 'error',
+				'prettier/prettier': ['error', { endOfLine: 'auto' }],
 
 				// The following two rules must be disabled when using eslint-plugin-prettier:
 				// See: https://github.com/prettier/eslint-plugin-prettier#arrow-body-style-and-prefer-arrow-callback-issue

.github/ISSUE_TEMPLATE/bug_report.md

@@ -4,14 +4,14 @@ about: Create a report to help us improve
 title: ''
 labels: ''
 assignees: ''
-
 ---
 
 **Describe the bug**
 A clear and concise description of what the bug is.
 
 **To Reproduce**
 Steps to reproduce the behavior:
+
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
@@ -21,11 +21,12 @@ Steps to reproduce the behavior:
 A clear and concise description of what you expected to happen.
 
 **Environment (please complete the following information):**
- - OS: [e.g. Ubuntu Linux 18.04]
- - n8n Version [e.g. 0.119.0]
- - Node.js Version [e.g. 14.16.0]
- - Database system [e.g. SQLite; n8n uses SQLite as default otherwise changed]
- - Operation mode [e.g. own; operation modes are `own`, `main` and `queue`. Default is `own`]
+
+- OS: [e.g. Ubuntu Linux 18.04]
+- n8n Version [e.g. 0.119.0]
+- Node.js Version [e.g. 14.16.0]
+- Database system [e.g. SQLite; n8n uses SQLite as default otherwise changed]
+- Operation mode [e.g. own; operation modes are `own`, `main` and `queue`. Default is `own`]
 
 **Additional context**
 Add any other context about the problem here.

.github/workflows/docker-images.yml

@@ -9,38 +9,38 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
-    - name: Get the version
-      id: vars
-      run: echo ::set-output name=tag::$(echo ${GITHUB_REF:14})
-    - name: Set up QEMU
-      uses: docker/setup-qemu-action@v1
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v1
-    - name: Login to DockerHub
-      uses: docker/login-action@v1
-      with:
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-    - name: Build
-      uses: docker/build-push-action@v2
-      with:
-        context: ./docker/images/n8n
-        build-args: |
-          N8N_VERSION=${{steps.vars.outputs.tag}}
-        platforms: linux/amd64,linux/arm64,linux/arm/v7
-        push: true
-        tags: |
-          ${{ secrets.DOCKER_USERNAME }}/n8n:${{ steps.vars.outputs.tag }}
-          ${{ secrets.DOCKER_USERNAME }}/n8n:latest
-    - name: Build (debian)
-      uses: docker/build-push-action@v2
-      with:
-        context: ./docker/images/n8n-debian
-        build-args: |
-          N8N_VERSION=${{ steps.vars.outputs.tag }}
-        platforms: linux/amd64,linux/arm64,linux/arm/v7
-        push: true
-        tags: |
-          ${{ secrets.DOCKER_USERNAME }}/n8n:${{ steps.vars.outputs.tag }}-debian
-          ${{ secrets.DOCKER_USERNAME }}/n8n:latest-debian
+      - uses: actions/checkout@v1
+      - name: Get the version
+        id: vars
+        run: echo ::set-output name=tag::$(echo ${GITHUB_REF:14})
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Build
+        uses: docker/build-push-action@v2
+        with:
+          context: ./docker/images/n8n
+          build-args: |
+            N8N_VERSION=${{steps.vars.outputs.tag}}
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          push: true
+          tags: |
+            ${{ secrets.DOCKER_USERNAME }}/n8n:${{ steps.vars.outputs.tag }}
+            ${{ secrets.DOCKER_USERNAME }}/n8n:latest
+      - name: Build (debian)
+        uses: docker/build-push-action@v2
+        with:
+          context: ./docker/images/n8n-debian
+          build-args: |
+            N8N_VERSION=${{ steps.vars.outputs.tag }}
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          push: true
+          tags: |
+            ${{ secrets.DOCKER_USERNAME }}/n8n:${{ steps.vars.outputs.tag }}-debian
+            ${{ secrets.DOCKER_USERNAME }}/n8n:latest-debian

.github/workflows/test-workflows.yml

@@ -2,13 +2,11 @@ name: Run test workflows
 
 on:
   schedule:
-    - cron: "0 2 * * *"
+    - cron: '0 2 * * *'
   workflow_dispatch:
 
-
 jobs:
   run-test-workflows:
-
     runs-on: ubuntu-latest
 
     timeout-minutes: 30
@@ -17,62 +15,53 @@ jobs:
       matrix:
         node-version: [16.x]
     steps:
-      -
-        name: Checkout
+      - name: Checkout
         uses: actions/checkout@v2
         with:
           path: n8n
-      -
-        name: Checkout workflows repo
+      - name: Checkout workflows repo
         uses: actions/checkout@v2
         with:
           repository: n8n-io/test-workflows
           path: test-workflows
-      -
-        name: Use Node.js ${{ matrix.node-version }}
+      - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v1
         with:
           node-version: ${{ matrix.node-version }}
-      -
-        name: Install dependencies
+      - name: Install dependencies
         run: |
           sudo apt update -y
           echo 'tzdata tzdata/Areas select Europe' | sudo debconf-set-selections
           echo 'tzdata tzdata/Zones/Europe select Paris' | sudo debconf-set-selections
           DEBIAN_FRONTEND="noninteractive" sudo apt-get install -y graphicsmagick
         shell: bash
-      -
-        name: npm install and build
+      - name: npm install and build
         run: |
           cd n8n
+          npm install -g npm@latest
           npm install
-          npm run bootstrap
           npm run build --if-present
         env:
           CI: true
         shell: bash
-      -
-        name: Import credentials
+      - name: Import credentials
         run: n8n/packages/cli/bin/n8n import:credentials --input=test-workflows/credentials.json
         shell: bash
         env:
           N8N_ENCRYPTION_KEY: ${{secrets.ENCRYPTION_KEY}}
-      -
-        name: Import workflows
+      - name: Import workflows
         run: n8n/packages/cli/bin/n8n import:workflow --separate --input=test-workflows/workflows
         shell: bash
         env:
           N8N_ENCRYPTION_KEY: ${{secrets.ENCRYPTION_KEY}}
-      -
-        name: Copy static assets
+      - name: Copy static assets
         run: |
           cp n8n/assets/n8n-logo.png /tmp/n8n-logo.png
           cp n8n/assets/n8n-screenshot.png /tmp/n8n-screenshot.png
           cp n8n/node_modules/pdf-parse/test/data/05-versions-space.pdf /tmp/05-versions-space.pdf
           cp n8n/node_modules/pdf-parse/test/data/04-valid.pdf /tmp/04-valid.pdf
         shell: bash
-      -
-        name: Run tests
+      - name: Run tests
         run: n8n/packages/cli/bin/n8n executeBatch --shallow --ids=test-workflows/safeList.txt --shortOutput --concurrency=16 --compare=test-workflows/snapshots
         shell: bash
         env:

.github/workflows/tests.yml

@@ -4,7 +4,6 @@ on: [push]
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
 
     timeout-minutes: 30
@@ -14,17 +13,17 @@ jobs:
         node-version: [14.x, 16.x]
 
     steps:
-    - uses: actions/checkout@v1
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
-      with:
-        node-version: ${{ matrix.node-version }}
-    - name: npm install, build, and test
-      run: |
-        npm install
-        npm run bootstrap
-        npm run build --if-present
-        npm test
-        npm run lint
-      env:
-        CI: true
+      - uses: actions/checkout@v1
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+      - name: npm install, build, and test
+        run: |
+          npm install -g npm@latest
+          npm install
+          npm run build --if-present
+          npm test
+          npm run lint
+        env:
+          CI: true

.gitignore

@@ -4,13 +4,14 @@ node_modules
 tmp
 dist
 npm-debug.log*
-lerna-debug.log
 yarn.lock
 google-generated-credentials.json
 _START_PACKAGE
 .env
 .vscode/*
 !.vscode/extensions.json
+!.vscode/settings.default.json
 .idea
 nodelinter.config.json
 packages/*/package-lock.json
+packages/*/.turbo