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

chore: file structure refactor #20

Merged
merged 4 commits into from
Sep 8, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/test-app-node-express.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
with:
filters: |
app-node-express:
- 'packages/app-node-express/**'
- 'packages/mern-sample-app/app-node-express/**'

- name: 🛠 Setup Git, PNPM and Node.js
if: steps.changes.outputs.app-node-express == 'true'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-app-vite-react.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
with:
filters: |
app-vite-react:
- 'packages/app-vite-react/**'
- 'packages/mern-sample-app/app-vite-react/**'

- name: 🛠 Setup Git, PNPM and Node.js
if: steps.changes.outputs.app-vite-react == 'true'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-lib-api-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
with:
filters: |
lib-api-client:
- 'packages/lib-api-client/**'
- 'packages/mern-sample-app/lib-api-client/**'

- name: 🛠 Setup Git, PNPM and Node.js
if: steps.changes.outputs.lib-api-client == 'true'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-lib-commons.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
with:
filters: |
lib-commons:
- 'packages/lib-commons/**'
- 'packages/mern-sample-app/lib-commons/**'

- name: 🛠 Setup Git, PNPM and Node.js
if: steps.changes.outputs.lib-commons == 'true'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/typedoc-generator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: typedoc-generator
on:
push:
paths:
- "packages/**/src/**"
- "packages/**/**/src/**"
branches:
- main
workflow_dispatch:
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
node_modules/**
docs/**
dist/**
dist/**
coverage/**
packages/**/**/coverage/**
60 changes: 39 additions & 21 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
},
{
"name": "@org/app-node-express: start",
"runtimeArgs": ["run", "start", "--prefix", "packages/app-node-express"],
"runtimeArgs": ["run", "start", "--prefix", "packages/mern-sample-app/app-node-express"],
"presentation": { "group": "3" },
// Defaults below
"runtimeVersion": "21.7.0",
Expand All @@ -94,7 +94,7 @@
},
{
"name": "@org/app-node-express: dev",
"runtimeArgs": ["run", "dev", "--prefix", "packages/app-node-express"],
"runtimeArgs": ["run", "dev", "--prefix", "packages/mern-sample-app/app-node-express"],
"presentation": { "group": "3" },
// Defaults below
"runtimeVersion": "21.7.0",
Expand All @@ -107,7 +107,7 @@
},
{
"name": "@org/app-node-express: test",
"runtimeArgs": ["run", "test", "--prefix", "packages/app-node-express"],
"runtimeArgs": ["run", "test", "--prefix", "packages/mern-sample-app/app-node-express"],
"presentation": { "group": "3" },
// Defaults below
"runtimeVersion": "21.7.0",
Expand All @@ -120,7 +120,7 @@
},
{
"name": "@org/app-node-express: build",
"runtimeArgs": ["run", "build", "--prefix", "packages/app-node-express"],
"runtimeArgs": ["run", "build", "--prefix", "packages/mern-sample-app/app-node-express"],
"presentation": { "group": "3" },
// Defaults below
"runtimeVersion": "21.7.0",
Expand All @@ -133,7 +133,7 @@
},
{
"name": "@org/app-node-express: clean",
"runtimeArgs": ["run", "clean", "--prefix", "packages/app-node-express"],
"runtimeArgs": ["run", "clean", "--prefix", "packages/mern-sample-app/app-node-express"],
"presentation": { "group": "3" },
// Defaults below
"runtimeVersion": "21.7.0",
Expand All @@ -146,7 +146,7 @@
},
{
"name": "@org/app-node-express: lint",
"runtimeArgs": ["run", "lint", "--prefix", "packages/app-node-express"],
"runtimeArgs": ["run", "lint", "--prefix", "packages/mern-sample-app/app-node-express"],
"presentation": { "group": "3" },
// Defaults below
"runtimeVersion": "21.7.0",
Expand All @@ -159,7 +159,7 @@
},
{
"name": "@org/app-vite-react: start",
"runtimeArgs": ["run", "start", "--prefix", "packages/app-vite-react"],
"runtimeArgs": ["run", "start", "--prefix", "packages/mern-sample-app/app-vite-react"],
"presentation": { "group": "4" },
// Defaults below
"runtimeVersion": "21.7.0",
Expand All @@ -172,7 +172,7 @@
},
{
"name": "@org/app-vite-react: dev",
"runtimeArgs": ["run", "dev", "--prefix", "packages/app-vite-react"],
"runtimeArgs": ["run", "dev", "--prefix", "packages/mern-sample-app/app-vite-react"],
"presentation": { "group": "4" },
// Defaults below
"runtimeVersion": "21.7.0",
Expand All @@ -185,7 +185,7 @@
},
{
"name": "@org/app-vite-react: test",
"runtimeArgs": ["run", "test", "--prefix", "packages/app-vite-react"],
"runtimeArgs": ["run", "test", "--prefix", "packages/mern-sample-app/app-vite-react"],
"presentation": { "group": "4" },
// Defaults below
"runtimeVersion": "21.7.0",
Expand All @@ -198,7 +198,7 @@
},
{
"name": "@org/app-vite-react: build",
"runtimeArgs": ["run", "build", "--prefix", "packages/app-vite-react"],
"runtimeArgs": ["run", "build", "--prefix", "packages/mern-sample-app/app-vite-react"],
"presentation": { "group": "4" },
// Defaults below
"runtimeVersion": "21.7.0",
Expand All @@ -211,7 +211,7 @@
},
{
"name": "@org/app-vite-react: clean",
"runtimeArgs": ["run", "clean", "--prefix", "packages/app-vite-react"],
"runtimeArgs": ["run", "clean", "--prefix", "packages/mern-sample-app/app-vite-react"],
"presentation": { "group": "4" },
// Defaults below
"runtimeVersion": "21.7.0",
Expand All @@ -224,7 +224,7 @@
},
{
"name": "@org/app-vite-react: lint",
"runtimeArgs": ["run", "lint", "--prefix", "packages/app-vite-react"],
"runtimeArgs": ["run", "lint", "--prefix", "packages/mern-sample-app/app-vite-react"],
"presentation": { "group": "4" },
// Defaults below
"runtimeVersion": "21.7.0",
Expand All @@ -237,7 +237,12 @@
},
{
"name": "@org/app-vite-react: loadTranslationTypes",
"runtimeArgs": ["run", "loadTranslationTypes", "--prefix", "packages/app-vite-react"],
"runtimeArgs": [
"run",
"loadTranslationTypes",
"--prefix",
"packages/mern-sample-app/app-vite-react"
],
"presentation": { "group": "4" },
// Defaults below
"runtimeVersion": "21.7.0",
Expand All @@ -250,7 +255,20 @@
},
{
"name": "@org/lib-commons: test",
"runtimeArgs": ["run", "test", "--prefix", "packages/lib-commons"],
"runtimeArgs": ["run", "test", "--prefix", "packages/mern-sample-app/lib-commons"],
"presentation": { "group": "5" },
// Defaults below
"runtimeVersion": "21.7.0",
"type": "node",
"request": "launch",
"runtimeExecutable": "npm",
"console": "integratedTerminal",
"outputCapture": "std",
"autoAttachChildProcesses": false
},
{
"name": "@org/lib-commons: test - coverage",
"runtimeArgs": ["run", "test:coverage", "--prefix", "packages/mern-sample-app/lib-commons"],
"presentation": { "group": "5" },
// Defaults below
"runtimeVersion": "21.7.0",
Expand All @@ -263,7 +281,7 @@
},
{
"name": "@org/lib-commons: build",
"runtimeArgs": ["run", "build", "--prefix", "packages/lib-commons"],
"runtimeArgs": ["run", "build", "--prefix", "packages/mern-sample-app/lib-commons"],
"presentation": { "group": "5" },
// Defaults below
"runtimeVersion": "21.7.0",
Expand All @@ -276,7 +294,7 @@
},
{
"name": "@org/lib-commons: clean",
"runtimeArgs": ["run", "clean", "--prefix", "packages/lib-commons"],
"runtimeArgs": ["run", "clean", "--prefix", "packages/mern-sample-app/lib-commons"],
"presentation": { "group": "5" },
// Defaults below
"runtimeVersion": "21.7.0",
Expand All @@ -289,7 +307,7 @@
},
{
"name": "@org/lib-commons: lint",
"runtimeArgs": ["run", "lint", "--prefix", "packages/lib-commons"],
"runtimeArgs": ["run", "lint", "--prefix", "packages/mern-sample-app/lib-commons"],
"presentation": { "group": "5" },
// Defaults below
"runtimeVersion": "21.7.0",
Expand All @@ -302,7 +320,7 @@
},
{
"name": "@org/lib-api-client: test",
"runtimeArgs": ["run", "test", "--prefix", "packages/lib-api-client"],
"runtimeArgs": ["run", "test", "--prefix", "packages/mern-sample-app/lib-api-client"],
"presentation": { "group": "6" },
// Defaults below
"runtimeVersion": "21.7.0",
Expand All @@ -315,7 +333,7 @@
},
{
"name": "@org/lib-api-client: build",
"runtimeArgs": ["run", "build", "--prefix", "packages/lib-api-client"],
"runtimeArgs": ["run", "build", "--prefix", "packages/mern-sample-app/lib-api-client"],
"presentation": { "group": "6" },
// Defaults below
"runtimeVersion": "21.7.0",
Expand All @@ -328,7 +346,7 @@
},
{
"name": "@org/lib-api-client: clean",
"runtimeArgs": ["run", "clean", "--prefix", "packages/lib-api-client"],
"runtimeArgs": ["run", "clean", "--prefix", "packages/mern-sample-app/lib-api-client"],
"presentation": { "group": "6" },
// Defaults below
"runtimeVersion": "21.7.0",
Expand All @@ -341,7 +359,7 @@
},
{
"name": "@org/lib-api-client: lint",
"runtimeArgs": ["run", "lint", "--prefix", "packages/lib-api-client"],
"runtimeArgs": ["run", "lint", "--prefix", "packages/mern-sample-app/lib-api-client"],
"presentation": { "group": "6" },
// Defaults below
"runtimeVersion": "21.7.0",
Expand Down
53 changes: 25 additions & 28 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"type": "module",
"private": true,
"workspaces": [
"packages/*"
"packages/**/*"
],
"engines": {
"pnpm": ">=8.15.7"
Expand All @@ -18,45 +18,42 @@
"test": "npm run app-node-express:test && npm run app-vite-react:test && npm run lib-commons:test && npm run lib-api-client:test",
"build": "npm run app-node-express:build && npm run app-vite-react:build && npm run lib-commons:build && npm run lib-api-client:build",
"clean": "rm -rf docs && npm run app-node-express:clean && npm run app-vite-react:clean && npm run lib-commons:clean && npm run lib-api-client:clean",
"reinstall": "rm -rf node_modules packages/app-node-express/node_modules packages/app-vite-react/node_modules packages/lib-commons/node_modules packages/lib-api-client/node_modules && pnpm i",
"reinstall": "rm -rf node_modules packages/mern-sample-app/app-node-express/node_modules packages/mern-sample-app/app-vite-react/node_modules packages/mern-sample-app/lib-commons/node_modules packages/mern-sample-app/lib-api-client/node_modules && npx pnpm i",
"lint": "npm run app-node-express:lint && npm run app-vite-react:lint && npm run lib-commons:lint && npm run lib-api-client:lint",
"writeTypedoc": "bash assets/sh/typedoc.sh",
"app-node-express:start": "npm run start --prefix packages/app-node-express",
"app-node-express:dev": "npm run start --prefix packages/app-node-express",
"app-node-express:test": "npm run test --prefix packages/app-node-express",
"app-node-express:build": "npm run build --prefix packages/app-node-express",
"app-node-express:clean": "npm run clean --prefix packages/app-node-express",
"app-node-express:lint": "npm run lint --prefix packages/app-node-express",
"app-vite-react:start": "npm run start --prefix packages/app-vite-react",
"app-vite-react:dev": "npm run dev --prefix packages/app-vite-react",
"app-vite-react:test": "npm run test --prefix packages/app-vite-react",
"app-vite-react:build": "npm run build --prefix packages/app-vite-react",
"app-vite-react:clean": "npm run clean --prefix packages/app-vite-react",
"app-vite-react:lint": "npm run lint --prefix packages/app-vite-react",
"lib-commons:lint": "npm run lint --prefix packages/lib-commons",
"lib-commons:build": "npm run build --prefix packages/lib-commons",
"lib-commons:test": "npm run test --prefix packages/lib-commons",
"lib-commons:clean": "npm run clean --prefix packages/lib-commons",
"lib-api-client:lint": "npm run lint --prefix packages/lib-api-client",
"lib-api-client:build": "npm run build --prefix packages/lib-api-client",
"lib-api-client:test": "npm run test --prefix packages/lib-api-client",
"lib-api-client:clean": "npm run clean --prefix packages/lib-api-client"
"app-node-express:start": "npm run start --prefix packages/mern-sample-app/app-node-express",
"app-node-express:dev": "npm run start --prefix packages/mern-sample-app/app-node-express",
"app-node-express:test": "npm run test --prefix packages/mern-sample-app/app-node-express",
"app-node-express:build": "npm run build --prefix packages/mern-sample-app/app-node-express",
"app-node-express:clean": "npm run clean --prefix packages/mern-sample-app/app-node-express",
"app-node-express:lint": "npm run lint --prefix packages/mern-sample-app/app-node-express",
"app-vite-react:start": "npm run start --prefix packages/mern-sample-app/app-vite-react",
"app-vite-react:dev": "npm run dev --prefix packages/mern-sample-app/app-vite-react",
"app-vite-react:test": "npm run test --prefix packages/mern-sample-app/app-vite-react",
"app-vite-react:build": "npm run build --prefix packages/mern-sample-app/app-vite-react",
"app-vite-react:clean": "npm run clean --prefix packages/mern-sample-app/app-vite-react",
"app-vite-react:lint": "npm run lint --prefix packages/mern-sample-app/app-vite-react",
"lib-commons:lint": "npm run lint --prefix packages/mern-sample-app/lib-commons",
"lib-commons:build": "npm run build --prefix packages/mern-sample-app/lib-commons",
"lib-commons:test": "npm run test --prefix packages/mern-sample-app/lib-commons",
"lib-commons:clean": "npm run clean --prefix packages/mern-sample-app/lib-commons",
"lib-api-client:lint": "npm run lint --prefix packages/mern-sample-app/lib-api-client",
"lib-api-client:build": "npm run build --prefix packages/mern-sample-app/lib-api-client",
"lib-api-client:test": "npm run test --prefix packages/mern-sample-app/lib-api-client",
"lib-api-client:clean": "npm run clean --prefix packages/mern-sample-app/lib-api-client"
},
"devDependencies": {
"@types/jest": "^29.5.12",
"@typescript-eslint/eslint-plugin": "^7.0.2",
"@typescript-eslint/parser": "^7.0.2",
"cross-dirname": "^0.1.0",
"eslint": "^8.56.0",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-react-refresh": "^0.4.5",
"markdown-toc": "^1.2.0",
"prettier": "^3.2.5",
"ts-node": "^10.9.2",
"tsc-alias": "^1.8.8",
"typedoc": "^0.26.6",
"typedoc-github-theme": "^0.1.2",
"typedoc-plugin-remove-references": "^0.0.6"
"typedoc-plugin-remove-references": "^0.0.6",
"vitest": "^2.0.5",
"@vitest/coverage-v8": "^2.0.5"
},
"keywords": [
"monorepo",
Expand Down
18 changes: 0 additions & 18 deletions packages/app-node-express/src/config/ClassMetadataEntry.config.ts

This file was deleted.

This file was deleted.

Loading
Loading