Skip to content

Commit 4fce134

Browse files
krzysztofzurawkrzysztofzuraw
authored
Add shared tsconfig & change linter name to be in sync with other pkg (#1778)
1 parent f8196e1 commit 4fce134

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+372
-422
lines changed

‎.changeset/lucky-years-develop.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
"@saleor/react-hook-form-macaw": patch
3-
"eslint-config-saleor": patch
3+
"@saleor/apps-eslint-config": patch
44
"@saleor/webhook-utils": patch
55
"saleor-app-products-feed": patch
66
"@saleor/apps-logger": patch

‎.changeset/neat-cougars-cross.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@saleor/typescript-config-apps": patch
3+
---
4+
5+
Initial version of pkg

‎.eslintrc.js

-9
This file was deleted.

‎.lintstagedrc.js

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
/**
2+
* @type {import('lint-staged').Configuration}
3+
*/
4+
export default {
5+
"*.{jsx,tsx,js,ts,md,mdx}": "eslint --cache --fix",
6+
"*.{jsx,tsx,js,ts,md,mdx}": "prettier --write",
7+
"*.{jsx,tsx,js,ts,md,mdx}": "cspell --no-must-find-files",
8+
"package.json": "sort-package-json",
9+
};

‎.prettierignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
**/pnpm-lock.yaml
33
**/graphql/schema.graphql
44
**/generated
5-
.changeset/
5+
.changeset/

‎apps/avatax/.eslintrc.cjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module.exports = {
22
root: true,
3-
extends: ["saleor"],
3+
extends: ["@saleor/eslint-config-apps"],
44
plugins: ["neverthrow", "node"],
55
rules: {
66
"turbo/no-undeclared-env-vars": ["error"],

‎apps/avatax/.lintstagedrc.js

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import baseConfig from "../../.lintstagedrc.js";
2+
3+
export default {
4+
...baseConfig,
5+
};

‎apps/avatax/package.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"type": "module",
66
"scripts": {
77
"build": "next build",
8-
"check-types": "tsc --noEmit",
8+
"check-types": "tsc",
99
"deploy": "tsx --require dotenv/config ./scripts/deploy.ts",
1010
"dev": "NODE_OPTIONS='--inspect' next dev",
1111
"dev:debug": "APP_LOG_LEVEL=debug pnpm dev",
@@ -88,6 +88,8 @@
8888
"@graphql-codegen/typescript-urql": "4.0.0",
8989
"@graphql-typed-document-node/core": "3.2.0",
9090
"@next/bundle-analyzer": "14.1.4",
91+
"@saleor/eslint-config-apps": "workspace:*",
92+
"@saleor/typescript-config-apps": "workspace:*",
9193
"@testing-library/react": "^14.0.0",
9294
"@total-typescript/ts-reset": "0.6.1",
9395
"@types/react": "18.2.5",
@@ -96,7 +98,6 @@
9698
"@vitest/coverage-v8": "1.6.0",
9799
"aws-sdk-client-mock": "4.0.1",
98100
"eslint": "catalog:",
99-
"eslint-config-saleor": "workspace:*",
100101
"eslint-plugin-neverthrow": "^1.1.4",
101102
"eslint-plugin-node": "11.1.0",
102103
"graphql-config": "5.0.3",

‎apps/avatax/tsconfig.json

+1-14
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,6 @@
11
{
2+
"extends": "@saleor/typescript-config-apps/base.json",
23
"compilerOptions": {
3-
"target": "es5",
4-
"lib": ["dom", "dom.iterable", "esnext"],
5-
"allowJs": true,
6-
"skipLibCheck": true,
7-
"strict": true,
8-
"forceConsistentCasingInFileNames": true,
9-
"noEmit": true,
10-
"esModuleInterop": true,
11-
"module": "esnext",
12-
"moduleResolution": "Bundler",
13-
"resolveJsonModule": true,
14-
"isolatedModules": true,
15-
"jsx": "preserve",
16-
"incremental": true,
174
"baseUrl": ".",
185
"paths": {
196
"@/*": ["src/*"]

‎apps/cms/.eslintrc.cjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module.exports = {
22
root: true,
3-
extends: ["saleor"],
3+
extends: ["@saleor/eslint-config-apps"],
44
rules: {
55
"@saleor/saleor-app/logger-leak": "warn",
66
},

‎apps/cms/.lintstagedrc.js

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import baseConfig from "../../.lintstagedrc.js";
2+
3+
export default {
4+
...baseConfig,
5+
};

‎apps/cms/package.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"type": "module",
66
"scripts": {
77
"build": "next build",
8-
"check-types": "tsc --noEmit",
8+
"check-types": "tsc",
99
"deploy": "tsx --require dotenv/config ./scripts/deploy.ts",
1010
"dev": "NODE_OPTIONS='--inspect' next dev",
1111
"dev:debug": "APP_LOG_LEVEL=debug pnpm dev",
@@ -73,14 +73,15 @@
7373
"@graphql-codegen/typescript-operations": "4.1.3",
7474
"@graphql-codegen/typescript-urql": "4.0.0",
7575
"@graphql-typed-document-node/core": "3.2.0",
76+
"@saleor/eslint-config-apps": "workspace:*",
77+
"@saleor/typescript-config-apps": "workspace:*",
7678
"@testing-library/react": "^14.0.0",
7779
"@testing-library/react-hooks": "^8.0.1",
7880
"@types/qs": "^6.9.7",
7981
"@types/react": "18.2.5",
8082
"@types/react-dom": "18.2.5",
8183
"@vitest/coverage-v8": "1.6.0",
8284
"eslint": "catalog:",
83-
"eslint-config-saleor": "workspace:*",
8485
"node-mocks-http": "^1.12.2",
8586
"tsx": "4.7.1",
8687
"typescript": "5.5.4"

‎apps/cms/tsconfig.json

+3-15
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,11 @@
11
{
2+
"extends": "@saleor/typescript-config-apps/base.json",
23
"compilerOptions": {
3-
"target": "es5",
4-
"lib": ["dom", "dom.iterable", "esnext"],
5-
"allowJs": true,
6-
"skipLibCheck": true,
7-
"strict": true,
8-
"forceConsistentCasingInFileNames": true,
9-
"noEmit": true,
10-
"esModuleInterop": true,
11-
"module": "esnext",
12-
"moduleResolution": "bundler",
13-
"resolveJsonModule": true,
14-
"isolatedModules": true,
15-
"jsx": "preserve",
16-
"incremental": true,
4+
"baseUrl": ".",
175
"paths": {
186
"@/*": ["./src/*"]
197
}
208
},
21-
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", "next.config.js"],
9+
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", "next.config.js", ".eslintrc.cjs"],
2210
"exclude": ["node_modules"]
2311
}

‎apps/klaviyo/.eslintrc.cjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module.exports = {
22
root: true,
3-
extends: ["saleor"],
3+
extends: ["@saleor/eslint-config-apps"],
44
rules: {
55
"no-console": "error",
66
"@saleor/saleor-app/logger-leak": "warn",

‎apps/klaviyo/.lintstagedrc.js

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import baseConfig from "../../.lintstagedrc.js";
2+
3+
export default {
4+
...baseConfig,
5+
};

‎apps/klaviyo/package.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"type": "module",
66
"scripts": {
77
"build": "next build",
8-
"check-types": "tsc --noEmit",
8+
"check-types": "tsc",
99
"deploy": "tsx --require dotenv/config ./scripts/deploy.ts",
1010
"dev": "NODE_OPTIONS='--inspect' next dev",
1111
"fetch-schema": "curl https://raw.githubusercontent.com/saleor/saleor/${npm_package_saleor_schemaVersion}/saleor/graphql/schema.graphql > graphql/schema.graphql",
@@ -56,12 +56,14 @@
5656
"@graphql-codegen/typescript-operations": "4.1.3",
5757
"@graphql-codegen/typescript-urql": "4.0.0",
5858
"@graphql-typed-document-node/core": "3.2.0",
59+
"@saleor/eslint-config-apps": "workspace:*",
60+
"@saleor/typescript-config-apps": "workspace:*",
61+
"@types/node": "22.13.10",
5962
"@types/react": "18.2.5",
6063
"@types/react-dom": "18.2.5",
6164
"autoprefixer": "^10.4.7",
6265
"clean-publish": "^4.0.1",
6366
"eslint": "catalog:",
64-
"eslint-config-saleor": "workspace:*",
6567
"postcss": "^8.4.14",
6668
"pretty-quick": "^3.1.3",
6769
"tsx": "4.7.1",

‎apps/klaviyo/tsconfig.json

+2-17
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,5 @@
11
{
2-
"compilerOptions": {
3-
"target": "es5",
4-
"lib": ["dom", "dom.iterable", "esnext"],
5-
"allowJs": true,
6-
"skipLibCheck": true,
7-
"strict": true,
8-
"forceConsistentCasingInFileNames": true,
9-
"noEmit": true,
10-
"esModuleInterop": true,
11-
"module": "esnext",
12-
"moduleResolution": "bundler",
13-
"resolveJsonModule": true,
14-
"isolatedModules": true,
15-
"jsx": "preserve",
16-
"incremental": true
17-
},
18-
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", "next.config.js"],
2+
"extends": "@saleor/typescript-config-apps/base.json",
3+
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", "next.config.js", ".eslintrc.cjs"],
194
"exclude": ["node_modules"]
205
}

‎apps/products-feed/.eslintrc.cjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module.exports = {
22
root: true,
3-
extends: ["saleor"],
3+
extends: ["@saleor/eslint-config-apps"],
44
rules: {
55
"@saleor/saleor-app/logger-leak": "warn",
66
},

‎apps/products-feed/.lintstagedrc.js

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import baseConfig from "../../.lintstagedrc.js";
2+
3+
export default {
4+
...baseConfig,
5+
};

‎apps/products-feed/package.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"type": "module",
66
"scripts": {
77
"build": "next build",
8-
"check-types": "tsc --noEmit",
8+
"check-types": "tsc",
99
"deploy": "tsx --require dotenv/config ./scripts/deploy.ts",
1010
"dev": "NODE_OPTIONS='--inspect' next dev",
1111
"fetch-schema": "curl https://raw.githubusercontent.com/saleor/saleor/${npm_package_saleor_schemaVersion}/saleor/graphql/schema.graphql > graphql/schema.graphql",
@@ -72,13 +72,14 @@
7272
"@graphql-codegen/typescript-operations": "4.1.3",
7373
"@graphql-codegen/typescript-urql": "4.0.0",
7474
"@graphql-typed-document-node/core": "3.2.0",
75+
"@saleor/eslint-config-apps": "workspace:*",
76+
"@saleor/typescript-config-apps": "workspace:*",
7577
"@testing-library/react": "^14.0.0",
7678
"@testing-library/react-hooks": "^8.0.1",
7779
"@types/react": "18.2.5",
7880
"@types/react-dom": "18.2.5",
7981
"@vitest/coverage-v8": "1.6.0",
8082
"eslint": "catalog:",
81-
"eslint-config-saleor": "workspace:*",
8283
"tsx": "4.7.1",
8384
"typescript": "5.5.4"
8485
},

‎apps/products-feed/tsconfig.json

+2-17
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,5 @@
11
{
2-
"compilerOptions": {
3-
"target": "es5",
4-
"lib": ["dom", "dom.iterable", "esnext"],
5-
"allowJs": true,
6-
"skipLibCheck": true,
7-
"strict": true,
8-
"forceConsistentCasingInFileNames": true,
9-
"noEmit": true,
10-
"esModuleInterop": true,
11-
"module": "esnext",
12-
"moduleResolution": "bundler",
13-
"resolveJsonModule": true,
14-
"isolatedModules": true,
15-
"jsx": "preserve",
16-
"incremental": true
17-
},
18-
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", "next.config.js"],
2+
"extends": "@saleor/typescript-config-apps/base.json",
3+
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", "next.config.js", ".eslintrc.cjs"],
194
"exclude": ["node_modules"]
205
}

‎apps/search/.eslintrc.cjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module.exports = {
22
root: true,
3-
extends: ["saleor"],
3+
extends: ["@saleor/eslint-config-apps"],
44
rules: {
55
"@saleor/saleor-app/logger-leak": "warn",
66
},

‎apps/search/.lintstagedrc.js

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import baseConfig from "../../.lintstagedrc.js";
2+
3+
export default {
4+
...baseConfig,
5+
};

‎apps/search/package.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"type": "module",
66
"scripts": {
77
"build": "next build",
8-
"check-types": "tsc --noEmit",
8+
"check-types": "tsc",
99
"deploy": "tsx --require dotenv/config ./scripts/deploy.ts",
1010
"dev": "NODE_OPTIONS='--inspect' next dev",
1111
"fetch-schema": "curl https://raw.githubusercontent.com/saleor/saleor/${npm_package_saleor_schemaVersion}/saleor/graphql/schema.graphql > graphql/schema.graphql",
@@ -68,14 +68,15 @@
6868
"@graphql-codegen/typescript-operations": "4.1.3",
6969
"@graphql-codegen/typescript-urql": "4.0.0",
7070
"@graphql-typed-document-node/core": "3.2.0",
71+
"@saleor/eslint-config-apps": "workspace:*",
72+
"@saleor/typescript-config-apps": "workspace:*",
7173
"@testing-library/react-hooks": "^8.0.1",
7274
"@types/debug": "^4.1.7",
7375
"@types/react": "18.2.5",
7476
"@types/react-dom": "18.2.5",
7577
"@vitejs/plugin-react": "4.3.1",
7678
"@vitest/coverage-v8": "1.6.0",
7779
"eslint": "catalog:",
78-
"eslint-config-saleor": "workspace:*",
7980
"node-mocks-http": "^1.12.2",
8081
"tsx": "4.7.1",
8182
"typescript": "5.5.4",

‎apps/search/tsconfig.json

+2-17
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,5 @@
11
{
2-
"compilerOptions": {
3-
"target": "ES2021",
4-
"lib": ["dom", "dom.iterable", "esnext"],
5-
"allowJs": true,
6-
"skipLibCheck": true,
7-
"strict": true,
8-
"forceConsistentCasingInFileNames": true,
9-
"noEmit": true,
10-
"esModuleInterop": true,
11-
"module": "esnext",
12-
"moduleResolution": "bundler",
13-
"resolveJsonModule": true,
14-
"isolatedModules": true,
15-
"jsx": "preserve",
16-
"incremental": true
17-
},
18-
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", "next.config.js"],
2+
"extends": "@saleor/typescript-config-apps/base.json",
3+
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", "next.config.js", ".eslintrc.cjs"],
194
"exclude": ["node_modules"]
205
}

‎apps/segment/.eslintrc.cjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module.exports = {
22
root: true,
3-
extends: ["saleor"],
3+
extends: ["@saleor/eslint-config-apps"],
44
plugins: ["@typescript-eslint", "neverthrow", "node"],
55
rules: {
66
"turbo/no-undeclared-env-vars": ["error"],

‎apps/segment/.lintstagedrc.js

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import baseConfig from "../../.lintstagedrc.js";
2+
3+
export default {
4+
...baseConfig,
5+
};

‎apps/segment/package.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"type": "module",
66
"scripts": {
77
"build": "next build",
8-
"check-types": "tsc --noEmit",
8+
"check-types": "tsc",
99
"deploy": "tsx --require dotenv/config ./scripts/deploy.ts",
1010
"dev": "NODE_OPTIONS='--inspect' next dev",
1111
"fetch-schema": "curl https://raw.githubusercontent.com/saleor/saleor/${npm_package_saleor_schemaVersion}/saleor/graphql/schema.graphql > graphql/schema.graphql",
@@ -77,6 +77,8 @@
7777
"@graphql-codegen/typescript-operations": "4.1.3",
7878
"@graphql-codegen/typescript-urql": "4.0.0",
7979
"@graphql-typed-document-node/core": "3.2.0",
80+
"@saleor/eslint-config-apps": "workspace:*",
81+
"@saleor/typescript-config-apps": "workspace:*",
8082
"@testing-library/react": "^14.0.0",
8183
"@testing-library/react-hooks": "^8.0.1",
8284
"@total-typescript/ts-reset": "0.6.1",
@@ -87,7 +89,6 @@
8789
"@vitest/coverage-v8": "1.6.0",
8890
"aws-sdk-client-mock": "4.0.1",
8991
"eslint": "catalog:",
90-
"eslint-config-saleor": "workspace:*",
9192
"eslint-plugin-neverthrow": "^1.1.4",
9293
"eslint-plugin-node": "11.1.0",
9394
"graphql-config": "5.0.3",

0 commit comments

Comments
 (0)