1.0.35

.gitlab-ci.yml

@@ -7,54 +7,10 @@ cache:
   key: '$CI_BUILD_STAGE'
 
 stages:
-  - security
+  - only
-  - test
-  - release
-  - metadata
-
-# ====================
-# security stage
-# ====================
-mirror:
-  stage: security
-  script:
-    - npmci git mirror
-  only:
-    - tags
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
-auditProductionDependencies:
-  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
-  stage: security
-  script:
-    - npmci npm prepare
-    - npmci command npm install --production --ignore-scripts
-    - npmci command npm config set registry https://registry.npmjs.org
-    - npmci command npm audit --audit-level=high --only=prod --production
-  tags:
-    - docker
-
-auditDevDependencies:
-  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
-  stage: security
-  script:
-    - npmci npm prepare
-    - npmci command npm install --ignore-scripts
-    - npmci command npm config set registry https://registry.npmjs.org
-    - npmci command npm audit --audit-level=high --only=dev
-  tags:
-    - docker
-  allow_failure: true
-
-# ====================
-# test stage
-# ====================
 
 testStable:
-  stage: test
+  stage: only
   script:
     - npmci npm prepare
     - npmci node install stable
@@ -64,74 +20,3 @@ testStable:
   tags:
     - docker
 
-testBuild:
-  stage: test
-  script:
-    - npmci npm prepare
-    - npmci node install stable
-    - npmci npm install
-    - npmci command npm run build
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-    - docker
-
-release:
-  stage: release
-  script:
-    - npmci node install stable
-    - npmci npm publish
-  only:
-    - tags
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
-# ====================
-# metadata stage
-# ====================
-codequality:
-  stage: metadata
-  allow_failure: true
-  only:
-    - tags
-  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
-
-trigger:
-  stage: metadata
-  script:
-    - npmci trigger
-  only:
-    - tags
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
-pages:
-  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:
-    - tags
-  artifacts:
-    expire_in: 1 week
-    paths:
-      - public
-  allow_failure: true

.vscode/launch.json

@@ -2,28 +2,10 @@
   "version": "0.2.0",
   "configurations": [
     {
-      "name": "current file",
+      "command": "npm test",
-      "type": "node",
+      "name": "Run npm test",
       "request": "launch",
-      "args": [
+      "type": "node-terminal"
-        "${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"
     }
   ]
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartpuppeteer",
-  "version": "1.0.27",
+  "version": "1.0.35",
   "private": false,
   "description": "simplified access to puppeteer",
   "main": "dist_ts/index.js",
@@ -13,17 +13,18 @@
     "format": "(gitzone format)"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.26",
+    "@gitzone/tsbuild": "^2.1.28",
-    "@gitzone/tstest": "^1.0.54",
+    "@gitzone/tstest": "^1.0.59",
     "@pushrocks/tapbundle": "^3.2.14",
-    "@types/node": "^16.6.1",
+    "@types/node": "^16.11.6",
     "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.15.0"
   },
   "dependencies": {
     "@pushrocks/smartdelay": "^2.0.13",
     "@pushrocks/smartenv": "^4.0.16",
-    "puppeteer": "^10.2.0",
+    "@pushrocks/smartshell": "^2.0.29",
+    "puppeteer": "^11.0.0",
     "tree-kill": "^1.2.2"
   },
   "files": [

test/test.ts

@@ -14,6 +14,6 @@ tap.test('should get and stop an Incognito browser', async () => {
   await incognitoInstance.start();
   const page = await incognitoInstance.browser.newPage();
   await incognitoInstance.stop();
-})
+});
 
 tap.start();

ts/smartpuppeteer.classes.incognitobrowser.ts

@@ -35,7 +35,7 @@ export class IncognitoBrowser {
   /**
    * rotate
    */
-  public async rotateBrowser () {
+  public async rotateBrowser() {
     this.browser.close().catch();
     this.browser = await getEnvAwareBrowserInstance();
   }

ts/smartpuppeteer.classes.smartpuppeteer.ts

@@ -25,7 +25,16 @@ export const getEnvAwareBrowserInstance = async (
   console.log(chromeArgs);
   headlessBrowser = await plugins.puppeteer.launch({
     args: chromeArgs,
-    pipe: true
+    pipe: true,
+    headless: true,
+    ...(() => {
+      const returnObject: any = {};
+      const googleChrome = plugins.smartshell.which.sync('google-chrome')
+      if(googleChrome) {
+        returnObject.executablePath = googleChrome
+      } 
+      return returnObject;
+    })()
   });
 
   return headlessBrowser;

ts/smartpuppeteer.plugins.ts

@@ -6,8 +6,9 @@ export { os };
 // @pushrocks scope
 import * as smartdelay from '@pushrocks/smartdelay';
 import * as smartenv from '@pushrocks/smartenv';
+import * as smartshell from '@pushrocks/smartshell';
 
-export { smartdelay, smartenv };
+export { smartdelay, smartenv, smartshell };
 
 // third party scope
 import puppeteer from 'puppeteer';