chore(nx): Upgrade to Nx 18 - align js/tsc configs

jogelin · jogelin · commit 098947faf013 · 2024-03-14T12:26:04.000+01:00
diff --git a/libs/mf/.eslintrc.json b/libs/mf/.eslintrc.json
@@ -1,7 +1,6 @@
 {
-  "extends": "../../.eslintrc.json",
+  "extends": ["../../.eslintrc.base.json"],
   "ignorePatterns": ["!**/*"],
-  "rules": {},
   "overrides": [
     {
       "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
@@ -14,6 +13,13 @@
     {
       "files": ["*.js", "*.jsx"],
       "rules": {}
+    },
+    {
+      "files": ["*.json"],
+      "parser": "jsonc-eslint-parser",
+      "rules": {
+        "@nx/dependency-checks": "error"
+      }
     }
   ]
 }
diff --git a/libs/mf/jest.config.ts b/libs/mf/jest.config.ts
@@ -2,11 +2,10 @@
 export default {
   displayName: 'mf',
   preset: '../../jest.preset.js',
-  globals: {},
+  testEnvironment: 'node',
   transform: {
-    '^.+\\.[tj]sx?$': ['ts-jest', { tsconfig: '<rootDir>/tsconfig.spec.json' }],
+    '^.+\\.[tj]s$': ['ts-jest', { tsconfig: '<rootDir>/tsconfig.spec.json' }],
   },
-  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
-  coverageDirectory: '../../coverage/packages/mf',
-  testEnvironment: 'node',
+  moduleFileExtensions: ['ts', 'js', 'html'],
+  coverageDirectory: '../../coverage/libs/mf',
 };
diff --git a/libs/mf/project.json b/libs/mf/project.json
@@ -4,17 +4,6 @@
   "sourceRoot": "libs/mf/src",
   "projectType": "library",
   "targets": {
-    "lint": {
-      "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"]
-    },
-    "test": {
-      "executor": "@nx/jest:jest",
-      "outputs": ["{workspaceRoot}/coverage/libs/mf"],
-      "options": {
-        "jestConfig": "libs/mf/jest.config.ts"
-      }
-    },
     "build": {
       "executor": "@nx/js:tsc",
       "outputs": ["{options.outputPath}"],
diff --git a/libs/mf/tsconfig.json b/libs/mf/tsconfig.json
@@ -1,5 +1,14 @@
 {
   "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "module": "commonjs",
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "noImplicitOverride": true,
+    "noPropertyAccessFromIndexSignature": true,
+    "noImplicitReturns": true,
+    "noFallthroughCasesInSwitch": true
+  },
   "files": [],
   "include": [],
   "references": [
diff --git a/libs/mf/tsconfig.lib.json b/libs/mf/tsconfig.lib.json
@@ -1,11 +1,10 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "module": "CommonJS",
     "outDir": "../../dist/out-tsc",
     "declaration": true,
     "types": ["node"]
   },
-  "exclude": ["**/*.spec.ts", "**/*.test.ts", "jest.config.ts"],
-  "include": ["**/*.ts"]
+  "include": ["src/**/*.ts"],
+  "exclude": ["jest.config.ts", "src/**/*.spec.ts", "src/**/*.test.ts"]
 }
diff --git a/libs/mf/tsconfig.spec.json b/libs/mf/tsconfig.spec.json
@@ -6,15 +6,9 @@
     "types": ["jest", "node"]
   },
   "include": [
-    "**/*.spec.ts",
-    "**/*.test.ts",
-    "**/*.spec.tsx",
-    "**/*.test.tsx",
-    "**/*.spec.js",
-    "**/*.test.js",
-    "**/*.spec.jsx",
-    "**/*.test.jsx",
-    "**/*.d.ts",
-    "jest.config.ts"
+    "jest.config.ts",
+    "src/**/*.test.ts",
+    "src/**/*.spec.ts",
+    "src/**/*.d.ts"
   ]
 }
diff --git a/libs/native-federation-core/.eslintrc.json b/libs/native-federation-core/.eslintrc.json
@@ -1,5 +1,5 @@
 {
-  "extends": ["../../.eslintrc.json"],
+  "extends": ["../../.eslintrc.base.json"],
   "ignorePatterns": ["!**/*"],
   "overrides": [
     {
@@ -13,6 +13,13 @@
     {
       "files": ["*.js", "*.jsx"],
       "rules": {}
+    },
+    {
+      "files": ["*.json"],
+      "parser": "jsonc-eslint-parser",
+      "rules": {
+        "@nx/dependency-checks": "error"
+      }
     }
   ]
 }
diff --git a/libs/native-federation-core/jest.config.ts b/libs/native-federation-core/jest.config.ts
@@ -2,14 +2,9 @@
 export default {
   displayName: 'native-federation-core',
   preset: '../../jest.preset.js',
-  globals: {},
+  testEnvironment: 'node',
   transform: {
-    '^.+\\.[tj]s$': [
-      'ts-jest',
-      {
-        tsconfig: '<rootDir>/tsconfig.spec.json',
-      },
-    ],
+    '^.+\\.[tj]s$': ['ts-jest', { tsconfig: '<rootDir>/tsconfig.spec.json' }],
   },
   moduleFileExtensions: ['ts', 'js', 'html'],
   coverageDirectory: '../../coverage/libs/native-federation-core',
diff --git a/libs/native-federation-core/project.json b/libs/native-federation-core/project.json
@@ -27,17 +27,6 @@
           "target": "build"
         }
       ]
-    },
-    "lint": {
-      "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"]
-    },
-    "test": {
-      "executor": "@nx/jest:jest",
-      "outputs": ["{workspaceRoot}/coverage/libs/native-federation-core"],
-      "options": {
-        "jestConfig": "libs/native-federation-core/jest.config.ts"
-      }
     }
   },
   "tags": []
diff --git a/libs/native-federation-core/tsconfig.json b/libs/native-federation-core/tsconfig.json
@@ -7,8 +7,7 @@
     "noImplicitOverride": true,
     "noPropertyAccessFromIndexSignature": true,
     "noImplicitReturns": true,
-    "noFallthroughCasesInSwitch": true,
-    "esModuleInterop": true
+    "noFallthroughCasesInSwitch": true
   },
   "files": [],
   "include": [],
diff --git a/libs/native-federation-core/tsconfig.lib.json b/libs/native-federation-core/tsconfig.lib.json
@@ -6,10 +6,10 @@
     "types": ["node"]
   },
   "include": [
-    "**/*.ts",
+    "src/**/*.ts",
     "src/lib/core/bundle-exposed.ts.bak",
     "src/lib/core/bundle-shared.ts",
     "src/lib/core/bundle-shared-mappings.ts.bak"
   ],
-  "exclude": ["jest.config.ts", "**/*.spec.ts", "**/*.test.ts"]
+  "exclude": ["jest.config.ts", "src/**/*.spec.ts", "src/**/*.test.ts"]
 }
diff --git a/libs/native-federation-core/tsconfig.spec.json b/libs/native-federation-core/tsconfig.spec.json
@@ -5,5 +5,10 @@
     "module": "commonjs",
     "types": ["jest", "node"]
   },
-  "include": ["jest.config.ts", "**/*.test.ts", "**/*.spec.ts", "**/*.d.ts"]
+  "include": [
+    "jest.config.ts",
+    "src/**/*.test.ts",
+    "src/**/*.spec.ts",
+    "src/**/*.d.ts"
+  ]
 }
diff --git a/libs/native-federation-esbuild/.eslintrc.json b/libs/native-federation-esbuild/.eslintrc.json
@@ -1,5 +1,5 @@
 {
-  "extends": ["../../.eslintrc.json"],
+  "extends": ["../../.eslintrc.base.json"],
   "ignorePatterns": ["!**/*"],
   "overrides": [
     {
@@ -13,6 +13,13 @@
     {
       "files": ["*.js", "*.jsx"],
       "rules": {}
+    },
+    {
+      "files": ["*.json"],
+      "parser": "jsonc-eslint-parser",
+      "rules": {
+        "@nx/dependency-checks": "error"
+      }
     }
   ]
 }
diff --git a/libs/native-federation-esbuild/jest.config.ts b/libs/native-federation-esbuild/jest.config.ts
@@ -2,14 +2,9 @@
 export default {
   displayName: 'native-federation-esbuild',
   preset: '../../jest.preset.js',
-  globals: {},
+  testEnvironment: 'node',
   transform: {
-    '^.+\\.[tj]s$': [
-      'ts-jest',
-      {
-        tsconfig: '<rootDir>/tsconfig.spec.json',
-      },
-    ],
+    '^.+\\.[tj]s$': ['ts-jest', { tsconfig: '<rootDir>/tsconfig.spec.json' }],
   },
   moduleFileExtensions: ['ts', 'js', 'html'],
   coverageDirectory: '../../coverage/libs/native-federation-esbuild',
diff --git a/libs/native-federation-esbuild/project.json b/libs/native-federation-esbuild/project.json
@@ -27,17 +27,6 @@
           "target": "build"
         }
       ]
-    },
-    "lint": {
-      "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"]
-    },
-    "test": {
-      "executor": "@nx/jest:jest",
-      "outputs": ["{workspaceRoot}/coverage/libs/native-federation-esbuild"],
-      "options": {
-        "jestConfig": "libs/native-federation-esbuild/jest.config.ts"
-      }
     }
   },
   "tags": []
diff --git a/libs/native-federation-esbuild/tsconfig.lib.json b/libs/native-federation-esbuild/tsconfig.lib.json
@@ -5,6 +5,6 @@
     "declaration": true,
     "types": ["node"]
   },
-  "include": ["**/*.ts"],
-  "exclude": ["jest.config.ts", "**/*.spec.ts", "**/*.test.ts"]
+  "include": ["src/**/*.ts"],
+  "exclude": ["jest.config.ts", "src/**/*.spec.ts", "src/**/*.test.ts"]
 }
diff --git a/libs/native-federation-esbuild/tsconfig.spec.json b/libs/native-federation-esbuild/tsconfig.spec.json
@@ -5,5 +5,10 @@
     "module": "commonjs",
     "types": ["jest", "node"]
   },
-  "include": ["jest.config.ts", "**/*.test.ts", "**/*.spec.ts", "**/*.d.ts"]
+  "include": [
+    "jest.config.ts",
+    "src/**/*.test.ts",
+    "src/**/*.spec.ts",
+    "src/**/*.d.ts"
+  ]
 }
diff --git a/libs/native-federation/.eslintrc.json b/libs/native-federation/.eslintrc.json
@@ -1,5 +1,5 @@
 {
-  "extends": ["../../.eslintrc.json"],
+  "extends": ["../../.eslintrc.base.json"],
   "ignorePatterns": ["!**/*"],
   "overrides": [
     {
@@ -15,10 +15,10 @@
       "rules": {}
     },
     {
-      "files": ["./package.json", "./generators.json", "./executors.json"],
+      "files": ["*.json"],
       "parser": "jsonc-eslint-parser",
       "rules": {
-        "@nx/nx-plugin-checks": "error"
+        "@nx/dependency-checks": "error"
       }
     }
   ]
diff --git a/libs/native-federation/jest.config.ts b/libs/native-federation/jest.config.ts
@@ -2,14 +2,9 @@
 export default {
   displayName: 'native-federation',
   preset: '../../jest.preset.js',
-  globals: {},
+  testEnvironment: 'node',
   transform: {
-    '^.+\\.[tj]s$': [
-      'ts-jest',
-      {
-        tsconfig: '<rootDir>/tsconfig.spec.json',
-      },
-    ],
+    '^.+\\.[tj]s$': ['ts-jest', { tsconfig: '<rootDir>/tsconfig.spec.json' }],
   },
   moduleFileExtensions: ['ts', 'js', 'html'],
   coverageDirectory: '../../coverage/libs/native-federation',
diff --git a/libs/native-federation/project.json b/libs/native-federation/project.json
@@ -46,17 +46,6 @@
           }
         ]
       }
-    },
-    "lint": {
-      "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"]
-    },
-    "test": {
-      "executor": "@nx/jest:jest",
-      "outputs": ["{workspaceRoot}/coverage/libs/native-federation"],
-      "options": {
-        "jestConfig": "libs/native-federation/jest.config.ts"
-      }
     }
   },
   "tags": []
diff --git a/libs/native-federation/tsconfig.json b/libs/native-federation/tsconfig.json
@@ -1,7 +1,13 @@
 {
   "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "module": "commonjs"
+    "module": "commonjs",
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "noImplicitOverride": true,
+    "noPropertyAccessFromIndexSignature": true,
+    "noImplicitReturns": true,
+    "noFallthroughCasesInSwitch": true
   },
   "files": [],
   "include": [],
diff --git a/libs/native-federation/tsconfig.lib.json b/libs/native-federation/tsconfig.lib.json
@@ -5,6 +5,6 @@
     "declaration": true,
     "types": []
   },
-  "include": ["**/*.ts"],
-  "exclude": ["jest.config.ts", "**/*.spec.ts", "**/*.test.ts"]
+  "include": ["src/**/*.ts"],
+  "exclude": ["jest.config.ts", "src/**/*.spec.ts", "src/**/*.test.ts"]
 }
diff --git a/libs/native-federation/tsconfig.spec.json b/libs/native-federation/tsconfig.spec.json
@@ -5,5 +5,10 @@
     "module": "commonjs",
     "types": ["jest", "node"]
   },
-  "include": ["jest.config.ts", "**/*.test.ts", "**/*.spec.ts", "**/*.d.ts"]
+  "include": [
+    "jest.config.ts",
+    "src/**/*.test.ts",
+    "src/**/*.spec.ts",
+    "src/**/*.d.ts"
+  ]
 }

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`{`
`2`		`- "extends": "../../.eslintrc.json",`
	`2`	`+ "extends": ["../../.eslintrc.base.json"],`
`3`	`3`	`"ignorePatterns": ["!*/"],`
`4`		`- "rules": {},`
`5`	`4`	`"overrides": [`
`6`	`5`	`{`
`7`	`6`	`"files": [".ts", ".tsx", ".js", ".jsx"],`
`@@ -14,6 +13,13 @@`
`14`	`13`	`{`
`15`	`14`	`"files": [".js", ".jsx"],`
`16`	`15`	`"rules": {}`
	`16`	`+ },`
	`17`	`+ {`
	`18`	`+ "files": ["*.json"],`
	`19`	`+ "parser": "jsonc-eslint-parser",`
	`20`	`+ "rules": {`
	`21`	`+ "@nx/dependency-checks": "error"`
	`22`	`+ }`
`17`	`23`	`}`
`18`	`24`	`]`
`19`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,10 @@`
`1`	`1`	`{`
`2`	`2`	`"extends": "./tsconfig.json",`
`3`	`3`	`"compilerOptions": {`
`4`		`- "module": "CommonJS",`
`5`	`4`	`"outDir": "../../dist/out-tsc",`
`6`	`5`	`"declaration": true,`
`7`	`6`	`"types": ["node"]`
`8`	`7`	`},`
`9`		`- "exclude": ["*/.spec.ts", "*/.test.ts", "jest.config.ts"],`
`10`		`- "include": ["*/.ts"]`
	`8`	`+ "include": ["src/*/.ts"],`
	`9`	`+ "exclude": ["jest.config.ts", "src/*/.spec.ts", "src/*/.test.ts"]`
`11`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "extends": ["../../.eslintrc.json"],`
	`2`	`+ "extends": ["../../.eslintrc.base.json"],`
`3`	`3`	`"ignorePatterns": ["!*/"],`
`4`	`4`	`"overrides": [`
`5`	`5`	`{`
`@@ -13,6 +13,13 @@`
`13`	`13`	`{`
`14`	`14`	`"files": [".js", ".jsx"],`
`15`	`15`	`"rules": {}`
	`16`	`+ },`
	`17`	`+ {`
	`18`	`+ "files": ["*.json"],`
	`19`	`+ "parser": "jsonc-eslint-parser",`
	`20`	`+ "rules": {`
	`21`	`+ "@nx/dependency-checks": "error"`
	`22`	`+ }`
`16`	`23`	`}`
`17`	`24`	`]`
`18`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,17 +27,6 @@`
`27`	`27`	`"target": "build"`
`28`	`28`	`}`
`29`	`29`	`]`
`30`		`- },`
`31`		`- "lint": {`
`32`		`- "executor": "@nx/eslint:lint",`
`33`		`- "outputs": ["{options.outputFile}"]`
`34`		`- },`
`35`		`- "test": {`
`36`		`- "executor": "@nx/jest:jest",`
`37`		`- "outputs": ["{workspaceRoot}/coverage/libs/native-federation-core"],`
`38`		`- "options": {`
`39`		`- "jestConfig": "libs/native-federation-core/jest.config.ts"`
`40`		`- }`
`41`	`30`	`}`
`42`	`31`	`},`
`43`	`32`	`"tags": []`