jizy-packer 2.1.0 → 2.1.2

package/lib/Build.js

@@ -1,6 +1,7 @@
 import fs from 'fs';
 import path from 'path';
 import { rollup } from 'rollup';
+import { pathToFileURL } from 'url';
 
 import LogMe from "./LogMe.js";
 import jPackConfig from "./Config.js";
@@ -72,24 +73,8 @@ export default async function jPackBuild({
     jPackConfig.set('action', action);
     jPackConfig.set('debug', debug);
 
-    try {
-        LogMe.log('Load jPack config');
-
-        const jpack = path.join(jPackConfig.get('basePath'), 'config', 'jpack.js');
-        if (!fs.existsSync(jpack)) {
-            throw new Error('Default jPack config not found in ' + jpack);
-        }
-
-        require(jpack);
-
-        jPackConfig.setPackageVersion();
-    } catch (error) {
-        LogMe.error(error.message);
-        process.exit(1);
-    }
-
     if (config) {
-        LogMe.log('Load the build config');
+        LogMe.log('Build config');
         try {
             if (config.substr(0, 1) === '{') {
                 LogMe.log('  JSON string');
@@ -104,6 +89,7 @@ export default async function jPackBuild({
         }
     }
 
+    jPackConfig.setPackageVersion();
     jPackConfig.validate();
 
     try {
@@ -115,6 +101,7 @@ export default async function jPackBuild({
         process.exit(1);
     }
 
+    LogMe.log('---');
     LogMe.log('Launch build ...');
 
     try {

package/lib/Cli.js

@@ -3,8 +3,9 @@ import { hideBin } from 'yargs/helpers';
 import jPackBuild from "./Build.js";
 import jPackConfig from "./Config.js";
 
-const jPackCli = function () {
+const jPackCli = function (jPackData) {
     jPackConfig.set('basePath', process.cwd());
+    jPackData();
 
     const command = yargs(hideBin(process.argv))
         .usage('Usage: $0 <command> [options]')

package/lib/Config.js

@@ -86,8 +86,9 @@ const jPackConfig = {
         if (typeof newConfig !== 'object' || newConfig === null) {
             throw new Error('Invalid configuration: newConfig must be an object.');
         }
-        newConfig.array.forEach(element => {
-            this.set(element, newConfig[element]);
+
+        Object.keys(newConfig).forEach(element => {
+            config[element] = newConfig[element];
         });
     },
 

package/lib/Rollup.js

@@ -155,11 +155,11 @@ function moveCssFiles() {
     LogMe.log('Moving CSS files from js/ to css/ ...');
     const targetPath = jPackConfig.get('targetPath');
 
-    fs.readdirSync(targetRelativePath + '/js')
+    fs.readdirSync(jPackConfig.get('targetRelativePath') + '/js')
         .filter(file => file.endsWith('.css'))
         .forEach(file => {
-            const oldPath = path.join(targetRelativePath + '/js', file);
-            const newPath = path.join(targetRelativePath + '/css', file);
+            const oldPath = path.join(jPackConfig.get('targetRelativePath') + '/js', file);
+            const newPath = path.join(jPackConfig.get('targetRelativePath') + '/css', file);
             fs.mkdirSync(path.dirname(newPath), { recursive: true });
             fs.renameSync(oldPath, newPath);
             LogMe.log('- ' + file);

package/lib/utils.js

@@ -3,8 +3,11 @@ import path from 'path';
 
 import LogMe from './LogMe.js';
 
-export function emptyTargetPath(targetPath) {
+export function emptyTargetPath(targetPath, removeEmpty = false) {
     if (!fs.existsSync(targetPath)) {
+        if (removeEmpty) {
+            return;
+        }
         fs.mkdirSync(targetPath, { recursive: true });
     }
 
@@ -19,7 +22,7 @@ export function emptyTargetPath(targetPath) {
             const fullPath = path.join(targetPath, file);
             if (fs.lstatSync(fullPath).isDirectory()) {
                 try {
-                    emptyTargetPath(fullPath);
+                    emptyTargetPath(fullPath, true);
                 } catch (error) {
                     LogMe.error('Failed to empty directory: ' + fullPath);
                     LogMe.error(error.message);
@@ -35,8 +38,10 @@ export function emptyTargetPath(targetPath) {
     }
 
     if (files.length === 0) {
-        LogMe.log('  [RM] ' + targetPath);
-        fs.rmdirSync(targetPath);
+        if (removeEmpty) {
+            LogMe.log('  [RM] ' + targetPath);
+            fs.rmdirSync(targetPath);
+        }
     }
 };
 

package/package.json

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