4.0.13

.gitlab-ci.yml

@@ -19,23 +19,35 @@ mirror:
   stage: security
   script:
     - npmci git mirror
+  only:
+    - tags
   tags:
     - lossless
     - docker
     - notpriv
 
-audit:
+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
+    - npmci command npm audit --audit-level=high --only=dev
   tags:
-    - lossless
     - docker
-    - notpriv
+  allow_failure: true
 
 # ====================
 # test stage
@@ -50,9 +62,7 @@ testStable:
     - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - lossless
     - docker
-    - priv
 
 testBuild:
   stage: test
@@ -63,9 +73,7 @@ testBuild:
     - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - lossless
     - docker
-    - notpriv
 
 release:
   stage: release
@@ -85,6 +93,8 @@ release:
 codequality:
   stage: metadata
   allow_failure: true
+  only:
+    - tags
   script:
     - npmci command npm install -g tslint typescript
     - npmci npm prepare

.vscode/settings.json

@@ -15,7 +15,7 @@
             "properties": {
               "projectType": {
                 "type": "string",
-                "enum": ["website", "element", "service", "npm"]
+                "enum": ["website", "element", "service", "npm", "wcc"]
               }
             }
           }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartenv",
-  "version": "4.0.9",
+  "version": "4.0.13",
   "description": "store things about your environment and let them travel across modules",
   "main": "dist_ts/index.js",
   "typings": "dist_ts/index.d.ts",
@@ -25,16 +25,16 @@
   "dependencies": {
     "@pushrocks/smartparam": "^1.1.6",
     "@pushrocks/smartpromise": "^3.0.6",
-    "@types/node": "^14.0.14",
+    "@types/node": "^14.11.2"
-    "is-wsl": "^2.2.0"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.24",
+    "@gitzone/tsbuild": "^2.1.25",
+    "@gitzone/tsbundle": "^1.0.78",
     "@gitzone/tsrun": "^1.2.12",
-    "@gitzone/tstest": "^1.0.33",
+    "@gitzone/tstest": "^1.0.44",
-    "@pushrocks/tapbundle": "^3.2.1",
+    "@pushrocks/tapbundle": "^3.2.9",
     "@types/npm": "^2.0.31",
-    "tslint": "^6.1.2",
+    "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.18.0"
   },
   "private": false,
@@ -49,5 +49,8 @@
     "cli.js",
     "npmextra.json",
     "readme.md"
+  ],
+  "browserslist": [
+    "last 1 chrome versions"
   ]
 }

readme.md

@@ -27,7 +27,6 @@ Platform support | [![Supports Windows 10](https://badgen.net/badge/supports%20W
 
 Use TypeScript for best in class instellisense.
 
-
 ## 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). :)

ts/smartenv.classes.smartenv.ts

@@ -11,6 +11,66 @@ export interface IEnvObject {
  * Smartenv class that makes it easy
  */
 export class Smartenv {
+  public async getEnvAwareModule(optionsArg: {
+    nodeModuleName: string;
+    webUrlArg: string;
+    getFunction: () => any;
+  }) {
+    if (this.isNode) {
+      const moduleResult = await  this.getSafeNodeModule(optionsArg.nodeModuleName);
+      return moduleResult;
+    } else if (this.isBrowser) {
+      const moduleResult = await this.getSafeWebModule(optionsArg.webUrlArg, optionsArg.getFunction);
+    } else {
+      console.error('platform for loading not supported by smartenv');
+    }
+  }
+
+  public getSafeNodeModule<T = any>(moduleNameArg: string): T {
+    if (!this.isNode) {
+      console.error('You tried to load a node module in a wrong context');
+      return;
+    }
+    // tslint:disable-next-line: function-constructor
+    return new Function(
+      'exports',
+      'require',
+      'module',
+      '__filename',
+      '__dirname',
+      `return require('${moduleNameArg}')`
+    )(exports, require, module, __filename, __dirname);
+  }
+
+  public loadedScripts: string[] = [];
+  public async getSafeWebModule(urlArg: string, getFunctionArg: () => any) {
+    if (!this.isBrowser) {
+      console.error('You tried to load a web module in a wrong context');
+      return;
+    }
+    
+    if (this.loadedScripts.includes(urlArg)) {
+      return;
+    } else {
+      this.loadedScripts.push(urlArg);
+    }
+    
+    const done = plugins.smartpromise.defer();
+    if (globalThis.importScripts) {
+      globalThis.importScripts(urlArg);
+      done.resolve();
+    } else {
+      const script = document.createElement('script');
+      script.onload = () => {
+        done.resolve();
+      };
+      script.src = urlArg;
+      document.head.appendChild(script);
+    }
+    await done.promise;
+    return getFunctionArg();
+  }
+
   public get runtimeEnv() {
     if (typeof window !== 'undefined') {
       return 'browser';
@@ -36,10 +96,6 @@ export class Smartenv {
     return this.runtimeEnv === 'node';
   }
 
-  public get isWsl(): boolean {
-    return plugins.isWsl;
-  }
-
   public get nodeVersion(): string {
     return process.version;
   }
@@ -58,7 +114,7 @@ export class Smartenv {
 
   public async isMacAsync(): Promise<boolean> {
     if (this.isNode) {
-      const os = await import('os');
+      const os = this.getSafeNodeModule('os');
       return os.platform() === 'darwin';
     } else {
       return false;
@@ -67,7 +123,7 @@ export class Smartenv {
 
   public async isWindowsAsync(): Promise<boolean> {
     if (this.isNode) {
-      const os = await import('os');
+      const os = this.getSafeNodeModule('os');
       return os.platform() === 'win32';
     } else {
       return false;
@@ -76,7 +132,7 @@ export class Smartenv {
 
   public async isLinuxAsync(): Promise<boolean> {
     if (this.isNode) {
-      const os = await import('os');
+      const os = this.getSafeNodeModule('os');
       return os.platform() === 'linux';
     } else {
       return false;

ts/smartenv.plugins.ts

@@ -2,11 +2,3 @@ import * as smartparam from '@pushrocks/smartparam';
 import * as smartpromise from '@pushrocks/smartpromise';
 
 export { smartparam, smartpromise };
-
-// third party scope
-
-import isWsl from 'is-wsl';
-
-export {
-  isWsl
-};