build: enable eslint support for VS Code (#6759)

SAP · Mar 22, 2023 · 4e115b8 · 4e115b8
1 parent 43301a9
commit 4e115b8
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -39,7 +39,6 @@ web.config
 /sap-ui-cachebuster-info.json
 
 # Ignore Visual Studio Code project and settings files
-.vscode/
 .idea/
 
 # Ignore yarn files

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,8 @@
+{
+    "eslint.workingDirectories": [
+        "./packages/base",
+        "./packages/localization",
+        "./packages/main",
+        "./packages/fiori",
+    ]
+}
diff --git a/packages/base/.eslintrc.js b/packages/base/.eslintrc.js
@@ -0,0 +1,3 @@
+const config = require("@ui5/webcomponents-tools/components-package/eslint.js");
+
+module.exports = config;
diff --git a/packages/base/package-scripts.js b/packages/base/package-scripts.js
@@ -11,11 +11,10 @@ const preprocessJSDocScript = resolve.sync("@ui5/webcomponents-tools/lib/jsdoc/p
 const LIB = path.join(__dirname, `../tools/lib/`);
 
 const viteConfig = `-c "${require.resolve("@ui5/webcomponents-tools/components-package/vite.config.js")}"`;
-const eslintConfig = `--config ${require.resolve("@ui5/webcomponents-tools/components-package/eslint.js")}`;
 
 const scripts = {
 	clean: "rimraf jsdoc-dist && rimraf src/generated && rimraf dist && rimraf .port",
-	lint: `cross-env UI5_TS=true eslint . ${eslintConfig}`,
+	lint: `eslint .`,
 	prepare: "cross-env UI5_TS=true nps clean integrate copy generateAssetParameters generateVersionInfo generateStyles generateTemplates typescript generateAPI",
 	typescript: "tsc",
 	integrate: {

diff --git a/packages/fiori/.eslintignore b/packages/fiori/.eslintignore
@@ -11,3 +11,4 @@ wdio.conf.js
 postcss.config.js
 package-scripts.js
 src/illustrations/js-imports/illustrations.js
+.eslintrc.js
diff --git a/packages/fiori/.eslintrc.js b/packages/fiori/.eslintrc.js
@@ -0,0 +1,3 @@
+const config = require("@ui5/webcomponents-tools/components-package/eslint.js");
+
+module.exports = config;
diff --git a/packages/localization/.eslintrc.js b/packages/localization/.eslintrc.js
@@ -0,0 +1,3 @@
+const config = require("@ui5/webcomponents-tools/components-package/eslint.js");
+
+module.exports = config;
diff --git a/packages/main/.eslintrc.js b/packages/main/.eslintrc.js
@@ -0,0 +1,3 @@
+const config = require("@ui5/webcomponents-tools/components-package/eslint.js");
+
+module.exports = config;
diff --git a/packages/theming/.eslintignore b/packages/theming/.eslintignore
diff --git a/packages/tools/components-package/eslint.js b/packages/tools/components-package/eslint.js
@@ -1,4 +1,6 @@
-const tsMode = process.env.UI5_TS === "true";
+const fs = require("fs");
+const path = require("path");
+const tsMode = fs.existsSync(path.join(process.cwd(), "tsconfig.json"));
 
 /**
  * Typescript Rules

diff --git a/packages/tools/components-package/nps.js b/packages/tools/components-package/nps.js
@@ -55,8 +55,8 @@ const getScripts = (options) => {
 
 	const scripts = {
 		clean: 'rimraf jsdoc-dist && rimraf src/generated && rimraf dist && rimraf .port && nps "scope.testPages.clean"',
-		lint: `${tsCrossEnv} eslint . ${eslintConfig}`,
-		lintfix: `${tsCrossEnv} eslint . ${eslintConfig} --fix`,
+		lint: `eslint . ${eslintConfig}`,
+		lintfix: `eslint . ${eslintConfig} --fix`,
 		prepare: {
 			default: `${tsCrossEnv} nps clean prepare.all typescript generateAPI`,
 			all: 'concurrently "nps build.templates" "nps build.i18n" "nps prepare.styleRelated" "nps copy" "nps build.illustrations"',
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		const config = require("@ui5/webcomponents-tools/components-package/eslint.js");

		module.exports = config;