@solidstarters/create-solid-app 1.2.12 → 1.2.13

package/helpers.js

@@ -11,13 +11,13 @@ import { fileURLToPath } from 'url';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 
-export async function copyAndInstallTemplate(source, target) {
+export async function copyAndInstallTemplate(source, target, showLogs) {
   try {
     // Copy the source folder to the target folder
     await copyTemplate(source, target); 
 
     // Run `npm install` in the target directory
-    return await installTemplate(target);
+    return await installTemplate(target, showLogs);
     // console.log(chalk.green(`Dependencies installed in ${target}`));
   } catch (error) {
     console.error(chalk.red('Error in copyAndInstallTemplate:', error));
@@ -25,8 +25,8 @@ export async function copyAndInstallTemplate(source, target) {
   }
 }
 
-async function installTemplate(target) {
-  const output = await execa('npm', ['install'], { stdio: 'inherit', cwd: target });
+async function installTemplate(target, showLogs) {
+  const output = await execa('npm', ['install'], { stdio: showLogs ? "inherit" : "ignore", cwd: target });
   return output;
 }
 
@@ -185,20 +185,19 @@ function generateJwtSecret() {
   return crypto.randomBytes(64).toString('hex'); // 64 bytes => 128 characters in hexadecimal
 };
 
-export async function installSolidAsGlobalBinary(cwd) {
+export async function installSolidAsGlobalBinary(cwd, showLogs) {
   try {
-    await execa('npm', ['run', 'build'], { stdio: 'inherit', cwd });
+    await execa('npm', ['run', 'build'], { stdio: showLogs ? "inherit" : "ignore", cwd });
 
     const nodeVersion = process.version;
     const homeDir = os.homedir();
     const binaryPath = path.join(homeDir, `.nvm/versions/node/${nodeVersion}/bin/solid`);
-
     try {
       await execa('rm', [binaryPath], { stdio: 'inherit' });
     } catch (error) {
     }
 
-    await execa('npm', ['i', '-g'], { stdio: 'inherit', cwd });
+    await execa('npm', ['i', '-g'], { stdio: showLogs ? "inherit" : "ignore", cwd });
   } catch (error) {
     console.error(chalk.red('Error during installation:', error.message));
     process.exit(1);

package/index.js

@@ -11,6 +11,10 @@ import _ from 'lodash';
 
 async function main() {
     try {
+        // Check if --debug=true or --verbose=true exists in args
+        const args = process.argv;
+        const showLogs = args.some(arg => arg.includes("--verbose"));
+
         console.log(chalk.cyan("Hello, Let's setup your Solid project!"));
 
         // Questions for the user to setup backend
@@ -30,13 +34,13 @@ async function main() {
         const templatesPath = getSourceFolderPath('templates');
         // copyTemplate(path.join(templatesPath, 'dot.templates'), targetPath);
 
-        await copyAndInstallTemplate(path.join(templatesPath, 'nest-template'), path.join(targetPath, 'solid-api'));
+        await copyAndInstallTemplate(path.join(templatesPath, 'nest-template'), path.join(targetPath, 'solid-api'), showLogs);
         
         console.log(prettyOutput('Step 2','Installing solid binary globally'));
-        const ignore = await installSolidAsGlobalBinary(path.join(targetPath, 'solid-api'));
+        const ignore = await installSolidAsGlobalBinary(path.join(targetPath, 'solid-api'), showLogs);
 
         console.log(prettyOutput('Step 3',`Setting up boilerplate for the frontend`));
-        await copyAndInstallTemplate(path.join(templatesPath, 'next-template'), path.join(targetPath, 'solid-ui'));
+        await copyAndInstallTemplate(path.join(templatesPath, 'next-template'), path.join(targetPath, 'solid-ui'), showLogs);
 
         // Step 3: Update project package json details
         updatePackageName(targetPath, 'solid-ui', `@${projectName}/solid-ui`);
@@ -57,8 +61,20 @@ async function main() {
         console.log(chalk.cyan(`\nNext steps:`));
         console.log(chalk.cyan(`Run the api:`));
         console.log(prettyOutput('',`cd ${projectName}/solid-api`));
-        console.log(prettyOutput('','solid seed -s ModuleMetadataSeederService','This will seed the database with the required metadata'));
-        console.log(prettyOutput('','npm run start',`This will start the backend server @http://localhost:${answers.solidApiPort}`));
+        console.log(prettyOutput('','solid seed','This will seed the database with the required metadata'));
+
+        // Development mode (with watch )
+        console.log(prettyOutput('', 'npm run start:dev', `Starts the backend in development mode with live reload on @http://localhost:${answers.solidApiPort}`));
+
+        // Development mode (debug)
+        console.log(prettyOutput('', 'npm run start:debug', `Starts the backend in development mode with debugging on @http://localhost:${answers.solidApiPort}`));
+
+        // Production mode
+        console.log(prettyOutput('', 'npm run start', `Starts the backend in production mode on @http://localhost:${answers.solidApiPort}`));
+
+        console.log(prettyOutput('',`api documentation is available on @http://localhost:${answers.solidApiPort}/docs`));
+
+        // console.log(prettyOutput('','npm run start',`This will start the backend server @http://localhost:${answers.solidApiPort}`));
         console.log(chalk.cyan(`\nRun the frontend:`));
         console.log(prettyOutput('',`cd ${projectName}/solid-ui`));
         console.log(prettyOutput('','npm run dev',`This will start the frontend server @http://localhost:${answers.solidUiPort}`));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidstarters/create-solid-app",
-  "version": "1.2.12",
+  "version": "1.2.13",
   "main": "index.js",
   "private": false,
   "publishConfig": {

package/templates/nest-template/refresh.bat

@@ -0,0 +1,15 @@
+@echo off
+echo Installing dependencies...
+call npm i
+
+echo Building the project...
+call npm run build
+
+echo Removing Solid binary...
+del "C:\Users\Lenovo\AppData\Roaming\npm\solid" 2>nul
+
+echo Installing global dependencies...
+call npm i -g
+
+echo Refresh complete!
+pause

package/templates/nest-template/src/main-cli.ts

@@ -2,18 +2,28 @@
 
 import { CommandFactory } from "nest-commander";
 import { AppModule } from "./app.module";
-import { INestApplication, INestApplicationContext } from "@nestjs/common";
+import { INestApplication, INestApplicationContext, Logger } from "@nestjs/common";
 import { setTimeout } from "timers/promises";
 import { NestFactory } from "@nestjs/core";
+import { existsSync } from "fs";
+import { resolve } from "path";
+
+const logger = new Logger("Bootstrap");
 
 async function bootstrap() {
+    const args = process?.argv;
+    // validate project existence
+    validateProjectRootPath();
+    const showLogs = args.some(arg =>arg.includes("--verbose"));
+    // Define log levels based on the flag
+    const logLevels = showLogs ? ['debug', 'error', 'fatal', 'log', 'verbose', 'warn'] : ['fatal', 'error', 'log'];
 
     const appModule = await AppModule.forRoot();
     // const app = await NestFactory.create(appModule);
 
     // Create an instance of the application, capture the application context so we can inject it into a service in itself.
     // @ts-ignore
-    const app = await CommandFactory.createWithoutRunning(appModule, ['debug', 'error', 'fatal', 'log', 'verbose', 'warn']);
+    const app = await CommandFactory.createWithoutRunning(appModule, logLevels);
     // const app = await CommandFactory.createWithoutRunning(AppModule, ['debug', 'error', 'fatal', 'log', 'verbose', 'warn']);
     // const app = await CommandFactory.createWithoutRunning(AppModule, ['error', 'fatal']);
 
@@ -35,4 +45,13 @@ async function bootstrap() {
 //   return parseInt(val)
 // });
 
-bootstrap();
+bootstrap();
+
+// Check if the current directory is a valid Solid API project
+function validateProjectRootPath() {
+    const packageJsonPath = resolve(process.cwd(), "package.json");
+    if (!existsSync(packageJsonPath)) {
+        logger.log("Does not seem to be a valid solid-api project.");
+        process.exit(1);
+    }
+}

package/templates/next-template/app/api/auth/[...nextauth]/route.ts

@@ -173,9 +173,11 @@ async function auth(req: NextRequest, res: any) {
     ],
     callbacks: {
       jwt: async ({ token, user }) => {
-        if (Date.now() >= (token.accessTokenExpires as number)) {
-          return refreshAccessToken(token); // Call the refresh token function
+        const bufferTime = 60000; // 1 minute buffer before expiry
+        if (Date.now() >= (token.accessTokenExpires as number - bufferTime)) {
+          return await refreshAccessToken(token); // Call the refresh token function
         }
+        
 
         // If there is no user (first time login or session), we return the user data
         if (user) {

package/templates/next-template/app/globals.css

@@ -2249,6 +2249,20 @@ li.header-li-px {
   flex: none;
 }
 
+@keyframes shake {
+  0% { transform: translateX(0); }
+  20% { transform: translateX(-5px); }
+  40% { transform: translateX(5px); }
+  60% { transform: translateX(-5px); }
+  80% { transform: translateX(5px); }
+  100% { transform: translateX(0); }
+}
+
+.tab-error {
+  animation: shake 0.8s ease-in-out;
+  border-bottom: 3px solid red;
+  font-weight: bold;
+}
 .p-button.p-button-icon-only.custom-add-button {
   padding: 4px !important;
   width: 2rem;