3.0.15

.gitlab-ci.yml

@@ -3,93 +3,148 @@ image: hosttoday/ht-docker-node:npmci
 
 cache:
   paths:
-  - .yarn/
+  - .npmci_cache/
   key: "$CI_BUILD_STAGE"
 
 stages:
 - security
 - test
 - release
-- trigger
+- metadata
-- pages
 
+# ====================
+# security stage
+# ====================
 mirror:
   stage: security
   script:
   - npmci git mirror
   tags:
   - docker
+  - notpriv
 
 snyk:
   stage: security
   script:
-    - npmci command yarn global add snyk
+    - npmci npm prepare
-    - npmci command yarn install --ignore-scripts
+    - npmci command npm install -g snyk
+    - npmci command npm install --ignore-scripts
     - npmci command snyk test
   tags:
   - docker
+  - notpriv
 
-testLEGACY:
+sast:
-  stage: test
+  stage: security
+  image: registry.gitlab.com/hosttoday/ht-docker-dbase:npmci
+  variables:
+    DOCKER_DRIVER: overlay2
+  allow_failure: true
+  services:
+    - docker:stable-dind
   script:
-  - npmci node install legacy
+    - npmci npm prepare
-  - npmci npm install
+    - npmci npm install
-  - npmci npm test
+    - npmci command npm run build
-  coverage: /\d+.?\d+?\%\s*coverage/
+    - 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
-  allow_failure: true
+  - priv
+
+# ====================
+# test stage
+# ====================
 
 testLTS:
   stage: test
   script:
+  - npmci npm prepare
   - npmci node install lts
   - npmci npm install
   - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
   - docker
+  - notpriv
     
 testSTABLE:
   stage: test
   script:
+  - npmci npm prepare
   - npmci node install stable
   - npmci npm install
   - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
   - docker
+  - notpriv
 
 release:
   stage: release
   script:
-  - npmci npm prepare
+  - npmci node install stable
   - npmci npm publish
   only:
   - tags
   tags:
   - 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/')
+    - docker run
+        --env SOURCE_CODE="$PWD"
+        --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
 
 trigger:
-  stage: trigger
+  stage: metadata
   script:
   - npmci trigger
   only:
   - tags
   tags:
   - docker
+  - notpriv
 
 pages:
   image: hosttoday/ht-docker-node:npmci
-  stage: pages
+  stage: metadata
   script:
-    - npmci command yarn global add npmpage
+    - npmci command npm install -g typedoc typescript
-    - npmci command npmpage
+    - npmci npm prepare
+    - npmci npm install
+    - npmci command typedoc --module "commonjs" --target "ES2016" --out public/ ts/
   tags:
     - docker
+    - notpriv
   only:
     - tags
   artifacts:
     expire_in: 1 week
     paths:
     - public
+  allow_failure: true

.snyk

@@ -0,0 +1,4 @@
+# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
+version: v1.13.3
+ignore: {}
+patch: {}

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Push.Rocks
+Copyright (c) 2015 Lossless GmbH
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,24 +1,19 @@
-# gulp-browser
+# @pushrocks/gulp-browser
-
 browserify and other goodies for gulp
 
-## Availabililty
+## Availabililty and Links
-
+* [npmjs.org (npm package)](https://www.npmjs.com/package/@pushrocks/gulp-browser)
-[![npm](https://pushrocks.gitlab.io/assets/repo-button-npm.svg)](https://www.npmjs.com/package/gulp-browser)
+* [gitlab.com (source)](https://gitlab.com/pushrocks/gulp-browser)
-[![git](https://pushrocks.gitlab.io/assets/repo-button-git.svg)](https://GitLab.com/pushrocks/gulp-browser)
+* [github.com (source mirror)](https://github.com/pushrocks/gulp-browser)
-[![git](https://pushrocks.gitlab.io/assets/repo-button-mirror.svg)](https://github.com/pushrocks/gulp-browser)
+* [docs (typedoc)](https://pushrocks.gitlab.io/gulp-browser/)
-[![docs](https://pushrocks.gitlab.io/assets/repo-button-docs.svg)](https://pushrocks.gitlab.io/gulp-browser/)
 
 ## Status for master
-
+[![build status](https://gitlab.com/pushrocks/gulp-browser/badges/master/build.svg)](https://gitlab.com/pushrocks/gulp-browser/commits/master)
-[![build status](https://GitLab.com/pushrocks/gulp-browser/badges/master/build.svg)](https://GitLab.com/pushrocks/gulp-browser/commits/master)
+[![coverage report](https://gitlab.com/pushrocks/gulp-browser/badges/master/coverage.svg)](https://gitlab.com/pushrocks/gulp-browser/commits/master)
-[![coverage report](https://GitLab.com/pushrocks/gulp-browser/badges/master/coverage.svg)](https://GitLab.com/pushrocks/gulp-browser/commits/master)
+[![npm downloads per month](https://img.shields.io/npm/dm/@pushrocks/gulp-browser.svg)](https://www.npmjs.com/package/@pushrocks/gulp-browser)
-[![npm downloads per month](https://img.shields.io/npm/dm/gulp-browser.svg)](https://www.npmjs.com/package/gulp-browser)
+[![Known Vulnerabilities](https://snyk.io/test/npm/@pushrocks/gulp-browser/badge.svg)](https://snyk.io/test/npm/@pushrocks/gulp-browser)
-[![Dependency Status](https://david-dm.org/pushrocks/gulp-browser.svg)](https://david-dm.org/pushrocks/gulp-browser)
+[![TypeScript](https://img.shields.io/badge/TypeScript->=%203.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
-[![bitHound Dependencies](https://www.bithound.io/github/pushrocks/gulp-browser/badges/dependencies.svg)](https://www.bithound.io/github/pushrocks/gulp-browser/master/dependencies/npm)
+[![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
-[![bitHound Code](https://www.bithound.io/github/pushrocks/gulp-browser/badges/code.svg)](https://www.bithound.io/github/pushrocks/gulp-browser)
-[![TypeScript](https://img.shields.io/badge/TypeScript-2.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
-[![node](https://img.shields.io/badge/node->=%206.x.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
 [![JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/)
 
 ## Usage
@@ -51,12 +46,12 @@ gulp.task('gulpBrowserTest', function() {
 
 ### Contributors
 
-* [Phil Kunz](https://github.com/philkunz)
+- [Phil Kunz](https://github.com/philkunz)
-* [Steffan Donal](https://github.com/SteffanDonal)
+- [Steffan Donal](https://github.com/SteffanDonal)
 
-For further information read the linked docs at the top of this README.
+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)
+| 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://push.rocks)
+[![repo-footer](https://pushrocks.gitlab.io/assets/repo-footer.svg)](https://maintainedby.lossless.com)

dist/gulpbrowser.browserify.d.ts

@@ -1,4 +0,0 @@
-/// <reference types="node" />
-import * as stream from 'stream';
-declare let browserify: (transforms?: any[]) => stream.Transform;
-export = browserify;

dist/gulpbrowser.browserify.js

@@ -1,44 +0,0 @@
-"use strict";
-const plugins = require("./gulpbrowser.plugins");
-let browserify = function (transforms = []) {
-    if (!Array.isArray(transforms)) {
-        transforms = [transforms];
-    }
-    let forEach = function (file, enc, cb) {
-        // do this with every chunk (file in gulp terms)
-        let bundleCallback = function (err, bufferedContent) {
-            // our bundle callback for when browserify is finished
-            if (Buffer.isBuffer(bufferedContent)) {
-                file.contents = bufferedContent;
-            }
-            else {
-                console.log('gulp-browser: .browserify() ' + err.message);
-                cb(new Error(err.message), file);
-                return;
-            }
-            cb(null, file);
-        };
-        if (file.contents.length > 0) {
-            let browserified = plugins.browserify(file, { basedir: file.base });
-            transforms.forEach(function (transform) {
-                if (typeof transform === 'function') {
-                    browserified.transform(transform);
-                }
-                else {
-                    browserified.transform(transform.transform, transform.options);
-                }
-            });
-            browserified.bundle(bundleCallback);
-        }
-        else {
-            console.warn('gulp-browser: .browserify() file.contents appears to be empty');
-            cb(null, file);
-        }
-    };
-    let atEnd = function (cb) {
-        cb();
-    }; // no need to clean up after ourselves
-    return plugins.through2.obj(forEach, atEnd); // this is the through object that gets returned by gulpBrowser.browserify();
-};
-module.exports = browserify;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ3VscGJyb3dzZXIuYnJvd3NlcmlmeS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL2d1bHBicm93c2VyLmJyb3dzZXJpZnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUNBLGlEQUFrRDtBQUdsRCxJQUFJLFVBQVUsR0FBRyxVQUFTLFVBQVUsR0FBRyxFQUFFO0lBQ3ZDLEVBQUUsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDL0IsVUFBVSxHQUFHLENBQUMsVUFBVSxDQUFDLENBQUM7SUFDNUIsQ0FBQztJQUVELElBQUksT0FBTyxHQUFHLFVBQVMsSUFBSSxFQUFFLEdBQUcsRUFBRSxFQUFFO1FBQ2xDLGdEQUFnRDtRQUVoRCxJQUFJLGNBQWMsR0FBRyxVQUFTLEdBQUcsRUFBRSxlQUFlO1lBQ2hELHNEQUFzRDtZQUN0RCxFQUFFLENBQUMsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLGVBQWUsQ0FBQyxDQUFDLENBQUMsQ0FBQztnQkFDckMsSUFBSSxDQUFDLFFBQVEsR0FBRyxlQUFlLENBQUM7WUFDbEMsQ0FBQztZQUFDLElBQUksQ0FBQyxDQUFDO2dCQUNOLE9BQU8sQ0FBQyxHQUFHLENBQUMsOEJBQThCLEdBQUcsR0FBRyxDQUFDLE9BQU8sQ0FBQyxDQUFDO2dCQUMxRCxFQUFFLENBQUMsSUFBSSxLQUFLLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxFQUFFLElBQUksQ0FBQyxDQUFDO2dCQUNqQyxNQUFNLENBQUM7WUFDVCxDQUFDO1lBQ0QsRUFBRSxDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsQ0FBQztRQUNqQixDQUFDLENBQUM7UUFFRixFQUFFLENBQUMsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLE1BQU0sR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDO1lBQzdCLElBQUksWUFBWSxHQUFHLE9BQU8sQ0FBQyxVQUFVLENBQUMsSUFBSSxFQUFFLEVBQUUsT0FBTyxFQUFFLElBQUksQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDO1lBRXBFLFVBQVUsQ0FBQyxPQUFPLENBQUMsVUFBUyxTQUFTO2dCQUNuQyxFQUFFLENBQUMsQ0FBQyxPQUFPLFNBQVMsS0FBSyxVQUFVLENBQUMsQ0FBQyxDQUFDO29CQUNwQyxZQUFZLENBQUMsU0FBUyxDQUFDLFNBQVMsQ0FBQyxDQUFDO2dCQUNwQyxDQUFDO2dCQUFDLElBQUksQ0FBQyxDQUFDO29CQUNOLFlBQVksQ0FBQyxTQUFTLENBQUMsU0FBUyxDQUFDLFNBQVMsRUFBRSxTQUFTLENBQUMsT0FBTyxDQUFDLENBQUM7Z0JBQ2pFLENBQUM7WUFDSCxDQUFDLENBQUMsQ0FBQztZQUVILFlBQVksQ0FBQyxNQUFNLENBQUMsY0FBYyxDQUFDLENBQUM7UUFDdEMsQ0FBQztRQUFDLElBQUksQ0FBQyxDQUFDO1lBQ04sT0FBTyxDQUFDLElBQUksQ0FBQywrREFBK0QsQ0FBQyxDQUFDO1lBQzlFLEVBQUUsQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFDakIsQ0FBQztJQUNILENBQUMsQ0FBQztJQUVGLElBQUksS0FBSyxHQUFHLFVBQVMsRUFBRTtRQUNyQixFQUFFLEVBQUUsQ0FBQztJQUNQLENBQUMsQ0FBQyxDQUFDLHNDQUFzQztJQUV6QyxNQUFNLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsT0FBTyxFQUFFLEtBQUssQ0FBQyxDQUFDLENBQUMsNkVBQTZFO0FBQzVILENBQUMsQ0FBQztBQUVGLGlCQUFTLFVBQVUsQ0FBQyJ9

dist/gulpbrowser.plugins.d.ts

@@ -1,3 +0,0 @@
-export import through2 = require('through2');
-export import path = require('path');
-export import browserify = require('browserify');

dist/gulpbrowser.plugins.js

@@ -1,6 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.through2 = require("through2");
-exports.path = require("path");
-exports.browserify = require("browserify");
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ3VscGJyb3dzZXIucGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL2d1bHBicm93c2VyLnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSx1Q0FBNkM7QUFDN0MsK0JBQXFDO0FBQ3JDLDJDQUFpRCJ9

dist/index.d.ts

@@ -1 +0,0 @@
-export import browserify = require('./gulpbrowser.browserify');

dist/index.js

@@ -1,4 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.browserify = require("./gulpbrowser.browserify");
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLHlEQUErRCJ9

npmextra.json

@@ -1,7 +1,5 @@
 {
   "npmci": {
-    "npmGlobalTools": [
+    "npmGlobalTools": []
-      "npmts"
-    ]
   }
 }

package.json

@@ -1,15 +1,12 @@
 {
-  "name": "gulp-browser",
+  "name": "@pushrocks/gulp-browser",
-  "version": "3.0.8",
+  "version": "3.0.15",
   "description": "browserify and other goodies for gulp",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "scripts": {
-    "test": "(npmts)",
+    "test": "(tstest test/)",
-    "reinstall": "(rm -r node_modules && npm install)",
+    "build": "(tsbuild)"
-    "release": "(git pull origin master && npm version patch && git push origin master && git checkout release && git merge master && git push origin release && git checkout master)",
-    "update": "(git checkout master && git pull origin master && npm install)",
-    "upgrade": "(npm run update) && (ncu upgradeAll && npm install)"
   },
   "repository": {
     "type": "git",
@@ -29,22 +26,22 @@
   },
   "homepage": "https://gitlab.com/pushrocks/gulp-browser",
   "dependencies": {
-    "@types/browserify": "^12.0.32",
+    "@pushrocks/smartpromise": "^2.0.5",
-    "@types/q": "1.0.7",
+    "@types/browserify": "^12.0.36",
-    "@types/through2": "^2.0.33",
+    "@types/through2": "^2.0.34",
-    "browserify": "^16.1.1",
+    "browserify": "^16.2.3",
-    "q": "^1.5.0",
+    "through2": "^3.0.0"
-    "smartq": "^1.1.6",
-    "through2": "^2.0.3"
   },
   "devDependencies": {
-    "@types/gulp": "^4.0.4",
+    "@gitzone/tsbuild": "^2.1.8",
-    "babel-core": "^6.26.0",
+    "@gitzone/tstest": "^1.0.18",
+    "@pushrocks/gulp-function": "^3.0.1",
+    "@pushrocks/tapbundle": "^3.0.7",
+    "@types/gulp": "^4.0.5",
+    "babel-core": "^6.26.3",
     "babel-preset-es2015": "^6.24.1",
-    "babelify": "^8.0.0",
+    "babelify": "^10.0.0",
-    "beautylog": "^6.1.10",
+    "gulp": "^4.0.0"
-    "gulp": "^3.9.1",
+  },
-    "gulp-function": "^2.2.9",
+  "private": true
-    "tapbundle": "^2.0.0"
-  }
 }

test/test.ts

@@ -1,14 +1,13 @@
-import * as beautylog from 'beautylog';
 import * as gulp from 'gulp';
-import * as gulpFunction from 'gulp-function';
+import * as gulpFunction from '@pushrocks/gulp-function';
-import * as smartq from 'smartq';
+import * as smartpromise from '@pushrocks/smartpromise';
 
-import { expect, tap } from 'tapbundle';
+import { expect, tap } from '@pushrocks/tapbundle';
 
 import * as gulpBrowser from '../ts/index';
 
 tap.test('should run through smoothly', async () => {
-  let done = smartq.defer();
+  let done = smartpromise.defer();
   let stream = gulp
     .src('./test/testBrowserifyNormal.js')
     .pipe(gulpBrowser.browserify())
@@ -21,24 +20,8 @@ tap.test('should run through smoothly', async () => {
   await done.promise;
 });
 
-tap.test('should throw an error, when a module is not found', async () => {
-  let done = smartq.defer();
-  let d = require('domain').create();
-  let doneCalled = false;
-  d.on('error', function(error) {
-    if (!doneCalled) {
-      done.resolve();
-      doneCalled = true;
-    }
-  });
-  d.run(function() {
-    let stream = gulp.src('./test/testBrowserifyError.js').pipe(gulpBrowser.browserify());
-  });
-  await done.promise;
-});
-
 tap.test('should run through with an empty file', async () => {
-  let done = smartq.defer();
+  let done = smartpromise.defer();
   let stream = gulp
     .src('./test/testBrowserifyEmpty.js')
     .pipe(gulpBrowser.browserify())
@@ -52,7 +35,7 @@ tap.test('should run through with an empty file', async () => {
 });
 
 tap.test('should run through work with transforms', async () => {
-  let done = smartq.defer();
+  let done = smartpromise.defer();
   let transforms = [
     {
       transform: 'babelify',

ts/gulpbrowser.browserify.ts

@@ -1,6 +1,6 @@
 import * as stream from 'stream';
 import plugins = require('./gulpbrowser.plugins');
-import * as q from 'q';
+import * as smartpromise from '@pushrocks/smartpromise';
 
 let browserify = function(transforms = []) {
   if (!Array.isArray(transforms)) {

tslint.json

@@ -1,3 +1,17 @@
 {
-    "extends": "tslint-config-standard"
+  "extends": ["tslint:latest", "tslint-config-prettier"],
+  "rules": {
+    "semicolon": [true, "always"],
+    "no-console": false,
+    "ordered-imports": false,
+    "object-literal-sort-keys": false,
+    "member-ordering": {
+      "options":{
+        "order": [
+          "static-method"
+        ]
+      }
+    }
+  },
+  "defaultSeverity": "warning"
 }