2.0.5

.gitignore

@@ -1,8 +1,22 @@
 .nogit/
-node_modules/
+
+# artifacts
 coverage/
 public/
 pages/
+
+# installs
+node_modules/
+
+# caches
 .yarn/
 .cache/
+.rpt2_cache
+
+# builds
 dist/
+dist_web/
+dist_serve/
+dist_ts_web/
+
+# custom

.gitlab-ci.yml

@@ -1,16 +1,16 @@
-# gitzone standard
+# gitzone ci_default
-image: hosttoday/ht-docker-node:npmci
+image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
 
 cache:
   paths:
-  - .npmci_cache/
+    - .npmci_cache/
-  key: "$CI_BUILD_STAGE"
+  key: '$CI_BUILD_STAGE'
 
 stages:
-- security
+  - security
-- test
+  - test
-- release
+  - release
-- metadata
+  - metadata
 
 # ====================
 # security stage
@@ -18,124 +18,103 @@ stages:
 mirror:
   stage: security
   script:
-  - npmci git mirror
+    - npmci git mirror
   tags:
-  - docker
+    - lossless
-  - notpriv
+    - 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:
-  - docker
+    - lossless
-  - notpriv
+    - docker
-
+    - notpriv
-sast:
-  stage: security
-  image: docker:stable
-  variables:
-    DOCKER_DRIVER: overlay2
-  allow_failure: true
-  services:
-    - docker:stable-dind
-  script:
-    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
-    - docker run
-        --env SAST_CONFIDENCE_LEVEL="${SAST_CONFIDENCE_LEVEL:-3}"
-        --volume "$PWD:/code"
-        --volume /var/run/docker.sock:/var/run/docker.sock
-        "registry.gitlab.com/gitlab-org/security-products/sast:$SP_VERSION" /app/bin/run /code
-  artifacts:
-    reports:
-      sast: gl-sast-report.json
-  tags:
-  - docker
-  - priv
 
 # ====================
 # test stage
 # ====================
 
-testLTS:
+testStable:
   stage: test
   script:
-  - npmci npm prepare
+    - npmci npm prepare
-  - npmci node install lts
+    - npmci node install stable
-  - npmci npm install
+    - npmci npm install
-  - npmci npm test
+    - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-  - docker
+    - lossless
-  - notpriv
+    - docker
-    
+    - priv
-testSTABLE:
+
+testBuild:
   stage: test
   script:
-  - npmci npm prepare
+    - npmci npm prepare
-  - npmci node install stable
+    - npmci node install stable
-  - npmci npm install
+    - npmci npm install
-  - npmci npm test
+    - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-  - docker
+    - lossless
-  - notpriv
+    - docker
+    - notpriv
 
 release:
   stage: release
   script:
-  - npmci node install stable
+    - npmci node install stable
-  - npmci npm publish
+    - npmci npm publish
   only:
-  - tags
+    - tags
   tags:
-  - docker
+    - lossless
-  - notpriv
+    - docker
+    - notpriv
 
 # ====================
 # metadata stage
 # ====================
 codequality:
   stage: metadata
-  image: docker:stable
   allow_failure: true
-  services:
-    - docker:stable-dind
   script:
-    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
+    - npmci command npm install -g tslint typescript
-    - docker run
+    - npmci npm prepare
-        --env SOURCE_CODE="$PWD"
+    - npmci npm install
-        --volume "$PWD":/code
+    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
-        --volume /var/run/docker.sock:/var/run/docker.sock
-        "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code
-  artifacts:
-    paths: [codeclimate.json]
   tags:
-  - docker
+    - lossless
-  - priv
+    - docker
+    - priv
 
 trigger:
   stage: metadata
   script:
-  - npmci trigger
+    - npmci trigger
   only:
-  - tags
+    - tags
   tags:
-  - docker
+    - lossless
-  - notpriv
+    - docker
+    - notpriv
 
 pages:
-  image: hosttoday/ht-docker-node:npmci
   stage: metadata
   script:
-    - npmci command npm install -g typedoc typescript
+    - npmci node install lts
+    - npmci command npm install -g @gitzone/tsdoc
     - npmci npm prepare
     - npmci npm install
-    - npmci command typedoc --module "commonjs" --target "ES2016" --out public/ ts/
+    - npmci command tsdoc
   tags:
+    - lossless
     - docker
     - notpriv
   only:
@@ -143,5 +122,5 @@ pages:
   artifacts:
     expire_in: 1 week
     paths:
-    - public
+      - public
   allow_failure: true

.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

@@ -2,5 +2,16 @@
   "npmci": {
     "npmGlobalTools": [],
     "npmAccessLevel": "public"
+  },
+  "gitzone": {
+    "projectType": "npm",
+    "module": {
+      "githost": "gitlab.com",
+      "gitscope": "pushrocks",
+      "gitrepo": "websetup",
+      "shortDescription": "setup basic page properties",
+      "npmPackagename": "@pushrocks/websetup",
+      "license": "MIT"
+    }
   }
-}
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/websetup",
-  "version": "1.0.4",
+  "version": "2.0.5",
   "private": false,
   "description": "setup basic page properties",
   "main": "dist/index.js",
@@ -9,15 +9,32 @@
   "license": "MIT",
   "scripts": {
     "test": "(tstest test/)",
-    "build": "(tsbuild)",
+    "build": "(tsbuild --web)",
     "format": "(gitzone format)"
   },
+  "keywords": [
+    "lossless",
+    "websafe"
+  ],
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.0.22",
+    "@gitzone/tsbuild": "^2.1.17",
-    "@gitzone/tstest": "^1.0.15",
+    "@gitzone/tstest": "^1.0.28",
-    "@pushrocks/tapbundle": "^3.0.7",
+    "@pushrocks/tapbundle": "^3.2.0",
-    "tslint": "^5.11.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/**/*",
+    "dist_ts_web/**/*",
+    "assets/**/*",
+    "cli.js",
+    "npmextra.json",
+    "readme.md"
+  ]
 }

readme.md

@@ -0,0 +1,31 @@
+# @pushrocks/websetup
+setup basic page properties
+
+## Availabililty and Links
+* [npmjs.org (npm package)](https://www.npmjs.com/package/@pushrocks/websetup)
+* [gitlab.com (source)](https://gitlab.com/pushrocks/websetup)
+* [github.com (source mirror)](https://github.com/pushrocks/websetup)
+* [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/)
+
+## 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)
+
+[![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com)

test/test.ts

@@ -1,8 +1,8 @@
 import { expect, tap } from '@pushrocks/tapbundle';
-import * as websetup from '../ts/index'
+import * as websetup from '../ts/index';
 
 tap.test('first test', async () => {
-  console.log(websetup.standardExport)
+  console.log('Waiting for proper puppeteer support here');
-})
+});
 
-tap.start()
+tap.start();

ts/index.ts

@@ -2,23 +2,32 @@ import * as plugins from './websetup.plugins';
 
 import { setupGoogleAnalytics } from './tools/ganalytics';
 import { setupFullStory } from './tools/fullstory';
+import { IMetaObject, setupMetaInformation } from './meta';
 
 export interface IWebSetupConstructorOptions {
   googleAnalyticsCode?: string;
   fsCode?: string;
+  metaObject: IMetaObject;
 }
 
 /**
  * the main WebSetup class
  */
 export class WebSetup {
+  public options: IWebSetupConstructorOptions;
   constructor(optionsArg: IWebSetupConstructorOptions) {
-    if (optionsArg.googleAnalyticsCode) {
+    this.options = optionsArg;
-      setupGoogleAnalytics(optionsArg.googleAnalyticsCode);
+  }
+
+  public async setup() {
+    await setupMetaInformation(this.options.metaObject);
+
+    if (this.options.googleAnalyticsCode) {
+      await setupGoogleAnalytics(this.options.googleAnalyticsCode);
     }
 
-    if (optionsArg.fsCode) {
+    if (this.options.fsCode) {
-      setupFullStory(optionsArg.fsCode)
+      await setupFullStory(this.options.fsCode);
     }
   }
-}
+}

ts/meta/index.ts

@@ -0,0 +1,69 @@
+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');
+  metaObjectArg.canonicalDomain ? addLinkTag('canonical', metaObjectArg.canonicalDomain) : null;
+
+  if (metaObjectArg.ldCompany) {
+    addCompanyJsonLD(metaObjectArg.ldCompany)
+  }
+};
+
+const addMetaTag = async (linkNameArg: string, contentArg: string) => {
+  const metaElement = document.createElement('meta');
+  metaElement.name = linkNameArg;
+  metaElement.content = contentArg;
+  document.getElementsByTagName('head')[0].appendChild(metaElement);
+};
+
+const addLinkTag = async (relArg, hrefArg) => {
+  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);
+};
+
+const addCompanyJsonLD = async (companyDataArg: plugins.tsclass.business.ICompany) => {
+  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);
+};

ts/tools/fullstory.ts

@@ -28,6 +28,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,4 +1,5 @@
-const removeme = {};
+import * as tsclass from '@tsclass/tsclass';
+
 export {
-  removeme
+  tsclass
-}
+};