@solidstarters/create-solid-app 1.2.40 → 1.2.42

package/helpers.js

@@ -194,6 +194,7 @@ export function getBackendEnvConfig(answers) {
 export function getFrontendEnvJson(answers) {
   const envConfig = {
     "General": {
+      PORT: answers.solidUiPort,
       API_URL: `http://localhost:${answers.solidApiPort}`, //FIXME duplicate of NEXT_PUBLIC_BACKEND_API_URL. need to cleanup
       NEXTAUTH_URL: `http://localhost:${answers.solidUiPort}`,
       NEXT_PUBLIC_BACKEND_API_URL: `http://localhost:${answers.solidApiPort}`,

package/package.json

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

package/templates/nest-template/src/app-default-database.module.ts

@@ -27,36 +27,11 @@ const coreEntities = getEntitiesFromExports(SolidCoreModuleExports);
 
                 const entities = [
                     ...coreEntities,
-                    // ...coreModules.map(module =>
-                    //     join(__dirname, `./${module}/entities/*.entity.{ts,js}`)
-                    // ),
-                    // join(__dirname, './app-builder/entities/*.entity.{ts,js}'),
-                    // join(__dirname, './common/entities/*.entity.{ts,js}'),
-                    // join(__dirname, './iam/entities/*.entity.{ts,js}'),
-                    // join(__dirname, './queues/entities/*.entity.{ts,js}'),
                     ...dynamicModules.map(module =>
                         join(__dirname, `./${module}/entities/*.entity.{ts,js}`)
                     ),
                 ];
 
-                // DO NOT REMOVE BELOW COMMENT
-                // We no longer register subscribers on the TypeORM datasource. 
-                // instead we register them directly as NestJS providers, and they register themselves as subscribers on the data source during service instantiation in their respective constructor. 
-                // check ModelSubscriber for a reference. 
-                // Steps are    
-                // 1. Create the subscriber like a NestJS injectable service. 
-                // 2. Register the subscriber in the respective module like you would any other NestJS service. 
-                // 3. Make sure to not provide the subscribers array below. 
-                // const subscribers = [
-                //     join(__dirname, './app-builder/subscribers/*.subscriber.{ts,js}'),
-                //     join(__dirname, './common/subscribers/*.subscriber.{ts,js}'),
-                //     join(__dirname, './iam/subscribers/*.subscriber.{ts,js}'),
-                //     join(__dirname, './queues/subscribers/*.subscriber.{ts,js}'),
-                //     ...enabledModules.map(module =>
-                //         join(__dirname, `./${module}/subscribers/*.subscriber.{ts,js}`)
-                //     ),
-                // ];
-
                 return {
                     // type of our database. 
                     type: 'postgres',
@@ -66,15 +41,22 @@ const coreEntities = getEntitiesFromExports(SolidCoreModuleExports);
                     password: process.env.DEFAULT_DATABASE_PASSWORD,
                     // name of our database
                     database: process.env.DEFAULT_DATABASE_NAME,
-                    // models will be loaded automatically
-                    // autoLoadEntities: true,
                     entities: entities,
                     // your entities will be synced with the database (recommended: disable in prod)
                     synchronize: parseBooleanEnv('DEFAULT_DATABASE_SYNCHRONIZE'),
                     logging: parseBooleanEnv('DEFAULT_DATABASE_LOGGING'),
                     logger: parseBooleanEnv('DEFAULT_DATABASE_LOGGING') ? new WinstonTypeORMLogger(logger) : undefined,  // Pass in the custom WinstonLogger
                     namingStrategy: new SnakeNamingStrategy(),
-                    // subscribers: subscribers
+                    maxQueryExecutionTime: 500,
+                    extra: {
+                        max: Number(process.env.DEFAULT_DATABASE_POOL_MAX ?? 20),
+                        connectionTimeoutMillis: 30000,
+                        idleTimeoutMillis: 30000,
+                        statement_timeout: 15000,
+                        idle_in_transaction_session_timeout: 60000,
+                    },
+                    retryAttempts: Number(process.env.DEFAULT_DATABASE_RETRY_ATTEMPTS ?? 0),
+                    retryDelay: Number(process.env.DEFAULT_DATABASE_RETRY_DELAY_MS ?? 0),
                 }
             },
             inject: [WINSTON_MODULE_PROVIDER]

package/templates/nest-template/src/app.module.ts

@@ -1,14 +1,11 @@
-import * as Joi from '@hapi/joi';
 import { DynamicModule, Module } from '@nestjs/common';
 import { ConfigModule } from '@nestjs/config';
-import { SolidCoreModule } from '@solidstarters/solid-core';
-import appConfig from './app.config';
-import { AppService } from './app.service';
 import { EventEmitterModule } from '@nestjs/event-emitter';
-import { DefaultDBModule } from './app-default-database.module';
+import { SolidCoreModule, WinstonLoggerConfig } from '@solidstarters/solid-core';
 import { WinstonModule } from 'nest-winston';
-import { WinstonLoggerConfig } from '@solidstarters/solid-core';
 import { ClsModule } from 'nestjs-cls';
+import { DefaultDBModule } from './app-default-database.module';
+import { AppService } from './app.service';
 
 
 @Module({
@@ -18,20 +15,6 @@ import { ClsModule } from 'nestjs-cls';
 
     ConfigModule.forRoot({
       isGlobal: true,
-      // Here we are specifying the path of the environment file.
-      // If not specified then it assumes a file named .env
-      // envFilePath: '.environment'
-
-      // This we do in live environments, where these variables should ideally come 
-      // from the OS provided environment.
-      // ignoreEnvFile: true
-
-      validationSchema: Joi.object({
-        DEFAULT_DATABASE_HOST: Joi.required(),
-        DEFAULT_DATABASE_PORT: Joi.number().default(5432),
-      }),
-
-      load: [appConfig],
     }),
 
     DefaultDBModule,

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

@@ -49,8 +49,7 @@ async function bootstrap() {
   app.useLogger(app.get(WINSTON_MODULE_NEST_PROVIDER));
 
   // Making the port dynamic
-  const configService = app.get(ConfigService);
-  const port = configService.get<number>('PORT') || 3000;
+  const port = process.env.PORT || 3000;
 
   app.setGlobalPrefix('api');
   // Middleware to parse deeply nested queries
@@ -109,7 +108,7 @@ async function bootstrap() {
     new WrapResponseInterceptor(),
   );
 
-  app.enableCors(buildDefaultCorsOptions(configService));
+  app.enableCors(buildDefaultCorsOptions());
 
   // https://github.com/typeorm/typeorm/issues/8583
   const types = require('pg').types;

package/templates/next-template/next-solidx-run.js

@@ -0,0 +1,18 @@
+#!/usr/bin/env node
+const { spawn } = require("child_process");
+const path = require("path");
+
+// Load .env (and .env.local if you use it)
+require("dotenv").config({ path: path.resolve(process.cwd(), ".env") });
+
+const port = process.env.PORT || "3001";
+
+const mode = process.argv[2]; // "dev" or "start"
+const args =
+    mode === "dev"
+        ? ["dev", "-p", port]
+        : ["start", "-p", port];
+
+const child = spawn("next", args, { stdio: "inherit", shell: true });
+
+child.on("exit", (code) => process.exit(code ?? 0));

package/templates/next-template/next.config.js

@@ -26,6 +26,11 @@ const nextConfig = {
   images: {
     remotePatterns: getRemotePatterns(),
   },
+  productionBrowserSourceMaps: true,
+  transpilePackages: ['@solidstarters/solid-core-ui'],
+  experimental: {
+    externalDir: true,
+  },
 };
 
 function getRemotePatterns(){

package/templates/next-template/package.json

@@ -4,11 +4,11 @@
   "private": true,
   "scripts": {
     "postinstall": "copyfiles -u 5 \"node_modules/@solidstarters/solid-core-ui/dist/resources/themes/**/*\" public",
-    "dev": "next dev",
     "build": "next build",
-    "start": "next start",
     "lint": "next lint",
     "seeder": "tsc seeder/seeder.ts --outDir .temp && node .temp/seeder/seeder.js && rm -rf .temp",
+    "dev": "node next-solidx-run.js dev",
+    "start": "node next-solidx-run.js start",   
     "solidx:dev": "rm -rf .next && npm run dev"
   },
   "dependencies": {
@@ -25,6 +25,7 @@
     "chart.js": "^4.4.3",
     "cloudinary": "^1.40.0",
     "codemirror": "^6.0.1",
+    "dotenv": "^17.2.3",
     "formik": "^2.4.6",
     "html2canvas": "^1.4.1",
     "jspdf": "^2.5.1",

package/templates/nest-template/src/app.config.ts

@@ -1,7 +0,0 @@
-export default () => ({
-    environment: process.env.NODE_ENV || 'development',
-    database: {
-        host: process.env.DEFAULT_DATABASE_HOST,
-        port: parseInt(process.env.DEFAULT_DATABASE_PORT, 10) || 5432
-    }
-});