From 65a88ad40e76c1aa09ead41d7c8e1d5663d552f1 Mon Sep 17 00:00:00 2001 From: Emil Litwiniec Date: Fri, 24 May 2024 16:27:52 +0200 Subject: [PATCH] fix: webapp eslint config redundant root import --- .../generators/webapp-lib/files/eslint.config.js__template__ | 4 +--- packages/webapp-libs/webapp-api-client/eslint.config.js | 3 --- packages/webapp-libs/webapp-contentful/eslint.config.js | 4 +--- packages/webapp-libs/webapp-crud-demo/eslint.config.js | 4 +--- packages/webapp-libs/webapp-documents/eslint.config.js | 4 +--- packages/webapp-libs/webapp-emails/eslint.config.js | 2 -- packages/webapp-libs/webapp-finances/eslint.config.js | 4 +--- packages/webapp-libs/webapp-generative-ai/eslint.config.js | 4 +--- packages/webapp-libs/webapp-notifications/eslint.config.js | 4 +--- packages/webapp-libs/webapp-tenants/eslint.config.js | 4 +--- packages/webapp/eslint.config.js | 3 --- 11 files changed, 8 insertions(+), 32 deletions(-) diff --git a/packages/internal/tools/src/generators/webapp-lib/files/eslint.config.js__template__ b/packages/internal/tools/src/generators/webapp-lib/files/eslint.config.js__template__ index fffaa5a71..d3658660a 100644 --- a/packages/internal/tools/src/generators/webapp-lib/files/eslint.config.js__template__ +++ b/packages/internal/tools/src/generators/webapp-lib/files/eslint.config.js__template__ @@ -1,5 +1,3 @@ -const rootConfig = require('<%= offsetFromRoot %>eslint.config.js'); - const webappCoreConfig = require('@sb/webapp-core/eslint.config.js'); -module.exports = [...rootConfig, ...webappCoreConfig]; +module.exports = [...webappCoreConfig]; diff --git a/packages/webapp-libs/webapp-api-client/eslint.config.js b/packages/webapp-libs/webapp-api-client/eslint.config.js index 1acfe8720..f0cd7d7de 100644 --- a/packages/webapp-libs/webapp-api-client/eslint.config.js +++ b/packages/webapp-libs/webapp-api-client/eslint.config.js @@ -1,9 +1,6 @@ -const rootConfig = require('../../../eslint.config.js'); - const webappCoreConfig = require('@sb/webapp-core/eslint.config.js'); module.exports = [ - ...rootConfig, ...webappCoreConfig, { ignores: ['**/src/graphql/__generated'], diff --git a/packages/webapp-libs/webapp-contentful/eslint.config.js b/packages/webapp-libs/webapp-contentful/eslint.config.js index a861846f3..d3658660a 100644 --- a/packages/webapp-libs/webapp-contentful/eslint.config.js +++ b/packages/webapp-libs/webapp-contentful/eslint.config.js @@ -1,5 +1,3 @@ -const rootConfig = require('../../../eslint.config.js'); - const webappCoreConfig = require('@sb/webapp-core/eslint.config.js'); -module.exports = [...rootConfig, ...webappCoreConfig]; +module.exports = [...webappCoreConfig]; diff --git a/packages/webapp-libs/webapp-crud-demo/eslint.config.js b/packages/webapp-libs/webapp-crud-demo/eslint.config.js index a861846f3..d3658660a 100644 --- a/packages/webapp-libs/webapp-crud-demo/eslint.config.js +++ b/packages/webapp-libs/webapp-crud-demo/eslint.config.js @@ -1,5 +1,3 @@ -const rootConfig = require('../../../eslint.config.js'); - const webappCoreConfig = require('@sb/webapp-core/eslint.config.js'); -module.exports = [...rootConfig, ...webappCoreConfig]; +module.exports = [...webappCoreConfig]; diff --git a/packages/webapp-libs/webapp-documents/eslint.config.js b/packages/webapp-libs/webapp-documents/eslint.config.js index a861846f3..d3658660a 100644 --- a/packages/webapp-libs/webapp-documents/eslint.config.js +++ b/packages/webapp-libs/webapp-documents/eslint.config.js @@ -1,5 +1,3 @@ -const rootConfig = require('../../../eslint.config.js'); - const webappCoreConfig = require('@sb/webapp-core/eslint.config.js'); -module.exports = [...rootConfig, ...webappCoreConfig]; +module.exports = [...webappCoreConfig]; diff --git a/packages/webapp-libs/webapp-emails/eslint.config.js b/packages/webapp-libs/webapp-emails/eslint.config.js index a861846f3..12f69dadc 100644 --- a/packages/webapp-libs/webapp-emails/eslint.config.js +++ b/packages/webapp-libs/webapp-emails/eslint.config.js @@ -1,5 +1,3 @@ -const rootConfig = require('../../../eslint.config.js'); - const webappCoreConfig = require('@sb/webapp-core/eslint.config.js'); module.exports = [...rootConfig, ...webappCoreConfig]; diff --git a/packages/webapp-libs/webapp-finances/eslint.config.js b/packages/webapp-libs/webapp-finances/eslint.config.js index a861846f3..16e7deac7 100644 --- a/packages/webapp-libs/webapp-finances/eslint.config.js +++ b/packages/webapp-libs/webapp-finances/eslint.config.js @@ -1,5 +1,3 @@ -const rootConfig = require('../../../eslint.config.js'); - const webappCoreConfig = require('@sb/webapp-core/eslint.config.js'); -module.exports = [...rootConfig, ...webappCoreConfig]; +module.exports = [ ...webappCoreConfig]; diff --git a/packages/webapp-libs/webapp-generative-ai/eslint.config.js b/packages/webapp-libs/webapp-generative-ai/eslint.config.js index a861846f3..d3658660a 100644 --- a/packages/webapp-libs/webapp-generative-ai/eslint.config.js +++ b/packages/webapp-libs/webapp-generative-ai/eslint.config.js @@ -1,5 +1,3 @@ -const rootConfig = require('../../../eslint.config.js'); - const webappCoreConfig = require('@sb/webapp-core/eslint.config.js'); -module.exports = [...rootConfig, ...webappCoreConfig]; +module.exports = [...webappCoreConfig]; diff --git a/packages/webapp-libs/webapp-notifications/eslint.config.js b/packages/webapp-libs/webapp-notifications/eslint.config.js index a861846f3..d3658660a 100644 --- a/packages/webapp-libs/webapp-notifications/eslint.config.js +++ b/packages/webapp-libs/webapp-notifications/eslint.config.js @@ -1,5 +1,3 @@ -const rootConfig = require('../../../eslint.config.js'); - const webappCoreConfig = require('@sb/webapp-core/eslint.config.js'); -module.exports = [...rootConfig, ...webappCoreConfig]; +module.exports = [...webappCoreConfig]; diff --git a/packages/webapp-libs/webapp-tenants/eslint.config.js b/packages/webapp-libs/webapp-tenants/eslint.config.js index a861846f3..d3658660a 100644 --- a/packages/webapp-libs/webapp-tenants/eslint.config.js +++ b/packages/webapp-libs/webapp-tenants/eslint.config.js @@ -1,5 +1,3 @@ -const rootConfig = require('../../../eslint.config.js'); - const webappCoreConfig = require('@sb/webapp-core/eslint.config.js'); -module.exports = [...rootConfig, ...webappCoreConfig]; +module.exports = [...webappCoreConfig]; diff --git a/packages/webapp/eslint.config.js b/packages/webapp/eslint.config.js index 7e6e0b7d2..8495e291a 100644 --- a/packages/webapp/eslint.config.js +++ b/packages/webapp/eslint.config.js @@ -1,9 +1,6 @@ const webappCoreConfig = require('@sb/webapp-core/eslint.config.js'); -const rootConfig = require('../../eslint.config.js'); - module.exports = [ - ...rootConfig, ...webappCoreConfig, { ignores: [