Merge pull request #926 from ficristo/search-fix

[mirror_xterm.js.git] / gulpfile.js

diff --git a/gulpfile.js b/gulpfile.js
index afb7df4816d7f2c943804bd000a91f538c89d3c6..249b7a0fa3434300532178dbba02139028ec759e 100644 (file)
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -6,6 +6,7 @@ const browserify = require('browserify');
 const buffer = require('vinyl-buffer');
 const coveralls = require('gulp-coveralls');
 const fs = require('fs-extra');
+const path = require('path');
 const gulp = require('gulp');
 const istanbul = require('gulp-istanbul');
 const merge = require('merge-stream');
@@ -22,6 +23,12 @@ let tsProjectSearchAddon = ts.createProject('./src/addons/search/tsconfig.json')
 let srcDir = tsProject.config.compilerOptions.rootDir;
 let outDir = tsProject.config.compilerOptions.outDir;
 
+// Under some environments like TravisCI, this comes out at absolute which can
+// break the build. This ensures that the outDir is absolute.
+if (outDir.indexOf(__dirname) !== 0) {
+  outDir = `${__dirname}/${outDir}`;
+}
+
 /**
  * Compile TypeScript sources to JavaScript files and create a source map file for each TypeScript
  * file compiled.
@@ -59,7 +66,7 @@ gulp.task('browserify', ['tsc'], function() {
   let browserifyOptions = {
     basedir: buildDir,
     debug: true,
-    entries: [`../${outDir}/xterm.js`],
+    entries: [`${outDir}/xterm.js`],
     standalone: 'Terminal',
     cache: {},
     packageCache: {}
@@ -87,6 +94,7 @@ gulp.task('browserify-addons', ['tsc'], function() {
     packageCache: {}
   };
   let searchBundle = browserify(searchOptions)
+        .external(path.join(outDir, 'xterm.js'))
         .bundle()
         .pipe(source('./addons/search/search.js'))
         .pipe(buffer())