Unified script-css functionality

highcharts · Dec 12, 2023 · 48edb89 · 48edb89
1 parent c7b6c22
commit 48edb89
Show file tree

Hide file tree

Showing 4 changed files with 77 additions and 56 deletions.
diff --git a/css/dashboards.css → css/dashboards/dashboards.css b/css/dashboards.css → css/dashboards/dashboards.css
diff --git a/css/datagrid.css → css/datagrid/datagrid.css b/css/datagrid.css → css/datagrid/datagrid.css
diff --git a/tools/gulptasks/dashboards/scripts-css.js b/tools/gulptasks/dashboards/scripts-css.js
@@ -4,19 +4,6 @@
 
 const gulp = require('gulp');
 
-/* *
- *
- *  Constants
- *
- * */
-
-const COPY_DIRECTORIES = [
-    'css',
-    'gfx'
-];
-
-const TARGET_DIRECTORY = 'code';
-
 /* *
  *
  *  Tasks
@@ -30,39 +17,33 @@ const TARGET_DIRECTORY = 'code';
  * Promise to keep
  */
 function dashboardsScriptsCSS() {
-
-    const fslib = require('../lib/fs');
     const log = require('../lib/log');
-    const path = require('path');
+    const { copyCSS } = require('../scripts-css');
+
+    const TARGET_DIRECTORY = 'code';
+
+    const dashboardsConfig = {
+        sources: [
+            'css/dashboards/',
+            'gfx/dashboards-icons/'
+        ],
+        target: TARGET_DIRECTORY + '/dashboards',
+        replacePath: 'dashboards/',
+        exclude: []
+    };
+
+    const datagridConfig = {
+        sources: 'css/datagrid/',
+        target: TARGET_DIRECTORY + '/datagrid',
+        replacePath: 'datagrid/',
+        exclude: []
+    };
 
     return new Promise(resolve => {
         log.message('Copy css and gfx ...');
 
-        const dashboardsCSS = path.join('css', 'dashboards.css');
-        const dashboardsGFX = path.join('gfx', 'dashboards-icons');
-
-        fslib.copyFile(
-            dashboardsCSS,
-            path.join('code', 'dashboards', dashboardsCSS)
-        );
-
-        fslib.copyAllFiles(
-            dashboardsGFX,
-            path.join('code', 'dashboards', dashboardsGFX),
-            true
-        );
-
-        const dataGridCSS = path.join('css', 'datagrid.css');
-
-        fslib.copyFile(
-            dataGridCSS,
-            path.join('code', 'dashboards', dataGridCSS)
-        );
-
-        fslib.copyFile(
-            dataGridCSS,
-            path.join('code', 'datagrid', dataGridCSS)
-        );
+        copyCSS(dashboardsConfig);
+        copyCSS(datagridConfig);
 
         log.success('Done.');
 

diff --git a/tools/gulptasks/scripts-css.js b/tools/gulptasks/scripts-css.js
@@ -17,6 +17,56 @@ const COPY_DIRECTORIES = [
 
 const TARGET_DIRECTORY = 'code';
 
+const highchartsConfig = {
+    sources: COPY_DIRECTORIES,
+    target: TARGET_DIRECTORY,
+    replacePath: '',
+    exclude: [
+        'dashboards/',
+        'datagrid/',
+        'dashboards-icons/'
+    ]
+};
+
+function handleConfig(config) {
+    const defaultConfig = {
+        sources: [], // Directories to copy over
+        target: 'code', // Directory to copy to
+        exclude: [], // Files and directories to exclude. Uses strubg.include()
+        replacePath: '' // String to replace from the path of the original file when copying
+    };
+
+    // Ensure sources is an array
+    if (typeof config.sources === 'string') {
+        config.sources = [config.sources];
+    }
+
+    // Merge the defaultConfig with the provided config
+    return { ...defaultConfig, ...config };
+}
+
+function copyCSS(config) {
+    const fslib = require('./lib/fs');
+    const path = require('path');
+
+    config = handleConfig(config);
+
+    config.sources.forEach(
+        copyPath => fslib.copyAllFiles(
+            copyPath,
+            path.join(
+                config.target,
+                config.replacePath ?
+                    copyPath.replace(config.replacePath, '') :
+                    copyPath
+            ),
+            true,
+            fileName => !config.exclude
+                .some(name => fileName.includes(name))
+        )
+    );
+}
+
 /* *
  *
  *  Tasks
@@ -30,26 +80,12 @@ const TARGET_DIRECTORY = 'code';
  *         Promise to keep
  */
 function task() {
-
-    const fslib = require('./lib/fs');
     const log = require('./lib/log');
-    const path = require('path');
 
     return new Promise(resolve => {
-
         log.message('Generating css ...');
 
-        COPY_DIRECTORIES.forEach(
-            copyPath => fslib.copyAllFiles(
-                copyPath,
-                path.join(TARGET_DIRECTORY, copyPath),
-                true,
-                fileName =>
-                    !['dashboards', 'datagrid']
-                        .some(name => fileName.includes(`${name}.css`))
-
-            )
-        );
+        copyCSS(highchartsConfig);
 
         log.success('Copied CSS');
 
@@ -58,3 +94,7 @@ function task() {
 }
 
 gulp.task('scripts-css', task);
+
+module.exports = {
+    copyCSS
+};