From 9d4183364aae1c81758adb1b48bcfd13aaf600c4 Mon Sep 17 00:00:00 2001 From: lublak <44057030+lublak@users.noreply.github.com> Date: Mon, 17 Jan 2022 18:21:18 +0100 Subject: [PATCH] :bug: Fix package (#6) * sync with n8n * Update package.json remove format --- gulpfile.js | 9 ++++++--- package.json | 19 +++++++++++-------- tsconfig.json | 7 +++++-- tslint.json | 23 ++++++++++++++++++++++- 4 files changed, 44 insertions(+), 14 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 9771a40..546bb43 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,8 +1,11 @@ const { src, dest } = require('gulp'); function copyIcons() { - return src('nodes/**/*.png') - .pipe(dest('dist/nodes')); + src('nodes/**/*.{png,svg}') + .pipe(dest('dist/nodes')) + + return src('credentials/**/*.{png,svg}') + .pipe(dest('dist/credentials')); } -exports.default = copyIcons; +exports.default = copyIcons; \ No newline at end of file diff --git a/package.json b/package.json index 0f9422b..2b0acb3 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,9 @@ "scripts": { "dev": "npm run watch", "build": "tsc && gulp", - "tslint": "tslint -p tsconfig.json -c tslint.json", + "lint": "tslint -p tsconfig.json -c tslint.json", + "lintfix": "tslint --fix -p tsconfig.json -c tslint.json", + "nodelinter": "nodelinter", "watch": "tsc --watch", "test": "jest" }, @@ -35,16 +37,17 @@ "@types/express": "^4.17.6", "@types/jest": "^24.0.18", "@types/node": "^10.10.1", - "@types/request-promise-native": "^1.0.17", + "@types/request-promise-native": "~1.0.15", "gulp": "^4.0.0", - "jest": "^24.9.0", - "n8n-workflow": "^0.11.0", - "ts-jest": "^24.0.2", - "tslint": "^5.17.0", - "typescript": "~3.5.2" + "jest": "^26.4.2", + "n8n-workflow": "~0.75.0", + "nodelinter": "^0.1.9", + "ts-jest": "^26.3.0", + "tslint": "^6.1.2", + "typescript": "~4.3.5" }, "dependencies": { - "n8n-core": "^0.10.0" + "n8n-core": "~0.92.0" }, "jest": { "transform": { diff --git a/tsconfig.json b/tsconfig.json index 5740965..6456490 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,7 +1,8 @@ { "compilerOptions": { "lib": [ - "es2017" + "es2017", + "es2019.array" ], "types": [ "node", @@ -13,6 +14,7 @@ "strictNullChecks": true, "strict": true, "preserveConstEnums": true, + "resolveJsonModule": true, "declaration": true, "outDir": "./dist/", "target": "es2017", @@ -22,9 +24,10 @@ "credentials/**/*", "src/**/*", "nodes/**/*", + "nodes/**/*.json", "test/**/*" ], "exclude": [ "**/*.spec.ts" ] -} +} \ No newline at end of file diff --git a/tslint.json b/tslint.json index 7eb9d01..859893d 100644 --- a/tslint.json +++ b/tslint.json @@ -46,6 +46,7 @@ "forin": true, "jsdoc-format": true, "label-position": true, + "indent": [true, "tabs", 2], "member-access": [ true, "no-public" @@ -60,6 +61,10 @@ "no-default-export": true, "no-duplicate-variable": true, "no-inferrable-types": true, + "ordered-imports": [true, { + "import-sources-order": "any", + "named-imports-order": "case-insensitive" + }], "no-namespace": [ true, "allow-declarations" @@ -82,11 +87,27 @@ "ignore-bound-class-methods" ], "switch-default": true, + "trailing-comma": [ + true, + { + "multiline": { + "objects": "always", + "arrays": "always", + "functions": "always", + "typeLiterals": "ignore" + }, + "esSpecCompliant": true + } + ], "triple-equals": [ true, "allow-null-check" ], "use-isnan": true, + "quotemark": [ + true, + "single" + ], "quotes": [ "error", "single" @@ -100,4 +121,4 @@ ] }, "rulesDirectory": [] -} +} \ No newline at end of file