build: update to nx 15 / ng 15

qupaya · Feb 8, 2023 · 96c4c9f · 96c4c9f
1 parent ba47513
commit 96c4c9f
Show file tree

Hide file tree

Showing 15 changed files with 18,569 additions and 19,692 deletions.
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-v16
+v16.19.0
diff --git a/angular.json b/angular.json
@@ -31,7 +31,7 @@
             "jestConfig": "libs/ng-mockito/ng-mockito/jest.config.ts",
             "passWithNoTests": true
           },
-          "outputs": ["coverage/libs/ng-mockito/ng-mockito"]
+          "outputs": ["{workspaceRoot}/coverage/libs/ng-mockito/ng-mockito"]
         }
       },
       "generators": {
@@ -59,7 +59,7 @@
             "jestConfig": "libs/ng-mockito/integration/jest.config.ts",
             "passWithNoTests": true
           },
-          "outputs": ["coverage/libs/ng-mockito/integration"]
+          "outputs": ["{workspaceRoot}/coverage/libs/ng-mockito/integration"]
         }
       },
       "generators": {

diff --git a/jest.config.ts b/jest.config.ts
@@ -1,3 +1,3 @@
 const { getJestProjects } = require('@nrwl/jest');
 
-module.exports = { projects: getJestProjects() };
+export default { projects: getJestProjects() };
diff --git a/jest.preset.js b/jest.preset.js
@@ -0,0 +1,3 @@
+const nxPreset = require('@nrwl/jest/preset').default;
+
+module.exports = { ...nxPreset };
diff --git a/jest.preset.ts b/jest.preset.ts
diff --git a/libs/ng-mockito/integration/jest.config.ts b/libs/ng-mockito/integration/jest.config.ts
@@ -1,4 +1,5 @@
-module.exports = {
+/* eslint-disable */
+export default {
   displayName: 'ng-mockito-integration',
 
   setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
@@ -19,5 +20,5 @@ module.exports = {
     '^.+.(ts|mjs|js|html)$': 'jest-preset-angular',
   },
   transformIgnorePatterns: ['node_modules/(?!.*.mjs$)'],
-  preset: '../../../jest.preset.ts',
+  preset: '../../../jest.preset.js',
 };
diff --git a/libs/ng-mockito/integration/tsconfig.json b/libs/ng-mockito/integration/tsconfig.json
@@ -14,7 +14,8 @@
     "forceConsistentCasingInFileNames": true,
     "strict": true,
     "noImplicitReturns": true,
-    "noFallthroughCasesInSwitch": true
+    "noFallthroughCasesInSwitch": true,
+    "target": "es2020"
   },
   "angularCompilerOptions": {
     "strictInjectionParameters": true,

diff --git a/libs/ng-mockito/ng-mockito/jest.config.ts b/libs/ng-mockito/ng-mockito/jest.config.ts
@@ -1,4 +1,5 @@
-module.exports = {
+/* eslint-disable */
+export default {
   displayName: 'ng-mockito-ng-mockito',
 
   setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
@@ -19,5 +20,5 @@ module.exports = {
     '^.+.(ts|mjs|js|html)$': 'jest-preset-angular',
   },
   transformIgnorePatterns: ['node_modules/(?!.*.mjs$)'],
-  preset: '../../../jest.preset.ts',
+  preset: '../../../jest.preset.js',
 };
diff --git a/libs/ng-mockito/ng-mockito/tsconfig.json b/libs/ng-mockito/ng-mockito/tsconfig.json
@@ -12,5 +12,8 @@
     {
       "path": "./tsconfig.spec.json"
     }
-  ]
+  ],
+  "compilerOptions": {
+    "target": "es2020"
+  }
 }
diff --git a/libs/ng-mockito/ng-mockito/tsconfig.lib.json b/libs/ng-mockito/ng-mockito/tsconfig.lib.json
@@ -2,12 +2,13 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "../../../dist/out-tsc",
-    "target": "es2015",
+    "target": "ES2022",
     "declaration": true,
     "declarationMap": true,
     "inlineSources": true,
     "types": [],
-    "lib": ["dom", "es2018"]
+    "lib": ["dom", "es2018"],
+    "useDefineForClassFields": false
   },
   "angularCompilerOptions": {
     "skipTemplateCodegen": true,

diff --git a/libs/ng-mockito/ng-mockito/tsconfig.lib.prod.json b/libs/ng-mockito/ng-mockito/tsconfig.lib.prod.json
@@ -1,7 +1,9 @@
 {
   "extends": "./tsconfig.lib.json",
   "compilerOptions": {
-    "declarationMap": false
+    "declarationMap": false,
+    "target": "ES2022",
+    "useDefineForClassFields": false
   },
   "angularCompilerOptions": {
     "compilationMode": "partial"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		const nxPreset = require('@nrwl/jest/preset').default;

		module.exports = { ...nxPreset };