@vcmap/ui 5.3.7 → 6.0.0-rc.10

package/build/build.js

@@ -1,5 +1,6 @@
 import path from 'path';
 import fs from 'fs';
+import { readFile, writeFile } from 'node:fs/promises';
 import { build } from 'vite';
 import { v4 as uuid } from 'uuid';
 
@@ -13,7 +14,6 @@ import {
   getFileMd5,
   getFilesInDirectory,
   libraries,
-  writeRewrittenFile,
 } from './buildHelpers.js';
 
 /**
@@ -77,8 +77,17 @@ function hashLibraries() {
       },
       entry: path.join('lib', 'ui.js'),
     },
-    'vuetify/lib': {
-      entry: path.join('lib', 'vuetify.js'),
+    vuetify: {
+      entry: path.join('lib', 'vuetifyLib.js'),
+      // vuetify special case, the entry to compile is the vuetifyLib, but the public entry must be vuetify.js
+      // vuetifyLib will reexport the nested vuetify namespace as a flat namespace, so we can easily point all
+      // nested namespaces to the vuetify entry file.
+      libraryEntry: path.join('lib', 'vuetify.js'),
+      rollupOptions: {
+        output: {
+          manualChunks: () => 'vuetify.js', // this is needed, otherwise vitejs will create multiple chunks.
+        },
+      },
     },
   };
 
@@ -88,11 +97,23 @@ function hashLibraries() {
       throw new Error(`Trying to build unexported library ${key}`);
     }
     value.lib = libraries[key];
-    value.hash = `${uuid().substring(0, 6)}`;
-    libraryPaths[key] = `./${value.lib}.${value.hash}.js`;
+    value.hash = `${uuid().substring(0, 8)}`;
+    libraryPaths[key] = `./${value.lib}-${value.hash}.js`;
     value.rollupOptions = value.rollupOptions ? value.rollupOptions : {};
   });
 
+  // Handle extended Vuetify libraries
+  Object.keys(libraries).forEach((key) => {
+    if (!libraryPaths[key]) {
+      if (key.startsWith('vuetify')) {
+        libraryPaths[key] = libraryPaths.vuetify;
+      }
+      if (key.startsWith('@cesium')) {
+        libraryPaths[key] = libraryPaths['@vcmap-cesium/engine'];
+      }
+    }
+  });
+
   return { libraryBuildOptions, libraryPaths };
 }
 
@@ -100,11 +121,13 @@ const { libraryBuildOptions, libraryPaths } = hashLibraries();
 console.log('Building ol dump file');
 await generateOLLib();
 
+const distFolder = path.join(process.cwd(), 'dist');
+const assetsFolder = path.join(distFolder, 'assets');
+
 /** Cleaning/recreating Dist Folder */
-if (await fs.existsSync(path.join(process.cwd(), 'dist'))) {
-  await fs.promises.rm(path.join(process.cwd(), 'dist'), { recursive: true });
+if (await fs.existsSync(distFolder)) {
+  await fs.promises.rm(distFolder, { recursive: true });
 }
-const assetsFolder = path.join(process.cwd(), 'dist', 'assets');
 await fs.promises.mkdir(assetsFolder, { recursive: true });
 
 /**
@@ -120,6 +143,8 @@ const fileTypesToHash = ['.png', '.css', '.svg', '.woff2'];
  * we exclude the materialDesignIcons font because we do not want to also rewrite the materialDesignIcons.css file.
  * The .woff2 is loaded with the materialDesignIcons Version number as a query parameter. So this also makes sure,
  * that the browser can cache the file.
+ *
+ * we also exclude favicons from hashing, to just use the index.html as is.
  */
 const filesToExclude = [
   path.join(
@@ -129,6 +154,11 @@ const filesToExclude = [
     'fonts',
     'materialdesignicons-webfont.woff2',
   ),
+  path.join('assets', 'favicon-4c4ce5df.svg'),
+  path.join('assets', 'favicon-32-4c4ce5df.png'),
+  path.join('assets', 'favicon-128-4c4ce5df.png'),
+  path.join('assets', 'favicon-180-4c4ce5df.png'),
+  path.join('assets', 'favicon-192-4c4ce5df.png'),
 ];
 const hashedPublicFiles = new Map();
 const filesToCopy = new Map();
@@ -144,7 +174,7 @@ for await (const filePath of getFilesInDirectory(publicAssetsFolder)) {
     const fileHash = await getFileMd5(filePath);
     const hashedFileUrl = path.posix.join(
       ...path.dirname(relativePathInDist).split(path.sep),
-      `${path.basename(filePath, fileType)}.${fileHash.slice(0, 6)}${fileType}`,
+      `${path.basename(filePath, fileType)}-${fileHash.slice(0, 8)}${fileType}`,
     );
     hashedPublicFiles.set(
       path.posix.join(...relativePath.split(path.sep)),
@@ -153,9 +183,9 @@ for await (const filePath of getFilesInDirectory(publicAssetsFolder)) {
     const newFilePath = path.join(
       assetsFolder,
       path.dirname(relativePathInDist),
-      `${path.basename(relativePath, fileType)}.${fileHash.slice(
+      `${path.basename(relativePath, fileType)}-${fileHash.slice(
         0,
-        6,
+        8,
       )}${fileType}`,
     );
     filesToCopy.set(filePath, newFilePath);
@@ -170,57 +200,28 @@ for await (const [originalFilePath, newFilePath] of filesToCopy) {
 }
 
 console.log('Building app');
-const buildoutput = await build({
-  configFile: './build/commonViteConfig.js',
-  base: './',
-  define: {
-    'process.env.NODE_ENV': '"production"',
-  },
-  build: {
-    write: false,
-    modulePreload: false,
-    emptyOutDir: true,
-    rollupOptions: {
-      external: Object.keys(libraries),
-      output: {
-        paths: libraryPaths,
-      },
-    },
-  },
-});
-
-/**
- * Building the Main entrypoint (index.html + index.js)
- * This will ensure that all references to public assets will be rewritten to the hashed filename
- */
-await Promise.all(
-  buildoutput.output?.map((output) => {
-    if (output.type === 'asset') {
-      const { source, fileName } = output;
-      // remove loading of materialdesignicons from index.html, we will later inject this in the ui.js
-      const fileContent = source.replace(
-        /<link[^>]*href=".*materialdesignicons\.min\.css"[^>]*(>[^<]*<\/link>|\/>)/,
-        '',
-      );
-      return writeRewrittenFile(
-        path.join(process.cwd(), 'dist', fileName),
-        fileContent,
-        hashedPublicFiles,
-        'assets',
-      );
-    }
-    if (output.type === 'chunk') {
-      const { code, fileName } = output;
-      return writeRewrittenFile(
-        path.join(process.cwd(), 'dist', fileName),
-        code,
-        hashedPublicFiles,
-        'assets',
-      );
-    }
-    return undefined;
-  }),
+let indexHTMLContent = await readFile('./index.html', { encoding: 'utf8' });
+// remove mdi icons link, will be later loaded from the ui.js
+indexHTMLContent = indexHTMLContent.replace(
+  /<link[^>]*href=".*materialdesignicons\.min\.css"[^>]*>/,
+  '',
 );
+// replace @vcmap/ui with './assets/ui.js'
+indexHTMLContent = indexHTMLContent.replace(/@vcmap\/ui/, './assets/ui.js');
+await writeFile(path.join(distFolder, 'index.html'), indexHTMLContent, {
+  encoding: 'utf8',
+});
+const htaccessContent = `
+    <FilesMatch "-[\\w\\d]{8}\\.(js|css)$">
+        Header set Cache-Control "public, max-age=31540000, immutable"
+    </FilesMatch>
+    <FilesMatch "(index\\.html|config\\.json|ui\\.js|vue\\.js|vuetify\\.js|ol\\.js|cesium\\.js|core\\.js)$">
+        Header set Cache-Control "no-store, max-age=0"
+    </FilesMatch>
+`;
+await writeFile(path.join(distFolder, '.htaccess'), htaccessContent, {
+  encoding: 'utf8',
+});
 
 /**
  * Building the Libraries, (vue, vuetify, openlayers, cesium, core, and ui). This will build one hashed library.hash.js
@@ -231,9 +232,10 @@ console.log('Building Libraries');
 await Promise.all(
   Object.entries(libraryBuildOptions).map(async ([key, value]) => {
     console.log('Building Library: ', key);
-    const external = Object.keys(libraryBuildOptions).filter((library) => {
-      return key !== library;
+    const external = Object.keys(libraries).filter((library) => {
+      return key !== library && !library.startsWith(key);
     });
+
     const output = {
       ...value.rollupOptions?.output,
       paths: libraryPaths,
@@ -249,7 +251,7 @@ await Promise.all(
         lib: {
           entry: path.resolve(process.cwd(), value.entry),
           formats: ['es'],
-          fileName: `${value.lib}.${value.hash}`,
+          fileName: `${value.lib}-${value.hash}`,
         },
         rollupOptions: {
           ...value.rollupOptions,

package/build/buildHelpers.js

@@ -1,4 +1,3 @@
-/* eslint import/no-extraneous-dependencies: ["error", { "devDependencies": false }] */
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { build } from 'vite'; // vite is also a plugin-cli dep
 import fs from 'fs';
@@ -159,18 +158,12 @@ export async function buildLibrary(
   base64Css = false,
   rewrittenPublicAssets = undefined,
 ) {
-  // Base64 contains the characters '+', '/', and '=', which have a reserved meaning in URLs.
-  // Base64url solves this by replacing '+' with '-' and '/' with '_'.
-  // See https://stackoverflow.com/a/55389212
   const cssInjectorCode = `
 function loadCss(href) {
-  const base64url = href
-    .replace(/-/g, '+')
-    .replace(/_/g, '/');
   return new Promise((resolve, reject) => {
     const elem = document.createElement('link');
     elem.rel = 'stylesheet';
-    elem.href = base64url;
+    elem.href = href;
     elem.defer = false;
     elem.async = false;
     elem.onload = resolve;
@@ -180,12 +173,12 @@ function loadCss(href) {
 }`;
 
   const write = async (output) => {
-    const addedHash = hash ? `.${hash}` : '';
+    const addedHash = hash ? `-${hash}` : '';
     let css = false;
     if (output[1] && output[1].type === 'asset') {
       if (base64Css) {
         css = `data:text/css;base64,${Buffer.from(output[1].source).toString(
-          'base64url',
+          'base64',
         )}`;
       } else {
         await writeRewrittenFile(
@@ -268,7 +261,12 @@ export const libraries = {
   ol: 'ol',
   '@vcmap/core': 'core',
   '@vcmap/ui': 'ui',
-  'vuetify/lib': 'vuetify',
+  vuetify: 'vuetify',
+  'vuetify/components': 'vuetify',
+  'vuetify/styles': 'vuetify',
+  'vuetify/directives': 'vuetify',
+  'vuetify/blueprints': 'vuetify',
+  'vuetify/labs/components': 'vuetify',
 };
 
 const toCopy = [
@@ -280,7 +278,12 @@ const toCopy = [
   'README.md',
 ];
 
-async function buildInlinePlugin(plugin, baseConfig, minify) {
+async function buildInlinePlugin(
+  plugin,
+  baseConfig,
+  minify,
+  isDependend = false,
+) {
   // the relative path between plugins and libraries, is not known beforehand, so we calculate the distance.
   // posixRelativePath is the relative path between the index.js of the plugin and the specific library.
   const relativePluginPaths = {};
@@ -293,7 +296,15 @@ async function buildInlinePlugin(plugin, baseConfig, minify) {
       .join(path.posix.sep);
   });
 
-  const pluginDir = getProjectPath('plugins', plugin);
+  const pluginDir = isDependend
+    ? getProjectPath('plugins', 'node_modules', plugin)
+    : getProjectPath('plugins', plugin);
+
+  const isTs = fs.existsSync(path.join(pluginDir, 'src', 'index.ts'));
+  const entry = isTs
+    ? path.join(pluginDir, 'src', 'index.ts')
+    : path.join(pluginDir, 'src', 'index.js');
+
   const pluginConfig = {
     ...baseConfig,
     esbuild: {
@@ -304,13 +315,14 @@ async function buildInlinePlugin(plugin, baseConfig, minify) {
       emptyOutDir: false,
       outDir: `dist/plugins/${plugin}/`,
       lib: {
-        entry: path.join(pluginDir, 'src', 'index.js'),
+        entry,
         formats: ['es'],
         fileName: 'index',
       },
       rollupOptions: {
         external: Object.keys(libraries),
         output: {
+          manualChunks: () => 'index.js',
           paths: relativePluginPaths,
         },
       },
@@ -322,11 +334,11 @@ async function buildInlinePlugin(plugin, baseConfig, minify) {
   }
   await buildLibrary(pluginConfig, `plugins/${plugin}`, 'index', '', true);
   await Promise.all(
-    toCopy.map(async (entry) => {
-      if (fs.existsSync(path.join(pluginDir, entry))) {
+    toCopy.map(async (fileEntry) => {
+      if (fs.existsSync(path.join(pluginDir, fileEntry))) {
         await fs.promises.cp(
-          path.join(pluginDir, entry),
-          path.join(distPath, entry),
+          path.join(pluginDir, fileEntry),
+          path.join(distPath, fileEntry),
           { recursive: true, force: true },
         );
       }
@@ -334,6 +346,10 @@ async function buildInlinePlugin(plugin, baseConfig, minify) {
   );
 }
 
+/**
+ * Dependent Plugins which are installed from npm are already build and we just copy the relevant files
+ * @param {string} pluginName
+ */
 async function buildDependentPlugin(pluginName) {
   const pluginsDirectory = getPluginDirectory();
   let scope = '';
@@ -366,6 +382,19 @@ async function buildDependentPlugin(pluginName) {
   );
 }
 
+function filterDependentPlugins(dependentPlugins, pluginIsBuild = true) {
+  const pluginsDir = getPluginDirectory();
+  return dependentPlugins.filter((pluginName) => {
+    const pluginExists = fs.existsSync(
+      path.join(pluginsDir, 'node_modules', ...pluginName.split('/'), 'dist'),
+    );
+    if (pluginIsBuild) {
+      return pluginExists;
+    }
+    return !pluginExists;
+  });
+}
+
 /**
  * Will build a preview of all the current plugins & inline plugins
  * @param {import("vite").InlineConfig} [baseConfig={}] - the base config to use. build & esbuild will be completely overwritten
@@ -375,14 +404,25 @@ async function buildDependentPlugin(pluginName) {
 export async function buildPluginsForPreview(baseConfig = {}, minify = true) {
   const inlinePlugins = await getInlinePlugins();
   const dependentPlugins = await getPluginNames();
+  // only take already build plugins into account.
+  // Plugins loaded from a git repository do not have a dist folder.
+  // These plugins need to be build, same as the inline plugins
+  const buildDependentPlugins = filterDependentPlugins(dependentPlugins, true);
+  const notBuildDependentPlugins = filterDependentPlugins(
+    dependentPlugins,
+    false,
+  );
 
   const promises = inlinePlugins.map((plugin) =>
     buildInlinePlugin(plugin, baseConfig, minify),
   );
 
   promises.push(
-    ...dependentPlugins.map(async (pluginName) =>
-      buildDependentPlugin(pluginName, baseConfig, minify),
+    ...buildDependentPlugins.map(async (pluginName) =>
+      buildDependentPlugin(pluginName),
+    ),
+    ...notBuildDependentPlugins.map(async (pluginName) =>
+      buildInlinePlugin(pluginName, baseConfig, minify, true),
     ),
   );
   await Promise.all(promises);
@@ -391,14 +431,22 @@ export async function buildPluginsForPreview(baseConfig = {}, minify = true) {
 export async function buildPluginsForBundle(baseConfig = {}) {
   const inlinePlugins = await getInlinePlugins();
   const dependentPlugins = await getPluginNames(false);
+  const buildDependentPlugins = filterDependentPlugins(dependentPlugins, true);
+  const notBuildDependentPlugins = filterDependentPlugins(
+    dependentPlugins,
+    false,
+  );
   const promises = inlinePlugins
     .filter((plugin) => plugin.startsWith('@vcmap/'))
     .map((plugin) => buildInlinePlugin(plugin, baseConfig, true));
 
   promises.push(
-    ...dependentPlugins.map(async (pluginName) =>
+    ...buildDependentPlugins.map(async (pluginName) =>
       buildDependentPlugin(pluginName),
     ),
+    ...notBuildDependentPlugins.map(async (pluginName) =>
+      buildInlinePlugin(pluginName, baseConfig, true, true),
+    ),
   );
   await Promise.all(promises);
 }

package/build/buildTypes.js

@@ -109,6 +109,26 @@ async function fixTemplateFunctions() {
   );
 }
 
+async function vueAugmentations() {
+  let content = await readFile('./index.d.ts', 'utf-8');
+  content = `${content}
+declare module 'vue' {
+  interface ComponentCustomProperties {
+    $st(key: string | number | undefined | null): string;
+    $st(key: string | number | undefined | null, plural: number, options?: import("vue-i18n").TranslateOptions<import("vue-i18n").Locale>): string;
+    $st(key: string | number | undefined | null, defaultMsg: string, options?: import("vue-i18n").TranslateOptions<import("vue-i18n").Locale>): string;
+    $st(key: string | number | undefined | null, list: unknown[], options?: import("vue-i18n").TranslateOptions<import("vue-i18n").Locale>): string;
+    $st(key: string | number | undefined | null, list: unknown[], plural: number): string;
+    $st(key: string | number | undefined | null, list: unknown[], defaultMsg: string): string;
+    $st(key: string | number | undefined | null, named: import("vue-i18n").NamedValue, options?: import("vue-i18n").TranslateOptions<import("vue-i18n").Locale>): string;
+    $st(key: string | number | undefined | null, named: import("vue-i18n").NamedValue, plural: number): string;
+    $st(key: string | number | undefined | null, named: import("vue-i18n").NamedValue, defaultMsg: string): string;
+  }
+}
+`;
+  await writeFile('./index.d.ts', content);
+}
+
 function printTypeErrors(stdout) {
   let withinNodeModule = false;
   const lines = stdout.split(EOL).filter((line) => {
@@ -156,6 +176,8 @@ async function run() {
   await fixTemplateFunctions();
   console.log('exporting types');
   await addTypeExports();
+  console.log('augmenting vue');
+  await vueAugmentations();
   if (process.argv.includes('--skipValidation')) {
     return;
   }

package/build/bundle.js

@@ -1,6 +1,6 @@
 import vcsOl from '@vcmap/rollup-plugin-vcs-ol';
 import { join as joinPath } from 'path';
-import tar from 'tar';
+import * as tar from 'tar';
 import { cp, rm } from 'fs/promises';
 import { createGzip } from 'zlib';
 import { pipeline } from 'stream';

package/build/commonViteConfig.js

@@ -1,7 +1,8 @@
 /* eslint-disable import/extensions */
 import path from 'path';
 import { defineConfig } from 'vite';
-import vue2 from '@vitejs/plugin-vue2';
+import vue3 from '@vitejs/plugin-vue';
+import { transformAssetUrls } from 'vite-plugin-vuetify';
 import { libraries } from './buildHelpers.js';
 
 const configMain = defineConfig({
@@ -9,7 +10,6 @@ const configMain = defineConfig({
     alias: {
       '@vcmap/ui': `${path.resolve(process.cwd(), 'index.js')}`,
       '@cesium/engine': '@vcmap-cesium/engine',
-      vue: 'vue/dist/vue.esm.js',
       tinyqueue: 'tinyqueue/tinyqueue.js',
     },
     dedupe: Object.keys(libraries),
@@ -17,14 +17,11 @@ const configMain = defineConfig({
   define: {
     'process.env.NODE_ENV': '"development"',
   },
-  plugins: [vue2()],
-  css: {
-    preprocessorOptions: {
-      sass: {
-        additionalData: "\n@import './src/styles/variables.scss'\n",
-      },
-    },
-  },
+  plugins: [
+    vue3({
+      template: { transformAssetUrls },
+    }),
+  ],
 });
 
 export default configMain;

package/build/generateOLLib.js

@@ -67,7 +67,11 @@ function spawnJSDoc() {
   return new Promise((resolve, reject) => {
     let output = '';
     let errors = '';
-    const child = spawn(getBinaryPath('jsdoc'), ['-c', jsdocConfig, sourceDir]);
+    const child = spawn(
+      getBinaryPath('jsdoc'),
+      ['-c', jsdocConfig, sourceDir],
+      { shell: true },
+    );
 
     child.stdout.on('data', (data) => {
       output += String(data);

package/build/info/conf.json

@@ -8,7 +8,7 @@
   },
   "source": {
     "includePattern": "\\.js$",
-    "exclude": ["dist"]
+    "exclude": ["dist", "node_modules/ol/node_modules"]
   },
   "plugins": [
     "jsdoc-plugin-intersection",

package/build/info/publish.js

@@ -20,37 +20,31 @@ exports.publish = function publish(data) {
 
   // get all doclets that have exports
   const classes = {};
-  const docs = data(
-    [
-      { define: { isObject: true } },
-      function someKindOfExportsTransformer() {
-        if (this?.meta?.code?.name) {
-          if (this.meta.code.name === 'module.exports') {
-            this.exports = 'default';
-          } else if (String(this.meta.code.name).startsWith('exports.')) {
-            this.exports = this.meta.code.name.replace(/exports./, '');
-          }
-        }
-        if (this.kind === 'class') {
-          if (
-            !('extends' in this) ||
-            typeof this.api === 'boolean' ||
-            this.exports
-          ) {
-            classes[this.longname] = this;
-            return true;
-          }
-        }
-        return (
-          typeof this.api === 'boolean' ||
-          this.exports ||
-          (this.meta && /[\\/]externs$/.test(this.meta.path))
-        );
-      },
-    ],
-    { kind: { '!is': 'file' } },
-    { kind: { '!is': 'event' } },
-  ).get();
+  const docs = data(function someKindOfExportsTransformer() {
+    if (this?.meta?.code?.name) {
+      if (this.meta.code.name === 'module.exports') {
+        this.exports = 'default';
+      } else if (String(this.meta.code.name).startsWith('exports.')) {
+        this.exports = this.meta.code.name.replace(/exports./, '');
+      }
+    }
+    if (this.kind === 'class') {
+      if (
+        !('extends' in this) ||
+        typeof this.api === 'boolean' ||
+        this.exports
+      ) {
+        classes[this.longname] = this;
+        return true;
+      }
+    }
+    return (
+      !['file', 'event', 'module'].includes(this.kind) &&
+      (typeof this.api === 'boolean' ||
+        this.exports ||
+        (this.meta && /[\\/]externs$/.test(this.meta.path)))
+    );
+  }).get();
 
   // get symbols data, filter out those that are members of private classes
   const symbols = [];
@@ -154,8 +148,8 @@ exports.publish = function publish(data) {
         const target = isExterns
           ? externs
           : doc.api || doc.exports
-          ? symbols
-          : base;
+            ? symbols
+            : base;
         const existingSymbol = symbolsByName[symbol.name];
         if (existingSymbol) {
           const idx = target.indexOf(existingSymbol);

package/build/lintTypes.js

@@ -10,6 +10,16 @@ async function lintTypes() {
   for await (const path of getFilesInDirectory('./src')) {
     if (path.endsWith('.d.ts') && !path.endsWith('vue.d.ts')) {
       const content = await readFile(path, 'utf8');
+      if (path.endsWith('vcsUiApp.d.ts')) {
+        // we do not check the vcsUiApp.d.ts, because the vuetify return Type has several occurances of any
+        // eslint-disable-next-line no-continue
+        continue;
+      }
+      if (path.endsWith('uiConfig.d.ts')) {
+        // we do not check the vcsUiApp.d.ts, because import("vue").DeepReadonly creates an any type
+        // eslint-disable-next-line no-continue
+        continue;
+      }
       // eslint-disable-next-line no-loop-func
       content.split(EOL).forEach((line, index) => {
         const matches = line.match(anyRegex);

package/build/staging/Dockerfile

@@ -1,2 +1,2 @@
 FROM httpd:2-buster
-COPY * /usr/local/apache2/htdocs/
+COPY . /usr/local/apache2/htdocs/

package/config/aerowest.config.json

@@ -271,7 +271,12 @@
       "minZoom": 2,
       "hideLevels": null,
       "properties": {
-        "title": "Schrägluftbilder 2020"
+        "title": "Schrägluftbilder 2020",
+        "attributions": {
+          "provider": "Aerowest",
+          "year": "2020",
+          "url": "https://www.aerowest.de/"
+        }
       }
     },
     {
@@ -292,7 +297,12 @@
       "minZoom": 2,
       "hideLevels": null,
       "properties": {
-        "title": "Schrägluftbilder 2019"
+        "title": "Schrägluftbilder 2019",
+        "attributions": {
+          "provider": "Aerowest",
+          "year": "2019",
+          "url": "https://www.aerowest.de/"
+        }
       }
     }
   ],