2.0.3

.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,5 +1,5 @@
-# gitzone standard
+# gitzone ci_default
-image: hosttoday/ht-docker-node:npmci
+image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
 
 cache:
   paths:
@@ -34,28 +34,6 @@ snyk:
   - 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
 # ====================
@@ -72,13 +50,13 @@ testLTS:
   - docker
   - notpriv
 
-testSTABLE:
+testBuild:
   stage: test
   script:
   - npmci npm prepare
-  - npmci node install stable
+  - npmci node install lts
   - npmci npm install
-  - npmci npm test
+  - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
   - docker
@@ -87,7 +65,7 @@ testSTABLE:
 release:
   stage: release
   script:
-  - npmci node install stable
+  - npmci node install lts
   - npmci npm publish
   only:
   - tags
@@ -100,19 +78,11 @@ release:
 # ====================
 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 install
-        --env SOURCE_CODE="$PWD"
+    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
-        --volume "$PWD":/code
-        --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
   - priv
@@ -131,10 +101,10 @@ pages:
   image: hosttoday/ht-docker-node:npmci
   stage: metadata
   script:
-    - npmci command npm install -g typedoc typescript
+    - 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:
     - docker
     - notpriv

npmextra.json

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

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/websetup",
-  "version": "1.0.5",
+  "version": "2.0.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/websetup",
-  "version": "1.0.5",
+  "version": "2.0.3",
   "private": false,
   "description": "setup basic page properties",
   "main": "dist/index.js",
@@ -9,7 +9,7 @@
   "license": "MIT",
   "scripts": {
     "test": "(tstest test/)",
-    "build": "(tsbuild)",
+    "build": "(tsbuild --web)",
     "format": "(gitzone format)"
   },
   "keywords": [
@@ -23,5 +23,15 @@
     "tslint": "^5.11.0",
     "tslint-config-prettier": "^1.15.0"
   },
-  "dependencies": {}
+  "dependencies": {},
+  "files": [
+    "ts/*",
+    "ts_web/*",
+    "dist/*",
+    "dist_web/*",
+    "assets/*",
+    "cli.js",
+    "npmextra.json",
+    "readme.md"
+  ]
 }

readme.md

@@ -0,0 +1,26 @@
+# @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
+[![build status](https://gitlab.com/pushrocks/websetup/badges/master/build.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
+
+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)
+
+[![repo-footer](https://pushrocks.gitlab.io/assets/repo-footer.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('Waiting for proper puppeteer support here');
-})
+});
 
 tap.start();

ts/index.ts

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

ts/serviceworker/index.ts

@@ -1,9 +0,0 @@
-export const setupServiceWoker = async () => {
-  // serviceworker
-  const script = document.createElement('script');
-  script.onload = () => {
-    console.log('Loaded Serviceworker. The serviceworker helps us with notifications and offline capabilities, so you can also read this site when your device is offline.');
-  };
-  script.src = 'serviceworker/mainthread.js';
-  document.head.appendChild(script);
-};

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,2 @@
 const removeme = {};
-export {
+export { removeme };
-  removeme
-}