Merge pull request #99 from paulmojicatech/v17

V17
paulmojicatech · Nov 25, 2023 · 4ee5bd9 · 4ee5bd9
2 parents 4d98bb9 + bdc50b3
commit 4ee5bd9
Show file tree

Hide file tree

Showing 31 changed files with 14,470 additions and 17,668 deletions.
diff --git a/.gitignore b/.gitignore
@@ -83,3 +83,5 @@ libs/fantalytic-web-scraper/package-lock.json
 libs/fantalytic-web-scraper/output/*
 apps/fantalytic-public/src/assets/stats/*
 apps/fantalytic-api/local.settings.json
+
+.nx/cache
diff --git a/.prettierignore b/.prettierignore
@@ -2,3 +2,5 @@
 
 /dist
 /coverage
+
+/.nx/cache
diff --git a/apps/fantalytic-mobile-e2e/project.json b/apps/fantalytic-mobile-e2e/project.json
@@ -18,7 +18,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["apps/fantalytic-mobile-e2e/**/*.{js,ts}"]

diff --git a/apps/fantalytic-mobile/project.json b/apps/fantalytic-mobile/project.json
@@ -68,26 +68,26 @@
       "executor": "@angular-devkit/build-angular:dev-server",
       "configurations": {
         "production": {
-          "browserTarget": "fantalytic-mobile:build:production"
+          "buildTarget": "fantalytic-mobile:build:production"
         },
         "development": {
-          "browserTarget": "fantalytic-mobile:build:development"
+          "buildTarget": "fantalytic-mobile:build:development"
         }
       },
       "options": {
-        "browserTarget": "app:build",
-        "proxyConfig": "apps/fantalytic-mobile/proxy.config.json"
+        "proxyConfig": "apps/fantalytic-mobile/proxy.config.json",
+        "buildTarget": "app:build"
       },
       "defaultConfiguration": "development"
     },
     "extract-i18n": {
       "executor": "@angular-devkit/build-angular:extract-i18n",
       "options": {
-        "browserTarget": "fantalytic-mobile:build"
+        "buildTarget": "fantalytic-mobile:build"
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "options": {
         "lintFilePatterns": [
           "apps/fantalytic-mobile/src/**/*.ts",
@@ -99,8 +99,7 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/apps/fantalytic-mobile"],
       "options": {
-        "jestConfig": "apps/fantalytic-mobile/jest.config.js",
-        "passWithNoTests": true
+        "jestConfig": "apps/fantalytic-mobile/jest.config.js"
       }
     },
     "cap": {

diff --git a/apps/fantalytic-mobile/src/polyfills.ts b/apps/fantalytic-mobile/src/polyfills.ts
@@ -57,8 +57,7 @@ import './zone-flags';
 /***************************************************************************************************
  * Zone JS is required by default for Angular itself.
  */
-import 'zone.js/dist/zone';  // Included with Angular CLI.
-
+import 'zone.js'; // Included with Angular CLI.
 
 /***************************************************************************************************
  * APPLICATION IMPORTS

diff --git a/apps/fantalytic-mobile/src/test.ts b/apps/fantalytic-mobile/src/test.ts
@@ -1,14 +1,18 @@
 // This file is required by karma.conf.js and loads recursively all the .spec and framework files
 
-import 'zone.js/dist/zone-testing';
+import 'zone.js/testing';
 import { getTestBed } from '@angular/core/testing';
 import {
   BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting
+  platformBrowserDynamicTesting,
 } from '@angular/platform-browser-dynamic/testing';
 
 declare const require: {
-  context(path: string, deep?: boolean, filter?: RegExp): {
+  context(
+    path: string,
+    deep?: boolean,
+    filter?: RegExp
+  ): {
     <T>(id: string): T;
     keys(): string[];
   };

diff --git a/apps/fantalytic-public-e2e/project.json b/apps/fantalytic-public-e2e/project.json
@@ -18,7 +18,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["apps/fantalytic-public-e2e/**/*.{js,ts}"]

diff --git a/apps/fantalytic-public/project.json b/apps/fantalytic-public/project.json
@@ -62,10 +62,10 @@
       "executor": "@angular-devkit/build-angular:dev-server",
       "configurations": {
         "production": {
-          "browserTarget": "fantalytic-public:build:production"
+          "buildTarget": "fantalytic-public:build:production"
         },
         "development": {
-          "browserTarget": "fantalytic-public:build:development"
+          "buildTarget": "fantalytic-public:build:development"
         }
       },
       "defaultConfiguration": "development",
@@ -76,11 +76,11 @@
     "extract-i18n": {
       "executor": "@angular-devkit/build-angular:extract-i18n",
       "options": {
-        "browserTarget": "fantalytic-public:build"
+        "buildTarget": "fantalytic-public:build"
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "options": {
         "lintFilePatterns": [
           "apps/fantalytic-public/**/*.ts",
@@ -92,8 +92,7 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/apps/fantalytic-public"],
       "options": {
-        "jestConfig": "apps/fantalytic-public/jest.config.ts",
-        "passWithNoTests": true
+        "jestConfig": "apps/fantalytic-public/jest.config.ts"
       }
     }
   },

diff --git a/apps/fantalytic-ssr/project.json b/apps/fantalytic-ssr/project.json
@@ -8,9 +8,9 @@
       "executor": "@nx/vite:build",
       "outputs": [
         "{options.outputPath}",
-        "dist/apps/fantalytic-ssr/.nitro",
-        "dist/apps/fantalytic-ssr/ssr",
-        "dist/apps/fantalytic-ssr/analog"
+        "{workspaceRoot}/dist/apps/fantalytic-ssr/.nitro",
+        "{workspaceRoot}/dist/apps/fantalytic-ssr/ssr",
+        "{workspaceRoot}/dist/apps/fantalytic-ssr/analog"
       ],
       "options": {
         "main": "apps/fantalytic-ssr/src/main.ts",
@@ -48,11 +48,11 @@
     "extract-i18n": {
       "executor": "@angular-devkit/build-angular:extract-i18n",
       "options": {
-        "browserTarget": "fantalytic-ssr:build"
+        "buildTarget": "fantalytic-ssr:build"
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": [
@@ -63,7 +63,7 @@
     },
     "test": {
       "executor": "@nx/vite:test",
-      "outputs": ["apps/fantalytic-ssr/coverage"]
+      "outputs": ["{projectRoot}/coverage"]
     }
   },
   "tags": []

diff --git a/apps/fantalytic-ssr/vite.config.ts b/apps/fantalytic-ssr/vite.config.ts
@@ -3,7 +3,7 @@
 import analog from '@analogjs/platform';
 import { visualizer } from 'rollup-plugin-visualizer';
 import { defineConfig, Plugin, splitVendorChunkPlugin } from 'vite';
-import tsConfigPaths from 'vite-tsconfig-paths';
+import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
 
 // https://vitejs.dev/config/
 export default defineConfig(({ mode }) => {
@@ -43,9 +43,7 @@ export default defineConfig(({ mode }) => {
           routes: ['/'],
         },
       }),
-      tsConfigPaths({
-        root: '../../',
-      }),
+      nxViteTsPaths(),
       visualizer() as Plugin,
       splitVendorChunkPlugin(),
     ],

diff --git a/apps/fantalytic-web-scraper-cron/project.json b/apps/fantalytic-web-scraper-cron/project.json
@@ -41,7 +41,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["apps/fantalytic-web-scraper-cron/**/*.ts"]

diff --git a/apps/grocery-list-e2e/project.json b/apps/grocery-list-e2e/project.json
@@ -18,7 +18,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["apps/grocery-list-e2e/**/*.{js,ts}"]

diff --git a/apps/grocery-list/project.json b/apps/grocery-list/project.json
@@ -65,7 +65,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["apps/grocery-list/**/*.{ts,tsx,js,jsx}"]
@@ -75,8 +75,7 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/apps/grocery-list"],
       "options": {
-        "jestConfig": "apps/grocery-list/jest.config.ts",
-        "passWithNoTests": true
+        "jestConfig": "apps/grocery-list/jest.config.ts"
       }
     }
   },

diff --git a/apps/marvel-web-e2e/project.json b/apps/marvel-web-e2e/project.json
@@ -17,7 +17,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["apps/marvel-web-e2e/**/*.{js,ts}"]

diff --git a/apps/marvel-web/project.json b/apps/marvel-web/project.json
@@ -59,22 +59,22 @@
       "executor": "@angular-devkit/build-angular:dev-server",
       "configurations": {
         "production": {
-          "browserTarget": "marvel-web:build:production"
+          "buildTarget": "marvel-web:build:production"
         },
         "development": {
-          "browserTarget": "marvel-web:build:development"
+          "buildTarget": "marvel-web:build:development"
         }
       },
       "defaultConfiguration": "development"
     },
     "extract-i18n": {
       "executor": "@angular-devkit/build-angular:extract-i18n",
       "options": {
-        "browserTarget": "marvel-web:build"
+        "buildTarget": "marvel-web:build"
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "options": {
         "lintFilePatterns": [
           "apps/marvel-web/src/**/*.ts",
@@ -86,8 +86,7 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/apps/marvel-web"],
       "options": {
-        "jestConfig": "apps/marvel-web/jest.config.js",
-        "passWithNoTests": true
+        "jestConfig": "apps/marvel-web/jest.config.js"
       }
     }
   },

diff --git a/apps/marvintherapy-public-e2e/project.json b/apps/marvintherapy-public-e2e/project.json
@@ -17,7 +17,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["apps/marvintherapy-public-e2e/**/*.{js,ts}"]

diff --git a/apps/marvintherapy-public/project.json b/apps/marvintherapy-public/project.json
@@ -9,7 +9,6 @@
       "outputs": ["{options.outputPath}"],
       "defaultConfiguration": "production",
       "options": {
-        "root": "apps/marvintherapy-public",
         "outputPath": "dist/apps/marvintherapy-public"
       },
       "configurations": {
@@ -39,12 +38,11 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/apps/marvintherapy-public"],
       "options": {
-        "jestConfig": "apps/marvintherapy-public/jest.config.js",
-        "passWithNoTests": true
+        "jestConfig": "apps/marvintherapy-public/jest.config.js"
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["apps/marvintherapy-public/**/*.{ts,tsx,js,jsx}"]

diff --git a/libs/fantalytic-shared-v2/project.json b/libs/fantalytic-shared-v2/project.json
@@ -12,7 +12,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["libs/fantalytic-shared-v2/**/*.ts"]

diff --git a/libs/fantalytic-shared-v2/vite.config.ts b/libs/fantalytic-shared-v2/vite.config.ts
@@ -1,7 +1,7 @@
 /// <reference types="vitest" />
 import { defineConfig } from 'vite';
 
-import viteTsConfigPaths from 'vite-tsconfig-paths';
+import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
 import dts from 'vite-plugin-dts';
 import { join } from 'path';
 
@@ -15,9 +15,7 @@ export default defineConfig({
       skipDiagnostics: true,
     }),
 
-    viteTsConfigPaths({
-      root: '../../',
-    }),
+    nxViteTsPaths(),
   ],
 
   // Uncomment this if you are using workers.

diff --git a/libs/fantalytic-shared/project.json b/libs/fantalytic-shared/project.json
@@ -5,7 +5,7 @@
   "projectType": "library",
   "targets": {
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["libs/fantalytic-shared/**/*.ts"]
@@ -15,8 +15,7 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/libs/fantalytic-shared"],
       "options": {
-        "jestConfig": "libs/fantalytic-shared/jest.config.ts",
-        "passWithNoTests": true
+        "jestConfig": "libs/fantalytic-shared/jest.config.ts"
       }
     }
   },

diff --git a/libs/marvel-shared-business-logic/project.json b/libs/marvel-shared-business-logic/project.json
@@ -9,12 +9,11 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/libs/marvel-shared-business-logic"],
       "options": {
-        "jestConfig": "libs/marvel-shared-business-logic/jest.config.js",
-        "passWithNoTests": true
+        "jestConfig": "libs/marvel-shared-business-logic/jest.config.js"
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "options": {
         "lintFilePatterns": [
           "libs/marvel-shared-business-logic/src/**/*.ts",

diff --git a/libs/marvel-shared-components/project.json b/libs/marvel-shared-components/project.json
@@ -9,12 +9,11 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/libs/marvel-shared-components"],
       "options": {
-        "jestConfig": "libs/marvel-shared-components/jest.config.js",
-        "passWithNoTests": true
+        "jestConfig": "libs/marvel-shared-components/jest.config.js"
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "options": {
         "lintFilePatterns": [
           "libs/marvel-shared-components/src/**/*.ts",