create-jwn-js 1.2.2 → 1.2.3

package/template-vite-vue3-pinia-mts/dist/server/entry-server.mjs

@@ -52,8 +52,7 @@ const createUrl = (url) => {
   return new URL(url);
 };
 const fileType = (file) => {
-  var _a;
-  const ext = ((_a = file.split(".").pop()) == null ? void 0 : _a.toLowerCase()) || "";
+  const ext = file.split(".").pop()?.toLowerCase() || "";
   if (ext === "js") {
     return "script";
   } else if (ext === "css") {
@@ -65,11 +64,11 @@ const fileType = (file) => {
   }
   return "";
 };
-const findDependencies = (modules, manifest, shouldPreload, shouldPrefetch) => {
+const findDependencies = (modules, ssrManifest, shouldPreload, shouldPrefetch) => {
   const preload = /* @__PURE__ */ new Set();
   const prefetch = /* @__PURE__ */ new Set();
   for (const id of modules || []) {
-    for (const file of manifest[id] || []) {
+    for (const file of ssrManifest[id] || []) {
       const asType = fileType(file);
       if (!shouldPreload && asType !== "script" && asType !== "style") {
         continue;
@@ -80,8 +79,8 @@ const findDependencies = (modules, manifest, shouldPreload, shouldPrefetch) => {
       preload.add(file);
     }
   }
-  for (const id of Object.keys(manifest)) {
-    for (const file of manifest[id]) {
+  for (const id of Object.keys(ssrManifest)) {
+    for (const file of ssrManifest[id]) {
       if (!preload.has(file)) {
         const asType = fileType(file);
         if (!shouldPrefetch) {
@@ -97,22 +96,21 @@ const findDependencies = (modules, manifest, shouldPreload, shouldPrefetch) => {
   return { preload: [...preload], prefetch: [...prefetch] };
 };
 const renderPreloadLinks = (files) => {
-  var _a;
-  const link = [];
+  const links = [];
   for (const file of files || []) {
     const asType = fileType(file);
-    const ext = ((_a = file.split(".").pop()) == null ? void 0 : _a.toLowerCase()) || "";
+    const ext = file.split(".").pop()?.toLowerCase() || "";
     if (asType === "script") {
-      link.push(`<link rel="modulepreload" crossorigin href="${file}">`);
+      links.push(`<link rel="modulepreload" crossorigin href="${file}">`);
     } else if (asType === "style") {
-      link.push(`<link rel="stylesheet" href="${file}">`);
+      links.push(`<link rel="stylesheet" href="${file}">`);
     } else if (asType === "font") {
-      link.push(`<link rel="stylesheet" href="${file}" type="font/${ext}" crossorigin>`);
+      links.push(`<link rel="stylesheet" href="${file}" type="font/${ext}" crossorigin>`);
     } else {
-      link.push(`<link rel="stylesheet" href="${file}">`);
+      links.push(`<link rel="stylesheet" href="${file}">`);
     }
   }
-  return link;
+  return links;
 };
 const renderPrefetchLinks = (files) => {
   const link = [];
@@ -121,6 +119,30 @@ const renderPrefetchLinks = (files) => {
   }
   return link;
 };
+const findIndexHtmlDependencies = (manifest) => {
+  const output = [];
+  const indexHtmlDependencies = manifest["index.html"] || {};
+  indexHtmlDependencies.file && output.push(indexHtmlDependencies.file);
+  indexHtmlDependencies.css && indexHtmlDependencies.css.length && output.push(...indexHtmlDependencies.css);
+  output.forEach((file, index) => {
+    if (!/^\//.test(file)) {
+      output[index] = `/${file}`;
+    }
+  });
+  return output;
+};
+const renderPreloadLinksIndexHtml = (files) => {
+  const links = [];
+  for (const file of files || []) {
+    const asType = fileType(file);
+    if (asType === "script") {
+      links.push(`<link rel="modulepreload" crossorigin href="${file}">`);
+    } else if (asType === "style") {
+      links.push(`<link rel="preload" href="${file}" as="style">`);
+    }
+  }
+  return links;
+};
 const teleportsInject = (body, teleports = {}) => {
   const teleportsKeys = Object.keys(teleports);
   if (teleportsKeys.length) {
@@ -140,7 +162,7 @@ const teleportsInject = (body, teleports = {}) => {
   return body;
 };
 const createViteSsrVue = (App2, options2 = {}) => {
-  return async (url, { manifest, ...extra } = {}) => {
+  return async (url, { manifest, ssrManifest, ...extra } = {}) => {
     const app = createSSRApp(App2, options2.rootProps);
     const serializer = options2.serializer || serialize;
     const ssrContext = {
@@ -149,6 +171,7 @@ const createViteSsrVue = (App2, options2 = {}) => {
       initialState: {},
       ...extra
     };
+    ssrManifest = ssrManifest || manifest;
     const { head, router, store, inserts, context, pinia } = options2.created && await options2.created({
       app,
       ...ssrContext
@@ -170,15 +193,20 @@ const createViteSsrVue = (App2, options2 = {}) => {
     if (pinia) {
       ssrContext.initialState.pinia = pinia.state.value;
     }
-    const body = (inserts == null ? void 0 : inserts.body) || await renderToString(app, Object.assign(ssrContext, context || {}));
-    let headTags = (inserts == null ? void 0 : inserts.headTags) || "", htmlAttrs = (inserts == null ? void 0 : inserts.htmlAttrs) || "", bodyAttrs = (inserts == null ? void 0 : inserts.bodyAttrs) || "", dependencies = (inserts == null ? void 0 : inserts.dependencies) || [];
+    const body = inserts?.body || await renderToString(app, Object.assign(ssrContext, context || {}));
+    let headTags = inserts?.headTags || "", htmlAttrs = inserts?.htmlAttrs || "", bodyAttrs = inserts?.bodyAttrs || "", dependencies = inserts?.dependencies || [];
     if (head) {
       ({ headTags, htmlAttrs, bodyAttrs } = await renderHeadToString(head));
     }
-    if (manifest) {
+    if (options2.preloadIndexHtml && manifest) {
+      const preloadIndexHtmlFiles = findIndexHtmlDependencies(manifest);
+      const links = renderPreloadLinksIndexHtml(preloadIndexHtmlFiles);
+      headTags += links.length ? "\n" + links.join("\n") : "";
+    }
+    if (ssrManifest) {
       const { preload, prefetch } = findDependencies(
         ssrContext.modules,
-        manifest,
+        ssrManifest,
         options2.shouldPreload,
         options2.shouldPrefetch
       );
@@ -200,7 +228,7 @@ const createViteSsrVue = (App2, options2 = {}) => {
       ...ssrContext
     });
     const initialState = await serializer(ssrContext.initialState || {});
-    const teleports = (ssrContext == null ? void 0 : ssrContext.teleports) || {};
+    const teleports = ssrContext?.teleports || {};
     return {
       html: teleportsInject(`<!DOCTYPE html>
 <html${htmlAttrs}>
@@ -215,7 +243,7 @@ const createViteSsrVue = (App2, options2 = {}) => {
             }
         
 /*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4Lmh0bWwlM0ZodG1sLXByb3h5JmlubGluZS1jc3MmaW5kZXg9MC5jc3MiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtZQUNZO2dCQUNJLFdBQVc7WUFDZiIsImZpbGUiOiJpbmRleC5odG1sP2h0bWwtcHJveHkmaW5saW5lLWNzcyZpbmRleD0wLmNzcyIsInNvdXJjZXNDb250ZW50IjpbIlxuICAgICAgICAgICAgLmljb25pbmcge1xuICAgICAgICAgICAgICAgIHdpZHRoOiAyMHB4O1xuICAgICAgICAgICAgfVxuICAgICAgICAiXX0= */</style>
-      <script type="module" crossorigin src="/assets/index-CrrygVvU.js"><\/script>
+      <script type="module" crossorigin src="/assets/index-CIJvTamH.js"><\/script>
       <link rel="stylesheet" crossorigin href="/assets/index-B40M1W6I.css">
     ${headTags}
 </head>
@@ -277,9 +305,8 @@ const useBaseStore = defineStore("baseStore", {
       return langLink(path2, this.lang);
     },
     async fetch(input, init = {}, opts = {}) {
-      var _a, _b;
       const url = new URL(`${this.getBaseUrl}${input}`);
-      const token = (init == null ? void 0 : init.token) || "";
+      const token = init?.token || "";
       const search = url.searchParams;
       search.set("lang", search.get("lang") || this.lang);
       const ssrHeaders = this.context.headers || {};
@@ -306,15 +333,15 @@ const useBaseStore = defineStore("baseStore", {
       init.headers = Object.assign(
         {},
         ssrHeaders,
-        (init == null ? void 0 : init.body) instanceof FormData ? {} : { "content-type": "application/json" },
+        init?.body instanceof FormData ? {} : { "content-type": "application/json" },
         token ? { "authorization": "Bearer " + token } : {},
         init.headers
       );
       init.method = init.method || "GET";
       if (["get", "head"].includes(init.method.toLowerCase())) {
-        url.search = new URLSearchParams((init == null ? void 0 : init.data) || url.search || {}).toString();
+        url.search = new URLSearchParams(init?.data || url.search || {}).toString();
       } else {
-        init.body = (init == null ? void 0 : init.body) || JSON.stringify((init == null ? void 0 : init.data) || {});
+        init.body = init?.body || JSON.stringify(init?.data || {});
       }
       try {
         this.loading = true;
@@ -348,7 +375,7 @@ const useBaseStore = defineStore("baseStore", {
         }
         if (e instanceof ApiError) {
           const statusCode = e.getStatusCode();
-          const error = ((_b = (_a = e.getData()) == null ? void 0 : _a.json) == null ? void 0 : _b.error) || e.getData().text || e.getMessage();
+          const error = e.getData()?.json?.error || e.getData().text || e.getMessage();
           if (init.method.toLowerCase() === "get") {
             if (statusCode === 410) {
               const location = e.getHeaders().location;
@@ -436,7 +463,6 @@ _sfc_main$2.setup = (props, ctx) => {
 const Error$1 = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["ssrRender", _sfc_ssrRender$2], ["__file", "/Volumes/MacMiniAPFS/projects/packages/vite-node-template/template-vite-vue3-pinia-mts/src/frontend/views/Error/Error.vue"]]);
 const customerPrefetchPinia = (options2, fn) => {
   return async ({ store, isFetch }, to, from) => {
-    var _a, _b;
     if (isFetch) {
       const baseStore = useBaseStore(store);
       const res = await baseStore.fetch("/web", {
@@ -448,10 +474,10 @@ const customerPrefetchPinia = (options2, fn) => {
         }
       });
       const body = await res.json();
-      const page = (_a = body.data) == null ? void 0 : _a.page;
+      const page = body.data?.page;
       baseStore.page = page ? omit(page, ["way"]) : {};
-      baseStore.way = (page == null ? void 0 : page.way) || [];
-      baseStore.microdata = ((_b = body.data) == null ? void 0 : _b.microdata) || "";
+      baseStore.way = page?.way || [];
+      baseStore.microdata = body.data?.microdata || "";
       baseStore.mergeContext({ memcache: options2.memcache || null });
     }
   };
@@ -498,8 +524,7 @@ const createRouter = (opt) => createRouter$1({
     }
   ],
   async scrollBehavior(to, from, savedPosition) {
-    var _a;
-    if ((_a = to.query) == null ? void 0 : _a.el) {
+    if (to.query?.el) {
       const el = to.query.el;
       return { el };
     }
@@ -630,8 +655,7 @@ const webRoutes = [
   }
 ];
 const createMariadb = (config2) => {
-  var _a;
-  if ((_a = config2.db) == null ? void 0 : _a.home) {
+  if (config2.db?.home) {
     const home2 = new Query({ debug: process.env.NODE_ENV === "production" ? 0 : 1 });
     const homePool = home2.createPool(config2.db.home);
     return { homePool, home: home2 };

package/template-vite-vue3-pinia-mts/src/frontend/entry-options.mts

@@ -1,4 +1,4 @@
-import {Context, CreatorOptions} from "vite-ssr-vue";
+import type {Context, CreatorOptions} from "vite-ssr-vue";
 import createRouter from "./routes/index.mjs";
 import {createHead} from "@vueuse/head";
 import {createPrefetch} from "@vuemod/prefetch";
@@ -6,7 +6,7 @@ import {amitt} from "amitt";
 
 // Multilang
 import Multilang from "@jwn-js/plugins/Multilang";
-import {parseLang} from "@/helpers/parseLang";
+import {parseLang} from "@/helpers/parseLang.mjs";
 
 // Primevue
 import PrimeVue from 'primevue/config';
@@ -23,7 +23,7 @@ const defaultLang = "ru";
 
 export default {
     created({app, context, req, res, isClient}) {
-        const emitter = amitt();
+        const emitter = amitt<"ga-pageview"|"ga-buttons"|"web-notification">();
         const head = createHead();
         const router = createRouter({isClient});
         const pinia = createPinia();

package/template-vite-vue3-pinia-mts/src/helpers/parseLang.mts

@@ -1,4 +1,4 @@
-export const parseLang = (url: string, defaultLang = "ru") => {
-    const result = url.match(/^\/(ru|ua|en)\/?/i);
+export const parseLang = (url: string, defaultLang = "ua") => {
+    const result = url.match(/^\/(ru|ua|en)(\/|$)/i);
     return result && result.length > 0 ? result[1] : defaultLang;
 }

package/template-vite-vue3-pinia-mts/src/scripts/vitest.global.setup.mts

@@ -9,7 +9,7 @@ declare global {
 
 const start = async(resolve: CallableFunction) => {
     try {
-        await fetch(`${testConfig.apiUrl}'`);
+        await fetch(`${testConfig.apiUrl}`);
         resolve();
     } catch(e: any) {
         await new Promise(resolve => setTimeout(resolve, 100));

package/template-vite-vue3-pinia-mts/{vite.config.ts → vite.config.mts}

@@ -1,6 +1,6 @@
 import * as path from "path";
 import chalk from "chalk";
-import {defineConfig, ResolvedConfig} from "vite";
+import {defineConfig, type ResolvedConfig} from "vite";
 import vue from "@vitejs/plugin-vue";
 import ssr from "vite-ssr-vue/plugin";
 import svgLoader from "vite-svg-loader";