2.0.15

.gitignore

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

.gitlab-ci.yml

@@ -24,13 +24,14 @@ mirror:
     - docker
     - notpriv
 
-snyk:
-  image: registry.gitlab.com/hosttoday/ht-docker-node:snyk
+audit:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
     - npmci npm prepare
     - npmci command npm install --ignore-scripts
-    - npmci command snyk test
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command npm audit --audit-level=high
   tags:
     - lossless
     - docker

package.json

@@ -1,36 +1,37 @@
 {
   "name": "@pushrocks/websetup",
-  "version": "2.0.5",
+  "version": "2.0.15",
   "private": false,
   "description": "setup basic page properties",
-  "main": "dist/index.js",
-  "typings": "dist/index.d.ts",
+  "main": "dist_ts/index.js",
+  "typings": "dist_ts/index.d.ts",
   "author": "Lossless GmbH",
   "license": "MIT",
   "scripts": {
     "test": "(tstest test/)",
-    "build": "(tsbuild --web)",
-    "format": "(gitzone format)"
+    "build": "(tsbuild --web && tsbundle npm)"
   },
   "keywords": [
     "lossless",
     "websafe"
   ],
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.17",
+    "@gitzone/tsbuild": "^2.1.22",
+    "@gitzone/tsbundle": "^1.0.57",
     "@gitzone/tstest": "^1.0.28",
-    "@pushrocks/tapbundle": "^3.2.0",
-    "tslint": "^6.0.0",
+    "@pushrocks/tapbundle": "^3.2.1",
+    "tslint": "^6.1.0",
     "tslint-config-prettier": "^1.15.0"
   },
   "dependencies": {
-    "@tsclass/tsclass": "^3.0.12"
+    "@tsclass/tsclass": "^3.0.18"
   },
   "files": [
     "ts/**/*",
     "ts_web/**/*",
     "dist/**/*",
-    "dist_web/**/*",
+    "dist_*/**/*",
+    "dist_ts/**/*",
     "dist_ts_web/**/*",
     "assets/**/*",
     "cli.js",

readme.md

@@ -8,16 +8,28 @@ setup basic page properties
 * [docs (typedoc)](https://pushrocks.gitlab.io/websetup/)
 
 ## Status for master
-[![pipeline status](https://gitlab.com/pushrocks/websetup/badges/master/pipeline.svg)](https://gitlab.com/pushrocks/websetup/commits/master)
-[![coverage report](https://gitlab.com/pushrocks/websetup/badges/master/coverage.svg)](https://gitlab.com/pushrocks/websetup/commits/master)
-[![npm downloads per month](https://img.shields.io/npm/dm/@pushrocks/websetup.svg)](https://www.npmjs.com/package/@pushrocks/websetup)
-[![Known Vulnerabilities](https://snyk.io/test/npm/@pushrocks/websetup/badge.svg)](https://snyk.io/test/npm/@pushrocks/websetup)
-[![TypeScript](https://img.shields.io/badge/TypeScript->=%203.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
-[![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
-[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-prettier-ff69b4.svg)](https://prettier.io/)
+
+Status Category | Status Badge
+-- | --
+GitLab Pipelines | [![pipeline status](https://gitlab.com/pushrocks/websetup/badges/master/pipeline.svg)](https://lossless.cloud)
+GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/pushrocks/websetup/badges/master/coverage.svg)](https://lossless.cloud)
+npm | [![npm downloads per month](https://badgen.net/npm/dy/@pushrocks/websetup)](https://lossless.cloud)
+Snyk | [![Known Vulnerabilities](https://badgen.net/snyk/pushrocks/websetup)](https://lossless.cloud)
+TypeScript Support | [![TypeScript](https://badgen.net/badge/TypeScript/>=%203.x/blue?icon=typescript)](https://lossless.cloud)
+node Support | [![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+Code Style | [![Code Style](https://badgen.net/badge/style/prettier/purple)](https://lossless.cloud)
+PackagePhobia (total standalone install weight) | [![PackagePhobia](https://badgen.net/packagephobia/install/@pushrocks/websetup)](https://lossless.cloud)
+PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@pushrocks/websetup)](https://lossless.cloud)
+BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@pushrocks/websetup)](https://lossless.cloud)
+Platform support | [![Supports Windows 10](https://badgen.net/badge/supports%20Windows%2010/yes/green?icon=windows)](https://lossless.cloud) [![Supports Mac OS X](https://badgen.net/badge/supports%20Mac%20OS%20X/yes/green?icon=apple)](https://lossless.cloud)
 
 ## Usage
 
+Use TypeScript for best in class intellisense.
+
+## Contribution
+
+We are always happy for code contributions. If you are not the code contributing type that is ok. Still, maintaining Open Source repositories takes considerable time and thought. If you like the quality of what we do and our modules are useful to you we would appreciate a little monthly contribution: You can [contribute one time](https://lossless.link/contribute-onetime) or [contribute monthly](https://lossless.link/contribute). :)
 
 ## Contribution
 

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,40 @@ 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"].');
@@ -21,7 +24,7 @@ export const setupFullStory = async (fsCodeArg: string) => {
       return;
     }
     // tslint:disable-next-line: only-arrow-functions
-    g = m[e] = function(a, b, s) {
+    g = m[e] = function (a, b, s) {
       g.q ? g.q.push([a, b, s]) : g._api(a, b, s);
     };
     g.q = [];
@@ -32,36 +35,36 @@ export const setupFullStory = async (fsCodeArg: string) => {
     y = n.getElementsByTagName(t)[0];
     y.parentNode.insertBefore(o, y);
     // tslint:disable-next-line: only-arrow-functions
-    g.identify = function(i, v, s) {
+    g.identify = function (i, v, s) {
       g(l, { uid: i }, s);
       if (v) g(l, v, s);
     };
-    g.setUserVars = function(v, s) {
+    g.setUserVars = function (v, s) {
       g(l, v, s);
     };
-    g.event = function(i, v, s) {
+    g.event = function (i, v, s) {
       g('event', { n: i, p: v }, s);
     };
     // tslint:disable-next-line: only-arrow-functions
-    g.shutdown = function() {
+    g.shutdown = function () {
       g('rec', !1);
     };
-    g.restart = function() {
+    g.restart = function () {
       g('rec', !0);
     };
     // tslint:disable-next-line: only-arrow-functions
-    g.consent = function(a) {
+    g.consent = function (a) {
       g('consent', !arguments.length || a);
     };
     // tslint:disable-next-line: only-arrow-functions
-    g.identifyAccount = function(i, v) {
+    g.identifyAccount = function (i, v) {
       o = 'account';
       v = v || {};
       v.acctId = i;
       g(o, v);
     };
     // tslint:disable-next-line: only-arrow-functions
-    g.clearUserCookie = function() {};
+    g.clearUserCookie = function () {};
     // tslint:disable-next-line: no-string-literal
   })(window, document, window['_fs_namespace'], 'script', 'user');
 };

ts/tools/ganalytics.ts

@@ -7,14 +7,14 @@ declare global {
 
 export const setupGoogleAnalytics = async (gaCode: string) => {
   // tslint:disable-next-line: only-arrow-functions
-  (function(i, s, o, g, r, a, m) {
+  (function (i, s, o, g, r, a, m) {
     // tslint:disable-next-line: no-string-literal
     i['GoogleAnalyticsObject'] = r;
     // tslint:disable-next-line: ban-comma-operator
     (i[r] =
       i[r] ||
       // tslint:disable-next-line: only-arrow-functions
-      function() {
+      function () {
         (i[r].q = i[r].q || []).push(arguments);
       }),
       (i[r].l = new Date().getTime());

ts/websetup.plugins.ts

@@ -1,5 +1,3 @@
 import * as tsclass from '@tsclass/tsclass';
 
-export {
-  tsclass
-};
+export { tsclass };