feature: migrate to nx (15.3.0) and angular 15 (ngworker#147)

Please check if your PR fulfills the following requirements:

- [x] The commit message follows our guidelines: CONTRIBUTING.md#commit
- [ ] Tests for the changes have been added (for bug fixes / features)
- [ ] Docs have been added / updated (for bug fixes / features)

What kind of change does this PR introduce?

<!-- Please check the one that applies to this PR using "x". -->

```
[ ] Bugfix
[ ] Feature
[ ] Code style update (formatting, local variables)
[ ] Refactoring (no functional changes, no api changes)
[x] Build related changes
[ ] CI related changes
[ ] Documentation content changes
[ ] Other... Please describe:
```

The workspace is using Nx 14.x and Angular 14.x

The workspace uses the latest Nx 15.2.x and the latest Angular 15.0.x

```
[ ] Yes
[x] No
```

---------

Co-authored-by: Lars Gyrup Brink Nielsen <[email protected]>

.nvmrc

@@ -1 +1 @@
-16.18.0
+18.12.1

README.md

@@ -65,6 +65,7 @@ Refer to the following table to determine which version of Lumberjack is compati
 
 | Angular version | Lumberjack version |
 | --------------- | ------------------ |
+| 15.x            | 15.x               |
 | 14.x            | 14.x               |
 | 13.x            | 2.x                |
 | 12.x            | 2.x                |

e2e/examples/lumberjack-app-e2e/cypress.config.ts

@@ -0,0 +1,6 @@
+import { nxE2EPreset } from '@nrwl/cypress/plugins/cypress-preset';
+import { defineConfig } from 'cypress';
+
+export default defineConfig({
+  e2e: nxE2EPreset(__dirname),
+});

e2e/examples/lumberjack-app-e2e/project.json

@@ -1,4 +1,5 @@
 {
+  "name": "examples-lumberjack-app-e2e",
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "e2e/examples/lumberjack-app-e2e/src",
   "projectType": "application",
@@ -12,8 +13,9 @@
         }
       ],
       "options": {
-        "cypressConfig": "e2e/examples/lumberjack-app-e2e/cypress.json",
-        "devServerTarget": "examples-lumberjack-app:serve:development"
+        "cypressConfig": "e2e/examples/lumberjack-app-e2e/cypress.config.ts",
+        "devServerTarget": "examples-lumberjack-app:serve:development",
+        "testingType": "e2e"
       },
       "configurations": {
         "production": {

e2e/examples/lumberjack-app-e2e/src/integration/console-driver.spec.ts → e2e/examples/lumberjack-app-e2e/src/e2e/console-driver.cy.ts

@@ -1,3 +1,5 @@
+import { VERSION } from '@angular/core';
+
 describe('Console log driver', () => {
   function visit() {
     cy.visit('/', {
@@ -9,7 +11,7 @@ describe('Console log driver', () => {
   }
 
   const expectedPayload = {
-    angularVersion: '14',
+    angularVersion: VERSION.major,
   };
   it('logs a greeting info message', () => {
     visit();

e2e/examples/lumberjack-app-e2e/src/support/commands.ts

@@ -0,0 +1,9 @@
+// ***********************************************
+// This example commands.js shows you how to
+// create various custom commands and overwrite
+// existing commands.
+//
+// For more comprehensive examples of custom
+// commands please read more here:
+// https://on.cypress.io/custom-commands
+// ***********************************************

e2e/examples/lumberjack-app-e2e/tsconfig.json

@@ -12,8 +12,9 @@
     "noImplicitReturns": true,
     "noFallthroughCasesInSwitch": true
   },
-  "include": ["src/**/*.ts", "src/**/*.js"],
+  "include": ["src/**/*.ts", "src/**/*.js", "cypress.config.ts"],
   "angularCompilerOptions": {
+    "enableI18nLegacyMessageIdFormat": false,
     "strictInjectionParameters": true,
     "strictInputAccessModifiers": true,
     "strictTemplates": true

nx.json

@@ -8,14 +8,6 @@
     "defaultCollection": "@nrwl/angular",
     "packageManager": "yarn"
   },
-  "implicitDependencies": {
-    "package.json": {
-      "dependencies": "*",
-      "devDependencies": "*"
-    },
-    ".eslintrc.json": "*",
-    "README.md": ["ngworker-lumberjack"]
-  },
   "tasksRunnerOptions": {
     "default": {
       "runner": "@nrwl/nx-cloud",
@@ -48,11 +40,33 @@
           "projects": "dependencies",
           "target": "build"
         }
-      ]
+      ],
+      "inputs": ["production", "^production"]
+    },
+    "e2e": {
+      "inputs": ["default", "^production"]
+    },
+    "test": {
+      "inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"]
+    },
+    "lint": {
+      "inputs": ["default", "{workspaceRoot}/.eslintrc.json"]
     }
   },
   "workspaceLayout": {
     "appsDir": "e2e",
     "libsDir": "packages"
+  },
+  "namedInputs": {
+    "default": ["{projectRoot}/**/*", "sharedGlobals", "projectSpecificFiles"],
+    "sharedGlobals": [],
+    "production": [
+      "default",
+      "!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)",
+      "!{projectRoot}/tsconfig.spec.json",
+      "!{projectRoot}/jest.config.[jt]s",
+      "!{projectRoot}/.eslintrc.json"
+    ],
+    "projectSpecificFiles": []
   }
 }

package.json

@@ -19,78 +19,79 @@
     "test": "nx run-many --target=test --all"
   },
   "engines": {
-    "node": "16.18.0",
+    "node": "18.12.1",
     "npm": "Use the Yarn Classic (1.x) CLI instead of npm",
     "yarn": "1.22.19"
   },
   "volta": {
-    "node": "16.18.0",
+    "node": "18.12.1",
     "yarn": "1.22.19"
   },
   "dependencies": {
-    "@angular/animations": "14.0.7",
-    "@angular/common": "14.0.7",
-    "@angular/compiler": "14.0.7",
-    "@angular/core": "14.0.7",
-    "@angular/forms": "14.0.7",
-    "@angular/platform-browser": "14.0.7",
-    "@angular/platform-browser-dynamic": "14.0.7",
-    "@angular/router": "14.0.7",
-    "@nrwl/angular": "14.4.3",
-    "rxjs": "7.4.0",
-    "tslib": "2.4.0",
-    "zone.js": "0.11.6"
+    "@angular/animations": "15.0.3",
+    "@angular/common": "15.0.3",
+    "@angular/compiler": "15.0.3",
+    "@angular/core": "15.0.3",
+    "@angular/forms": "15.0.3",
+    "@angular/platform-browser": "15.0.3",
+    "@angular/platform-browser-dynamic": "15.0.3",
+    "@angular/router": "15.0.3",
+    "@nrwl/angular": "15.3.0",
+    "rxjs": "7.5.7",
+    "tslib": "2.4.1",
+    "zone.js": "0.12.0"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "14.0.7",
-    "@angular-eslint/eslint-plugin": "14.0.4",
-    "@angular-eslint/eslint-plugin-template": "14.0.4",
-    "@angular-eslint/template-parser": "14.0.4",
-    "@angular/cli": "14.0.7",
-    "@angular/compiler-cli": "14.0.7",
-    "@angular/language-service": "14.0.7",
-    "@commitlint/cli": "17.1.2",
-    "@commitlint/config-conventional": "17.1.0",
-    "@jscutlery/semver": "2.27.1",
-    "@nrwl/cli": "14.4.3",
-    "@nrwl/cypress": "14.4.3",
-    "@nrwl/devkit": "14.4.3",
-    "@nrwl/eslint-plugin-nx": "14.4.3",
-    "@nrwl/jest": "14.4.3",
-    "@nrwl/linter": "14.4.3",
-    "@nrwl/nx-cloud": "14.7.0",
-    "@nrwl/workspace": "14.4.3",
+    "@angular-devkit/build-angular": "15.0.3",
+    "@angular-eslint/eslint-plugin": "15.1.0",
+    "@angular-eslint/eslint-plugin-template": "15.1.0",
+    "@angular-eslint/template-parser": "15.1.0",
+    "@angular/cli": "15.0.3",
+    "@angular/compiler-cli": "15.0.3",
+    "@angular/language-service": "15.0.3",
+    "@commitlint/cli": "17.3.0",
+    "@commitlint/config-conventional": "17.3.0",
+    "@jscutlery/semver": "2.29.2",
+    "@nrwl/cli": "15.3.0",
+    "@nrwl/cypress": "15.3.0",
+    "@nrwl/devkit": "15.3.0",
+    "@nrwl/eslint-plugin-nx": "15.3.0",
+    "@nrwl/jest": "15.3.0",
+    "@nrwl/linter": "15.3.0",
+    "@nrwl/nx-cloud": "15.0.2",
+    "@nrwl/workspace": "15.3.0",
     "@types/copy": "0.3.2",
-    "@types/jest": "27.4.1",
-    "@types/node": "16.11.7",
-    "@typescript-eslint/eslint-plugin": "5.29.0",
-    "@typescript-eslint/parser": "5.29.0",
+    "@types/jest": "28.1.8",
+    "@types/node": "18.11.13",
+    "@typescript-eslint/eslint-plugin": "5.45.0",
+    "@typescript-eslint/parser": "5.45.0",
     "copy": "0.3.2",
-    "cypress": "9.1.1",
+    "cypress": "11.2.0",
     "eslint": "8.15.0",
     "eslint-config-prettier": "8.1.0",
-    "eslint-plugin-cypress": "2.10.3",
+    "eslint-plugin-cypress": "2.12.1",
     "eslint-plugin-etc": "2.0.2",
     "eslint-plugin-ordered-imports": "0.6.0",
     "eslint-plugin-rxjs": "5.0.2",
     "eslint-plugin-rxjs-angular": "2.0.0",
-    "eslint-plugin-sonarjs": "0.13.0",
+    "eslint-plugin-sonarjs": "0.17.0",
     "glob": "8.0.3",
-    "husky": "8.0.0",
-    "jest": "27.5.1",
-    "jest-preset-angular": "11.1.2",
-    "ng-packagr": "14.0.2",
-    "ngx-deploy-npm": "4.1.0",
-    "nx": "14.4.3",
+    "husky": "8.0.2",
+    "jest": "28.1.3",
+    "jest-environment-jsdom": "28.1.3",
+    "jest-preset-angular": "12.2.3",
+    "ng-packagr": "15.0.3",
+    "ngx-deploy-npm": "4.3.10",
+    "nx": "15.3.0",
     "postcss": "8.4.18",
     "postcss-import": "14.1.0",
     "postcss-preset-env": "7.5.0",
     "postcss-url": "10.1.3",
-    "prettier": "2.6.2",
+    "prettier": "2.8.1",
     "replace-in-file": "6.3.5",
     "rimraf": "3.0.2",
-    "ts-jest": "27.1.5",
-    "ts-node": "10.8.1",
-    "typescript": "4.6.4"
+    "ts-jest": "28.0.8",
+    "ts-node": "10.9.1",
+    "typescript": "4.8.4"
   }
 }

packages/examples/lumberjack-app/project.json

@@ -11,7 +11,7 @@
         "outputPath": "dist/packages/examples/lumberjack-app",
         "index": "packages/examples/lumberjack-app/src/index.html",
         "main": "packages/examples/lumberjack-app/src/main.ts",
-        "polyfills": "packages/examples/lumberjack-app/src/polyfills.ts",
+        "polyfills": ["zone.js"],
         "tsConfig": "packages/examples/lumberjack-app/tsconfig.app.json",
         "inlineStyleLanguage": "scss",
         "assets": ["packages/examples/lumberjack-app/src/favicon.ico", "packages/examples/lumberjack-app/src/assets"],
@@ -32,12 +32,6 @@
               "maximumError": "4kb"
             }
           ],
-          "fileReplacements": [
-            {
-              "replace": "packages/examples/lumberjack-app/src/environments/environment.ts",
-              "with": "packages/examples/lumberjack-app/src/environments/environment.prod.ts"
-            }
-          ],
           "outputHashing": "all"
         },
         "development": {
@@ -91,10 +85,11 @@
     },
     "test": {
       "executor": "@nrwl/jest:jest",
-      "outputs": ["coverage/packages/examples/lumberjack-app"],
+      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
         "jestConfig": "packages/examples/lumberjack-app/jest.config.ts",
-        "passWithNoTests": true
+        "passWithNoTests": true,
+        "reporters": ["default", "github-actions"]
       },
       "configurations": {
         "coverage": {
@@ -105,5 +100,6 @@
       }
     }
   },
-  "tags": ["scope:internal", "type:app"]
+  "tags": ["scope:internal", "type:app"],
+  "name": "examples-lumberjack-app"
 }

packages/examples/lumberjack-app/src/main.ts

@@ -1,10 +1,9 @@
-import { enableProdMode, importProvidersFrom } from '@angular/core';
-import { bootstrapApplication, BrowserModule } from '@angular/platform-browser';
+import { importProvidersFrom } from '@angular/core';
+import { bootstrapApplication } from '@angular/platform-browser';
 
 import { LumberjackLog, LumberjackModule, LumberjackOptions } from '@ngworker/lumberjack';
 import { LumberjackConsoleDriverModule } from '@ngworker/lumberjack/console-driver';
 
-import { environment } from './environments/environment';
 import { AppComponent } from './app/app.component';
 
 const cypressLumberjackOptions: LumberjackOptions = {
@@ -17,14 +16,9 @@ const cypressLumberjackOptions: LumberjackOptions = {
   },
 };
 
-if (environment.production) {
-  enableProdMode();
-}
-
 bootstrapApplication(AppComponent, {
   providers: [
     importProvidersFrom([
-      BrowserModule,
       LumberjackModule.forRoot('Cypress' in window ? cypressLumberjackOptions : undefined),
       LumberjackConsoleDriverModule.forRoot(),
     ]),