@simple-reporting/base 1.0.4 → 1.0.6

package/README.md

@@ -24,14 +24,14 @@ Build all required files.
 
 ## Important CLI commands
 
-| Command                                                  | Description                                                                    |
-|----------------------------------------------------------|--------------------------------------------------------------------------------|
-| `npm install`                                            | Installs all packages listed in `package.json`                                 |
-| `npm run dev`                                            | Starts the development environment including SCSS and JS watcher (Live Reload) |
-| `npm run build`                                          | Generates all CSS and JS files and ZIP packages in `.output`                   |
-| `npx @simple-reporting/base create component`            | Creates a component                                                            |
-| `npx @simple-reporting/base add components`              | Adds predefined components                                                     |
-| `npx @simple-reporting/base remove components`           | Removes one or more components                                                 |
-| `npx @simple-reporting/base add groups`                  | Adds predefined groups and their components                                    |
-| `npx @simple-reporting/base remove groups`               | Removes one or more groups                                                     |
+| Command                         | Description                                                                    |
+|---------------------------------|--------------------------------------------------------------------------------|
+| `npm install`                   | Installs all packages listed in `package.json`                                 |
+| `npm run dev`                   | Starts the development environment including SCSS and JS watcher (Live Reload) |
+| `npm run build`                 | Generates all CSS and JS files and ZIP packages in `.output`                   |
+| `npx srl create component`      | Creates a component                                                            |
+| `npx srl add components`        | Adds predefined components                                                     |
+| `npx srl remove components`     | Removes one or more components                                                 |
+| `npx srl add groups`            | Adds predefined groups and their components                                    |
+| `npx srl remove groups`         | Removes one or more groups                                                     |
 

package/dev/.ddev/config.yaml

@@ -1,4 +1,4 @@
-name: nassauische-ld
+name: standard-ld
 type: php
 docroot: .output/ddev
 php_version: '8.3'

package/dev/package.json

@@ -19,7 +19,7 @@
     "postinstall": "srl prepare"
   },
   "dependencies": {
-    "@simple-reporting/base": "^1.0.4",
+    "@simple-reporting/base": "^1.0.6",
     "axios": "^1.9.0",
     "chalk": "^5.4.1",
     "exceljs": "^4.4.0",

package/dev/srl.config.json

@@ -454,7 +454,7 @@
         "line-height": 1.5,
         "font-style": "normal",
         "font-weight": 400,
-        "color": "green-1000",
+        "color": "primary-1000",
         "letter-spacing": 0,
         "media": {
           "print": {
@@ -746,23 +746,23 @@
         "color": "#ff7d00"
       },
       {
-        "name": "blue-200",
+        "name": "secondary-200",
         "color": "#ccd1e7"
       },
       {
-        "name": "blue-400",
+        "name": "secondary-400",
         "color": "#99a3cf"
       },
       {
-        "name": "blue-600",
+        "name": "secondary-600",
         "color": "#6675b7"
       },
       {
-        "name": "blue-800",
+        "name": "secondary-800",
         "color": "#33479f"
       },
       {
-        "name": "blue-1000",
+        "name": "secondary-1000",
         "color": "#001987"
       },
       {

package/livingdocs/020.Text/060.quote-with-portrait/scss/general.scss

@@ -1,7 +1,5 @@
 @use 'srl';
 @use "sass:map";
-@use "assets/scss/margins";
-@use "spacing-variations";
 
 $quote-open: map.get(srl.$meta, quote, quote-open);
 $quote-close: map.get(srl.$meta, quote, quote-close);

package/livingdocs/020.Text/060.quote-with-portrait/scss/pdf.scss

@@ -1,6 +1,4 @@
 @use 'srl';
-@use "assets/scss/margins";
-@use "spacing-variations";
 
 .srl-quote--with-image {
   flex-direction: row;

package/livingdocs/040.Media/030.video/scss/web.scss

@@ -49,22 +49,22 @@
   border-radius: 50%;
   transition: background-color 0.3s ease;
   -webkit-appearance: none;
-  border: 1px solid srl.colors-green-1000();
-  color: srl.colors-green-1000();
+  border: 1px solid srl.colors-primary-1000();
+  color: srl.colors-primary-1000();
 
   @media (prefers-reduced-motion: reduce) {
     transition-duration: 0s;
   }
 
   &:hover {
-    background-color: srl.colors-green-1000();
-    border-color: srl.colors-green-1000();
+    background-color: srl.colors-primary-1000();
+    border-color: srl.colors-primary-1000();
     color: srl.colors-white-1000();
   }
 
   &:focus {
-    background-color: srl.colors-umbra-1000();
-    border-color: srl.colors-umbra-1000();
+    background-color: srl.colors-secondary-1000();
+    border-color: srl.colors-secondary-1000();
     color: srl.colors-white-1000();
   }
 }

package/livingdocs/100.Misc/010.anchor/scss/editor.scss

@@ -3,8 +3,8 @@
 @use 'assets/scss/placeholders';
 
 .srl-anchor {
-  border-top: 1px solid #{srl.colors-burgundy-1000()};
-  border-bottom: 1px solid #{srl.colors-burgundy-1000()};
+  border-top: 1px solid #{srl.colors-secondary-1000()};
+  border-bottom: 1px solid #{srl.colors-secondary-1000()};
   @include srl.spacer-padding-block(200);
   @extend %srl-grid-base;
 }

package/livingdocs/110.PDF/010.pdf-pagebreak/scss/editor.scss

@@ -3,8 +3,8 @@
 @use 'assets/scss/placeholders';
 
 .srl-pdf-pagebreak {
-  border-top: 1px solid #{srl.colors-burgundy-1000()};
-  border-bottom: 1px solid #{srl.colors-burgundy-1000()};
+  border-top: 1px solid #{srl.colors-secondary-1000()};
+  border-bottom: 1px solid #{srl.colors-secondary-1000()};
   text-align: center;
   @include srl.spacer-padding-block(200);
   @extend %srl-grid-base;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simple-reporting/base",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "Manage srl templates, build and publish",
   "bin": {
     "srl": "cli.js"

package/scripts/init.js

@@ -51,6 +51,11 @@ async function init(folder, options) {
         );
       });
 
+      const ddevConfigPath = join(projectPath, '.ddev', 'config.yaml');
+      let ddevConfig = await readFileSync(ddevConfigPath, 'utf8');
+      ddevConfig = ddevConfig.replace(/name: .*/, `name: ${folder.replaceAll(/[^a-zA-Z0-9-]/g, '-').toLowerCase()}`);
+      await writeFileSync(ddevConfigPath, ddevConfig, 'utf8');
+
       await writeFileSync(
         `${projectPath}/.gitignore`,
         `/.output/\n/.srl/\n/node_modules/\n/public/downloads/\n/public/html/\n/public/images/\n/public/json/\n/public/exclude/\n/dev-dist/`,

package/scripts/ldd/mapLdd.js

@@ -152,7 +152,13 @@ async function mapComponents(lddJson) {
           );
           const componentHtml = readFileSync(htmlPath, { encoding: 'utf-8' });
 
-          lddComponents.push({ ...componentDeclaration, html: componentHtml });
+          lddComponents.push({ 
+            ...componentDeclaration, 
+            html: componentHtml
+                    .replaceAll(/>\s+/g, ">")
+                    .replaceAll(/\s+</g, "<")
+                    .trim()
+          });
         }
       } catch (error) {}
 

package/srl/components/Srl/Article/Root.vue

@@ -32,7 +32,7 @@ import { nextTick, ref, onMounted } from 'vue';
 import VRuntimeTemplate from 'vue3-runtime-template';
 import Autoload from '@/Autoload.ts';
 import { useRoute } from 'vue-router';
-import { useArticle, useArticles, useConfig, useRoot } from '#composables';
+import { useArticle, useArticles, useConfig } from '#composables';
 import { prepareHtmlContent } from '#utils';
 
 const articleRoot = ref<HTMLDivElement | null>(null);

package/srl/components/Srl/Page/App.vue

@@ -36,15 +36,13 @@
  * to other components in the application.
  */
 import App from '@/App.vue';
-import { ref, watch } from 'vue';
+import { watch } from 'vue'
+import { useCssStyles } from '#composables'
 
 const styleElement = document.createElement('style');
 document.head.appendChild(styleElement);
 
-const styleContent = ref<string[]>([]);
-function addCssStyles(styles: string) {
-  styleContent.value.includes(styles) || styleContent.value.push(styles);
-}
+const styleContent = useCssStyles();
 watch(
   styleContent.value,
   (newStyles) => {
@@ -52,10 +50,6 @@ watch(
   },
   { immediate: true },
 );
-
-defineExpose({
-  addCssStyles,
-});
 </script>
 
 <template>

package/srl/composables/cssStyles.ts

@@ -0,0 +1,16 @@
+import { ref } from 'vue';
+
+const cssStyles = ref<string[]>([]);
+
+export function addCssStyles(cssString: string): void {
+  cssStyles.value.includes(cssString) || cssStyles.value.push(cssString);
+}
+
+export function useCssStyles(): string[] {
+  return cssStyles;
+}
+
+export default {
+  addCssStyles,
+  useCssStyles,
+}

package/srl/composables/index.ts

@@ -4,10 +4,10 @@ import _useConfig from './config';
 import _useDownloads from './downloads';
 import _useLocale from './locale';
 import _useMenu from './menu';
-import _useRoot from './root';
 import _useSearch from './search';
 import _useSettings from './settings';
 import _useViewPort from './viewPort';
+import * as cssStyles from './cssStyles.ts'
 
 export const useArticle = _useArticle;
 export const useArticles = _useArticles;
@@ -15,10 +15,11 @@ export const useConfig = _useConfig;
 export const useDownloads = _useDownloads;
 export const useLocale = _useLocale;
 export const useMenu = _useMenu;
-export const useRoot = _useRoot;
 export const useSearch = _useSearch;
 export const useSettings = _useSettings;
 export const useViewPort = _useViewPort;
+export const addCssStyles = cssStyles.addCssStyles;
+export const useCssStyles = cssStyles.useCssStyles;
 
 export default {
   useArticle,
@@ -27,8 +28,9 @@ export default {
   useDownloads,
   useLocale,
   useMenu,
-  useRoot,
   useSearch,
   useSettings,
   useViewPort,
+  addCssStyles,
+  useCssStyles,
 };

package/srl/utils/html.ts

@@ -1,5 +1,6 @@
 import { isRouterPath } from '#utils/uri.ts';
-import { useArticles, useLocale, useRoot } from '#composables';
+import { useArticles, useLocale, addCssStyles } from '#composables';
+
 function attributesToString(attributes: Record<string, string | null>): string {
   return Object.entries(attributes)
     .map(([key, value]) => (value !== null ? `${key}="${value}"` : key))
@@ -7,7 +8,6 @@ function attributesToString(attributes: Record<string, string | null>): string {
 }
 
 export function prepareHtmlContent(text: string): string {
-  const rootComponent = useRoot();
   const articles = useArticles();
   const locale = useLocale();
 
@@ -34,7 +34,6 @@ export function prepareHtmlContent(text: string): string {
       const arrLink = attrObj.href.split('#');
 
       if (isRouterPath(arrLink[0])) {
-        console.log(arrLink);
         delete attrObj.href;
         if (arrLink[0].startsWith('./')) {
           arrLink[0] = arrLink[0].substring(1);
@@ -70,7 +69,7 @@ export function prepareHtmlContent(text: string): string {
   text = text.replaceAll('../', `./`);
 
   text = text.replace(/<style[^>]*>([\s\S]*?)<\/style>/gi, (match, p1) => {
-    rootComponent.addCssStyles(p1);
+    addCssStyles(p1);
     return '';
   });
 

package/srl/composables/root.ts

@@ -1,7 +0,0 @@
-import SrlPageApp from '#components/Srl/Page/App.vue';
-import { getCurrentInstance } from 'vue';
-
-export default function useRoot(): typeof SrlPageApp {
-  const instance = getCurrentInstance();
-  return instance?.proxy?.$root ?? window.app._instance.root.setupState;
-}