diff --git a/package-lock.json b/package-lock.json index 2af615f..55b267c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@netcentric/fe-build", - "version": "5.0.0", + "version": "5.1.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@netcentric/fe-build", - "version": "5.0.0", + "version": "5.1.1", "license": "Apache-2.0", "dependencies": { "@babel/core": "^7.26.7", diff --git a/tasks/clientlibs.js b/tasks/clientlibs.js index 698bd99..735f06d 100644 --- a/tasks/clientlibs.js +++ b/tasks/clientlibs.js @@ -18,8 +18,7 @@ module.exports = (config) => { // get parse to check if it has css or js or both. Object.keys(entries).forEach((entryKey) => { - const { name, folder, fileName } = getClientlib(entryKey, config); - const extension = entryKey.split('.').pop(); + const { name, folder, fileName, extension } = getClientlib(entryKey); if (!clientLibs[folder]) { clientLibs[folder] = { name, folder }; diff --git a/tasks/clientlibs.test.js b/tasks/clientlibs.test.js index 9e64a92..deba29e 100644 --- a/tasks/clientlibs.test.js +++ b/tasks/clientlibs.test.js @@ -24,7 +24,7 @@ describe('Test task/clientlibs.js', () => { const file = path.join(destinationPath, entry); const type = path.extname(file); const dir = path.dirname(file); - const { name, fileName } = getClientlib(entry, config); + const { name, fileName } = getClientlib(entry); const ext = type == '.js' ? 'js' : 'css'; const txtContet = `${fileName.split('.').slice(0, -1).join('.')}.${ext}`; const txtPath = path.join(dir, `${ext}.txt`); diff --git a/utils/getClientlib.js b/utils/getClientlib.js index f0d9df2..cb175a2 100644 --- a/utils/getClientlib.js +++ b/utils/getClientlib.js @@ -1,16 +1,16 @@ const path = require('path'); -module.exports = function getClientlib(original, config) { - // extract from config - const { sourceTypes, sourceKey, bundleKey } = config.general; +module.exports = function getClientlib(original) { + const folder = path.dirname(original); const fileName = path.basename(original); - const clear = new RegExp([...sourceTypes, sourceKey, bundleKey].join('|'), 'gi'); - const name = folder.replace(clear, '').split(path.sep).join('.'); + const name = folder.split(path.sep).join('.'); + const extension = original.split('.').pop(); return { folder, name, - fileName + fileName, + extension, }; }; diff --git a/utils/getClientlib.test.js b/utils/getClientlib.test.js index 90727af..7be2e7c 100644 --- a/utils/getClientlib.test.js +++ b/utils/getClientlib.test.js @@ -1,22 +1,19 @@ process.argv.push('--quiet'); const path = require('path'); -const defaults = require('../config'); -const extendConfig = require('./extendConfig'); -const generateEntries = require('./generateEntries'); const getClientlib = require("./getClientlib"); -const config = extendConfig('./test/.febuild', defaults); - describe('Test utils/getClientlib.js', () => { - + it('Should return from a file location the required info for a clientlib, eg category name, file to import into js.txt etc', () => { const fileName = 'component.bundle.js'; const folder = 'publish/content/component'; + const extension = 'js'; const location = `${folder}${path.sep}${fileName}`; - const clientlibNameCategory = 'publish.content.component' - const clientlib = getClientlib(location, config); + const clientlibNameCategory = 'publish.content.component'; + const clientlib = getClientlib(location); expect(clientlib.name).toBe(clientlibNameCategory); expect(clientlib.fileName).toBe(fileName); expect(clientlib.folder).toBe(folder); + expect(clientlib.extension).toBe(extension); }); })