2.0.13

.gitignore

@@ -15,8 +15,6 @@ node_modules/
 
 # builds
 dist/
-dist_web/
-dist_serve/
-dist_ts_web/
+dist_*/
 
 # custom

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/websetup",
-  "version": "2.0.5",
+  "version": "2.0.13",
   "private": false,
   "description": "setup basic page properties",
   "main": "dist/index.js",
@@ -9,8 +9,9 @@
   "license": "MIT",
   "scripts": {
     "test": "(tstest test/)",
-    "build": "(tsbuild --web)",
-    "format": "(gitzone format)"
+    "build": "(tsbuild --web && npm run bundle)",
+    "format": "(gitzone format)",
+    "bundle": "tsbundle --production --from ./ts/index.ts --to ./dist_bundle/bundle.js"
   },
   "keywords": [
     "lossless",
@@ -18,6 +19,7 @@
   ],
   "devDependencies": {
     "@gitzone/tsbuild": "^2.1.17",
+    "@gitzone/tsbundle": "^1.0.50",
     "@gitzone/tstest": "^1.0.28",
     "@pushrocks/tapbundle": "^3.2.0",
     "tslint": "^6.0.0",

ts/meta/index.ts

@@ -12,46 +12,63 @@ export const setupMetaInformation = async (metaObjectArg: IMetaObject) => {
   document.title = metaObjectArg.title;
   addMetaTag('description', metaObjectArg.description);
   addMetaTag('google', 'notranslate');
-  addMetaTag('revisited-after', '1 days');
+  addMetaTag('revisit-after', '1 days');
   metaObjectArg.canonicalDomain ? addLinkTag('canonical', metaObjectArg.canonicalDomain) : null;
 
   if (metaObjectArg.ldCompany) {
-    addCompanyJsonLD(metaObjectArg.ldCompany)
+    addCompanyInfo(metaObjectArg.ldCompany);
   }
 };
 
-const addMetaTag = async (linkNameArg: string, contentArg: string) => {
+const addMetaTag = async (metaNameArg: string, contentArg: string) => {
   const metaElement = document.createElement('meta');
-  metaElement.name = linkNameArg;
+  metaElement.name = metaNameArg;
   metaElement.content = contentArg;
   document.getElementsByTagName('head')[0].appendChild(metaElement);
 };
 
-const addLinkTag = async (relArg, hrefArg) => {
+const addLinkTag = async (relArg, hrefArg): Promise<Element> => {
   const link = !!document.querySelector("link[rel='canonical']")
     ? document.querySelector("link[rel='canonical']")
     : document.createElement('link');
   link.setAttribute('rel', relArg);
   link.setAttribute('href', hrefArg);
   document.head.appendChild(link);
+  return link;
 };
 
-const addCompanyJsonLD = async (companyDataArg: plugins.tsclass.business.ICompany) => {
+const addOpenGraphProperty = async (
+  propertyNameArg: string,
+  contentArg: string
+): Promise<Element> => {
+  const openGraphElement = document.createElement('meta');
+  openGraphElement.setAttribute('property', propertyNameArg);
+  openGraphElement.content = contentArg;
+  document.getElementsByTagName('head')[0].appendChild(openGraphElement);
+  return openGraphElement;
+};
+
+const addCompanyInfo = async (
+  companyDataArg: plugins.tsclass.business.ICompany
+): Promise<Element[]> => {
+  const returnElementArray: Element[] = [];
+
+  // lets care about linked data
   const companyLd = {
-    "@context": "https://schema.org",
-    "@type": "Corporation",
-    "name": companyDataArg.name,
-    "alternateName": companyDataArg.name.replace(' GmbH', ''),
-    "url": companyDataArg.contact.website,
-    "logo": companyDataArg.contact.logoUrl,
-    "contactPoint": {
-      "@type": "ContactPoint",
-      "telephone": companyDataArg.contact.phone,
-      "contactType": "customer service",
-      "areaServed": "DE",
-      "availableLanguage": ["en","German"]
+    '@context': 'https://schema.org',
+    '@type': 'Corporation',
+    name: companyDataArg.name,
+    alternateName: companyDataArg.name.replace(' GmbH', ''),
+    url: companyDataArg.contact.website,
+    logo: companyDataArg.contact.logoUrl,
+    contactPoint: {
+      '@type': 'ContactPoint',
+      telephone: companyDataArg.contact.phone,
+      contactType: 'customer service',
+      areaServed: 'DE',
+      availableLanguage: ['en', 'German']
     },
-    "sameAs": []
+    sameAs: []
   };
 
   if (companyDataArg.contact.facebookUrl) {
@@ -66,4 +83,23 @@ const addCompanyJsonLD = async (companyDataArg: plugins.tsclass.business.ICompan
   jsonLdElement.type = 'application/ld+json';
   jsonLdElement.text = JSON.stringify(companyLd);
   document.querySelector('head').appendChild(jsonLdElement);
+  returnElementArray.push(jsonLdElement);
+
+  // lets care about open graph
+  returnElementArray.push(await addOpenGraphProperty('og:type', 'business.business'));
+  returnElementArray.push(await addOpenGraphProperty('og:title', companyDataArg.name));
+  returnElementArray.push(await addOpenGraphProperty('og:url', companyDataArg.contact.website));
+  returnElementArray.push(await addOpenGraphProperty('og:image', companyDataArg.contact.logoUrl));
+  returnElementArray.push(
+    await addOpenGraphProperty(
+      'business:contact_data:street_address',
+      `${companyDataArg.contact.address.streetName} ${companyDataArg.contact.address.houseNumber}`
+    )
+  );
+  returnElementArray.push(await addOpenGraphProperty('business:contact_data:locality', companyDataArg.contact.address.postalCode));
+  returnElementArray.push(await addOpenGraphProperty('business:contact_data:region', companyDataArg.contact.address.city));
+  returnElementArray.push(await addOpenGraphProperty('business:contact_data:postal_code', companyDataArg.contact.address.postalCode));
+  returnElementArray.push(await addOpenGraphProperty('business:contact_data:country_name', companyDataArg.contact.address.country));
+
+  return returnElementArray;
 };

ts/tools/fullstory.ts

@@ -1,7 +1,10 @@
 declare global {
   // tslint:disable-next-line: interface-name
   interface Window {
+    _fs_debug: boolean;
     _fs_host: any;
+    _fs_org: string;
+    _fs_namespace: string;
   }
 }
 export const setupFullStory = async (fsCodeArg: string) => {
@@ -13,7 +16,7 @@ export const setupFullStory = async (fsCodeArg: string) => {
   window['_fs_org'] = fsCodeArg;
   // tslint:disable-next-line: no-string-literal
   window['_fs_namespace'] = 'FS';
-  (function(m, n, e, t, l, o, g, y) {
+  ((m, n, e, t, l, o, g, y) => {
     if (e in m) {
       if (m.console && m.console.log) {
         m.console.log('FullStory namespace conflict. Please set window["_fs_namespace"].');