Skip to content

Commit 866b139

Browse files
authored
Merge pull request #174 from WildCodeSchool/dev
Dev
2 parents 5ada20e + 88f4aa4 commit 866b139

16 files changed

+3639
-3389
lines changed

CHANGELOG.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,26 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99

1010
[Open an issue](https://github.com/WildCodeSchool/create-js-monorepo/issues) if you have any request/feedback :)
1111

12+
## [7.2.0] - 2025-03-31
13+
14+
### Fixed
15+
16+
- Replaced husky with native config for git hooks.
17+
18+
- Used `tsx` in script `start` to avoid server transpilation.
19+
20+
### Added
21+
22+
- Added `check:fix` script. Thanks to [Florian Schaessens](https://github.com/Dolpheus89).
23+
24+
- Added `.gitattributes` file to [mind the end of line](https://adaptivepatchwork.com/2012/03/01/mind-the-end-of-your-line/).
25+
26+
## [7.1.8] - 2025-01-03
27+
28+
### Fixed
29+
30+
- Fixed import path in seed system. Thanks to [Brian Boudrioux](https://github.com/Brian-boudrioux).
31+
1232
## [7.1.7] - 2024-10-28
1333

1434
### Fixed

bin/create-js-monorepo.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ fs.writeFileSync(
124124
);
125125
fs.rmSync(`${destDir}/README.template.md`);
126126

127+
fs.renameSync(`${destDir}/gitattributes`, `${destDir}/.gitattributes`);
127128
fs.renameSync(`${destDir}/gitignore`, `${destDir}/.gitignore`);
128129
fs.renameSync(`${destDir}/client/gitignore`, `${destDir}/client/.gitignore`);
129130
fs.renameSync(`${destDir}/server/gitignore`, `${destDir}/server/.gitignore`);

package-lock.json

Lines changed: 18 additions & 29 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@this-is-to-learn/create-js-monorepo",
3-
"version": "7.1.7",
3+
"version": "7.2.0",
44
"type": "module",
55
"description": "Our pedagogical framework for the React-Express-MySQL cursus in Wild Code School",
66
"homepage": "https://github.com/wildcodeschool/create-js-monorepo#readme",
@@ -21,7 +21,7 @@
2121
"author": "Wild Code School",
2222
"license": "MIT",
2323
"dependencies": {
24-
"@clack/prompts": "^0.7.0",
24+
"@clack/prompts": "^0.10.0",
2525
"kleur": "^4.1.5",
2626
"mustache": "^4.2.0"
2727
}
File renamed without changes.
File renamed without changes.

template/README.template.md

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# {{name}}
22

3-
Ce projet est un monorepo JS, suivant l'architecture React-Express-MySQL telle qu'enseignée à la Wild Code School (v7.1.7) :
3+
Ce projet est un monorepo JS, suivant l'architecture React-Express-MySQL telle qu'enseignée à la Wild Code School (v7.2.0) :
44

55
```mermaid
66
sequenceDiagram
@@ -37,7 +37,6 @@ sequenceDiagram
3737
Il est pré-configuré avec un ensemble d'outils pour aider les étudiants à produire du code de qualité industrielle, tout en restant un outil pédagogique :
3838

3939
- **Concurrently** : Permet d'exécuter plusieurs commandes simultanément dans le même terminal.
40-
- **Husky** : Permet d'exécuter des commandes spécifiques déclenchées par des événements _git_.
4140
- **Vite** : Alternative à _Create-React-App_, offrant une expérience plus fluide avec moins d'outils.
4241
- **Biome** : Alternative à _ESlint_ et _Prettier_, assurant la qualité du code selon des règles choisies.
4342
- **Supertest** : Bibliothèque pour tester les serveurs HTTP en node.js.
@@ -46,7 +45,6 @@ Il est pré-configuré avec un ensemble d'outils pour aider les étudiants à pr
4645

4746
- [{{name}}](#name)
4847
- [Table des Matières](#table-des-matières)
49-
- [Utilisateurs Windows](#utilisateurs-windows)
5048
- [Installation \& Utilisation](#installation--utilisation)
5149
- [Les choses à retenir](#les-choses-à-retenir)
5250
- [Commandes de Base](#commandes-de-base)
@@ -61,15 +59,6 @@ Il est pré-configuré avec un ensemble d'outils pour aider les étudiants à pr
6159
- [Logs](#logs)
6260
- [Contribution](#contribution)
6361

64-
## Utilisateurs Windows
65-
66-
Assurez-vous de lancer ces commandes dans un terminal Git pour éviter [les problèmes de formats de nouvelles lignes](https://en.wikipedia.org/wiki/Newline#Issues_with_different_newline_formats) :
67-
68-
```sh
69-
git config --global core.eol lf
70-
git config --global core.autocrlf false
71-
```
72-
7362
## Installation & Utilisation
7463

7564
1. Installez le plugin **Biome** dans VSCode et configurez-le.

template/biome.json

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,30 @@
11
{
2-
"$schema": "https://biomejs.dev/schemas/1.8.1/schema.json",
2+
"$schema": "https://biomejs.dev/schemas/1.9.4/schema.json",
3+
"vcs": {
4+
"enabled": false,
5+
"clientKind": "git",
6+
"useIgnoreFile": false
7+
},
38
"files": {
9+
"ignoreUnknown": false,
410
"ignore": ["**/dist/*", "**/*.template.*", "**/tsconfig.json", "coverage"]
511
},
6-
"formatter": { "indentStyle": "space" },
7-
"organizeImports": { "enabled": true },
12+
"formatter": {
13+
"enabled": true,
14+
"indentStyle": "space"
15+
},
16+
"organizeImports": {
17+
"enabled": true
18+
},
819
"linter": {
920
"enabled": true,
10-
"rules": { "recommended": true, "suspicious": { "noConsoleLog": "error" } }
21+
"rules": {
22+
"recommended": true
23+
}
24+
},
25+
"javascript": {
26+
"formatter": {
27+
"quoteStyle": "double"
28+
}
1129
}
1230
}

template/client/package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
"preview": "vite preview"
99
},
1010
"dependencies": {
11-
"react": "^18.3.1",
12-
"react-dom": "^18.3.1",
13-
"react-router-dom": "^6.26.2"
11+
"react": "^19.1.0",
12+
"react-dom": "^19.1.0",
13+
"react-router": "^7.4.1"
1414
},
1515
"devDependencies": {
16-
"@types/react": "^18.3.10",
17-
"@types/react-dom": "^18.3.0",
18-
"@vitejs/plugin-react": "^4.3.1",
19-
"typescript": "^5.6.2",
20-
"vite": "^5.4.8"
16+
"@types/react": "^19.0.12",
17+
"@types/react-dom": "^19.0.4",
18+
"@vitejs/plugin-react": "^4.3.4",
19+
"typescript": "^5.8.2",
20+
"vite": "^6.2.4"
2121
}
2222
}

template/client/src/main.tsx

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Import necessary modules from React and React Router
22
import { StrictMode } from "react";
33
import { createRoot } from "react-dom/client";
4-
import { RouterProvider, createBrowserRouter } from "react-router-dom";
4+
import { RouterProvider, createBrowserRouter } from "react-router";
55

66
/* ************************************************************************* */
77

@@ -38,31 +38,30 @@ if (rootElement == null) {
3838
createRoot(rootElement).render(
3939
<StrictMode>
4040
<RouterProvider router={router} />
41-
</StrictMode>
41+
</StrictMode>,
4242
);
4343

4444
/**
4545
* Helpful Notes:
46-
*
46+
*
4747
* 1. Adding More Routes:
4848
* To add more pages to your app, first create a new component (e.g., About.tsx).
4949
* Then, import that component above like this:
50-
*
50+
*
5151
* import About from "./pages/About";
52-
*
52+
*
5353
* Add a new route to the router:
54-
*
54+
*
5555
* {
5656
* path: "/about",
5757
* element: <About />, // Renders the About component
5858
* }
59-
*
59+
*
6060
* 2. Try Nested Routes:
6161
* For more complex applications, you can nest routes. This lets you have sub-pages within a main page.
6262
* Documentation: https://reactrouter.com/en/main/start/tutorial#nested-routes
63-
*
63+
*
6464
* 3. Experiment with Dynamic Routes:
6565
* You can create routes that take parameters (e.g., /users/:id).
6666
* Documentation: https://reactrouter.com/en/main/start/tutorial#url-params-in-loaders
6767
*/
68-

0 commit comments

Comments
 (0)