@vc-shell/create-vc-app 1.0.110 → 1.0.112

package/CHANGELOG.md

@@ -1,3 +1,16 @@
+## [1.0.112](https://github.com/VirtoCommerce/vc-shell/compare/v1.0.111...v1.0.112) (2023-10-24)
+
+
+
+## [1.0.111](https://github.com/VirtoCommerce/vc-shell/compare/v1.0.110...v1.0.111) (2023-10-17)
+
+
+### Features
+
+* dynamic modules ([ed4af3a](https://github.com/VirtoCommerce/vc-shell/commit/ed4af3ad65e47b0d633d6e2eb23e9c90d73ff50d))
+
+
+
 ## [1.0.110](https://github.com/VirtoCommerce/vc-shell/compare/v1.0.109...v1.0.110) (2023-10-16)
 
 

package/dist/template/base/.env.ejs

@@ -2,4 +2,5 @@ APP_LOG_ENABLED=true
 APP_LOG_LEVEL=debug
 APP_PLATFORM_URL=https://vcmp-dev.paas.govirto.com/
 APP_PLATFORM_MODULES=[]
+APP_API_CLIENT_DIRECTORY=./src/api_client/
 APP_BASE_PATH=/apps/<%= appName %>/

package/dist/template/base/.eslintrc.js

@@ -15,6 +15,8 @@ module.exports = {
   ],
   parser: "vue-eslint-parser",
   parserOptions: {
+    parser: "@typescript-eslint/parser",
+    sourceType: "module",
     node: true,
   },
   settings: {

package/dist/template/base/.vscode/settings.json

@@ -9,5 +9,6 @@
   ],
   "i18n-ally.localesPaths": [
     "src/locales",
-  ]
+  ],
+  "typescript.preferences.importModuleSpecifier": "relative",
 }

package/dist/template/base/package.json.ejs

@@ -13,7 +13,7 @@
     "lint-staged": "lint-staged",
     "generate-api-client": "cross-env api-client-generator --color",
     "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0",
-    "bump": "cross-env-shell 'f() { yarn version --\"$@\" --no-commit-hooks --ignore-scripts --no-git-tag-version --yes && yarn changelog && git add . && yarn commit-release && yarn create:tag ; }; f'",
+    "bump": "cross-env-shell 'f() { yarn workspaces foreach --topological version --deferred \"$@\" && yarn version apply --all && yarn run changelog && yarn workspaces foreach -v exec git add . && yarn run commit-release && yarn create:tag ; }; f'",
     "commit-release": "cross-env-shell 'git commit -m v$npm_package_version'",
     "create:tag": "PACKAGE_VERSION=$(cat package.json | grep \\\"version\\\" | head -1 | awk -F: '{ print $2 }' | sed 's/[\",]//g' | tr -d '[[:space:]]') && git tag v$PACKAGE_VERSION && git push --tags"
   },
@@ -49,9 +49,9 @@
     "vite": "^4.3.9",
     "vite-plugin-checker": "^0.6.0",
     "vite-plugin-mkcert": "^1.15.0",
-    "vite-plugin-pwa": "^0.14.7",
+    "vite-plugin-pwa": "^0.16.5",
     "vue-eslint-parser": "^9.3.0",
-    "vue-tsc": "~1.6.5"
+    "vue-tsc": "^1.8.19"
   },
   "dependencies": {
     "@fortawesome/fontawesome-free": "^5.15.3",

package/dist/template/base/src/main.ts.ejs

@@ -1,4 +1,4 @@
-import VirtoShellFramework, { notification } from "@vc-shell/framework";
+import VirtoShellFramework, { notification, useUser } from "@vc-shell/framework";
 import { createApp } from "vue";
 import { router } from "./router";
 import * as locales from "./locales";
@@ -16,26 +16,33 @@ import "@fortawesome/fontawesome-free/css/all.min.css";
 import "roboto-fontface/css/roboto/roboto-fontface.css";
 import "@vc-shell/framework/dist/index.css";
 
-const app = createApp(RouterView)
-.use(VirtoShellFramework<% if(commonPages === true) { -%>, {
-  useLogin,
-}<% } -%>)
-<% if(bladeModuleStarter === true) { -%>
-.use(Default, { router })
-<% } -%>
+async function startApp() {
+  const { loadUser } = useUser();
 
-.use(router)
+  await loadUser();
 
-Object.entries(locales).forEach(([key, message]) => {
-  app.config.globalProperties.$mergeLocaleMessage(key, message);
-});
+  const app = createApp(RouterView)
+  .use(VirtoShellFramework)
+  <% if(bladeModuleStarter === true) { -%>
+    .use(Default, { router })
+    <% } -%>
+  .use(router)
 
-app.provide("platformUrl", import.meta.env.APP_PLATFORM_URL);
-
-app.config.errorHandler = (err) => {
-  notification.error(err.toString(), {
-    timeout: 5000,
+  Object.entries(locales).forEach(([key, message]) => {
+    app.config.globalProperties.$mergeLocaleMessage(key, message);
   });
-};
 
-app.mount("#app");
+  app.provide("platformUrl", import.meta.env.APP_PLATFORM_URL);
+
+  app.config.errorHandler = (err) => {
+    notification.error(err.toString(), {
+      timeout: 5000,
+    });
+  };
+
+  await router.isReady();
+
+  app.mount("#app");
+}
+
+startApp()

package/dist/template/base/src/router/index.ts.ejs

@@ -1,6 +1,7 @@
 import { createRouter, createWebHashHistory, RouteRecordRaw } from "vue-router";
 <% if(commonPages === true || bladeModuleStarter === true) { -%>
 import { inject } from "vue";
+import { useLogin } from "../composables";
 <% } -%>
 import {
   usePermissions,
@@ -13,7 +14,6 @@ import {
   ResetPassword,
   Invite,
   <% } -%>} from "@vc-shell/framework";
-  import { useCookies } from "@vueuse/integrations/useCookies";
 
 /**
  * Pages
@@ -53,6 +53,7 @@ const routes: RouteRecordRaw[] = [
     name: "Login",
     component: Login,
     props: () => ({
+      composable: useLogin,
       logo: whiteLogoImage,
       background: bgImage,
       title: "<%= appName %>",
@@ -97,7 +98,7 @@ export const router = createRouter({
 
 <% if(commonPages === true || bladeModuleStarter === true) { -%>
 router.beforeEach(async (to, from) => {
-  const { fetchUserPermissions, checkPermission } = usePermissions();
+  const { hasAccess } = usePermissions();
   const { resolveBlades } = useBladeNavigation();
   const { isAuthenticated } = useUser();
   const pages = inject<BladePageComponent[]>("pages");
@@ -105,16 +106,13 @@ router.beforeEach(async (to, from) => {
   <% if(commonPages === true) { -%>
   if (to.name !== "Login" && to.name !== "ResetPassword" && to.name !== "Invite") {
     try {
-      // Fetch permissions if not any
-      await fetchUserPermissions();
-
       const component = pages.find((blade) => blade?.url === to.path);
 
-      const hasAccess = checkPermission(component?.permissions);
+      const _hasAccess = hasAccess(component?.permissions);
 
       if (!(await isAuthenticated()) && to.name !== "Login") {
         return { name: "Login" };
-      } else if (hasAccess && to.name !== "Login") {
+      } else if (_hasAccess && to.name !== "Login") {
         const resolvedBladeUrl = resolveBlades(to);
         return resolvedBladeUrl ? resolvedBladeUrl : true;
       } else if (!hasAccess) {

package/dist/template/base/vite.config.ts.ejs

@@ -42,6 +42,6 @@ export default getApplicationConfiguration({
     splitVendorChunkPlugin(),
   ],
   optimizeDeps: {
-    include: mode === "development" ? ["ace-builds", "client-oauth2", "quill-delta", "quill", "url-pattern"] : [],
+    include: mode === "development" ? ["ace-builds", "client-oauth2", "quill-delta", "quill", "url-pattern", "vee-validate"] : [],
   },
 });

package/dist/template/code/blade/src/modules/default/index.ts

@@ -6,4 +6,4 @@ export default createAppModule(pages, locales);
 
 export * from "./pages";
 export * from "./composables";
-//export * from "./components";
+// export * from "./components";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vc-shell/create-vc-app",
   "description": "Application scaffolding",
-  "version": "1.0.110",
+  "version": "1.0.112",
   "bin": "./dist/index.js",
   "files": [
     "src/template",