create-jwn-js 1.1.4 → 1.2.1

package/index.mjs

@@ -40,6 +40,11 @@ const FRAMEWORKS = [
                 name: 'vite-vue3-mts',
                 display: 'TypeScript',
                 color: blue
+            },
+            {
+                name: 'vite-vue3-pinia-mts',
+                display: 'TypeScript',
+                color: blue
             }
         ]
     },

package/package.json

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

package/template-lambda-http-api-mts/package.json

@@ -8,10 +8,10 @@
   "scripts": {
     "dev": "vite",
     "serve": "vite",
-    "build": "vite build && cd ./dist && yarn",
+    "build": "vite build && cd ./dist && npm install --cpu=arm64 --os=linux --libc=glibc --omit=dev",
     "test": "vitest run",
     "test:production": "vitest run -c vitest.config.production.mts",
-    "deploy": "yarn build && cd dist && zip -r ../dist.zip ."
+    "deploy": "yarn build && rm -f dist.zip && cd dist && zip -r ../dist.zip ."
   },
   "devDependencies": {
     "@types/aws-lambda": "8",

package/template-lambda-rest-api-mts/package.json

@@ -8,10 +8,10 @@
   "scripts": {
     "dev": "vite",
     "serve": "vite",
-    "build": "vite build && cd ./dist && yarn",
+    "build": "vite build && cd ./dist && npm install --cpu=arm64 --os=linux --libc=glibc --omit=dev",
     "test": "vitest run",
     "test:production": "vitest run -c vitest.config.production.mts",
-    "deploy": "yarn build && cd dist && zip -r ../dist.zip ."
+    "deploy": "yarn build && rm -f dist.zip && cd dist && zip -r ../dist.zip ."
   },
   "devDependencies": {
     "@types/aws-lambda": "8",

package/template-vite-node-mts/src/scripts/test.setup.mts

@@ -1,6 +1,7 @@
-import {createConfigServer} from "@/backend/server/helpers/createConfigServer";
-import type {server} from "@/backend/server/types";
-import {readJson5ConfigsSync} from "@/backend/server/helpers/readJson5ConfigsSync";
+import {createConfigServer} from "@/backend/server/helpers/createConfigServer.mjs";
+import type {server} from "@/backend/server/types.mjs";
+import {readJson5ConfigsSync} from "@/backend/server/helpers/readJson5ConfigsSync.mjs";
+import {omit} from "easy-ash";
 const config = readJson5ConfigsSync<server.Config>(["./connect.json5", "./common.json5"]);
 const cnf = createConfigServer(config, process.env.TEST_MODE_APP as "test");
 const apiUrl = `${cnf.protocol}://${cnf.host}:${cnf.port}`;

package/template-vite-vue3-mts/.nvmrc

@@ -0,0 +1 @@
+v20.19.3

package/template-vite-vue3-mts/.ws-context

@@ -0,0 +1,9 @@
+{
+  "framework": "vue",
+  "src/**/*.mts": {
+    "framework": null
+  },
+  "src/frontend/**/*.mts": {
+    "framework": "vue"
+  }
+}

package/template-vite-vue3-mts/CHANGELOG.md

@@ -0,0 +1,3 @@
+[1.0.1]
+
+* Initial commit

package/template-vite-vue3-mts/{cron.mjs → cron.js}

@@ -1,27 +1,26 @@
 const {appendFileSync} = require("fs");
 const {performance} = require("perf_hooks");
 const margv = require("margv");
-const fetch = require("cross-fetch");
 const chalk = require("chalk");
 const fs = require("fs");
 const path = require("path");
-
-const logFile = "/var/www/tehnoskarb/logs/cron/skarb.works.log";
+const JSON5 = require("json5");
+const logFile = "/var/www/test.log"; // path to log file
 const two = (value) => ("0" + value).slice(-2);
 const toMysqlDatetime = (date) => `${date.getFullYear()}-${two(date.getMonth()+1)}-${two(date.getDate())} ${two(date.getHours())}:${two(date.getMinutes())}:${two(date.getSeconds())}`;
-
 (async() => {
     const start = performance.now();
     const args = margv();
-
     if(args.help) {
         console.log(`// $ cron.js -c=<controller> -s=<subaction> -p={} -m=<method> -h={} --development`);
-
         return;
     }
-
-    const connect = path.resolve(__dirname, './connect.json');
-    const config = JSON.parse(fs.readFileSync(connect, 'utf8'));
+    const connect = path.resolve(__dirname, './connect.json5');
+    const common = path.resolve(__dirname, './common.json5');
+    const config = Object.assign(
+        JSON5.parse(fs.readFileSync(common, 'utf8')),
+        JSON5.parse(fs.readFileSync(connect, 'utf8'))
+    );
     const host = args.development || args.d
         ? `http://${config.server.development.host}:${config.server.development.port}/web`
         : `http://${config.server.production.host}:${config.server.production.port}/web`;
@@ -32,18 +31,13 @@ const toMysqlDatetime = (date) => `${date.getFullYear()}-${two(date.getMonth()+1
     const headers = args.headers || args.h || {};
     const adminToken = config.cron["admin-token"];
     const apiToken = config.cron["api-token"];
-
     console.log(chalk.green(host));
-
     if(!controller) {
         console.log(chalk.red("required --controller=<controller>"));
-
         return;
     }
-
     if(!subaction) {
         console.log(chalk.red("required --subaction=<subaction>"));
-
         return;
     }
 
@@ -57,20 +51,17 @@ const toMysqlDatetime = (date) => `${date.getFullYear()}-${two(date.getMonth()+1
             ...headers
         }
     }
-
     if(method.toLowerCase() === "get") {
         url.search = new URLSearchParams(Object.assign(params, {controller, subaction, token: apiToken})).toString();
     } else {
         options.body = JSON.stringify(Object.assign(params, {controller, subaction, token: apiToken}));
     }
-
     console.log(chalk.green(`send params to ${controller} ${subaction}`));
     const response = await fetch(url.toString(), options);
     const text = decodeURIComponent(await response.text());
     const time = Math.round(performance.now() - start)/1000;
     const logParams = (JSON.stringify(Object.assign(params, {subaction}))
         .substring(0, 512));
-
     try {
         appendFileSync(
             logFile,
@@ -79,7 +70,6 @@ const toMysqlDatetime = (date) => `${date.getFullYear()}-${two(date.getMonth()+1
     } catch(e) {
         console.log(chalk.red( `No log file ${logFile}`));
     }
-
     if(response.ok) {
         console.log(chalk.green("response ok."));
         console.log(chalk.green(text));

package/template-vite-vue3-mts/package.json

@@ -31,21 +31,22 @@
     "postcss-plugin": "^1.0.0",
     "postcss-scss": "^4.0.9",
     "typescript": "^5.6.3",
-    "vite": "^5.4.10",
+    "vite": "^7.0.4",
     "vite-svg-loader": "^5.1.0",
     "vitepress": "^1.4.1",
-    "vitest": "^2.1.4"
+    "vitest": "^3.2.4"
   },
   "dependencies": {
-    "@jwn-js/common": "^2.2.17",
+    "@jwn-js/common": "^2.3.9",
     "@jwn-js/plugins": "^1.0.16",
     "@primevue/themes": "^4.1.1",
     "@vue/server-renderer": "^3.5.12",
-    "@vuemod/prefetch": "^1.0.10",
+    "@vuemod/prefetch": "^1.1.1",
     "amitt": "^1.0.20",
     "buildmsql": "^1.7.0",
     "chalk": "4",
-    "easy-ash": "^1.1.14",
+    "easy-ash": "^1.1.16",
+    "json5": "^2.2.3",
     "margv": "^1.1.2",
     "memjs": "^1.3.2",
     "primevue": "^4.1.1",

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

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

package/template-vite-vue3-mts/src/backend/server/helpers/createMemcached.mts

@@ -10,6 +10,5 @@ export const createMemcached = () => {
         }
     });
     const memcached =  new Memcached(memcachedClient);
-
     return {memcachedClient, memcached};
 }

package/template-vite-vue3-mts/src/backend/server/helpers/readJson5ConfigsSync.mts

@@ -6,6 +6,5 @@ export const readJson5ConfigsSync = <T extends Record<string, any>>(configs: str
         const filePath = path.resolve(config);
         Object.assign(input, JSON5.parse(fs.readFileSync(filePath).toString()));
     }
-
     return input as T;
 }

package/template-vite-vue3-mts/src/backend/server/helpers/readManifest.mts

@@ -1,16 +1,11 @@
 import {helpers} from "@jwn-js/common";
 
-/**
- * Read ssr manifest
- */
 export const readManifest = () => {
     let manifest = {};
-
     try {
         manifest = helpers.readConfigSync("./dist/client/ssr-manifest.json");
     } catch(e: any) {
         // console.log(e.message);
     }
-
     return manifest;
 }

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

@@ -1,13 +1,13 @@
-import {Server, helpers, Web, Ssr, OptionsWeb, OptionsSsr} from "@jwn-js/common";
+import {Server, helpers, Web, Ssr, type OptionsWeb, type OptionsSsr} from "@jwn-js/common";
 import {createConfigServer} from "./helpers/createConfigServer.mjs";
 import {schema} from "./site-schema.mjs";
 import {webRoutes} from "./web-routes/index.mjs";
 import {createMariadb} from "./helpers/createMariadb.mjs";
 import {createMemcached} from "./helpers/createMemcached.mjs";
 import {readManifest} from "@/backend/server/helpers/readManifest.mjs";
-import entry from "@/frontend/entry-server";
+import entry from "@/frontend/entry-server.mjs";
 import {readJson5ConfigsSync} from "@/backend/server/helpers/readJson5ConfigsSync.mjs";
-import {server} from "@/backend/server/types.mjs";
+import type * as server from "@/backend/server/types.mjs";
 declare var process: any;
 
 const {readConfigSync} = helpers;

package/template-vite-vue3-mts/src/backend/server/site-schema.mts

@@ -1,4 +1,4 @@
-import {Schema} from "@jwn-js/common";
+import type {Schema} from "@jwn-js/common";
 
 export const schema: Schema = {
     actions: [

package/template-vite-vue3-mts/src/backend/server/types.mts

@@ -1,7 +1,5 @@
-import {Config as _Config} from "@jwn-js/common";
+import {type Config as _Config} from "@jwn-js/common";
 
-export namespace server {
-    export interface Config extends _Config {
+export interface Config extends _Config {
 
-    }
-}
+}

package/template-vite-vue3-mts/src/frontend/routes/index.mts

@@ -23,19 +23,11 @@ export default (opt: Record<string, any>) => createRouter({
         },
     ],
     async scrollBehavior(to, from, savedPosition) {
-
-        // Scroll to element
-        if(to.query?.el) {
+        if (to.query?.el) { // Scroll to element
             const el: string = to.query.el as string;
-
-            return {
-                el
-            };
+            return {el};
         }
-
-        // meta scrollToTop
-        if(to.meta.scrollToTop) {
-
+        if (to.meta.scrollToTop) { // meta scrollToTop
             return {left: 0, top: 0};
         }
     }

package/template-vite-vue3-mts/src/frontend/store/fetch.mts

@@ -1,5 +1,4 @@
 import {isBrowser} from "easy-ash";
-import fetch from "cross-fetch";
 import {ApiError} from "@jwn-js/common/ApiError";
 import type {ActionContext} from "vuex";
 

package/template-vite-vue3-mts/src/frontend/views/Index/Index.vue

@@ -7,7 +7,7 @@
 <script lang="ts">
     import {defineComponent} from "vue";
     import {mapState} from "vuex";
-    import {customerPrefetch} from "@/frontend/helpers/customerPrefetch";
+    import {customerPrefetch} from "@/frontend/helpers/customerPrefetch.mts";
 
     export default defineComponent({
         name: "Index",

package/template-vite-vue3-mts/tsconfig.json

@@ -18,15 +18,16 @@
     "experimentalDecorators": true,
     "emitDecoratorMetadata": true,
     "allowImportingTsExtensions": true,
+    "moduleDetection": "force",
+    "isolatedModules": true,
+    "verbatimModuleSyntax": true,
     "lib": [
       "esnext",
       "dom"
     ],
     "types": [
       "vite/client",
-      "@types/jest",
-      "node",
-      "jest-environment-puppeteer"
+      "node"
     ],
     "baseUrl": ".",
     "paths": {
@@ -36,15 +37,13 @@
     }
   },
   "include": [
-    "src/**/*.ts",
     "src/**/*.mts",
-    "src/**/*.d.ts",
-    "src/**/*.d.mts",
-    "src/**/*.tsx",
-    "src/**/*.vue"
+    "src/**/*.spec.mts",
+    "src/**/*.ts",
+    "src/**/*.vue",
+    "node_modules/vitest/globals.d.ts"
   ],
   "exclude": [
-    "node_modules",
     "dist"
   ]
 }