Fixed builder not replacing paths correctly

master
Guusvanmeerveld 3 years ago
parent e2507a3d47
commit 9098d7952e

@ -35,7 +35,7 @@ module.exports = {
{ {
input: 'libraries', input: 'libraries',
output: 'lib', output: 'lib',
type: 'other', type: 'css',
}, },
{ {
input: 'manifest.json', input: 'manifest.json',

@ -45,7 +45,7 @@ const builder = async (path, outPath, fileType) => {
/** /**
* Compiles a file * Compiles a file
* @param {string} file - The input files path * @param {string} file - The input files path
* @param {'sass' | 'js' | 'html' | 'file'} fileType - The file type * @param {'sass' | 'js' | 'html' | 'css' | 'file'} fileType - The file type
*/ */
const fileBuilder = async (file, outPath, fileType) => { const fileBuilder = async (file, outPath, fileType) => {
const t0 = performance.now(); const t0 = performance.now();
@ -57,6 +57,7 @@ const fileBuilder = async (file, outPath, fileType) => {
file = file.replace(sassExtension, '.min.css'); file = file.replace(sassExtension, '.min.css');
} }
const path = file.split('/'); const path = file.split('/');
const fileName = path[path.length - 1]; const fileName = path[path.length - 1];
@ -75,7 +76,7 @@ const fileBuilder = async (file, outPath, fileType) => {
/** /**
* Compiles a string of data given its type. * Compiles a string of data given its type.
* @param {string} data * @param {string} data
* @param {'sass' | 'js' | 'html' | 'file'} fileType * @param {'sass' | 'js' | 'html' | 'css' | 'file'} fileType
* @returns {Promise<string>} The compiled data * @returns {Promise<string>} The compiled data
*/ */
const compile = async (file, fileType) => { const compile = async (file, fileType) => {
@ -85,6 +86,7 @@ const compile = async (file, fileType) => {
return data.css.toString(); return data.css.toString();
case 'js': case 'js':
case 'css':
case 'html': case 'html':
return await minify(file).catch((err) => return await minify(file).catch((err) =>
console.log('Error compiling file ' + file + ':' + err) console.log('Error compiling file ' + file + ':' + err)
@ -105,9 +107,10 @@ const replacePaths = (data) => {
data = data.replace(new RegExp(key, 'g'), '/' + config.paths[key]); data = data.replace(new RegExp(key, 'g'), '/' + config.paths[key]);
}); });
data = data.replace(sassExtension, '.min.css');
} }
data = data.replace(new RegExp(sassExtension, 'g'), '.min.css');
return data; return data;
}; };

@ -25,7 +25,7 @@ watcher.on('change', async (path) => {
if (config) { if (config) {
const fileType = path.split('.').pop(); const fileType = path.split('.').pop();
const outPath = join(process.cwd(), 'dist', config.output); const outPath = join(distDir, config.output);
await fileBuilder(path, outPath, fileType); await fileBuilder(path, outPath, fileType);
} }

Loading…
Cancel
Save