diff --git a/.npmignore b/.npmignore
new file mode 100644
index 0000000..002bb70
--- /dev/null
+++ b/.npmignore
@@ -0,0 +1,3 @@
+node_modules
+test
+ts
\ No newline at end of file
diff --git a/index.d.ts b/index.d.ts
new file mode 100644
index 0000000..d5a51df
--- /dev/null
+++ b/index.d.ts
@@ -0,0 +1,12 @@
+///
+declare module GulpBrowserBrowserify {
+ function init(): () => any;
+}
+declare var plugins: {
+ beautylog: any;
+ through: any;
+ gutil: any;
+ path: any;
+ browserify: any;
+};
+declare var gulpBrowser: any;
diff --git a/index.js b/index.js
index 02f992c..678e3a2 100644
--- a/index.js
+++ b/index.js
@@ -1,19 +1,21 @@
+#!/usr/bin/env node
+
///
var GulpBrowserBrowserify;
(function (GulpBrowserBrowserify) {
function init() {
return function () {
- return through.obj(function (file, enc, cb) {
+ return plugins.through.obj(function (file, enc, cb) {
var bundleCallback = function (err, bufferedContent) {
if (Buffer.isBuffer(bufferedContent)) {
file.contents = bufferedContent;
}
else {
- pr.beautylog.error("gulp-browser: .browserify() " + err.message);
+ plugins.beautylog.error("gulp-browser: .browserify() " + err.message);
}
cb(null, file);
};
- browserify(file)
+ plugins.browserify(file)
.bundle(bundleCallback);
});
};
@@ -22,11 +24,13 @@ var GulpBrowserBrowserify;
})(GulpBrowserBrowserify || (GulpBrowserBrowserify = {}));
///
///
-var through = require("through2");
-var gutil = require("gulp-util");
-var path = require("path");
-var browserify = require("browserify");
-var pr = require("pushrocks");
+var plugins = {
+ beautylog: require("beautylog"),
+ through: require("through2"),
+ gutil: require("gulp-util"),
+ path: require("path"),
+ browserify: require("browserify")
+};
//create the return object
var gulpBrowser = {};
gulpBrowser.browserify = GulpBrowserBrowserify.init();
diff --git a/package.json b/package.json
index a61daa9..0f0943a 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
"description": "browserify and other goodies for gulp",
"main": "index.js",
"scripts": {
- "test": "(cd ts/compile && node compile.js) && (node test.js)",
+ "test": "(npmts) && (node test.js)",
"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)",
@@ -15,6 +15,7 @@
"url": "https://github.com/pushrocks/gulp-browser.git"
},
"keywords": [
+ "gulpplugin",
"json",
"jade",
"template"
@@ -26,15 +27,14 @@
},
"homepage": "https://github.com/pushrocks/gulp-browser",
"dependencies": {
- "browserify": "12.0.1",
+ "browserify": "13.0.0",
"gulp-util": "3.0.7",
- "pushrocks": "1.0.24",
"through2": "2.0.0"
},
"devDependencies": {
- "beautylog": "1.0.6",
+ "beautylog": "2.0.2",
"gulp": "3.9.0",
"gulp-callfunction": "0.0.10",
- "gulp-typescript": "2.10.0"
+ "npmts": "^1.0.9"
}
}
diff --git a/test.js b/test.js
index f60c3df..7d2b8ce 100644
--- a/test.js
+++ b/test.js
@@ -1,27 +1,29 @@
///
-var gulp = require("gulp");
-var gulpBrowser = require("./index.js");
-var pr = require("pushrocks");
-var gulpCallFunction = require("gulp-callfunction");
-var pipeWorked = function () {
- pr.beautylog.info("Pipe didn't break! Ready for Primetime!");
+var plugins = {
+ beautylog: require("beautylog"),
+ gulp: require("gulp"),
+ gulpBrowser: require("./index.js"),
+ gulpCallFunction: require("gulp-callfunction")
};
-pr.beautylog.log('Now trying to browserify a testfile...');
-gulp.task('gulpBrowserTest', function (cb) {
- var stream = gulp.src('./test/browserifyGulpTest.js')
- .pipe(gulpBrowser.browserify())
- .pipe(gulp.dest("./test/result/"))
- .pipe(gulpCallFunction(pipeWorked));
+var pipeWorked = function () {
+ plugins.beautylog.info("Pipe didn't break! Ready for Primetime!");
+};
+plugins.beautylog.log('Now trying to browserify a testfile...');
+plugins.gulp.task('gulpBrowserTest', function (cb) {
+ var stream = plugins.gulp.src('./test/browserifyGulpTest.js')
+ .pipe(plugins.gulpBrowser.browserify())
+ .pipe(plugins.gulp.dest("./test/result/"))
+ .pipe(plugins.gulpCallFunction(pipeWorked));
return stream;
});
-gulp.task('gulpBrowserTestError', function (cb) {
- var stream = gulp.src('./test/browserifyGulpTestError.js')
- .pipe(gulpBrowser.browserify())
- .pipe(gulp.dest("./test/result/"))
- .pipe(gulpCallFunction(pipeWorked));
+plugins.gulp.task('gulpBrowserTestError', function (cb) {
+ var stream = plugins.gulp.src('./test/browserifyGulpTestError.js')
+ .pipe(plugins.gulpBrowser.browserify())
+ .pipe(plugins.gulp.dest("./test/result/"))
+ .pipe(plugins.gulpCallFunction(pipeWorked));
return stream;
});
-gulp.task("default", ['gulpBrowserTest', 'gulpBrowserTestError'], function () {
- pr.beautylog.success("Test passed!");
+plugins.gulp.task("default", ['gulpBrowserTest', 'gulpBrowserTestError'], function () {
+ plugins.beautylog.success("Test passed!");
});
-gulp.start.apply(gulp, ['default']);
+plugins.gulp.start.apply(plugins.gulp, ['default']);
diff --git a/ts/compile/compile.js b/ts/compile/compile.js
deleted file mode 100644
index 20fcdb8..0000000
--- a/ts/compile/compile.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// import gulp
-var gulp = require("gulp")
-var gulpTypescript = require("gulp-typescript");
-var pr = require("pushrocks");
-
-gulp.task('compileTS', function() {
- var stream = gulp.src('../index.ts')
- .pipe(gulpTypescript({
- out: "index.js"
- }))
- .pipe(gulp.dest("../../"));
- return stream;
-});
-
-gulp.task('compileTestTS', function() {
- var stream = gulp.src('../test.ts')
- .pipe(gulpTypescript({
- out: "test.js"
- }))
- .pipe(gulp.dest("../../"));
- return stream;
-});
-
-gulp.task('default',['compileTS','compileTestTS'], function() {
- pr.beautylog.success('Typescript compiled');
-});
-gulp.start.apply(gulp, ['default']);
\ No newline at end of file
diff --git a/ts/compile/readme.md b/ts/compile/readme.md
deleted file mode 100644
index b43dc07..0000000
--- a/ts/compile/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# How to compile.
-Make sure gulp and gulp-taypescript from npm are available. Then run the gulpfile in this directory.
\ No newline at end of file
diff --git a/ts/index.ts b/ts/index.ts
index 385dbae..fc633da 100644
--- a/ts/index.ts
+++ b/ts/index.ts
@@ -1,11 +1,14 @@
///
///
-var through = require("through2");
-var gutil = require("gulp-util");
-var path = require("path");
-var browserify = require("browserify");
-var pr = require("pushrocks");
+var plugins = {
+ beautylog: require("beautylog"),
+ through: require("through2"),
+ gutil: require("gulp-util"),
+ path: require("path"),
+ browserify: require("browserify")
+};
+
//create the return object
var gulpBrowser:any = {};
diff --git a/ts/modulebrowserify.ts b/ts/modulebrowserify.ts
index a4142f9..3539b48 100644
--- a/ts/modulebrowserify.ts
+++ b/ts/modulebrowserify.ts
@@ -2,16 +2,16 @@
module GulpBrowserBrowserify {
export function init() {
return function() {
- return through.obj((file, enc, cb) => { //this is the through object that gets returned by gulpBrowser.browserify();
+ return plugins.through.obj((file, enc, cb) => { //this is the through object that gets returned by gulpBrowser.browserify();
var bundleCallback = function(err, bufferedContent) {
if (Buffer.isBuffer(bufferedContent)){
file.contents = bufferedContent;
} else {
- pr.beautylog.error("gulp-browser: .browserify() " + err.message);
+ plugins.beautylog.error("gulp-browser: .browserify() " + err.message);
}
cb(null,file);
};
- browserify(file)
+ plugins.browserify(file)
.bundle(bundleCallback)
});
};
diff --git a/ts/test.ts b/ts/test.ts
index 09b6920..66269d3 100644
--- a/ts/test.ts
+++ b/ts/test.ts
@@ -1,29 +1,33 @@
///
-var gulp = require("gulp");
-var gulpBrowser = require("./index.js");
-var pr = require("pushrocks");
-var gulpCallFunction = require("gulp-callfunction");
-var pipeWorked = function() {
- pr.beautylog.info("Pipe didn't break! Ready for Primetime!");
+var plugins = {
+ beautylog: require("beautylog"),
+ gulp: require("gulp"),
+ gulpBrowser: require("./index.js"),
+ gulpCallFunction: require("gulp-callfunction")
};
-pr.beautylog.log('Now trying to browserify a testfile...');
-gulp.task('gulpBrowserTest',function(cb) {
- var stream =gulp.src('./test/browserifyGulpTest.js')
- .pipe(gulpBrowser.browserify())
- .pipe(gulp.dest("./test/result/"))
- .pipe(gulpCallFunction(pipeWorked));
+
+var pipeWorked = function() {
+ plugins.beautylog.info("Pipe didn't break! Ready for Primetime!");
+};
+
+plugins.beautylog.log('Now trying to browserify a testfile...');
+plugins.gulp.task('gulpBrowserTest',function(cb) {
+ var stream = plugins.gulp.src('./test/browserifyGulpTest.js')
+ .pipe(plugins.gulpBrowser.browserify())
+ .pipe(plugins.gulp.dest("./test/result/"))
+ .pipe(plugins.gulpCallFunction(pipeWorked));
return stream;
});
-gulp.task('gulpBrowserTestError',function(cb) {
- var stream = gulp.src('./test/browserifyGulpTestError.js')
- .pipe(gulpBrowser.browserify())
- .pipe(gulp.dest("./test/result/"))
- .pipe(gulpCallFunction(pipeWorked));
+plugins.gulp.task('gulpBrowserTestError',function(cb) {
+ var stream = plugins.gulp.src('./test/browserifyGulpTestError.js')
+ .pipe(plugins.gulpBrowser.browserify())
+ .pipe(plugins.gulp.dest("./test/result/"))
+ .pipe(plugins.gulpCallFunction(pipeWorked));
return stream;
});
-gulp.task("default",['gulpBrowserTest','gulpBrowserTestError'],function(){
- pr.beautylog.success("Test passed!");
+plugins.gulp.task("default",['gulpBrowserTest','gulpBrowserTestError'],function(){
+ plugins.beautylog.success("Test passed!");
});
-gulp.start.apply(gulp, ['default']);
\ No newline at end of file
+plugins.gulp.start.apply(plugins.gulp, ['default']);
\ No newline at end of file