@foal/cli 4.4.0 → 4.5.0

package/lib/generate/generators/react/connect-react.js

@@ -18,12 +18,17 @@ function connectReact(path) {
         }
         return;
     }
+    const outputPath = (0, path_1.join)((0, path_1.relative)(path, process.cwd()), 'public')
+        // Make projects generated on Windows build on Unix.
+        .replace(/\\/g, '/');
     fs
         .cd(path)
         .modify('package.json', content => {
         const pkg = JSON.parse(content);
         pkg.proxy = 'http://localhost:3001';
         return JSON.stringify(pkg, null, 2);
-    });
+    })
+        .copy('react/env.development', '.env.development')
+        .render('react/env', '.env', { path: outputPath });
 }
 exports.connectReact = connectReact;

package/lib/generate/generators/rest-api/create-rest-api.js

@@ -12,7 +12,7 @@ function createRestApi({ name, register, auth }) {
     auth = auth || false;
     const fs = new file_system_1.FileSystem();
     if (fs.projectHasDependency('mongodb')) {
-        throw new file_system_1.ClientError('"foal generate|g rest-api <name>" cannot be used in a MongoDB project.');
+        throw new file_system_1.ClientError('"npx foal generate|g rest-api <name>" cannot be used in a MongoDB project.');
     }
     if (fs.exists('src/app/entities') && fs.exists('src/app/controllers')) {
         fs.cd('src/app');

package/lib/generate/templates/app/package.json

@@ -5,18 +5,18 @@
   "license": "MIT",
   "repository": {},
   "scripts": {
-    "build": "foal rmdir build && tsc -p tsconfig.app.json",
+    "build": "npx foal rmdir build && tsc -p tsconfig.app.json",
     "start": "node ./build/index.js",
     "dev": "npm run build && concurrently -r \"tsc -p tsconfig.app.json -w\" \"supervisor -w ./build,./config -e js,json,yml --no-restart-on error ./build/index.js\"",
-    "build:test": "foal rmdir build && tsc -p tsconfig.test.json",
+    "build:test": "npx foal rmdir build && tsc -p tsconfig.test.json",
     "start:test": "mocha --file ./build/test.js \"./build/**/*.spec.js\"",
     "test": "npm run build:test && concurrently -r \"tsc -p tsconfig.test.json -w\" \"mocha --file ./build/test.js -w \\\"./build/**/*.spec.js\\\"\"",
-    "build:e2e": "foal rmdir build && tsc -p tsconfig.e2e.json",
+    "build:e2e": "npx foal rmdir build && tsc -p tsconfig.e2e.json",
     "start:e2e": "mocha --timeout 4000 --file ./build/e2e.js \"./build/e2e/**/*.js\"",
     "e2e": "npm run build:e2e && concurrently -r \"tsc -p tsconfig.e2e.json -w\" \"mocha --file ./build/e2e.js -w \\\"./build/e2e/**/*.js\\\"\"",
     "lint": "eslint --ext ts src",
     "lint:fix": "eslint --ext ts --fix src",
-    "makemigrations": "foal rmdir build && tsc -p tsconfig.app.json && npx typeorm migration:generate src/migrations/migration -d build/db -p && tsc -p tsconfig.app.json",
+    "makemigrations": "npx foal rmdir build && tsc -p tsconfig.app.json && npx typeorm migration:generate src/migrations/migration -d build/db -p && tsc -p tsconfig.app.json",
     "migrations": "npx typeorm migration:run -d build/db",
     "revertmigration": "npx typeorm migration:revert -d build/db"
   },
@@ -32,10 +32,10 @@
   },
   "devDependencies": {
     "@foal/cli": "^4.0.0",
-    "@types/mocha": "10.0.6",
+    "@types/mocha": "10.0.7",
     "@types/node": "18.18.6",
     "concurrently": "~8.2.2",
-    "mocha": "~10.4.0",
+    "mocha": "~10.7.0",
     "supertest": "~7.0.0",
     "supervisor": "~0.12.0",
     "eslint": "~8.48.0",

package/lib/generate/templates/app/package.mongodb.json

@@ -5,13 +5,13 @@
   "license": "MIT",
   "repository": {},
   "scripts": {
-    "build": "foal rmdir build && tsc -p tsconfig.app.json",
+    "build": "npx foal rmdir build && tsc -p tsconfig.app.json",
     "start": "node ./build/index.js",
     "dev": "npm run build && concurrently -r \"tsc -p tsconfig.app.json -w\" \"supervisor -w ./build,./config -e js,json,yml --no-restart-on error ./build/index.js\"",
-    "build:test": "foal rmdir build && tsc -p tsconfig.test.json",
+    "build:test": "npx foal rmdir build && tsc -p tsconfig.test.json",
     "start:test": "mocha --file ./build/test.js \"./build/**/*.spec.js\"",
     "test": "npm run build:test && concurrently -r \"tsc -p tsconfig.test.json -w\" \"mocha --file ./build/test.js -w \\\"./build/**/*.spec.js\\\"\"",
-    "build:e2e": "foal rmdir build && tsc -p tsconfig.e2e.json",
+    "build:e2e": "npx foal rmdir build && tsc -p tsconfig.e2e.json",
     "start:e2e": "mocha --timeout 4000 --file ./build/e2e.js \"./build/e2e/**/*.js\"",
     "e2e": "npm run build:e2e && concurrently -r \"tsc -p tsconfig.e2e.json -w\" \"mocha --file ./build/e2e.js -w \\\"./build/e2e/**/*.js\\\"\"",
     "lint": "eslint --ext ts src",
@@ -22,16 +22,16 @@
   },
   "dependencies": {
     "@foal/core": "^4.0.0",
-    "mongodb": "~5.8.1",
+    "mongodb": "~5.9.2",
     "source-map-support": "~0.5.21",
     "typeorm": "0.3.17"
   },
   "devDependencies": {
     "@foal/cli": "^4.0.0",
-    "@types/mocha": "10.0.6",
+    "@types/mocha": "10.0.7",
     "@types/node": "18.18.6",
     "concurrently": "~8.2.2",
-    "mocha": "~10.4.0",
+    "mocha": "~10.7.0",
     "supertest": "~7.0.0",
     "supervisor": "~0.12.0",
     "eslint": "~8.48.0",

package/lib/generate/templates/app/public/index.html

@@ -10,40 +10,31 @@
       height: 100%
     }
     body {
-      margin: 0;
-      text-align: center;
-      font-family: Arial;
-      background-color: #282c34;
+      background-size: cover;
+      background-repeat: no-repeat;
+      background-image: url("data:image/svg+xml,%3Csvg%20id%3D%22visual%22%20viewBox%3D%220%200%20900%20600%22%20width%3D%22900%22%20height%3D%22600%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20version%3D%221.1%22%3E%3Cdefs%3E%3Cfilter%20id%3D%22blur1%22%20x%3D%22-10%25%22%20y%3D%22-10%25%22%20width%3D%22120%25%22%20height%3D%22120%25%22%3E%3CfeFlood%20flood-opacity%3D%220%22%20result%3D%22BackgroundImageFix%22%3E%3C%2FfeFlood%3E%3CfeBlend%20mode%3D%22normal%22%20in%3D%22SourceGraphic%22%20in2%3D%22BackgroundImageFix%22%20result%3D%22shape%22%3E%3C%2FfeBlend%3E%3CfeGaussianBlur%20stdDeviation%3D%22161%22%20result%3D%22effect1_foregroundBlur%22%3E%3C%2FfeGaussianBlur%3E%3C%2Ffilter%3E%3C%2Fdefs%3E%3Crect%20width%3D%22900%22%20height%3D%22600%22%20fill%3D%22%234FACF7%22%3E%3C%2Frect%3E%3Cg%20filter%3D%22url(%23blur1)%22%3E%3Ccircle%20cx%3D%22828%22%20cy%3D%22361%22%20fill%3D%22%230066FF%22%20r%3D%22357%22%3E%3C%2Fcircle%3E%3Ccircle%20cx%3D%22652%22%20cy%3D%22263%22%20fill%3D%22%234FACF7%22%20r%3D%22357%22%3E%3C%2Fcircle%3E%3Ccircle%20cx%3D%22832%22%20cy%3D%226%22%20fill%3D%22%230066FF%22%20r%3D%22357%22%3E%3C%2Fcircle%3E%3Ccircle%20cx%3D%22617%22%20cy%3D%22590%22%20fill%3D%22%230066FF%22%20r%3D%22357%22%3E%3C%2Fcircle%3E%3Ccircle%20cx%3D%223%22%20cy%3D%2218%22%20fill%3D%22%234FACF7%22%20r%3D%22357%22%3E%3C%2Fcircle%3E%3Ccircle%20cx%3D%2290%22%20cy%3D%22295%22%20fill%3D%22%230066FF%22%20r%3D%22357%22%3E%3C%2Fcircle%3E%3C%2Fg%3E%3C%2Fsvg%3E");
     }
-    .wrapper {
-      height: 95%;
+    body {
+      font-family: Arial, sans-serif;
       display: flex;
-      flex-direction: column;
       justify-content: center;
+      align-items: center;
+      height: 100vh;
+      margin: 0;
+      background-color: #f4f4f9;
+      color: white;
     }
     h1 {
-      color: white;
-      font-weight: bold;
-      margin-bottom: 40px;
-      letter-spacing: 2px;
+      font-size: 2.5rem;
+      margin-bottom: 0.5rem;
     }
-    a {
-      color: #4B89EC;
-      letter-spacing: 1px;
-      font-size: 1.3rem;
-      font-weight: bold;
+    p {
+      font-size: 1.2rem;
+      color: rgb(230, 238, 252);
     }
   </style>
 </head>
 <body>
-  <div class="wrapper">
-    <div>
-      <img src="logo.png" alt="FoalTS logo">
-    </div>
-    <h1>Welcome on board ✨</h1>
-    <div>
-      <a href="https://foalts.org/docs/tutorials/simple-todo-list/1-installation">Learn FoalTS</a>
-    </div> 
-  </div>
+  <h1>Your app is running!</h1>
 </body>
 </html>

package/lib/generate/templates/app/src/index.ts

@@ -1,7 +1,7 @@
 import 'source-map-support/register';
 
 // 3p
-import { Config, createApp, displayServerURL } from '@foal/core';
+import { Config, createApp, Logger, ServiceManager } from '@foal/core';
 
 // App
 import { AppController } from './app/app.controller';
@@ -10,10 +10,13 @@ import { dataSource } from './db';
 async function main() {
   await dataSource.initialize();
 
-  const app = await createApp(AppController);
+  const serviceManager = new ServiceManager();
+  const logger = serviceManager.get(Logger);
+
+  const app = await createApp(AppController, { serviceManager });
 
   const port = Config.get('port', 'number', 3001);
-  app.listen(port, () => displayServerURL(port));
+  app.listen(port, () => logger.info(`Listening on port ${port}...`));
 }
 
 main()

package/lib/generate/templates/react/env

@@ -0,0 +1 @@
+BUILD_PATH='/* path */'

package/lib/generate/templates/react/env.development

@@ -0,0 +1,3 @@
+# Proxify requests to the development server.
+# See https://github.com/facebook/create-react-app/issues/12304
+DANGEROUSLY_DISABLE_HOST_CHECK=true

package/lib/run-script/run-script.js

@@ -16,7 +16,7 @@ async function runScript({ name }, argv, log = console.log) {
                 + ' Please build your script by running the command "npm run build" or using "npm run dev".');
         }
         else {
-            log(`The script "${name}" does not exist. You can create it by running the command "foal g script ${name}".`);
+            log(`The script "${name}" does not exist. You can create it by running the command "npx foal g script ${name}".`);
         }
         return;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@foal/cli",
-  "version": "4.4.0",
+  "version": "4.5.0",
   "description": "CLI tool for FoalTS",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -57,21 +57,21 @@
     "bin/"
   ],
   "dependencies": {
-    "ajv": "~8.12.0",
+    "ajv": "~8.17.0",
     "ajv-formats": "~2.1.1",
     "cli-spinner": "~0.2.10",
     "colors": "1.4.0",
-    "commander": "~12.0.0",
+    "commander": "~12.1.0",
     "node-fetch": "~2.7.0"
   },
   "devDependencies": {
-    "@types/mocha": "10.0.6",
+    "@types/mocha": "10.0.7",
     "@types/node": "18.18.6",
     "copyfiles": "~2.4.1",
-    "mocha": "~10.4.0",
+    "mocha": "~10.7.0",
     "rimraf": "~5.0.5",
     "ts-node": "~10.9.2",
     "typescript": "~4.9.5"
   },
-  "gitHead": "7940702713d1c4fbd4bf12747deadafcf1daa3b9"
+  "gitHead": "c99451588302b9ea8837b6d4a1d9e376712b30e8"
 }