npm - zova-ui-empty - Versions diffs - 5.0.258 → 5.0.261 - Mend

zova-ui-empty 5.0.258 → 5.0.261

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (16) hide show

package/env/.env.ssr.admin +3 -0
package/env/.env.ssr.production +5 -0
package/index.html +15 -8
package/package.json +18 -7
package/quasar.config.ts +19 -0
package/quasar.extensions.json +3 -0
package/src/boot/main.ts +3 -10
package/src/boot/zova.ts +6 -0
package/src/suite/a-home/modules/home-layout/src/component/layoutDefault/controller.ts +6 -1
package/src-ssr/middlewares/env.ts +21 -0
package/src-ssr/middlewares/render.ts +60 -0
package/src-ssr/server.ts +141 -0
package/src-ssr/ssr-flag.d.ts +10 -0
package/env/.env.development +0 -0
package/env/.env.production +0 -0
package/vite.config.ts +0 -44

package/env/.env.ssr.admin ADDED Viewed

@@ -0,0 +1,3 @@
+SSR_COOKIE_THEMENAME = true
+SSR_COOKIE_THEMEDARK = true
+SSR_BODYREADYOBSERVER = false

package/env/.env.ssr.production ADDED Viewed

@@ -0,0 +1,5 @@
+API_BASE_URL = http://localhost:$MOCK_BUILD_PORT
+SSR_API_BASE_URL = $API_BASE_URL
+MOCK_BUILD =true

package/index.html CHANGED Viewed

@@ -1,14 +1,21 @@
 <!doctype html>
-<html lang="en">
+<html>
   <head>
-    <meta charset="UTF-8" />
-    <link rel="icon" href="/favicon.ico" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Welcome to Zova</title>
-  </head>
+    <title><%= productName %></title>
+    <meta charset="utf-8" />
+    <meta name="description" content="<%= productDescription %>" />
+    <meta name="format-detection" content="telephone=no" />
+    <meta name="msapplication-tap-highlight" content="no" />
+    <meta
+      name="viewport"
+      content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width<% if (ctx.mode.cordova || ctx.mode.capacitor) { %>, viewport-fit=cover<% } %>"
+    />
+    <link rel="icon" type="image/ico" href="favicon.ico" />
+  </head>
   <body>
-    <div id="app"></div>
-    <script type="module" src="/src/boot/main.ts"></script>
+    <!-- quasar:entry-point -->
+    <!--app-teleports-->
   </body>
 </html>

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "zova-ui-empty",
-  "version": "5.0.258",
+  "version": "5.0.261",
   "description": "A vue3 empty framework with ioc",
   "publishConfig": {
     "access": "public"
@@ -8,9 +8,17 @@
   "author": "zhennann <zhen.nann@icloud.com>",
   "type": "module",
   "scripts": {
-    "dev": "vite",
-    "build": "vue-tsc --noEmit --project tsconfig.vue-tsc.json && vite build",
-    "preview": "vite preview --outDir=dist/spa",
+    "dev": "npm run dev:ssr:admin",
+    "build": "npm run build:ssr:admin",
+    "preview": "npm run preview:ssr",
+    "dev:ssr:admin": "tsc -b && quasar dev --mode ssr --flavor admin",
+    "dev:ssr:front": "tsc -b && quasar dev --mode ssr --flavor front",
+    "build:ssr:admin": "tsc -b && npm run tsc && quasar build --mode ssr --flavor admin",
+    "build:ssr:front": "tsc -b && npm run tsc && quasar build --mode ssr --flavor front",
+    "preview:ssr": "concurrently \"cd ./distMockServer && node index.js\" \"node ./dist/ssr/index.js\"",
+    "dev:spa": "tsc -b && quasar dev --mode spa --flavor admin",
+    "build:spa": "tsc -b && npm run tsc && quasar build --mode spa --flavor admin",
+    "preview:spa": "vite preview --outDir=dist/spa",
     "tsc": "vue-tsc --noEmit --project tsconfig.vue-tsc.json",
     "lint": "eslint . --fix --ignore-path .gitignore"
   },
@@ -35,22 +43,25 @@
     "connect": "^3.7.0",
     "cors": "^2.8.5",
     "express": "^4.19.2",
+    "quasar": "^2.16.8",
     "typestyle": "^2.4.0",
     "vue": "^3.4.29",
     "vue-router": "^4.3.3",
     "zod": "^3.23.8",
-    "zova": "^5.0.187",
+    "zova": "^5.0.190",
     "zova-module-a-model": "^5.0.24",
     "zova-module-a-pinia": "^5.0.24",
     "zova-module-a-router": "^5.0.58",
-    "zova-module-a-style": "^5.0.33",
+    "zova-module-a-style": "^5.0.35",
     "zova-module-a-tabs": "^5.0.18"
   },
   "devDependencies": {
     "@cabloy/lint": "^4.0.11",
+    "@quasar/app-vite": "2.0.0-beta.18",
     "@types/node": "^20.14.2",
     "@vitejs/plugin-vue": "^5.0.5",
     "concurrently": "^8.2.2",
+    "quasar-app-extension-zova": "^1.1.153",
     "sass": "^1.77.5",
     "typescript": "^5.4.5",
     "vite": "^5.3.1",
@@ -58,5 +69,5 @@
     "zova-vite": "^1.0.157"
   },
   "license": "MIT",
-  "gitHead": "73cbbe8383e40d9efc1541de1f539e4c478c369c"
+  "gitHead": "6634268bdb6e583d44f84a0befd39afb431ce678"
 }

package/quasar.config.ts ADDED Viewed

@@ -0,0 +1,19 @@
+/* eslint-env node */
+// Configuration for your app
+// https://v2.quasar.dev/quasar-cli-vite/quasar-config-js
+import { configure } from 'quasar/wrappers';
+export default configure(_ctx => {
+  return {
+    build: {
+      // extendViteConf(_viteConf) {},
+      // viteVuePluginOptions: {},
+    },
+    devServer: {
+      open: false, // opens browser window automatically
+    },
+  };
+});

package/quasar.extensions.json ADDED Viewed

@@ -0,0 +1,3 @@
+{
+  "zova": {}
+}

package/src/boot/main.ts CHANGED Viewed

@@ -1,13 +1,6 @@
-import { createApp } from 'vue';
-import { PluginBean } from 'zova';
-import App from './app/index.vue';
+import { SSRContext } from 'zova';
+import { App } from 'vue';
 import '../css/settings.scss';
-async function start({ app }) {
-  app.use(PluginBean);
-  app.mount('#app');
-}
-const app = createApp(App);
-start({ app });
+export default (_app: App, _ssrContext: SSRContext) => {};

package/src/boot/zova.ts ADDED Viewed

@@ -0,0 +1,6 @@
+import { App } from 'vue';
+import { PluginBean } from 'zova';
+export default async function ({ app }: { app: App }) {
+  app.use(PluginBean);
+}

package/src/suite/a-home/modules/home-layout/src/component/layoutDefault/controller.ts CHANGED Viewed

@@ -16,7 +16,12 @@ export class ControllerLayoutDefault extends BeanControllerBase<unknown, Props,
   leftDrawerOpen: boolean = false;
-  protected async __init__() {}
+  protected async __init__() {
+    // menu
+    const queryMenus = this.$$modelMenu.select();
+    await queryMenus.suspense();
+    if (queryMenus.error) throw queryMenus.error;
+  }
   toggleLeftDrawer() {
     this.leftDrawerOpen = !this.leftDrawerOpen;

package/src-ssr/middlewares/env.ts ADDED Viewed

@@ -0,0 +1,21 @@
+import path, { dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { readFileSync } from 'node:fs';
+import { ssrMiddleware } from 'quasar/wrappers';
+// This middleware should execute as first one
+// since it prepare the process.env variables
+export default ssrMiddleware(({ app: _app, resolve: _resolve, render: _render, serve: _serve }) => {
+  if (process.env.PROD) {
+    const __filename = fileURLToPath(import.meta.url);
+    const __dirname = dirname(__filename);
+    const envContent = readFileSync(path.join(__dirname, './.env.json'));
+    const env = JSON.parse(envContent.toString());
+    for (const key of Object.keys(env)) {
+      if (process.env[key] === undefined && env[key] !== false) {
+        process.env[key] = env[key];
+      }
+    }
+  }
+});

package/src-ssr/middlewares/render.ts ADDED Viewed

@@ -0,0 +1,60 @@
+import { Request, Response } from 'express';
+import { RenderError } from '@quasar/app-vite';
+import { ssrMiddleware } from 'quasar/wrappers';
+// This middleware should execute as last one
+// since it captures everything and tries to
+// render the page with Vue
+export default ssrMiddleware(({ app, resolve, render, serve }) => {
+  // we capture any other Express route and hand it
+  // over to Vue and Vue Router to render our page
+  app.get(resolve.urlPath('*'), (req: Request, res: Response) => {
+    res.setHeader('Content-Type', 'text/html');
+    render(/* the ssrContext: */ { req, res })
+      .then((html) => {
+        // now let's send the rendered html to the client
+        res.send(html);
+      })
+      .catch((err: RenderError) => {
+        // oops, we had an error while rendering the page
+        // we were told to redirect to another URL
+        if (err.url) {
+          if (err.code) {
+            res.redirect(err.code, err.url);
+          } else {
+            res.redirect(err.url);
+          }
+        } else if (err.code === 404) {
+          // hmm, Vue Router could not find the requested route
+          // Should reach here only if no "catch-all" route
+          // is defined in /src/routes
+          res.status(404).send('404 | Page Not Found');
+        } else if (process.env.DEV) {
+          // well, we treat any other code as error;
+          // if we're in dev mode, then we can use Quasar CLI
+          // to display a nice error page that contains the stack
+          // and other useful information
+          // serve.error is available on dev only
+          serve.error({ err, req, res });
+        } else {
+          // we're in production, so we should have another method
+          // to display something to the client when we encounter an error
+          // (for security reasons, it's not ok to display the same wealth
+          // of information as we do in development)
+          // Render Error Page on production or
+          // create a route (/src/routes) for an error page and redirect to it
+          res.status(500).send('500 | Internal Server Error');
+          if (process.env.DEBUGGING) {
+            console.error(err.stack);
+          }
+        }
+      });
+  });
+});

package/src-ssr/server.ts ADDED Viewed

@@ -0,0 +1,141 @@
+/**
+ * More info about this file:
+ * https://v2.quasar.dev/quasar-cli-vite/developing-ssr/ssr-webserver
+ *
+ * Runs in Node context.
+ */
+/**
+ * Make sure to yarn add / npm install (in your project root)
+ * anything you import here (except for express and compression).
+ */
+import express from 'express';
+import compression from 'compression';
+import {
+  ssrClose,
+  ssrCreate,
+  ssrListen,
+  ssrServeStaticContent,
+  ssrRenderPreloadTag,
+} from 'quasar/wrappers';
+/**
+ * Create your webserver and return its instance.
+ * If needed, prepare your webserver to receive
+ * connect-like middlewares.
+ *
+ * Can be async: ssrCreate(async ({ ... }) => { ... })
+ */
+export const create = ssrCreate((/* { ... } */) => {
+  const app = express();
+  // attackers can use this header to detect apps running Express
+  // and then launch specifically-targeted attacks
+  app.disable('x-powered-by');
+  // place here any middlewares that
+  // absolutely need to run before anything else
+  if (process.env.PROD) {
+    app.use(compression());
+  }
+  return app;
+});
+/**
+ * You need to make the server listen to the indicated port
+ * and return the listening instance or whatever you need to
+ * close the server with.
+ *
+ * The "listenResult" param for the "close()" definition below
+ * is what you return here.
+ *
+ * For production, you can instead export your
+ * handler for serverless use or whatever else fits your needs.
+ *
+ * Can be async: ssrListen(async ({ app, devHttpsApp, port }) => { ... })
+ */
+export const listen = ssrListen(({ app, devHttpsApp, port }) => {
+  const server = devHttpsApp || app;
+  return server.listen(port, () => {
+    if (process.env.PROD) {
+      console.log('Server listening at port ' + port);
+    }
+  });
+});
+/**
+ * Should close the server and free up any resources.
+ * Will be used on development only when the server needs
+ * to be rebooted.
+ *
+ * Should you need the result of the "listen()" call above,
+ * you can use the "listenResult" param.
+ *
+ * Can be async: ssrClose(async ({ listenResult }) => { ... }))
+ */
+export const close = ssrClose(({ listenResult }) => {
+  return listenResult.close();
+});
+const maxAge = process.env.DEV ? 0 : 1000 * 60 * 60 * 24 * 30;
+/**
+ * Should return a function that will be used to configure the webserver
+ * to serve static content at "urlPath" from "pathToServe" folder/file.
+ *
+ * Notice resolve.urlPath(urlPath) and resolve.public(pathToServe) usages.
+ *
+ * Can be async: ssrServeStaticContent(async ({ app, resolve }) => {
+ * Can return an async function: return async ({ urlPath = '/', pathToServe = '.', opts = {} }) => {
+ */
+export const serveStaticContent = ssrServeStaticContent(({ app, resolve }) => {
+  return ({ urlPath = '/', pathToServe = '.', opts = {} }) => {
+    const serveFn = express.static(resolve.public(pathToServe), { maxAge, ...opts });
+    app.use(resolve.urlPath(urlPath), serveFn);
+  };
+});
+const jsRE = /\.js$/;
+const cssRE = /\.css$/;
+const woffRE = /\.woff$/;
+const woff2RE = /\.woff2$/;
+const gifRE = /\.gif$/;
+const jpgRE = /\.jpe?g$/;
+const pngRE = /\.png$/;
+/**
+ * Should return a String with HTML output
+ * (if any) for preloading indicated file
+ */
+export const renderPreloadTag = ssrRenderPreloadTag((file/* , { ssrContext } */) => {
+  if (jsRE.test(file) === true) {
+    return `<link rel="modulepreload" href="${file}" crossorigin>`;
+  }
+  if (cssRE.test(file) === true) {
+    return `<link rel="stylesheet" href="${file}" crossorigin>`;
+  }
+  if (woffRE.test(file) === true) {
+    return `<link rel="preload" href="${file}" as="font" type="font/woff" crossorigin>`;
+  }
+  if (woff2RE.test(file) === true) {
+    return `<link rel="preload" href="${file}" as="font" type="font/woff2" crossorigin>`;
+  }
+  if (gifRE.test(file) === true) {
+    return `<link rel="preload" href="${file}" as="image" type="image/gif" crossorigin>`;
+  }
+  if (jpgRE.test(file) === true) {
+    return `<link rel="preload" href="${file}" as="image" type="image/jpeg" crossorigin>`;
+  }
+  if (pngRE.test(file) === true) {
+    return `<link rel="preload" href="${file}" as="image" type="image/png" crossorigin>`;
+  }
+  return '';
+});

package/src-ssr/ssr-flag.d.ts ADDED Viewed

@@ -0,0 +1,10 @@
+/* eslint-disable */
+// THIS FEATURE-FLAG FILE IS AUTOGENERATED,
+//  REMOVAL OR CHANGES WILL CAUSE RELATED TYPES TO STOP WORKING
+import "quasar/dist/types/feature-flag";
+declare module "quasar/dist/types/feature-flag" {
+  interface QuasarFeatureFlags {
+    ssr: true;
+  }
+}

package/env/.env.development DELETED Viewed

File without changes

package/env/.env.production DELETED Viewed

File without changes

package/vite.config.ts DELETED Viewed

@@ -1,44 +0,0 @@
-// Plugins
-import Vue from '@vitejs/plugin-vue';
-// Utilities
-import { defineConfig, mergeConfig } from 'vite';
-import { getAppMode, getFlavor } from 'zova-vite';
-import { ZovaConfigMeta } from 'zova';
-import { generateZovaViteMeta } from 'zova-vite';
-// https://vitejs.dev/config/
-export default defineConfig(async ({ mode }) => {
-  const flavor = getFlavor();
-  const appMode = getAppMode();
-  const configMeta: ZovaConfigMeta = {
-    flavor,
-    mode,
-    appMode,
-  };
-  const configOptions = {
-    appDir: process.cwd(),
-    runtimeDir: '.zova',
-    zovaManualChunk: {
-      debug: false,
-      vendors: [],
-    },
-  };
-  // zovaViteMeta
-  const zovaViteMeta = await generateZovaViteMeta(configMeta, configOptions);
-  // plugins
-  const plugins = [Vue({})];
-  for (const plugin of zovaViteMeta.vitePlugins) {
-    const pluginFn = plugin[1];
-    const pluginOptions = plugin[2];
-    plugins.push(pluginFn(pluginOptions));
-  }
-  // viteConfig
-  const viteConfig = mergeConfig(zovaViteMeta.viteConfig, {
-    plugins,
-    build: {
-      // minify: false,
-    },
-  });
-  return viteConfig;
-});