Merge magicspace changes (update)

mufancom · Oct 29, 2023 · 09f78b0 · 09f78b0
2 parents 66c5347 + ebf04ef
commit 09f78b0
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 7 deletions.
diff --git a/general/src/composables/package.json.ts b/general/src/composables/package.json.ts
@@ -158,7 +158,6 @@ export default composable<ResolvedOptions>(
       ...packages.map(packageOptions =>
         json(
           Path.join(packageOptions.resolvedDir, 'package.json'),
-          // eslint-disable-next-line @typescript-eslint/no-explicit-any
           (data: any) => {
             return {
               ...data,

diff --git a/package.json b/package.json
@@ -19,7 +19,7 @@
   "scripts": {
     "3": "yarn && yarn-deduplicate && yarn",
     "build": "rimraf --glob */bld && tsc --build",
-    "lint": "eslint --no-error-on-unmatched-pattern . && run-in-every eslint-project --parallel --echo -- eslint --no-error-on-unmatched-pattern .",
+    "lint": "eslint --no-error-on-unmatched-pattern --report-unused-disable-directives . && run-in-every eslint-project --parallel --echo -- eslint --no-error-on-unmatched-pattern --report-unused-disable-directives .",
     "lint-prettier": "prettier --check .",
     "test": "yarn lint-prettier && yarn build && yarn lint"
   },

diff --git a/typescript/src/composables/eslintrc.ts b/typescript/src/composables/eslintrc.ts
@@ -6,7 +6,6 @@ import type {ResolvedOptions} from '../library/index.js';
 
 export default composable<ResolvedOptions>(({resolvedProjects: projects}) => {
   return [
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     json('.eslintrc.json', (data: any) => {
       return {
         ...data,
@@ -22,7 +21,6 @@ export default composable<ResolvedOptions>(({resolvedProjects: projects}) => {
       };
     }),
     ...projects.map(project =>
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       json(Path.join(project.inDir, '.eslintrc.json'), (data: any) => {
         return {
           ...data,

diff --git a/typescript/src/composables/package.json.ts b/typescript/src/composables/package.json.ts
@@ -74,7 +74,6 @@ export default composable<ResolvedOptions>(
     ]);
 
     return [
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       json('package.json', (data: any) => {
         let {scripts = {}} = data;
 
@@ -131,7 +130,6 @@ export default composable<ResolvedOptions>(
         };
       }),
       ...packagesWithTypeScriptProject.map(packageOptions =>
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         json(packageOptions.packageJSONPath, (data: any) => {
           const referencedPackageNames = _.compact(
             _.union(

diff --git a/typescript/src/composables/vscode-settings.json.ts b/typescript/src/composables/vscode-settings.json.ts
@@ -5,7 +5,6 @@ import type {ResolvedOptions} from '../library/index.js';
 
 export default composable<ResolvedOptions>(
   async ({resolvedProjects: projects}) => {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     return json('.vscode/settings.json', (data: any) => {
       data = extendObjectProperties(
         data,