Skip to content
Merged
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
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,7 @@ vite.config.*.timestamp*
vitest.config.*.timestamp*
**/.env
secrets

.claude/worktrees
.nx/polygraph
.nx/self-healing
3 changes: 2 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
/dist
/coverage
/.nx/cache
/.nx/workspace-data
/.nx/workspace-data
/.nx/self-healing
2 changes: 1 addition & 1 deletion apps/backend-e2e/jest.config.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export default {
module.exports = {
displayName: 'backend-e2e',
preset: '../../jest.preset.js',
globalSetup: '<rootDir>/src/support/global-setup.ts',
Expand Down
2 changes: 1 addition & 1 deletion apps/backend/jest.config.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export default {
module.exports = {
displayName: 'backend',
preset: '../../jest.preset.js',
testEnvironment: 'node',
Expand Down
1 change: 1 addition & 0 deletions apps/frontend/src/theme.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ import { createTheme, MantineThemeOverride } from '@mantine/core';

export const theme: MantineThemeOverride = createTheme({
/** Put your mantine theme override here */
defaultRadius: 'sm',
});
2 changes: 0 additions & 2 deletions apps/frontend/src/utils/query.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ export const setQueryOptions = (
yesterdayBegin.setHours(0, 0, 0, 0);
const yesterdayEnd = new Date(new Date().setDate(new Date().getDate() - 1));
yesterdayEnd.setHours(23, 59, 59, 999);
console.log('yesterdayEnd', yesterdayEnd);
options.begin = yesterdayBegin.toISOString();
options.end = yesterdayEnd.toISOString();
}
Expand All @@ -38,6 +37,5 @@ export const setQueryOptions = (
lastWeek.setHours(0, 0, 0, 0);
options.begin = lastWeek.toISOString();
}
console.log(options);
return options;
};
5 changes: 3 additions & 2 deletions apps/frontend/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"compilerOptions": {
"jsx": "react-jsx",
"moduleResolution": "bundler",
"allowJs": false,
"esModuleInterop": true,
"allowSyntheticDefaultImports": true,
Expand All @@ -14,8 +15,8 @@
"files": [],
"include": [],
"references": [
{"path": "./tsconfig.app.json"},
{"path": "./tsconfig.spec.json"}
{ "path": "./tsconfig.app.json" },
{ "path": "./tsconfig.spec.json" }
],
"extends": "../../tsconfig.base.json"
}
45 changes: 11 additions & 34 deletions apps/frontend/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,20 +1,24 @@
/// <reference types='vitest' />
/// <reference types="vitest/config" />
import { nxCopyAssetsPlugin } from '@nx/vite/plugins/nx-copy-assets.plugin';
import react from '@vitejs/plugin-react';
import path from 'path';
import type { ConfigEnv } from 'vite';
import { defineConfig, loadEnv } from 'vite';

export default ({ mode }: { mode: string }) => {
const env = loadEnv(mode, process.cwd());
export default defineConfig(({ mode }: ConfigEnv) => {
const env = loadEnv(mode, process.cwd(), '');
const apiUrl = env.VITE_API_BASE_URL || 'http://localhost:3000';
return defineConfig({
return {
root: __dirname,
cacheDir: '../../node_modules/.vite/apps/frontend',
server: {
port: 4200,
host: 'localhost',
proxy: {
'/api': apiUrl,
'/api': {
target: apiUrl,
changeOrigin: true,
},
},
},
preview: {
Expand All @@ -29,27 +33,13 @@ export default ({ mode }: { mode: string }) => {
'@tabler/icons-react': '@tabler/icons-react/dist/esm/icons/index.mjs',
},
},
// Uncomment this if you are using workers.
// worker: {
// plugins: [ nxViteTsPaths() ],
// },
build: {
outDir: '../../dist/apps/frontend',
emptyOutDir: true,
reportCompressedSize: true,
commonjsOptions: {
transformMixedEsModules: true,
},
rollupOptions: {
output: {
manualChunks: {
mantine: ['@mantine/core', '@mantine/hooks'],
'react-vendor': ['react', 'react-dom', 'react-router-dom'],
'redux-vendor': ['@reduxjs/toolkit', 'react-redux'],
icons: ['@tabler/icons-react'],
},
},
},
},
test: {
watch: false,
Expand All @@ -62,18 +52,5 @@ export default ({ mode }: { mode: string }) => {
provider: 'v8',
},
},
css: {
preprocessorOptions: {
scss: {
silenceDeprecations: [
'legacy-js-api',
'import',
'mixed-decls',
'global-builtin',
'color-functions',
],
},
},
},
});
};
};
});
6 changes: 5 additions & 1 deletion eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@ export default [
...nx.configs['flat/typescript'],
...nx.configs['flat/javascript'],
{
ignores: ['**/dist'],
ignores: [
'**/dist',
'**/vite.config.*.timestamp*',
'**/vitest.config.*.timestamp*',
],
},
{
files: ['**/*.ts', '**/*.tsx', '**/*.js', '**/*.jsx'],
Expand Down
4 changes: 2 additions & 2 deletions jest.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { getJestProjectsAsync } from '@nx/jest';
const { getJestProjectsAsync } = require('@nx/jest');

export default async () => ({
module.exports = async () => ({
projects: await getJestProjectsAsync(),
});
2 changes: 1 addition & 1 deletion libs/jest.config.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export default {
module.exports = {
displayName: 'libs',
preset: '../jest.preset.js',
testEnvironment: 'node',
Expand Down
219 changes: 219 additions & 0 deletions migrations.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,219 @@
{
"migrations": [
{
"version": "21.0.0-beta.8",
"description": "Removes the legacy cache configuration from nx.json",
"implementation": "./dist/src/migrations/update-21-0-0/remove-legacy-cache",
"package": "nx",
"name": "remove-legacy-cache"
},
{
"version": "21.0.0-beta.8",
"description": "Removes the legacy cache configuration from nx.json",
"implementation": "./dist/src/migrations/update-21-0-0/remove-custom-tasks-runner",
"package": "nx",
"name": "remove-custom-tasks-runner"
},
{
"version": "21.0.0-beta.11",
"description": "Updates release version config based on the breaking changes in Nx v21",
"implementation": "./dist/src/migrations/update-21-0-0/release-version-config-changes",
"package": "nx",
"name": "release-version-config-changes"
},
{
"version": "21.0.0-beta.11",
"description": "Updates release changelog config based on the breaking changes in Nx v21",
"implementation": "./dist/src/migrations/update-21-0-0/release-changelog-config-changes",
"package": "nx",
"name": "release-changelog-config-changes"
},
{
"version": "22.0.0-beta.1",
"description": "Updates release version config based on the breaking changes in Nx v22",
"implementation": "./dist/src/migrations/update-22-0-0/release-version-config-changes",
"package": "nx",
"name": "22-0-0-release-version-config-changes"
},
{
"version": "22.0.0-beta.2",
"description": "Consolidates releaseTag* options into nested releaseTag object structure",
"implementation": "./dist/src/migrations/update-22-0-0/consolidate-release-tag-config",
"package": "nx",
"name": "22-0-0-consolidate-release-tag-config"
},
{
"cli": "nx",
"version": "22.1.0-beta.5",
"description": "Updates the nx wrapper.",
"implementation": "./dist/src/migrations/update-22-1-0/update-nx-wrapper",
"package": "nx",
"name": "22-1-0-update-nx-wrapper"
},
{
"cli": "nx",
"version": "22.6.0-beta.10",
"description": "Adds .claude/worktrees to .gitignore",
"implementation": "./dist/src/migrations/update-22-6-0/add-claude-worktrees-to-git-ignore",
"package": "nx",
"name": "22-6-1-add-claude-worktrees-to-git-ignore"
},
{
"cli": "nx",
"version": "22.7.0-beta.0",
"description": "Adds .nx/polygraph to .gitignore",
"implementation": "./dist/src/migrations/update-22-7-0/add-polygraph-to-git-ignore",
"package": "nx",
"name": "22-7-0-add-polygraph-to-git-ignore"
},
{
"cli": "nx",
"version": "22.6.0-rc.0",
"description": "Adds .claude/settings.local.json to .gitignore",
"implementation": "./dist/src/migrations/update-17-3-0/update-nxw",
"package": "nx",
"name": "22-6-0-add-claude-settings-local-to-git-ignore"
},
{
"cli": "nx",
"version": "22.7.0-beta.0",
"description": "Adds .nx/self-healing to .gitignore",
"implementation": "./dist/src/migrations/update-22-2-0/add-self-healing-to-gitignore",
"package": "nx",
"name": "22-7-0-add-self-healing-to-gitignore"
},
{
"version": "21.5.0-beta.2",
"description": "Migrate the legacy 'development' custom condition to a workspace-unique custom condition name.",
"factory": "./src/migrations/update-21-5-0/migrate-development-custom-condition",
"package": "@nx/js",
"name": "migrate-development-custom-condition"
},
{
"version": "22.0.0-beta.0",
"description": "Remove the deprecated `external` and `externalBuildTargets` options from the `@nx/js:swc` and `@nx/js:tsc` executors.",
"factory": "./src/migrations/update-22-0-0/remove-external-options-from-js-executors",
"package": "@nx/js",
"name": "remove-external-options-from-js-executors"
},
{
"version": "22.1.0-rc.1",
"description": "Removes redundant TypeScript project references from project's tsconfig.json files when runtime tsconfig files (e.g., tsconfig.lib.json, tsconfig.app.json) exist.",
"factory": "./src/migrations/update-22-1-0/remove-redundant-ts-project-references",
"package": "@nx/js",
"name": "remove-redundant-ts-project-references"
},
{
"version": "22.7.0-beta.12",
"description": "Add missing inputs to @nx/eslint:lint executor target defaults",
"implementation": "./src/migrations/update-21-6-0/update-executor-lint-inputs",
"package": "@nx/eslint",
"name": "update-executor-lint-inputs"
},
{
"version": "20.5.0-beta.2",
"description": "Install jiti as a devDependency to allow vite to parse TS postcss files.",
"implementation": "./src/migrations/update-20-5-0/install-jiti",
"package": "@nx/vite",
"name": "update-20-5-0-install-jiti"
},
{
"version": "20.5.0-beta.3",
"description": "Update resolve.conditions to include defaults that are no longer provided by Vite.",
"implementation": "./src/migrations/update-20-5-0/update-resolve-conditions",
"package": "@nx/vite",
"name": "update-20-5-0-update-resolve-conditions"
},
{
"version": "20.5.0-beta.3",
"description": "Add vite config temporary files to the ESLint configuration ignore patterns if ESLint is used.",
"implementation": "./src/migrations/update-20-5-0/eslint-ignore-vite-temp-files",
"package": "@nx/vite",
"name": "eslint-ignore-vite-temp-files"
},
{
"version": "22.2.0-beta.2",
"description": "Migrate Vitest usage from @nx/vite to @nx/vitest package.",
"implementation": "./src/migrations/update-22-2-0/migrate-vitest-to-vitest-package",
"package": "@nx/vite",
"name": "migrate-vitest-to-vitest-package"
},
{
"cli": "nx",
"version": "21.0.0-beta.9",
"description": "Replace usage of `getJestProjects` with `getJestProjectsAsync`.",
"implementation": "./src/migrations/update-21-0-0/replace-getJestProjects-with-getJestProjectsAsync",
"package": "@nx/jest",
"name": "replace-getJestProjects-with-getJestProjectsAsync-v21"
},
{
"version": "21.0.0-beta.10",
"description": "Remove the previously deprecated and unused `tsConfig` option from the `@nx/jest:jest` executor.",
"implementation": "./src/migrations/update-21-0-0/remove-tsconfig-option-from-jest-executor",
"package": "@nx/jest",
"name": "remove-tsconfig-option-from-jest-executor"
},
{
"version": "21.3.0-beta.3",
"description": "Rename the CLI option `testPathPattern` to `testPathPatterns`.",
"implementation": "./src/migrations/update-21-3-0/rename-test-path-pattern",
"package": "@nx/jest",
"name": "rename-test-path-pattern"
},
{
"version": "21.3.0-beta.3",
"requires": { "jest": ">=30.0.0" },
"description": "Replace removed matcher aliases in Jest v30 with their corresponding matcher",
"implementation": "./src/migrations/update-21-3-0/replace-removed-matcher-aliases",
"package": "@nx/jest",
"name": "replace-removed-matcher-aliases"
},
{
"version": "22.2.0-beta.2",
"description": "Convert jest.config.ts files from ESM to CJS syntax (export default -> module.exports, import -> require) for projects using CommonJS resolution to ensure correct loading under Node.js type-stripping.",
"implementation": "./src/migrations/update-22-2-0/convert-jest-config-to-cjs",
"package": "@nx/jest",
"name": "convert-jest-config-to-cjs"
},
{
"version": "22.3.2-beta.0",
"requires": { "jest": ">=30.0.0" },
"description": "Replace removed matcher aliases in Jest v30 with their corresponding matcher",
"implementation": "./src/migrations/update-21-3-0/replace-removed-matcher-aliases",
"package": "@nx/jest",
"name": "replace-removed-matcher-aliases-v22-3"
},
{
"cli": "nx",
"version": "21.0.0-beta.11",
"description": "Remove isolatedConfig option for @nx/webpack:webpack",
"implementation": "./src/migrations/update-21-0-0/remove-isolated-config",
"package": "@nx/webpack",
"name": "update-21-0-0-remove-isolated-config"
},
{
"cli": "nx",
"version": "22.0.0-beta.0",
"description": "Remove deprecated deleteOutputPath and sassImplementation options from @nx/webpack:webpack",
"implementation": "./src/migrations/update-22-0-0/remove-deprecated-options",
"package": "@nx/webpack",
"name": "update-22-0-0-remove-deprecated-options"
},
{
"cli": "nx",
"version": "21.0.0-beta.11",
"description": "Replaces `classProperties.loose` option with `loose`.",
"factory": "./src/migrations/update-21-0-0/update-babel-loose",
"package": "@nx/react",
"name": "update-21-0-0-update-babel-loose"
},
{
"cli": "nx",
"version": "22.0.0-beta.0",
"description": "Updates webpack configs using React to use the new withSvgr composable function instead of the svgr option in withReact or NxReactWebpackPlugin.",
"factory": "./src/migrations/update-22-0-0/add-svgr-to-webpack-config",
"package": "@nx/react",
"name": "update-22-0-0-add-svgr-to-webpack-config"
}
]
}
Loading