.gitlab-ci.yml

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

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Lossless GmbH
+Copyright (c) 2015 Push.Rocks
 
 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,19 +1,24 @@
-# @pushrocks/gulp-browser
+# gulp-browser
+
 browserify and other goodies for gulp
 
-## Availabililty and Links
-* [npmjs.org (npm package)](https://www.npmjs.com/package/@pushrocks/gulp-browser)
-* [gitlab.com (source)](https://gitlab.com/pushrocks/gulp-browser)
-* [github.com (source mirror)](https://github.com/pushrocks/gulp-browser)
-* [docs (typedoc)](https://pushrocks.gitlab.io/gulp-browser/)
+## Availabililty
+
+[![npm](https://pushrocks.gitlab.io/assets/repo-button-npm.svg)](https://www.npmjs.com/package/gulp-browser)
+[![git](https://pushrocks.gitlab.io/assets/repo-button-git.svg)](https://GitLab.com/pushrocks/gulp-browser)
+[![git](https://pushrocks.gitlab.io/assets/repo-button-mirror.svg)](https://github.com/pushrocks/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)
-[![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)
-[![Known Vulnerabilities](https://snyk.io/test/npm/@pushrocks/gulp-browser/badge.svg)](https://snyk.io/test/npm/@pushrocks/gulp-browser)
-[![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/)
+
+[![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)
+[![npm downloads per month](https://img.shields.io/npm/dm/gulp-browser.svg)](https://www.npmjs.com/package/gulp-browser)
+[![Dependency Status](https://david-dm.org/pushrocks/gulp-browser.svg)](https://david-dm.org/pushrocks/gulp-browser)
+[![bitHound Dependencies](https://www.bithound.io/github/pushrocks/gulp-browser/badges/dependencies.svg)](https://www.bithound.io/github/pushrocks/gulp-browser/master/dependencies/npm)
+[![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
@@ -46,12 +51,12 @@ gulp.task('gulpBrowserTest', function() {
 
 ### Contributors
 
-- [Phil Kunz](https://github.com/philkunz)
-- [Steffan Donal](https://github.com/SteffanDonal)
+* [Phil Kunz](https://github.com/philkunz)
+* [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://maintainedby.lossless.com)
+[![repo-footer](https://pushrocks.gitlab.io/assets/repo-footer.svg)](https://push.rocks)

dist/gulpbrowser.browserify.d.ts

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

dist/gulpbrowser.browserify.js

@@ -0,0 +1,44 @@
+"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

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

dist/gulpbrowser.plugins.js

@@ -0,0 +1,6 @@
+"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

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

dist/index.js

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

npmextra.json

@@ -1,19 +1,7 @@
 {
-  "gitzone": {
-    "module": {
-      "githost": "code.foss.global",
-      "gitscope": "push.rocks",
-      "gitrepo": "gulp-browser",
-      "shortDescription": "browserify and other goodies for gulp",
-      "npmPackagename": "@push.rocks/gulp-browser",
-      "license": "MIT"
-    }
-  },
   "npmci": {
-    "npmGlobalTools": [],
-    "npmAccessLevel": "public"
-  },
-  "tsdocs": {
-    "legal": "\n## License and Legal Information\n\nThis repository contains open-source code that is licensed under the MIT License. A copy of the MIT License can be found in the [license](license) file within this repository. \n\n**Please note:** The MIT License does not grant permission to use the trade names, trademarks, service marks, or product names of the project, except as required for reasonable and customary use in describing the origin of the work and reproducing the content of the NOTICE file.\n\n### Trademarks\n\nThis project is owned and maintained by Task Venture Capital GmbH. The names and logos associated with Task Venture Capital GmbH and any related products or services are trademarks of Task Venture Capital GmbH and are not included within the scope of the MIT license granted herein. Use of these trademarks must comply with Task Venture Capital GmbH's Trademark Guidelines, and any usage must be approved in writing by Task Venture Capital GmbH.\n\n### Company Information\n\nTask Venture Capital GmbH  \nRegistered at District court Bremen HRB 35230 HB, Germany\n\nFor any legal inquiries or if you require further information, please contact us via email at hello@task.vc.\n\nBy using this repository, you acknowledge that you have read this section, agree to comply with its terms, and understand that the licensing of the code does not imply endorsement by Task Venture Capital GmbH of any derivative works.\n"
+    "npmGlobalTools": [
+      "npmts"
+    ]
   }
 }

package.json

@@ -1,13 +1,15 @@
 {
-  "name": "@push.rocks/gulp-browser",
-  "version": "3.0.19",
-  "private": false,
+  "name": "gulp-browser",
+  "version": "3.0.11",
   "description": "browserify and other goodies for gulp",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "scripts": {
-    "test": "(tstest test/)",
-    "build": "(tsbuild)"
+    "test": "(npmts)",
+    "reinstall": "(rm -r node_modules && npm install)",
+    "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",
@@ -27,21 +29,20 @@
   },
   "homepage": "https://gitlab.com/pushrocks/gulp-browser",
   "dependencies": {
-    "@pushrocks/smartpromise": "^2.0.5",
-    "@types/browserify": "^12.0.36",
-    "@types/through2": "^2.0.34",
-    "browserify": "^16.2.3",
-    "through2": "^3.0.0"
+    "@types/browserify": "^12.0.32",
+    "@types/through2": "^2.0.33",
+    "browserify": "^16.1.1",
+    "smartq": "^1.1.8",
+    "through2": "^2.0.3"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.8",
-    "@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",
+    "@types/gulp": "^4.0.4",
+    "babel-core": "^6.26.0",
     "babel-preset-es2015": "^6.24.1",
-    "babelify": "^10.0.0",
-    "gulp": "^4.0.0"
+    "babelify": "^8.0.0",
+    "beautylog": "^6.1.10",
+    "gulp": "^3.9.1",
+    "gulp-function": "^2.2.9",
+    "tapbundle": "^2.0.0"
   }
 }

test/test.ts

@@ -1,13 +1,14 @@
+import * as beautylog from 'beautylog';
 import * as gulp from 'gulp';
-import * as gulpFunction from '@pushrocks/gulp-function';
-import * as smartpromise from '@pushrocks/smartpromise';
+import * as gulpFunction from 'gulp-function';
+import * as smartq from 'smartq';
 
-import { expect, tap } from '@pushrocks/tapbundle';
+import { expect, tap } from 'tapbundle';
 
 import * as gulpBrowser from '../ts/index';
 
 tap.test('should run through smoothly', async () => {
-  let done = smartpromise.defer();
+  let done = smartq.defer();
   let stream = gulp
     .src('./test/testBrowserifyNormal.js')
     .pipe(gulpBrowser.browserify())
@@ -20,8 +21,24 @@ 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 = smartpromise.defer();
+  let done = smartq.defer();
   let stream = gulp
     .src('./test/testBrowserifyEmpty.js')
     .pipe(gulpBrowser.browserify())
@@ -35,7 +52,7 @@ tap.test('should run through with an empty file', async () => {
 });
 
 tap.test('should run through work with transforms', async () => {
-  let done = smartpromise.defer();
+  let done = smartq.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 smartpromise from '@pushrocks/smartpromise';
+import * as q from 'smartq';
 
 let browserify = function(transforms = []) {
   if (!Array.isArray(transforms)) {

tsconfig.json

@@ -1,14 +0,0 @@
-{
-  "compilerOptions": {
-    "experimentalDecorators": true,
-    "useDefineForClassFields": false,
-    "target": "ES2022",
-    "module": "NodeNext",
-    "moduleResolution": "NodeNext",
-    "esModuleInterop": true,
-    "verbatimModuleSyntax": true
-  },
-  "exclude": [
-    "dist_*/**/*.d.ts"
-  ]
-}

tslint.json

@@ -0,0 +1,3 @@
+{
+    "extends": "tslint-config-standard"
+}