create-jwn-js 1.0.7 → 1.0.10

package/index.js

@@ -168,7 +168,9 @@ async function init() {
     }
 
     // connect.json
-    copy(path.join(templateDir,"connect-template.json"), path.join(templateDir,"connect.json"));
+    const connect = require(path.join(templateDir, `connect-template.json`));
+    delete(connect.db);
+    write('connect.json', JSON.stringify(connect, null, 2));
 
     // package.json
     const pkg = require(path.join(templateDir, `package.json`))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-jwn-js",
-  "version": "1.0.7",
+  "version": "1.0.10",
   "license": "PRIVATE",
   "author": "Webigorkiev",
   "bin": {

package/template-vite-node-ts/src/backend/server/helpers/createMariadb.ts

@@ -5,7 +5,7 @@ import {Query} from "buildmsql";
  * @param config
  */
 export const createMariadb = (config: Record<string, any>) => {
-    if(config.db.home) {
+    if(config.db?.home) {
         const home = new Query({debug: process.env.NODE_ENV === "production" ? 0 : 1});
         const homePool = home.createPool(config.db.home);
 

package/template-vite-node-ts/vite.config.ts

@@ -58,8 +58,8 @@ const node = (opt: Options): Plugin => {
             }
         },
         async closeBundle() {
-            await memcachedClient.close();
-            await homePool.end();
+            memcachedClient && await memcachedClient.close();
+            homePool && await homePool.end();
             process.server.app && await process.server.app.close();
         }
     }

package/template-vite-vue3-ts/connect-template.json

@@ -2,10 +2,8 @@
     "server": {
         "development": {
             "mode": "development",
-            "vite": {
-                "port": 3000
-            },
-            "port": 3001,
+            "https": false,
+            "port": 80,
             "host": "localhost"
         },
         "production": {

package/template-vite-vue3-ts/src/backend/server/helpers/createConfigServer.ts

@@ -7,10 +7,13 @@ const args = margv();
  */
 export const createConfigServer = (config: Record<string, any>) => {
     const configServer = process.env.NODE_ENV === "production" ? config.server.production : config.server.development;
-    configServer.port = +args.port + 1 || configServer.port;
+
+    configServer.https =  args.https ?? configServer.https;
+    configServer.protocol =  configServer.https ? "https" : "http";
+    configServer.port = args.port || configServer.port;
+    configServer.webPort = process.env.NODE_ENV === "production" ? configServer.port : 3001;
     configServer.host = args.host || configServer.host;
-    configServer.proxy =  `http://${configServer.host}:${configServer.port}`;
-    configServer.vitePort = config.server.development.vite.port;
+    configServer.proxy = `http://${configServer.host}:${configServer.webPort}`;
 
     return configServer;
 }

package/template-vite-vue3-ts/src/backend/server/helpers/createMariadb.ts

@@ -5,7 +5,7 @@ import {Query} from "buildmsql";
  * @param config
  */
 export const createMariadb = (config: Record<string, any>) => {
-    if(config.db.home) {
+    if(config.db?.home) {
         const home = new Query({debug: process.env.NODE_ENV === "production" ? 0 : 1});
         const homePool = home.createPool(config.db.home);
 

package/template-vite-vue3-ts/src/backend/server/index.ts

@@ -34,6 +34,7 @@ const ssrOptions:OptionsSsr  = {
 
 process.server.app = new Server({
     ...configServer,
+    port: configServer.webPort,
     routes: [
         {
             method: "any",

package/template-vite-vue3-ts/src/scripts/jest.global.setup.ts

@@ -6,18 +6,17 @@ declare global {
     var server: ViteDevServer;
 }
 
+const start = async(resolve: CallableFunction) => {
+    try {
+        await fetch(apiUrl);
+        resolve();
+    } catch(e: any) {
+        await start(resolve);
+    }
+};
+
 export default async(config: Record<string, any>) => {
     global.server = await createServer();
     await global.server.listen();
-    await new Promise(resolve => {
-        const interval = setInterval(async() => {
-            try {
-                await fetch(apiUrl);
-                clearInterval(interval);
-                resolve(true);
-            } catch(e) {}
-
-        }, 50);
-    });
-
+    await new Promise(resolve => start(resolve));
 }

package/template-vite-vue3-ts/src/scripts/jest.global.teardown.ts

@@ -5,6 +5,5 @@ declare global {
 }
 
 export default async() => {
-    await new Promise(resolve => setTimeout(resolve, 100));
     await global.server.close();
 }

package/template-vite-vue3-ts/src/scripts/jest.setup.ts

@@ -1,7 +1,9 @@
 import crossFetch from "cross-fetch";
-import connect from "../../connect.json"
+import config from "../../connect.json";
+import {createConfigServer} from "../../src/backend/server/helpers/createConfigServer";
+const cnf = createConfigServer(config);
 
-const apiUrl = `http://${connect.server.development.host}:${connect.server.development.vite.port}`;
+const apiUrl = `${cnf.protocol}://${cnf.host}:${cnf.port}`;
 const defaultHeaders = {
     headers: {
         "user-agent": "fetch-tests",

package/template-vite-vue3-ts/vite.config.ts

@@ -34,9 +34,9 @@ export default defineConfig({
     },
     server: {
         host: cnf.host,
-        port: config.server.development.vite.port,
+        port: cnf.port,
         proxy: {
-            "/web": `http://${cnf.host}:${cnf.port}`
+            "/web": cnf.proxy
         },
     },
 
@@ -68,13 +68,15 @@ export default defineConfig({
             name: "close",
             async configResolved(config:ResolvedConfig) {
                 if(config.command !== "build") {
-                    const interval = setInterval(async() => {
+                    const start = async(resolve: CallableFunction) => {
                         try {
-                            await fetch(`http://${cnf.host}:${cnf.vitePort}`);
-                            clearInterval(interval);
-                        } catch(e) {}
-
-                    }, 50);
+                            await fetch(`${cnf.protocol}://${cnf.host}:${cnf.port}`);
+                            resolve();
+                        } catch(e: any) {
+                            await start(resolve);
+                        }
+                    };
+                    new Promise(resolve => start(resolve));
                 }
             },
             async closeBundle() {