ch4o5/locomotive-boilerplate
Template
1
0
Fork 0
mirror of https://github.com/locomotivemtl/locomotive-boilerplate.git synced 2026-01-15 00:55:08 +08:00
Code Issues Projects Releases Wiki Activity

Make glob optional in concats.js

Browse Source 
Added:
- Condition to process includes with glob if it's available.

Changed:
- Utility 'glob.js' to not throw an error if a glob function is unavailable.
This commit is contained in:
Chauncey McAskill
2022-02-08 15:18:18 -05:00
parent c9056b27d8
commit 5e07473396
2 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
build/tasks/concats.js
View File

@@ -56,20 +56,24 @@ export const productionConcatFilesArgs = [
* @todo Add support for minification.
*
* @async
* @param {object} [globOptions=null] - Customize the glob options.
* @param {object|boolean} [globOptions=null] - Customize the glob options.
* If `null`, default production options are used.
* @param {object} [concatOptions=null] - Customize the concatenation options.
* If `false`, the glob function will be ignored.
* @param {object} [concatOptions=null] - Customize the concatenation options.
* If `null`, default production options are used.
* @return {Promise}
*/
export default async function concatFiles(globOptions = null, concatOptions = null) {
if (globOptions == null) {
globOptions = productionGlobOptions;
} else if (
globOptions !== developmentGlobOptions &&
globOptions !== productionGlobOptions
) {
globOptions = Object.assign({}, defaultGlobOptions, globOptions);
if (glob) {
if (globOptions == null) {
globOptions = productionGlobOptions;
} else if (
globOptions !== false &&
globOptions !== developmentGlobOptions &&
globOptions !== productionGlobOptions
) {
globOptions = Object.assign({}, defaultGlobOptions, globOptions);
}
}
if (concatOptions == null) {
@@ -97,7 +101,13 @@ export default async function concatFiles(globOptions = null, concatOptions = nu
includes = includes.map((path) => template(path));
outfile = template(outfile);
let files = await glob(includes, globOptions);
let files;
if (glob && globOptions) {
files = await glob(includes, globOptions);
} else {
files = includes;
}
if (concatOptions.removeDuplicates) {
files = files.map((path) => normalize(path));