2.0.2

.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:
@@ -49,14 +49,14 @@ testLTS:
   tags:
   - 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
@@ -65,7 +65,7 @@ testSTABLE:
 release:
   stage: release
   script:
-  - npmci node install stable
+  - npmci node install lts
   - npmci npm publish
   only:
   - tags
@@ -78,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
@@ -109,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

package-lock.json

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/websetup",
-  "version": "1.0.8",
+  "version": "2.0.2",
   "private": false,
   "description": "setup basic page properties",
   "main": "dist/index.js",
@@ -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"
+  ]
 }

ts/index.ts

@@ -2,38 +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() {
-    await setupMetaInformation(optionsArg.metaObject);
+    await setupMetaInformation(this.options.metaObject);
 
-    if (optionsArg.serviceworker) {
+    if (this.options.googleAnalyticsCode) {
-      await setupServiceWoker();
+      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,11 +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);
-};