Merge pull request #505 from jogelin/fix-linting

manfredsteyer · web-flow · commit 8fc5f7e4b2b7 · 2024-03-13T00:39:37.000+01:00
fix(lint): fix linting
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -6,6 +6,7 @@
     {
       "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
       "rules": {
+        "@typescript-eslint/no-explicit-any": "warn",
         "@nx/enforce-module-boundaries": [
           "error",
           {
@@ -24,7 +25,7 @@
     {
       "files": ["*.ts", "*.tsx"],
       "extends": ["plugin:@nx/typescript"],
-      "rules": {}
+      "rules": { "@typescript-eslint/no-explicit-any": "warn" }
     },
     {
       "files": ["*.js", "*.jsx"],
diff --git a/apps/mfe1/src/app/demo/demo.component.ts b/apps/mfe1/src/app/demo/demo.component.ts
@@ -3,7 +3,7 @@ import {
   PlaygroundLibModule,
 } from '@angular-architects/playground-lib';
 import { CommonModule } from '@angular/common';
-import { Component, OnInit } from '@angular/core';
+import { Component } from '@angular/core';
 
 @Component({
   standalone: true,
diff --git a/apps/mfe2/src/main.ts b/apps/mfe2/src/main.ts
@@ -2,5 +2,5 @@ import { initFederation } from '@angular-architects/native-federation';
 
 initFederation('/assets/federation.manifest.json')
   .catch((err) => console.error(err))
-  .then((_) => import('./bootstrap'))
+  .then(() => import('./bootstrap'))
   .catch((err) => console.error(err));
diff --git a/libs/mf/src/schematics/mf/schematic.ts b/libs/mf/src/schematics/mf/schematic.ts
@@ -32,7 +32,7 @@ export function add(options: MfSchematicSchema): Rule {
 }
 
 export function adjustSSR(sourceRoot: string, ssrMappings: string): Rule {
-  return async function (tree, context) {
+  return async function (tree) {
     const server = path.join(sourceRoot, 'server.ts');
 
     if (!tree.exists(server)) {
@@ -70,7 +70,7 @@ const ssrEngine = new Engine();
 }
 
 function makeMainAsync(main: string, options: MfSchematicSchema): Rule {
-  return async function (tree, context) {
+  return async function (tree) {
     const mainPath = path.dirname(main);
     const bootstrapName = path.join(mainPath, 'bootstrap.ts');
 
@@ -149,7 +149,10 @@ function nxBuildersAvailable(tree: Tree): boolean {
 function infereNxBuilderNames(tree: Tree): { dev: string; prod: string } {
   const dep = getPackageJsonDependency(tree, '@nx/angular');
 
-  const useDevServer = dep && dep.version && semver.satisfies(semver.minVersion(dep.version), '>=17.2.0');
+  const useDevServer =
+    dep &&
+    dep.version &&
+    semver.satisfies(semver.minVersion(dep.version), '>=17.2.0');
 
   const defaultResult = {
     dev: useDevServer
@@ -264,8 +267,7 @@ export default function config(options: MfSchematicSchema): Rule {
         projectName,
         remotes,
         relTsConfigPath,
-        projectRoot,
-        port
+        projectRoot
       );
       tree.create(configPath, webpackConfig);
     } else {
diff --git a/libs/mf/src/schematics/migrate-to-13/schematic.ts b/libs/mf/src/schematics/migrate-to-13/schematic.ts
@@ -1,10 +1,10 @@
 import { Rule } from '@angular-devkit/schematics';
 
 export function index(): Rule {
-  return async function (tree, context) {
+  return async function () {
     console.info(`!!!
-Angular 13 compiles bundles as EcmaScript modules. 
-Hence, we need to adjust how we use Module Federation. 
+Angular 13 compiles bundles as EcmaScript modules.
+Hence, we need to adjust how we use Module Federation.
 We've got you covered. Please find all information here:
 https://github.com/angular-architects/module-federation-plugin/blob/main/migration-guide.md
 !!!
diff --git a/libs/mf/src/schematics/migrate-to-14-3/schema.d.ts b/libs/mf/src/schematics/migrate-to-14-3/schema.d.ts
@@ -1 +1 @@
-type BootAsyncSchema = {};
+type BootAsyncSchema = object;
diff --git a/libs/mf/src/utils/create-config.ts b/libs/mf/src/utils/create-config.ts
@@ -4,8 +4,7 @@ export function createConfig(
   projectName: string,
   remotes: string,
   tsConfigName: string,
-  root: string,
-  port: number
+  root: string
 ): string {
   return `const ModuleFederationPlugin = require("webpack/lib/container/ModuleFederationPlugin");
 const mf = require("@angular-architects/module-federation/webpack");
@@ -24,7 +23,7 @@ module.exports = {
   },
   optimization: {
     runtimeChunk: false
-  },   
+  },
   resolve: {
     alias: {
       ...sharedMappings.getAliases(),
@@ -42,22 +41,22 @@ module.exports = {
         // filename: "remoteEntry.js",
         // exposes: {
         //     './Component': './${root}/src/app/app.component.ts',
-        // },        
-        
+        // },
+
         // For hosts (please adjust)
         // remotes: {
 ${remotes}
         // },
 
         shared: share({
-          "@angular/core": { singleton: true, strictVersion: true, requiredVersion: 'auto' }, 
-          "@angular/common": { singleton: true, strictVersion: true, requiredVersion: 'auto' }, 
-          "@angular/common/http": { singleton: true, strictVersion: true, requiredVersion: 'auto' }, 
+          "@angular/core": { singleton: true, strictVersion: true, requiredVersion: 'auto' },
+          "@angular/common": { singleton: true, strictVersion: true, requiredVersion: 'auto' },
+          "@angular/common/http": { singleton: true, strictVersion: true, requiredVersion: 'auto' },
           "@angular/router": { singleton: true, strictVersion: true, requiredVersion: 'auto' },
 
           ...sharedMappings.getDescriptors()
         })
-        
+
     }),
     sharedMappings.getPlugin()
   ],
diff --git a/libs/mf/src/utils/share-utils.ts b/libs/mf/src/utils/share-utils.ts
@@ -296,7 +296,10 @@ export function share(
   return result;
 }
 
-function addSecondaries(secondaries: Record<string, SharedConfig>, result: {}) {
+function addSecondaries(
+  secondaries: Record<string, SharedConfig>,
+  result: object
+) {
   for (const key in secondaries) {
     result[key] = secondaries[key];
   }
diff --git a/libs/native-federation-core/src/lib/config/share-utils.ts b/libs/native-federation-core/src/lib/config/share-utils.ts
@@ -65,14 +65,15 @@ function findPackageJson(folder: string): string {
   );
 }
 
-function readVersionMap(packagePath: string): VersionMap {
-  // eslint-disable-next-line @typescript-eslint/no-var-requires
-  const json = require(packagePath);
-  const versions = {
-    ...json['dependencies'],
-  };
-  return versions;
-}
+// TODO: Unused, to delete?
+// function readVersionMap(packagePath: string): VersionMap {
+//   // eslint-disable-next-line @typescript-eslint/no-var-requires
+//   const json = require(packagePath);
+//   const versions = {
+//     ...json['dependencies'],
+//   };
+//   return versions;
+// }
 
 function lookupVersion(key: string, workspaceRoot: string): string {
   const versionMaps = getVersionMaps(workspaceRoot, workspaceRoot);
diff --git a/libs/native-federation-core/src/lib/config/with-native-federation.ts b/libs/native-federation-core/src/lib/config/with-native-federation.ts
@@ -1,5 +1,5 @@
 import { getMappedPaths, MappedPath } from '../utils/mapped-paths';
-import { shareAll, share, findRootTsConfigJson } from './share-utils';
+import { shareAll, findRootTsConfigJson } from './share-utils';
 import {
   FederationConfig,
   NormalizedFederationConfig,
diff --git a/libs/native-federation-esbuild/src/lib/adapter.ts b/libs/native-federation-esbuild/src/lib/adapter.ts
@@ -7,7 +7,6 @@ import * as esbuild from 'esbuild';
 import { rollup } from 'rollup';
 import resolve from '@rollup/plugin-node-resolve';
 import { externals } from 'rollup-plugin-node-externals';
-import { collectExports } from './collect-exports';
 import * as fs from 'fs';
 import path from 'path';
 
@@ -111,24 +110,25 @@ function writeResult(
   return writtenFiles;
 }
 
-function compensateExports(entryPoint: string, outfile?: string): void {
-  const inExports = collectExports(entryPoint);
-  const outExports = outfile ? collectExports(outfile) : inExports;
-
-  if (!outExports.hasDefaultExport || outExports.hasFurtherExports) {
-    return;
-  }
-  const defaultName = outExports.defaultExportName;
-
-  let exports = '/*Try to compensate missing exports*/\n\n';
-  for (const exp of inExports.exports) {
-    exports += `let ${exp}$softarc = ${defaultName}.${exp};\n`;
-    exports += `export { ${exp}$softarc as ${exp} };\n`;
-  }
-
-  const target = outfile ?? entryPoint;
-  fs.appendFileSync(target, exports, 'utf-8');
-}
+// TODO: Unused, to delete?
+// function compensateExports(entryPoint: string, outfile?: string): void {
+//   const inExports = collectExports(entryPoint);
+//   const outExports = outfile ? collectExports(outfile) : inExports;
+//
+//   if (!outExports.hasDefaultExport || outExports.hasFurtherExports) {
+//     return;
+//   }
+//   const defaultName = outExports.defaultExportName;
+//
+//   let exports = '/*Try to compensate missing exports*/\n\n';
+//   for (const exp of inExports.exports) {
+//     exports += `let ${exp}$softarc = ${defaultName}.${exp};\n`;
+//     exports += `export { ${exp}$softarc as ${exp} };\n`;
+//   }
+//
+//   const target = outfile ?? entryPoint;
+//   fs.appendFileSync(target, exports, 'utf-8');
+// }
 
 async function prepareNodePackage(
   entryPoint: string,
diff --git a/libs/native-federation/src/plugin/index.ts b/libs/native-federation/src/plugin/index.ts
@@ -40,7 +40,7 @@ export const federation = (params: BuildHelperParams) => {
 {
 "shimMode": true
 }
-</script>                    
+</script>
 <script src="polyfills.js" type="module">
 `;
       html = html.replace(/type="module"/g, 'type="module-shim"');
@@ -99,27 +99,29 @@ const serveFromDist = (
   };
 };
 
-const enhanceFile = (fileName: string, src: string): string => {
-  if (fileName.endsWith('remoteEntry.json')) {
-    let remoteEntry = JSON.parse(fs.readFileSync(fileName, 'utf-8'));
-    remoteEntry = {
-      ...remoteEntry,
-      shared: (remoteEntry.shared || []).map((el) => ({
-        ...el,
-        outFileName: el.dev?.entryPoint.includes('/node_modules/')
-          ? el.outFileName
-          : normalize(path.join('@fs', el.dev?.entryPoint || '')),
-      })),
-      exposes: (remoteEntry.exposes || []).map((el) => ({
-        ...el,
-        outFileName: normalize(path.join('@fs', el.dev?.entryPoint || '')),
-      })),
-    };
-    return JSON.stringify(remoteEntry, null, 2);
-  }
-  return src;
-};
+// TODO: Unused, to delete?
+// const enhanceFile = (fileName: string, src: string): string => {
+//   if (fileName.endsWith('remoteEntry.json')) {
+//     let remoteEntry = JSON.parse(fs.readFileSync(fileName, 'utf-8'));
+//     remoteEntry = {
+//       ...remoteEntry,
+//       shared: (remoteEntry.shared || []).map((el) => ({
+//         ...el,
+//         outFileName: el.dev?.entryPoint.includes('/node_modules/')
+//           ? el.outFileName
+//           : normalize(path.join('@fs', el.dev?.entryPoint || '')),
+//       })),
+//       exposes: (remoteEntry.exposes || []).map((el) => ({
+//         ...el,
+//         outFileName: normalize(path.join('@fs', el.dev?.entryPoint || '')),
+//       })),
+//     };
+//     return JSON.stringify(remoteEntry, null, 2);
+//   }
+//   return src;
+// };
 
-const normalize = (path: string): string => {
-  return path.replace(/\\/g, '/');
-};
+// TODO: Unused, to delete?
+// const normalize = (path: string): string => {
+//   return path.replace(/\\/g, '/');
+// };
diff --git a/libs/native-federation/src/schematics/appbuilder/schematic.ts b/libs/native-federation/src/schematics/appbuilder/schematic.ts
@@ -1,4 +1,4 @@
-import { Rule, Tree, noop } from '@angular-devkit/schematics';
+import { Rule, Tree } from '@angular-devkit/schematics';
 
 import { MfSchematicSchema } from './schema';
 
diff --git a/libs/native-federation/src/schematics/init/schematic.ts b/libs/native-federation/src/schematics/init/schematic.ts
@@ -300,7 +300,7 @@ function makeMainAsync(
   options: MfSchematicSchema,
   remoteMap: unknown
 ): Rule {
-  return async function (tree, context) {
+  return async function (tree) {
     const mainPath = path.dirname(main);
     const bootstrapName = path.join(mainPath, 'bootstrap.ts');
 
diff --git a/libs/native-federation/src/schematics/remove/schematic.ts b/libs/native-federation/src/schematics/remove/schematic.ts
@@ -1,4 +1,4 @@
-import { Rule, Tree, noop } from '@angular-devkit/schematics';
+import { Rule, Tree } from '@angular-devkit/schematics';
 
 import { MfSchematicSchema } from './schema';
 
diff --git a/libs/native-federation/src/utils/angular-esbuild-adapter.ts b/libs/native-federation/src/utils/angular-esbuild-adapter.ts
@@ -26,7 +26,6 @@ import {
 } from '@angular-devkit/build-angular/src/utils';
 import { createRequire } from 'node:module';
 
-import { Schema as EsBuildBuilderOptions } from '@angular-devkit/build-angular/src/builders/browser-esbuild/schema';
 import { ApplicationBuilderOptions as AppBuilderSchema } from '@angular-devkit/build-angular/src/builders/application';
 
 import { createSharedMappingsPlugin } from './shared-mappings-plugin';
@@ -39,7 +38,7 @@ import {
   BuildKind,
   BuildResult,
   EntryPoint,
-} from 'libs/native-federation-core/src/lib/core/build-adapter';
+} from '@softarc/native-federation/src/lib/core/build-adapter';
 
 // const fesmFolderRegExp = /[/\\]fesm\d+[/\\]/;
 
@@ -375,8 +374,8 @@ function createTsConfigForFederation(
   const content = JSON.stringify(tsconfig, null, 2);
 
   const tsconfigFedPath = path.join(tsconfigDir, 'tsconfig.federation.json');
-  
-  if (!doesFileExist(tsconfigFedPath,content)) {
+
+  if (!doesFileExist(tsconfigFedPath, content)) {
     fs.writeFileSync(tsconfigFedPath, JSON.stringify(tsconfig, null, 2));
   }
   tsConfigPath = tsconfigFedPath;

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`{`
`7`	`7`	`"files": [".ts", ".tsx", ".js", ".jsx"],`
`8`	`8`	`"rules": {`
	`9`	`+ "@typescript-eslint/no-explicit-any": "warn",`
`9`	`10`	`"@nx/enforce-module-boundaries": [`
`10`	`11`	`"error",`
`11`	`12`	`{`
`@@ -24,7 +25,7 @@`
`24`	`25`	`{`
`25`	`26`	`"files": [".ts", ".tsx"],`
`26`	`27`	`"extends": ["plugin:@nx/typescript"],`
`27`		`- "rules": {}`
	`28`	`+ "rules": { "@typescript-eslint/no-explicit-any": "warn" }`
`28`	`29`	`},`
`29`	`30`	`{`
`30`	`31`	`"files": [".js", ".jsx"],`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-type BootAsyncSchema = {};`
	`1`	`+type BootAsyncSchema = object;`
Original file line number	Diff line number	Diff line change
`@@ -296,7 +296,10 @@ export function share(`
`296`	`296`	`return result;`
`297`	`297`	`}`
`298`	`298`
`299`		`-function addSecondaries(secondaries: Record<string, SharedConfig>, result: {}) {`
	`299`	`+function addSecondaries(`
	`300`	`+ secondaries: Record<string, SharedConfig>,`
	`301`	`+ result: object`
	`302`	`+) {`
`300`	`303`	`for (const key in secondaries) {`
`301`	`304`	`result[key] = secondaries[key];`
`302`	`305`	`}`