Merge pull request #2459 from ike18t/renovate/e2e/nx/patch-nrwl-monorepo

chore(deps): update nrwl monorepo to v14.1.5 (patch)

.eslintrc.yml

@@ -28,6 +28,7 @@ settings:
         - ./e2e/jasmine/tsconfig.json
         - ./e2e/jest/tsconfig.json
         - ./e2e/min/tsconfig.json
+        - ./e2e/nx/tsconfig.base.json
         - ./e2e/nx/apps/a-nx/tsconfig.json
   es-roikoren:
     aggressive: true
@@ -55,6 +56,7 @@ overrides:
         - ./e2e/jasmine/tsconfig.json
         - ./e2e/jest/tsconfig.json
         - ./e2e/min/tsconfig.json
+        - ./e2e/nx/tsconfig.base.json
         - ./e2e/nx/apps/a-nx/tsconfig.json
     extends:
       - 'eslint:recommended'

e2e/nx/apps/a-nx/jest.config.js → e2e/nx/apps/a-nx/jest.config.ts

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
   displayName: 'a-nx',
   preset: '../../jest.preset.js',
   setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],

e2e/nx/apps/a-nx/project.json

@@ -1,6 +1,5 @@
 {
   "projectType": "application",
-  "root": "apps/a-nx",
   "sourceRoot": "apps/a-nx/src",
   "prefix": "nx",
   "targets": {
@@ -35,23 +34,11 @@
       },
       "defaultConfiguration": "development"
     },
-    "extract-i18n": {
-      "executor": "@angular-devkit/build-angular:extract-i18n",
-      "options": {
-        "browserTarget": "a-nx:build"
-      }
-    },
-    "lint": {
-      "executor": "@nrwl/linter:eslint",
-      "options": {
-        "lintFilePatterns": ["apps/a-nx/src/**/*.ts", "apps/a-nx/src/**/*.html"]
-      }
-    },
     "test": {
       "executor": "@nrwl/jest:jest",
       "outputs": ["coverage/apps/a-nx"],
       "options": {
-        "jestConfig": "apps/a-nx/jest.config.js",
+        "jestConfig": "apps/a-nx/jest.config.ts",
         "passWithNoTests": true
       }
     }

e2e/nx/apps/a-nx/tsconfig.json

@@ -1,7 +1,7 @@
 {
   "extends": "../../tsconfig.base.json",
   "files": ["src/main.ts", "src/polyfills.ts", "src/test-setup.ts"],
-  "include": ["**/*.test.ts", "**/*.spec.ts", "**/*.d.ts"],
+  "include": ["**/*.test.ts", "**/*.spec.ts", "**/*.d.ts", "jest.config.ts"],
   "compilerOptions": {
     "outDir": "../../dist/out-tsc",
     "forceConsistentCasingInFileNames": true,

e2e/nx/decorate-angular-cli.js

@@ -63,7 +63,7 @@ function symlinkNgCLItoNxCLI() {
 
 try {
   symlinkNgCLItoNxCLI();
-  require('@nrwl/cli/lib/decorate-cli').decorateCli();
+  require('nx/src/adapter/decorate-cli').decorateCli();
   output.log({ title: 'Angular CLI has been decorated to enable computation caching.' });
 } catch (e) {
   output.error({ title: 'Decoration of the Angular CLI did not complete successfully' });

e2e/nx/jest.config.ts

@@ -0,0 +1,5 @@
+import { getJestProjects } from '@nrwl/jest';
+
+export default {
+  projects: getJestProjects(),
+};

e2e/nx/jest.preset.js

@@ -1,3 +1,3 @@
-const nxPreset = require('@nrwl/jest/preset');
+const nxPreset = require('@nrwl/jest/preset').default;
 
 module.exports = { ...nxPreset };

e2e/nx/nx.json

@@ -15,7 +15,7 @@
   },
   "tasksRunnerOptions": {
     "default": {
-      "runner": "@nrwl/workspace/tasks-runners/default",
+      "runner": "nx/tasks-runners/default",
       "options": {
         "cacheableOperations": ["build", "test"]
       }