Grunt active plugins (#7677)

* feat: only watch active plugins/themes

* fix: remove log

* fix: remove left over glob

* fix: remove test glob

* feat: watch baseThemes as well

* feat: dont watch upgrade scripts
v1.18.x
Barış Soner Uşaklı 6 years ago committed by GitHub
parent 5995834bc6
commit a6b7770342
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -1,5 +1,7 @@
'use strict'; 'use strict';
var async = require('async');
var fork = require('child_process').fork; var fork = require('child_process').fork;
var env = process.env; var env = process.env;
var worker; var worker;
@ -10,6 +12,26 @@ var running = 0;
env.NODE_ENV = env.NODE_ENV || 'development'; env.NODE_ENV = env.NODE_ENV || 'development';
var nconf = require('nconf');
nconf.file({
file: 'config.json',
});
nconf.defaults({
base_dir: __dirname,
views_dir: './build/public/templates',
});
var winston = require('winston');
winston.configure({
transports: [
new winston.transports.Console({
handleExceptions: true,
}),
],
});
var db = require('./src/database');
module.exports = function (grunt) { module.exports = function (grunt) {
var args = []; var args = [];
var initArgs = ['--build']; var initArgs = ['--build'];
@ -70,12 +92,42 @@ module.exports = function (grunt) {
} }
grunt.initConfig({ grunt.initConfig({
watch: { watch: {},
});
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.registerTask('default', ['watch']);
grunt.registerTask('init', function () {
var done = this.async();
async.waterfall([
function (next) {
db.init(next);
},
function (next) {
db.getSortedSetRange('plugins:active', 0, -1, next);
},
function (plugins, next) {
addBaseThemes(plugins, next);
},
function (plugins, next) {
if (!plugins.includes('nodebb-plugin-composer-default')) {
plugins.push('nodebb-plugin-composer-default');
}
const lessUpdated_Client = plugins.map(p => 'node_modules/' + p + '/**/*.less');
const lessUpdated_Admin = plugins.map(p => 'node_modules/' + p + '/**/*.less');
const clientUpdated = plugins.map(p => 'node_modules/' + p + '/**/*.js');
const templatesUpdated = plugins.map(p => 'node_modules/' + p + '/**/*.tpl');
const langUpdated = plugins.map(p => 'node_modules/' + p + '/**/*.json');
grunt.config(['watch'], {
lessUpdated_Client: { lessUpdated_Client: {
files: [ files: [
'public/less/*.less', 'public/less/*.less',
'!public/less/admin/**/*.less', '!public/less/admin/**/*.less',
'node_modules/nodebb-*/**/*.less', ...lessUpdated_Client,
'!node_modules/nodebb-*/node_modules/**', '!node_modules/nodebb-*/node_modules/**',
'!node_modules/nodebb-*/.git/**', '!node_modules/nodebb-*/.git/**',
], ],
@ -86,7 +138,7 @@ module.exports = function (grunt) {
lessUpdated_Admin: { lessUpdated_Admin: {
files: [ files: [
'public/less/admin/**/*.less', 'public/less/admin/**/*.less',
'node_modules/nodebb-*/**/*.less', ...lessUpdated_Admin,
'!node_modules/nodebb-*/node_modules/**', '!node_modules/nodebb-*/node_modules/**',
'!node_modules/nodebb-*/.git/**', '!node_modules/nodebb-*/.git/**',
], ],
@ -97,7 +149,7 @@ module.exports = function (grunt) {
clientUpdated: { clientUpdated: {
files: [ files: [
'public/src/**/*.js', 'public/src/**/*.js',
'node_modules/nodebb-*/**/*.js', ...clientUpdated,
'!node_modules/nodebb-*/node_modules/**', '!node_modules/nodebb-*/node_modules/**',
'node_modules/benchpressjs/build/benchpress.js', 'node_modules/benchpressjs/build/benchpress.js',
'!node_modules/nodebb-*/.git/**', '!node_modules/nodebb-*/.git/**',
@ -107,7 +159,7 @@ module.exports = function (grunt) {
}, },
}, },
serverUpdated: { serverUpdated: {
files: ['*.js', 'install/*.js', 'src/**/*.js'], files: ['*.js', 'install/*.js', 'src/**/*.js', '!src/upgrades/**'],
options: { options: {
interval: 1000, interval: 1000,
}, },
@ -115,7 +167,7 @@ module.exports = function (grunt) {
templatesUpdated: { templatesUpdated: {
files: [ files: [
'src/views/**/*.tpl', 'src/views/**/*.tpl',
'node_modules/nodebb-*/**/*.tpl', ...templatesUpdated,
'!node_modules/nodebb-*/node_modules/**', '!node_modules/nodebb-*/node_modules/**',
'!node_modules/nodebb-*/.git/**', '!node_modules/nodebb-*/.git/**',
], ],
@ -127,7 +179,7 @@ module.exports = function (grunt) {
files: [ files: [
'public/language/en-GB/*.json', 'public/language/en-GB/*.json',
'public/language/en-GB/**/*.json', 'public/language/en-GB/**/*.json',
'node_modules/nodebb-*/**/*.json', ...langUpdated,
'!node_modules/nodebb-*/node_modules/**', '!node_modules/nodebb-*/node_modules/**',
'!node_modules/nodebb-*/.git/**', '!node_modules/nodebb-*/.git/**',
'!node_modules/nodebb-*/plugin.json', '!node_modules/nodebb-*/plugin.json',
@ -138,12 +190,14 @@ module.exports = function (grunt) {
interval: 1000, interval: 1000,
}, },
}, },
});
next();
}, },
], done);
}); });
grunt.loadNpmTasks('grunt-contrib-watch'); grunt.task.run('init');
grunt.registerTask('default', ['watch']);
env.NODE_ENV = 'development'; env.NODE_ENV = 'development';
if (grunt.option('skip')) { if (grunt.option('skip')) {
@ -164,3 +218,25 @@ module.exports = function (grunt) {
grunt.event.on('watch', update); grunt.event.on('watch', update);
}; };
function addBaseThemes(plugins, callback) {
const themeId = plugins.find(p => p.startsWith('nodebb-theme-'));
if (!themeId) {
return setImmediate(callback, null, plugins);
}
function getBaseRecursive(themeId) {
try {
const baseTheme = require(themeId + '/theme').baseTheme;
if (baseTheme) {
plugins.push(baseTheme);
getBaseRecursive(baseTheme);
}
} catch (err) {
console.log(err);
}
}
getBaseRecursive(themeId);
callback(null, plugins);
}

Loading…
Cancel
Save