2.0.11

.gitlab-ci.yml

@@ -4,7 +4,7 @@ image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
 cache:
   paths:
     - .npmci_cache/
-  key: "$CI_BUILD_STAGE"
+  key: '$CI_BUILD_STAGE'
 
 stages:
   - security
@@ -20,17 +20,19 @@ mirror:
   script:
     - npmci git mirror
   tags:
+    - lossless
     - docker
     - notpriv
 
 snyk:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:snyk
   stage: security
   script:
     - npmci npm prepare
-    - npmci command npm install -g snyk
     - npmci command npm install --ignore-scripts
     - npmci command snyk test
   tags:
+    - lossless
     - docker
     - notpriv
 
@@ -38,38 +40,41 @@ snyk:
 # test stage
 # ====================
 
-testLTS:
+testStable:
   stage: test
   script:
     - npmci npm prepare
-  - npmci node install lts
+    - npmci node install stable
     - npmci npm install
     - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
+    - lossless
     - docker
-  - notpriv
+    - priv
 
 testBuild:
   stage: test
   script:
     - npmci npm prepare
-  - npmci node install lts
+    - npmci node install stable
     - npmci npm install
     - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
+    - lossless
     - docker
     - notpriv
 
 release:
   stage: release
   script:
-  - npmci node install lts
+    - npmci node install stable
     - npmci npm publish
   only:
     - tags
   tags:
+    - lossless
     - docker
     - notpriv
 
@@ -81,9 +86,11 @@ codequality:
   allow_failure: true
   script:
     - npmci command npm install -g tslint typescript
+    - npmci npm prepare
     - npmci npm install
     - npmci command "tslint -c tslint.json ./ts/**/*.ts"
   tags:
+    - lossless
     - docker
     - priv
 
@@ -94,18 +101,20 @@ trigger:
   only:
     - tags
   tags:
+    - lossless
     - docker
     - notpriv
 
 pages:
-  image: hosttoday/ht-docker-node:npmci
   stage: metadata
   script:
+    - npmci node install lts
     - npmci command npm install -g @gitzone/tsdoc
     - npmci npm prepare
     - npmci npm install
     - npmci command tsdoc
   tags:
+    - lossless
     - docker
     - notpriv
   only:

.vscode/launch.json

@@ -0,0 +1,29 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "current file",
+      "type": "node",
+      "request": "launch",
+      "args": [
+        "${relativeFile}"
+      ],
+      "runtimeArgs": ["-r", "@gitzone/tsrun"],
+      "cwd": "${workspaceRoot}",
+      "protocol": "inspector",
+      "internalConsoleOptions": "openOnSessionStart"
+    },
+    {
+      "name": "test.ts",
+      "type": "node",
+      "request": "launch",
+      "args": [
+        "test/test.ts"
+      ],
+      "runtimeArgs": ["-r", "@gitzone/tsrun"],
+      "cwd": "${workspaceRoot}",
+      "protocol": "inspector",
+      "internalConsoleOptions": "openOnSessionStart"
+    }
+  ]
+}

.vscode/settings.json

@@ -0,0 +1,26 @@
+{
+  "json.schemas": [
+    {
+      "fileMatch": ["/npmextra.json"],
+      "schema": {
+        "type": "object",
+        "properties": {
+          "npmci": {
+            "type": "object",
+            "description": "settings for npmci"
+          },
+          "gitzone": {
+            "type": "object",
+            "description": "settings for gitzone",
+            "properties": {
+              "projectType": {
+                "type": "string",
+                "enum": ["website", "element", "service", "npm"]
+              }
+            }
+          }
+        }
+      }
+    }
+  ]
+}

npmextra.json

@@ -4,6 +4,7 @@
     "npmAccessLevel": "public"
   },
   "gitzone": {
+    "projectType": "npm",
     "module": {
       "githost": "gitlab.com",
       "gitscope": "pushrocks",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/websetup",
-  "version": "2.0.2",
+  "version": "2.0.11",
   "private": false,
   "description": "setup basic page properties",
   "main": "dist/index.js",
@@ -17,19 +17,22 @@
     "websafe"
   ],
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.0.22",
-    "@gitzone/tstest": "^1.0.15",
-    "@pushrocks/tapbundle": "^3.0.7",
-    "tslint": "^5.11.0",
+    "@gitzone/tsbuild": "^2.1.17",
+    "@gitzone/tstest": "^1.0.28",
+    "@pushrocks/tapbundle": "^3.2.0",
+    "tslint": "^6.0.0",
     "tslint-config-prettier": "^1.15.0"
   },
-  "dependencies": {},
+  "dependencies": {
+    "@tsclass/tsclass": "^3.0.12"
+  },
   "files": [
-    "ts/*",
-    "ts_web/*",
-    "dist/*",
-    "dist_web/*",
-    "assets/*",
+    "ts/**/*",
+    "ts_web/**/*",
+    "dist/**/*",
+    "dist_web/**/*",
+    "dist_ts_web/**/*",
+    "assets/**/*",
     "cli.js",
     "npmextra.json",
     "readme.md"

readme.md

@@ -8,7 +8,7 @@ setup basic page properties
 * [docs (typedoc)](https://pushrocks.gitlab.io/websetup/)
 
 ## Status for master
-[![build status](https://gitlab.com/pushrocks/websetup/badges/master/build.svg)](https://gitlab.com/pushrocks/websetup/commits/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)
@@ -18,9 +18,14 @@ setup basic page properties
 
 ## Usage
 
+
+## 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). :)
+
 For further information read the linked docs at the top of this readme.
 
 > MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
-| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy.html)
+| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)
 
-[![repo-footer](https://pushrocks.gitlab.io/assets/repo-footer.svg)](https://maintainedby.lossless.com)
+[![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com)

ts/meta/index.ts

@@ -1,18 +1,105 @@
+import * as plugins from '../websetup.plugins';
+
 export interface IMetaObject {
   title: string;
   description: string;
+  canonicalDomain?: string;
+  ldCompany?: plugins.tsclass.business.ICompany;
+  ldProduct?: any;
 }
 
 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) {
+    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): 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 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']
+    },
+    sameAs: []
+  };
+
+  if (companyDataArg.contact.facebookUrl) {
+    companyLd.sameAs.push(companyDataArg.contact.facebookUrl);
+  }
+
+  if (companyDataArg.contact.twitterUrl) {
+    companyLd.sameAs.push(companyDataArg.contact.twitterUrl);
+  }
+
+  const jsonLdElement = document.createElement('script');
+  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"].');
@@ -28,6 +31,7 @@ export const setupFullStory = async (fsCodeArg: string) => {
     o = n.createElement(t);
     o.async = 1;
     o.src = 'https://' + window._fs_host + '/s/fs.js';
+    o.crossorigin = 'anonymous';
     y = n.getElementsByTagName(t)[0];
     y.parentNode.insertBefore(o, y);
     // tslint:disable-next-line: only-arrow-functions

ts/tools/ganalytics.ts

@@ -22,6 +22,7 @@ export const setupGoogleAnalytics = async (gaCode: string) => {
     (a = s.createElement(o)), (m = s.getElementsByTagName(o)[0]);
     a.async = 1;
     a.src = g;
+    a.crossorigin = 'anonymous';
     m.parentNode.insertBefore(a, m);
   })(window, document, 'script', '//www.google-analytics.com/analytics.js', 'analytics');
 

ts/websetup.plugins.ts

@@ -1,2 +1,5 @@
-const removeme = {};
-export { removeme };
+import * as tsclass from '@tsclass/tsclass';
+
+export {
+  tsclass
+};