|
|
|
'use strict';
|
|
|
|
|
|
|
|
const path = require('path');
|
|
|
|
const nconf = require('nconf');
|
|
|
|
|
|
|
|
nconf.argv().env({
|
|
|
|
separator: '__',
|
|
|
|
});
|
|
|
|
const winston = require('winston');
|
|
|
|
const { fork } = require('child_process');
|
|
|
|
|
|
|
|
const { env } = process;
|
|
|
|
let worker;
|
|
|
|
|
|
|
|
env.NODE_ENV = env.NODE_ENV || 'development';
|
|
|
|
|
|
|
|
const configFile = path.resolve(__dirname, nconf.any(['config', 'CONFIG']) || 'config.json');
|
|
|
|
const prestart = require('./src/prestart');
|
|
|
|
|
|
|
|
prestart.loadConfig(configFile);
|
|
|
|
|
|
|
|
const db = require('./src/database');
|
|
|
|
const plugins = require('./src/plugins');
|
|
|
|
|
|
|
|
module.exports = function (grunt) {
|
|
|
|
const args = [];
|
|
|
|
|
|
|
|
if (!grunt.option('verbose')) {
|
|
|
|
args.push('--log-level=info');
|
|
|
|
nconf.set('log-level', 'info');
|
|
|
|
}
|
|
|
|
prestart.setupWinston();
|
|
|
|
|
|
|
|
grunt.initConfig({
|
|
|
|
watch: {},
|
|
|
|
});
|
|
|
|
|
|
|
|
grunt.loadNpmTasks('grunt-contrib-watch');
|
|
|
|
|
|
|
|
grunt.registerTask('default', ['watch']);
|
|
|
|
|
|
|
|
grunt.registerTask('init', async function () {
|
|
|
|
const done = this.async();
|
|
|
|
let pluginList = [];
|
|
|
|
if (!process.argv.includes('--core')) {
|
|
|
|
await db.init();
|
|
|
|
pluginList = await plugins.getActive();
|
|
|
|
addBaseThemes(pluginList);
|
|
|
|
if (!pluginList.includes('nodebb-plugin-composer-default')) {
|
|
|
|
pluginList.push('nodebb-plugin-composer-default');
|
|
|
|
}
|
|
|
|
if (!pluginList.includes('nodebb-theme-persona')) {
|
|
|
|
pluginList.push('nodebb-theme-persona');
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
const styleUpdated_Client = pluginList.map(p => `node_modules/${p}/*.less`)
|
|
|
|
.concat(pluginList.map(p => `node_modules/${p}/*.css`))
|
|
|
|
.concat(pluginList.map(p => `node_modules/${p}/+(public|static|less)/**/*.less`))
|
|
|
|
.concat(pluginList.map(p => `node_modules/${p}/+(public|static)/**/*.css`));
|
|
|
|
|
|
|
|
const styleUpdated_Admin = pluginList.map(p => `node_modules/${p}/*.less`)
|
|
|
|
.concat(pluginList.map(p => `node_modules/${p}/*.css`))
|
|
|
|
.concat(pluginList.map(p => `node_modules/${p}/+(public|static|less)/**/*.less`))
|
|
|
|
.concat(pluginList.map(p => `node_modules/${p}/+(public|static)/**/*.css`));
|
|
|
|
|
|
|
|
const clientUpdated = pluginList.map(p => `node_modules/${p}/+(public|static)/**/*.js`);
|
|
|
|
const serverUpdated = pluginList.map(p => `node_modules/${p}/*.js`)
|
|
|
|
.concat(pluginList.map(p => `node_modules/${p}/+(lib|src)/**/*.js`));
|
|
|
|
|
|
|
|
const templatesUpdated = pluginList.map(p => `node_modules/${p}/+(public|static|templates)/**/*.tpl`);
|
|
|
|
const langUpdated = pluginList.map(p => `node_modules/${p}/+(public|static|languages)/**/*.json`);
|
|
|
|
|
|
|
|
grunt.config(['watch'], {
|
|
|
|
styleUpdated_Client: {
|
|
|
|
files: [
|
|
|
|
'public/less/**/*.less',
|
|
|
|
...styleUpdated_Client,
|
|
|
|
],
|
|
|
|
options: {
|
|
|
|
interval: 1000,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
styleUpdated_Admin: {
|
|
|
|
files: [
|
|
|
|
'public/less/**/*.less',
|
|
|
|
...styleUpdated_Admin,
|
|
|
|
],
|
|
|
|
options: {
|
|
|
|
interval: 1000,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
clientUpdated: {
|
|
|
|
files: [
|
|
|
|
'public/src/**/*.js',
|
|
|
|
'public/vendor/**/*.js',
|
|
|
|
...clientUpdated,
|
|
|
|
'node_modules/benchpressjs/build/benchpress.js',
|
|
|
|
],
|
|
|
|
options: {
|
|
|
|
interval: 1000,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
serverUpdated: {
|
|
|
|
files: [
|
|
|
|
'app.js',
|
|
|
|
'install/*.js',
|
|
|
|
'src/**/*.js',
|
Webpack5 (#10311)
* feat: webpack 5 part 1
* fix: gruntfile fixes
* fix: fix taskbar warning
add app.importScript
copy public/src/modules to build folder
* refactor: remove commented old code
* feat: reenable admin
* fix: acp settings pages, fix sortable on manage categories
embedded require in html not allowed
* fix: bundle serialize/deserizeli so plugins dont break
* test: fixe util tests
* test: fix require path
* test: more test fixes
* test: require correct utils module
* test: require correct utils
* test: log stack
* test: fix db require blowing up tests
* test: move and disable bundle test
* refactor: add aliases
* test: disable testing route
* fix: move webpack modules necessary for build, into `dependencies`
* test: fix one more test
remove 500-embed.tpl
* fix: restore use of assets/nodebb.min.js, at least for now
* fix: remove unnecessary line break
* fix: point to proper ACP bundle
* test: maybe fix build test
* test: composer
* refactor: dont need dist
* refactor: more cleanup
use everything from build/public folder
* get rid of conditional import in app.js
* fix: ace
* refactor: cropper alias
* test: lint and test fixes
* lint: fix
* refactor: rename function to app.require
* refactor: go back to using app.require
* chore: use github branch
* chore: use webpack branch
* feat: webpack webinstaller
* feat: add chunkFile name with contenthash
* refactor: move hooks to top
* refactor: get rid of template500Function
* fix(deps): use webpack5 branch of 2factor plugin
* chore: tagging v2.0.0-beta.0 pre-release version :boom: :shipit: :tada: :rocket:
* refactor: disable cache on templates
loadTemplate is called once by benchpress and the result is cache internally
* refactor: add server side helpers.js
* feat: deprecate /plugins shorthand route, closes #10343
* refactor: use build/public for webpack
* test: fix filename
* fix: more specific selector
* lint: ignore
* refactor: fix comments
* test: add debug for random failing test
* refactor: cleanup
remove test page, remove dupe functions in utils.common
* lint: use relative path for now
* chore: bump prerelease version
* feat: add translateKeys
* fix: optional params
* fix: get rid of extra timeago files
* refactor: cleanup, require timeago locale earlier
remove translator.prepareDOM, it is in header.tpl html tag
* refactor: privileges system to use a Map in the backend instead of separate objects for keys and labels (#10378)
* refactor: privileges system to use a Map in the backend instead of separate objects for keys and labels
- Existing hooks are preserved (to be deprecated at a later date, possibly)
- New init hooks are called on NodeBB start, and provide a one-stop shop to add new privileges, instead of having to add to four different hooks
* docs: fix typo in comment
* test: spec changes
* refactor: privileges system to use a Map in the backend instead of separate objects for keys and labels (#10378)
* refactor: privileges system to use a Map in the backend instead of separate objects for keys and labels
- Existing hooks are preserved (to be deprecated at a later date, possibly)
- New init hooks are called on NodeBB start, and provide a one-stop shop to add new privileges, instead of having to add to four different hooks
* docs: fix typo in comment
* test: spec changes
* feat: allow app.require('bootbox'/'benchpressjs')
* refactor: require server side utils
* test: jquery ready
* change istaller to use build/public
* test: use document.addEventListener
* refactor: closes #10301
* refactor: generateTopicClass
* fix: column counts for other privileges
* fix: #10443, regression where sorted-list items did not render into the DOM in the predicted order [breaking]
* fix: typo in hook name
* refactor: introduce a generic autocomplete.init() method that can be called to add nodebb-style autocompletion but using different data sources (e.g. not user/groups/tags)
* fix: crash if `delay` not passed in (as it cannot be destructured)
* refactor: replace substr
* feat: set --panel-offset style in html element based on stored value in localStorage
* refactor: addDropupHandler() logic to be less naive
- Take into account height of the menu
- Don't apply dropUp logic if there's nothing in the dropdown
- Remove 'hidden' class (added by default in Persona for post tools) when menu items are added
closes #10423
* refactor: simplify utils.params [breaking]
Retrospective analysis of the usage of this method suggests that the options passed in are superfluous, and that only `url` is required. Using a browser built-in makes more sense to accomplish what this method sets out to do.
* feat: add support for returning full URLSearchParams for utils.params
* fix: utils.params() fallback handling
* fix: default empty obj for params()
* fix: remove \'loggedin\' and \'register\' qs parameters once they have been used, delay invocation of messages until ajaxify.end
* fix: utils.params() not allowing relative paths to be passed in
* refactor(DRY): new assertPasswordValidity utils method
* fix: incorrect error message returned on insufficient privilege on flag edit
* fix: read/update/delete access to flags API should be limited for moderators to only post flags in categories they moderate
- added failing tests and patched up middleware.assert.flags to fix
* refactor: flag api v3 tests to create new post and flags on every round
* fix: missing error:no-flag language key
* refactor: flags.canView to check flag existence, simplify middleware.assert.flag
* feat: flag deletion API endpoint, #10426
* feat: UI for flag deletion, closes #10426
* chore: update plugin versions
* chore: up emoji
* chore: update markdown
* chore: up emoji-android
* fix: regression caused by utils.params() refactor, supports arrays and pipes all values through utils.toType, adjusts tests to type check
Co-authored-by: Julian Lam <[email protected]>
3 years ago
|
|
|
'public/src/modules/translator.common.js',
|
|
|
|
'public/src/modules/helpers.common.js',
|
|
|
|
'public/src/utils.common.js',
|
|
|
|
serverUpdated,
|
|
|
|
'!src/upgrades/**',
|
|
|
|
],
|
|
|
|
options: {
|
|
|
|
interval: 1000,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
templatesUpdated: {
|
|
|
|
files: [
|
|
|
|
'src/views/**/*.tpl',
|
|
|
|
...templatesUpdated,
|
|
|
|
],
|
|
|
|
options: {
|
|
|
|
interval: 1000,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
langUpdated: {
|
|
|
|
files: [
|
|
|
|
'public/language/en-GB/*.json',
|
|
|
|
'public/language/en-GB/**/*.json',
|
|
|
|
...langUpdated,
|
|
|
|
],
|
|
|
|
options: {
|
|
|
|
interval: 1000,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
});
|
|
|
|
const build = require('./src/meta/build');
|
|
|
|
if (!grunt.option('skip')) {
|
|
|
|
await build.build(true, { watch: true });
|
|
|
|
}
|
|
|
|
run();
|
|
|
|
done();
|
|
|
|
});
|
|
|
|
|
|
|
|
function run() {
|
|
|
|
if (worker) {
|
|
|
|
worker.kill();
|
|
|
|
}
|
|
|
|
|
|
|
|
const execArgv = [];
|
|
|
|
const inspect = process.argv.find(a => a.startsWith('--inspect'));
|
|
|
|
|
|
|
|
if (inspect) {
|
|
|
|
execArgv.push(inspect);
|
|
|
|
}
|
|
|
|
|
|
|
|
worker = fork('app.js', args, {
|
|
|
|
env,
|
|
|
|
execArgv,
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
grunt.task.run('init');
|
|
|
|
|
|
|
|
grunt.event.removeAllListeners('watch');
|
|
|
|
grunt.event.on('watch', (action, filepath, target) => {
|
|
|
|
let compiling;
|
|
|
|
if (target === 'styleUpdated_Client') {
|
|
|
|
compiling = 'clientCSS';
|
|
|
|
} else if (target === 'styleUpdated_Admin') {
|
|
|
|
compiling = 'acpCSS';
|
|
|
|
} else if (target === 'clientUpdated') {
|
|
|
|
compiling = 'js';
|
|
|
|
} else if (target === 'templatesUpdated') {
|
|
|
|
compiling = 'tpl';
|
|
|
|
} else if (target === 'langUpdated') {
|
|
|
|
compiling = 'lang';
|
|
|
|
} else if (target === 'serverUpdated') {
|
|
|
|
// empty require cache
|
|
|
|
const paths = ['./src/meta/build.js', './src/meta/index.js'];
|
|
|
|
paths.forEach(p => delete require.cache[require.resolve(p)]);
|
|
|
|
return run();
|
|
|
|
}
|
|
|
|
|
Webpack5 (#10311)
* feat: webpack 5 part 1
* fix: gruntfile fixes
* fix: fix taskbar warning
add app.importScript
copy public/src/modules to build folder
* refactor: remove commented old code
* feat: reenable admin
* fix: acp settings pages, fix sortable on manage categories
embedded require in html not allowed
* fix: bundle serialize/deserizeli so plugins dont break
* test: fixe util tests
* test: fix require path
* test: more test fixes
* test: require correct utils module
* test: require correct utils
* test: log stack
* test: fix db require blowing up tests
* test: move and disable bundle test
* refactor: add aliases
* test: disable testing route
* fix: move webpack modules necessary for build, into `dependencies`
* test: fix one more test
remove 500-embed.tpl
* fix: restore use of assets/nodebb.min.js, at least for now
* fix: remove unnecessary line break
* fix: point to proper ACP bundle
* test: maybe fix build test
* test: composer
* refactor: dont need dist
* refactor: more cleanup
use everything from build/public folder
* get rid of conditional import in app.js
* fix: ace
* refactor: cropper alias
* test: lint and test fixes
* lint: fix
* refactor: rename function to app.require
* refactor: go back to using app.require
* chore: use github branch
* chore: use webpack branch
* feat: webpack webinstaller
* feat: add chunkFile name with contenthash
* refactor: move hooks to top
* refactor: get rid of template500Function
* fix(deps): use webpack5 branch of 2factor plugin
* chore: tagging v2.0.0-beta.0 pre-release version :boom: :shipit: :tada: :rocket:
* refactor: disable cache on templates
loadTemplate is called once by benchpress and the result is cache internally
* refactor: add server side helpers.js
* feat: deprecate /plugins shorthand route, closes #10343
* refactor: use build/public for webpack
* test: fix filename
* fix: more specific selector
* lint: ignore
* refactor: fix comments
* test: add debug for random failing test
* refactor: cleanup
remove test page, remove dupe functions in utils.common
* lint: use relative path for now
* chore: bump prerelease version
* feat: add translateKeys
* fix: optional params
* fix: get rid of extra timeago files
* refactor: cleanup, require timeago locale earlier
remove translator.prepareDOM, it is in header.tpl html tag
* refactor: privileges system to use a Map in the backend instead of separate objects for keys and labels (#10378)
* refactor: privileges system to use a Map in the backend instead of separate objects for keys and labels
- Existing hooks are preserved (to be deprecated at a later date, possibly)
- New init hooks are called on NodeBB start, and provide a one-stop shop to add new privileges, instead of having to add to four different hooks
* docs: fix typo in comment
* test: spec changes
* refactor: privileges system to use a Map in the backend instead of separate objects for keys and labels (#10378)
* refactor: privileges system to use a Map in the backend instead of separate objects for keys and labels
- Existing hooks are preserved (to be deprecated at a later date, possibly)
- New init hooks are called on NodeBB start, and provide a one-stop shop to add new privileges, instead of having to add to four different hooks
* docs: fix typo in comment
* test: spec changes
* feat: allow app.require('bootbox'/'benchpressjs')
* refactor: require server side utils
* test: jquery ready
* change istaller to use build/public
* test: use document.addEventListener
* refactor: closes #10301
* refactor: generateTopicClass
* fix: column counts for other privileges
* fix: #10443, regression where sorted-list items did not render into the DOM in the predicted order [breaking]
* fix: typo in hook name
* refactor: introduce a generic autocomplete.init() method that can be called to add nodebb-style autocompletion but using different data sources (e.g. not user/groups/tags)
* fix: crash if `delay` not passed in (as it cannot be destructured)
* refactor: replace substr
* feat: set --panel-offset style in html element based on stored value in localStorage
* refactor: addDropupHandler() logic to be less naive
- Take into account height of the menu
- Don't apply dropUp logic if there's nothing in the dropdown
- Remove 'hidden' class (added by default in Persona for post tools) when menu items are added
closes #10423
* refactor: simplify utils.params [breaking]
Retrospective analysis of the usage of this method suggests that the options passed in are superfluous, and that only `url` is required. Using a browser built-in makes more sense to accomplish what this method sets out to do.
* feat: add support for returning full URLSearchParams for utils.params
* fix: utils.params() fallback handling
* fix: default empty obj for params()
* fix: remove \'loggedin\' and \'register\' qs parameters once they have been used, delay invocation of messages until ajaxify.end
* fix: utils.params() not allowing relative paths to be passed in
* refactor(DRY): new assertPasswordValidity utils method
* fix: incorrect error message returned on insufficient privilege on flag edit
* fix: read/update/delete access to flags API should be limited for moderators to only post flags in categories they moderate
- added failing tests and patched up middleware.assert.flags to fix
* refactor: flag api v3 tests to create new post and flags on every round
* fix: missing error:no-flag language key
* refactor: flags.canView to check flag existence, simplify middleware.assert.flag
* feat: flag deletion API endpoint, #10426
* feat: UI for flag deletion, closes #10426
* chore: update plugin versions
* chore: up emoji
* chore: update markdown
* chore: up emoji-android
* fix: regression caused by utils.params() refactor, supports arrays and pipes all values through utils.toType, adjusts tests to type check
Co-authored-by: Julian Lam <[email protected]>
3 years ago
|
|
|
require('./src/meta/build').build([compiling], { webpack: false }, (err) => {
|
|
|
|
if (err) {
|
|
|
|
winston.error(err.stack);
|
|
|
|
}
|
|
|
|
if (worker) {
|
|
|
|
worker.send({ compiling: compiling });
|
|
|
|
}
|
|
|
|
});
|
|
|
|
});
|
|
|
|
};
|
|
|
|
|
|
|
|
function addBaseThemes(pluginList) {
|
|
|
|
let themeId = pluginList.find(p => p.includes('nodebb-theme-'));
|
|
|
|
if (!themeId) {
|
|
|
|
return pluginList;
|
|
|
|
}
|
|
|
|
let baseTheme;
|
|
|
|
do {
|
|
|
|
try {
|
|
|
|
baseTheme = require(`${themeId}/theme`).baseTheme;
|
|
|
|
} catch (err) {
|
|
|
|
console.log(err);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (baseTheme) {
|
|
|
|
pluginList.push(baseTheme);
|
|
|
|
themeId = baseTheme;
|
|
|
|
}
|
|
|
|
} while (baseTheme);
|
|
|
|
return pluginList;
|
|
|
|
}
|