Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-05-06 20:47:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

test: maybe fix build test

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2022-02-17 22:10:33 -05:00
parent 66c45996e1
commit cb34728421
3 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/src/app.js
View File

@@ -14,9 +14,9 @@ const Benchpress = require('benchpressjs');
Benchpress.setGlobal('config', config);
if (app.inAdmin) {
require('../../build/public/acp-scripts.min');
require('../../build/public/scripts-admin.min');
} else {
require('../../build/public/client-scripts.min');
require('../../build/public/scripts-client.min');
}
require('./sockets');

10
src/meta/js.js
View File

@@ -128,18 +128,14 @@ async function getBundleScriptList(target) {
}
JS.buildBundle = async function (target, fork) {
const fileNames = {
client: 'client-scripts.min.js',
admin: 'acp-scripts.min.js',
};
const filename = `scripts-${target}.min.js`;
const files = await getBundleScriptList(target);
const minify = process.env.NODE_ENV !== 'development';
const filePath = path.join(__dirname, '../../build/public', fileNames[target]);
const filePath = path.join(__dirname, '../../build/public', filename);
await minifier.js.bundle({
files: files,
filename: fileNames[target],
filename: filename,
destPath: filePath,
}, minify, fork);
};

31
test/build.js
View File

@@ -6,7 +6,6 @@ const assert = require('assert');
const mkdirp = require('mkdirp');
const rimraf = require('rimraf');
const async = require('async');
const nconf = require('nconf');
const db = require('./mocks/databasemock');
const file = require('../src/file');
@@ -148,7 +147,7 @@ describe('Build', () => {
it('should build client js bundle', (done) => {
build.build(['client js bundle'], (err) => {
assert.ifError(err);
const filename = path.join(__dirname, '../build/public/client-scripts.min.js');
const filename = path.join(__dirname, '../build/public/scripts-client.min.js');
assert(file.existsSync(filename));
assert(fs.readFileSync(filename).length > 1000);
done();
@@ -158,7 +157,7 @@ describe('Build', () => {
it('should build admin js bundle', (done) => {
build.build(['admin js bundle'], (err) => {
assert.ifError(err);
const filename = path.join(__dirname, '../build/public/acp-scripts.min.js');
const filename = path.join(__dirname, '../build/public/scripts-admin.min.js');
assert(file.existsSync(filename));
assert(fs.readFileSync(filename).length > 1000);
done();
@@ -190,17 +189,21 @@ describe('Build', () => {
});
});
// TODO: doesn't work because plugins js modules are not loaded into build/public/src/modules
it('should build bundle files', async () => {
await build.buildAll();
assert(file.existsSync(path.join(__dirname, '../dist/app.bundle.js')));
assert(file.existsSync(path.join(__dirname, '../dist/admin.bundle.js')));
let { res, body } = await helpers.request('GET', `/dist/app.bundle.js`, {});
assert(res.statusCode, 200);
assert(body);
({ res, body } = await helpers.request('GET', `/dist/admin.bundle.js`, {}));
assert(res.statusCode, 200);
assert(body);
it('should build bundle files', function (done) {
this.timeout(0);
build.buildAll(async (err) => {
assert.ifError(err);
assert(file.existsSync(path.join(__dirname, '../build/webpack/nodebb.min.js')));
assert(file.existsSync(path.join(__dirname, '../build/webpack/admin.min.js')));
let { res, body } = await helpers.request('GET', `/assets/nodebb.min.js`, {});
assert(res.statusCode, 200);
assert(body);
({ res, body } = await helpers.request('GET', `/assets/admin.min.js`, {}));
assert(res.statusCode, 200);
assert(body);
done();
});
});
it('should build templates', function (done) {