Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-12-20 23:40:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor: more cleanup

Browse Source 
use everything from build/public folder
This commit is contained in:
Barış Soner Uşaklı
2022-02-18 17:18:13 -05:00
parent 45d5b5a586
commit 29aaa9ee2d
4 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Gruntfile.js
View File

@@ -91,8 +91,8 @@ module.exports = function (grunt) {
}, },
clientUpdated: { clientUpdated: {
files: [ files: [
// 'public/src/modules/**/*.js', 'public/src/**/*.js',
// 'public/vendor/**/*.js', 'public/vendor/**/*.js',
...clientUpdated, ...clientUpdated,
'node_modules/benchpressjs/build/benchpress.js', 'node_modules/benchpressjs/build/benchpress.js',
], ],

12
public/src/app.js
View File

@@ -14,9 +14,9 @@ const Benchpress = require('benchpressjs');
Benchpress.setGlobal('config', config); Benchpress.setGlobal('config', config);
if (app.inAdmin) { if (app.inAdmin) {
require('../../build/public/scripts-admin.min'); require('../scripts-admin.min');
} else { } else {
require('../../build/public/scripts-client.min'); require('../scripts-client.min');
} }
require('./sockets'); require('./sockets');
@@ -55,16 +55,12 @@ app.flags = {};
app.importScript = async function (scriptName) { app.importScript = async function (scriptName) {
let pageScript; let pageScript;
try { try {
if (scriptName.startsWith('admin/plugins')) { if (scriptName.startsWith('admin')) {
pageScript = await import(/* webpackChunkName: "admin/plugins/[request]" */ 'admin/plugins/' + scriptName.replace(/^admin\/plugins\//, ''));
} else if (scriptName.startsWith('admin')) {
pageScript = await import(/* webpackChunkName: "admin/[request]" */ 'admin/' + scriptName.replace(/^admin\//, '')); pageScript = await import(/* webpackChunkName: "admin/[request]" */ 'admin/' + scriptName.replace(/^admin\//, ''));
} else if (scriptName.startsWith('forum/plugins')) {
pageScript = await import(/* webpackChunkName: "forum/plugins/[request]" */ 'forum/plugins/' + scriptName.replace(/^forum\/plugins\//, ''));
} else if (scriptName.startsWith('forum')) { } else if (scriptName.startsWith('forum')) {
pageScript = await import(/* webpackChunkName: "forum/[request]" */ 'forum/' + scriptName.replace(/^forum\//, '')); pageScript = await import(/* webpackChunkName: "forum/[request]" */ 'forum/' + scriptName.replace(/^forum\//, ''));
} else { } else {
pageScript = await import(/* webpackChunkName: "modules/[request]" */ '../../build/public/src/modules/' + scriptName); pageScript = await import(/* webpackChunkName: "modules/[request]" */ 'modules/' + scriptName);
} }
} catch (err) { } catch (err) {
console.warn('error loading script' + err.stack); console.warn('error loading script' + err.stack);

8
src/meta/js.js
View File

@@ -42,8 +42,8 @@ async function linkModules() {
const { modules } = JS.scripts; const { modules } = JS.scripts;
await Promise.all([ await Promise.all([
mkdirp(path.join(__dirname, '../../build/public/src/modules/admin/plugins')), mkdirp(path.join(__dirname, '../../build/public/src/admin/plugins')),
mkdirp(path.join(__dirname, '../../build/public/src/modules/forum/plugins')), mkdirp(path.join(__dirname, '../../build/public/src/client/plugins')),
]); ]);
await Promise.all(Object.keys(modules).map(async (relPath) => { await Promise.all(Object.keys(modules).map(async (relPath) => {
@@ -77,8 +77,8 @@ JS.buildModules = async function () {
const fse = require('fs-extra'); const fse = require('fs-extra');
await fse.copy( await fse.copy(
path.join(__dirname, `../../public/src/modules`), path.join(__dirname, `../../public/src`),
path.join(__dirname, `../../build/public/src/modules`) path.join(__dirname, `../../build/public/src`)
); );
await linkModules(); await linkModules();

12
webpack.common.js
View File

@@ -23,8 +23,8 @@ module.exports = {
new CleanWebpackPlugin(), // cleans dist folder new CleanWebpackPlugin(), // cleans dist folder
], ],
entry: { entry: {
nodebb: './public/src/app.js', nodebb: './build/public/src/app.js',
admin: './public/src/admin/admin.js', admin: './build/public/src/admin/admin.js',
}, },
output: { output: {
filename: '[name].min.js', filename: '[name].min.js',
@@ -39,16 +39,14 @@ module.exports = {
symlinks: false, symlinks: false,
modules: [ modules: [
'build/public/src/modules', 'build/public/src/modules',
'public/src', 'build/public/src',
'node_modules', 'node_modules',
...activePlugins.map(p => `node_modules/${p}/node_modules`), ...activePlugins.map(p => `node_modules/${p}/node_modules`),
], ],
alias: { alias: {
assets: path.resolve(__dirname, 'build/public'), assets: path.resolve(__dirname, 'build/public'),
'forum/plugins': path.resolve(__dirname, 'build/public/src/modules/forum/plugins'), forum: path.resolve(__dirname, 'build/public/src/client'),
forum: path.resolve(__dirname, 'public/src/client'), admin: path.resolve(__dirname, 'build/public/src/admin'),
'admin/plugins': path.resolve(__dirname, 'build/public/src/modules/admin/plugins'),
admin: path.resolve(__dirname, 'public/src/admin'),
vendor: path.resolve(__dirname, 'public/vendor'), vendor: path.resolve(__dirname, 'public/vendor'),
benchpress: path.resolve(__dirname, 'node_modules/benchpressjs'), benchpress: path.resolve(__dirname, 'node_modules/benchpressjs'),
Chart: path.resolve(__dirname, 'node_modules/chart.js'), Chart: path.resolve(__dirname, 'node_modules/chart.js'),