Merge pull request #109 from resin-io/refactor/remove-browserify

Get rid of Browserify
This commit is contained in:
Juan Cruz Viotti 2016-01-22 00:10:43 -04:00
commit a03d1214ec
5 changed files with 9 additions and 50744 deletions

File diff suppressed because it is too large Load Diff

View File

@ -18,9 +18,6 @@ var gulp = require('gulp');
var jshint = require('gulp-jshint'); var jshint = require('gulp-jshint');
var jshintStylish = require('jshint-stylish'); var jshintStylish = require('jshint-stylish');
var sass = require('gulp-sass'); var sass = require('gulp-sass');
var browserify = require('browserify');
var source = require('vinyl-source-stream');
var buffer = require('vinyl-buffer');
var paths = { var paths = {
scripts: [ scripts: [
@ -49,26 +46,9 @@ gulp.task('lint', function() {
.pipe(jshint.reporter(jshintStylish)); .pipe(jshint.reporter(jshintStylish));
}); });
gulp.task('javascript', function() { gulp.task('watch', [ 'lint', 'sass' ], function() {
'use strict'; 'use strict';
var b = browserify({ gulp.watch(paths.scripts, [ 'lint' ]);
entries: './lib/browser/app.js',
// No need for Browserify builtins since Electron
// has access to all NodeJS libraries
builtins: {}
});
return b.bundle()
.pipe(source('app.js'))
.pipe(buffer())
.pipe(gulp.dest('./build/browser/'));
});
gulp.task('watch', [ 'lint', 'javascript', 'sass' ], function() {
'use strict';
gulp.watch(paths.scripts, [ 'lint', 'javascript' ]);
gulp.watch(paths.sass, [ 'sass' ]); gulp.watch(paths.sass, [ 'sass' ]);
}); });

View File

@ -25,11 +25,11 @@ var shell = remote.require('shell');
var dialog = remote.require('./src/dialog'); var dialog = remote.require('./src/dialog');
require('angular-ui-bootstrap'); require('angular-ui-bootstrap');
require('./modules/selection-state'); require('./browser/modules/selection-state');
require('./modules/drive-scanner'); require('./browser/modules/drive-scanner');
require('./modules/image-writer'); require('./browser/modules/image-writer');
require('./modules/logger'); require('./browser/modules/logger');
require('./modules/path'); require('./browser/modules/path');
var app = angular.module('ResinEtcher', [ var app = angular.module('ResinEtcher', [
'ui.bootstrap', 'ui.bootstrap',

View File

@ -17,7 +17,7 @@
<script src="../vendor/tracker.js"></script> <script src="../vendor/tracker.js"></script>
<!-- END TRACKJS --> <!-- END TRACKJS -->
<script src="../build/browser/app.js"></script> <script src="./browser/app.js"></script>
</head> </head>
<body ng-app="ResinEtcher" ng-controller="AppController as app" style="display: none"> <body ng-app="ResinEtcher" ng-controller="AppController as app" style="display: none">
<div class="content row middle-xs space-horizontal-large"> <div class="content row middle-xs space-horizontal-large">

View File

@ -36,7 +36,6 @@
}, },
"devDependencies": { "devDependencies": {
"angular-mocks": "^1.4.7", "angular-mocks": "^1.4.7",
"browserify": "^12.0.1",
"electron-mocha": "^0.6.1", "electron-mocha": "^0.6.1",
"electron-packager": "^5.1.1", "electron-packager": "^5.1.1",
"electron-prebuilt": "^0.31.2", "electron-prebuilt": "^0.31.2",
@ -44,8 +43,6 @@
"gulp-jshint": "^1.11.2", "gulp-jshint": "^1.11.2",
"gulp-sass": "^2.0.4", "gulp-sass": "^2.0.4",
"jshint-stylish": "^2.0.1", "jshint-stylish": "^2.0.1",
"mochainon": "^1.0.0", "mochainon": "^1.0.0"
"vinyl-buffer": "^1.0.0",
"vinyl-source-stream": "^1.1.0"
} }
} }