Skip to content

Commit

Permalink
change to integrated repo
Browse files Browse the repository at this point in the history
  • Loading branch information
slikts committed Dec 25, 2024
1 parent febaf1f commit 3674dda
Show file tree
Hide file tree
Showing 8 changed files with 321 additions and 151 deletions.
94 changes: 0 additions & 94 deletions apps/api/package.json

This file was deleted.

53 changes: 53 additions & 0 deletions apps/api/project.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
{
"name": "api",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "apps/api/src",
"projectType": "application",
"targets": {
"build": {
"executor": "@nx/esbuild:esbuild",
"outputs": ["{options.outputPath}"],
"defaultConfiguration": "production",
"options": {
"platform": "node",
"outputPath": "dist/apps/api",
"format": ["cjs"],
"bundle": false,
"main": "apps/api/src/main.ts",
"tsConfig": "apps/api/tsconfig.app.json",
"assets": ["apps/api/src/assets"],
"generatePackageJson": true,
"esbuildOptions": {
"sourcemap": true,
"outExtension": {
".js": ".js"
}
}
},
"configurations": {
"development": {},
"production": {
"esbuildOptions": {
"sourcemap": false
}
}
}
},
"serve": {
"executor": "@nx/js:node",
"defaultConfiguration": "development",
"dependsOn": ["build"],
"options": {
"buildTarget": "api:build"
},
"configurations": {
"development": {
"buildTarget": "api:build:development"
},
"production": {
"buildTarget": "api:build:production"
}
}
}
}
}
41 changes: 0 additions & 41 deletions apps/web/package.json

This file was deleted.

52 changes: 52 additions & 0 deletions apps/web/project.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
"name": "web",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "apps/web/src",
"projectType": "application",
"targets": {
"build": {
"executor": "@nx/webpack:webpack",
"outputs": ["{options.outputPath}"],
"defaultConfiguration": "production",
"options": {
"outputPath": "dist/apps/web",
"compiler": "babel",
"main": "apps/web/src/main.tsx",
"tsConfig": "apps/web/tsconfig.app.json",
"webpackConfig": "apps/web/webpack.config.js",
"assets": ["apps/web/src/assets"]
},
"configurations": {
"development": {
"extractLicenses": false,
"optimization": false,
"sourceMap": true,
"vendorChunk": true
},
"production": {
"optimization": true,
"sourceMap": false,
"namedChunks": false,
"extractLicenses": true,
"vendorChunk": false
}
}
},
"serve": {
"executor": "@nx/webpack:dev-server",
"defaultConfiguration": "development",
"options": {
"buildTarget": "web:build",
"hmr": true
},
"configurations": {
"development": {
"buildTarget": "web:build:development"
},
"production": {
"buildTarget": "web:build:production"
}
}
}
}
}
25 changes: 19 additions & 6 deletions nx.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,26 @@
{
"extends": "nx/presets/npm.json",
"$schema": "./node_modules/nx/schemas/nx-schema.json",
"affected": {
"defaultBase": "main"
},
"tasksRunnerOptions": {
"default": {
"runner": "nx/tasks-runners/default",
"options": {
"cacheableOperations": ["build", "test", "lint"]
}
}
},
"namedInputs": {
"sharedGlobals": ["{workspaceRoot}/.github/workflows/ci.yml"],
"sharedGlobals": [],
"default": ["{projectRoot}/**/*", "sharedGlobals"],
"production": [
"default",
"!{projectRoot}/.eslintrc.json",
"!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)",
"!{projectRoot}/tsconfig.spec.json",
"!{projectRoot}/src/test-setup.[jt]s",
"!{projectRoot}/eslint.config.js",
"!{projectRoot}/vite.config.ts",
"!{projectRoot}/test-setup.[jt]s"

"!{projectRoot}/tsconfig.spec.json"
]
},
"plugins": [
Expand Down Expand Up @@ -39,6 +48,10 @@
}
],
"targetDefaults": {
"build": {
"dependsOn": ["^build"],
"inputs": ["production", "^production"]
},
"e2e-ci--**/*": { "dependsOn": ["^build"] },
"@nx/esbuild:esbuild": {
"cache": true,
Expand Down
42 changes: 37 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,42 @@
"name": "@modes/source",
"version": "0.0.0",
"license": "MIT",
"scripts": {},
"private": true,
"packageManager": "pnpm@9.15.1",
"dependencies": {
"@emotion/react": "^11.14.0",
"@emotion/styled": "^11.14.0",
"@faker-js/faker": "^9.3.0",
"@hookform/resolvers": "^3.9.1",
"@mui/icons-material": "^6.2.1",
"@mui/material": "^6.2.1",
"@mui/x-data-grid": "^7.23.3",
"@prisma/client": "^6.1.0",
"@tanstack/react-query": "^4.36.1",
"@tanstack/react-query-devtools": "^5.62.8",
"@trpc/client": "^10.45.2",
"@trpc/react-query": "^10.45.2",
"@trpc/server": "^10.45.2",
"bcryptjs": "^2.4.3",
"cors": "^2.8.5",
"express": "~4.18.1",
"jsonwebtoken": "^9.0.2",
"msw": "^2.7.0",
"pretty-bytes": "^6.1.1",
"react": "18.3.1",
"react-dom": "18.3.1",
"react-error-boundary": "^5.0.0",
"react-helmet-async": "^2.0.5",
"react-hook-form": "^7.54.2",
"react-router-dom": "6.11.2",
"superjson": "^2.2.2",
"systeminformation": "^5.23.15",
"zod": "^3.24.1",
"zustand": "^5.0.2"
},
"devDependencies": {
"@eslint/js": "^9.8.0",
"@nx-tools/nx-prisma": "^6.4.1",
"@nx/devkit": "20.2.2",
"@nx/esbuild": "20.2.2",
"@nx/eslint": "20.2.2",
Expand All @@ -29,7 +60,11 @@
"@swc/core": "~1.5.7",
"@swc/helpers": "~0.5.11",
"@testing-library/react": "15.0.6",
"@types/cors": "^2.8.17",
"@types/express": "~4.17.13",
"@types/node": "^22.10.2",
"@types/react": "18.3.1",
"@types/react-dom": "18.3.0",
"@typescript-eslint/eslint-plugin": "^8.18.1",
"@typescript-eslint/parser": "^8.18.1",
"@vitejs/plugin-react-swc": "^3.7.2",
Expand All @@ -46,6 +81,7 @@
"msw-storybook-addon": "^2.0.4",
"nx": "20.2.2",
"prettier": "^2.6.2",
"prisma": "^6.1.0",
"storybook": "^8.4.7",
"superjson": "^2.2.2",
"ts-node": "10.9.1",
Expand All @@ -54,9 +90,5 @@
"typescript-eslint": "^8.13.0",
"vite": "^5.0.0",
"vitest": "^1.3.1"
},
"dependencies": {
"msw": "^2.7.0",
"zod": "^3.24.1"
}
}
Loading

0 comments on commit 3674dda

Please sign in to comment.