Merge pull request #1827 from rx-angular/fix-tsconfig-mess

hoebbelsB · web-flow · commit 70173f60ab29 · 2025-01-03T17:05:35.000+01:00
chore: align tsconfig lib and module settings
diff --git a/apps/demos/tsconfig.app.json b/apps/demos/tsconfig.app.json
@@ -2,7 +2,6 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "../../dist/out-tsc",
-    "lib": ["ES2018", "DOM"],
     "types": []
   },
   "files": ["src/main.ts", "src/polyfills.ts"],
diff --git a/libs/cdk/tsconfig.lib.json b/libs/cdk/tsconfig.lib.json
@@ -1,10 +1,8 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "module": "es2015",
     "inlineSources": true,
-    "importHelpers": true,
-    "lib": ["dom", "es2018"]
+    "importHelpers": true
   },
   "angularCompilerOptions": {
     "enableIvy": true,
diff --git a/libs/state/tsconfig.lib.json b/libs/state/tsconfig.lib.json
@@ -1,13 +1,11 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "module": "es2015",
     "inlineSources": true,
     "declaration": true,
     "declarationMap": true,
     "strictNullChecks": true,
-    "noImplicitAny": true,
-    "lib": ["dom", "es2018"]
+    "noImplicitAny": true
   },
   "angularCompilerOptions": {
     "enableIvy": true,
diff --git a/libs/template/project.json b/libs/template/project.json
@@ -8,7 +8,7 @@
     "build-lib": {
       "executor": "@angular-devkit/build-angular:ng-packagr",
       "options": {
-        "tsConfig": "libs/template/tsconfig.lib.json",
+        "tsConfig": "libs/template/tsconfig.prod.json",
         "project": "libs/template/ng-package.json"
       },
       "dependsOn": ["^build"],
diff --git a/libs/template/tsconfig.json b/libs/template/tsconfig.json
@@ -6,6 +6,9 @@
     {
       "path": "./tsconfig.lib.json"
     },
+    {
+      "path": "./tsconfig.prod.json"
+    },
     {
       "path": "./tsconfig.spec.json"
     },
diff --git a/libs/template/tsconfig.lib.json b/libs/template/tsconfig.lib.json
@@ -1,13 +1,8 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "module": "es2015",
     "inlineSources": true,
-    "importHelpers": true,
-    "lib": ["dom", "es2018"],
-    "paths": {
-      "@rx-angular/cdk/*": ["dist/libs/cdk/*"]
-    }
+    "importHelpers": true
   },
   "angularCompilerOptions": {
     "enableIvy": true,
diff --git a/libs/template/tsconfig.prod.json b/libs/template/tsconfig.prod.json
@@ -0,0 +1,34 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "inlineSources": true,
+    "importHelpers": true,
+    "paths": {
+      "@rx-angular/cdk/*": ["dist/libs/cdk/*"]
+    }
+  },
+  "angularCompilerOptions": {
+    "enableIvy": true,
+    "compilationMode": "partial",
+    "annotateForClosureCompiler": true,
+    "skipTemplateCodegen": true,
+    "strictMetadataEmit": true,
+    "fullTemplateTypeCheck": true,
+    "strictInjectionParameters": true,
+    "enableResourceInlining": true
+  },
+  "include": ["**/*.ts"],
+  "exclude": [
+    "src/test-setup.ts",
+    "**/*.spec.ts",
+    "**/*.test.ts",
+    "jest.config.ts",
+    "cypress/**/*",
+    "cypress.config.ts",
+    "**/*.cy.ts",
+    "**/*.cy.js",
+    "**/*.cy.tsx",
+    "**/*.cy.jsx",
+    "**/tests/*.ts"
+  ]
+}
diff --git a/tsconfig.base.json b/tsconfig.base.json
@@ -11,7 +11,7 @@
     "importHelpers": true,
     "target": "ES2022",
     "module": "esnext",
-    "lib": ["es2017", "dom"],
+    "lib": ["es2022", "dom"],
     "skipLibCheck": true,
     "skipDefaultLibCheck": true,
     "baseUrl": ".",

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,9 @@`
`6`	`6`	`{`
`7`	`7`	`"path": "./tsconfig.lib.json"`
`8`	`8`	`},`
	`9`	`+ {`
	`10`	`+ "path": "./tsconfig.prod.json"`
	`11`	`+ },`
`9`	`12`	`{`
`10`	`13`	`"path": "./tsconfig.spec.json"`
`11`	`14`	`},`