chore: update to Nx 14.1.x (#3413)

ngrx · May 16, 2022 · d54b033 · d54b033
1 parent f5b055b
commit d54b033
Show file tree

Hide file tree

Showing 18 changed files with 1,042 additions and 712 deletions.
diff --git a/angular.json b/angular.json
@@ -42,7 +42,7 @@
         "test": {
           "builder": "@nrwl/jest:jest",
           "options": {
-            "jestConfig": "modules/component/jest.config.js",
+            "jestConfig": "modules/component/jest.config.ts",
             "runInBand": true
           },
           "outputs": ["coverage/modules/component"]
@@ -92,7 +92,7 @@
         "test": {
           "builder": "@nrwl/jest:jest",
           "options": {
-            "jestConfig": "modules/component-store/jest.config.js",
+            "jestConfig": "modules/component-store/jest.config.ts",
             "runInBand": true
           },
           "outputs": ["coverage/modules/component-store"]
@@ -142,7 +142,7 @@
         "test": {
           "builder": "@nrwl/jest:jest",
           "options": {
-            "jestConfig": "modules/data/jest.config.js",
+            "jestConfig": "modules/data/jest.config.ts",
             "runInBand": true
           },
           "outputs": ["coverage/modules/data"]
@@ -242,7 +242,7 @@
         "test": {
           "builder": "@nrwl/jest:jest",
           "options": {
-            "jestConfig": "projects/data-example-app/jest.config.js",
+            "jestConfig": "projects/data-example-app/jest.config.ts",
             "runInBand": true,
             "passWithNoTests": true
           }
@@ -372,7 +372,7 @@
         "test": {
           "builder": "@nrwl/jest:jest",
           "options": {
-            "jestConfig": "modules/effects/jest.config.js",
+            "jestConfig": "modules/effects/jest.config.ts",
             "runInBand": true
           },
           "outputs": ["coverage/modules/effects"]
@@ -431,7 +431,7 @@
         "test": {
           "builder": "@nrwl/jest:jest",
           "options": {
-            "jestConfig": "modules/entity/jest.config.js",
+            "jestConfig": "modules/entity/jest.config.ts",
             "runInBand": true
           },
           "outputs": ["coverage/modules/entity"]
@@ -459,7 +459,7 @@
         "test": {
           "builder": "@nrwl/jest:jest",
           "options": {
-            "jestConfig": "modules/eslint-plugin/jest.config.js",
+            "jestConfig": "modules/eslint-plugin/jest.config.ts",
             "runInBand": true
           },
           "outputs": ["coverage/modules/eslint-plugin"]
@@ -598,7 +598,7 @@
         "test": {
           "builder": "@nrwl/jest:jest",
           "options": {
-            "jestConfig": "projects/example-app/jest.config.js",
+            "jestConfig": "projects/example-app/jest.config.ts",
             "runInBand": true
           },
           "outputs": ["coverage/projects/example-app"]
@@ -679,7 +679,7 @@
         "test": {
           "builder": "@nrwl/jest:jest",
           "options": {
-            "jestConfig": "modules/router-store/jest.config.js",
+            "jestConfig": "modules/router-store/jest.config.ts",
             "runInBand": true
           },
           "outputs": ["coverage/modules/router-store"]
@@ -707,7 +707,7 @@
         "test": {
           "builder": "@nrwl/jest:jest",
           "options": {
-            "jestConfig": "modules/schematics/jest.config.js",
+            "jestConfig": "modules/schematics/jest.config.ts",
             "runInBand": true
           },
           "outputs": ["coverage/modules/schematics"]
@@ -795,7 +795,7 @@
         "test": {
           "builder": "@nrwl/jest:jest",
           "options": {
-            "jestConfig": "modules/schematics-core/jest.config.js",
+            "jestConfig": "modules/schematics-core/jest.config.ts",
             "passWithNoTests": true
           },
           "outputs": ["coverage/modules/schematics-core"]
@@ -854,7 +854,7 @@
         "test": {
           "builder": "@nrwl/jest:jest",
           "options": {
-            "jestConfig": "modules/store/jest.config.js",
+            "jestConfig": "modules/store/jest.config.ts",
             "runInBand": true
           },
           "outputs": ["coverage/modules/store"]
@@ -904,7 +904,7 @@
         "test": {
           "builder": "@nrwl/jest:jest",
           "options": {
-            "jestConfig": "modules/store-devtools/jest.config.js",
+            "jestConfig": "modules/store-devtools/jest.config.ts",
             "runInBand": true
           },
           "outputs": ["coverage/modules/store-devtools"]

diff --git a/jest.config.js → jest.config.ts b/jest.config.js → 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
@@ -1,4 +1,4 @@
-const nxPreset = require('@nrwl/jest/preset');
+const nxPreset = require('@nrwl/jest/preset').default;
 module.exports = {
   ...nxPreset,
   testMatch: ['**/+(*.)+(spec|test).+(ts|js)?(x)'],

diff --git a/modules/component-store/jest.config.js → modules/component-store/jest.config.ts b/modules/component-store/jest.config.js → modules/component-store/jest.config.ts
@@ -1,4 +1,5 @@
-module.exports = {
+/* eslint-disable */
+export default {
   displayName: 'Component Store',
   preset: '../../jest.preset.js',
   coverageDirectory: '../../coverage/libs/component-store',

diff --git a/modules/component/jest.config.js → modules/component/jest.config.ts b/modules/component/jest.config.js → modules/component/jest.config.ts
@@ -1,4 +1,5 @@
-module.exports = {
+/* eslint-disable */
+export default {
   displayName: 'Component',
   preset: '../../jest.preset.js',
   coverageDirectory: '../../coverage/modules/component',

diff --git a/modules/data/jest.config.js → modules/data/jest.config.ts b/modules/data/jest.config.js → modules/data/jest.config.ts
@@ -1,4 +1,5 @@
-module.exports = {
+/* eslint-disable */
+export default {
   displayName: 'Data',
   preset: '../../jest.preset.js',
   coverageDirectory: '../../coverage/modules/data',

diff --git a/modules/effects/jest.config.js → modules/effects/jest.config.ts b/modules/effects/jest.config.js → modules/effects/jest.config.ts
@@ -1,4 +1,5 @@
-module.exports = {
+/* eslint-disable */
+export default {
   displayName: 'Effects',
   preset: '../../jest.preset.js',
   coverageDirectory: '../../coverage/modules/effects',

diff --git a/modules/entity/jest.config.js → modules/entity/jest.config.ts b/modules/entity/jest.config.js → modules/entity/jest.config.ts
@@ -1,4 +1,5 @@
-module.exports = {
+/* eslint-disable */
+export default {
   displayName: 'Entity',
   preset: '../../jest.preset.js',
   coverageDirectory: '../../coverage/modules/entity',

diff --git a/modules/eslint-plugin/jest.config.js → modules/eslint-plugin/jest.config.ts b/modules/eslint-plugin/jest.config.js → modules/eslint-plugin/jest.config.ts
@@ -1,4 +1,5 @@
-module.exports = {
+/* eslint-disable */
+export default {
   displayName: 'eslint-plugin',
   preset: '../../jest.preset.js',
   coverageDirectory: '../../coverage/modules/esling-plugin',

diff --git a/modules/router-store/jest.config.js → modules/router-store/jest.config.ts b/modules/router-store/jest.config.js → modules/router-store/jest.config.ts
@@ -1,4 +1,5 @@
-module.exports = {
+/* eslint-disable */
+export default {
   displayName: 'Router Store',
   preset: '../../jest.preset.js',
   coverageDirectory: '../../coverage/modules/router-store',

diff --git a/modules/schematics-core/jest.config.js → modules/schematics-core/jest.config.ts b/modules/schematics-core/jest.config.js → modules/schematics-core/jest.config.ts
@@ -1,4 +1,5 @@
-module.exports = {
+/* eslint-disable */
+export default {
   displayName: 'Schematics Core',
   preset: '../../jest.preset.js',
   setupFilesAfterEnv: ['<rootDir>/test-setup.ts'],

diff --git a/modules/schematics/jest.config.js → modules/schematics/jest.config.ts b/modules/schematics/jest.config.js → modules/schematics/jest.config.ts
@@ -1,4 +1,5 @@
-module.exports = {
+/* eslint-disable */
+export default {
   displayName: 'Schematics',
   preset: '../../jest.preset.js',
   coverageDirectory: '../../coverage/modules/schematics',

diff --git a/modules/store-devtools/jest.config.js → modules/store-devtools/jest.config.ts b/modules/store-devtools/jest.config.js → modules/store-devtools/jest.config.ts
@@ -1,4 +1,5 @@
-module.exports = {
+/* eslint-disable */
+export default {
   displayName: 'Store Devtools',
   preset: '../../jest.preset.js',
   coverageDirectory: '../../coverage/modules/store-devtools',

diff --git a/modules/store/jest.config.js → modules/store/jest.config.ts b/modules/store/jest.config.js → modules/store/jest.config.ts
@@ -1,4 +1,5 @@
-module.exports = {
+/* eslint-disable */
+export default {
   displayName: 'Store',
   preset: '../../jest.preset.js',
   coverageDirectory: '../../coverage/modules/store',

diff --git a/package.json b/package.json
@@ -97,7 +97,7 @@
     "@angular/platform-browser-dynamic": "13.0.0",
     "@angular/platform-server": "13.0.0",
     "@angular/router": "13.0.0",
-    "@nrwl/angular": "13.10.0",
+    "@nrwl/angular": "14.1.5",
     "@typescript-eslint/experimental-utils": "^5.18.0",
     "core-js": "^2.5.4",
     "eslint-etc": "^5.1.0",
@@ -118,23 +118,23 @@
     "@angular/cli": "13.0.1",
     "@angular/compiler-cli": "13.0.0",
     "@babel/core": "7.9.0",
-    "@nrwl/cli": "13.10.0",
-    "@nrwl/cypress": "13.10.0",
-    "@nrwl/eslint-plugin-nx": "13.10.0",
-    "@nrwl/jest": "13.10.0",
-    "@nrwl/linter": "13.10.0",
-    "@nrwl/node": "13.10.0",
-    "@nrwl/nx-cloud": "13.2.2",
-    "@nrwl/tao": "13.10.0",
-    "@nrwl/workspace": "13.10.0",
+    "@nrwl/cli": "14.1.5",
+    "@nrwl/cypress": "14.1.5",
+    "@nrwl/eslint-plugin-nx": "14.1.5",
+    "@nrwl/jest": "14.1.5",
+    "@nrwl/linter": "14.1.5",
+    "@nrwl/node": "14.1.5",
+    "@nrwl/nx-cloud": "14.0.3",
+    "@nrwl/tao": "14.1.5",
+    "@nrwl/workspace": "14.1.5",
     "@octokit/rest": "^15.17.0",
     "@testing-library/cypress": "^7.0.1",
     "@types/fs-extra": "^2.1.0",
     "@types/glob": "^5.0.33",
     "@types/globby": "^8.0.0",
     "@types/jasmine": "3.6.3",
     "@types/jasminewd2": "^2.0.2",
-    "@types/jest": "27.0.2",
+    "@types/jest": "27.4.1",
     "@types/lodash": "^4.14.80",
     "@types/ncp": "^2.0.1",
     "@types/node": "14.14.33",
@@ -164,7 +164,7 @@
     "jasmine": "^3.4.0",
     "jasmine-core": "3.6.0",
     "jasmine-spec-reporter": "5.0.2",
-    "jest": "27.2.3",
+    "jest": "27.5.1",
     "jest-preset-angular": "11.0.0-rc.3",
     "jest-zone-patch": "^0.0.10",
     "karma": "6.3.2",
@@ -192,7 +192,7 @@
     "rxjs-marbles": "^7.0.1",
     "shelljs": "^0.8.3",
     "sorcery": "^0.10.0",
-    "ts-jest": "27.0.5",
+    "ts-jest": "27.1.4",
     "ts-loader": "^5.3.3",
     "ts-node": "9.1.1",
     "ts-snippet": "5.0.2",
@@ -217,3 +217,4 @@
     }
   }
 }
+
diff --git a/projects/data-example-app/jest.config.js → projects/data-example-app/jest.config.ts b/projects/data-example-app/jest.config.js → projects/data-example-app/jest.config.ts
@@ -1,4 +1,5 @@
-module.exports = {
+/* eslint-disable */
+export default {
   displayName: 'Data Example App',
   preset: '../../jest.preset.js',
   coverageDirectory: '../../coverage/apps/data-example-app',

diff --git a/projects/example-app/jest.config.js → projects/example-app/jest.config.ts b/projects/example-app/jest.config.js → projects/example-app/jest.config.ts
@@ -1,4 +1,5 @@
-module.exports = {
+/* eslint-disable */
+export default {
   displayName: 'Example App',
   preset: '../../jest.preset.js',
   coverageDirectory: '../../coverage/apps/example-app',