too much work … just find a way to concatenate

This commit is contained in:
Felipe Gasper
2017-10-27 21:10:23 -05:00
parent f2befc0c06
commit 0ca1318284
4 changed files with 46 additions and 5 deletions
-1
View File
@@ -10,7 +10,6 @@
<script src="/build/xterm.js" ></script>
<script src="/build/addons/attach/attach.js" ></script>
<script src="/js/zmodem.devel.js" ></script>
<script src="/build/addons/zmodem/zmodem.js" ></script>
<script src="/build/addons/fit/fit.js" ></script>
+28 -4
View File
@@ -20,6 +20,7 @@ const util = require('gulp-util');
let buildDir = process.env.BUILD_DIR || 'build';
let tsProject = ts.createProject('tsconfig.json');
let tsProjectSearchAddon = ts.createProject('./src/addons/search/tsconfig.json');
let tsProjectZmodemAddon = ts.createProject('./src/addons/zmodem/tsconfig.json');
let srcDir = tsProject.config.compilerOptions.rootDir;
let outDir = tsProject.config.compilerOptions.outDir;
@@ -49,13 +50,17 @@ gulp.task('tsc', function () {
let tsResultSearchAddon = tsProjectSearchAddon.src().pipe(sourcemaps.init()).pipe(tsProjectSearchAddon());
let tscSearchAddon = tsResultSearchAddon.js.pipe(sourcemaps.write('.', {includeContent: false, sourceRoot: ''})).pipe(gulp.dest(`${outDir}/addons/search`));
fs.emptyDirSync(`${outDir}/addons/zmodem`);
let tsResultZmodemAddon = tsProjectZmodemAddon.src().pipe(sourcemaps.init()).pipe(tsProjectZmodemAddon());
let tscZmodemAddon = tsResultZmodemAddon.js.pipe(sourcemaps.write('.', {includeContent: false, sourceRoot: ''})).pipe(gulp.dest(`${outDir}/addons/zmodem`));
// Copy all addons from ${srcDir}/ to ${outDir}/
let copyAddons = gulp.src([`${srcDir}/addons/**/*`, `!${srcDir}/addons/search`, `!${srcDir}/addons/search/**`]).pipe(gulp.dest(`${outDir}/addons`));
let copyAddons = gulp.src([`${srcDir}/addons/**/*`, `!${srcDir}/addons/search`, `!${srcDir}/addons/search/**`, `!${srcDir}/addons/zmodem`, `!${srcDir}/addons/zmodem/**`]).pipe(gulp.dest(`${outDir}/addons`));
// Copy stylesheets from ${srcDir}/ to ${outDir}/
let copyStylesheets = gulp.src(`${srcDir}/**/*.css`).pipe(gulp.dest(outDir));
return merge(tsc, tscSearchAddon, copyAddons, copyStylesheets);
return merge(tsc, tscSearchAddon, tscZmodemAddon, copyAddons, copyStylesheets);
});
/**
@@ -105,16 +110,35 @@ gulp.task('browserify-addons', ['tsc'], function() {
.pipe(sourcemaps.write('./'))
.pipe(gulp.dest(buildDir));
let zmodemOptions = {
basedir: `${buildDir}/addons/zmodem`,
debug: true,
entries: [`${outDir}/addons/zmodem/zmodem.js`],
cache: {},
packageCache: {}
};
let zmodemBundle = browserify(zmodemOptions)
.external(path.join(outDir, 'Terminal.js'))
.bundle()
.pipe(source('./addons/zmodem/zmodem.js'))
.pipe(buffer())
.pipe(sourcemaps.init({loadMaps: true, sourceRoot: ''}))
.pipe(sourcemaps.write('./'))
.pipe(gulp.dest(buildDir));
// Copy all add-ons from outDir to buildDir
let copyAddons = gulp.src([
// Copy JS addons
`${outDir}/addons/**/*`,
// Exclude TS addons from copy as they are being built via browserify
`!${outDir}/addons/search`,
`!${outDir}/addons/search/**`
`!${outDir}/addons/search/**`,
`!${outDir}/addons/zmodem`,
`!${outDir}/addons/zmodem/**`,
]).pipe(gulp.dest(`${buildDir}/addons`));
return merge(searchBundle, copyAddons);
return merge(searchBundle, zmodemBundle, copyAddons);
});
gulp.task('instrument-test', function () {
+10
View File
@@ -0,0 +1,10 @@
{
"compilerOptions": {
"module": "commonjs",
"target": "es6",
"rootDir": ".",
"outDir": "../../../lib/addons/zmodem/",
"sourceMap": true,
"removeComments": true
}
}
@@ -1,3 +1,11 @@
import { Zmodem } from '../../../node_modules/zmodem.js/dist/zmodem.js';
declare var exports: any;
declare var module: any;
declare var define: any;
declare var require: any;
declare var window: any;
/**
*
* Allow xterm.js to handle ZMODEM uploads and downloads.