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.

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

fix(typescript): Use consistent typescript configs - N8N-4552 #4049

Merged
merged 1 commit into from
Sep 9, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions docker/images/n8n-custom/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ RUN \
apk --no-cache add git && \
npm install -g run-script-os turbo

COPY turbo.json package.json package-lock.json ./
COPY turbo.json package.json package-lock.json tsconfig.json ./
COPY packages ./packages

RUN chown -R node:node .
Expand All @@ -21,7 +21,7 @@ RUN \
# TODO: removing dev dependecies is deleting `bn.js`, which breaks the Snowflake node
npm prune --omit=dev && \
npm i --omit=dev bn.js && \
find . -type f -name "*.ts" -o -name "*.js.map" -o -name "*.vue" | xargs rm &&\
find . -type f -name "*.ts" -o -name "*.js.map" -o -name "*.vue" -o -name "tsconfig.json" | xargs rm &&\
rm -rf node_modules/.cache packages/*/node_modules/.cache packages/*/.turbo .config .npm /tmp/*


Expand Down
2 changes: 1 addition & 1 deletion packages/cli/jest.config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module.exports = {
verbose: true,
transform: {
'^.+\\.ts?$': 'ts-jest',
'^.+\\.ts$': 'ts-jest',
},
testURL: 'http://localhost/',
testRegex: '(/__tests__/.*|(\\.|/)(test))\\.ts$',
Expand Down
42 changes: 8 additions & 34 deletions packages/cli/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,40 +1,14 @@
{
"extends": "../../tsconfig.json",
"compilerOptions": {
"lib": [
"es2017",
"ES2020.Promise"
],
"types": [
"node",
"jest"
],
"module": "commonjs",
"noImplicitAny": true,
"removeComments": true,
"incremental": true,
"strictNullChecks": true,
"forceConsistentCasingInFileNames": true,
"noImplicitReturns": true,
"preserveConstEnums": true,
"declaration": true,
"outDir": "./dist/",
"target": "es2017",
netroy marked this conversation as resolved.
Show resolved Hide resolved
"sourceMap": true,
"outDir": "dist",
"types": ["node", "jest"],
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"esModuleInterop": true
// TODO: remove all options below this line
netroy marked this conversation as resolved.
Show resolved Hide resolved
"strict": false,
"noUnusedLocals": false,
"useUnknownInCatchVariables": false
},
"include": [
"**/*.d.ts",
"commands/**/*",
"index.ts",
"config/**/*",
"src/**/*",
"test/**/*"
],
"exclude": [
"dist/**/*",
"node_modules/**/*",
"**/*.spec.ts"
]
"include": ["**/*.d.ts", "commands/**/*", "config/**/*", "src/**/*"]
}
5 changes: 2 additions & 3 deletions packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,17 +61,16 @@
},
"jest": {
"transform": {
"^.+\\.tsx?$": "ts-jest"
"^.+\\.ts$": "ts-jest"
},
"testURL": "http://localhost/",
"testRegex": "(/__tests__/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$",
"testRegex": "(/__tests__/.*|(\\.|/)(test|spec))\\.(js|ts)$",
"testPathIgnorePatterns": [
"/dist/",
"/node_modules/"
],
"moduleFileExtensions": [
"ts",
"tsx",
"js",
"json",
"node"
Expand Down
38 changes: 7 additions & 31 deletions packages/core/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,35 +1,11 @@
{
"extends": "../../tsconfig.json",
"compilerOptions": {
"lib": [
"es2019"
],
"types": [
"node",
"jest"
],
"module": "commonjs",
"incremental": true,
"removeComments": true,
"forceConsistentCasingInFileNames": true,
"noImplicitReturns": true,
"strict": true,
"noUnusedLocals": true,
"preserveConstEnums": true,
"declaration": true,
"outDir": "./dist/",
"target": "es2019",
"sourceMap": true,
"esModuleInterop": true,
"useUnknownInCatchVariables": false,
"rootDir": ".",
"outDir": "dist",
"types": ["node", "jest"],
// TODO: remove all options below this line
"useUnknownInCatchVariables": false
},
"include": [
"**/*.d.ts",
"src/**/*",
"test/**/*"
],
"exclude": [
"dist/**/*",
"node_modules/**/*",
"**/*.spec.ts"
]
"include": ["src/**/*.ts"]
}
2 changes: 1 addition & 1 deletion packages/design-system/.storybook/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const path = require('path');
* @type {import('@storybook/core-common').StorybookConfig}
*/
module.exports = {
stories: ['../src/**/*.stories.mdx', '../src/**/*.stories.@(js|jsx|ts|tsx)'],
stories: ['../src/**/*.stories.mdx', '../src/**/*.stories.@(js|ts)'],
addons: [
'@storybook/addon-links',
'@storybook/addon-essentials',
Expand Down
13 changes: 0 additions & 13 deletions packages/design-system/src/shims-tsx.d.ts

This file was deleted.

34 changes: 10 additions & 24 deletions packages/design-system/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,38 +1,24 @@
{
"extends": "../../tsconfig.json",
"compilerOptions": {
"rootDir": ".",
"outDir": "dist",
"target": "esnext",
"module": "esnext",
"strict": true,
"importHelpers": true,
"moduleResolution": "node",
"declaration": true,
"experimentalDecorators": true,
"skipLibCheck": true,
"incremental": true,
"esModuleInterop": true,
"allowJs": true,
"allowSyntheticDefaultImports": true,
"sourceMap": true,
"baseUrl": ".",
"outDir": "dist",
"types": [
"webpack-env",
"jest",
"vitest/globals"
],
"typeRoots": [
"@testing-library",
"@types"
],
"types": ["webpack-env", "jest", "vitest/globals"],
"typeRoots": ["@testing-library", "@types"],
"paths": {
"@/*": ["src/*"]
},
"lib": ["esnext", "dom", "dom.iterable", "scripthost"]
"lib": ["esnext", "dom", "dom.iterable", "scripthost"],
// TODO: remove all options below this line
"noUnusedLocals": false,
"noImplicitReturns": false
},
"include": [
"src/**/*.ts",
"src/**/*.tsx",
"src/**/*.vue"
],
"exclude": ["node_modules"]
"include": ["src/**/*.ts", "src/**/*.vue"]
}
6 changes: 2 additions & 4 deletions packages/editor-ui/jest.config.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
module.exports = {
moduleFileExtensions: [
'js',
'jsx',
'json',
'vue',
'ts',
'tsx',
],
transform: {
'^.+\\.vue$': 'vue-jest',
'.+\\.(css|styl|less|sass|scss|svg|png|jpg|ttf|woff|woff2)$': 'jest-transform-stub',
'^.+\\.tsx?$': 'ts-jest',
'^.+\\.ts$': 'ts-jest',
},
moduleNameMapper: {
'^@/(.*)$': '<rootDir>/src/$1',
Expand All @@ -19,7 +17,7 @@ module.exports = {
'jest-serializer-vue',
],
testMatch: [
'**/tests/unit/**/*.spec.(js|jsx|ts|tsx)|**/__tests__/*.(js|jsx|ts|tsx)',
'**/tests/unit/**/*.spec.(js|ts)|**/__tests__/*.(js|ts)',
],
testURL: 'http://localhost/',
};
13 changes: 0 additions & 13 deletions packages/editor-ui/src/shims-tsx.d.ts

This file was deleted.

45 changes: 11 additions & 34 deletions packages/editor-ui/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,46 +1,23 @@
{
"extends": "../../tsconfig.json",
"compilerOptions": {
"rootDir": ".",
"outDir": "dist",
"target": "esnext",
"module": "esnext",
"removeComments": true,
"forceConsistentCasingInFileNames": true,
"noImplicitReturns": true,
"strict": true,
"jsx": "preserve",
"skipLibCheck": true,
"incremental": true,
"allowJs": true,
"importHelpers": true,
"moduleResolution": "node",
"esModuleInterop": true,
"allowSyntheticDefaultImports": true,
"useUnknownInCatchVariables": false,
"resolveJsonModule": true,
"sourceMap": true,
"baseUrl": ".",
"types": [
"webpack-env",
"jest"
],
"types": ["webpack-env", "jest"],
"paths": {
"@/*": [
"src/*"
]
"@/*": ["src/*"]
},
"lib": [
"esnext",
"dom",
"dom.iterable",
"scripthost"
]
"lib": ["esnext", "dom", "dom.iterable", "scripthost"],
// TODO: remove all options below this line
"noUnusedLocals": false,
"useUnknownInCatchVariables": false
},
"include": [
"src/**/*.ts",
"src/**/*.tsx",
"src/**/*.vue",
"tests/**/*.ts",
"tests/**/*.tsx",
],
"exclude": [
"node_modules"
]
"include": ["src/**/*.ts", "src/**/*.vue"]
}
14 changes: 1 addition & 13 deletions packages/node-dev/src/tsconfig-build.json
Original file line number Diff line number Diff line change
@@ -1,22 +1,10 @@
{
"extends": "../../tsconfig.json",
"compilerOptions": {
"lib": [
"es2017"
],
"types": [],
"module": "commonjs",
"incremental": true,
"importHelpers": true,
"preserveConstEnums": true,
"declaration": true,
"target": "es2017",
"sourceMap": true
},
"include": [
"*.credentials.ts",
"*.node.ts"
],
"exclude": [
"node_modules"
]
}
35 changes: 7 additions & 28 deletions packages/node-dev/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,32 +1,11 @@
{
"extends": "../../tsconfig.json",
"compilerOptions": {
"lib": [
"es2019"
],
"types": [
"node"
],
"module": "commonjs",
"incremental": true,
"esModuleInterop": true,
"removeComments": true,
"strict": true,
"preserveConstEnums": true,
"declaration": true,
"outDir": "./dist/",
"target": "es2019",
"useUnknownInCatchVariables": false,
"sourceMap": true
"outDir": "dist",
"types": ["node"],
// TODO: remove all options below this line
"noUnusedLocals": false,
"useUnknownInCatchVariables": false
},
"include": [
"**/*.d.ts",
"commands/**/*",
"index.ts",
"src/**/*"
],
"exclude": [
"dist",
"node_modules/**/*",
"**/*.spec.ts"
]
"include": ["commands/**/*.ts", "src/**/*.ts"]
}
5 changes: 2 additions & 3 deletions packages/nodes-base/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -795,17 +795,16 @@
},
"jest": {
"transform": {
"^.+\\.tsx?$": "ts-jest"
"^.+\\.ts$": "ts-jest"
},
"testURL": "http://localhost/",
"testRegex": "(/__tests__/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$",
"testRegex": "(/__tests__/.*|(\\.|/)(test|spec))\\.(js|ts)$",
"testPathIgnorePatterns": [
"/dist/",
"/node_modules/"
],
"moduleFileExtensions": [
"ts",
"tsx",
"js",
"json"
]
Expand Down
Loading