Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ci: Update most of the dev tooling (no-changelog) #6780

Merged
merged 3 commits into from
Jul 28, 2023
Merged

ci: Update most of the dev tooling (no-changelog) #6780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
acdc97a
ci: Update most of the dev tooling (no-changelog)
netroy Jul 28, 2023
51369e1
lintfix
netroy Jul 28, 2023
57d5126
downgrade falso
netroy Jul 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 23 additions & 29 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,54 +37,48 @@
},
"devDependencies": {
"@n8n_io/eslint-config": "workspace:*",
"@ngneat/falso": "^6.1.0",
"@types/jest": "^29.5.0",
"@ngneat/falso": "^6.4.0",
"@types/jest": "^29.5.3",
"@types/supertest": "^2.0.12",
"@vitest/coverage-c8": "^0.28.5",
"c8": "^7.12.0",
"@vitest/coverage-v8": "^0.33.0",
"cross-env": "^7.0.3",
"cypress": "^12.8.1",
"cypress-real-events": "^1.7.6",
"jest": "^29.5.0",
"jest-environment-jsdom": "^29.5.0",
"cypress": "^12.17.2",
"cypress-real-events": "^1.9.1",
"jest": "^29.6.2",
"jest-environment-jsdom": "^29.6.2",
"jest-expect-message": "^1.1.3",
"jest-mock": "^29.5.0",
"jest-mock": "^29.6.2",
"jest-mock-extended": "^3.0.4",
"nock": "^13.2.9",
"nock": "^13.3.2",
"nodemon": "^3.0.1",
"p-limit": "^3.1.0",
"prettier": "^2.8.3",
"rimraf": "^3.0.2",
"prettier": "*",
"rimraf": "^5.0.1",
"run-script-os": "^1.0.7",
"start-server-and-test": "^1.14.0",
"start-server-and-test": "^2.0.0",
"supertest": "^6.3.3",
"ts-jest": "^29.1.0",
"tsc-watch": "^6.0.0",
"turbo": "1.8.8",
"ts-jest": "^29.1.1",
"tsc-watch": "^6.0.4",
"turbo": "1.10.12",
"typescript": "*",
"vite": "^4.0.4",
"vitest": "^0.28.5",
"vue-tsc": "^1.0.24"
"vite": "^4.4.7",
"vitest": "^0.33.0",
"vue-tsc": "^1.8.8"
},
"pnpm": {
"onlyBuiltDependencies": [
"sqlite3",
"vue-demi"
"sqlite3"
],
"overrides": {
"@types/node": "^18.16.16",
"browserslist": "^4.21.4",
"chokidar": "3.5.2",
"decode-uri-component": "0.2.2",
"ejs": "^3.1.8",
"fork-ts-checker-webpack-plugin": "^6.0.4",
"http-cache-semantics": "4.1.1",
"jsonwebtoken": "9.0.0",
"prettier": "^2.8.3",
"prettier": "^3.0.0",
"semver": "^7.5.4",
"tough-cookie": "^4.1.3",
"tslib": "^2.5.0",
"tslib": "^2.6.1",
"ts-node": "^10.9.1",
"typescript": "^5.1.3",
"typescript": "^5.1.6",
"xml2js": "^0.5.0",
"cpy@8>globby": "^11.1.0",
"qqjs>globby": "^11.1.0"
Expand Down
6 changes: 5 additions & 1 deletion packages/@n8n/client-oauth2/src/ClientOAuth2.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,11 @@ export interface ClientOAuth2Options {
}

class ResponseError extends Error {
constructor(readonly status: number, readonly body: object, readonly code = 'ESTATUS') {
constructor(
readonly status: number,
readonly body: object,
readonly code = 'ESTATUS',
) {
super(`HTTP status ${status}`);
}
}
Expand Down
5 changes: 4 additions & 1 deletion packages/@n8n/client-oauth2/src/ClientOAuth2Token.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@ export class ClientOAuth2Token {

private expires: Date;

constructor(readonly client: ClientOAuth2, readonly data: ClientOAuth2TokenData) {
constructor(
readonly client: ClientOAuth2,
readonly data: ClientOAuth2TokenData,
) {
this.tokenType = data.token_type?.toLowerCase() ?? 'bearer';
this.accessToken = data.access_token;
this.refreshToken = data.refresh_token;
Expand Down
6 changes: 5 additions & 1 deletion packages/@n8n/client-oauth2/src/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,11 @@ export function expects<Keys extends keyof ClientOAuth2Options>(
}

export class AuthError extends Error {
constructor(message: string, readonly body: any, readonly code = 'EAUTH') {
constructor(
message: string,
readonly body: any,
readonly code = 'EAUTH',
) {
super(message);
}
}
Expand Down
8 changes: 4 additions & 4 deletions packages/@n8n_io/eslint-config/base.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,9 +253,9 @@ const config = (module.exports = {
],

/**
* https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/docs/rules/no-duplicate-imports.md
* https://github.com/import-js/eslint-plugin-import/blob/HEAD/docs/rules/no-duplicates.md
*/
'@typescript-eslint/no-duplicate-imports': 'error',
'import/no-duplicates': 'error',

/**
* https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/docs/rules/no-invalid-void-type.md
Expand Down Expand Up @@ -451,7 +451,7 @@ const config = (module.exports = {
},
},
{
files: ['test/**/*.ts'],
files: ['test/**/*.ts', 'src/__tests__/*.ts'],
rules: {
'n8n-local-rules/no-skipped-tests':
process.env.NODE_ENV === 'development' ? 'warn' : 'error',
Expand All @@ -460,7 +460,7 @@ const config = (module.exports = {
'@typescript-eslint/await-thenable': 'off',
'@typescript-eslint/ban-ts-comment': 'off',
'@typescript-eslint/naming-convention': 'off',
'@typescript-eslint/no-duplicate-imports': 'off',
'import/no-duplicates': 'off',
'@typescript-eslint/no-empty-function': 'off',
'@typescript-eslint/no-loop-func': 'off',
'@typescript-eslint/no-non-null-assertion': 'off',
Expand Down
30 changes: 15 additions & 15 deletions packages/@n8n_io/eslint-config/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,22 @@
"private": true,
"version": "0.0.1",
"devDependencies": {
"@types/eslint": "~8.37",
"@typescript-eslint/eslint-plugin": "~5.59",
"@typescript-eslint/parser": "~5.59",
"@types/eslint": "^8.44.1",
"@typescript-eslint/eslint-plugin": "^6.2.0",
"@typescript-eslint/parser": "^6.2.0",
"@vue/eslint-config-typescript": "^11.0.3",
"eslint": "~8.39",
"eslint-config-airbnb-typescript": "~17.0",
"eslint-config-prettier": "~8.8",
"eslint-import-resolver-typescript": "~3.5",
"eslint-plugin-diff": "~2.0",
"eslint-plugin-import": "~2.27",
"eslint-plugin-n8n-local-rules": "~1.0",
"eslint-plugin-prettier": "~4.2",
"eslint-plugin-unicorn": "~46.0",
"eslint-plugin-unused-imports": "~2.0",
"eslint-plugin-vue": "^9.12.0",
"vue-eslint-parser": "^9.3.0"
"eslint": "^8.45.0",
"eslint-config-airbnb-typescript": "^17.1.0",
"eslint-config-prettier": "^8.9.0",
"eslint-import-resolver-typescript": "^3.5.5",
"eslint-plugin-diff": "^2.0.1",
"eslint-plugin-import": "^2.28.0",
"eslint-plugin-n8n-local-rules": "^1.0.0",
"eslint-plugin-prettier": "^5.0.0",
"eslint-plugin-unicorn": "^48.0.1",
"eslint-plugin-unused-imports": "^3.0.0",
"eslint-plugin-vue": "^9.15.1",
"vue-eslint-parser": "^9.3.1"
},
"scripts": {
"clean": "rimraf .turbo",
Expand Down
9 changes: 3 additions & 6 deletions packages/cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,10 @@
"@types/ws": "^8.5.4",
"@types/yamljs": "^0.2.31",
"chokidar": "^3.5.2",
"concurrently": "^5.1.0",
"mock-jwks": "^1.0.9",
"nodemon": "^2.0.2",
"run-script-os": "^1.0.7",
"concurrently": "^8.2.0",
"ts-essentials": "^7.0.3",
"tsc-alias": "^1.8.2",
"tsconfig-paths": "^4.1.2"
"tsc-alias": "^1.8.7",
"tsconfig-paths": "^4.2.0"
},
"dependencies": {
"@n8n/client-oauth2": "workspace:*",
Expand Down
42 changes: 0 additions & 42 deletions packages/design-system/.storybook/main.js
View file
Open in desktop

This file was deleted.

25 changes: 25 additions & 0 deletions packages/design-system/.storybook/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import type { StorybookConfig } from '@storybook/vue3-vite';

const config: StorybookConfig = {
stories: ['../src/**/*.stories.@(js|jsx|ts|tsx|mdx)'],
addons: [
'@storybook/addon-styling',
'@storybook/addon-links',
'@storybook/addon-essentials',
'@storybook/addon-a11y',
'storybook-dark-mode',
],
staticDirs: ['../public'],
framework: {
name: '@storybook/vue3-vite',
options: {},
},
core: {
disableTelemetry: true,
},
docs: {
autodocs: true,
},
};

export default config;
26 changes: 13 additions & 13 deletions packages/design-system/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,18 +41,18 @@
"@fortawesome/fontawesome-svg-core": "^1.2.36",
"@fortawesome/free-solid-svg-icons": "^5.15.4",
"@fortawesome/vue-fontawesome": "^3.0.3",
"@storybook/addon-a11y": "^7.0.21",
"@storybook/addon-actions": "^7.0.21",
"@storybook/addon-docs": "^7.0.21",
"@storybook/addon-essentials": "^7.0.21",
"@storybook/addon-links": "^7.0.21",
"@storybook/addon-a11y": "^7.1.1",
"@storybook/addon-actions": "^7.1.1",
"@storybook/addon-docs": "^7.1.1",
"@storybook/addon-essentials": "^7.1.1",
"@storybook/addon-links": "^7.1.1",
"@storybook/addon-postcss": "3.0.0-alpha.1",
"@storybook/addon-styling": "^1.3.0",
"@storybook/vue3": "^7.0.21",
"@storybook/vue3-vite": "^7.0.21",
"@testing-library/jest-dom": "^5.16.5",
"@storybook/addon-styling": "^1.3.4",
"@storybook/vue3": "^7.1.1",
"@storybook/vue3-vite": "^7.1.1",
"@testing-library/jest-dom": "^5.17.0",
"@testing-library/user-event": "^14.4.3",
"@testing-library/vue": "^6.6.1",
"@testing-library/vue": "^7.0.0",
"@types/markdown-it": "^12.2.3",
"@types/markdown-it-emoji": "^2.0.2",
"@types/markdown-it-link-attributes": "^3.0.1",
Expand All @@ -62,11 +62,11 @@
"autoprefixer": "^10.4.14",
"core-js": "^3.31.0",
"jsdom": "21.1.0",
"sass": "^1.63.4",
"sass": "^1.64.1",
"sass-loader": "^13.3.2",
"storybook": "^7.0.21",
"storybook": "^7.1.1",
"storybook-addon-themes": "^6.1.0",
"storybook-dark-mode": "^3.0.0"
"storybook-dark-mode": "^3.0.1"
},
"dependencies": {
"element-plus": "^2.3.6",
Expand Down
2 changes: 1 addition & 1 deletion .../design-system/src/components/N8nActionBox/__tests__/__snapshots__/ActionBox.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Vitest Snapshot v1
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html

netroy marked this conversation as resolved.
Show resolved Hide resolved
exports[`N8NActionBox > should render correctly 1`] = `
"<div class=\\"n8n-action-box container\\" data-test-id=\\"action-box\\">
Expand Down
2 changes: 1 addition & 1 deletion ...stem/src/components/N8nActionDropdown/__tests__/__snapshots__/ActionDropdown.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Vitest Snapshot v1
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html

exports[`components > N8nActionDropdown > should render custom styling correctly 1`] = `
"<div class=\\"action-dropdown-container actionDropdownContainer\\">
Expand Down
2 changes: 1 addition & 1 deletion packages/design-system/src/components/N8nBadge/__tests__/__snapshots__/Badge.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Vitest Snapshot v1
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html

exports[`components > N8nBadge > props > should render default theme correctly 1`] = `"<span class=\\"n8n-badge default\\"><n8n-text-stub bold=\\"true\\" size=\\"large\\" compact=\\"true\\" tag=\\"span\\"></n8n-text-stub></span>"`;

Expand Down
2 changes: 1 addition & 1 deletion packages/design-system/src/components/N8nButton/__tests__/__snapshots__/Button.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Vitest Snapshot v1
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html

exports[`components > N8nButton > props > icon > should render icon button 1`] = `"<button class=\\"button button primary medium withIcon\\" aria-live=\\"polite\\"><span class=\\"icon\\"><n8n-icon-stub icon=\\"plus-circle\\" size=\\"medium\\" spin=\\"false\\"></n8n-icon-stub></span><span>Button</span></button>"`;

Expand Down
2 changes: 1 addition & 1 deletion ...ages/design-system/src/components/N8nCallout/__tests__/__snapshots__/Callout.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Vitest Snapshot v1
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html

exports[`components > N8nCallout > should render additional slots correctly 1`] = `
"<div class=\\"n8n-callout callout custom round\\" role=\\"alert\\">
Expand Down
2 changes: 1 addition & 1 deletion packages/design-system/src/components/N8nCard/__tests__/__snapshots__/Card.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Vitest Snapshot v1
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html

exports[`components > N8nCard > should render correctly 1`] = `
"<div class=\\"card\\">
Expand Down
2 changes: 1 addition & 1 deletion ...es/design-system/src/components/N8nCheckbox/__tests__/__snapshots__/Checkbox.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Vitest Snapshot v1
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html

exports[`components > N8nCheckbox > should render with both child and label 1`] = `
<div>
Expand Down
2 changes: 1 addition & 1 deletion ...ign-system/src/components/N8nColorPicker/__tests__/__snapshots__/ColorPicker.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Vitest Snapshot v1
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html

exports[`components > N8nColorPicker > should render with input 1`] = `
<div>
Expand Down
2 changes: 1 addition & 1 deletion .../design-system/src/components/N8nDatatable/__tests__/__snapshots__/Datatable.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Vitest Snapshot v1
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html

exports[`components > N8nDatatable > should render correctly 1`] = `
"<div class=\\"datatable datatableWrapper\\">
Expand Down
2 changes: 1 addition & 1 deletion ...ages/design-system/src/components/N8nInfoTip/__tests__/__snapshots__/InfoTip.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Vitest Snapshot v1
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html

exports[`N8nInfoTip > should render correctly as note 1`] = `"<div class=\\"n8n-info-tip info note bold\\"><span class=\\"iconText\\"><span class=\\"n8n-text compact size-medium regular n8n-icon n8n-icon\\"><!----></span><span>Need help doing something?<a href=\\"/docs\\" target=\\"_blank\\">Open docs</a></span></span></div>"`;

Expand Down
2 changes: 1 addition & 1 deletion packages/design-system/src/components/N8nInput/__tests__/__snapshots__/Input.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Vitest Snapshot v1
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html

exports[`N8nInput > should render correctly 1`] = `
"<div class=\\"el-input el-input--large n8n-input\\">
Expand Down
2 changes: 1 addition & 1 deletion packages/design-system/src/components/N8nNotice/__tests__/__snapshots__/Notice.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Vitest Snapshot v1
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html

exports[`components > N8nNotice > props > content > should render HTML 1`] = `
"<div id=\\"notice\\" class=\\"notice notice warning\\" role=\\"alert\\">
Expand Down
2 changes: 1 addition & 1 deletion ...em/src/components/N8nRecycleScroller/__tests__/__snapshots__/RecycleScroller.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Vitest Snapshot v1
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html

exports[`components > N8nRecycleScroller > should render correctly 1`] = `
"<div class=\\"recycle-scroller-wrapper\\">
Expand Down
2 changes: 1 addition & 1 deletion packages/design-system/src/components/N8nSelect/__tests__/__snapshots__/Select.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Vitest Snapshot v1
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html

exports[`components > N8nSelect > should render correctly 1`] = `
"<div class=\\"n8n-select container\\">
Expand Down
Loading
Loading