jizy-packer 2.1.11 → 2.1.13

package/lib/Rollup.js

@@ -9,7 +9,7 @@ import terser from '@rollup/plugin-terser';
 
 import jPackConfig from "./Config.js";
 import LogMe from "./LogMe.js";
-import { emptyTargetPath } from './utils.js';
+import { emptyTargetPath, moveFolderFiles } from './utils.js';
 
 export default async function jPackRollup(config) {
     return [
@@ -81,7 +81,7 @@ export default async function jPackRollup(config) {
 };
 
 function generateBuildJs() {
-    LogMe.log('Generate the build.js file ...');
+    LogMe.log('Generate build.js');
 
     // Read the build template
     let code = fs.readFileSync(jPackConfig.get('buildTemplatePath'), 'utf8');
@@ -89,7 +89,7 @@ function generateBuildJs() {
     // append config callback
     const onGenerateBuildJs = jPackConfig.get('onGenerateBuildJs');
     if (typeof onGenerateBuildJs === 'function') {
-        LogMe.log('Calling onGenerateBuildJs callback');
+        LogMe.log('**onGenerateBuildJs');
         code = onGenerateBuildJs(code);
     }
 
@@ -99,15 +99,15 @@ function generateBuildJs() {
     fs.writeFileSync(jPackConfig.get('buildJsFilePath'), code, 'utf8');
 
     if (fs.existsSync(jPackConfig.get('buildJsFilePath'))) {
-        LogMe.log('Generated build successfully in "' + jPackConfig.get('buildJsFilePath') + '"');
+        LogMe.log('Build generated in "' + jPackConfig.get('buildJsFilePath') + '"');
     } else {
-        console.error('Error: Generated build file not found: ' + jPackConfig.get('buildJsFilePath'));
+        console.error('Error: build.js file not found');
         process.exit(1);
     }
 }
 
 function generateWrappedJs(code) {
-    LogMe.log('Generate the wrapper.js file ...');
+    LogMe.log('Generate wrapper.js');
 
     const date = new Date();
     const wrapper = fs.readFileSync(jPackConfig.get('wrapperPath'), 'utf8');
@@ -134,6 +134,7 @@ function generateWrappedJs(code) {
 
     const onGenerateWrappedJs = jPackConfig.get('onGenerateWrappedJs');
     if (typeof onGenerateWrappedJs === 'function') {
+        LogMe.log('**onGenerateWrappedJs');
         wrapped = onGenerateWrappedJs(wrapped);
     }
 
@@ -141,32 +142,9 @@ function generateWrappedJs(code) {
 }
 
 function onPacked() {
-    LogMe.log('Packed successfully.');
+    LogMe.log('*onPacked');
 
-    moveCssFiles();
-
-    const onPacked = jPackConfig.get('onPacked');
-    if (typeof onPacked === 'function') {
-        onPacked();
-    }
-
-    // Cleanup the build folder
-    cleanupBuild();
-
-    LogMe.log('Build process completed.');
-}
-
-function onComplete() {
-    LogMe.log('All done.');
-
-    const onComplete = jPackConfig.get('onComplete');
-    if (typeof onComplete === 'function') {
-        onComplete();
-    }
-}
-
-function moveCssFiles() {
-    LogMe.log('Moving CSS files from js/ to css/ ...');
+    LogMe.log('Move CSS files from js/ to css/');
     const targetPath = jPackConfig.get('targetPath');
 
     fs.readdirSync(jPackConfig.get('targetRelativePath') + '/js')
@@ -178,10 +156,14 @@ function moveCssFiles() {
             fs.renameSync(oldPath, newPath);
             LogMe.log('- ' + file);
         });
-}
 
-function cleanupBuild() {
-    LogMe.log('Cleaning up generated build ...');
+    const onPacked = jPackConfig.get('onPacked');
+    if (typeof onPacked === 'function') {
+        LogMe.log('**onPacked');
+        onPacked();
+    }
+
+    LogMe.log('Clean up');
 
     // Remove the generated build.js file
     if (fs.existsSync(jPackConfig.get('buildJsFilePath'))) {
@@ -199,3 +181,20 @@ function cleanupBuild() {
         }
     });
 }
+
+function onComplete() {
+    LogMe.log('*onComplete');
+
+    if (jPackConfig.get('buildName') === 'example') {
+        LogMe.log('Move example files to root example folder');
+        const src = path.join(jPackConfig.get('basePath'), 'build/example');
+        const dest = path.join(jPackConfig.get('basePath'), 'example');
+        moveFolderFiles(src, dest);
+    }
+
+    const onComplete = jPackConfig.get('onComplete');
+    if (typeof onComplete === 'function') {
+        LogMe.log('**onComplete');
+        onComplete();
+    }
+}

package/lib/utils.js

@@ -94,6 +94,28 @@ export function deleteLessVariablesFile(variablesPath) {
     }
 };
 
+export function moveFolderFiles(src, dest) {
+    if (!fs.existsSync(src)) {
+        return;
+    }
+
+    fs.mkdirSync(dest, { recursive: true });
+
+    fs.readdirSync(src).forEach(file => {
+        const srcPath = path.join(src, file);
+        const destPath = path.join(dest, file);
+        if (fs.lstatSync(srcPath).isDirectory()) {
+            moveFolderFiles(srcPath, destPath);
+        } else {
+            fs.copyFileSync(srcPath, destPath);
+        }
+        fs.unlinkSync(srcPath);
+    });
+
+    fs.rmdirSync(src);
+};
+
+
 function isObject(item) {
     return (item && typeof item === 'object' && !Array.isArray(item));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jizy-packer",
-  "version": "2.1.11",
+  "version": "2.1.13",
   "type": "module",
   "files": [
     "lib/*.js"