Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

V17 #99

Merged
merged 2 commits into from
Nov 25, 2023
Merged

V17 #99

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 2 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@

/dist
/coverage

/.nx/cache
2 changes: 1 addition & 1 deletion apps/fantalytic-mobile-e2e/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
}
},
"lint": {
"executor": "@nx/linter:eslint",
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["apps/fantalytic-mobile-e2e/**/*.{js,ts}"]
Expand Down
15 changes: 7 additions & 8 deletions apps/fantalytic-mobile/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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": {
Expand Down
3 changes: 1 addition & 2 deletions apps/fantalytic-mobile/src/polyfills.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 7 additions & 3 deletions apps/fantalytic-mobile/src/test.ts
Original file line number Diff line number Diff line change
@@ -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[];
};
Expand Down
2 changes: 1 addition & 1 deletion apps/fantalytic-public-e2e/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
}
},
"lint": {
"executor": "@nx/linter:eslint",
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["apps/fantalytic-public-e2e/**/*.{js,ts}"]
Expand Down
11 changes: 5 additions & 6 deletions apps/fantalytic-public/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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"
}
}
},
Expand Down
12 changes: 6 additions & 6 deletions apps/fantalytic-ssr/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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": [
Expand All @@ -63,7 +63,7 @@
},
"test": {
"executor": "@nx/vite:test",
"outputs": ["apps/fantalytic-ssr/coverage"]
"outputs": ["{projectRoot}/coverage"]
}
},
"tags": []
Expand Down
6 changes: 2 additions & 4 deletions apps/fantalytic-ssr/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 }) => {
Expand Down Expand Up @@ -43,9 +43,7 @@ export default defineConfig(({ mode }) => {
routes: ['/'],
},
}),
tsConfigPaths({
root: '../../',
}),
nxViteTsPaths(),
visualizer() as Plugin,
splitVendorChunkPlugin(),
],
Expand Down
2 changes: 1 addition & 1 deletion apps/fantalytic-web-scraper-cron/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
}
},
"lint": {
"executor": "@nx/linter:eslint",
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["apps/fantalytic-web-scraper-cron/**/*.ts"]
Expand Down
2 changes: 1 addition & 1 deletion apps/grocery-list-e2e/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
}
},
"lint": {
"executor": "@nx/linter:eslint",
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["apps/grocery-list-e2e/**/*.{js,ts}"]
Expand Down
5 changes: 2 additions & 3 deletions apps/grocery-list/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -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}"]
Expand All @@ -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"
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion apps/marvel-web-e2e/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
}
},
"lint": {
"executor": "@nx/linter:eslint",
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["apps/marvel-web-e2e/**/*.{js,ts}"]
Expand Down
11 changes: 5 additions & 6 deletions apps/marvel-web/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion apps/marvintherapy-public-e2e/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
}
},
"lint": {
"executor": "@nx/linter:eslint",
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["apps/marvintherapy-public-e2e/**/*.{js,ts}"]
Expand Down
6 changes: 2 additions & 4 deletions apps/marvintherapy-public/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
"outputs": ["{options.outputPath}"],
"defaultConfiguration": "production",
"options": {
"root": "apps/marvintherapy-public",
"outputPath": "dist/apps/marvintherapy-public"
},
"configurations": {
Expand Down Expand Up @@ -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}"]
Expand Down
2 changes: 1 addition & 1 deletion libs/fantalytic-shared-v2/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
}
},
"lint": {
"executor": "@nx/linter:eslint",
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["libs/fantalytic-shared-v2/**/*.ts"]
Expand Down
6 changes: 2 additions & 4 deletions libs/fantalytic-shared-v2/vite.config.ts
Original file line number Diff line number Diff line change
@@ -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';

Expand All @@ -15,9 +15,7 @@ export default defineConfig({
skipDiagnostics: true,
}),

viteTsConfigPaths({
root: '../../',
}),
nxViteTsPaths(),
],

// Uncomment this if you are using workers.
Expand Down
5 changes: 2 additions & 3 deletions libs/fantalytic-shared/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand All @@ -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"
}
}
},
Expand Down
5 changes: 2 additions & 3 deletions libs/marvel-shared-business-logic/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 2 additions & 3 deletions libs/marvel-shared-components/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading