Skip to content

build: fix missing plugins in dist directory and simplify grunt build #1327

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 11, 2018
Merged

build: fix missing plugins in dist directory and simplify grunt build #1327

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 20 additions & 25 deletions Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,17 +85,22 @@ module.exports = function(grunt) {
});

var pluginCombinations = combine(plugins);
var pluginConcatFiles = pluginCombinations.reduce(function(dict, comb) {
var key = comb.map(function(plugin) {
return path.basename(plugin, '.js');
});
key.sort();

var dest = path.join('build/', key.join(','), '/raven.js');
dict[dest] = ['src/singleton.js'].concat(comb);
var pluginConcatFiles = pluginCombinations
.filter(function(comb) {
return comb.length > 0;
})
.reduce(function(dict, comb) {
var key = comb.map(function(plugin) {
return path.basename(plugin, '.js');
});
key.sort();

var dest = path.join('build/', key.join(','), '/raven.js');
dict[dest] = ['src/singleton.js'].concat(comb);

return dict;
}, {});
return dict;
}, {});

var browserifyConfig = {
options: {
Expand Down Expand Up @@ -302,24 +307,14 @@ module.exports = function(grunt) {

// Build tasks
grunt.registerTask('_prep', ['clean', 'gitinfo', 'version']);
grunt.registerTask('build', ['_prep', 'build.core', 'build.plugins', 'sri:build']);
grunt.registerTask('build.test', ['_prep', 'build.core', 'browserify:test']);
grunt.registerTask('build.core', ['browserify:core']);
grunt.registerTask(
'browserify.core',
['_prep', 'browserify:core'].concat(browserifyPluginTaskNames)
'build.plugins',
browserifyPluginTaskNames.concat('browserify:plugins-combined')
);
grunt.registerTask('browserify.plugins-combined', [
'_prep',
'browserify:plugins-combined'
]);
grunt.registerTask('build', ['build.core', 'build.plugins-combined']);
grunt.registerTask('build.test', ['_prep', 'browserify.core', 'browserify:test']);
grunt.registerTask('build.core', ['browserify.core', 'uglify', 'sri:dist']);
grunt.registerTask('build.plugins-combined', [
'browserify.plugins-combined',
'uglify',
'sri:dist',
'sri:build'
]);
grunt.registerTask('dist', ['build', 'copy:dist']);
grunt.registerTask('dist', ['build', 'uglify', 'copy:dist', 'sri:dist']);
grunt.registerTask('publish', ['build', 's3']);
grunt.registerTask('test:ci', ['config:ci', 'build.test']);
};